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

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

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

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

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

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

@@ -96,11 +96,11 @@ class AioHTTPWebSocketAdapter(AsyncWebSocketAdapter):
 
     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()

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

@@ -5,7 +5,6 @@ from datetime import timedelta
 from json import JSONDecodeError
 from typing import (
     TYPE_CHECKING,
-    Any,
     AsyncGenerator,
     AsyncIterator,
     Callable,
@@ -95,11 +94,12 @@ class ASGIWebSocketAdapter(AsyncWebSocketAdapter):
 
     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()
@@ -184,7 +184,9 @@ class GraphQL(
         else:  # pragma: no cover
             raise ValueError("Unknown scope type: {!r}".format(scope["type"]))
 
-    async def get_root_value(self, request: Union[Request, WebSocket]) -> Optional[Any]:
+    async def get_root_value(
+        self, request: Union[Request, WebSocket]
+    ) -> Optional[RootValue]:
         return None
 
     async def get_context(

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

@@ -6,7 +6,6 @@ import json
 from typing import (
     TYPE_CHECKING,
     AsyncGenerator,
-    Dict,
     Mapping,
     Optional,
     Tuple,
@@ -39,7 +38,7 @@ class ChannelsWebSocketAdapter(AsyncWebSocketAdapter):
 
     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()
 
@@ -50,7 +49,7 @@ 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()

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

@@ -221,8 +221,8 @@ class GraphQLView(
     def get_root_value(self, request: HttpRequest) -> Optional[RootValue]:
         return None
 
-    def get_context(self, request: HttpRequest, response: HttpResponse) -> Any:
-        return StrawberryDjangoContext(request=request, response=response)
+    def get_context(self, request: HttpRequest, response: HttpResponse) -> Context:
+        return StrawberryDjangoContext(request=request, response=response)  # type: ignore
 
     def get_sub_response(self, request: HttpRequest) -> TemporalHttpResponse:
         return TemporalHttpResponse()
@@ -276,11 +276,13 @@ class AsyncGraphQLView(
 
         return view
 
-    async def get_root_value(self, request: HttpRequest) -> Any:
+    async def get_root_value(self, request: HttpRequest) -> Optional[RootValue]:
         return None
 
-    async def get_context(self, request: HttpRequest, response: HttpResponse) -> Any:
-        return StrawberryDjangoContext(request=request, response=response)
+    async def get_context(
+        self, request: HttpRequest, response: HttpResponse
+    ) -> Context:
+        return StrawberryDjangoContext(request=request, response=response)  # type: ignore
 
     async def get_sub_response(self, request: HttpRequest) -> TemporalHttpResponse:
         return TemporalHttpResponse()

{strawberry_graphql-0.251.0 → strawberry_graphql-0.253.0}/strawberry/fastapi/router.py

@@ -38,7 +38,6 @@ from fastapi.utils import generate_unique_id
 from strawberry.asgi import ASGIRequestAdapter, ASGIWebSocketAdapter
 from strawberry.exceptions import InvalidCustomContext
 from strawberry.fastapi.context import BaseContext, CustomContext
-from strawberry.http import process_result
 from strawberry.http.async_base_view import AsyncBaseHTTPView
 from strawberry.http.exceptions import HTTPException
 from strawberry.http.typevars import Context, RootValue
@@ -54,7 +53,6 @@ if TYPE_CHECKING:
     from strawberry.http import GraphQLHTTPResponse
     from strawberry.http.ides import GraphQL_IDE
     from strawberry.schema import BaseSchema
-    from strawberry.types import ExecutionResult
 
 
 class GraphQLRouter(
@@ -268,11 +266,6 @@ class GraphQLRouter(
     async def render_graphql_ide(self, request: Request) -> HTMLResponse:
         return HTMLResponse(self.graphql_ide_html)
 
-    async def process_result(
-        self, request: Request, result: ExecutionResult
-    ) -> GraphQLHTTPResponse:
-        return process_result(result)
-
     async def get_context(
         self, request: Union[Request, WebSocket], response: Union[Response, WebSocket]
     ) -> Context:  # pragma: no cover

{strawberry_graphql-0.251.0 → strawberry_graphql-0.253.0}/strawberry/http/__init__.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-import json
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional
+from typing import TYPE_CHECKING, Any, Dict, List, Optional
 from typing_extensions import Literal, TypedDict
 
 if TYPE_CHECKING:
@@ -36,25 +35,8 @@ class GraphQLRequestData:
     protocol: Literal["http", "multipart-subscription"] = "http"
 
 
-def parse_query_params(params: Dict[str, str]) -> Dict[str, Any]:
-    if "variables" in params:
-        params["variables"] = json.loads(params["variables"])
-
-    return params
-
-
-def parse_request_data(data: Mapping[str, Any]) -> GraphQLRequestData:
-    return GraphQLRequestData(
-        query=data.get("query"),
-        variables=data.get("variables"),
-        operation_name=data.get("operationName"),
-    )
-
-
 __all__ = [
     "GraphQLHTTPResponse",
     "process_result",
     "GraphQLRequestData",
-    "parse_query_params",
-    "parse_request_data",
 ]

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

@@ -86,7 +86,7 @@ class AsyncWebSocketAdapter(abc.ABC):
     @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: ...

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

@@ -39,10 +39,13 @@ 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 decode_json(self, data: Union[str, bytes]) -> object:
+        return json.loads(data)
+
     def encode_json(self, data: object) -> str:
         return json.dumps(data)
 

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

@@ -202,7 +202,7 @@ class LitestarWebSocketAdapter(AsyncWebSocketAdapter):
 
     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()
@@ -212,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()