enumplus 1.2.0__tar.gz → 1.2.2__tar.gz

{enumplus-1.2.0 → enumplus-1.2.2}/.github/ISSUE_TEMPLATE/bug_report.md

@@ -31,7 +31,7 @@ A clear and concise description of what actually happened.
 ## Environment
 
 - Python version: [e.g. 3.12.1]
-- enumplus version: [e.g. 1.1.0]
+- enumplus version: [e.g. 1.2.1]
 - OS: [e.g. Ubuntu 22.04, Windows 11, macOS 14]
 
 ## Additional context

{enumplus-1.2.0 → enumplus-1.2.2}/.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
   - name: GitHub Discussions
-    url: https://github.com/MathiasPaulenko/enumpy/discussions
+    url: https://github.com/MathiasPaulenko/enumplus/discussions
     about: Ask questions and discuss ideas with the community.
   - name: Security Policy
-    url: https://github.com/MathiasPaulenko/enumpy/blob/main/SECURITY.md
+    url: https://github.com/MathiasPaulenko/enumplus/blob/main/SECURITY.md
     about: Report security vulnerabilities privately — do not open a public issue.

{enumplus-1.2.0 → enumplus-1.2.2}/.github/workflows/release.yml

@@ -96,7 +96,6 @@ jobs:
           DOCS=$(git log --pretty=format:"- %s" ${RANGE} --grep="^docs" --grep="^readme" -i || true)
           TESTS=$(git log --pretty=format:"- %s" ${RANGE} --grep="^test" -i || true)
           CHORE=$(git log --pretty=format:"- %s" ${RANGE} --grep="^chore" --grep="^ci" --grep="^build" -i || true)
-          RELEASE=$(git log --pretty=format:"- %s" ${RANGE} --grep="^release" -i || true)
 
           {
             echo "body<<EOF"

{enumplus-1.2.0 → enumplus-1.2.2}/AGENTS.md

@@ -22,6 +22,10 @@ Requires Python `>=3.11`.
   - Keep class config keys such as `serialize_by_name` from becoming enum members
     or affecting `auto()` generation.
   - Support `auto()` following a metadata tuple on Python 3.11–3.14.
+- `serialize_by_name` is a reserved class config key: it must be a `bool`
+  (`TypeError` otherwise) and can never be a member name.
+- Auto-generated labels use `name.replace("_", " ").title()`. `filter(label=...)`
+  matches the evaluated label, not the raw metadata dict.
 - `Enum.__eq__` and `EnumMeta.__contains__` use `_safe_equal`, which coerces
   `a == b` to a `bool` without raising on shape/length mismatches (e.g. NumPy
   arrays, unhashable container values).
@@ -67,7 +71,7 @@ py -3.11 -m mypy --strict enumplus/ tests/
 
 ## Known constraints
 
-- The git remote is `MathiasPaulenko/enumpy`, while the package name and PyPI
-  project are `enumplus`. Package URLs in `pyproject.toml` point to the actual
-  remote repository; update if the repository is renamed.
+- The repository was renamed from `enumpy` to `enumplus` on GitHub. All
+  project URLs point to `MathiasPaulenko/enumplus`; old `enumpy` links
+  redirect automatically.
 - `ref/` is intentionally ignored (local reference material). Do not commit it.

enumplus-1.2.2/CHANGELOG.md

@@ -0,0 +1,118 @@
+# Changelog
+
+All notable changes to this project are documented in this file.
+
+The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [1.2.2] - 2026-10-06
+
+### Fixed
+
+- `from_value()`, `get()`, and `validate()` now return the member itself when
+  passed a member of the queried enum whose value is a foreign enum member.
+  Previously they raised `ValueError` (or returned the default) even though
+  `is_valid()` and `in` correctly accepted the member.
+- `is_valid()` and `from_value()` now accept members of subclass enums, matching
+  the behavior of `in` (e.g. `Base.is_valid(Child.MEMBER)` is `True` for an
+  empty `Base`).
+- `SerializableEncoder` now also serializes stdlib `enum.Enum` members, not just
+  enumplus members. `to_json()` and `json.dumps()` no longer raise `TypeError`
+  when a member's value or metadata is a stdlib enum member.
+
+### Changed
+
+- Auto-generated labels now replace underscores with spaces: `IN_PROGRESS`
+  produces `"In Progress"` instead of `"In_Progress"`.
+- `filter(label=...)` now matches against the member's evaluated label, so
+  callable and auto-generated labels can be filtered.
+- `serialize_by_name` now raises `TypeError` when set to a non-`bool` value
+  instead of being silently swallowed as a member assignment.
+- `OrderedEnum` comparison operators are now typed as returning
+  `bool | NotImplementedType`.
+
+## [1.2.1] - 2026-08-23
+
+### Fixed
+
+- `to_dict()` and `to_json()` no longer double-evaluate callable labels — the callable is invoked exactly once and the result is reused in both the top-level `label` field and the `metadata` dict.
+- `__version__` is now loaded dynamically from package metadata via `importlib.metadata`, eliminating version mismatch between `__init__.py` and `pyproject.toml`.
+- `__contains__`, `from_value()`, `is_valid()`, and `get()` no longer produce false positives when passed a foreign enum member with the same value as a member of the queried enum.
+- `__contains__`, `from_value()`, `is_valid()`, and `get()` now correctly handle members whose value is an enum member from another class. Previously, the foreign-enum guard rejected all foreign enum members, making it impossible to look up such members by value.
+- `to_json()` now uses `SerializableEncoder` internally, so members whose value (or metadata) is an enum member from another class are serialized correctly instead of raising `TypeError`.
+- `_safe_equal()` now catches all exceptions (not just `TypeError` and `ValueError`) from custom `__eq__` implementations, preventing crashes when comparing with objects that raise unexpected exceptions.
+- Falsy but valid labels (`0`, `""`, `False`) are now respected instead of being silently replaced by `name.title()`. Only `None` and missing labels trigger the fallback.
+- Removed dead `_serialize_value` function from `serialize.py`.
+- Updated `SECURITY.md` to include `1.2.x` in supported versions.
+
+## [1.2.0] - 2026-08-23
+
+### Fixed
+
+- `serialize_by_name` is now correctly inherited by subclass enums instead of being silently reset to `False`.
+
+### Changed
+
+- Improved README with table of contents, requirements section, and dynamic CI badge.
+- Added `pydantic` optional dependency extra for Pydantic v2 integration.
+- Added concurrency groups to CI and release workflows to cancel superseded runs.
+- Updated issue templates with correct version examples.
+- Updated CONTRIBUTING with cross-version testing instructions and repository name clarification.
+
+## [1.1.0] - 2025-01-15
+
+### Added
+
+- Case-insensitive lookup via `case_insensitive=True` on `from_value()` and `from_name()`.
+- `serialize_by_name` class config for Pydantic v2 validation and serialization by member name.
+- `to_dict()` method for serializing an enum to a nested dictionary.
+- `get()` method for dict-style lookup with a default.
+- `map()` method for mapping each member to a value.
+- `keys()` method as an alias of `names()`.
+- `get_initial()` and `get_final()` for declaration-order access.
+- Callable labels for i18n / translatable labels.
+- `@dataclass_transform()` on the metaclass for type-checker metadata attribute support.
+- `py.typed` marker for PEP 561 typed-package support.
+- Python 3.14 support and CI coverage.
+
+### Fixed
+
+- `auto()` now works correctly after metadata tuples on Python 3.11–3.14.
+- Class config (`serialize_by_name`) no longer registers as an enum member or corrupts `auto()` state.
+- `__eq__`, `__hash__`, `__contains__`, `from_value`, `is_valid`, and `filter` are now safe for unhashable values and non-boolean comparison results.
+- `from_json` validates input type and JSON shape (`TypeError` for wrong type, `ValueError` for invalid JSON).
+- `from_name` raises `TypeError` for non-string input instead of `KeyError`.
+- `to_dict()` and `to_json()` no longer invoke non-label callable metadata values.
+- Removed redundant import in `SerializableEncoder`.
+
+### Changed
+
+- Improved package metadata: classifiers, project URLs, and dev dependency lower bounds.
+- Release workflow uses `${{ github.repository }}` for dynamic changelog URLs.
+- CONTRIBUTING and SUPPORT docs updated with correct commands.
+
+## [1.0.0] - 2024-12-01
+
+### Added
+
+- `Enum` base class as a drop-in replacement for `enum.Enum`.
+- `OrderedEnum` with declaration-order comparison operators.
+- Per-member labels with automatic `name.title()` fallback.
+- Per-member metadata via `(value, dict)` tuple syntax.
+- Metadata attribute access via `__getattr__`.
+- `choices()`, `from_value()`, `from_name()`, `is_valid()`, `validate()`.
+- `values()`, `names()`, `labels()`.
+- `filter()` by metadata key-value pairs.
+- `to_json()` / `from_json()` serialization.
+- `SerializableEncoder` for `json.dumps`.
+- Pydantic v2 integration via `__get_pydantic_core_schema__`.
+- Full test suite, CI, and release workflows.
+
+[Unreleased]: https://github.com/MathiasPaulenko/enumplus/compare/v1.2.2...HEAD
+[1.2.2]: https://github.com/MathiasPaulenko/enumplus/releases/tag/v1.2.2
+[1.2.1]: https://github.com/MathiasPaulenko/enumplus/releases/tag/v1.2.1
+[1.2.0]: https://github.com/MathiasPaulenko/enumplus/releases/tag/v1.2.0
+[1.1.0]: https://github.com/MathiasPaulenko/enumplus/releases/tag/v1.1.0
+[1.0.0]: https://github.com/MathiasPaulenko/enumplus/releases/tag/v1.0.0

{enumplus-1.2.0 → enumplus-1.2.2}/CONTRIBUTING.md

@@ -7,8 +7,8 @@ Thank you for your interest in contributing to enumplus! This document describes
 1. Fork the repository on GitHub.
 2. Clone your fork locally:
    ```bash
-   git clone https://github.com/<your-username>/enumpy.git
-   cd enumpy
+   git clone https://github.com/<your-username>/enumplus.git
+   cd enumplus
    ```
 3. Create a virtual environment and install dev dependencies:
    ```bash
@@ -17,7 +17,7 @@ Thank you for your interest in contributing to enumplus! This document describes
    pip install -e ".[dev]"
    ```
 
-> **Note:** The git repository is named `enumpy`, while the package name is `enumplus`. This is expected — the repository name predates the package rename.
+> **Note:** The repository was previously named `enumpy`; it has been renamed to `enumplus` to match the package name. Old links redirect automatically.
 
 ## Development Workflow
 
@@ -73,7 +73,7 @@ py -3.11 -m mypy --strict enumplus/ tests/
 
 ## Reporting Issues
 
-- Use [GitHub Issues](https://github.com/MathiasPaulenko/enumpy/issues) to report bugs or request features.
+- Use [GitHub Issues](https://github.com/MathiasPaulenko/enumplus/issues) to report bugs or request features.
 - Use the provided issue templates for consistency.
 
 ## Code of Conduct

{enumplus-1.2.0 → enumplus-1.2.2}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2026 Mathias Paulenko
+Copyright (c) 2024-2026 Mathias Paulenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{enumplus-1.2.0 → enumplus-1.2.2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.5
 Name: enumplus
-Version: 1.2.0
+Version: 1.2.2
 Summary: Enhanced Python enums with metadata, serialization, and choices
 Project-URL: Homepage, https://pypi.org/project/enumplus/
-Project-URL: Repository, https://github.com/MathiasPaulenko/enumpy
-Project-URL: Issues, https://github.com/MathiasPaulenko/enumpy/issues
-Project-URL: Changelog, https://github.com/MathiasPaulenko/enumpy/blob/main/CHANGELOG.md
+Project-URL: Repository, https://github.com/MathiasPaulenko/enumplus
+Project-URL: Issues, https://github.com/MathiasPaulenko/enumplus/issues
+Project-URL: Changelog, https://github.com/MathiasPaulenko/enumplus/blob/main/CHANGELOG.md
 Author-email: Mathias Paulenko <mathias.paulenko@outlook.com>
 License-Expression: MIT
 License-File: LICENSE
@@ -36,7 +36,7 @@ Description-Content-Type: text/markdown
 ![PyPI](https://img.shields.io/pypi/v/enumplus)
 ![Python](https://img.shields.io/badge/python-3.11+-blue)
 ![License](https://img.shields.io/badge/license-MIT-green)
-![Tests](https://github.com/MathiasPaulenko/enumpy/actions/workflows/ci.yml/badge.svg)
+![Tests](https://github.com/MathiasPaulenko/enumplus/actions/workflows/ci.yml/badge.svg)
 
 Python's `enum.Enum` is basic. `enumplus` adds display names, metadata, JSON
 serialization, `choices()`, and value-based comparison — all with zero runtime
@@ -125,12 +125,12 @@ print("red" in Color)           # True
 
 ### Display Names (label)
 
-Every member gets a human-readable label, auto-generated from the member name or set explicitly via metadata.
+Every member gets a human-readable label, auto-generated from the member name or set explicitly via metadata. Auto-generated labels replace underscores with spaces (`IN_PROGRESS` becomes `"In Progress"`).
 
 ```python
 class Status(Enum):
-    PENDING = "pending"                              # label: "Pending"
-    IN_PROGRESS = ("in_progress", {"label": "In Progress"})
+    PENDING = "pending"         # label: "Pending"
+    IN_PROGRESS = "in_progress" # label: "In Progress"
 
 print(Status.PENDING.label)       # "Pending"
 print(Status.IN_PROGRESS.label)   # "In Progress"
@@ -220,7 +220,7 @@ Color.keys()     # ["RED", "GREEN"]
 
 ### filter()
 
-Filter members by metadata key-value pairs (AND logic).
+Filter members by metadata key-value pairs (AND logic). `label` is special: it matches against the evaluated label (including auto-generated and callable labels), not the raw metadata dict.
 
 ```python
 class Color(Enum):
@@ -230,6 +230,7 @@ class Color(Enum):
 Color.filter(category="warm")              # [Color.RED]
 Color.filter(hex="#FF0000", category="warm")  # [Color.RED]
 Color.filter()                             # [Color.RED, Color.GREEN]
+Color.filter(label="Red")                  # [Color.RED]
 ```
 
 ### Comparison with values (==)
@@ -433,7 +434,7 @@ print(Color.labels())      # ["Rojo", "Verde"]
 print(Color.choices())     # [("red", "Rojo"), ("green", "Verde")]
 ```
 
-Callable labels work everywhere: `choices()`, `to_dict()`, `to_json()`, `labels()`, and `str()`.
+Callable labels work everywhere: `choices()`, `to_dict()`, `to_json()`, `labels()`, `filter(label=...)`, and `str()`.
 
 ### Type hints in metadata
 
@@ -465,6 +466,17 @@ from enumplus import Enum
 
 All existing enum code continues to work — `Enum["RED"]`, `Enum("red")`, `list(Enum)`, `len(Enum)`, `@unique`, `auto()`, `isinstance` checks, everything.
 
+A few deliberate differences from `enum.Enum` to keep in mind:
+
+- `str(member)` returns the label, not `"ClassName.MEMBER"` (`repr()` shows
+  `<ClassName.MEMBER: value>`), and `member == value` compares by value.
+- `serialize_by_name` is a reserved class attribute for Pydantic config — it
+  can't be used as a member name and must be a `bool`.
+- Metadata keys that collide with real attributes (`name`, `value`, `label`,
+  `metadata`) are only reachable via `member.metadata`, not as attributes.
+- Metadata declared on an alias is ignored — an alias shares the canonical
+  member's label and metadata.
+
 ## Changelog
 
 See [CHANGELOG.md](CHANGELOG.md) for a full history of changes.

{enumplus-1.2.0 → enumplus-1.2.2}/README.md

@@ -3,7 +3,7 @@
 ![PyPI](https://img.shields.io/pypi/v/enumplus)
 ![Python](https://img.shields.io/badge/python-3.11+-blue)
 ![License](https://img.shields.io/badge/license-MIT-green)
-![Tests](https://github.com/MathiasPaulenko/enumpy/actions/workflows/ci.yml/badge.svg)
+![Tests](https://github.com/MathiasPaulenko/enumplus/actions/workflows/ci.yml/badge.svg)
 
 Python's `enum.Enum` is basic. `enumplus` adds display names, metadata, JSON
 serialization, `choices()`, and value-based comparison — all with zero runtime
@@ -92,12 +92,12 @@ print("red" in Color)           # True
 
 ### Display Names (label)
 
-Every member gets a human-readable label, auto-generated from the member name or set explicitly via metadata.
+Every member gets a human-readable label, auto-generated from the member name or set explicitly via metadata. Auto-generated labels replace underscores with spaces (`IN_PROGRESS` becomes `"In Progress"`).
 
 ```python
 class Status(Enum):
-    PENDING = "pending"                              # label: "Pending"
-    IN_PROGRESS = ("in_progress", {"label": "In Progress"})
+    PENDING = "pending"         # label: "Pending"
+    IN_PROGRESS = "in_progress" # label: "In Progress"
 
 print(Status.PENDING.label)       # "Pending"
 print(Status.IN_PROGRESS.label)   # "In Progress"
@@ -187,7 +187,7 @@ Color.keys()     # ["RED", "GREEN"]
 
 ### filter()
 
-Filter members by metadata key-value pairs (AND logic).
+Filter members by metadata key-value pairs (AND logic). `label` is special: it matches against the evaluated label (including auto-generated and callable labels), not the raw metadata dict.
 
 ```python
 class Color(Enum):
@@ -197,6 +197,7 @@ class Color(Enum):
 Color.filter(category="warm")              # [Color.RED]
 Color.filter(hex="#FF0000", category="warm")  # [Color.RED]
 Color.filter()                             # [Color.RED, Color.GREEN]
+Color.filter(label="Red")                  # [Color.RED]
 ```
 
 ### Comparison with values (==)
@@ -400,7 +401,7 @@ print(Color.labels())      # ["Rojo", "Verde"]
 print(Color.choices())     # [("red", "Rojo"), ("green", "Verde")]
 ```
 
-Callable labels work everywhere: `choices()`, `to_dict()`, `to_json()`, `labels()`, and `str()`.
+Callable labels work everywhere: `choices()`, `to_dict()`, `to_json()`, `labels()`, `filter(label=...)`, and `str()`.
 
 ### Type hints in metadata
 
@@ -432,6 +433,17 @@ from enumplus import Enum
 
 All existing enum code continues to work — `Enum["RED"]`, `Enum("red")`, `list(Enum)`, `len(Enum)`, `@unique`, `auto()`, `isinstance` checks, everything.
 
+A few deliberate differences from `enum.Enum` to keep in mind:
+
+- `str(member)` returns the label, not `"ClassName.MEMBER"` (`repr()` shows
+  `<ClassName.MEMBER: value>`), and `member == value` compares by value.
+- `serialize_by_name` is a reserved class attribute for Pydantic config — it
+  can't be used as a member name and must be a `bool`.
+- Metadata keys that collide with real attributes (`name`, `value`, `label`,
+  `metadata`) are only reachable via `member.metadata`, not as attributes.
+- Metadata declared on an alias is ignored — an alias shares the canonical
+  member's label and metadata.
+
 ## Changelog
 
 See [CHANGELOG.md](CHANGELOG.md) for a full history of changes.

{enumplus-1.2.0 → enumplus-1.2.2}/SECURITY.md

@@ -4,6 +4,7 @@
 
 | Version | Supported          |
 |---------|--------------------|
+| 1.2.x   | :white_check_mark: |
 | 1.1.x   | :white_check_mark: |
 | < 1.1   | :x:                |
 

{enumplus-1.2.0 → enumplus-1.2.2}/SUPPORT.md

@@ -3,12 +3,12 @@
 ## Getting Help
 
 - **Documentation**: Start with the [README](README.md) for usage examples and API reference.
-- **Issues**: Search [existing issues](https://github.com/MathiasPaulenko/enumpy/issues) to see if your question has already been answered.
-- **Discussions**: Use [GitHub Discussions](https://github.com/MathiasPaulenko/enumpy/discussions) for questions, ideas, and general discussion.
+- **Issues**: Search [existing issues](https://github.com/MathiasPaulenko/enumplus/issues) to see if your question has already been answered.
+- **Discussions**: Use [GitHub Discussions](https://github.com/MathiasPaulenko/enumplus/discussions) for questions, ideas, and general discussion.
 
 ## Reporting a Bug
 
-Open a [bug report issue](https://github.com/MathiasPaulenko/enumpy/issues/new?template=bug_report.md).
+Open a [bug report issue](https://github.com/MathiasPaulenko/enumplus/issues/new?template=bug_report.md).
 Include:
 
 - Python version
@@ -18,7 +18,7 @@ Include:
 
 ## Requesting a Feature
 
-Open a [feature request issue](https://github.com/MathiasPaulenko/enumpy/issues/new?template=feature_request.md).
+Open a [feature request issue](https://github.com/MathiasPaulenko/enumplus/issues/new?template=feature_request.md).
 
 ## Security Issues
 

{enumplus-1.2.0 → enumplus-1.2.2}/enumplus/__init__.py

@@ -4,9 +4,15 @@ Drop-in replacement for ``enum.Enum`` with labels, metadata, serialization,
 and Pydantic v2 integration.
 """
 
+from importlib.metadata import PackageNotFoundError
+from importlib.metadata import version as _pkg_version
+
 from enumplus.enum import Enum, OrderedEnum
 from enumplus.serialize import SerializableEncoder
 
-__version__ = "1.1.0"
+try:
+    __version__ = _pkg_version("enumplus")
+except PackageNotFoundError:  # pragma: no cover
+    __version__ = "0.0.0.dev0"
 
 __all__ = ["Enum", "OrderedEnum", "SerializableEncoder", "__version__"]

{enumplus-1.2.0 → enumplus-1.2.2}/enumplus/enum.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import enum
 import sys
+from types import NotImplementedType
 from typing import Any, Self, TypeVar, dataclass_transform, overload
 
 if sys.version_info >= (3, 13):
@@ -39,6 +40,11 @@ class _EnumPlusDict(EnumDict):
 
     def __setitem__(self, key: str, value: Any) -> None:
         if key in self._CONFIG_KEYS:
+            if not isinstance(value, bool):
+                raise TypeError(
+                    f"{key} is a reserved class config key and must be a bool, "
+                    f"got {type(value).__name__}"
+                )
             self._class_config[key] = value
             # Store as a class attribute, but do not register as a member and
             # do not affect _last_values used by auto().
@@ -58,20 +64,21 @@ class _EnumPlusDict(EnumDict):
 
 
 def _safe_equal(a: Any, b: Any) -> bool:
-    """Return ``a == b`` as a bool, swallowing shape/length comparison errors.
+    """Return ``a == b`` as a bool, swallowing comparison errors.
 
     Handles values whose ``__eq__`` may raise (e.g. NumPy arrays with shape
-    mismatches) or return non-boolean objects (e.g. arrays, ``NotImplemented``).
+    mismatches, custom objects with side-effecting ``__eq__``) or return
+    non-boolean objects (e.g. arrays, ``NotImplemented``).
     """
     try:
         result = a == b
-    except (TypeError, ValueError):
+    except Exception:
         return False
     if result is NotImplemented:
         return False
     try:
         return bool(result)
-    except (TypeError, ValueError):
+    except Exception:
         return False
 
 
@@ -147,8 +154,8 @@ class EnumMeta(enum.EnumMeta):
             member._metadata_ = metadata
 
             label = metadata.get("label")
-            if not label:
-                member._label_ = member.name.title()
+            if label is None:
+                member._label_ = member.name.replace("_", " ").title()
             else:
                 member._label_ = label
 
@@ -160,6 +167,13 @@ class EnumMeta(enum.EnumMeta):
         if isinstance(item, cls):
             return True
         member: Any
+        if isinstance(item, enum.Enum):
+            # Foreign enum member: only match if a member's value IS this
+            # exact enum member (identity), not just equal by value.
+            for member in cls:
+                if member.value is item:
+                    return True
+            return False
         for member in cls:
             if _safe_equal(member.value, item):
                 return True
@@ -185,7 +199,7 @@ class Enum(enum.Enum, metaclass=EnumMeta):
     - Pydantic v2 integration
     """
 
-    _label_: str
+    _label_: Any
     _metadata_: dict[str, Any]
     _index_: int
 
@@ -194,7 +208,7 @@ class Enum(enum.Enum, metaclass=EnumMeta):
         """Human-readable label for this member.
 
         If the label was set to a callable, it is evaluated on every access.
-        Falls back to ``name.title()`` when no label is set.
+        Falls back to ``name.replace("_", " ").title()`` when no label is set.
         """
         label = self._label_
         if callable(label):
@@ -272,6 +286,18 @@ class Enum(enum.Enum, metaclass=EnumMeta):
             ValueError: If no match is found and no default is provided.
         """
         member: Any
+        if isinstance(value, cls):
+            return value
+        if isinstance(value, enum.Enum):
+            # Foreign enum member: only match if a member's value IS this
+            # exact enum member (identity), not just equal by value.
+            for member in cls:
+                if member.value is value:
+                    return member
+            if default is not _SENTINEL:
+                return default
+            raise ValueError(f"{value!r} is not a valid {cls.__name__} value")
+
         if case_insensitive and isinstance(value, str):
             lowered = value.lower()
             for member in cls:
@@ -336,6 +362,15 @@ class Enum(enum.Enum, metaclass=EnumMeta):
     @classmethod
     def is_valid(cls, value: Any) -> bool:
         """Return ``True`` if ``value`` is a valid member or member value."""
+        if isinstance(value, cls):
+            return True
+        if isinstance(value, enum.Enum):
+            # Foreign enum member: only match if a member's value IS this
+            # exact enum member (identity), not just equal by value.
+            for member in cls:
+                if member.value is value:
+                    return True
+            return False
         for member in cls:
             if member is value or _safe_equal(member.value, value):
                 return True
@@ -424,13 +459,17 @@ class Enum(enum.Enum, metaclass=EnumMeta):
         """Serialize the enum to a nested dict with ``value``, ``label``, ``metadata``."""
         result: dict[str, dict[str, Any]] = {}
         for member in cls:
+            label = member.label
+            metadata: dict[str, Any] = {}
+            for k, v in member._metadata_.items():
+                if k == "label" and callable(v):
+                    metadata[k] = label
+                else:
+                    metadata[k] = v
             result[member.name] = {
                 "value": member.value,
-                "label": member.label,
-                "metadata": {
-                    k: (v() if callable(v) and k == "label" else v)
-                    for k, v in member._metadata_.items()
-                },
+                "label": label,
+                "metadata": metadata,
             }
         return result
 
@@ -438,14 +477,18 @@ class Enum(enum.Enum, metaclass=EnumMeta):
     def filter(cls, **kwargs: Any) -> list[Self]:
         """Filter members by metadata key-value pairs (AND logic).
 
-        With no kwargs, returns all members.
+        ``label`` is matched against the member's evaluated label, so callable
+        labels work too. With no kwargs, returns all members.
         """
         if not kwargs:
             return list(cls)
         result: list[Self] = []
         for member in cls:
             if all(
-                key in member._metadata_ and _safe_equal(member._metadata_[key], value)
+                _safe_equal(member.label, value)
+                if key == "label"
+                else key in member._metadata_
+                and _safe_equal(member._metadata_[key], value)
                 for key, value in kwargs.items()
             ):
                 result.append(member)
@@ -486,22 +529,22 @@ class OrderedEnum(Enum):
     Also works with ``sorted()``, ``min()``, and ``max()``.
     """
 
-    def __lt__(self, other: object) -> bool:
+    def __lt__(self, other: object) -> bool | NotImplementedType:
         if not isinstance(other, type(self)):
             return NotImplemented
         return self._index_ < other._index_
 
-    def __le__(self, other: object) -> bool:
+    def __le__(self, other: object) -> bool | NotImplementedType:
         if not isinstance(other, type(self)):
             return NotImplemented
         return self._index_ <= other._index_
 
-    def __gt__(self, other: object) -> bool:
+    def __gt__(self, other: object) -> bool | NotImplementedType:
         if not isinstance(other, type(self)):
             return NotImplemented
         return self._index_ > other._index_
 
-    def __ge__(self, other: object) -> bool:
+    def __ge__(self, other: object) -> bool | NotImplementedType:
         if not isinstance(other, type(self)):
             return NotImplemented
         return self._index_ >= other._index_