Merge pull request #17 from PlayerData/regenerate-ariadne-codegen-again

chore: regenerate ariadne codegen

Author: CraigNewlands

playerdatapy/__init__.py

@@ -73,6 +73,7 @@
     AthleteRelativeAccelzoneAttributes,
     AthleteRelativeDecelzoneAttributes,
     AthleteSpeedzoneAttributes,
+    BandedJumpZoneLowerBoundsInput,
     BulkUpdateMatchEventAttributes,
     ClaimPersonAttributes,
     ClubContextAttributes,
@@ -164,6 +165,7 @@
     "AthleteRelativeAccelzoneAttributes",
     "AthleteRelativeDecelzoneAttributes",
     "AthleteSpeedzoneAttributes",
+    "BandedJumpZoneLowerBoundsInput",
     "BaseModel",
     "BulkUpdateMatchEventAttributes",
     "ChartDataTypeEnum",

playerdatapy/async_base_client.py

@@ -1,5 +1,6 @@
 # Generated by ariadne-codegen
 
+import asyncio
 import enum
 import json
 from collections.abc import AsyncIterator
@@ -12,6 +13,7 @@
 
 from .base_model import UNSET, Upload
 from .exceptions import (
+    GraphQLClientError,
     GraphQLClientGraphQLMultiError,
     GraphQLClientHttpError,
     GraphQLClientInvalidMessageFormat,
@@ -155,11 +157,11 @@ async def execute_ws(
         **kwargs: Any,
     ) -> AsyncIterator[dict[str, Any]]:
         headers = self.ws_headers.copy()
-        headers.update(kwargs.get("extra_headers", {}))
+        headers.update(kwargs.pop("additional_headers", {}))
 
         merged_kwargs: dict[str, Any] = {"origin": self.ws_origin}
         merged_kwargs.update(kwargs)
-        merged_kwargs["extra_headers"] = headers
+        merged_kwargs["additional_headers"] = headers
 
         operation_id = str(uuid4())
         async with ws_connect(
@@ -168,12 +170,17 @@ async def execute_ws(
             **merged_kwargs,
         ) as websocket:
             await self._send_connection_init(websocket)
-            # wait for connection_ack from server
-            await self._handle_ws_message(
-                await websocket.recv(),
-                websocket,
-                expected_type=GraphQLTransportWSMessageType.CONNECTION_ACK,
-            )
+            # Wait for connection_ack; some servers (e.g. Hasura) send ping before
+            # connection_ack, so we loop and handle pings until we get ack.
+            try:
+                await asyncio.wait_for(
+                    self._wait_for_connection_ack(websocket),
+                    timeout=5.0,
+                )
+            except asyncio.TimeoutError as exc:
+                raise GraphQLClientError(
+                    "Connection ack not received within 5 seconds"
+                ) from exc
             await self._send_subscribe(
                 websocket,
                 operation_id=operation_id,
@@ -184,7 +191,7 @@ async def execute_ws(
 
             async for message in websocket:
                 data = await self._handle_ws_message(message, websocket)
-                if data:
+                if data and "connection_ack" not in data:
                     yield data
 
     def _process_variables(
@@ -315,6 +322,13 @@ async def _send_connection_init(self, websocket: ClientConnection) -> None:
             payload["payload"] = self.ws_connection_init_payload
         await websocket.send(json.dumps(payload))
 
+    async def _wait_for_connection_ack(self, websocket: ClientConnection) -> None:
+        """Read messages until connection_ack; handle ping/pong in between."""
+        async for message in websocket:
+            data = await self._handle_ws_message(message, websocket)
+            if data is not None and "connection_ack" in data:
+                return
+
     async def _send_subscribe(
         self,
         websocket: ClientConnection,
@@ -371,5 +385,7 @@ async def _handle_ws_message(
             raise GraphQLClientGraphQLMultiError.from_errors_dicts(
                 errors_dicts=payload, data=message_dict
             )
+        elif type_ == GraphQLTransportWSMessageType.CONNECTION_ACK:
+            return {"connection_ack": True}
 
         return None