Regenerate with list fix

Author: shangyian

datajunction-clients/python/datajunction/graphql_client/async_base_client.py

@@ -18,8 +18,10 @@
 )
 
 try:
-    from websockets.client import (  # type: ignore[import-not-found,unused-ignore]
-        WebSocketClientProtocol,
+    from websockets import (  # type: ignore[import-not-found,unused-ignore]
+        ClientConnection,
+    )
+    from websockets import (
         connect as ws_connect,
     )
     from websockets.typing import (  # type: ignore[import-not-found,unused-ignore]
@@ -31,15 +33,15 @@
     from contextlib import asynccontextmanager
 
     @asynccontextmanager  # type: ignore
-    async def ws_connect(*args, **kwargs):  # pylint: disable=unused-argument
+    async def ws_connect(*args, **kwargs):
         raise NotImplementedError("Subscriptions require 'websockets' package.")
-        yield  # pylint: disable=unreachable
+        yield
 
-    WebSocketClientProtocol = Any  # type: ignore[misc,assignment,unused-ignore]
+    ClientConnection = Any  # type: ignore[misc,assignment,unused-ignore]
     Data = Any  # type: ignore[misc,assignment,unused-ignore]
     Origin = Any  # type: ignore[misc,assignment,unused-ignore]
 
-    def Subprotocol(*args, **kwargs):  # type: ignore # pylint: disable=invalid-name
+    def Subprotocol(*args, **kwargs):  # type: ignore # noqa: N802, N803
         raise NotImplementedError("Subscriptions require 'websockets' package.")
 
 
@@ -304,7 +306,7 @@ async def _execute_json(
             **merged_kwargs,
         )
 
-    async def _send_connection_init(self, websocket: WebSocketClientProtocol) -> None:
+    async def _send_connection_init(self, websocket: ClientConnection) -> None:
         payload: Dict[str, Any] = {
             "type": GraphQLTransportWSMessageType.CONNECTION_INIT.value
         }
@@ -314,7 +316,7 @@ async def _send_connection_init(self, websocket: WebSocketClientProtocol) -> Non
 
     async def _send_subscribe(
         self,
-        websocket: WebSocketClientProtocol,
+        websocket: ClientConnection,
         operation_id: str,
         query: str,
         operation_name: Optional[str] = None,
@@ -334,7 +336,7 @@ async def _send_subscribe(
     async def _handle_ws_message(
         self,
         message: Data,
-        websocket: WebSocketClientProtocol,
+        websocket: ClientConnection,
         expected_type: Optional[GraphQLTransportWSMessageType] = None,
     ) -> Optional[Dict[str, Any]]:
         try:

datajunction-clients/python/datajunction/graphql_client/base_model.py

@@ -2,7 +2,8 @@
 
 from io import IOBase
 
-from pydantic import BaseModel as PydanticBaseModel, ConfigDict
+from pydantic import BaseModel as PydanticBaseModel
+from pydantic import ConfigDict
 
 
 class UnsetType:

datajunction-clients/python/datajunction/graphql_client/custom_queries.py

@@ -1,6 +1,6 @@
 # Generated by ariadne-codegen
 
-from typing import Any, Dict, Optional
+from typing import Any, Dict, List, Optional
 
 from . import NodeType
 from .custom_fields import (
@@ -35,16 +35,16 @@ def find_nodes(
         cls,
         *,
         fragment: Optional[str] = None,
-        names: Optional[str] = None,
-        node_types: Optional[NodeType] = None,
-        tags: Optional[str] = None,
+        names: Optional[List[str]] = None,
+        node_types: Optional[List[NodeType]] = None,
+        tags: Optional[List[str]] = None,
         limit: Optional[int] = None
     ) -> NodeFields:
         arguments: Dict[str, Dict[str, Any]] = {
             "fragment": {"type": "String", "value": fragment},
-            "names": {"type": "String", "value": names},
-            "nodeTypes": {"type": "NodeType", "value": node_types},
-            "tags": {"type": "String", "value": tags},
+            "names": {"type": "[String!]", "value": names},
+            "nodeTypes": {"type": "[NodeType!]", "value": node_types},
+            "tags": {"type": "[String!]", "value": tags},
             "limit": {"type": "Int", "value": limit},
         }
         cleared_arguments = {
@@ -57,9 +57,9 @@ def find_nodes_paginated(
         cls,
         *,
         fragment: Optional[str] = None,
-        names: Optional[str] = None,
-        node_types: Optional[NodeType] = None,
-        tags: Optional[str] = None,
+        names: Optional[List[str]] = None,
+        node_types: Optional[List[NodeType]] = None,
+        tags: Optional[List[str]] = None,
         edited_by: Optional[str] = None,
         namespace: Optional[str] = None,
         after: Optional[str] = None,
@@ -68,9 +68,9 @@ def find_nodes_paginated(
     ) -> NodeConnectionFields:
         arguments: Dict[str, Dict[str, Any]] = {
             "fragment": {"type": "String", "value": fragment},
-            "names": {"type": "String", "value": names},
-            "nodeTypes": {"type": "NodeType", "value": node_types},
-            "tags": {"type": "String", "value": tags},
+            "names": {"type": "[String!]", "value": names},
+            "nodeTypes": {"type": "[NodeType!]", "value": node_types},
+            "tags": {"type": "[String!]", "value": tags},
             "editedBy": {"type": "String", "value": edited_by},
             "namespace": {"type": "String", "value": namespace},
             "after": {"type": "String", "value": after},
@@ -86,10 +86,10 @@ def find_nodes_paginated(
 
     @classmethod
     def common_dimensions(
-        cls, *, nodes: Optional[str] = None
+        cls, *, nodes: Optional[List[str]] = None
     ) -> DimensionAttributeFields:
         arguments: Dict[str, Dict[str, Any]] = {
-            "nodes": {"type": "String", "value": nodes}
+            "nodes": {"type": "[String!]", "value": nodes}
         }
         cleared_arguments = {
             key: value for key, value in arguments.items() if value["value"] is not None
@@ -135,11 +135,14 @@ def measures_sql(
 
     @classmethod
     def list_tags(
-        cls, *, tag_names: Optional[str] = None, tag_types: Optional[str] = None
+        cls,
+        *,
+        tag_names: Optional[List[str]] = None,
+        tag_types: Optional[List[str]] = None
     ) -> TagFields:
         arguments: Dict[str, Dict[str, Any]] = {
-            "tagNames": {"type": "String", "value": tag_names},
-            "tagTypes": {"type": "String", "value": tag_types},
+            "tagNames": {"type": "[String!]", "value": tag_names},
+            "tagTypes": {"type": "[String!]", "value": tag_types},
         }
         cleared_arguments = {
             key: value for key, value in arguments.items() if value["value"] is not None

datajunction-clients/python/datajunction/graphql_client/exceptions.py

@@ -33,13 +33,13 @@ def __init__(
         locations: Optional[List[Dict[str, int]]] = None,
         path: Optional[List[str]] = None,
         extensions: Optional[Dict[str, object]] = None,
-        orginal: Optional[Dict[str, object]] = None,
+        original: Optional[Dict[str, object]] = None,
     ):
         self.message = message
         self.locations = locations
         self.path = path
         self.extensions = extensions
-        self.orginal = orginal
+        self.original = original
 
     def __str__(self) -> str:
         return self.message
@@ -51,7 +51,7 @@ def from_dict(cls, error: Dict[str, Any]) -> "GraphQLClientGraphQLError":
             locations=error.get("locations"),
             path=error.get("path"),
             extensions=error.get("extensions"),
-            orginal=error,
+            original=error,
         )
 
 
@@ -77,7 +77,7 @@ def from_errors_dicts(
         )
 
 
-class GraphQLClientInvalidMessageFormat(GraphQLClientError):
+class GraphQLClientInvalidMessageFormat(GraphQLClientError):  # noqa: N818
     def __init__(self, message: Union[str, bytes]) -> None:
         self.message = message
 

datajunction-server/.pre-commit-config.yaml

@@ -64,6 +64,8 @@ repos:
     - id: ariadne-codegen
       files: ^datajunction-server/datajunction_server/api/graphql/
       name: Generate GraphQL Python Client with Ariadne
-      entry: bash -c 'cd datajunction-server && ariadne-codegen'
-      language: system
+      entry: bash -c 'cd datajunction-server && ariadne-codegen client'
+      language: python
+      additional_dependencies:
+        - git+https://github.com/normanre/ariadne-codegen.git@fix/list-arg-handling#egg=ariadne-codegen
       pass_filenames: false