strawberry-graphql 0.235.0__py3-none-any.whl → 0.235.1.dev1719337273__py3-none-any.whl

strawberry/annotation.py

@@ -54,7 +54,7 @@ ASYNC_TYPES = (
 
 
 class StrawberryAnnotation:
-    __slots__ = "raw_annotation", "namespace", "__eval_cache__"
+    __slots__ = "raw_annotation", "namespace", "__resolve_cache__"
 
     def __init__(
         self,
@@ -65,7 +65,7 @@ class StrawberryAnnotation:
         self.raw_annotation = annotation
         self.namespace = namespace
 
-        self.__eval_cache__: Optional[Type[Any]] = None
+        self.__resolve_cache__: Optional[Union[StrawberryType, type]] = None
 
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, StrawberryAnnotation):
@@ -101,19 +101,17 @@ class StrawberryAnnotation:
     def annotation(self, value: Union[object, str]) -> None:
         self.raw_annotation = value
 
+        self.__resolve_cache__ = None
+
     def evaluate(self) -> type:
         """Return evaluated annotation using `strawberry.util.typing.eval_type`."""
-        evaled_type = self.__eval_cache__
-        if evaled_type:
-            return evaled_type
-
         annotation = self.raw_annotation
+
         if isinstance(annotation, str):
             annotation = ForwardRef(annotation)
 
         evaled_type = eval_type(annotation, self.namespace, None)
 
-        self.__eval_cache__ = evaled_type
         return evaled_type
 
     def _get_type_with_args(
@@ -131,6 +129,15 @@ class StrawberryAnnotation:
 
     def resolve(self) -> Union[StrawberryType, type]:
         """Return resolved (transformed) annotation."""
+        if self.__resolve_cache__ is None:
+            self.__resolve_cache__ = self._resolve()
+
+        return self.__resolve_cache__
+
+    def _resolve(self) -> Union[StrawberryType, type]:
+        # TODO: I wonder if this resolve should be creating types?
+        # types should only be created once, in the schema converter maybe?
+        # but maybe the cache above is fine
         evaled_type = cast(Any, self.evaluate())
 
         if is_private(evaled_type):
@@ -172,7 +179,7 @@ class StrawberryAnnotation:
         module = sys.modules[field.origin.__module__]
         self.namespace = module.__dict__
 
-        self.__eval_cache__ = None  # Invalidate cache to allow re-evaluation
+        self.__resolve_cache__ = None  # Invalidate cache to allow re-evaluation
 
     def create_concrete_type(self, evaled_type: type) -> type:
         if has_object_definition(evaled_type):

strawberry/arguments.py

@@ -129,7 +129,6 @@ class StrawberryArgument:
 
     @property
     def is_graphql_generic(self) -> bool:
-        # TODO: double check this
         from strawberry.schema.compat import is_graphql_generic
 
         return is_graphql_generic(self.type)

{strawberry_graphql-0.235.0.dist-info → strawberry_graphql-0.235.1.dev1719337273.dist-info}/METADATA

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

{strawberry_graphql-0.235.0.dist-info → strawberry_graphql-0.235.1.dev1719337273.dist-info}/RECORD

@@ -7,8 +7,8 @@ strawberry/aiohttp/handlers/graphql_ws_handler.py,sha256=Zi1y_XLsZwqX52vvy0Se3S0
 strawberry/aiohttp/test/__init__.py,sha256=4xxdUZtIISSOwjrcnmox7AvT4WWjowCm5bUuPdQneMg,71
 strawberry/aiohttp/test/client.py,sha256=tlpHymSWqhiQbLmKwodcaX2vdc8BW1IaNTFTHlWKlOY,1323
 strawberry/aiohttp/views.py,sha256=l5Gb_9twQo1TQuWk7v0dGFry0yM1ivnGztUtwQ_N5-c,6063
-strawberry/annotation.py,sha256=YYWKjDUxgwFLuTtHYjrCZTub0R4knUngidDauXovDg8,12887
-strawberry/arguments.py,sha256=bIfpFN2kcs4cjmeI8UPV1Xxzm5bb4jmbggejOyouulw,8440
+strawberry/annotation.py,sha256=BH2zt675Gxh4h8GEoewUMLh26WdvT1Xw8UVqkKG5vKM,13192
+strawberry/arguments.py,sha256=yFbL1o9vFemrJSVGadt80wN_ajU1khw2--S0nDjrx78,8406
 strawberry/asgi/__init__.py,sha256=9s_6505Aa68y_qAgzQV3yXE0IrGVZbuhQ7rIUNPXOlE,6985
 strawberry/asgi/handlers/__init__.py,sha256=rz5Gth2eJUn7tDq2--99KSNFeMdDPpLFCkfA7vge0cI,235
 strawberry/asgi/handlers/graphql_transport_ws_handler.py,sha256=obBZ1bQ1R9eZL1_Xcr5eKQObjSPB0FFLtMFj9EAmFc0,2105
@@ -245,8 +245,8 @@ strawberry/utils/logging.py,sha256=flS7hV0JiIOEdXcrIjda4WyIWix86cpHHFNJL8gl1y4,7
 strawberry/utils/operation.py,sha256=Um-tBCPl3_bVFN2Ph7o1mnrxfxBes4HFCj6T0x4kZxE,1135
 strawberry/utils/str_converters.py,sha256=avIgPVLg98vZH9mA2lhzVdyyjqzLsK2NdBw9mJQ02Xk,813
 strawberry/utils/typing.py,sha256=G92wuT2WhEGQrwjek_On2K8l0nyVFtBW3P7I_cfjG-8,13870
-strawberry_graphql-0.235.0.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.235.0.dist-info/METADATA,sha256=pbG-KszzQKU30_gF1B2tUWz0f9OCMXLoXdlhsiUr-bM,7821
-strawberry_graphql-0.235.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-strawberry_graphql-0.235.0.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.235.0.dist-info/RECORD,,
+strawberry_graphql-0.235.1.dev1719337273.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.235.1.dev1719337273.dist-info/METADATA,sha256=kPR0Nr5aSHyjpqDjvPEEdt6HXhEID7cpL8CsrxjtVyk,7835
+strawberry_graphql-0.235.1.dev1719337273.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+strawberry_graphql-0.235.1.dev1719337273.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.235.1.dev1719337273.dist-info/RECORD,,