strawberry-graphql 0.259.1__py3-none-any.whl → 0.260.0__py3-none-any.whl

strawberry/utils/inspect.py

@@ -4,13 +4,16 @@ from functools import lru_cache
 from typing import (
     Any,
     Callable,
+    Generic,
     Optional,
+    Protocol,
     TypeVar,
+    Union,
+    get_args,
     get_origin,
 )
-from typing_extensions import get_args
 
-from strawberry.utils.typing import is_generic_alias
+import strawberry
 
 
 def in_async_context() -> bool:
@@ -67,13 +70,13 @@ def get_specialized_type_var_map(cls: type) -> Optional[dict[str, type]]:
     # {}
 
     get_specialized_type_var_map(Bar)
-    # {~T: ~T}
+    # {}
 
     get_specialized_type_var_map(IntBar)
-    # {~T: int}
+    # {~T: int, ~K: int}
 
     get_specialized_type_var_map(IntBarSubclass)
-    # {~T: int}
+    # {~T: int, ~K: int}
 
     get_specialized_type_var_map(IntBarFoo)
     # {~T: int, ~K: str}
@@ -81,43 +84,52 @@ def get_specialized_type_var_map(cls: type) -> Optional[dict[str, type]]:
     """
     from strawberry.types.base import has_object_definition
 
-    orig_bases = getattr(cls, "__orig_bases__", None)
-    if orig_bases is None:
-        # Specialized generic aliases will not have __orig_bases__
-        if get_origin(cls) is not None and is_generic_alias(cls):
-            orig_bases = (cls,)
-        else:
-            # Not a specialized type
-            return None
-
-    type_var_map = {}
-
-    # only get type vars for base generics (ie. Generic[T]) and for strawberry types
-
-    orig_bases = [b for b in orig_bases if has_object_definition(b)]
+    param_args: dict[TypeVar, Union[TypeVar, type]] = {}
 
-    for base in orig_bases:
-        # Recursively get type var map from base classes
-        if base is not cls:
-            base_type_var_map = get_specialized_type_var_map(base)
-            if base_type_var_map is not None:
-                type_var_map.update(base_type_var_map)
+    types: list[type] = [cls]
+    while types:
+        tp = types.pop(0)
+        if (origin := get_origin(tp)) is None or origin in (Generic, Protocol):
+            origin = tp
 
-        args = get_args(base)
-        origin = getattr(base, "__origin__", None)
-
-        params = origin and getattr(origin, "__parameters__", None)
-        if params is None:
-            params = getattr(base, "__parameters__", None)
-
-        if not params:
+        # only get type vars for base generics (i.e. Generic[T]) and for strawberry types
+        if not has_object_definition(origin):
             continue
 
-        type_var_map.update(
-            {p.__name__: a for p, a in zip(params, args) if not isinstance(a, TypeVar)}
-        )
-
-    return type_var_map
+        if (type_params := getattr(origin, "__parameters__", None)) is not None:
+            args = get_args(tp)
+            if args:
+                for type_param, arg in zip(type_params, args):
+                    if type_param not in param_args:
+                        param_args[type_param] = arg
+            else:
+                for type_param in type_params:
+                    if type_param not in param_args:
+                        param_args[type_param] = strawberry.UNSET
+
+        if orig_bases := getattr(origin, "__orig_bases__", None):
+            types.extend(orig_bases)
+    if not param_args:
+        return None
+
+    for type_param, arg in list(param_args.items()):
+        resolved_arg = arg
+        while (
+            isinstance(resolved_arg, TypeVar) and resolved_arg is not strawberry.UNSET
+        ):
+            resolved_arg = (
+                param_args.get(resolved_arg, strawberry.UNSET)
+                if resolved_arg is not type_param
+                else strawberry.UNSET
+            )
+
+        param_args[type_param] = resolved_arg
+
+    return {
+        k.__name__: v
+        for k, v in reversed(param_args.items())
+        if v is not strawberry.UNSET and not isinstance(v, TypeVar)
+    }
 
 
 __all__ = ["get_func_args", "get_specialized_type_var_map", "in_async_context"]

{strawberry_graphql-0.259.1.dist-info → strawberry_graphql-0.260.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: strawberry-graphql
-Version: 0.259.1
+Version: 0.260.0
 Summary: A library for creating GraphQL APIs
 License: MIT
 Keywords: graphql,api,rest,starlette,async

{strawberry_graphql-0.259.1.dist-info → strawberry_graphql-0.260.0.dist-info}/RECORD

@@ -223,13 +223,13 @@ strawberry/utils/debug.py,sha256=eP-wyKSSt7YHHY_lJdSa2hDlrBPd72kDtmGdFZ0Kyyo,144
 strawberry/utils/deprecations.py,sha256=Yrp4xBzp36mQprH8qPHpPMhkCLm527q7XU7pP4aar_0,782
 strawberry/utils/graphql_lexer.py,sha256=JUVJrJ6Ax0t7m6-DTWFzf4cvXrC02VPmL1NS2zMEMbY,1255
 strawberry/utils/importer.py,sha256=NtTgNaNSW4TnlLo_S34nxXq14RxUAec-QlEZ0LON28M,629
-strawberry/utils/inspect.py,sha256=Pkyl7SQPdo6-tfZk42nzqffjg1RCosgmQJVcDGvUOhI,3010
+strawberry/utils/inspect.py,sha256=-aFT65PkQ9KXo5w8Q2uveBJ8jEpi40sTqRipRQVdYR8,3406
 strawberry/utils/logging.py,sha256=U1cseHGquN09YFhFmRkiphfASKCyK0HUZREImPgVb0c,746
 strawberry/utils/operation.py,sha256=SSXxN-vMqdHO6W2OZtip-1z7y4_A-eTVFdhDvhKeLCk,1193
 strawberry/utils/str_converters.py,sha256=-eH1Cl16IO_wrBlsGM-km4IY0IKsjhjnSNGRGOwQjVM,897
 strawberry/utils/typing.py,sha256=Ux0Hl46lhuXvOKK-C5hj6nlz3zDn8P4CUGH2nUVD2vU,13373
-strawberry_graphql-0.259.1.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.259.1.dist-info/METADATA,sha256=KuCcwxcDNqNi0f5yvUL1AmTfpupYqJnXTHk8r-1zxco,7539
-strawberry_graphql-0.259.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-strawberry_graphql-0.259.1.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.259.1.dist-info/RECORD,,
+strawberry_graphql-0.260.0.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.260.0.dist-info/METADATA,sha256=YXvVSrWaUwwRiAhSjY0TYToBMFkQltM4_rkL8BZQDmE,7539
+strawberry_graphql-0.260.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+strawberry_graphql-0.260.0.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.260.0.dist-info/RECORD,,