strawberry-graphql 0.276.0.dev1750672223__tar.gz → 0.276.0.dev1752831589__tar.gz

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/PKG-INFO

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

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "strawberry-graphql"
-version = "0.276.0.dev.1750672223"
+version = "0.276.0.dev.1752831589"
 description = "A library for creating GraphQL APIs"
 authors = [{ name = "Patrick Arminio", email = "patrick.arminio@gmail.com" }]
 license = { text = "MIT" }
@@ -323,6 +323,7 @@ ignore = [
   "Q002",
   "Q003",
   "W191",
+  "PLR0915",
 ]
 
 [tool.ruff.lint.per-file-ignores]

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/strawberry/annotation.py

@@ -145,7 +145,7 @@ class StrawberryAnnotation:
         if self._is_lazy_type(evaled_type):
             return evaled_type
         if self._is_streamable(evaled_type, args):
-            return self.create_list(list[evaled_type])
+            return self.create_list(list[evaled_type])  # type: ignore[valid-type]
         if self._is_list(evaled_type):
             return self.create_list(evaled_type)
         if self._is_maybe(evaled_type):

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/strawberry/experimental/pydantic/object_type.py

@@ -116,7 +116,7 @@ if TYPE_CHECKING:
     )
 
 
-def type(  # noqa: PLR0915
+def type(
     model: builtins.type[PydanticModel],
     *,
     fields: Optional[list[str]] = None,
@@ -129,7 +129,7 @@ def type(  # noqa: PLR0915
     include_computed: bool = False,
     use_pydantic_alias: bool = True,
 ) -> Callable[..., builtins.type[StrawberryTypeFromPydantic[PydanticModel]]]:
-    def wrap(cls: Any) -> builtins.type[StrawberryTypeFromPydantic[PydanticModel]]:  # noqa: PLR0915
+    def wrap(cls: Any) -> builtins.type[StrawberryTypeFromPydantic[PydanticModel]]:
         compat = PydanticCompat.from_model(model)
         model_fields = compat.get_model_fields(model, include_computed=include_computed)
         original_fields_set = set(fields) if fields else set()

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/strawberry/extensions/directives.py

@@ -29,7 +29,9 @@ class DirectivesExtension(SchemaExtension):
     ) -> AwaitableOrValue[Any]:
         value = await await_maybe(_next(root, info, *args, **kwargs))
 
-        for directive in info.field_nodes[0].directives:
+        nodes = list(info.field_nodes)
+
+        for directive in nodes[0].directives:
             if directive.name.value in SPECIFIED_DIRECTIVES:
                 continue
             strawberry_directive, arguments = process_directive(directive, value, info)
@@ -49,7 +51,9 @@ class DirectivesExtensionSync(SchemaExtension):
     ) -> AwaitableOrValue[Any]:
         value = _next(root, info, *args, **kwargs)
 
-        for directive in info.field_nodes[0].directives:
+        nodes = list(info.field_nodes)
+
+        for directive in nodes[0].directives:
             if directive.name.value in SPECIFIED_DIRECTIVES:
                 continue
             strawberry_directive, arguments = process_directive(directive, value, info)

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/strawberry/extensions/mask_errors.py

@@ -1,7 +1,8 @@
 from collections.abc import Iterator
-from typing import Callable
+from typing import Any, Callable
 
 from graphql.error import GraphQLError
+from graphql.execution import ExecutionResult
 
 from strawberry.extensions.base_extension import SchemaExtension
 
@@ -33,18 +34,30 @@ class MaskErrors(SchemaExtension):
             original_error=None,
         )
 
+    # TODO: proper typing
+    def _process_result(self, result: Any) -> None:
+        if not result.errors:
+            return
+
+        processed_errors: list[GraphQLError] = []
+
+        for error in result.errors:
+            if self.should_mask_error(error):
+                processed_errors.append(self.anonymise_error(error))
+            else:
+                processed_errors.append(error)
+
+        result.errors = processed_errors
+
     def on_operation(self) -> Iterator[None]:
         yield
+
         result = self.execution_context.result
-        if result and result.errors:
-            processed_errors: list[GraphQLError] = []
-            for error in result.errors:
-                if self.should_mask_error(error):
-                    processed_errors.append(self.anonymise_error(error))
-                else:
-                    processed_errors.append(error)
-
-            result.errors = processed_errors
+
+        if isinstance(result, ExecutionResult):
+            self._process_result(result)
+        else:
+            self._process_result(result.initial_result)
 
 
 __all__ = ["MaskErrors"]

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/strawberry/http/__init__.py

@@ -14,6 +14,11 @@ class GraphQLHTTPResponse(TypedDict, total=False):
     data: Optional[dict[str, object]]
     errors: Optional[list[object]]
     extensions: Optional[dict[str, object]]
+    hasNext: Optional[bool]
+    completed: Optional[list[Any]]
+    pending: Optional[list[Any]]
+    initial: Optional[list[Any]]
+    incremental: Optional[list[Any]]
 
 
 def process_result(result: ResultType) -> GraphQLHTTPResponse:

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/strawberry/http/async_base_view.py

@@ -201,8 +201,6 @@ class AsyncBaseHTTPView(
         if not self.allow_queries_via_get and request_adapter.method == "GET":
             allowed_operation_types = allowed_operation_types - {OperationType.QUERY}
 
-        assert self.schema
-
         if request_data.protocol == "multipart-subscription":
             return await self.schema.subscribe(
                 request_data.query,  # type: ignore
@@ -266,7 +264,7 @@ class AsyncBaseHTTPView(
         root_value: Optional[RootValue] = UNSET,
     ) -> WebSocketResponse: ...
 
-    async def run(  # noqa: PLR0915
+    async def run(
         self,
         request: Union[Request, WebSocketRequest],
         context: Context = UNSET,
@@ -294,7 +292,7 @@ class AsyncBaseHTTPView(
                     view=self,
                     websocket=websocket,
                     context=context,
-                    root_value=root_value,  # type: ignore
+                    root_value=root_value,
                     schema=self.schema,
                     debug=self.debug,
                     connection_init_wait_timeout=self.connection_init_wait_timeout,
@@ -304,7 +302,7 @@ class AsyncBaseHTTPView(
                     view=self,
                     websocket=websocket,
                     context=context,
-                    root_value=root_value,  # type: ignore
+                    root_value=root_value,
                     schema=self.schema,
                     debug=self.debug,
                     keep_alive=self.keep_alive,
@@ -605,9 +603,23 @@ class AsyncBaseHTTPView(
         else:
             raise HTTPException(400, "Unsupported content type")
 
+        query = data.get("query")
+        if not isinstance(query, (str, type(None))):
+            raise HTTPException(
+                400,
+                "The GraphQL operation's `query` must be a string or null, if provided.",
+            )
+
+        variables = data.get("variables")
+        if not isinstance(variables, (dict, type(None))):
+            raise HTTPException(
+                400,
+                "The GraphQL operation's `variables` must be an object or null, if provided.",
+            )
+
         return GraphQLRequestData(
-            query=data.get("query"),
-            variables=data.get("variables"),
+            query=query,
+            variables=variables,
             operation_name=data.get("operationName"),
             extensions=data.get("extensions"),
             protocol=protocol,

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/strawberry/http/sync_base_view.py

@@ -116,8 +116,6 @@ class SyncBaseHTTPView(
         if not self.allow_queries_via_get and request_adapter.method == "GET":
             allowed_operation_types = allowed_operation_types - {OperationType.QUERY}
 
-        assert self.schema
-
         return self.schema.execute_sync(
             request_data.query,
             root_value=root_value,
@@ -154,9 +152,23 @@ class SyncBaseHTTPView(
         else:
             raise HTTPException(400, "Unsupported content type")
 
+        query = data.get("query")
+        if not isinstance(query, (str, type(None))):
+            raise HTTPException(
+                400,
+                "The GraphQL operation's `query` must be a string or null, if provided.",
+            )
+
+        variables = data.get("variables")
+        if not isinstance(variables, (dict, type(None))):
+            raise HTTPException(
+                400,
+                "The GraphQL operation's `variables` must be an object or null, if provided.",
+            )
+
         return GraphQLRequestData(
-            query=data.get("query"),
-            variables=data.get("variables"),
+            query=query,
+            variables=variables,
             operation_name=data.get("operationName"),
             extensions=data.get("extensions"),
         )

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/strawberry/relay/types.py

@@ -762,7 +762,7 @@ class ListConnection(Connection[NodeType]):
     )
 
     @classmethod
-    def resolve_connection(  # noqa: PLR0915
+    def resolve_connection(
         cls,
         nodes: NodeIterableType[NodeType],
         *,

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/strawberry/schema/_graphql_core.py

@@ -7,11 +7,14 @@ from graphql.execution import execute, subscribe
 from strawberry.types import ExecutionResult
 
 try:
-    from graphql import (
+    from graphql import (  # type: ignore[attr-defined]
         ExperimentalIncrementalExecutionResults as GraphQLIncrementalExecutionResults,
     )
-    from graphql.execution import experimental_execute_incrementally
-    from graphql.type.directives import (
+    from graphql.execution import (  # type: ignore[attr-defined]
+        InitialIncrementalExecutionResult,
+        experimental_execute_incrementally,
+    )
+    from graphql.type.directives import (  # type: ignore[attr-defined]
         GraphQLDeferDirective,
         GraphQLStreamDirective,
     )
@@ -21,10 +24,14 @@ try:
         GraphQLStreamDirective,
     )
 
+    GraphQLExecutionResult = Union[
+        GraphQLExecutionResult, InitialIncrementalExecutionResult
+    ]
+
 except ImportError:
     GraphQLIncrementalExecutionResults = type(None)
 
-    incremental_execution_directives = []
+    incremental_execution_directives = ()  # type: ignore
     experimental_execute_incrementally = None
 
 

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/strawberry/schema/schema.py

@@ -84,7 +84,6 @@ if TYPE_CHECKING:
     from collections.abc import Iterable, Mapping
     from typing_extensions import TypeAlias
 
-    from graphql.execution.collect_fields import FieldGroup  # type: ignore
     from graphql.language import DocumentNode
     from graphql.pyutils import Path
     from graphql.type import GraphQLResolveInfo
@@ -176,17 +175,18 @@ class StrawberryGraphQLCoreExecutionContext(GraphQLExecutionContext):
 
         self.operation_extensions = operation_extensions
 
-    def build_resolve_info(
-        self,
-        field_def: GraphQLField,
-        field_group: FieldGroup,
-        parent_type: GraphQLObjectType,
-        path: Path,
-    ) -> GraphQLResolveInfo:
-        if IS_GQL_33:
+    if IS_GQL_33:
+
+        def build_resolve_info(
+            self,
+            field_def: GraphQLField,
+            field_nodes: list[FieldNode],
+            parent_type: GraphQLObjectType,
+            path: Path,
+        ) -> GraphQLResolveInfo:
             return _OperationContextAwareGraphQLResolveInfo(  # type: ignore
-                field_group.fields[0].node.name.value,
-                field_group.to_nodes(),
+                field_nodes[0].name.value,
+                field_nodes,
                 field_def.type,
                 parent_type,
                 path,
@@ -200,13 +200,6 @@ class StrawberryGraphQLCoreExecutionContext(GraphQLExecutionContext):
                 self.operation_extensions,
             )
 
-        return super().build_resolve_info(
-            field_def,
-            field_group,
-            parent_type,
-            path,
-        )
-
 
 class Schema(BaseSchema):
     def __init__(
@@ -329,7 +322,7 @@ class Schema(BaseSchema):
                 graphql_types.append(graphql_type)
 
         try:
-            directives = specified_directives + tuple(graphql_directives)
+            directives = specified_directives + tuple(graphql_directives)  # type: ignore
 
             if self.config.enable_experimental_incremental_execution:
                 directives = tuple(directives) + tuple(incremental_execution_directives)
@@ -338,7 +331,7 @@ class Schema(BaseSchema):
                 query=query_type,
                 mutation=mutation_type,
                 subscription=subscription_type if subscription else None,
-                directives=directives,
+                directives=directives,  # type: ignore
                 types=graphql_types,
                 extensions={
                     GraphQLCoreConverter.DEFINITION_BACKREF: self,

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/strawberry/subscriptions/protocols/graphql_transport_ws/handlers.py

@@ -53,7 +53,7 @@ class BaseGraphQLTransportWSHandler(Generic[Context, RootValue]):
         view: AsyncBaseHTTPView[Any, Any, Any, Any, Any, Context, RootValue],
         websocket: AsyncWebSocketAdapter,
         context: Context,
-        root_value: RootValue,
+        root_value: Optional[RootValue],
         schema: BaseSchema,
         debug: bool,
         connection_init_wait_timeout: timedelta,

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/strawberry/subscriptions/protocols/graphql_ws/handlers.py

@@ -42,7 +42,7 @@ class BaseGraphQLWSHandler(Generic[Context, RootValue]):
         view: AsyncBaseHTTPView[Any, Any, Any, Any, Any, Context, RootValue],
         websocket: AsyncWebSocketAdapter,
         context: Context,
-        root_value: RootValue,
+        root_value: Optional[RootValue],
         schema: BaseSchema,
         debug: bool,
         keep_alive: bool,

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/strawberry/types/arguments.py

@@ -144,12 +144,52 @@ class StrawberryArgument:
         return isinstance(self.type, StrawberryMaybe)
 
 
+def _is_leaf_type(
+    type_: Union[StrawberryType, type],
+    scalar_registry: Mapping[object, Union[ScalarWrapper, ScalarDefinition]],
+    skip_classes: tuple[type, ...] = (),
+) -> bool:
+    if type_ in skip_classes:
+        return False
+
+    if is_scalar(type_, scalar_registry):
+        return True
+
+    if isinstance(type_, EnumDefinition):
+        return True
+
+    if isinstance(type_, LazyType):
+        return _is_leaf_type(type_.resolve_type(), scalar_registry)
+
+    if hasattr(type_, "_enum_definition"):
+        enum_definition: EnumDefinition = type_._enum_definition
+        return _is_leaf_type(enum_definition, scalar_registry)
+
+    return False
+
+
+def _is_optional_leaf_type(
+    type_: Union[StrawberryType, type],
+    scalar_registry: Mapping[object, Union[ScalarWrapper, ScalarDefinition]],
+    skip_classes: tuple[type, ...] = (),
+) -> bool:
+    if type_ in skip_classes:
+        return False
+
+    if isinstance(type_, StrawberryOptional):
+        return _is_leaf_type(type_.of_type, scalar_registry, skip_classes)
+
+    return False
+
+
 def convert_argument(
     value: object,
     type_: Union[StrawberryType, type],
     scalar_registry: Mapping[object, Union[ScalarWrapper, ScalarDefinition]],
     config: StrawberryConfig,
 ) -> object:
+    from strawberry.relay.types import GlobalID
+
     # TODO: move this somewhere else and make it first class
     if isinstance(type_, StrawberryOptional):
         res = convert_argument(value, type_.of_type, scalar_registry, config)
@@ -164,22 +204,27 @@ def convert_argument(
 
     if isinstance(type_, StrawberryList):
         value_list = cast("Iterable", value)
+
+        if _is_leaf_type(
+            type_.of_type, scalar_registry, skip_classes=(GlobalID,)
+        ) or _is_optional_leaf_type(
+            type_.of_type, scalar_registry, skip_classes=(GlobalID,)
+        ):
+            return value_list
+
+        value_list = cast("Iterable", value)
+
         return [
             convert_argument(x, type_.of_type, scalar_registry, config)
             for x in value_list
         ]
 
-    if is_scalar(type_, scalar_registry):
-        from strawberry.relay.types import GlobalID
-
+    if _is_leaf_type(type_, scalar_registry):
         if type_ is GlobalID:
             return GlobalID.from_id(value)  # type: ignore
 
         return value
 
-    if isinstance(type_, EnumDefinition):
-        return value
-
     if isinstance(type_, LazyType):
         return convert_argument(value, type_.resolve_type(), scalar_registry, config)
 

{strawberry_graphql-0.276.0.dev1750672223 → strawberry_graphql-0.276.0.dev1752831589}/strawberry/types/execution.py

@@ -18,11 +18,11 @@ if TYPE_CHECKING:
     from typing_extensions import NotRequired
 
     from graphql import ASTValidationRule
-    from graphql import ExecutionResult as GraphQLExecutionResult
     from graphql.error.graphql_error import GraphQLError
     from graphql.language import DocumentNode, OperationDefinitionNode
 
     from strawberry.schema import Schema
+    from strawberry.schema._graphql_core import GraphQLExecutionResult
 
     from .graphql import OperationType