#270 Fix invalid typing checks that didn't take typing/typing_extensions differences into account

Author: zmievsa

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 default_language_version:
-  python: python3.10
+  python: python3
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0

CHANGELOG.md

@@ -5,6 +5,11 @@ Please follow [the Keep a Changelog standard](https://keepachangelog.com/en/1.0.
 
 ## [Unreleased]
 
+### Added
+
+- `typing_inspection` dependency from pydantic team for complex isinstance checks that must be the same between `typing` and `typing_extensions`
+
+
 ## [5.3.3]
 
 ### Fixed

cadwyn/schema_generation.py

@@ -18,7 +18,6 @@
 import fastapi.utils
 import pydantic
 import pydantic._internal._decorators
-import typing_extensions
 from fastapi import Response
 from fastapi.dependencies.utils import is_async_gen_callable, is_coroutine_callable, is_gen_callable
 from fastapi.routing import APIRoute
@@ -37,7 +36,6 @@
 from typing_extensions import (
     Any,
     Doc,
-    NewType,
     Self,
     TypeAlias,
     TypeAliasType,
@@ -587,9 +585,11 @@ def migrate_route_to_version(self, route: fastapi.routing.APIRoute, *, ignore_re
         self._remake_endpoint_dependencies(route)
 
     def _change_version_of_a_non_container_annotation(self, annotation: Any) -> Any:
+        from typing_inspection.typing_objects import is_any, is_newtype, is_typealiastype
+
         if isinstance(annotation, (_BaseGenericAlias, types.GenericAlias)):
             return get_origin(annotation)[tuple(self.change_version_of_annotation(arg) for arg in get_args(annotation))]
-        elif isinstance(annotation, TypeAliasType):
+        elif is_typealiastype(annotation):
             if (
                 annotation.__module__ is not None and (annotation.__module__.startswith("pydantic."))
             ) or annotation.__name__ in _PYDANTIC_ALL_EXPORTED_NAMES:
@@ -616,7 +616,7 @@ def _change_version_of_a_non_container_annotation(self, annotation: Any) -> Any:
             return getitem(
                 tuple(self.change_version_of_annotation(a) for a in get_args(annotation)),
             )
-        elif annotation is typing.Any or annotation is typing_extensions.Any or isinstance(annotation, NewType):
+        elif is_any(annotation) or is_newtype(annotation):
             return annotation
         elif isinstance(annotation, type):
             return self._change_version_of_type(annotation)

pyproject.toml

@@ -57,6 +57,7 @@ dependencies = [
     "jinja2 >=3.1.2",
     "backports-strenum >=1.3.1,<2; python_version < '3.11'",
     "typing-extensions>=4.8.0",
+    "typing-inspection>=0.4.0",
 ]