strawberry-graphql 0.269.0.dev1746905409__py3-none-any.whl → 0.269.0.dev1747164009__py3-none-any.whl

strawberry/__init__.py

@@ -11,7 +11,6 @@ from .permission import BasePermission
 from .scalars import ID
 from .schema import Schema
 from .schema_directive import schema_directive
-from .streamable import Streamable
 from .types.arguments import argument
 from .types.auto import auto
 from .types.cast import cast
@@ -38,7 +37,6 @@ __all__ = [
     "Private",
     "Schema",
     "Some",
-    "Streamable",
     "argument",
     "asdict",
     "auto",

strawberry/annotation.py

@@ -17,7 +17,6 @@ from typing import (
 )
 from typing_extensions import Self, get_args, get_origin
 
-from strawberry.streamable import StrawberryStreamable
 from strawberry.types.base import (
     StrawberryList,
     StrawberryMaybe,
@@ -144,8 +143,6 @@ 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])
         if self._is_list(evaled_type):
             return self.create_list(evaled_type)
         if type_of := self._get_maybe_type(evaled_type):
@@ -326,10 +323,6 @@ class StrawberryAnnotation:
     def _get_maybe_type(cls, annotation: Any) -> type | None:
         return get_args(annotation)[0] if _annotation_is_maybe(annotation) else None
 
-    @classmethod
-    def _is_streamable(cls, annotation: Any, args: list[Any]) -> bool:
-        return any(isinstance(arg, StrawberryStreamable) for arg in args)
-
     @classmethod
     def _is_strawberry_type(cls, evaled_type: Any) -> bool:
         # Prevent import cycles

strawberry/http/__init__.py

@@ -1,13 +1,11 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import TYPE_CHECKING, Any, Optional
 from typing_extensions import Literal, TypedDict
 
-from strawberry.schema._graphql_core import (
-    GraphQLIncrementalExecutionResults,
-    ResultType,
-)
+if TYPE_CHECKING:
+    from strawberry.types import ExecutionResult
 
 
 class GraphQLHTTPResponse(TypedDict, total=False):
@@ -16,16 +14,13 @@ class GraphQLHTTPResponse(TypedDict, total=False):
     extensions: Optional[dict[str, object]]
 
 
-def process_result(result: ResultType) -> GraphQLHTTPResponse:
-    if isinstance(result, GraphQLIncrementalExecutionResults):
-        return result
+def process_result(result: ExecutionResult) -> GraphQLHTTPResponse:
+    data: GraphQLHTTPResponse = {"data": result.data}
 
-    errors, extensions = result.errors, result.extensions
-    data: GraphQLHTTPResponse = {
-        "data": result.data,
-        **({"errors": [err.formatted for err in errors]} if errors else {}),
-        **({"extensions": extensions} if extensions else {}),
-    }
+    if result.errors:
+        data["errors"] = [err.formatted for err in result.errors]
+    if result.extensions:
+        data["extensions"] = result.extensions
 
     return data
 
@@ -37,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/http/async_base_view.py

@@ -25,9 +25,6 @@ from strawberry.http import (
     process_result,
 )
 from strawberry.http.ides import GraphQL_IDE
-from strawberry.schema._graphql_core import (
-    GraphQLIncrementalExecutionResults,
-)
 from strawberry.schema.base import BaseSchema
 from strawberry.schema.exceptions import InvalidOperationTypeError
 from strawberry.subscriptions import GRAPHQL_TRANSPORT_WS_PROTOCOL, GRAPHQL_WS_PROTOCOL
@@ -207,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(
@@ -216,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]:
@@ -261,7 +260,7 @@ class AsyncBaseHTTPView(
         root_value: Optional[RootValue] = UNSET,
     ) -> WebSocketResponse: ...
 
-    async def run(  # noqa: PLR0915
+    async def run(
         self,
         request: Union[Request, WebSocketRequest],
         context: Optional[Context] = UNSET,
@@ -352,75 +351,6 @@ class AsyncBaseHTTPView(
                     "Content-Type": "multipart/mixed;boundary=graphql;subscriptionSpec=1.0,application/json",
                 },
             )
-        if isinstance(result, GraphQLIncrementalExecutionResults):
-
-            async def stream() -> AsyncGenerator[str, None]:
-                yield "---"
-
-                response = await self.process_result(request, result.initial_result)
-
-                response["hasNext"] = result.initial_result.has_next
-                response["pending"] = [
-                    p.formatted for p in result.initial_result.pending
-                ]
-                response["extensions"] = result.initial_result.extensions
-
-                yield self.encode_multipart_data(response, "-")
-
-                all_pending = result.initial_result.pending
-
-                async for value in result.subsequent_results:
-                    response = {
-                        "hasNext": value.has_next,
-                        "extensions": value.extensions,
-                    }
-
-                    if value.pending:
-                        response["pending"] = [p.formatted for p in value.pending]
-
-                    if value.completed:
-                        response["completed"] = [p.formatted for p in value.completed]
-
-                    if value.incremental:
-                        incremental = []
-
-                        all_pending.extend(value.pending)
-
-                        for incremental_value in value.incremental:
-                            pending_value = next(
-                                (
-                                    v
-                                    for v in all_pending
-                                    if v.id == incremental_value.id
-                                ),
-                                None,
-                            )
-
-                            assert pending_value
-
-                            incremental.append(
-                                {
-                                    **incremental_value.formatted,
-                                    "path": pending_value.path,
-                                    "label": pending_value.label,
-                                }
-                            )
-
-                        response["incremental"] = incremental
-
-                    yield self.encode_multipart_data(response, "-")
-
-                yield "--\r\n"
-
-            return await self.create_streaming_response(
-                request,
-                stream,
-                sub_response,
-                headers={
-                    "Transfer-Encoding": "chunked",
-                    "Content-Type": 'multipart/mixed; boundary="-"',
-                },
-            )
 
         response_data = await self.process_result(request=request, result=result)
 
@@ -432,16 +362,12 @@ class AsyncBaseHTTPView(
         )
 
     def encode_multipart_data(self, data: Any, separator: str) -> str:
-        encoded_data = self.encode_json(data)
-
         return "".join(
             [
-                "\r\n",
-                "Content-Type: application/json; charset=utf-8\r\n",
-                "Content-Length: " + str(len(encoded_data)) + "\r\n",
-                "\r\n",
-                encoded_data,
-                f"\r\n--{separator}",
+                f"\r\n--{separator}\r\n",
+                "Content-Type: application/json\r\n\r\n",
+                self.encode_json(data),
+                "\n",
             ]
         )
 
@@ -548,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/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/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/printer/printer.py

@@ -561,9 +561,9 @@ def print_schema_definition(
 def print_directive(
     directive: GraphQLDirective, *, schema: BaseSchema
 ) -> Optional[str]:
-    strawberry_directive = directive.extensions.get("strawberry-definition")
+    strawberry_directive = directive.extensions["strawberry-definition"]
 
-    if strawberry_directive is None or (
+    if (
         isinstance(strawberry_directive, StrawberrySchemaDirective)
         and not strawberry_directive.print_definition
     ):
@@ -621,14 +621,6 @@ def print_schema(schema: BaseSchema) -> str:
         if (printed_directive := print_directive(directive, schema=schema)) is not None
     ]
 
-    if schema.config.enable_experimental_incremental_execution:
-        directives.append(
-            "directive @defer(if: Boolean, label: String) on FRAGMENT_SPREAD | INLINE_FRAGMENT"
-        )
-        directives.append(
-            "directive @stream(if: Boolean, label: String, initialCount: Int = 0) on FIELD"
-        )
-
     def _name_getter(type_: Any) -> str:
         if hasattr(type_, "name"):
             return type_.name

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/schema/config.py

@@ -17,7 +17,6 @@ class StrawberryConfig:
     relay_use_legacy_global_id: bool = False
     disable_field_suggestions: bool = False
     info_class: type[Info] = Info
-    enable_experimental_incremental_execution: bool = False
 
     def __post_init__(
         self,

strawberry/schema/schema.py

@@ -9,26 +9,34 @@ 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 execute, subscribe
 from graphql.execution.middleware import MiddlewareManager
 from graphql.type.directives import specified_directives
 from graphql.validation import validate
@@ -56,20 +64,11 @@ 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
 
 from . import compat
-from ._graphql_core import (
-    GraphQLExecutionContext,
-    GraphQLIncrementalExecutionResults,
-    ResultType,
-    execute,
-    experimental_execute_incrementally,
-    incremental_execution_directives,
-    subscribe,
-)
 from .base import BaseSchema
 from .config import StrawberryConfig
 from .exceptions import InvalidOperationTypeError
@@ -78,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
@@ -98,7 +99,6 @@ OriginSubscriptionResult = Union[
     AsyncIterator[OriginalExecutionResult],
 ]
 
-
 DEFAULT_ALLOWED_OPERATION_TYPES = {
     OperationType.QUERY,
     OperationType.MUTATION,
@@ -144,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,
@@ -203,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(
@@ -263,16 +321,11 @@ class Schema(BaseSchema):
                 graphql_types.append(graphql_type)
 
         try:
-            directives = specified_directives + tuple(graphql_directives)
-
-            if self.config.enable_experimental_incremental_execution:
-                directives = tuple(directives) + tuple(incremental_execution_directives)
-
             self._schema = GraphQLSchema(
                 query=query_type,
                 mutation=mutation_type,
                 subscription=subscription_type if subscription else None,
-                directives=directives,
+                directives=specified_directives + tuple(graphql_directives),
                 types=graphql_types,
                 extensions={
                     GraphQLCoreConverter.DEFINITION_BACKREF: self,
@@ -333,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:
@@ -450,16 +511,12 @@ class Schema(BaseSchema):
     async def _handle_execution_result(
         self,
         context: ExecutionContext,
-        result: ResultType,
+        result: Union[GraphQLExecutionResult, ExecutionResult],
         extensions_runner: SchemaExtensionsRunner,
         *,
         # TODO: can we remove this somehow, see comment in execute
         skip_process_errors: bool = False,
     ) -> ExecutionResult:
-        # TODO: handle this, also, why do we have both GraphQLExecutionResult and ExecutionResult?
-        if isinstance(result, GraphQLIncrementalExecutionResults):
-            return result
-
         # Set errors on the context so that it's easier
         # to access in extensions
         if result.errors:
@@ -480,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
@@ -500,16 +558,7 @@ class Schema(BaseSchema):
         extensions_runner = self.create_extensions_runner(execution_context, extensions)
         middleware_manager = self._get_middleware_manager(extensions)
 
-        execute_function = execute
-
-        if self.config.enable_experimental_incremental_execution:
-            execute_function = experimental_execute_incrementally
-
-            if execute_function is None:
-                raise RuntimeError(
-                    "Incremental execution is enabled but experimental_execute_incrementally is not available, "
-                    "please install graphql-core>=3.3.0"
-                )
+        custom_context_kwargs = self._get_custom_context_kwargs(operation_extensions)
 
         try:
             async with extensions_runner.operation():
@@ -529,7 +578,7 @@ class Schema(BaseSchema):
                 async with extensions_runner.executing():
                     if not execution_context.result:
                         result = await await_maybe(
-                            execute_function(
+                            execute(
                                 self._schema,
                                 execution_context.graphql_document,
                                 root_value=execution_context.root_value,
@@ -538,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
@@ -545,9 +595,7 @@ class Schema(BaseSchema):
                         result = execution_context.result
                     # Also set errors on the execution_context so that it's easier
                     # to access in extensions
-
-                    # TODO: maybe here use the first result from incremental execution if it exists
-                    if isinstance(result, GraphQLExecutionResult) and result.errors:
+                    if result.errors:
                         execution_context.errors = result.errors
 
                         # Run the `Schema.process_errors` function here before
@@ -577,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
@@ -597,16 +646,8 @@ class Schema(BaseSchema):
         extensions_runner = self.create_extensions_runner(execution_context, extensions)
         middleware_manager = self._get_middleware_manager(extensions)
 
-        execute_function = execute
-
-        if self.config.enable_experimental_incremental_execution:
-            execute_function = experimental_execute_incrementally
+        custom_context_kwargs = self._get_custom_context_kwargs(operation_extensions)
 
-            if execute_function is None:
-                raise RuntimeError(
-                    "Incremental execution is enabled but experimental_execute_incrementally is not available, "
-                    "please install graphql-core>=3.3.0"
-                )
         try:
             with extensions_runner.operation():
                 # Note: In graphql-core the schema would be validated here but in
@@ -648,7 +689,7 @@ class Schema(BaseSchema):
 
                 with extensions_runner.executing():
                     if not execution_context.result:
-                        result = execute_function(
+                        result = execute(
                             self._schema,
                             execution_context.graphql_document,
                             root_value=execution_context.root_value,
@@ -657,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):
@@ -701,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(
@@ -719,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.
@@ -783,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,
@@ -804,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/schema/schema_converter.py

@@ -817,9 +817,9 @@ class GraphQLCoreConverter:
 
         scalar_name = self.config.name_converter.from_type(scalar_definition)
 
-        if scalar_name not in self.type_map:
-            from strawberry.relay import GlobalID
+        from strawberry.relay import GlobalID
 
+        if scalar_name not in self.type_map:
             if scalar is GlobalID and hasattr(GraphQLNamedType, "reserved_types"):
                 GraphQLNamedType.reserved_types.pop("ID")
 
@@ -841,7 +841,17 @@ class GraphQLCoreConverter:
             # TODO: the other definition might not be a scalar, we should
             # handle this case better, since right now we assume it is a scalar
 
-            if other_definition != scalar_definition:
+            # special case to allow GlobalID to be used as an ID scalar
+            # TODO: we need to find a better way to handle this, might be
+            # worth reworking our scalar implementation.
+            if (
+                hasattr(other_definition, "origin")
+                and hasattr(scalar_definition, "origin")
+                and other_definition.origin == GlobalID
+                and scalar_definition.origin == GraphQLID
+            ):
+                pass
+            elif other_definition != scalar_definition:
                 other_definition = cast("ScalarDefinition", other_definition)
 
                 raise ScalarAlreadyRegisteredError(scalar_definition, other_definition)

strawberry/schema/types/scalar.py

@@ -40,6 +40,7 @@ def _make_scalar_definition(scalar_type: GraphQLScalarType) -> ScalarDefinition:
         parse_literal=scalar_type.parse_literal,
         parse_value=scalar_type.parse_value,
         implementation=scalar_type,
+        origin=scalar_type,
     )
 
 

strawberry/static/graphiql.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
   <head>
     <title>Strawberry GraphiQL</title>
@@ -61,8 +61,8 @@
     <link
       crossorigin
       rel="stylesheet"
-      href="https://unpkg.com/graphiql@3.8.3/graphiql.min.css"
-      integrity="sha384-Mq3vbRBY71jfjQAt/DcjxUIYY33ksal4cgdRt9U/hNPvHBCaT2JfJ/PTRiPKf0aM"
+      href="https://unpkg.com/graphiql@3.0.9/graphiql.min.css"
+      integrity="sha384-yz3/sqpuplkA7msMo0FE4ekg0xdwdvZ8JX9MVZREsxipqjU4h8IRfmAMRcb1QpUy"
     />
 
     <link
@@ -77,8 +77,8 @@
     <div id="graphiql" class="graphiql-container">Loading...</div>
     <script
       crossorigin
-      src="https://unpkg.com/graphiql@3.8.3/graphiql.min.js"
-      integrity="sha384-HbRVEFG0JGJZeAHCJ9Xm2+tpknBQ7QZmNlO/DgZtkZ0aJSypT96YYGRNod99l9Ie"
+      src="https://unpkg.com/graphiql@3.0.9/graphiql.min.js"
+      integrity="sha384-Mjte+vxCWz1ZYCzszGHiJqJa5eAxiqI4mc3BErq7eDXnt+UGLXSEW7+i0wmfPiji"
     ></script>
     <script
       crossorigin

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."""

strawberry/types/scalar.py

@@ -43,6 +43,7 @@ class ScalarDefinition(StrawberryType):
     parse_value: Optional[Callable]
     parse_literal: Optional[Callable]
     directives: Iterable[object] = ()
+    origin: Optional[GraphQLScalarType | type] = None
 
     # Optionally store the GraphQLScalarType instance so that we don't get
     # duplicates
@@ -115,6 +116,7 @@ def _process_scalar(
         parse_literal=parse_literal,
         parse_value=parse_value,
         directives=directives,
+        origin=cls,  # type: ignore[arg-type]
         _source_file=_source_file,
         _source_line=_source_line,
     )

{strawberry_graphql-0.269.0.dev1746905409.dist-info → strawberry_graphql-0.269.0.dev1747164009.dist-info}/METADATA

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

{strawberry_graphql-0.269.0.dev1746905409.dist-info → strawberry_graphql-0.269.0.dev1747164009.dist-info}/RECORD

@@ -1,10 +1,10 @@
-strawberry/__init__.py,sha256=tavG4mNFBNHhGBoFR2T7fhiCQ7P-ITHify10nkKBOJE,1544
+strawberry/__init__.py,sha256=-K---AYIgHvBVYF_9oovgEPNBbymXH673bntlV9sOeU,1491
 strawberry/__main__.py,sha256=3U77Eu21mJ-LY27RG-JEnpbh6Z63wGOom4i-EoLtUcY,59
 strawberry/aiohttp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/aiohttp/test/__init__.py,sha256=4xxdUZtIISSOwjrcnmox7AvT4WWjowCm5bUuPdQneMg,71
 strawberry/aiohttp/test/client.py,sha256=8FKZTnvawxYpgEICOri-34O3wHRHLhRpjH_Ktp2EupQ,1801
 strawberry/aiohttp/views.py,sha256=AQVBbZTBa127TbQRwoBelTHrVdZnJeGdMYcTfNmoaSc,7887
-strawberry/annotation.py,sha256=YGauf-nyuW-RGdjEu5RBxgcYV31cHx3pDLwqqjlgKv8,13822
+strawberry/annotation.py,sha256=iqSXtJ4pTTLDZRPyil0f-yzpcCm8UYRiwvFWkD5LgpQ,13498
 strawberry/asgi/__init__.py,sha256=psdKl_52LGkxKKbzZlmwNGZ9jz2FLyLSC7fUhys4FqY,8169
 strawberry/asgi/test/__init__.py,sha256=4xxdUZtIISSOwjrcnmox7AvT4WWjowCm5bUuPdQneMg,71
 strawberry/asgi/test/client.py,sha256=kp2O5znHWuAB5VVYO8p4XPSTEDDXBSjNz5WHqW0r6GM,1473
@@ -130,13 +130,13 @@ strawberry/file_uploads/scalars.py,sha256=NRDeB7j8aotqIkz9r62ISTf4DrxQxEZYUuHsX5
 strawberry/file_uploads/utils.py,sha256=-c6TbqUI-Dkb96hWCrZabh6TL2OabBuQNkCarOqgDm4,1181
 strawberry/flask/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/flask/views.py,sha256=MCvAsNgTZLU8RvTYKWfnLU2w7Wv1ZZpxW9W3TyTZuPY,6355
-strawberry/http/__init__.py,sha256=nvy1c7CGHMJlOE9rSiTl6D7eiqWixC1G6x4evgIEKgk,1275
-strawberry/http/async_base_view.py,sha256=hDHVAS9ZVsY0apn109oMX-HLNbMiQinPrp8iYYf6rBQ,19151
-strawberry/http/base.py,sha256=Lz-u5SWg2uQp3l5GMKZDPQuJOR42LXHgjV1PZHwiapE,2373
+strawberry/http/__init__.py,sha256=ytAirKk7K7D5knY21tpCGeZ-sCPgwMsijL5AxmOy-94,1163
+strawberry/http/async_base_view.py,sha256=NnFYHy_3b6WtxRZoLCWDeOXDqEz2VxzG6jlKcIwrM4E,16519
+strawberry/http/base.py,sha256=MiX0-RqOkhRvlfpmuvgTHp4tygbUmG8fnLc0uCrOllU,2550
 strawberry/http/exceptions.py,sha256=9E2dreS1crRoJVUEPuHyx23NcDELDHNzkAOa-rGv-8I,348
 strawberry/http/ides.py,sha256=WjU0nsMDgr3Bd1ebWkUEkO2d1hk0dI16mLqXyCHqklA,613
 strawberry/http/parse_content_type.py,sha256=CYHO8F9b9DP1gJ1xxPjc9L2GkBwsyC1O_GCEp1QOuG0,381
-strawberry/http/sync_base_view.py,sha256=iKcc9bDu7wQnOTfcCEW56I-Y35xdkb1P_sP3-y7RTh8,7180
+strawberry/http/sync_base_view.py,sha256=x_RQ7XdzwPmMl1vCh3bmgVvShQp28azSEkVMCX2o6Mc,7285
 strawberry/http/temporal_response.py,sha256=HTt65g-YxqlPGxjqvH5bzGoU1b3CctVR-9cmCRo5dUo,196
 strawberry/http/types.py,sha256=H0wGOdCO-5tNKZM_6cAtNRwZAjoEXnAC5N0Q7b70AtU,398
 strawberry/http/typevars.py,sha256=Uu6NkKe3h7o29ZWwldq6sJy4ioSSeXODTCDRvY2hUpE,489
@@ -146,7 +146,7 @@ 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
-strawberry/printer/printer.py,sha256=5E9w0wDsUv1hvkeXof12277NLMiCVy5MgJ6gSo_NJhQ,19177
+strawberry/printer/printer.py,sha256=49u3QwttTGvh13HXZtbTnkZzBwL1k5SLf8rXQLiTpl4,18814
 strawberry/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/quart/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/quart/views.py,sha256=Hjm93A9j9fy--DQVhsPQ_PakqYtajyWeuH7wUnSLYoA,4449
@@ -162,27 +162,25 @@ strawberry/sanic/utils.py,sha256=XjUVBFuBWfECBCZbx_YtrjQnFTUyIGTo7aISIeB22Gc,100
 strawberry/sanic/views.py,sha256=F5ZrKt-R3135evKLfhQuPd1isOexI0Lrzevm_6Te4Eg,7069
 strawberry/scalars.py,sha256=CGkG8CIfurXiYhidmW3qwy6M5BF_Mhih3wAEcWx_iBU,2278
 strawberry/schema/__init__.py,sha256=u1QCyDVQExUVDA20kyosKPz3TS5HMCN2NrXclhiFAL4,92
-strawberry/schema/_graphql_core.py,sha256=XHsNZLkCyiH55jANK4XJIjq6VCMhN_MgZBEFWEYj5Jc,1237
-strawberry/schema/base.py,sha256=q5UAw6do4Ele5Cf8dNAouiPjNmZoCBNFqh5Vl05caCI,3864
+strawberry/schema/base.py,sha256=wqvEOQ_aVkfebk9SlG9zg1YXl3MlwxGZhxFRoIkAxu0,4053
 strawberry/schema/compat.py,sha256=xNpOEDfi-MODpplMGaKuKeQIVcr-tcAaKaU3TlBc1Zs,1873
-strawberry/schema/config.py,sha256=zQLJSF6FoUIur6MJSMz3NHqxDCYqcHL3fu6H5NA4hmI,1029
+strawberry/schema/config.py,sha256=KeZ1Pc1gvYK0fOx9Aghx7m0Av8sWexycl3HJGFgHPvg,969
 strawberry/schema/exceptions.py,sha256=rqVNb_oYrKM0dHPgvAemqCG6Um282LPPu4zwQ5cZqs4,584
 strawberry/schema/name_converter.py,sha256=xFOXEgqldFkxXRkIQvsJN1dPkWbEUaIrTYNOMYSEVwQ,6945
-strawberry/schema/schema.py,sha256=So_T5IqyADhIrj_OSoLt3UlFwuRppeOY39JSChEZ7k0,35704
-strawberry/schema/schema_converter.py,sha256=yuYafNwa9zs6l-GmuGtxdjYwawxjiU6zmwIgJ-aLhV4,39308
+strawberry/schema/schema.py,sha256=zRIv4mpVEFjFWv-MmfjO9v7OsuSFZ2xghr_ekIAuZI4,37113
+strawberry/schema/schema_converter.py,sha256=u12Og8eUX8SNMtJB6LYkj9zEpoQs-rDOXpN7tU8JG7k,39785
 strawberry/schema/types/__init__.py,sha256=oHO3COWhL3L1KLYCJNY1XFf5xt2GGtHiMC-UaYbFfnA,68
 strawberry/schema/types/base_scalars.py,sha256=JRUq0WjEkR9dFewstZnqnZKp0uOEipo4UXNF5dzRf4M,1971
 strawberry/schema/types/concrete_type.py,sha256=axIyFZgdwNv-XYkiqX67464wuFX6Vp0jYATwnBZSUvM,750
-strawberry/schema/types/scalar.py,sha256=X_9R7tLDINcs9UeExUUqq3_U2JkhCVJBeEhDFDUt3Tc,2347
+strawberry/schema/types/scalar.py,sha256=bg9AumdmYUBuvaKoEZtP9YKJ7lwMtDMCWFTsZQwpdQY,2375
 strawberry/schema/validation_rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/schema/validation_rules/one_of.py,sha256=fPuYzCyLT7p9y7dHF_sWTImArTQaEhyF664lZijB1Gw,2629
 strawberry/schema_codegen/__init__.py,sha256=mN4Qmu5Iakht6nHpRpt9hCs8e--oTPlVtDJZJpzgHR4,24364
 strawberry/schema_directive.py,sha256=CbjdX54EIeWGkJu4SgiLR8mph5_8wyNsgJk2oLoQK_0,2023
 strawberry/schema_directives.py,sha256=KGKFWCODjm1Ah9qNV_bBwbic7Mld4qLWnWQkev-PG8A,175
 strawberry/static/apollo-sandbox.html,sha256=2XzkbE0dqsFHqehE-jul9_J9TFOpwA6Ylrlo0Kdx_9w,973
-strawberry/static/graphiql.html,sha256=0e3pvTnAet-lNEqA_pgJ8Ak2CdMt34zPKMMMzpAkEVU,4257
+strawberry/static/graphiql.html,sha256=BkiqZlC63f1sHBDs_UpMzcibcNrHKh7K41Sp23yttfo,4257
 strawberry/static/pathfinder.html,sha256=0DPx9AmJ2C_sJstFXnWOz9k5tVQHeHaK7qdVY4lAlmk,1547
-strawberry/streamable.py,sha256=ylfMt5lfX7RRKGi86wWokvIgYQk5jZCvQVc3shK0epk,645
 strawberry/subscriptions/__init__.py,sha256=1VGmiCzFepqRFyCikagkUoHHdoTG3XYlFu9GafoQMws,170
 strawberry/subscriptions/protocols/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/subscriptions/protocols/graphql_transport_ws/__init__.py,sha256=wN6dkMu6WiaIZTE19PGoN9xXpIN_RdDE_q7F7ZgjCxk,138
@@ -207,14 +205,14 @@ strawberry/types/field.py,sha256=vxb7JvkHfRmDCYsjhDmVnO2lMbtSOteQm3jQUeSFu6g,216
 strawberry/types/fields/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/info.py,sha256=V3DQMd97tkWSdPIhp7HcelQ2h94-HSCI5zJ7cRO7i58,4907
 strawberry/types/lazy_type.py,sha256=dlP9VcMjZc9sdgriiQGzOZa0TToB6Ee7zpIP8h7TLC0,5079
 strawberry/types/maybe.py,sha256=Zdv4pAJwgUmaFNU8WKlwjk50qwgYEzT90WteURZBzAo,1174
 strawberry/types/mutation.py,sha256=cg-_O2WWnZ-GSwOIv0toSdxlGeY2lhBBxZ24AifJuSM,11978
 strawberry/types/nodes.py,sha256=RwZB43OT9BS3Cqjgq4AazqOfyq_y0GD2ysC86EDBv5U,5134
 strawberry/types/object_type.py,sha256=SZOzxaS318079G-pr-1PM5iMoTddxdw8KD4cI67IhzI,15579
 strawberry/types/private.py,sha256=DhJs50XVGtOXlxWZFkRpMxQ5_6oki0-x_WQsV1bGUxk,518
-strawberry/types/scalar.py,sha256=CM24Ixg4DKxxI1C6hTNGYVitohJibs8BpGtntRZvMXw,6284
+strawberry/types/scalar.py,sha256=vUWGwAYgcfY26jQUdBJ1tGOvrBq92V0p9L8AWXM7bkk,6384
 strawberry/types/type_resolver.py,sha256=fH2ZOK4dAGgu8AMPi-JAXe_kEAbvvw2MCYXqbpx-kTc,6529
 strawberry/types/union.py,sha256=rwZoJcMdUxJBlYMwx3ONByv6BylhvXT0Bflem6xzMM4,10090
 strawberry/types/unset.py,sha256=7DVK-WWxVLo41agvavTvIbphE42BmY8UpGolXfasIvw,1682
@@ -231,8 +229,8 @@ strawberry/utils/logging.py,sha256=U1cseHGquN09YFhFmRkiphfASKCyK0HUZREImPgVb0c,7
 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=SDvX-Du-9HAV3-XXjqi7Q5f5qPDDFd_gASIITiwBQT4,14073
-strawberry_graphql-0.269.0.dev1746905409.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.269.0.dev1746905409.dist-info/METADATA,sha256=sHIySmlxBSdlyOX75pzZ4cMZfQM-ohxJHrN7hVhYGkw,7693
-strawberry_graphql-0.269.0.dev1746905409.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-strawberry_graphql-0.269.0.dev1746905409.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.269.0.dev1746905409.dist-info/RECORD,,
+strawberry_graphql-0.269.0.dev1747164009.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.269.0.dev1747164009.dist-info/METADATA,sha256=JpVEXkg2xDj9vjnGUpAV7_XvnIg6LV74yCj9xo6ZAR4,7693
+strawberry_graphql-0.269.0.dev1747164009.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+strawberry_graphql-0.269.0.dev1747164009.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.269.0.dev1747164009.dist-info/RECORD,,

strawberry/schema/_graphql_core.py

@@ -1,46 +0,0 @@
-from typing import Union
-
-from graphql.execution import ExecutionContext as GraphQLExecutionContext
-from graphql.execution import ExecutionResult as GraphQLExecutionResult
-from graphql.execution import execute, subscribe
-
-from strawberry.types import ExecutionResult
-
-try:
-    from graphql import (
-        ExperimentalIncrementalExecutionResults as GraphQLIncrementalExecutionResults,
-    )
-    from graphql.execution import experimental_execute_incrementally
-    from graphql.type.directives import (
-        GraphQLDeferDirective,
-        GraphQLStreamDirective,
-    )
-
-    incremental_execution_directives = (
-        GraphQLDeferDirective,
-        GraphQLStreamDirective,
-    )
-
-except ImportError:
-    GraphQLIncrementalExecutionResults = type(None)
-
-    incremental_execution_directives = []
-    experimental_execute_incrementally = None
-
-
-# TODO: give this a better name, maybe also a better place
-ResultType = Union[
-    GraphQLExecutionResult,
-    GraphQLIncrementalExecutionResults,
-    ExecutionResult,
-]
-
-__all__ = [
-    "GraphQLExecutionContext",
-    "GraphQLIncrementalExecutionResults",
-    "ResultType",
-    "execute",
-    "experimental_execute_incrementally",
-    "incremental_execution_directives",
-    "subscribe",
-]

strawberry/streamable.py

@@ -1,36 +0,0 @@
-from collections.abc import AsyncGenerator
-from typing import Annotated, TypeVar
-
-
-class StrawberryStreamable: ...
-
-
-T = TypeVar("T")
-
-Streamable = Annotated[AsyncGenerator[T, None], StrawberryStreamable()]
-"""Represents a list that can be streamed using @stream.
-
-Example:
-
-```python
-import strawberry
-from dataclasses import dataclass
-
-
-@strawberry.type
-class Comment:
-    id: strawberry.ID
-    content: str
-
-
-@strawberry.type
-class Article:
-    @strawberry.field
-    @staticmethod
-    async def comments() -> strawberry.Streamable[Comment]:
-        for comment in fetch_comments():
-            yield comment
-```
-"""
-
-__all__ = ["Streamable"]