Make use of typing-inspection (#1019)

Author: Viicos

pydantic_ai_slim/pydantic_ai/_pydantic.py

@@ -6,7 +6,7 @@
 from __future__ import annotations as _annotations
 
 from inspect import Parameter, signature
-from typing import TYPE_CHECKING, Any, Callable, TypedDict, cast, get_origin
+from typing import TYPE_CHECKING, Any, Callable, TypedDict, cast
 
 from pydantic import ConfigDict
 from pydantic._internal import _decorators, _generate_schema, _typing_extra
@@ -15,6 +15,7 @@
 from pydantic.json_schema import GenerateJsonSchema
 from pydantic.plugin._schema_validator import create_schema_validator
 from pydantic_core import SchemaValidator, core_schema
+from typing_extensions import get_origin
 
 from ._griffe import doc_descriptions
 from ._utils import check_object_json_schema, is_model_like
@@ -223,8 +224,7 @@ def _build_schema(
 
 
 def _is_call_ctx(annotation: Any) -> bool:
+    """Return whether the annotation is the `RunContext` class, parameterized or not."""
     from .tools import RunContext
 
-    return annotation is RunContext or (
-        _typing_extra.is_generic_alias(annotation) and get_origin(annotation) is RunContext
-    )
+    return annotation is RunContext or get_origin(annotation) is RunContext

pydantic_ai_slim/pydantic_ai/_result.py

@@ -1,14 +1,14 @@
 from __future__ import annotations as _annotations
 
 import inspect
-import sys
-import types
 from collections.abc import Awaitable, Iterable, Iterator
 from dataclasses import dataclass, field
-from typing import Any, Callable, Generic, Literal, Union, cast, get_args, get_origin
+from typing import Any, Callable, Generic, Literal, Union, cast
 
 from pydantic import TypeAdapter, ValidationError
-from typing_extensions import TypeAliasType, TypedDict, TypeVar
+from typing_extensions import TypedDict, TypeVar, get_args, get_origin
+from typing_inspection import typing_objects
+from typing_inspection.introspection import is_union_origin
 
 from . import _utils, messages as _messages
 from .exceptions import ModelRetry
@@ -248,23 +248,12 @@ def extract_str_from_union(response_type: Any) -> _utils.Option[Any]:
 
 
 def get_union_args(tp: Any) -> tuple[Any, ...]:
-    """Extract the arguments of a Union type if `response_type` is a union, otherwise return an empty union."""
-    if isinstance(tp, TypeAliasType):
+    """Extract the arguments of a Union type if `response_type` is a union, otherwise return an empty tuple."""
+    if typing_objects.is_typealiastype(tp):
         tp = tp.__value__
 
     origin = get_origin(tp)
-    if origin_is_union(origin):
+    if is_union_origin(origin):
         return get_args(tp)
     else:
         return ()
-
-
-if sys.version_info < (3, 10):
-
-    def origin_is_union(tp: type[Any] | None) -> bool:
-        return tp is Union
-
-else:
-
-    def origin_is_union(tp: type[Any] | None) -> bool:
-        return tp is Union or tp is types.UnionType

pydantic_ai_slim/pyproject.toml

@@ -39,6 +39,7 @@ dependencies = [
     "pydantic-graph==0.0.32",
     "exceptiongroup; python_version < '3.11'",
     "opentelemetry-api>=1.28.0",
+    "typing-inspection>=0.4.0",
 ]
 
 [project.optional-dependencies]

pydantic_graph/pydantic_graph/_utils.py

@@ -1,12 +1,13 @@
 from __future__ import annotations as _annotations
 
 import asyncio
-import sys
 import types
 from datetime import datetime, timezone
-from typing import Annotated, Any, TypeVar, Union, get_args, get_origin
+from typing import Any, TypeVar
 
-import typing_extensions
+from typing_extensions import TypeIs, get_args, get_origin
+from typing_inspection import typing_objects
+from typing_inspection.introspection import is_union_origin
 
 
 def get_event_loop():
@@ -19,13 +20,13 @@ def get_event_loop():
 
 
 def get_union_args(tp: Any) -> tuple[Any, ...]:
-    """Extract the arguments of a Union type if `response_type` is a union, otherwise return the original type."""
+    """Extract the arguments of a Union type if `response_type` is a union, otherwise return an empty tuple."""
     # similar to `pydantic_ai_slim/pydantic_ai/_result.py:get_union_args`
-    if isinstance(tp, typing_extensions.TypeAliasType):
+    if typing_objects.is_typealiastype(tp):
         tp = tp.__value__
 
     origin = get_origin(tp)
-    if origin_is_union(origin):
+    if is_union_origin(origin):
         return get_args(tp)
     else:
         return (tp,)
@@ -38,35 +39,13 @@ def unpack_annotated(tp: Any) -> tuple[Any, list[Any]]:
         `(tp argument, ())` if not annotated, otherwise `(stripped type, annotations)`.
     """
     origin = get_origin(tp)
-    if origin is Annotated or origin is typing_extensions.Annotated:
+    if typing_objects.is_annotated(origin):
         inner_tp, *args = get_args(tp)
         return inner_tp, args
     else:
         return tp, []
 
 
-def is_never(tp: Any) -> bool:
-    """Check if a type is `Never`."""
-    if tp is typing_extensions.Never:
-        return True
-    elif typing_never := getattr(typing_extensions, 'Never', None):
-        return tp is typing_never
-    else:
-        return False
-
-
-# same as `pydantic_ai_slim/pydantic_ai/_result.py:origin_is_union`
-if sys.version_info < (3, 10):
-
-    def origin_is_union(tp: type[Any] | None) -> bool:
-        return tp is Union
-
-else:
-
-    def origin_is_union(tp: type[Any] | None) -> bool:
-        return tp is Union or tp is types.UnionType
-
-
 def comma_and(items: list[str]) -> str:
     """Join with a comma and 'and' for the last item."""
     if len(items) == 1:
@@ -84,7 +63,11 @@ def get_parent_namespace(frame: types.FrameType | None) -> dict[str, Any] | None
     """
     if frame is not None:
         if back := frame.f_back:
-            if back.f_code.co_filename.endswith('/typing.py'):
+            if back.f_globals.get('__name__') == 'typing':
+                # If the class calling this function is generic, explicitly parameterizing the class
+                # results in a `typing._GenericAlias` instance, which proxies instantiation calls to the
+                # "real" class and thus adding an extra frame to the call. To avoid pulling anything
+                # from the `typing` module, use the correct frame (the one before):
                 return get_parent_namespace(back)
             else:
                 return back.f_locals
@@ -107,5 +90,5 @@ class Unset:
 T = TypeVar('T')
 
 
-def is_set(t_or_unset: T | Unset) -> typing_extensions.TypeGuard[T]:
+def is_set(t_or_unset: T | Unset) -> TypeIs[T]:
     return t_or_unset is not UNSET

pydantic_graph/pydantic_graph/graph.py

@@ -13,6 +13,7 @@
 import pydantic
 import typing_extensions
 from logfire_api import LogfireSpan
+from typing_inspection import typing_objects
 
 from . import _utils, exceptions, mermaid
 from .nodes import BaseNode, DepsT, End, GraphRunContext, NodeDef, RunEndT
@@ -505,7 +506,7 @@ def _get_run_end_type(self) -> type[RunEndT]:
                     args = typing_extensions.get_args(base)
                     if len(args) == 3:
                         t = args[2]
-                        if not _utils.is_never(t):
+                        if not typing_objects.is_never(t):
                             return t
                     # break the inner (bases) loop
                     break

pydantic_graph/pydantic_graph/nodes.py

@@ -3,9 +3,9 @@
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, is_dataclass
 from functools import cache
-from typing import TYPE_CHECKING, Any, ClassVar, Generic, get_origin, get_type_hints
+from typing import TYPE_CHECKING, Any, ClassVar, Generic, get_type_hints
 
-from typing_extensions import Never, TypeVar
+from typing_extensions import Never, TypeVar, get_origin
 
 from . import _utils, exceptions
 

pydantic_graph/pyproject.toml

@@ -31,7 +31,12 @@ classifiers = [
     "Topic :: Internet",
 ]
 requires-python = ">=3.9"
-dependencies = ["httpx>=0.27", "logfire-api>=1.2.0", "pydantic>=2.10"]
+dependencies = [
+    "httpx>=0.27",
+    "logfire-api>=1.2.0",
+    "pydantic>=2.10",
+    "typing-inspection>=0.4.0",
+]
 
 [project.urls]
 Homepage = "https://ai.pydantic.dev/graph/tree/main/pydantic_graph"

tests/models/test_model_names.py

@@ -1,7 +1,8 @@
 from collections.abc import Iterator
-from typing import Any, get_args
+from typing import Any
 
 import pytest
+from typing_extensions import get_args
 
 from pydantic_ai.models import KnownModelName