strawberry-graphql 0.268.2__tar.gz → 0.269.0__tar.gz

{strawberry_graphql-0.268.2 → strawberry_graphql-0.269.0}/PKG-INFO

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

{strawberry_graphql-0.268.2 → strawberry_graphql-0.269.0}/pyproject.toml

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

{strawberry_graphql-0.268.2 → strawberry_graphql-0.269.0}/strawberry/http/__init__.py

@@ -32,6 +32,7 @@ class GraphQLRequestData:
     query: Optional[str]
     variables: Optional[dict[str, Any]]
     operation_name: Optional[str]
+    extensions: Optional[dict[str, Any]]
     protocol: Literal["http", "multipart-subscription"] = "http"
 
 

{strawberry_graphql-0.268.2 → strawberry_graphql-0.269.0}/strawberry/http/async_base_view.py

@@ -204,6 +204,7 @@ class AsyncBaseHTTPView(
                 context_value=context,
                 root_value=root_value,
                 operation_name=request_data.operation_name,
+                operation_extensions=request_data.extensions,
             )
 
         return await self.schema.execute(
@@ -213,6 +214,7 @@ class AsyncBaseHTTPView(
             context_value=context,
             operation_name=request_data.operation_name,
             allowed_operation_types=allowed_operation_types,
+            operation_extensions=request_data.extensions,
         )
 
     async def parse_multipart(self, request: AsyncHTTPRequestAdapter) -> dict[str, str]:
@@ -472,6 +474,7 @@ class AsyncBaseHTTPView(
             query=data.get("query"),
             variables=data.get("variables"),
             operation_name=data.get("operationName"),
+            extensions=data.get("extensions"),
             protocol=protocol,
         )
 

{strawberry_graphql-0.268.2 → strawberry_graphql-0.269.0}/strawberry/http/base.py

@@ -59,6 +59,12 @@ class BaseView(Generic[Request]):
             if variables:
                 params["variables"] = self.parse_json(variables)
 
+        if "extensions" in params:
+            extensions = params["extensions"]
+
+            if extensions:
+                params["extensions"] = self.parse_json(extensions)
+
         return params
 
     @property

{strawberry_graphql-0.268.2 → strawberry_graphql-0.269.0}/strawberry/http/sync_base_view.py

@@ -122,6 +122,7 @@ class SyncBaseHTTPView(
             context_value=context,
             operation_name=request_data.operation_name,
             allowed_operation_types=allowed_operation_types,
+            operation_extensions=request_data.extensions,
         )
 
     def parse_multipart(self, request: SyncHTTPRequestAdapter) -> dict[str, str]:
@@ -154,6 +155,7 @@ class SyncBaseHTTPView(
             query=data.get("query"),
             variables=data.get("variables"),
             operation_name=data.get("operationName"),
+            extensions=data.get("extensions"),
         )
 
     def _handle_errors(

{strawberry_graphql-0.268.2 → strawberry_graphql-0.269.0}/strawberry/schema/base.py

@@ -47,6 +47,7 @@ class BaseSchema(Protocol):
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
         allowed_operation_types: Optional[Iterable[OperationType]] = None,
+        operation_extensions: Optional[dict[str, Any]] = None,
     ) -> ExecutionResult:
         raise NotImplementedError
 
@@ -59,6 +60,7 @@ class BaseSchema(Protocol):
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
         allowed_operation_types: Optional[Iterable[OperationType]] = None,
+        operation_extensions: Optional[dict[str, Any]] = None,
     ) -> ExecutionResult:
         raise NotImplementedError
 
@@ -70,6 +72,7 @@ class BaseSchema(Protocol):
         context_value: Optional[Any] = None,
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
+        operation_extensions: Optional[dict[str, Any]] = None,
     ) -> SubscriptionResult:
         raise NotImplementedError
 

{strawberry_graphql-0.268.2 → strawberry_graphql-0.269.0}/strawberry/schema/schema.py

@@ -9,27 +9,33 @@ from typing import (
     TYPE_CHECKING,
     Any,
     Callable,
+    NamedTuple,
     Optional,
     Union,
     cast,
 )
 
+from graphql import ExecutionContext as GraphQLExecutionContext
 from graphql import ExecutionResult as GraphQLExecutionResult
 from graphql import (
     ExecutionResult as OriginalExecutionResult,
 )
 from graphql import (
+    FieldNode,
+    FragmentDefinitionNode,
     GraphQLBoolean,
     GraphQLError,
     GraphQLField,
     GraphQLNamedType,
     GraphQLNonNull,
+    GraphQLObjectType,
+    GraphQLOutputType,
     GraphQLSchema,
+    OperationDefinitionNode,
     get_introspection_query,
     parse,
     validate_schema,
 )
-from graphql.execution import ExecutionContext as GraphQLExecutionContext
 from graphql.execution import execute, subscribe
 from graphql.execution.middleware import MiddlewareManager
 from graphql.type.directives import specified_directives
@@ -58,7 +64,7 @@ from strawberry.types.execution import (
     PreExecutionError,
 )
 from strawberry.types.graphql import OperationType
-from strawberry.utils import IS_GQL_32
+from strawberry.utils import IS_GQL_32, IS_GQL_33
 from strawberry.utils.aio import aclosing
 from strawberry.utils.await_maybe import await_maybe
 
@@ -71,8 +77,10 @@ if TYPE_CHECKING:
     from collections.abc import Iterable, Mapping
     from typing_extensions import TypeAlias
 
-    from graphql import ExecutionContext as GraphQLExecutionContext
+    from graphql.execution.collect_fields import FieldGroup  # type: ignore
     from graphql.language import DocumentNode
+    from graphql.pyutils import Path
+    from graphql.type import GraphQLResolveInfo
     from graphql.validation import ASTValidationRule
 
     from strawberry.directive import StrawberryDirective
@@ -136,6 +144,62 @@ def _coerce_error(error: Union[GraphQLError, Exception]) -> GraphQLError:
     return GraphQLError(str(error), original_error=error)
 
 
+class _OperationContextAwareGraphQLResolveInfo(NamedTuple):  # pyright: ignore
+    field_name: str
+    field_nodes: list[FieldNode]
+    return_type: GraphQLOutputType
+    parent_type: GraphQLObjectType
+    path: Path
+    schema: GraphQLSchema
+    fragments: dict[str, FragmentDefinitionNode]
+    root_value: Any
+    operation: OperationDefinitionNode
+    variable_values: dict[str, Any]
+    context: Any
+    is_awaitable: Callable[[Any], bool]
+    operation_extensions: dict[str, Any]
+
+
+class StrawberryGraphQLCoreExecutionContext(GraphQLExecutionContext):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        operation_extensions = kwargs.pop("operation_extensions", None)
+
+        super().__init__(*args, **kwargs)
+
+        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:
+            return _OperationContextAwareGraphQLResolveInfo(  # type: ignore
+                field_group.fields[0].node.name.value,
+                field_group.to_nodes(),
+                field_def.type,
+                parent_type,
+                path,
+                self.schema,
+                self.fragments,
+                self.root_value,
+                self.operation,
+                self.variable_values,
+                self.context_value,
+                self.is_awaitable,
+                self.operation_extensions,
+            )
+
+        return super().build_resolve_info(
+            field_def,
+            field_group,
+            parent_type,
+            path,
+        )
+
+
 class Schema(BaseSchema):
     def __init__(
         self,
@@ -195,7 +259,9 @@ class Schema(BaseSchema):
 
         self.extensions = extensions
         self._cached_middleware_manager: MiddlewareManager | None = None
-        self.execution_context_class = execution_context_class
+        self.execution_context_class = (
+            execution_context_class or StrawberryGraphQLCoreExecutionContext
+        )
         self.config = config or StrawberryConfig()
 
         self.schema_converter = GraphQLCoreConverter(
@@ -320,6 +386,14 @@ class Schema(BaseSchema):
             extensions=extensions,
         )
 
+    def _get_custom_context_kwargs(
+        self, operation_extensions: Optional[dict[str, Any]] = None
+    ) -> dict[str, Any]:
+        if not IS_GQL_33:
+            return {}
+
+        return {"operation_extensions": operation_extensions}
+
     def _get_middleware_manager(
         self, extensions: list[SchemaExtension]
     ) -> MiddlewareManager:
@@ -463,6 +537,7 @@ class Schema(BaseSchema):
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
         allowed_operation_types: Optional[Iterable[OperationType]] = None,
+        operation_extensions: Optional[dict[str, Any]] = None,
     ) -> ExecutionResult:
         if allowed_operation_types is None:
             allowed_operation_types = DEFAULT_ALLOWED_OPERATION_TYPES
@@ -483,6 +558,8 @@ class Schema(BaseSchema):
         extensions_runner = self.create_extensions_runner(execution_context, extensions)
         middleware_manager = self._get_middleware_manager(extensions)
 
+        custom_context_kwargs = self._get_custom_context_kwargs(operation_extensions)
+
         try:
             async with extensions_runner.operation():
                 # Note: In graphql-core the schema would be validated here but in
@@ -510,6 +587,7 @@ class Schema(BaseSchema):
                                 operation_name=execution_context.operation_name,
                                 context_value=execution_context.context,
                                 execution_context_class=self.execution_context_class,
+                                **custom_context_kwargs,
                             )
                         )
                         execution_context.result = result
@@ -547,6 +625,7 @@ class Schema(BaseSchema):
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
         allowed_operation_types: Optional[Iterable[OperationType]] = None,
+        operation_extensions: Optional[dict[str, Any]] = None,
     ) -> ExecutionResult:
         if allowed_operation_types is None:
             allowed_operation_types = DEFAULT_ALLOWED_OPERATION_TYPES
@@ -567,6 +646,8 @@ class Schema(BaseSchema):
         extensions_runner = self.create_extensions_runner(execution_context, extensions)
         middleware_manager = self._get_middleware_manager(extensions)
 
+        custom_context_kwargs = self._get_custom_context_kwargs(operation_extensions)
+
         try:
             with extensions_runner.operation():
                 # Note: In graphql-core the schema would be validated here but in
@@ -617,6 +698,7 @@ class Schema(BaseSchema):
                             operation_name=execution_context.operation_name,
                             context_value=execution_context.context,
                             execution_context_class=self.execution_context_class,
+                            **custom_context_kwargs,
                         )
 
                         if isawaitable(result):
@@ -661,6 +743,7 @@ class Schema(BaseSchema):
         extensions_runner: SchemaExtensionsRunner,
         middleware_manager: MiddlewareManager,
         execution_context_class: type[GraphQLExecutionContext] | None = None,
+        operation_extensions: Optional[dict[str, Any]] = None,
     ) -> AsyncGenerator[ExecutionResult, None]:
         async with extensions_runner.operation():
             if initial_error := await self._parse_and_validate_async(
@@ -679,6 +762,7 @@ class Schema(BaseSchema):
                     gql_33_kwargs = {
                         "middleware": middleware_manager,
                         "execution_context_class": execution_context_class,
+                        "operation_extensions": operation_extensions,
                     }
                     try:
                         # Might not be awaitable for pre-execution errors.
@@ -743,6 +827,7 @@ class Schema(BaseSchema):
         context_value: Optional[Any] = None,
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
+        operation_extensions: Optional[dict[str, Any]] = None,
     ) -> SubscriptionResult:
         execution_context = self._create_execution_context(
             query=query,
@@ -764,6 +849,7 @@ class Schema(BaseSchema):
             ),
             middleware_manager=self._get_middleware_manager(extensions),
             execution_context_class=self.execution_context_class,
+            operation_extensions=operation_extensions,
         )
 
     def _resolve_node_ids(self) -> None:

{strawberry_graphql-0.268.2 → strawberry_graphql-0.269.0}/strawberry/types/info.py

@@ -113,6 +113,11 @@ class Info(Generic[ContextType, RootValueType]):
         """The context passed to the query execution."""
         return self._raw_info.context
 
+    @property
+    def input_extensions(self) -> dict[str, Any]:
+        """The input extensions passed to the query execution."""
+        return self._raw_info.operation_extensions  # type: ignore
+
     @property
     def root_value(self) -> RootValueType:
         """The root value passed to the query execution."""