strawberry-graphql 0.183.4__py3-none-any.whl → 0.183.5__py3-none-any.whl

strawberry/types/types.py

@@ -16,7 +16,6 @@ from typing import (
 from typing_extensions import Self
 
 from strawberry.type import StrawberryType, StrawberryTypeVar
-from strawberry.utils.inspect import get_specialized_type_var_map
 from strawberry.utils.typing import is_generic as is_type_generic
 
 if TYPE_CHECKING:
@@ -116,13 +115,7 @@ class TypeDefinition(StrawberryType):
 
     @property
     def is_specialized_generic(self) -> bool:
-        if not self.is_generic:
-            return False
-
-        type_var_map = get_specialized_type_var_map(self.origin, include_type_vars=True)
-        return type_var_map is None or not any(
-            isinstance(arg, TypeVar) for arg in type_var_map.values()
-        )
+        return self.is_generic and not getattr(self.origin, "__parameters__", None)
 
     @property
     def type_params(self) -> List[TypeVar]:

strawberry/utils/inspect.py

@@ -1,8 +1,15 @@
 import asyncio
 import inspect
 from functools import lru_cache
-from typing import Any, Callable, Dict, List, Optional, TypeVar, Union, overload
-from typing_extensions import Literal, get_args
+from typing import (
+    Any,
+    Callable,
+    Dict,
+    List,
+    Optional,
+    TypeVar,
+)
+from typing_extensions import get_args
 
 
 def in_async_context() -> bool:
@@ -29,36 +36,7 @@ def get_func_args(func: Callable[[Any], Any]) -> List[str]:
     ]
 
 
-@overload
-def get_specialized_type_var_map(
-    cls: type,
-    *,
-    include_type_vars: Literal[True],
-) -> Optional[Dict[TypeVar, Union[TypeVar, type]]]:
-    ...
-
-
-@overload
-def get_specialized_type_var_map(
-    cls: type,
-    *,
-    include_type_vars: Literal[False] = ...,
-) -> Optional[Dict[TypeVar, type]]:
-    ...
-
-
-@overload
-def get_specialized_type_var_map(
-    cls: type,
-    *,
-    include_type_vars: bool,
-) -> Optional[
-    Union[Optional[Dict[TypeVar, type]], Dict[TypeVar, Union[TypeVar, type]]]
-]:
-    ...
-
-
-def get_specialized_type_var_map(cls: type, *, include_type_vars: bool = False):
+def get_specialized_type_var_map(cls: type) -> Optional[Dict[TypeVar, type]]:
     """Get a type var map for specialized types.
 
     Consider the following:
@@ -85,8 +63,6 @@ def get_specialized_type_var_map(cls: type, *, include_type_vars: bool = False):
         None
         >>> get_specialized_type_var_map(Foo)
         {}
-        >>> get_specialized_type_var_map(Foo, include_type_vars=True)
-        {~T: ~T}
         >>> get_specialized_type_var_map(Bar)
         {~T: ~T}
         >>> get_specialized_type_var_map(IntBar)
@@ -104,6 +80,10 @@ def get_specialized_type_var_map(cls: type, *, include_type_vars: bool = False):
 
     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 hasattr(b, "_type_definition")]
+
     for base in orig_bases:
         # Recursively get type var map from base classes
         base_type_var_map = get_specialized_type_var_map(base)
@@ -121,11 +101,7 @@ def get_specialized_type_var_map(cls: type, *, include_type_vars: bool = False):
             continue
 
         type_var_map.update(
-            {
-                p: a
-                for p, a in zip(params, args)
-                if include_type_vars or not isinstance(a, TypeVar)
-            }
+            {p: a for p, a in zip(params, args) if not isinstance(a, TypeVar)}
         )
 
     return type_var_map

{strawberry_graphql-0.183.4.dist-info → strawberry_graphql-0.183.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strawberry-graphql
-Version: 0.183.4
+Version: 0.183.5
 Summary: A library for creating GraphQL APIs
 Home-page: https://strawberry.rocks/
 License: MIT

{strawberry_graphql-0.183.4.dist-info → strawberry_graphql-0.183.5.dist-info}/RECORD

@@ -206,7 +206,7 @@ strawberry/types/graphql.py,sha256=3SWZEsa0Zy1eVW6vy75BnB7t9_lJVi6TBV3_1j3RNBs,6
 strawberry/types/info.py,sha256=-ZppOgyEWdUYtkRpUVVn9SJGVsMNtR6gaChk8V3DmIg,2754
 strawberry/types/nodes.py,sha256=2ZVa1HOFgHZ96QTfz3QEr1fufi6Sz9hAzcZxsN7KtGE,5026
 strawberry/types/type_resolver.py,sha256=bktpUGS8VOF01tx3IwSbmjgXmKR3tREc8qhdIDGaHAA,7306
-strawberry/types/types.py,sha256=qy95nwoso5TncX_mo4PXuQzUH2Ej7b3PQ_kpBRrVNIQ,6011
+strawberry/types/types.py,sha256=_9aHLBLZRZLwRMuT6DCFW3KlxO2AjmRU6jrYdkyt8-I,5754
 strawberry/union.py,sha256=Ne2Q8UHxxdmFC4GgnfSMHh_mEDi9Lq5XcU7hqtCZ2X4,9360
 strawberry/unset.py,sha256=_180_Wxvw-umn-URMb3CmO-WegBfZHjVZW0L0RXrQrI,1097
 strawberry/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -218,13 +218,13 @@ strawberry/utils/debug.py,sha256=-MtRqM5e1J-GDNgKQXoVFcBB9f3dHvhEGrTc82uN4LM,137
 strawberry/utils/graphiql.py,sha256=-l6j5YyFzKMNLeDuNqD_tBl-b2ulvj8ZgMNU1eqEwJE,437
 strawberry/utils/graphql_lexer.py,sha256=U1mTE5fWy0gcF5fITiZzLWftCpo_C3xOi4BpQxasP3M,1085
 strawberry/utils/importer.py,sha256=hzTiWCeL9ju6opXTU_kjGpatbUy3UUTW8O1Y5hNA_W8,592
-strawberry/utils/inspect.py,sha256=wax9UsOwBrVX0KZad61VOiqsyKgBrODWTAldxE_5woM,3307
+strawberry/utils/inspect.py,sha256=1RyhShhzJ2YuC0tyaTRtpwHx0toiedq1SPWhM1gG9PQ,2775
 strawberry/utils/logging.py,sha256=pz1pRJtx5xX2ejGKNN-fG8zPA4SJjnq1HK9xaQpjd4s,1106
 strawberry/utils/operation.py,sha256=Um-tBCPl3_bVFN2Ph7o1mnrxfxBes4HFCj6T0x4kZxE,1135
 strawberry/utils/str_converters.py,sha256=VdOnzaxhwJnmQl1Lon0VOjl72uXhM8tLfGxoGwn3arI,657
 strawberry/utils/typing.py,sha256=MpKjtblkpDBCbjS-yeNSxnOo594_2FLHBOdXiYlAjLM,12716
-strawberry_graphql-0.183.4.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.183.4.dist-info/METADATA,sha256=wKAsyfxwdo9U3murKB1PeRmNJRIhWkdqjjHNGF-TM9c,7644
-strawberry_graphql-0.183.4.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-strawberry_graphql-0.183.4.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.183.4.dist-info/RECORD,,
+strawberry_graphql-0.183.5.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.183.5.dist-info/METADATA,sha256=1674sEwb-L-qyjJ-OplJbTHwbnfu9GKCogMaz4iOe5w,7644
+strawberry_graphql-0.183.5.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+strawberry_graphql-0.183.5.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.183.5.dist-info/RECORD,,