Tests + linting

Author: magicmark

docs/code_examples/http_multipart_async.py

@@ -9,9 +9,7 @@
 
 async def main():
 
-    transport = HTTPMultipartTransport(
-        url="http://localhost:8000/graphql"
-    )
+    transport = HTTPMultipartTransport(url="http://localhost:8000/graphql")
 
     # Using `async with` on the client will start a connection on the transport
     # and provide a `session` variable to execute queries on this connection

gql/transport/__init__.py

@@ -1,5 +1,4 @@
 from .async_transport import AsyncTransport
-from .http_multipart_transport import HTTPMultipartTransport
 from .transport import Transport
 
-__all__ = ["AsyncTransport", "HTTPMultipartTransport", "Transport"]
+__all__ = ["AsyncTransport", "Transport"]

gql/transport/http_multipart_transport.py

@@ -5,15 +5,15 @@
 the multipart subscription protocol as implemented by Apollo GraphOS Router
 and other compatible servers.
 
-Reference: https://www.apollographql.com/docs/graphos/routing/operations/subscriptions/multipart-protocol
-Issue: https://github.com/graphql-python/gql/issues/463
+Reference:
+https://www.apollographql.com/docs/graphos/routing/operations/subscriptions/multipart-protocol
 """
 
 import asyncio
 import json
 import logging
 from ssl import SSLContext
-from typing import Any, AsyncGenerator, Callable, Dict, Optional, Tuple, Union
+from typing import Any, AsyncGenerator, Callable, Dict, Optional, Union
 
 import aiohttp
 from aiohttp.client_reqrep import Fingerprint
@@ -92,7 +92,7 @@ async def connect(self) -> None:
         if self.session is not None:
             raise TransportAlreadyConnected("Transport is already connected")
 
-        client_session_args = {
+        client_session_args: Dict[str, Any] = {
             "cookies": self.cookies,
             "headers": self.headers,
             "auth": self.auth,
@@ -170,7 +170,7 @@ async def subscribe(
                     error_text = await response.text()
                     raise TransportServerError(
                         f"Server returned {response.status}: {error_text}",
-                        response.status
+                        response.status,
                     )
 
                 content_type = response.headers.get("Content-Type", "")
@@ -183,7 +183,9 @@ async def subscribe(
                     )
 
                 # Parse multipart response
-                async for result in self._parse_multipart_response(response, content_type):
+                async for result in self._parse_multipart_response(
+                    response, content_type
+                ):
                     yield result
 
         except (TransportServerError, TransportProtocolError):
@@ -233,20 +235,24 @@ async def _parse_multipart_response(
                     break  # No complete part yet
 
                 # Check if this is the end boundary
-                if buffer[boundary_pos:boundary_pos + len(end_boundary_bytes)] == end_boundary_bytes:
+                end_pos = boundary_pos + len(end_boundary_bytes)
+                if buffer[boundary_pos:end_pos] == end_boundary_bytes:
                     log.debug("Reached end boundary")
                     return
 
                 # Find the start of the next part (after this boundary)
                 # Look for either another regular boundary or the end boundary
-                next_boundary_pos = buffer.find(boundary_bytes, boundary_pos + len(boundary_bytes))
+                next_boundary_pos = buffer.find(
+                    boundary_bytes, boundary_pos + len(boundary_bytes)
+                )
 
                 if next_boundary_pos == -1:
                     # No next boundary yet, wait for more data
                     break
 
                 # Extract the part between boundaries
-                part_data = buffer[boundary_pos + len(boundary_bytes):next_boundary_pos]
+                start_pos = boundary_pos + len(boundary_bytes)
+                part_data = buffer[start_pos:next_boundary_pos]
 
                 # Parse the part
                 try:
@@ -270,16 +276,16 @@ def _parse_multipart_part(self, part_data: bytes) -> Optional[ExecutionResult]:
         :return: ExecutionResult or None if part is empty/heartbeat
         """
         # Split headers and body by double CRLF or double LF
-        part_str = part_data.decode('utf-8')
+        part_str = part_data.decode("utf-8")
 
         # Try different separators
-        if '\r\n\r\n' in part_str:
-            parts = part_str.split('\r\n\r\n', 1)
-        elif '\n\n' in part_str:
-            parts = part_str.split('\n\n', 1)
+        if "\r\n\r\n" in part_str:
+            parts = part_str.split("\r\n\r\n", 1)
+        elif "\n\n" in part_str:
+            parts = part_str.split("\n\n", 1)
         else:
             # No headers separator found, treat entire content as body
-            parts = ['', part_str]
+            parts = ["", part_str]
 
         if len(parts) < 2:
             return None

tests/test_http_multipart_transport.py

@@ -2,7 +2,6 @@
 import json
 from typing import Mapping
 
-import aiohttp
 import pytest
 
 from gql import Client, gql
@@ -210,7 +209,7 @@ async def handler(request):
         # Transport error has null payload with errors at top level
         error_response = {
             "payload": None,
-            "errors": [{"message": "Transport connection failed"}]
+            "errors": [{"message": "Transport connection failed"}],
         }
         part = (
             f"--graphql\r\n"
@@ -254,7 +253,7 @@ async def handler(request):
         response = {
             "payload": {
                 "data": {"book": book1},
-                "errors": [{"message": "Field deprecated", "path": ["book", "author"]}]
+                "errors": [{"message": "Field deprecated", "path": ["book", "author"]}],
             }
         }
         part = (
@@ -472,9 +471,9 @@ async def test_http_multipart_accept_header(aiohttp_server):
     async def handler(request):
         # Verify the Accept header
         accept_header = request.headers.get("Accept", "")
-        assert 'multipart/mixed' in accept_header
+        assert "multipart/mixed" in accept_header
         assert 'subscriptionSpec="1.0"' in accept_header
-        assert 'application/json' in accept_header
+        assert "application/json" in accept_header
 
         body = create_multipart_response([book1])
         return web.Response(
@@ -617,7 +616,9 @@ async def test_http_multipart_connection_error():
     from gql.transport.http_multipart_transport import HTTPMultipartTransport
 
     # Use an invalid URL that will fail to connect
-    transport = HTTPMultipartTransport(url="http://invalid.local:99999/graphql", timeout=1)
+    transport = HTTPMultipartTransport(
+        url="http://invalid.local:99999/graphql", timeout=1
+    )
 
     async with Client(transport=transport) as session:
         query = gql(subscription_str)