strawberry-graphql 0.250.1__tar.gz → 0.252.0__tar.gz

{strawberry_graphql-0.250.1 → strawberry_graphql-0.252.0}/PKG-INFO

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

{strawberry_graphql-0.250.1 → strawberry_graphql-0.252.0}/pyproject.toml

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

{strawberry_graphql-0.250.1 → strawberry_graphql-0.252.0}/strawberry/aiohttp/views.py

@@ -87,17 +87,20 @@ 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
 
     async def iter_json(
         self, *, ignore_parsing_errors: bool = False
-    ) -> AsyncGenerator[Dict[str, object], None]:
+    ) -> AsyncGenerator[object, None]:
         async for ws_message in self.ws:
             if ws_message.type == http.WSMsgType.TEXT:
                 try:
-                    yield ws_message.json()
+                    yield self.view.decode_json(ws_message.data)
                 except JSONDecodeError:
                     if not ignore_parsing_errors:
                         raise NonJsonMessageReceived()
@@ -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.1 → strawberry_graphql-0.252.0}/strawberry/asgi/__init__.py

@@ -87,16 +87,20 @@ 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(
         self, *, ignore_parsing_errors: bool = False
-    ) -> AsyncGenerator[Dict[str, object], None]:
+    ) -> AsyncGenerator[object, None]:
         try:
             while self.ws.application_state != WebSocketState.DISCONNECTED:
                 try:
-                    yield await self.ws.receive_json()
+                    text = await self.ws.receive_text()
+                    yield self.view.decode_json(text)
                 except JSONDecodeError:  # noqa: PERF203
                     if not ignore_parsing_errors:
                         raise NonJsonMessageReceived()
@@ -107,7 +111,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.1 → strawberry_graphql-0.252.0}/strawberry/channels/handlers/ws_handler.py

@@ -6,7 +6,6 @@ import json
 from typing import (
     TYPE_CHECKING,
     AsyncGenerator,
-    Dict,
     Mapping,
     Optional,
     Tuple,
@@ -28,12 +27,18 @@ 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(
         self, *, ignore_parsing_errors: bool = False
-    ) -> AsyncGenerator[Dict[str, object], None]:
+    ) -> AsyncGenerator[object, None]:
         while True:
             message = await self.ws_consumer.message_queue.get()
 
@@ -44,13 +49,13 @@ class ChannelsWebSocketAdapter(AsyncWebSocketAdapter):
                 raise NonTextMessageReceived()
 
             try:
-                yield json.loads(message["message"])
+                yield self.view.decode_json(message["message"])
             except json.JSONDecodeError:
                 if not ignore_parsing_errors:
                     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.1 → strawberry_graphql-0.252.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.1 → strawberry_graphql-0.252.0}/strawberry/http/async_base_view.py

@@ -80,10 +80,13 @@ 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
-    ) -> AsyncGenerator[Dict[str, object], None]: ...
+    ) -> AsyncGenerator[object, None]: ...
 
     @abc.abstractmethod
     async def send_json(self, message: Mapping[str, object]) -> None: ...
@@ -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.1 → strawberry_graphql-0.252.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
 
@@ -40,12 +39,15 @@ class BaseView(Generic[Request]):
 
     def parse_json(self, data: Union[str, bytes]) -> Any:
         try:
-            return json.loads(data)
+            return self.decode_json(data)
         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 decode_json(self, data: Union[str, bytes]) -> object:
+        return json.loads(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.1 → strawberry_graphql-0.252.0}/strawberry/litestar/controller.py

@@ -194,12 +194,15 @@ 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(
         self, *, ignore_parsing_errors: bool = False
-    ) -> AsyncGenerator[Dict[str, object], None]:
+    ) -> AsyncGenerator[object, None]:
         try:
             while self.ws.connection_state != "disconnect":
                 text = await self.ws.receive_text()
@@ -209,7 +212,7 @@ class LitestarWebSocketAdapter(AsyncWebSocketAdapter):
                     raise NonTextMessageReceived()
 
                 try:
-                    yield json.loads(text)
+                    yield self.view.decode_json(text)
                 except json.JSONDecodeError:
                     if not ignore_parsing_errors:
                         raise NonJsonMessageReceived()
@@ -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