strawberry-graphql 0.193.1__py3-none-any.whl → 0.194.1__py3-none-any.whl

strawberry/annotation.py

@@ -52,7 +52,7 @@ ASYNC_TYPES = (
 
 
 class StrawberryAnnotation:
-    __slots__ = "annotation", "namespace", "__eval_cache__"
+    __slots__ = "raw_annotation", "namespace", "__eval_cache__"
 
     def __init__(
         self,
@@ -60,7 +60,7 @@ class StrawberryAnnotation:
         *,
         namespace: Optional[Dict[str, Any]] = None,
     ):
-        self.annotation = annotation
+        self.raw_annotation = annotation
         self.namespace = namespace
 
         self.__eval_cache__: Optional[Type[Any]] = None
@@ -85,13 +85,27 @@ class StrawberryAnnotation:
             return StrawberryAnnotation(annotation, namespace=namespace)
         return annotation
 
+    @property
+    def annotation(self) -> Union[object, str]:
+        """Return evaluated type on success or fallback to raw (string) annotation."""
+        try:
+            return self.evaluate()
+        except NameError:
+            # Evaluation failures can happen when importing types within a TYPE_CHECKING
+            # block or if the type is declared later on in a module.
+            return self.raw_annotation
+
+    @annotation.setter
+    def annotation(self, value: Union[object, str]) -> None:
+        self.raw_annotation = value
+
     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.annotation
+        annotation = self.raw_annotation
         if isinstance(annotation, str):
             annotation = ForwardRef(annotation)
 

strawberry/arguments.py

@@ -89,15 +89,11 @@ class StrawberryArgument:
             _deprecated_UNSET if default is inspect.Parameter.empty else default
         )
 
-        try:
-            evaled_type = type_annotation.evaluate()
-        except NameError:
-            # Evaluation failures can happen when importing types within a TYPE_CHECKING
-            # block or if the type is declared later on in the current module.
-            pass
-        else:
-            if get_origin(evaled_type) is Annotated:
-                first, *rest = get_args(evaled_type)
+        annotation = type_annotation.annotation
+        if not isinstance(annotation, str):
+            resolved_annotation = annotation
+            if get_origin(resolved_annotation) is Annotated:
+                first, *rest = get_args(resolved_annotation)
 
                 # The first argument to Annotated is always the underlying type
                 self.type_annotation = StrawberryAnnotation(first)

strawberry/auto.py

@@ -39,7 +39,7 @@ class StrawberryAutoMeta(type):
         instance: Union[StrawberryAuto, StrawberryAnnotation, StrawberryType, type],
     ):
         if isinstance(instance, StrawberryAnnotation):
-            resolved = instance.annotation
+            resolved = instance.raw_annotation
             if isinstance(resolved, str):
                 namespace = instance.namespace
                 resolved = namespace and namespace.get(resolved)

{strawberry_graphql-0.193.1.dist-info → strawberry_graphql-0.194.1.dist-info}/METADATA

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

{strawberry_graphql-0.193.1.dist-info → strawberry_graphql-0.194.1.dist-info}/RECORD

@@ -7,15 +7,15 @@ strawberry/aiohttp/handlers/graphql_ws_handler.py,sha256=0wy0IjBapHwlkfMhVk6frgp
 strawberry/aiohttp/test/__init__.py,sha256=4xxdUZtIISSOwjrcnmox7AvT4WWjowCm5bUuPdQneMg,71
 strawberry/aiohttp/test/client.py,sha256=tlpHymSWqhiQbLmKwodcaX2vdc8BW1IaNTFTHlWKlOY,1323
 strawberry/aiohttp/views.py,sha256=l85Dy_-e6-19t5szkWn2NQZAkkqSQ-qT47ZXRDXOyfE,5705
-strawberry/annotation.py,sha256=tKPuPCkaaZu1OPbWmXe8-TpQzXGk4ZmV7aa8X6Fd3rI,11196
-strawberry/arguments.py,sha256=8HmrTQsdvoiTR41Rkzr05xDZpufwjMrHlyxJgB2zdmQ,8369
+strawberry/annotation.py,sha256=U6Iks9S7uYCP4f0GmVRuNpGsbqVmZQesIQLheLLS4tA,11750
+strawberry/arguments.py,sha256=b-jmSwRkC_jDjtJJxD-tO5WnAtuGfhaGgzof0v9QPrE,8231
 strawberry/asgi/__init__.py,sha256=dXiMHkXfsATl_gDklKnmkgv93SFr6TMqflxV5qzsGIw,6629
 strawberry/asgi/handlers/__init__.py,sha256=rz5Gth2eJUn7tDq2--99KSNFeMdDPpLFCkfA7vge0cI,235
 strawberry/asgi/handlers/graphql_transport_ws_handler.py,sha256=czeQetwtgpOliJP81PzUQHjOUa8T8l58nKQsP0NS5ro,2080
 strawberry/asgi/handlers/graphql_ws_handler.py,sha256=lizGZiwvDe0P581UKyAKerqHrd_L-cljeMxJAD1F114,2321
 strawberry/asgi/test/__init__.py,sha256=4xxdUZtIISSOwjrcnmox7AvT4WWjowCm5bUuPdQneMg,71
 strawberry/asgi/test/client.py,sha256=pqxTfWdA8N0Te4pRGxC8TiRcND43LadX-TRo1O_1JJY,1407
-strawberry/auto.py,sha256=IYRHAnDau9lV4bcTwtVwflVbVuNNnLn2QGGF5wGi-3Q,2585
+strawberry/auto.py,sha256=aQixog3ZPFqL_o1YYRhYbURUntoOY0UAGzLxT-Wiwi8,2589
 strawberry/chalice/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/chalice/views.py,sha256=pZhN0xGj2HJrmuP1cP382zripNjRUgzeqJZEZltoGCw,4293
 strawberry/channels/__init__.py,sha256=9oRdAT7uIYETF-23gZ5NteOXSjwkUtwRmwu3YCFv1tw,671
@@ -230,8 +230,8 @@ strawberry/utils/logging.py,sha256=pz1pRJtx5xX2ejGKNN-fG8zPA4SJjnq1HK9xaQpjd4s,1
 strawberry/utils/operation.py,sha256=Um-tBCPl3_bVFN2Ph7o1mnrxfxBes4HFCj6T0x4kZxE,1135
 strawberry/utils/str_converters.py,sha256=VdOnzaxhwJnmQl1Lon0VOjl72uXhM8tLfGxoGwn3arI,657
 strawberry/utils/typing.py,sha256=_PvVDZJrT_iciDvIEwwh4knAog6stKe9sLpxqy00GmI,13182
-strawberry_graphql-0.193.1.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.193.1.dist-info/METADATA,sha256=Co6TFro7lnIBz5KnbNxdwb8Rl5w8-2dABof1iV8jhis,7634
-strawberry_graphql-0.193.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-strawberry_graphql-0.193.1.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.193.1.dist-info/RECORD,,
+strawberry_graphql-0.194.1.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.194.1.dist-info/METADATA,sha256=ilk-2D0FZdhhvL0PjHAuKhusIdGZVVB_sE8rkGkXoCQ,7634
+strawberry_graphql-0.194.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+strawberry_graphql-0.194.1.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.194.1.dist-info/RECORD,,