Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly account for member and nonmember in TypeInfo.enum_members #18559

Merged
merged 5 commits into from
Feb 14, 2025

Conversation

sobolevn
Copy link
Member

Closes #18557

This comment has been minimized.

Copy link
Collaborator

@tyralla tyralla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the first time I heard about member and nomember, but I appreciate the opportunity to learn...

I played a little and found your fix does not cover the following slight change of your example:

from enum import Enum, member
from typing import reveal_type

class Pet(Enum):
    CAT = 1

    @member
    def human(self) -> int:
        return 2

def a(x: Pet) -> None:
    if x is not Pet.human:  # `human` instead of `CAT`, as in the original example
        reveal_type(x)  # N: Revealed type is "__main__.Pet"

Expected would be Literal[__main__.Pet.CAT]

However, this does not seem to be related to TypeInfo.enum_members, so this comment is just a suggestion for an extension of this or an independent PR.

Because of my lack of experience, I am not really sure if some edge cases are missed, but to me, this change looks good and is definitely an improvement.

@sobolevn
Copy link
Member Author

sobolevn commented Jan 29, 2025

However, this does not seem to be related to TypeInfo.enum_members, so this comment is just a suggestion for an extension of this or an independent PR.

Yeah, there are multiple other problems with Enum. For example: #18563

I think that the example that you've mentioned is happening because right now Enum cannot properly unwrap callable types or something.

(
isinstance(sym.node, Var)
and name not in EXCLUDED_ENUM_ATTRIBUTES
and not name.startswith("__")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this condition exist for enum.member too because #18563?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, good question. Let's keep it for now, I will change it in #18563 if needed.

Copy link
Contributor

Diff from mypy_primer, showing the effect of this PR on open source code:

freqtrade (https://github.com/freqtrade/freqtrade): 1.98x slower (128.9s -> 255.0s in a single noisy sample)

@sobolevn
Copy link
Member Author

My further plan: get rid of is_final_enum_value and use enum_members everywhere, PR is incoming!

@sobolevn sobolevn merged commit f404b16 into master Feb 14, 2025
17 of 18 checks passed
@sobolevn sobolevn deleted the issue-18557 branch February 14, 2025 07:18
@sobolevn
Copy link
Member Author

Done: #18675

x612skm pushed a commit to x612skm/mypy-dev that referenced this pull request Feb 24, 2025
…rs` (python#18559)

Closes python#18557

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

.enum_members property does not account to @member decorator and call
3 participants