strawberry-graphql 0.266.1__py3-none-any.whl → 0.267.0__py3-none-any.whl

strawberry/parent.py

@@ -1,4 +1,7 @@
-from typing import Annotated, TypeVar
+import re
+from typing import Annotated, Any, ForwardRef, TypeVar
+
+_parent_re = re.compile(r"^(?:strawberry\.)?Parent\[(.*)\]$")
 
 
 class StrawberryParent: ...
@@ -40,4 +43,20 @@ class Query:
 ```
 """
 
-__all__ = ["Parent"]
+
+def resolve_parent_forward_arg(annotation: Any) -> Any:
+    if isinstance(annotation, str):
+        str_annotation = annotation
+    elif isinstance(annotation, ForwardRef):
+        str_annotation = annotation.__forward_arg__
+    else:
+        # If neither, return the annotation as is
+        return annotation
+
+    if parent_match := _parent_re.match(str_annotation):
+        annotation = Parent[ForwardRef(parent_match.group(1))]  # type: ignore[misc]
+
+    return annotation
+
+
+__all__ = ["Parent", "StrawberryParent", "resolve_parent_forward_arg"]

strawberry/types/fields/resolver.py

@@ -25,7 +25,7 @@ from strawberry.exceptions import (
     ConflictingArgumentsError,
     MissingArgumentsAnnotationsError,
 )
-from strawberry.parent import StrawberryParent
+from strawberry.parent import StrawberryParent, resolve_parent_forward_arg
 from strawberry.types.arguments import StrawberryArgument
 from strawberry.types.base import StrawberryType, has_object_definition
 from strawberry.types.info import Info
@@ -118,10 +118,17 @@ class ReservedType(NamedTuple):
                 try:
                     evaled_annotation = annotation.evaluate()
                 except NameError:
-                    continue
-                else:
-                    if self.is_reserved_type(evaled_annotation):
-                        type_parameters.append(parameter)
+                    # If this is a strawberry.Parent using ForwardRef, we will fail to
+                    # evaluate at this moment, but at least knowing that it is a reserved
+                    # type is enough for now
+                    # We might want to revisit this in the future, maybe by postponing
+                    # this check to when the schema is actually being created
+                    evaled_annotation = resolve_parent_forward_arg(
+                        annotation.annotation
+                    )
+
+                if self.is_reserved_type(evaled_annotation):
+                    type_parameters.append(parameter)
 
         if len(type_parameters) > 1:
             raise ConflictingArgumentsError(

strawberry/utils/typing.py

@@ -304,11 +304,13 @@ def eval_type(
     localns: Optional[dict] = None,
 ) -> type:
     """Evaluates a type, resolving forward references."""
+    from strawberry.parent import StrawberryParent
     from strawberry.types.auto import StrawberryAuto
     from strawberry.types.lazy_type import StrawberryLazyReference
     from strawberry.types.private import StrawberryPrivate
 
     globalns = globalns or {}
+
     # If this is not a string, maybe its args are (e.g. list["Foo"])
     if isinstance(type_, ForwardRef):
         ast_obj = cast("ast.Expr", ast.parse(type_.__forward_arg__).body[0])
@@ -355,6 +357,7 @@ def eval_type(
                     )
                     args = (type_arg, *remaining_args)
                     break
+
                 if isinstance(arg, StrawberryAuto):
                     remaining_args = [
                         a for a in args[1:] if not isinstance(a, StrawberryAuto)
@@ -362,6 +365,21 @@ def eval_type(
                     args = (args[0], arg, *remaining_args)
                     break
 
+                if isinstance(arg, StrawberryParent):
+                    remaining_args = [
+                        a for a in args[1:] if not isinstance(a, StrawberryParent)
+                    ]
+                    try:
+                        type_arg = (
+                            eval_type(args[0], globalns, localns)
+                            if isinstance(args[0], ForwardRef)
+                            else args[0]
+                        )
+                    except (NameError, TypeError):
+                        type_arg = args[0]
+                    args = (type_arg, arg, *remaining_args)
+                    break
+
             # If we have only a StrawberryLazyReference and no more annotations,
             # we need to return the argument directly because Annotated
             # will raise an error if trying to instantiate it with only

{strawberry_graphql-0.266.1.dist-info → strawberry_graphql-0.267.0.dist-info}/METADATA

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

{strawberry_graphql-0.266.1.dist-info → strawberry_graphql-0.267.0.dist-info}/RECORD

@@ -142,7 +142,7 @@ strawberry/http/types.py,sha256=H0wGOdCO-5tNKZM_6cAtNRwZAjoEXnAC5N0Q7b70AtU,398
 strawberry/http/typevars.py,sha256=Uu6NkKe3h7o29ZWwldq6sJy4ioSSeXODTCDRvY2hUpE,489
 strawberry/litestar/__init__.py,sha256=zsXzg-mglCGUVO9iNXLm-yadoDSCK7k-zuyRqyvAh1w,237
 strawberry/litestar/controller.py,sha256=DSbjl7QGCY_TX77EomqDvtH8-ZK6wfhL81IUEFa-JJs,14124
-strawberry/parent.py,sha256=wViSVYl5ADuyy2EGaS98by_iT1ep9xTP2od8NB_EIuw,742
+strawberry/parent.py,sha256=JYFp-HGCgwbH2oB4uLSiIO4cVsoPaxX6lfYmxOKPkSg,1362
 strawberry/permission.py,sha256=dSRJMjSCmTlXfvfC24kCSrAk0txTjYKTJ5ZVU5IW91Y,7537
 strawberry/printer/__init__.py,sha256=DmepjmgtkdF5RxK_7yC6qUyRWn56U-9qeZMbkztYB9w,62
 strawberry/printer/ast_from_value.py,sha256=Tkme60qlykbN2m3dNPNMOe65X-wj6EmcDQwgQv7gUkc,4987
@@ -203,7 +203,7 @@ strawberry/types/enum.py,sha256=IcCz0FLswJtDC_bU8aG1cjreawcqHywAzzVRBZUSAqs,6229
 strawberry/types/execution.py,sha256=Ylc0lH0nyHyQW509mVqBh2sIN5qpf4cJtt8QhVmWGgI,3749
 strawberry/types/field.py,sha256=vxb7JvkHfRmDCYsjhDmVnO2lMbtSOteQm3jQUeSFu6g,21605
 strawberry/types/fields/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-strawberry/types/fields/resolver.py,sha256=iYYVUVpm-JM3AFQHuQFeOooftiQWFw3kg64pqSNIe_0,14186
+strawberry/types/fields/resolver.py,sha256=b6lxfw6AMOUFWm7vs7a9KzNkpR8b_S110DoIosrrWDQ,14679
 strawberry/types/graphql.py,sha256=gXKzawwKiow7hvoJhq5ApNJOMUCnKmvTiHaKY5CK1Lw,867
 strawberry/types/info.py,sha256=bPP7XTQQScmskJcmVv36iqLAWpdGmF2nhYjI1pJ-csI,4709
 strawberry/types/lazy_type.py,sha256=dlP9VcMjZc9sdgriiQGzOZa0TToB6Ee7zpIP8h7TLC0,5079
@@ -228,9 +228,9 @@ strawberry/utils/inspect.py,sha256=-aFT65PkQ9KXo5w8Q2uveBJ8jEpi40sTqRipRQVdYR8,3
 strawberry/utils/logging.py,sha256=U1cseHGquN09YFhFmRkiphfASKCyK0HUZREImPgVb0c,746
 strawberry/utils/operation.py,sha256=s7ajvLg_q6v2mg47kEMQPjO_J-XluMKTCwo4d47mGvE,1195
 strawberry/utils/str_converters.py,sha256=-eH1Cl16IO_wrBlsGM-km4IY0IKsjhjnSNGRGOwQjVM,897
-strawberry/utils/typing.py,sha256=Xmnhwvnw8RIQVIc5D5iI4_9qM4Thpk7tWx8xf-RW_So,13383
-strawberry_graphql-0.266.1.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.266.1.dist-info/METADATA,sha256=_RqVVXjFJ7svPPZ9xGPZHsBg5fjlnPAue2seThG3Tjo,7679
-strawberry_graphql-0.266.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-strawberry_graphql-0.266.1.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.266.1.dist-info/RECORD,,
+strawberry/utils/typing.py,sha256=SDvX-Du-9HAV3-XXjqi7Q5f5qPDDFd_gASIITiwBQT4,14073
+strawberry_graphql-0.267.0.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.267.0.dist-info/METADATA,sha256=U6UycYRIH28R4jOQQO9BfGiciKuLEBUl_Doas8LahO0,7679
+strawberry_graphql-0.267.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+strawberry_graphql-0.267.0.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.267.0.dist-info/RECORD,,