strawberry-graphql 0.250.0__tar.gz → 0.251.0__tar.gz

{strawberry_graphql-0.250.0 → strawberry_graphql-0.251.0}/PKG-INFO

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

{strawberry_graphql-0.250.0 → strawberry_graphql-0.251.0}/pyproject.toml

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

{strawberry_graphql-0.250.0 → strawberry_graphql-0.251.0}/strawberry/aiohttp/views.py

@@ -87,7 +87,10 @@ class AioHTTPRequestAdapter(AsyncHTTPRequestAdapter):
 
 
 class AioHTTPWebSocketAdapter(AsyncWebSocketAdapter):
-    def __init__(self, request: web.Request, ws: web.WebSocketResponse) -> None:
+    def __init__(
+        self, view: AsyncBaseHTTPView, request: web.Request, ws: web.WebSocketResponse
+    ) -> None:
+        super().__init__(view)
         self.request = request
         self.ws = ws
 
@@ -107,7 +110,7 @@ class AioHTTPWebSocketAdapter(AsyncWebSocketAdapter):
 
     async def send_json(self, message: Mapping[str, object]) -> None:
         try:
-            await self.ws.send_json(message)
+            await self.ws.send_str(self.view.encode_json(message))
         except RuntimeError as exc:
             raise WebSocketDisconnected from exc
 

{strawberry_graphql-0.250.0 → strawberry_graphql-0.251.0}/strawberry/asgi/__init__.py

@@ -87,7 +87,10 @@ class ASGIRequestAdapter(AsyncHTTPRequestAdapter):
 
 
 class ASGIWebSocketAdapter(AsyncWebSocketAdapter):
-    def __init__(self, request: WebSocket, response: WebSocket) -> None:
+    def __init__(
+        self, view: AsyncBaseHTTPView, request: WebSocket, response: WebSocket
+    ) -> None:
+        super().__init__(view)
         self.ws = response
 
     async def iter_json(
@@ -107,7 +110,7 @@ class ASGIWebSocketAdapter(AsyncWebSocketAdapter):
 
     async def send_json(self, message: Mapping[str, object]) -> None:
         try:
-            await self.ws.send_json(message)
+            await self.ws.send_text(self.view.encode_json(message))
         except WebSocketDisconnect as exc:
             raise WebSocketDisconnected from exc
 

{strawberry_graphql-0.250.0 → strawberry_graphql-0.251.0}/strawberry/channels/handlers/ws_handler.py

@@ -28,7 +28,13 @@ if TYPE_CHECKING:
 
 
 class ChannelsWebSocketAdapter(AsyncWebSocketAdapter):
-    def __init__(self, request: GraphQLWSConsumer, response: GraphQLWSConsumer) -> None:
+    def __init__(
+        self,
+        view: AsyncBaseHTTPView,
+        request: GraphQLWSConsumer,
+        response: GraphQLWSConsumer,
+    ) -> None:
+        super().__init__(view)
         self.ws_consumer = response
 
     async def iter_json(
@@ -50,7 +56,7 @@ class ChannelsWebSocketAdapter(AsyncWebSocketAdapter):
                     raise NonJsonMessageReceived()
 
     async def send_json(self, message: Mapping[str, object]) -> None:
-        serialized_message = json.dumps(message)
+        serialized_message = self.view.encode_json(message)
         await self.ws_consumer.send(serialized_message)
 
     async def close(self, code: int, reason: str) -> None:

{strawberry_graphql-0.250.0 → strawberry_graphql-0.251.0}/strawberry/django/views.py

@@ -201,8 +201,8 @@ class BaseView:
             },
         )
 
-    def encode_json(self, response_data: GraphQLHTTPResponse) -> str:
-        return json.dumps(response_data, cls=DjangoJSONEncoder)
+    def encode_json(self, data: object) -> str:
+        return json.dumps(data, cls=DjangoJSONEncoder)
 
 
 class GraphQLView(

{strawberry_graphql-0.250.0 → strawberry_graphql-0.251.0}/strawberry/http/async_base_view.py

@@ -80,6 +80,9 @@ class AsyncHTTPRequestAdapter(abc.ABC):
 
 
 class AsyncWebSocketAdapter(abc.ABC):
+    def __init__(self, view: "AsyncBaseHTTPView") -> None:
+        self.view = view
+
     @abc.abstractmethod
     def iter_json(
         self, *, ignore_parsing_errors: bool = False
@@ -113,7 +116,8 @@ class AsyncBaseHTTPView(
     connection_init_wait_timeout: timedelta = timedelta(minutes=1)
     request_adapter_class: Callable[[Request], AsyncHTTPRequestAdapter]
     websocket_adapter_class: Callable[
-        [WebSocketRequest, WebSocketResponse], AsyncWebSocketAdapter
+        ["AsyncBaseHTTPView", WebSocketRequest, WebSocketResponse],
+        AsyncWebSocketAdapter,
     ]
     graphql_transport_ws_handler_class = BaseGraphQLTransportWSHandler
     graphql_ws_handler_class = BaseGraphQLWSHandler
@@ -265,7 +269,7 @@ class AsyncBaseHTTPView(
             websocket_response = await self.create_websocket_response(
                 request, websocket_subprotocol
             )
-            websocket = self.websocket_adapter_class(request, websocket_response)
+            websocket = self.websocket_adapter_class(self, request, websocket_response)
 
             context = (
                 await self.get_context(request, response=websocket_response)

{strawberry_graphql-0.250.0 → strawberry_graphql-0.251.0}/strawberry/http/base.py

@@ -2,7 +2,6 @@ import json
 from typing import Any, Dict, Generic, List, Mapping, Optional, Union
 from typing_extensions import Protocol
 
-from strawberry.http import GraphQLHTTPResponse
 from strawberry.http.ides import GraphQL_IDE, get_graphql_ide_html
 from strawberry.http.types import HTTPMethod, QueryParams
 
@@ -44,8 +43,8 @@ class BaseView(Generic[Request]):
         except json.JSONDecodeError as e:
             raise HTTPException(400, "Unable to parse request body as JSON") from e
 
-    def encode_json(self, response_data: GraphQLHTTPResponse) -> str:
-        return json.dumps(response_data)
+    def encode_json(self, data: object) -> str:
+        return json.dumps(data)
 
     def parse_query_params(self, params: QueryParams) -> Dict[str, Any]:
         params = dict(params)

{strawberry_graphql-0.250.0 → strawberry_graphql-0.251.0}/strawberry/litestar/controller.py

@@ -194,7 +194,10 @@ class LitestarRequestAdapter(AsyncHTTPRequestAdapter):
 
 
 class LitestarWebSocketAdapter(AsyncWebSocketAdapter):
-    def __init__(self, request: WebSocket, response: WebSocket) -> None:
+    def __init__(
+        self, view: AsyncBaseHTTPView, request: WebSocket, response: WebSocket
+    ) -> None:
+        super().__init__(view)
         self.ws = response
 
     async def iter_json(
@@ -218,7 +221,7 @@ class LitestarWebSocketAdapter(AsyncWebSocketAdapter):
 
     async def send_json(self, message: Mapping[str, object]) -> None:
         try:
-            await self.ws.send_json(message)
+            await self.ws.send_data(data=self.view.encode_json(message))
         except WebSocketDisconnect as exc:
             raise WebSocketDisconnected from exc
 

{strawberry_graphql-0.250.0 → strawberry_graphql-0.251.0}/strawberry/subscriptions/protocols/graphql_ws/handlers.py

@@ -12,14 +12,9 @@ from typing import (
 
 from strawberry.http.exceptions import NonTextMessageReceived, WebSocketDisconnected
 from strawberry.subscriptions.protocols.graphql_ws.types import (
-    CompleteMessage,
-    ConnectionAckMessage,
-    ConnectionErrorMessage,
     ConnectionInitMessage,
-    ConnectionKeepAliveMessage,
     ConnectionTerminateMessage,
     DataMessage,
-    ErrorMessage,
     OperationMessage,
     StartMessage,
     StopMessage,
@@ -93,15 +88,13 @@ class BaseGraphQLWSHandler:
     async def handle_connection_init(self, message: ConnectionInitMessage) -> None:
         payload = message.get("payload")
         if payload is not None and not isinstance(payload, dict):
-            error_message: ConnectionErrorMessage = {"type": "connection_error"}
-            await self.websocket.send_json(error_message)
+            await self.send_message({"type": "connection_error"})
             await self.websocket.close(code=1000, reason="")
             return
 
         self.connection_params = payload
 
-        connection_ack_message: ConnectionAckMessage = {"type": "connection_ack"}
-        await self.websocket.send_json(connection_ack_message)
+        await self.send_message({"type": "connection_ack"})
 
         if self.keep_alive:
             keep_alive_handler = self.handle_keep_alive()
@@ -139,8 +132,7 @@ class BaseGraphQLWSHandler:
     async def handle_keep_alive(self) -> None:
         assert self.keep_alive_interval
         while True:
-            data: ConnectionKeepAliveMessage = {"type": "ka"}
-            await self.websocket.send_json(data)
+            await self.send_message({"type": "ka"})
             await asyncio.sleep(self.keep_alive_interval)
 
     async def handle_async_results(
@@ -160,26 +152,22 @@ class BaseGraphQLWSHandler:
             )
             if isinstance(agen_or_err, PreExecutionError):
                 assert agen_or_err.errors
-                error_payload = agen_or_err.errors[0].formatted
-                error_message: ErrorMessage = {
-                    "type": "error",
-                    "id": operation_id,
-                    "payload": error_payload,
-                }
-                await self.websocket.send_json(error_message)
+                await self.send_message(
+                    {
+                        "type": "error",
+                        "id": operation_id,
+                        "payload": agen_or_err.errors[0].formatted,
+                    }
+                )
             else:
                 self.subscriptions[operation_id] = agen_or_err
 
                 async for result in agen_or_err:
-                    await self.send_data(result, operation_id)
+                    await self.send_data_message(result, operation_id)
 
-                await self.websocket.send_json(
-                    CompleteMessage({"type": "complete", "id": operation_id})
-                )
+                await self.send_message({"type": "complete", "id": operation_id})
         except asyncio.CancelledError:
-            await self.websocket.send_json(
-                CompleteMessage({"type": "complete", "id": operation_id})
-            )
+            await self.send_message({"type": "complete", "id": operation_id})
 
     async def cleanup_operation(self, operation_id: str) -> None:
         if operation_id in self.subscriptions:
@@ -192,7 +180,7 @@ class BaseGraphQLWSHandler:
             await self.tasks[operation_id]
         del self.tasks[operation_id]
 
-    async def send_data(
+    async def send_data_message(
         self, execution_result: ExecutionResult, operation_id: str
     ) -> None:
         data_message: DataMessage = {
@@ -209,7 +197,10 @@ class BaseGraphQLWSHandler:
         if execution_result.extensions:
             data_message["payload"]["extensions"] = execution_result.extensions
 
-        await self.websocket.send_json(data_message)
+        await self.send_message(data_message)
+
+    async def send_message(self, message: OperationMessage) -> None:
+        await self.websocket.send_json(message)
 
 
 __all__ = ["BaseGraphQLWSHandler"]

{strawberry_graphql-0.250.0 → strawberry_graphql-0.251.0}/strawberry/subscriptions/protocols/graphql_ws/types.py

@@ -78,6 +78,7 @@ OperationMessage = Union[
     DataMessage,
     ErrorMessage,
     CompleteMessage,
+    ConnectionKeepAliveMessage,
 ]