strawberry-graphql 0.266.1__tar.gz → 0.267.0__tar.gz

{strawberry_graphql-0.266.1 → strawberry_graphql-0.267.0}/PKG-INFO

@@ -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 → strawberry_graphql-0.267.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "strawberry-graphql"
 packages = [ { include = "strawberry" } ]
-version = "0.266.1"
+version = "0.267.0"
 description = "A library for creating GraphQL APIs"
 authors = ["Patrick Arminio <patrick.arminio@gmail.com>"]
 license = "MIT"

{strawberry_graphql-0.266.1 → strawberry_graphql-0.267.0}/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_graphql-0.266.1 → strawberry_graphql-0.267.0}/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_graphql-0.266.1 → strawberry_graphql-0.267.0}/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