fix: update code for mypy v2 compatibility

Agent-Logs-Url: https://github.com/openapi-generators/openapi-python-client/sessions/fcf228f8-9c17-45a7-a11e-f87474279b51

Co-authored-by: dbanty <43723790+dbanty@users.noreply.github.com>

Author: Copilot

end_to_end_tests/literal-enums-golden-record/my_enum_api_client/models/an_all_of_enum.py

@@ -1,4 +1,4 @@
-from typing import Literal, cast
+from typing import Literal
 
 AnAllOfEnum = Literal["a_default", "bar", "foo", "overridden_default"]
 
@@ -12,5 +12,5 @@
 
 def check_an_all_of_enum(value: str) -> AnAllOfEnum:
     if value in AN_ALL_OF_ENUM_VALUES:
-        return cast(AnAllOfEnum, value)
+        return value
     raise TypeError(f"Unexpected value {value!r}. Expected one of {AN_ALL_OF_ENUM_VALUES!r}")

end_to_end_tests/literal-enums-golden-record/my_enum_api_client/models/an_enum.py

@@ -1,4 +1,4 @@
-from typing import Literal, cast
+from typing import Literal
 
 AnEnum = Literal["FIRST_VALUE", "SECOND_VALUE"]
 
@@ -10,5 +10,5 @@
 
 def check_an_enum(value: str) -> AnEnum:
     if value in AN_ENUM_VALUES:
-        return cast(AnEnum, value)
+        return value
     raise TypeError(f"Unexpected value {value!r}. Expected one of {AN_ENUM_VALUES!r}")

end_to_end_tests/literal-enums-golden-record/my_enum_api_client/models/an_enum_with_null.py

@@ -1,4 +1,4 @@
-from typing import Literal, cast
+from typing import Literal
 
 AnEnumWithNull = Literal["FIRST_VALUE", "SECOND_VALUE"]
 
@@ -10,5 +10,5 @@
 
 def check_an_enum_with_null(value: str) -> AnEnumWithNull:
     if value in AN_ENUM_WITH_NULL_VALUES:
-        return cast(AnEnumWithNull, value)
+        return value
     raise TypeError(f"Unexpected value {value!r}. Expected one of {AN_ENUM_WITH_NULL_VALUES!r}")

end_to_end_tests/literal-enums-golden-record/my_enum_api_client/models/an_int_enum.py

@@ -1,4 +1,4 @@
-from typing import Literal, cast
+from typing import Literal
 
 AnIntEnum = Literal[-1, 1, 2]
 
@@ -11,5 +11,5 @@
 
 def check_an_int_enum(value: int) -> AnIntEnum:
     if value in AN_INT_ENUM_VALUES:
-        return cast(AnIntEnum, value)
+        return value
     raise TypeError(f"Unexpected value {value!r}. Expected one of {AN_INT_ENUM_VALUES!r}")

end_to_end_tests/literal-enums-golden-record/my_enum_api_client/models/different_enum.py

@@ -1,4 +1,4 @@
-from typing import Literal, cast
+from typing import Literal
 
 DifferentEnum = Literal["DIFFERENT", "OTHER"]
 
@@ -10,5 +10,5 @@
 
 def check_different_enum(value: str) -> DifferentEnum:
     if value in DIFFERENT_ENUM_VALUES:
-        return cast(DifferentEnum, value)
+        return value
     raise TypeError(f"Unexpected value {value!r}. Expected one of {DIFFERENT_ENUM_VALUES!r}")

end_to_end_tests/literal-enums-golden-record/my_enum_api_client/models/get_user_list_int_enum_header.py

@@ -1,4 +1,4 @@
-from typing import Literal, cast
+from typing import Literal
 
 GetUserListIntEnumHeader = Literal[1, 2, 3]
 
@@ -11,5 +11,5 @@
 
 def check_get_user_list_int_enum_header(value: int) -> GetUserListIntEnumHeader:
     if value in GET_USER_LIST_INT_ENUM_HEADER_VALUES:
-        return cast(GetUserListIntEnumHeader, value)
+        return value
     raise TypeError(f"Unexpected value {value!r}. Expected one of {GET_USER_LIST_INT_ENUM_HEADER_VALUES!r}")

end_to_end_tests/literal-enums-golden-record/my_enum_api_client/models/get_user_list_string_enum_header.py

@@ -1,4 +1,4 @@
-from typing import Literal, cast
+from typing import Literal
 
 GetUserListStringEnumHeader = Literal["one", "three", "two"]
 
@@ -11,5 +11,5 @@
 
 def check_get_user_list_string_enum_header(value: str) -> GetUserListStringEnumHeader:
     if value in GET_USER_LIST_STRING_ENUM_HEADER_VALUES:
-        return cast(GetUserListStringEnumHeader, value)
+        return value
     raise TypeError(f"Unexpected value {value!r}. Expected one of {GET_USER_LIST_STRING_ENUM_HEADER_VALUES!r}")

end_to_end_tests/test_end_to_end.py

@@ -1,4 +1,6 @@
 import shutil
+import subprocess
+import sys
 from filecmp import cmpfiles, dircmp
 from pathlib import Path
 
@@ -99,10 +101,12 @@ def run_e2e_test(
             gr_path, g.output_path, expected_differences=expected_differences, expected_missing=expected_missing
         )
 
-        import mypy.api
-
-        out, err, status = mypy.api.run([str(g.output_path), "--strict"])
-        assert status == 0, f"Type checking client failed: {out}"
+        result = subprocess.run(
+            [sys.executable, "-m", "mypy", str(g.output_path), "--strict"],
+            capture_output=True,
+            text=True,
+        )
+        assert result.returncode == 0, f"Type checking client failed: {result.stdout}"
 
         return g.generator_result
 
@@ -281,10 +285,12 @@ def test_update_integration_tests():
             config_path=config_path
         )
         _compare_directories(source_path, temp_dir, ignore=["pyproject.toml"])
-        import mypy.api
-
-        out, err, status = mypy.api.run([str(temp_dir), "--strict"])
-        assert status == 0, f"Type checking client failed: {out=} {err=}"
+        result = subprocess.run(
+            [sys.executable, "-m", "mypy", str(temp_dir), "--strict"],
+            capture_output=True,
+            text=True,
+        )
+        assert result.returncode == 0, f"Type checking client failed: {result.stdout=} {result.stderr=}"
 
     finally:
         shutil.rmtree(temp_dir)

openapi_python_client/templates/literal_enum.py.jinja

@@ -1,10 +1,10 @@
-from typing import Literal, cast
+from typing import Literal
 
 {{ enum.class_info.name }} = Literal{{ "%r" | format(enum.values|list|sort) }}
 
 {{ enum.get_class_name_snake_case() | upper }}_VALUES: set[{{ enum.class_info.name }}] = { {% for v in enum.values|list|sort %}{{"%r"|format(v)}}, {% endfor %} }
 
 def check_{{ enum.get_class_name_snake_case() }}(value: {{ enum.get_instance_type_string() }}) -> {{ enum.class_info.name}}:
     if value in {{ enum.get_class_name_snake_case() | upper }}_VALUES:
-        return cast({{enum.class_info.name}}, value)
+        return value
     raise TypeError(f"Unexpected value {value!r}. Expected one of {{"{"}}{{ enum.get_class_name_snake_case() | upper }}_VALUES!r}")