strawberry-graphql 0.247.0__py3-none-any.whl → 0.247.2__py3-none-any.whl

strawberry/aiohttp/views.py

@@ -30,6 +30,7 @@ from strawberry.http.exceptions import (
     HTTPException,
     NonJsonMessageReceived,
     NonTextMessageReceived,
+    WebSocketDisconnected,
 )
 from strawberry.http.types import FormData, HTTPMethod, QueryParams
 from strawberry.http.typevars import (
@@ -105,7 +106,10 @@ class AioHTTPWebSocketAdapter(AsyncWebSocketAdapter):
                 raise NonTextMessageReceived()
 
     async def send_json(self, message: Mapping[str, object]) -> None:
-        await self.ws.send_json(message)
+        try:
+            await self.ws.send_json(message)
+        except RuntimeError as exc:
+            raise WebSocketDisconnected from exc
 
     async def close(self, code: int, reason: str) -> None:
         await self.ws.close(code=code, message=reason.encode())

strawberry/asgi/__init__.py

@@ -37,6 +37,7 @@ from strawberry.http.exceptions import (
     HTTPException,
     NonJsonMessageReceived,
     NonTextMessageReceived,
+    WebSocketDisconnected,
 )
 from strawberry.http.types import FormData, HTTPMethod, QueryParams
 from strawberry.http.typevars import (
@@ -105,7 +106,10 @@ class ASGIWebSocketAdapter(AsyncWebSocketAdapter):
             pass
 
     async def send_json(self, message: Mapping[str, object]) -> None:
-        await self.ws.send_json(message)
+        try:
+            await self.ws.send_json(message)
+        except WebSocketDisconnect as exc:
+            raise WebSocketDisconnected from exc
 
     async def close(self, code: int, reason: str) -> None:
         await self.ws.close(code=code, reason=reason)

strawberry/http/exceptions.py

@@ -12,4 +12,8 @@ class NonJsonMessageReceived(Exception):
     pass
 
 
+class WebSocketDisconnected(Exception):
+    pass
+
+
 __all__ = ["HTTPException"]

strawberry/litestar/controller.py

@@ -53,6 +53,7 @@ from strawberry.http.exceptions import (
     HTTPException,
     NonJsonMessageReceived,
     NonTextMessageReceived,
+    WebSocketDisconnected,
 )
 from strawberry.http.types import FormData, HTTPMethod, QueryParams
 from strawberry.http.typevars import Context, RootValue
@@ -216,7 +217,10 @@ class LitestarWebSocketAdapter(AsyncWebSocketAdapter):
             pass
 
     async def send_json(self, message: Mapping[str, object]) -> None:
-        await self.ws.send_json(message)
+        try:
+            await self.ws.send_json(message)
+        except WebSocketDisconnect as exc:
+            raise WebSocketDisconnected from exc
 
     async def close(self, code: int, reason: str) -> None:
         await self.ws.close(code=code, reason=reason)

strawberry/subscriptions/protocols/graphql_transport_ws/handlers.py

@@ -7,7 +7,6 @@ from typing import (
     TYPE_CHECKING,
     Any,
     Awaitable,
-    Callable,
     Dict,
     List,
     Optional,
@@ -15,7 +14,11 @@ from typing import (
 
 from graphql import GraphQLError, GraphQLSyntaxError, parse
 
-from strawberry.http.exceptions import NonJsonMessageReceived, NonTextMessageReceived
+from strawberry.http.exceptions import (
+    NonJsonMessageReceived,
+    NonTextMessageReceived,
+    WebSocketDisconnected,
+)
 from strawberry.subscriptions.protocols.graphql_transport_ws.types import (
     CompleteMessage,
     ConnectionAckMessage,
@@ -76,12 +79,17 @@ class BaseGraphQLTransportWSHandler:
         self.on_request_accepted()
 
         try:
-            async for message in self.websocket.iter_json():
-                await self.handle_message(message)
-        except NonTextMessageReceived:
-            await self.handle_invalid_message("WebSocket message type must be text")
-        except NonJsonMessageReceived:
-            await self.handle_invalid_message("WebSocket message must be valid JSON")
+            try:
+                async for message in self.websocket.iter_json():
+                    await self.handle_message(message)
+            except NonTextMessageReceived:
+                await self.handle_invalid_message("WebSocket message type must be text")
+            except NonJsonMessageReceived:
+                await self.handle_invalid_message(
+                    "WebSocket message must be valid JSON"
+                )
+        except WebSocketDisconnected:
+            pass
         finally:
             await self.shutdown()
 
@@ -127,50 +135,41 @@ class BaseGraphQLTransportWSHandler:
         self.task_logger.exception("Exception in worker task", exc_info=error)
 
     async def handle_message(self, message: dict) -> None:
-        handler: Callable
-        handler_arg: Any
         try:
             message_type = message.pop("type")
 
             if message_type == ConnectionInitMessage.type:
-                handler = self.handle_connection_init
-                handler_arg = ConnectionInitMessage(**message)
+                await self.handle_connection_init(ConnectionInitMessage(**message))
 
             elif message_type == PingMessage.type:
-                handler = self.handle_ping
-                handler_arg = PingMessage(**message)
+                await self.handle_ping(PingMessage(**message))
 
             elif message_type == PongMessage.type:
-                handler = self.handle_pong
-                handler_arg = PongMessage(**message)
+                await self.handle_pong(PongMessage(**message))
 
             elif message_type == SubscribeMessage.type:
-                handler = self.handle_subscribe
-
                 payload_args = message.pop("payload")
-
                 payload = SubscribeMessagePayload(
                     query=payload_args["query"],
                     operationName=payload_args.get("operationName"),
                     variables=payload_args.get("variables"),
                     extensions=payload_args.get("extensions"),
                 )
-                handler_arg = SubscribeMessage(payload=payload, **message)
+                await self.handle_subscribe(
+                    SubscribeMessage(payload=payload, **message)
+                )
 
             elif message_type == CompleteMessage.type:
-                handler = self.handle_complete
-                handler_arg = CompleteMessage(**message)
+                await self.handle_complete(CompleteMessage(**message))
 
             else:
-                handler = self.handle_invalid_message
-                handler_arg = f"Unknown message type: {message_type}"
+                error_message = f"Unknown message type: {message_type}"
+                await self.handle_invalid_message(error_message)
 
         except (KeyError, TypeError):
-            handler = self.handle_invalid_message
-            handler_arg = "Failed to parse message"
-
-        await handler(handler_arg)
-        await self.reap_completed_tasks()
+            await self.handle_invalid_message("Failed to parse message")
+        finally:
+            await self.reap_completed_tasks()
 
     async def handle_connection_init(self, message: ConnectionInitMessage) -> None:
         if self.connection_timed_out:
@@ -246,41 +245,42 @@ class BaseGraphQLTransportWSHandler:
         elif hasattr(self.context, "connection_params"):
             self.context.connection_params = self.connection_params
 
+        operation = Operation(
+            self,
+            message.id,
+            operation_type,
+            message.payload.query,
+            message.payload.variables,
+            message.payload.operationName,
+        )
+
+        operation.task = asyncio.create_task(self.run_operation(operation))
+        self.operations[message.id] = operation
+
+    async def run_operation(self, operation: Operation) -> None:
+        """The operation task's top level method. Cleans-up and de-registers the operation once it is done."""
+        # TODO: Handle errors in this method using self.handle_task_exception()
+
         result_source: Awaitable[ExecutionResult] | Awaitable[SubscriptionResult]
 
         # Get an AsyncGenerator yielding the results
-        if operation_type == OperationType.SUBSCRIPTION:
+        if operation.operation_type == OperationType.SUBSCRIPTION:
             result_source = self.schema.subscribe(
-                query=message.payload.query,
-                variable_values=message.payload.variables,
-                operation_name=message.payload.operationName,
+                query=operation.query,
+                variable_values=operation.variables,
+                operation_name=operation.operation_name,
                 context_value=self.context,
                 root_value=self.root_value,
             )
         else:
             result_source = self.schema.execute(
-                query=message.payload.query,
-                variable_values=message.payload.variables,
+                query=operation.query,
+                variable_values=operation.variables,
                 context_value=self.context,
                 root_value=self.root_value,
-                operation_name=message.payload.operationName,
+                operation_name=operation.operation_name,
             )
 
-        operation = Operation(self, message.id, operation_type)
-
-        # Create task to handle this subscription, reserve the operation ID
-        operation.task = asyncio.create_task(
-            self.operation_task(result_source, operation)
-        )
-        self.operations[message.id] = operation
-
-    async def operation_task(
-        self,
-        result_source: Awaitable[ExecutionResult] | Awaitable[SubscriptionResult],
-        operation: Operation,
-    ) -> None:
-        """The operation task's top level method. Cleans-up and de-registers the operation once it is done."""
-        # TODO: Handle errors in this method using self.handle_task_exception()
         try:
             first_res_or_agen = await result_source
             # that's an immediate error we should end the operation
@@ -341,17 +341,32 @@ class BaseGraphQLTransportWSHandler:
 class Operation:
     """A class encapsulating a single operation with its id. Helps enforce protocol state transition."""
 
-    __slots__ = ["handler", "id", "operation_type", "completed", "task"]
+    __slots__ = [
+        "handler",
+        "id",
+        "operation_type",
+        "query",
+        "variables",
+        "operation_name",
+        "completed",
+        "task",
+    ]
 
     def __init__(
         self,
         handler: BaseGraphQLTransportWSHandler,
         id: str,
         operation_type: OperationType,
+        query: str,
+        variables: Optional[Dict[str, Any]],
+        operation_name: Optional[str],
     ) -> None:
         self.handler = handler
         self.id = id
         self.operation_type = operation_type
+        self.query = query
+        self.variables = variables
+        self.operation_name = operation_name
         self.completed = False
         self.task: Optional[asyncio.Task] = None
 

strawberry/subscriptions/protocols/graphql_ws/handlers.py

@@ -5,13 +5,12 @@ from contextlib import suppress
 from typing import (
     TYPE_CHECKING,
     AsyncGenerator,
-    Awaitable,
     Dict,
     Optional,
     cast,
 )
 
-from strawberry.http.exceptions import NonTextMessageReceived
+from strawberry.http.exceptions import NonTextMessageReceived, WebSocketDisconnected
 from strawberry.subscriptions.protocols.graphql_ws import (
     GQL_COMPLETE,
     GQL_CONNECTION_ACK,
@@ -37,7 +36,6 @@ from strawberry.utils.debug import pretty_print_graphql_operation
 if TYPE_CHECKING:
     from strawberry.http.async_base_view import AsyncWebSocketAdapter
     from strawberry.schema import BaseSchema
-    from strawberry.schema.subscribe import SubscriptionResult
 
 
 class BaseGraphQLWSHandler:
@@ -65,12 +63,17 @@ class BaseGraphQLWSHandler:
 
     async def handle(self) -> None:
         try:
-            async for message in self.websocket.iter_json(ignore_parsing_errors=True):
-                await self.handle_message(cast(OperationMessage, message))
-        except NonTextMessageReceived:
-            await self.websocket.close(
-                code=1002, reason="WebSocket message type must be text"
-            )
+            try:
+                async for message in self.websocket.iter_json(
+                    ignore_parsing_errors=True
+                ):
+                    await self.handle_message(cast(OperationMessage, message))
+            except NonTextMessageReceived:
+                await self.websocket.close(
+                    code=1002, reason="WebSocket message type must be text"
+                )
+        except WebSocketDisconnected:
+            pass
         finally:
             if self.keep_alive_task:
                 self.keep_alive_task.cancel()
@@ -131,15 +134,9 @@ class BaseGraphQLWSHandler:
         if self.debug:
             pretty_print_graphql_operation(operation_name, query, variables)
 
-        result_source = self.schema.subscribe(
-            query=query,
-            variable_values=variables,
-            operation_name=operation_name,
-            context_value=self.context,
-            root_value=self.root_value,
+        result_handler = self.handle_async_results(
+            operation_id, query, operation_name, variables
         )
-
-        result_handler = self.handle_async_results(result_source, operation_id)
         self.tasks[operation_id] = asyncio.create_task(result_handler)
 
     async def handle_stop(self, message: OperationMessage) -> None:
@@ -155,11 +152,19 @@ class BaseGraphQLWSHandler:
 
     async def handle_async_results(
         self,
-        result_source: Awaitable[SubscriptionResult],
         operation_id: str,
+        query: str,
+        operation_name: Optional[str],
+        variables: Optional[Dict[str, object]],
     ) -> None:
         try:
-            agen_or_err = await result_source
+            agen_or_err = await self.schema.subscribe(
+                query=query,
+                variable_values=variables,
+                operation_name=operation_name,
+                context_value=self.context,
+                root_value=self.root_value,
+            )
             if isinstance(agen_or_err, PreExecutionError):
                 assert agen_or_err.errors
                 error_payload = agen_or_err.errors[0].formatted

{strawberry_graphql-0.247.0.dist-info → strawberry_graphql-0.247.2.dist-info}/METADATA

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

{strawberry_graphql-0.247.0.dist-info → strawberry_graphql-0.247.2.dist-info}/RECORD

@@ -3,9 +3,9 @@ strawberry/__main__.py,sha256=3U77Eu21mJ-LY27RG-JEnpbh6Z63wGOom4i-EoLtUcY,59
 strawberry/aiohttp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/aiohttp/test/__init__.py,sha256=4xxdUZtIISSOwjrcnmox7AvT4WWjowCm5bUuPdQneMg,71
 strawberry/aiohttp/test/client.py,sha256=xPwOo1V0XbC86LWHiSRTLcGNOa796flz49wzWmdkvSs,1775
-strawberry/aiohttp/views.py,sha256=Y7seaVmuz2jLQfgcYOhQLQW5oDEIVrHqZoiqe49VVnI,7636
+strawberry/aiohttp/views.py,sha256=nzZSiCT3ruBHRmPy7P7Ow8tzRtCfSpHq0KR_Eu8U1WY,7765
 strawberry/annotation.py,sha256=u5rkFs6CDUaiJZMK7jp_VDUWdZZ3HXQEbR2ocruDpxA,13065
-strawberry/asgi/__init__.py,sha256=2_dRxUUaXp-tMWB9kebutLFK9BH-hSMP6vwmveZHJHQ,7857
+strawberry/asgi/__init__.py,sha256=cykkfbnNfpJu65DrCn3GPI4QamW1d2ez2fI6WVsEnwE,7993
 strawberry/asgi/test/__init__.py,sha256=4xxdUZtIISSOwjrcnmox7AvT4WWjowCm5bUuPdQneMg,71
 strawberry/asgi/test/client.py,sha256=VolupxMna9ktF1lYgV_dUQAIN53DNzVyWTeWTbwsxqE,1448
 strawberry/chalice/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -134,7 +134,7 @@ strawberry/flask/views.py,sha256=3gd1Xgxg3IT72dz2nrMBK094dMNxTUHciu3oofGOAG4,623
 strawberry/http/__init__.py,sha256=GSvHUDXl1cHfLnb37PXOAnxfoXhvz0f467P1O8uDatM,1620
 strawberry/http/async_base_view.py,sha256=n4Kg9sG9awN7EWa0JIQUmMtnyfI6aqRmg3n2IkoQ_F4,15742
 strawberry/http/base.py,sha256=DFGBb6UhHR1EOmZkLn5V-2IKXzjYasg6yv06PQnm9Ds,2336
-strawberry/http/exceptions.py,sha256=6AF0F-Y_CGReeLtZefN4ApJw0cYWfLctvHGWL6NuNTM,297
+strawberry/http/exceptions.py,sha256=9E2dreS1crRoJVUEPuHyx23NcDELDHNzkAOa-rGv-8I,348
 strawberry/http/ides.py,sha256=njYI2b5R0PnY27ll1ePdIvgPQU3m6Aod_JTBrcZYs0U,638
 strawberry/http/parse_content_type.py,sha256=sgtcOO_ZOFg7WWWibYyLc4SU58K-SErcW56kQczQmKU,412
 strawberry/http/sync_base_view.py,sha256=qA9o-Ic4ZcTXiKF02lBsrN7ET6VeXGYWf9m9mjhlfWU,7199
@@ -142,7 +142,7 @@ strawberry/http/temporal_response.py,sha256=QrGYSg7Apu7Mh-X_uPKDZby-UicXw2J_ywxa
 strawberry/http/types.py,sha256=cAuaiUuvaMI_XhZ2Ey6Ej23WyQKqMGFxzzpVHDjVazY,371
 strawberry/http/typevars.py,sha256=8hK5PfNPZXb2EhZmqlobYyfwJJcO2Wb96T91MlLEVJs,450
 strawberry/litestar/__init__.py,sha256=zsXzg-mglCGUVO9iNXLm-yadoDSCK7k-zuyRqyvAh1w,237
-strawberry/litestar/controller.py,sha256=vGLfjnTb6AljROkAy4nUdzr08BeDF5dJFrjDO26NBJM,13856
+strawberry/litestar/controller.py,sha256=yA8f59NuC6ZJgpG2p4HoILko3FdWiNx5AWdkQGti_6U,13992
 strawberry/parent.py,sha256=sXURm0lauSpjUADsmfNGY-Zl7kHs0A67BFcWuWKzRxw,771
 strawberry/permission.py,sha256=HusiB46yZANdpZM3AdzFVZB6JkCu7dcvoZ3QP2E01jM,7575
 strawberry/printer/__init__.py,sha256=DmepjmgtkdF5RxK_7yC6qUyRWn56U-9qeZMbkztYB9w,62
@@ -187,10 +187,10 @@ strawberry/static/pathfinder.html,sha256=0DPx9AmJ2C_sJstFXnWOz9k5tVQHeHaK7qdVY4l
 strawberry/subscriptions/__init__.py,sha256=1VGmiCzFepqRFyCikagkUoHHdoTG3XYlFu9GafoQMws,170
 strawberry/subscriptions/protocols/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strawberry/subscriptions/protocols/graphql_transport_ws/__init__.py,sha256=wN6dkMu6WiaIZTE19PGoN9xXpIN_RdDE_q7F7ZgjCxk,138
-strawberry/subscriptions/protocols/graphql_transport_ws/handlers.py,sha256=WE45AJp3D7LO4tKnFfapQnAK5D1a7Liv3aY5Ga7fvvU,14537
+strawberry/subscriptions/protocols/graphql_transport_ws/handlers.py,sha256=_h-xNf_ZRtjn8PGbxZk3u9qTR-NNNCevdgaFF0uXciw,14728
 strawberry/subscriptions/protocols/graphql_transport_ws/types.py,sha256=udYxzGtwjETYvY5f23org0t-aY4cimTjEGFYUR3idaY,2596
 strawberry/subscriptions/protocols/graphql_ws/__init__.py,sha256=ijn1A1O0Fzv5p9n-jw3T5H7M3oxbN4gbxRaepN7HyJk,553
-strawberry/subscriptions/protocols/graphql_ws/handlers.py,sha256=1Cy3GGQfiAhKJNAvGESR1WElzh4g9YsKYnhFuQoxt-0,7582
+strawberry/subscriptions/protocols/graphql_ws/handlers.py,sha256=tQmQjoA-x4yXLHbjmq7r7fFnNPluIcc7EiYgQSFbiZ0,7740
 strawberry/subscriptions/protocols/graphql_ws/types.py,sha256=CKm4Hy95p6H9u_-QyWdxipwzNeeDIWtilP3RRp8vjPw,1050
 strawberry/test/__init__.py,sha256=U3B5Ng7C_H8GpCpfvgZZcfADMw6cor5hm78gS3nDdMI,115
 strawberry/test/client.py,sha256=Va7J1tIjZ6PxbOqPl57jSp5lNLOZSueHPmrUuUx5sRY,6462
@@ -230,8 +230,8 @@ strawberry/utils/logging.py,sha256=U1cseHGquN09YFhFmRkiphfASKCyK0HUZREImPgVb0c,7
 strawberry/utils/operation.py,sha256=SSXxN-vMqdHO6W2OZtip-1z7y4_A-eTVFdhDvhKeLCk,1193
 strawberry/utils/str_converters.py,sha256=KGd7QH90RevaJjH6SQEkiVVsb8KuhJr_wv5AsI7UzQk,897
 strawberry/utils/typing.py,sha256=3xws5kxSQGsp8BnYyUwClvxXNzZakMAuOPoq1rjHRuk,14252
-strawberry_graphql-0.247.0.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
-strawberry_graphql-0.247.0.dist-info/METADATA,sha256=BIXpXvq7MkMvSToInnl-p1uTVQR_SR1YwogjRYOTSFs,7758
-strawberry_graphql-0.247.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-strawberry_graphql-0.247.0.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
-strawberry_graphql-0.247.0.dist-info/RECORD,,
+strawberry_graphql-0.247.2.dist-info/LICENSE,sha256=m-XnIVUKqlG_AWnfi9NReh9JfKhYOB-gJfKE45WM1W8,1072
+strawberry_graphql-0.247.2.dist-info/METADATA,sha256=UNSXeMuxxVcoA8hC-8-CP-I7jeo-4R8Syg8W-kIA-ZE,7758
+strawberry_graphql-0.247.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+strawberry_graphql-0.247.2.dist-info/entry_points.txt,sha256=Nk7-aT3_uEwCgyqtHESV9H6Mc31cK-VAvhnQNTzTb4k,49
+strawberry_graphql-0.247.2.dist-info/RECORD,,