strawberry-graphql 0.214.0.dev1699441271__py3-none-any.whl → 0.214.0.dev1701082152__py3-none-any.whl

strawberry/aiohttp/views.py

@@ -7,13 +7,10 @@ from io import BytesIO
 from typing import (
     TYPE_CHECKING,
     Any,
-    AsyncGenerator,
-    Callable,
     Dict,
     Iterable,
     Mapping,
     Optional,
-    Union,
     cast,
 )
 
@@ -78,13 +75,7 @@ class AioHTTPRequestAdapter(AsyncHTTPRequestAdapter):
 
 
 class GraphQLView(
-    AsyncBaseHTTPView[
-        web.Request,
-        Union[web.Response, web.StreamResponse],
-        web.Response,
-        Context,
-        RootValue,
-    ]
+    AsyncBaseHTTPView[web.Request, web.Response, web.Response, Context, RootValue]
 ):
     # Mark the view as coroutine so that AIOHTTP does not confuse it with a deprecated
     # bare handler function.
@@ -140,8 +131,6 @@ class GraphQLView(
 
         if not ws_test.ok:
             try:
-                # TODO: pass this down from run to multipart thingy
-                self.request = request
                 return await self.run(request=request)
             except HTTPException as e:
                 return web.Response(
@@ -188,26 +177,3 @@ class GraphQLView(
         sub_response.content_type = "application/json"
 
         return sub_response
-
-    async def create_multipart_response(
-        self,
-        stream: Callable[[], AsyncGenerator[str, None]],
-        sub_response: web.Response,
-    ) -> web.StreamResponse:
-        # TODO: use sub response
-        response = web.StreamResponse(
-            status=200,
-            headers={
-                "Transfer-Encoding": "chunked",
-                "Content-type": "multipart/mixed;boundary=graphql;subscriptionSpec=1.0,application/json",
-            },
-            reason="OK",
-        )
-
-        await response.prepare(self.request)
-
-        async for data in stream():
-            await response.write(data.encode())
-
-        await response.write_eof()
-        return response

strawberry/asgi/__init__.py

@@ -5,8 +5,6 @@ from datetime import timedelta
 from typing import (
     TYPE_CHECKING,
     Any,
-    AsyncIterator,
-    Callable,
     Mapping,
     Optional,
     Sequence,
@@ -16,12 +14,7 @@ from typing import (
 
 from starlette import status
 from starlette.requests import Request
-from starlette.responses import (
-    HTMLResponse,
-    PlainTextResponse,
-    Response,
-    StreamingResponse,
-)
+from starlette.responses import HTMLResponse, PlainTextResponse, Response
 from starlette.websockets import WebSocket
 
 from strawberry.asgi.handlers import (
@@ -220,14 +213,3 @@ class GraphQL(
             response.status_code = sub_response.status_code
 
         return response
-
-    async def create_multipart_response(
-        self, stream: Callable[[], AsyncIterator[str]], sub_response: Response
-    ) -> Response:
-        return StreamingResponse(
-            stream(),
-            headers={
-                "Transfer-Encoding": "chunked",
-                "Content-type": "multipart/mixed;boundary=graphql;subscriptionSpec=1.0,application/json",
-            },
-        )

strawberry/channels/handlers/http_handler.py

@@ -9,16 +9,7 @@ import json
 import warnings
 from functools import cached_property
 from io import BytesIO
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    AsyncGenerator,
-    Callable,
-    Dict,
-    Mapping,
-    Optional,
-    Union,
-)
+from typing import TYPE_CHECKING, Any, Dict, Mapping, Optional, Union
 from urllib.parse import parse_qs
 
 from django.conf import settings
@@ -52,14 +43,6 @@ class ChannelsResponse:
     headers: Dict[bytes, bytes] = dataclasses.field(default_factory=dict)
 
 
-@dataclasses.dataclass
-class MultipartChannelsResponse:
-    stream: Callable[[], AsyncGenerator[str, None]]
-    status: int = 200
-    content_type: str = "multipart/mixed;boundary=graphql;subscriptionSpec=1.0"
-    headers: Dict[bytes, bytes] = dataclasses.field(default_factory=dict)
-
-
 @dataclasses.dataclass
 class ChannelsRequest:
     consumer: ChannelsConsumer
@@ -202,25 +185,16 @@ class BaseGraphQLHTTPConsumer(ChannelsConsumer, AsyncHttpConsumer):
     async def handle(self, body: bytes) -> None:
         request = ChannelsRequest(consumer=self, body=body)
         try:
-            response = await self.run(request)
+            response: ChannelsResponse = await self.run(request)
 
             if b"Content-Type" not in response.headers:
                 response.headers[b"Content-Type"] = response.content_type.encode()
 
-            if isinstance(response, MultipartChannelsResponse):
-                response.headers[b"Transfer-Encoding"] = b"chunked"
-                await self.send_headers(headers=response.headers)
-
-                async for chunk in response.stream():
-                    # TODO: we should change more body
-                    await self.send_body(chunk.encode("utf-8"), more_body=True)
-
-            else:
-                await self.send_response(
-                    response.status,
-                    response.content,
-                    headers=response.headers,
-                )
+            await self.send_response(
+                response.status,
+                response.content,
+                headers=response.headers,
+            )
         except HTTPException as e:
             await self.send_response(e.status_code, e.reason.encode())
 
@@ -229,7 +203,7 @@ class GraphQLHTTPConsumer(
     BaseGraphQLHTTPConsumer,
     AsyncBaseHTTPView[
         ChannelsRequest,
-        Union[ChannelsResponse, MultipartChannelsResponse],
+        ChannelsResponse,
         TemporalResponse,
         Context,
         RootValue,
@@ -273,14 +247,6 @@ class GraphQLHTTPConsumer(
     async def get_sub_response(self, request: ChannelsRequest) -> TemporalResponse:
         return TemporalResponse()
 
-    async def create_multipart_response(
-        self,
-        stream: Callable[[], AsyncGenerator[str, None]],
-        sub_response: TemporalResponse,
-    ) -> MultipartChannelsResponse:
-        # TODO: sub response
-        return MultipartChannelsResponse(stream=stream)
-
     async def render_graphql_ide(self, request: ChannelsRequest) -> ChannelsResponse:
         return ChannelsResponse(
             content=self.graphql_ide_html.encode(), content_type="text/html"
@@ -335,5 +301,5 @@ class SyncGraphQLHTTPConsumer(
         request: ChannelsRequest,
         context: Optional[Context] = UNSET,
         root_value: Optional[RootValue] = UNSET,
-    ) -> ChannelsResponse:  # pyright: ignore
+    ) -> ChannelsResponse:
         return super().run(request, context, root_value)

strawberry/django/views.py

@@ -5,7 +5,6 @@ import warnings
 from typing import (
     TYPE_CHECKING,
     Any,
-    AsyncIterator,
     Callable,
     Mapping,
     Optional,
@@ -14,14 +13,8 @@ from typing import (
 )
 
 from asgiref.sync import markcoroutinefunction
-from django.http import (
-    HttpRequest,
-    HttpResponse,
-    HttpResponseNotAllowed,
-    JsonResponse,
-    StreamingHttpResponse,
-)
-from django.http.response import HttpResponseBase
+from django.http import HttpRequest, HttpResponseNotAllowed, JsonResponse
+from django.http.response import HttpResponse
 from django.template import RequestContext, Template
 from django.template.exceptions import TemplateDoesNotExist
 from django.template.loader import render_to_string
@@ -165,7 +158,7 @@ class BaseView:
 
     def create_response(
         self, response_data: GraphQLHTTPResponse, sub_response: HttpResponse
-    ) -> HttpResponseBase:
+    ) -> HttpResponse:
         data = self.encode_json(response_data)  # type: ignore
 
         response = HttpResponse(
@@ -184,22 +177,11 @@ class BaseView:
 
         return response
 
-    async def create_multipart_response(
-        self, stream: Callable[[], AsyncIterator[Any]], sub_response: HttpResponse
-    ) -> HttpResponseBase:
-        return StreamingHttpResponse(
-            streaming_content=stream(),
-            headers={
-                "Transfer-Encoding": "chunked",
-                "Content-type": "multipart/mixed;boundary=graphql;subscriptionSpec=1.0,application/json",
-            },
-        )
-
 
 class GraphQLView(
     BaseView,
     SyncBaseHTTPView[
-        HttpRequest, HttpResponseBase, TemporalHttpResponse, Context, RootValue
+        HttpRequest, HttpResponse, TemporalHttpResponse, Context, RootValue
     ],
     View,
 ):
@@ -222,7 +204,7 @@ class GraphQLView(
     @method_decorator(csrf_exempt)
     def dispatch(
         self, request: HttpRequest, *args: Any, **kwargs: Any
-    ) -> Union[HttpResponseNotAllowed, TemplateResponse, HttpResponseBase]:
+    ) -> Union[HttpResponseNotAllowed, TemplateResponse, HttpResponse]:
         try:
             return self.run(request=request)
         except HTTPException as e:
@@ -248,7 +230,7 @@ class GraphQLView(
 class AsyncGraphQLView(
     BaseView,
     AsyncBaseHTTPView[
-        HttpRequest, HttpResponseBase, TemporalHttpResponse, Context, RootValue
+        HttpRequest, HttpResponse, TemporalHttpResponse, Context, RootValue
     ],
     View,
 ):
@@ -281,7 +263,7 @@ class AsyncGraphQLView(
     @method_decorator(csrf_exempt)
     async def dispatch(  # pyright: ignore
         self, request: HttpRequest, *args: Any, **kwargs: Any
-    ) -> Union[HttpResponseNotAllowed, TemplateResponse, HttpResponseBase]:
+    ) -> Union[HttpResponseNotAllowed, TemplateResponse, HttpResponse]:
         try:
             return await self.run(request=request)
         except HTTPException as e:

strawberry/fastapi/router.py

@@ -6,7 +6,6 @@ from inspect import signature
 from typing import (
     TYPE_CHECKING,
     Any,
-    AsyncIterator,
     Awaitable,
     Callable,
     Mapping,
@@ -23,7 +22,6 @@ from starlette.responses import (
     HTMLResponse,
     PlainTextResponse,
     Response,
-    StreamingResponse,
 )
 from starlette.websockets import WebSocket
 
@@ -324,14 +322,3 @@ class GraphQLRouter(
         response.headers.raw.extend(sub_response.headers.raw)
 
         return response
-
-    async def create_multipart_response(
-        self, stream: Callable[[], AsyncIterator[str]], sub_response: Response
-    ) -> Response:
-        return StreamingResponse(
-            stream(),
-            headers={
-                "Transfer-Encoding": "chunked",
-                "Content-type": "multipart/mixed;boundary=graphql;subscriptionSpec=1.0,application/json",
-            },
-        )

strawberry/flask/views.py

@@ -1,15 +1,7 @@
 from __future__ import annotations
 
 import warnings
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    List,
-    Mapping,
-    Optional,
-    Union,
-    cast,
-)
+from typing import TYPE_CHECKING, Any, List, Mapping, Optional, Union, cast
 
 from flask import Request, Response, render_template_string, request
 from flask.views import View

strawberry/http/async_base_view.py

@@ -1,16 +1,12 @@
 import abc
-import asyncio
 import json
 from typing import (
-    Any,
-    AsyncGenerator,
     Callable,
     Dict,
     Generic,
     List,
     Mapping,
     Optional,
-    Tuple,
     Union,
 )
 
@@ -23,7 +19,7 @@ from strawberry.http import GraphQLHTTPResponse, GraphQLRequestData, process_res
 from strawberry.http.ides import GraphQL_IDE
 from strawberry.schema.base import BaseSchema
 from strawberry.schema.exceptions import InvalidOperationTypeError
-from strawberry.types import ExecutionResult, SubscriptionExecutionResult
+from strawberry.types import ExecutionResult
 from strawberry.types.graphql import OperationType
 
 from .base import BaseView
@@ -98,14 +94,9 @@ class AsyncBaseHTTPView(
     async def render_graphql_ide(self, request: Request) -> Response:
         ...
 
-    async def create_multipart_response(
-        self, stream: Callable[[], AsyncGenerator[str, None]], sub_response: SubResponse
-    ) -> Response:
-        raise ValueError("Multipart responses are not supported")
-
     async def execute_operation(
         self, request: Request, context: Context, root_value: Optional[RootValue]
-    ) -> Union[ExecutionResult, SubscriptionExecutionResult]:
+    ) -> ExecutionResult:
         request_adapter = self.request_adapter_class(request)
 
         try:
@@ -201,11 +192,6 @@ class AsyncBaseHTTPView(
         except MissingQueryError as e:
             raise HTTPException(400, "No GraphQL query found in the request") from e
 
-        if isinstance(result, SubscriptionExecutionResult):
-            stream = self._get_stream(request, result)
-
-            return await self.create_multipart_response(stream, sub_response)
-
         response_data = await self.process_result(request=request, result=result)
 
         if result.errors:
@@ -215,88 +201,6 @@ class AsyncBaseHTTPView(
             response_data=response_data, sub_response=sub_response
         )
 
-    def encode_multipart_data(self, data: Any, separator: str) -> str:
-        return "".join(
-            [
-                f"\r\n--{separator}\r\n",
-                "Content-Type: application/json\r\n\r\n",
-                self.encode_json(data),
-                "\n",
-            ]
-        )
-
-    def _stream_with_heartbeat(
-        self, stream: Callable[[], AsyncGenerator[str, None]]
-    ) -> Callable[[], AsyncGenerator[str, None]]:
-        """Adds a heartbeat to the stream, to prevent the connection from closing
-        when there are no messages being sent."""
-        # TODO: handle errors
-        # TODO: should we do this more efficiently? and only send the heartbeat when
-        # 5 seconds have passed after the last message? (apollo router doesn't seem to do this)
-        queue = asyncio.Queue[Tuple[bool, Any]](1)
-
-        cancelling = False
-
-        async def drain():
-            try:
-                async for item in stream():
-                    await queue.put((False, item))
-            except Exception as e:
-                if not cancelling:
-                    await queue.put((True, e))
-                else:
-                    raise
-
-        async def heartbeat():
-            while True:
-                await queue.put((False, self.encode_multipart_data({}, "graphql")))
-
-                await asyncio.sleep(5)
-
-        async def merged() -> AsyncGenerator[str, None]:
-            heartbeat_task = asyncio.create_task(heartbeat())
-            task = asyncio.create_task(drain())
-
-            def cancel_tasks():
-                nonlocal cancelling
-                cancelling = True
-                task.cancel()
-                heartbeat_task.cancel()
-
-            try:
-                while not task.done():
-                    raised, data = await queue.get()
-
-                    if raised:
-                        cancel_tasks()
-                        raise data
-
-                    yield data
-            finally:
-                cancel_tasks()
-
-        return merged
-
-    def _get_stream(
-        self,
-        request: Request,
-        result: SubscriptionExecutionResult,
-        separator: str = "graphql",
-    ) -> Callable[[], AsyncGenerator[str, None]]:
-        async def stream():
-            async for value in result:
-                response = await self.process_result(request, value)
-                yield self.encode_multipart_data({"payload": response}, separator)
-
-            yield f"\r\n--{separator}--\r\n"
-
-        return self._stream_with_heartbeat(stream)
-
-    async def parse_multipart_subscriptions(
-        self, request: AsyncHTTPRequestAdapter
-    ) -> Dict[str, str]:
-        return self.parse_json(await request.get_body())
-
     async def parse_http_body(
         self, request: AsyncHTTPRequestAdapter
     ) -> GraphQLRequestData:
@@ -306,9 +210,6 @@ class AsyncBaseHTTPView(
             data = self.parse_json(await request.get_body())
         elif content_type.startswith("multipart/form-data"):
             data = await self.parse_multipart(request)
-        elif content_type.startswith("multipart/mixed"):
-            # TODO: do a check that checks if this is a multipart subscription
-            data = await self.parse_multipart_subscriptions(request)
         elif request.method == "GET":
             data = self.parse_query_params(request.query_params)
         else:

strawberry/sanic/views.py

@@ -5,8 +5,6 @@ import warnings
 from typing import (
     TYPE_CHECKING,
     Any,
-    AsyncGenerator,
-    Callable,
     Dict,
     List,
     Mapping,
@@ -170,35 +168,13 @@ class GraphQLView(
         )
 
     async def post(self, request: Request) -> HTTPResponse:
-        self.request = request
-
         try:
             return await self.run(request)
         except HTTPException as e:
             return HTTPResponse(e.reason, status=e.status_code)
 
     async def get(self, request: Request) -> HTTPResponse:
-        self.request = request
         try:
             return await self.run(request)
         except HTTPException as e:
             return HTTPResponse(e.reason, status=e.status_code)
-
-    async def create_multipart_response(
-        self,
-        stream: Callable[[], AsyncGenerator[str, None]],
-        sub_response: TemporalResponse,
-    ) -> HTTPResponse:
-        response = await self.request.respond(
-            content_type="multipart/mixed;boundary=graphql;subscriptionSpec=1.0,application/json",
-            headers={
-                "Transfer-Encoding": "chunked",
-            },
-        )
-
-        async for chunk in stream():
-            await response.send(chunk)
-
-        await response.eof()
-
-        return response

strawberry/schema/base.py

@@ -14,11 +14,7 @@ if TYPE_CHECKING:
     from strawberry.directive import StrawberryDirective
     from strawberry.enum import EnumDefinition
     from strawberry.schema.schema_converter import GraphQLCoreConverter
-    from strawberry.types import (
-        ExecutionContext,
-        ExecutionResult,
-        SubscriptionExecutionResult,
-    )
+    from strawberry.types import ExecutionContext, ExecutionResult
     from strawberry.types.graphql import OperationType
     from strawberry.types.types import StrawberryObjectDefinition
     from strawberry.union import StrawberryUnion
@@ -43,7 +39,7 @@ class BaseSchema(Protocol):
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
         allowed_operation_types: Optional[Iterable[OperationType]] = None,
-    ) -> Union[ExecutionResult, SubscriptionExecutionResult]:
+    ) -> ExecutionResult:
         raise NotImplementedError
 
     @abstractmethod

strawberry/schema/execute.py

@@ -17,14 +17,13 @@ from typing import (
     cast,
 )
 
-from graphql import GraphQLError, parse, subscribe
+from graphql import GraphQLError, parse
 from graphql import execute as original_execute
 from graphql.validation import validate
 
 from strawberry.exceptions import MissingQueryError
 from strawberry.extensions.runner import SchemaExtensionsRunner
 from strawberry.types import ExecutionResult
-from strawberry.types.graphql import OperationType
 
 from .exceptions import InvalidOperationTypeError
 
@@ -38,7 +37,8 @@ if TYPE_CHECKING:
     from graphql.validation import ASTValidationRule
 
     from strawberry.extensions import SchemaExtension
-    from strawberry.types import ExecutionContext, SubscriptionExecutionResult
+    from strawberry.types import ExecutionContext
+    from strawberry.types.graphql import OperationType
 
 
 # duplicated because of https://github.com/mkdocstrings/griffe-typingdoc/issues/7
@@ -82,69 +82,46 @@ async def execute(
     execution_context: ExecutionContext,
     execution_context_class: Optional[Type[GraphQLExecutionContext]] = None,
     process_errors: Callable[[List[GraphQLError], Optional[ExecutionContext]], None],
-) -> Union[ExecutionResult, SubscriptionExecutionResult]:
+) -> ExecutionResult:
     extensions_runner = SchemaExtensionsRunner(
         execution_context=execution_context,
         extensions=list(extensions),
     )
 
-    async with extensions_runner.operation():
-        # Note: In graphql-core the schema would be validated here but in
-        # Strawberry we are validating it at initialisation time instead
-        if not execution_context.query:
-            raise MissingQueryError()
-
-        async with extensions_runner.parsing():
-            try:
-                if not execution_context.graphql_document:
-                    execution_context.graphql_document = parse_document(
-                        execution_context.query, **execution_context.parse_options
+    try:
+        async with extensions_runner.operation():
+            # Note: In graphql-core the schema would be validated here but in
+            # Strawberry we are validating it at initialisation time instead
+            if not execution_context.query:
+                raise MissingQueryError()
+
+            async with extensions_runner.parsing():
+                try:
+                    if not execution_context.graphql_document:
+                        execution_context.graphql_document = parse_document(
+                            execution_context.query, **execution_context.parse_options
+                        )
+
+                except GraphQLError as exc:
+                    execution_context.errors = [exc]
+                    process_errors([exc], execution_context)
+                    return ExecutionResult(
+                        data=None,
+                        errors=[exc],
+                        extensions=await extensions_runner.get_extensions_results(),
                     )
 
-            except GraphQLError as error:
-                execution_context.errors = [error]
-                process_errors([error], execution_context)
-                return ExecutionResult(
-                    data=None,
-                    errors=[error],
-                    extensions=await extensions_runner.get_extensions_results(),
-                )
-
-            except Exception as error:  # pragma: no cover
-                error = GraphQLError(str(error), original_error=error)
-
-                execution_context.errors = [error]
-                process_errors([error], execution_context)
-
-                return ExecutionResult(
-                    data=None,
-                    errors=[error],
-                    extensions=await extensions_runner.get_extensions_results(),
-                )
-
-        if execution_context.operation_type not in allowed_operation_types:
-            raise InvalidOperationTypeError(execution_context.operation_type)
-
-        async with extensions_runner.validation():
-            _run_validation(execution_context)
-            if execution_context.errors:
-                process_errors(execution_context.errors, execution_context)
-                return ExecutionResult(data=None, errors=execution_context.errors)
-
-        async with extensions_runner.executing():
-            if not execution_context.result:
-                if execution_context.operation_type == OperationType.SUBSCRIPTION:
-                    # TODO: should we process errors here?
-                    # TODO: make our own wrapper?
-                    return await subscribe(  # type: ignore
-                        schema,
-                        execution_context.graphql_document,
-                        root_value=execution_context.root_value,
-                        context_value=execution_context.context,
-                        variable_values=execution_context.variables,
-                        operation_name=execution_context.operation_name,
-                    )
-                else:
+            if execution_context.operation_type not in allowed_operation_types:
+                raise InvalidOperationTypeError(execution_context.operation_type)
+
+            async with extensions_runner.validation():
+                _run_validation(execution_context)
+                if execution_context.errors:
+                    process_errors(execution_context.errors, execution_context)
+                    return ExecutionResult(data=None, errors=execution_context.errors)
+
+            async with extensions_runner.executing():
+                if not execution_context.result:
                     result = original_execute(
                         schema,
                         execution_context.graphql_document,
@@ -156,21 +133,33 @@ async def execute(
                         execution_context_class=execution_context_class,
                     )
 
-                if isawaitable(result):
-                    result = await cast(Awaitable["GraphQLExecutionResult"], result)
-
-                result = cast("GraphQLExecutionResult", result)
-                execution_context.result = result
-                # Also set errors on the execution_context so that it's easier
-                # to access in extensions
-                if result.errors:
-                    execution_context.errors = result.errors
-
-                    # Run the `Schema.process_errors` function here before
-                    # extensions have a chance to modify them (see the MaskErrors
-                    # extension). That way we can log the original errors but
-                    # only return a sanitised version to the client.
-                    process_errors(result.errors, execution_context)
+                    if isawaitable(result):
+                        result = await cast(Awaitable["GraphQLExecutionResult"], result)
+
+                    result = cast("GraphQLExecutionResult", result)
+                    execution_context.result = result
+                    # Also set errors on the execution_context so that it's easier
+                    # to access in extensions
+                    if result.errors:
+                        execution_context.errors = result.errors
+
+                        # Run the `Schema.process_errors` function here before
+                        # extensions have a chance to modify them (see the MaskErrors
+                        # extension). That way we can log the original errors but
+                        # only return a sanitised version to the client.
+                        process_errors(result.errors, execution_context)
+
+    except (MissingQueryError, InvalidOperationTypeError) as e:
+        raise e
+    except Exception as exc:
+        error = GraphQLError(str(exc), original_error=exc)
+        execution_context.errors = [error]
+        process_errors([error], execution_context)
+        return ExecutionResult(
+            data=None,
+            errors=[error],
+            extensions=await extensions_runner.get_extensions_results(),
+        )
 
     return ExecutionResult(
         data=execution_context.result.data,
@@ -193,80 +182,82 @@ def execute_sync(
         extensions=list(extensions),
     )
 
-    with extensions_runner.operation():
-        # Note: In graphql-core the schema would be validated here but in
-        # Strawberry we are validating it at initialisation time instead
-        if not execution_context.query:
-            raise MissingQueryError()
-
-        with extensions_runner.parsing():
-            try:
-                if not execution_context.graphql_document:
-                    execution_context.graphql_document = parse_document(
-                        execution_context.query, **execution_context.parse_options
+    try:
+        with extensions_runner.operation():
+            # Note: In graphql-core the schema would be validated here but in
+            # Strawberry we are validating it at initialisation time instead
+            if not execution_context.query:
+                raise MissingQueryError()
+
+            with extensions_runner.parsing():
+                try:
+                    if not execution_context.graphql_document:
+                        execution_context.graphql_document = parse_document(
+                            execution_context.query, **execution_context.parse_options
+                        )
+
+                except GraphQLError as exc:
+                    execution_context.errors = [exc]
+                    process_errors([exc], execution_context)
+                    return ExecutionResult(
+                        data=None,
+                        errors=[exc],
+                        extensions=extensions_runner.get_extensions_results_sync(),
                     )
 
-            except GraphQLError as error:
-                execution_context.errors = [error]
-                process_errors([error], execution_context)
-                return ExecutionResult(
-                    data=None,
-                    errors=[error],
-                    extensions=extensions_runner.get_extensions_results_sync(),
-                )
-
-            except Exception as error:  # pragma: no cover
-                error = GraphQLError(str(error), original_error=error)
-
-                execution_context.errors = [error]
-                process_errors([error], execution_context)
-                return ExecutionResult(
-                    data=None,
-                    errors=[error],
-                    extensions=extensions_runner.get_extensions_results_sync(),
-                )
-
-        if execution_context.operation_type not in allowed_operation_types:
-            raise InvalidOperationTypeError(execution_context.operation_type)
-
-        with extensions_runner.validation():
-            _run_validation(execution_context)
-            if execution_context.errors:
-                process_errors(execution_context.errors, execution_context)
-                return ExecutionResult(data=None, errors=execution_context.errors)
-
-        with extensions_runner.executing():
-            if not execution_context.result:
-                result = original_execute(
-                    schema,
-                    execution_context.graphql_document,
-                    root_value=execution_context.root_value,
-                    middleware=extensions_runner.as_middleware_manager(),
-                    variable_values=execution_context.variables,
-                    operation_name=execution_context.operation_name,
-                    context_value=execution_context.context,
-                    execution_context_class=execution_context_class,
-                )
-
-                if isawaitable(result):
-                    result = cast(Awaitable["GraphQLExecutionResult"], result)
-                    ensure_future(result).cancel()
-                    raise RuntimeError(
-                        "GraphQL execution failed to complete synchronously."
+            if execution_context.operation_type not in allowed_operation_types:
+                raise InvalidOperationTypeError(execution_context.operation_type)
+
+            with extensions_runner.validation():
+                _run_validation(execution_context)
+                if execution_context.errors:
+                    process_errors(execution_context.errors, execution_context)
+                    return ExecutionResult(data=None, errors=execution_context.errors)
+
+            with extensions_runner.executing():
+                if not execution_context.result:
+                    result = original_execute(
+                        schema,
+                        execution_context.graphql_document,
+                        root_value=execution_context.root_value,
+                        middleware=extensions_runner.as_middleware_manager(),
+                        variable_values=execution_context.variables,
+                        operation_name=execution_context.operation_name,
+                        context_value=execution_context.context,
+                        execution_context_class=execution_context_class,
                     )
 
-                result = cast("GraphQLExecutionResult", result)
-                execution_context.result = result
-                # Also set errors on the execution_context so that it's easier
-                # to access in extensions
-                if result.errors:
-                    execution_context.errors = result.errors
-
-                    # Run the `Schema.process_errors` function here before
-                    # extensions have a chance to modify them (see the MaskErrors
-                    # extension). That way we can log the original errors but
-                    # only return a sanitised version to the client.
-                    process_errors(result.errors, execution_context)
+                    if isawaitable(result):
+                        result = cast(Awaitable["GraphQLExecutionResult"], result)
+                        ensure_future(result).cancel()
+                        raise RuntimeError(
+                            "GraphQL execution failed to complete synchronously."
+                        )
+
+                    result = cast("GraphQLExecutionResult", result)
+                    execution_context.result = result
+                    # Also set errors on the execution_context so that it's easier
+                    # to access in extensions
+                    if result.errors:
+                        execution_context.errors = result.errors
+
+                        # Run the `Schema.process_errors` function here before
+                        # extensions have a chance to modify them (see the MaskErrors
+                        # extension). That way we can log the original errors but
+                        # only return a sanitised version to the client.
+                        process_errors(result.errors, execution_context)
+
+    except (MissingQueryError, InvalidOperationTypeError) as e:
+        raise e
+    except Exception as exc:
+        error = GraphQLError(str(exc), original_error=exc)
+        execution_context.errors = [error]
+        process_errors([error], execution_context)
+        return ExecutionResult(
+            data=None,
+            errors=[error],
+            extensions=extensions_runner.get_extensions_results_sync(),
+        )
 
     return ExecutionResult(
         data=execution_context.result.data,

strawberry/schema/schema.py

@@ -55,7 +55,7 @@ if TYPE_CHECKING:
     from strawberry.extensions import SchemaExtension
     from strawberry.field import StrawberryField
     from strawberry.type import StrawberryType
-    from strawberry.types import ExecutionResult, SubscriptionExecutionResult
+    from strawberry.types import ExecutionResult
     from strawberry.union import StrawberryUnion
 
 DEFAULT_ALLOWED_OPERATION_TYPES = {
@@ -239,7 +239,7 @@ class Schema(BaseSchema):
         root_value: Optional[Any] = None,
         operation_name: Optional[str] = None,
         allowed_operation_types: Optional[Iterable[OperationType]] = None,
-    ) -> Union[ExecutionResult, SubscriptionExecutionResult]:
+    ) -> ExecutionResult:
         if allowed_operation_types is None:
             allowed_operation_types = DEFAULT_ALLOWED_OPERATION_TYPES
 

strawberry/types/__init__.py

@@ -1,9 +1,4 @@
-from .execution import ExecutionContext, ExecutionResult, SubscriptionExecutionResult
+from .execution import ExecutionContext, ExecutionResult
 from .info import Info
 
-__all__ = [
-    "ExecutionContext",
-    "ExecutionResult",
-    "SubscriptionExecutionResult",
-    "Info",
-]
+__all__ = ["ExecutionContext", "ExecutionResult", "Info"]

strawberry/types/execution.py

@@ -9,9 +9,8 @@ from typing import (
     Optional,
     Tuple,
     Type,
-    runtime_checkable,
 )
-from typing_extensions import Protocol, TypedDict
+from typing_extensions import TypedDict
 
 from graphql import specified_rules
 
@@ -95,12 +94,3 @@ class ExecutionResult:
 
 class ParseOptions(TypedDict):
     max_tokens: NotRequired[int]
-
-
-@runtime_checkable
-class SubscriptionExecutionResult(Protocol):
-    def __aiter__(self) -> SubscriptionExecutionResult:  # pragma: no cover
-        ...
-
-    async def __anext__(self) -> Any:  # pragma: no cover
-        ...

{strawberry_graphql-0.214.0.dev1699441271.dist-info → strawberry_graphql-0.214.0.dev1701082152.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strawberry-graphql
-Version: 0.214.0.dev1699441271
+Version: 0.214.0.dev1701082152
 Summary: A library for creating GraphQL APIs
 Home-page: https://strawberry.rocks/
 License: MIT

{strawberry_graphql-0.214.0.dev1699441271.dist-info → strawberry_graphql-0.214.0.dev1701082152.dist-info}/RECORD

@@ -6,10 +6,10 @@ strawberry/aiohttp/handlers/graphql_transport_ws_handler.py,sha256=Czzss3Gt9Rdhb
 strawberry/aiohttp/handlers/graphql_ws_handler.py,sha256=0wy0IjBapHwlkfMhVk6frgpOxviNLDbuIn6Q8k5M_2E,2234
 strawberry/aiohttp/test/__init__.py,sha256=4xxdUZtIISSOwjrcnmox7AvT4WWjowCm5bUuPdQneMg,71
 strawberry/aiohttp/test/client.py,sha256=tlpHymSWqhiQbLmKwodcaX2vdc8BW1IaNTFTHlWKlOY,1323
-strawberry/aiohttp/views.py,sha256=vwJpWl_UqEqFwKF412MXR4LwONzyrpyAnKHS0cQyoKk,6934
+strawberry/aiohttp/views.py,sha256=XzIwfXrLGMIVnqU0qqtBtksjue_ng_6LbDgoN_Wyxhs,6017
 strawberry/annotation.py,sha256=HoArlanqDZbV2HftN0lAkEMNOFzEs2AmVJQEpbaF3oE,12879
 strawberry/arguments.py,sha256=6Ke0vVrAKeEj46CPEEWBK3LuZGTeBxeD6wJZFtJWqH8,8432
-strawberry/asgi/__init__.py,sha256=C1KXaF-mZdGz_hTA_I7Q9iG8E_KxDSYKCTwW1mobGWM,7447
+strawberry/asgi/__init__.py,sha256=IJXwXcAx0AGGszZDfEy_n00dXtgL77GKiUYJMvcgA50,6977
 strawberry/asgi/handlers/__init__.py,sha256=rz5Gth2eJUn7tDq2--99KSNFeMdDPpLFCkfA7vge0cI,235
 strawberry/asgi/handlers/graphql_transport_ws_handler.py,sha256=g4OFtFzUfONnypeN6qBg2edwQRHnebLy0pyyFbHZpnE,2097
 strawberry/asgi/handlers/graphql_ws_handler.py,sha256=Yktyks4xQ4KHIByAU-AC2kxrbzDCC5YBCgf3ngqT_GU,2338
@@ -22,7 +22,7 @@ strawberry/channels/__init__.py,sha256=9oRdAT7uIYETF-23gZ5NteOXSjwkUtwRmwu3YCFv1
 strawberry/channels/handlers/base.py,sha256=tgXLjKCHrP-8yOJV-qo9iOMJUgDe2wW6rGs_nDZFi80,7869
 strawberry/channels/handlers/graphql_transport_ws_handler.py,sha256=UKfxRoo1pEv1CBHhkhSTkbztJlfU-OoksFwyLktj8xc,1945
 strawberry/channels/handlers/graphql_ws_handler.py,sha256=PHRkwnXt3tY4E0XBVHh4hpTyFBt9jQfTreBUmEo9vhI,2497
-strawberry/channels/handlers/http_handler.py,sha256=OJ6eTz7EWF6R3wakhB93Yb15gq__Ma8dGq5SVWy2ypo,10645
+strawberry/channels/handlers/http_handler.py,sha256=9pW978XaeF-aFWM9WMaSHCOWmcWoIJCNkW8X3lKJcws,9560
 strawberry/channels/handlers/ws_handler.py,sha256=sHL44eay4tNoKzkrRn3WewSYH-3ZSJzxJpmBJ-aTkeM,4650
 strawberry/channels/router.py,sha256=dyOBbSF8nFiygP0zz6MM14mhkvFQAEbbLBXzcpubSHM,1927
 strawberry/channels/testing.py,sha256=he9cdsu5KxoPfpR8z2E6kwr2hwUjVhACTrTIoIbsSkQ,5519
@@ -58,7 +58,7 @@ strawberry/django/apps.py,sha256=ZWw3Mzv1Cgy0T9xT8Jr2_dkCTZjT5WQABb34iqnu5pc,135
 strawberry/django/context.py,sha256=KHZ-u9tc2ip3FAEj4mXoFPeKVyq3KyVjHqCZM9uFc7c,607
 strawberry/django/test/__init__.py,sha256=4xxdUZtIISSOwjrcnmox7AvT4WWjowCm5bUuPdQneMg,71
 strawberry/django/test/client.py,sha256=lPEbe_4lNL1pSgtywq4O-b6n7ALCW3U9_uvoWz3EaSM,592
-strawberry/django/views.py,sha256=viG1uapkHacQdmfqj__aodMGkOxXxegu4uq5SBBIcSA,9507
+strawberry/django/views.py,sha256=vKUmfxvs75v8eZVM8eJ9KyBP6fFNmrbzwaEejIfE-4g,8971
 strawberry/enum.py,sha256=H1KQdDATMaba-yqdfdek-YHFkqEoq-Kt5yUE57oUXNg,4263
 strawberry/exceptions/__init__.py,sha256=DMnNx3f2km02dchxkKgf5e9akS7LW3vRhUPOLApHXk4,6173
 strawberry/exceptions/conflicting_arguments.py,sha256=b4IFgdHMc44MW00NAUNf0W-NUD7p3s1t8cjyS32fsu4,1579
@@ -123,7 +123,7 @@ strawberry/fastapi/context.py,sha256=hxLoihS9TM16iyUPiAGQf-0i4wv975CJYHHI6EwOewA
 strawberry/fastapi/handlers/__init__.py,sha256=TziBHyibYBOGiidjpCkjNThYbVY7K_nt0hnRLVHVh3I,241
 strawberry/fastapi/handlers/graphql_transport_ws_handler.py,sha256=k8BhP1xQAFc1GnbQoFhi8KQSWwY1x-ngR9qIDVJW_ic,549
 strawberry/fastapi/handlers/graphql_ws_handler.py,sha256=U84lpd7Lxl2bEnFr9QroswmEaMO5ipLCZTeYRAaZH-g,504
-strawberry/fastapi/router.py,sha256=Kht9qrxG3JNjcWnYIIH5fdMsHGrUDkvSJSqLeXAJ9rk,12012
+strawberry/fastapi/router.py,sha256=o55NLbL7n-LoKM30eUCJgzyPlRYPsybWb07L8-fcZZo,11573
 strawberry/federation/__init__.py,sha256=FeUxLiBVuk9TKBmJJi51SeUaI8c80rS8hbl9No-hjII,535
 strawberry/federation/argument.py,sha256=5qyJYlQGEZd6iXWseQ7dnnejCYj5HyglfK10jOCIJBg,802
 strawberry/federation/enum.py,sha256=KpcQfL_efoaNBbb2gl-CYO5PtyVsuyz1LcluTMuRcks,2185
@@ -143,9 +143,9 @@ strawberry/file_uploads/__init__.py,sha256=v2-6FGBqnTnMPSUTFOiXpIutDMl-ga0PFtw5t
 strawberry/file_uploads/scalars.py,sha256=jccJh-h7t4naRiDzrszGoYsp95zdF30c7y5Ht0Zrk_s,131
 strawberry/file_uploads/utils.py,sha256=U8gk1aHjWOBa_Opyvc47h6OpYToGq1QiSnEkI2kphdo,1112
 strawberry/flask/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-strawberry/flask/views.py,sha256=6RkFA-VP5ZFqWePOBsgUweHKwfzrkpBvRsf1XscGLDc,5617
+strawberry/flask/views.py,sha256=t3G7hYqYJXsVuvkVVVjfqaQ2SlNB-uvvWQ0uBlc6iJA,5584
 strawberry/http/__init__.py,sha256=t-Inc7JHEr1Tr_Afu9uAb042ujpYx-jEbe_gqCfuOlc,1403
-strawberry/http/async_base_view.py,sha256=PniDgx0fR2XP_fPkWV8X4Ec2LZnoEjZ9G5sui7WKGgo,10682
+strawberry/http/async_base_view.py,sha256=IOuM3_6DIjz3eNGz8-2YDK3SQS3ThU4Bhr2xXHmi58A,7249
 strawberry/http/base.py,sha256=4W46QvgenE3-Wf8IfxDyPx2hrA-EJ3k6THyUZc19TVw,2372
 strawberry/http/exceptions.py,sha256=4lgbMQ-UF2HHu2PczqkS1vGAcU08cEGY03FMrVvjqeA,155
 strawberry/http/ides.py,sha256=f8sjynd4hCPJIaZaALRfJ2HM9_ghyymuCrBViAH2M34,822
@@ -174,16 +174,16 @@ strawberry/resolvers.py,sha256=g7_g3jmXszziGydY1UG6IItf9s6B1lGLUCnwW1kb8U0,224
 strawberry/sanic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/sanic/context.py,sha256=qfoj8QMaAiWbCQFAdm2KPPJGNc7ilXeKAl5z0XJ2nzo,805
 strawberry/sanic/utils.py,sha256=eDiJPJYpELj4hFsx8CCAHomqe7dDEpStDPm6OfkstJ0,998
-strawberry/sanic/views.py,sha256=rM1diPchUnvRRHRoyuxbrtAHkw8Rx2BNW8xsaUuCYYo,6188
+strawberry/sanic/views.py,sha256=hxEu_pXw2keaZSiNiJxpqY-5nGrkeLL-2MRqWdsTwdU,5542
 strawberry/scalars.py,sha256=CSxTGSvpFyT9H83NxZeiBerl_WPGe43TlSxcrn60960,2076
 strawberry/schema/__init__.py,sha256=u1QCyDVQExUVDA20kyosKPz3TS5HMCN2NrXclhiFAL4,92
-strawberry/schema/base.py,sha256=_DytGAC_uJvAjMbT6Y8EwUg9Gd1JzJrwJghfOWrawy8,3074
+strawberry/schema/base.py,sha256=lQBJyzG2ZhKc544oLbXEbpYOPOjaXBop3lxp68h_lfI,2976
 strawberry/schema/compat.py,sha256=n0r3UPUcGemMqK8vklgtCkkuCA1p6tWAYbc6Vl4iNOw,1684
 strawberry/schema/config.py,sha256=N9KsqkSTnm5snizoBZAVneaWQprhaTd8PFyMuR-jfUs,632
 strawberry/schema/exceptions.py,sha256=_9Ua-lLRCJfbtd8B6MXILNKGI2SwHkcBNkAHYM7ITp8,534
-strawberry/schema/execute.py,sha256=7V4LaBJVPqddwPMIKwMUmfAAVlVFpeb2KQCyk28G1fU,11187
+strawberry/schema/execute.py,sha256=aqLZkqb_cK2OVxfkagP6hS9_XADTpRIkY8I5J75ZhHY,10802
 strawberry/schema/name_converter.py,sha256=UdNyd-QtqF2HsDCQK-nsOcLGxDTj4hJwYFNvMtZnpq4,6533
-strawberry/schema/schema.py,sha256=20vPcUQ7zH4HDJaZvYznGbZ8L1Y8yYKtF42PRCh6FfI,13252
+strawberry/schema/schema.py,sha256=0FlMPIeMwRo2OEUG9lD-OmMFbnpKDACZgBNaCoTVxok,13187
 strawberry/schema/schema_converter.py,sha256=pxUgK5VEI2Puc_zk2lwDPknb3rg-SuFOManl4fSDZ9s,35601
 strawberry/schema/types/__init__.py,sha256=oHO3COWhL3L1KLYCJNY1XFf5xt2GGtHiMC-UaYbFfnA,68
 strawberry/schema/types/base_scalars.py,sha256=Z_BmgwLicNexLipGyw6MmZ7OBnkGJU3ySgaY9SwBWrw,1837
@@ -212,8 +212,8 @@ strawberry/tools/__init__.py,sha256=pdGpZx8wpq03VfUZJyF9JtYxZhGqzzxCiipsalWxJX4,
 strawberry/tools/create_type.py,sha256=QxLRT9-DrSgo6vsu_L818wtlbO3wRtI0dOos0gmn1xk,1593
 strawberry/tools/merge_types.py,sha256=YZ2GSMoDD82bfuvCT0COpN6SLFVRZpTXFFm9LHUyi10,1014
 strawberry/type.py,sha256=KDztUFxVju4CEPPRzZYcyHtDNRrkFYxK-mI99GcqCgU,6511
-strawberry/types/__init__.py,sha256=BgyD5scKfR1cN7SQMVsRMPr5Mb9PzElaHhKe3A_smog,218
-strawberry/types/execution.py,sha256=NYdbKK17jQc8Itmx58M45X8TJk78-8jgpns6_B2uH1Y,3033
+strawberry/types/__init__.py,sha256=APb1Cjy6bxqFxIfDfempP6eb9NE3LYDwQ3gX7r07lXI,139
+strawberry/types/execution.py,sha256=qCqDMJgdAFwdc3uPzVTAKsZlu6fgxPLrFwkoX_PFBq8,2775
 strawberry/types/fields/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/types/fields/resolver.py,sha256=7-fzFfQdf0uWuYyWiSIsGbt2qvpLpGPy6w1T_57cYL8,14140
 strawberry/types/graphql.py,sha256=3SWZEsa0Zy1eVW6vy75BnB7t9_lJVi6TBV3_1j3RNBs,687
@@ -236,8 +236,8 @@ strawberry/utils/logging.py,sha256=flS7hV0JiIOEdXcrIjda4WyIWix86cpHHFNJL8gl1y4,7
 strawberry/utils/operation.py,sha256=Um-tBCPl3_bVFN2Ph7o1mnrxfxBes4HFCj6T0x4kZxE,1135
 strawberry/utils/str_converters.py,sha256=avIgPVLg98vZH9mA2lhzVdyyjqzLsK2NdBw9mJQ02Xk,813
 strawberry/utils/typing.py,sha256=xkRDUaSJH669jtmdUvWIqrj66Vx4tsbrXSuuYy0FPxU,13490
-strawberry_graphql-0.214.0.dev1699441271.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.214.0.dev1699441271.dist-info/METADATA,sha256=o4XvmMZUg8SWPBGAKC3kOWbgPxBn7DDGffFn_4dai7A,7655
-strawberry_graphql-0.214.0.dev1699441271.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-strawberry_graphql-0.214.0.dev1699441271.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.214.0.dev1699441271.dist-info/RECORD,,
+strawberry_graphql-0.214.0.dev1701082152.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.214.0.dev1701082152.dist-info/METADATA,sha256=bfOftMog_QTzzrbp_oDGaFKUGNu3gfcXACVRL4efgdg,7655
+strawberry_graphql-0.214.0.dev1701082152.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+strawberry_graphql-0.214.0.dev1701082152.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.214.0.dev1701082152.dist-info/RECORD,,