From 2c11546f4467de68fcad3587432c813fa04846f3 Mon Sep 17 00:00:00 2001
From: Kadir Can Ozden <101993364+bysiber@users.noreply.github.com>
Date: Fri, 20 Feb 2026 11:46:13 +0300
Subject: [PATCH 1/2] Fix enum convertor returning None for already-converted
 enum values

When an enum parameter has a user callback, the value gets converted
twice: once in the parameter callback wrapper and again in the command
callback wrapper. The second pass receives an enum member, but
str(EnumMember) returns 'ClassName.member' which doesn't match the
val_map keys, so the convertor silently returns None.

Added an isinstance check (same pattern as param_path_convertor) to
pass through values that are already enum members.
---
 typer/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/typer/main.py b/typer/main.py
index f4f21bb844..98a2d2195e 100644
--- a/typer/main.py
+++ b/typer/main.py
@@ -1446,6 +1446,8 @@ def generate_enum_convertor(enum: type[Enum]) -> Callable[[Any], Any]:
 
     def convertor(value: Any) -> Any:
         if value is not None:
+            if isinstance(value, enum):
+                return value
             val = str(value)
             if val in val_map:
                 key = val_map[val]

From 3c557e9f24a861742820d32827ed9492e50de192 Mon Sep 17 00:00:00 2001
From: Kadir Can Ozden <101993364+bysiber@users.noreply.github.com>
Date: Fri, 20 Feb 2026 14:13:49 +0300
Subject: [PATCH 2/2] Add test for enum convertor with already-converted value

---
 tests/test_type_conversion.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/test_type_conversion.py b/tests/test_type_conversion.py
index 83edd1ecb5..9d6d302d9b 100644
--- a/tests/test_type_conversion.py
+++ b/tests/test_type_conversion.py
@@ -85,6 +85,15 @@ class SomeEnum(Enum):
     THREE = "three"
 
 
+def test_enum_convertor_already_converted():
+    """If the value is already an enum member, the convertor should return it as-is."""
+    from typer.main import generate_enum_convertor
+
+    convertor = generate_enum_convertor(SomeEnum)
+    result = convertor(SomeEnum.ONE)
+    assert result is SomeEnum.ONE
+
+
 @pytest.mark.parametrize(
     "type_annotation",
     [list[Path], list[SomeEnum], list[str]],