strawberry-graphql 0.214.0.dev1699441271__tar.gz → 0.214.0.dev1701082152__tar.gz

{strawberry_graphql-0.214.0.dev1699441271 → strawberry_graphql-0.214.0.dev1701082152}/PKG-INFO

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

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

{strawberry_graphql-0.214.0.dev1699441271 → strawberry_graphql-0.214.0.dev1701082152}/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_graphql-0.214.0.dev1699441271 → strawberry_graphql-0.214.0.dev1701082152}/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_graphql-0.214.0.dev1699441271 → strawberry_graphql-0.214.0.dev1701082152}/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_graphql-0.214.0.dev1699441271 → strawberry_graphql-0.214.0.dev1701082152}/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_graphql-0.214.0.dev1699441271 → strawberry_graphql-0.214.0.dev1701082152}/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_graphql-0.214.0.dev1699441271 → strawberry_graphql-0.214.0.dev1701082152}/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_graphql-0.214.0.dev1699441271 → strawberry_graphql-0.214.0.dev1701082152}/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_graphql-0.214.0.dev1699441271 → strawberry_graphql-0.214.0.dev1701082152}/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_graphql-0.214.0.dev1699441271 → strawberry_graphql-0.214.0.dev1701082152}/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