Move WebSocketConnectionError to exceptions (#1026) (#1124)

ariadne/asgi/__init__.py

@@ -1,3 +1,4 @@
+from ..exceptions import WebSocketConnectionError
 from ..types import (
     Extensions,
     MiddlewareList,
@@ -7,7 +8,6 @@
     OnDisconnect,
     OnOperation,
     Operation,
-    WebSocketConnectionError,
 )
 from .graphql import GraphQL
 

ariadne/asgi/handlers/graphql_ws.py

@@ -7,11 +7,11 @@
 from starlette.types import Receive, Scope, Send
 from starlette.websockets import WebSocket, WebSocketDisconnect, WebSocketState
 
+from ...exceptions import WebSocketConnectionError
 from ...graphql import parse_query, subscribe, validate_data
 from ...logger import log_error
 from ...types import (
     Operation,
-    WebSocketConnectionError,
 )
 from ...utils import get_operation_type
 from .base import GraphQLWebsocketHandler

ariadne/exceptions.py

@@ -62,3 +62,15 @@ def format_message(self, file_path: Union[str, os.PathLike], message: str):
     def __str__(self):
         """Returns error message."""
         return self.message
+
+
+class WebSocketConnectionError(Exception):
+    """Special error class enabling custom error reporting for on_connect"""
+
+    def __init__(self, payload: Optional[Union[dict, str]] = None) -> None:
+        if isinstance(payload, dict):
+            self.payload = payload
+        elif payload:
+            self.payload = {"message": str(payload)}
+        else:
+            self.payload = {"message": "Unexpected error has occurred."}

ariadne/types.py

@@ -47,7 +47,6 @@
     "OnDisconnect",
     "OnOperation",
     "OnComplete",
-    "WebSocketConnectionError",
     "Extension",
     "SchemaBindable",
 ]
@@ -503,18 +502,6 @@ class Operation:
 OnComplete = Callable[[WebSocket, Operation], Any]
 
 
-class WebSocketConnectionError(Exception):
-    """Special error class enabling custom error reporting for on_connect"""
-
-    def __init__(self, payload: Optional[Union[dict, str]] = None) -> None:
-        if isinstance(payload, dict):
-            self.payload = payload
-        elif payload:
-            self.payload = {"message": str(payload)}
-        else:
-            self.payload = {"message": "Unexpected error has occurred."}
-
-
 class Extension:
     """Base class for extensions.
 

tests/asgi/test_websockets_graphql_transport_ws.py

@@ -9,7 +9,7 @@
 
 from ariadne.asgi import GraphQL
 from ariadne.asgi.handlers import GraphQLTransportWSHandler
-from ariadne.types import WebSocketConnectionError
+from ariadne.exceptions import WebSocketConnectionError
 from ariadne.utils import get_operation_type
 
 

tests/asgi/test_websockets_graphql_ws.py

@@ -7,7 +7,7 @@
 
 from ariadne.asgi import GraphQL
 from ariadne.asgi.handlers import GraphQLWSHandler
-from ariadne.types import WebSocketConnectionError
+from ariadne.exceptions import WebSocketConnectionError
 
 
 def test_field_can_be_subscribed_using_websocket_connection(client):