From 29fd0283b8b7d2e94a4905662bbb892a3c491314 Mon Sep 17 00:00:00 2001 From: "damian.czajkowski" Date: Mon, 2 Nov 2026 20:16:27 +0100 Subject: [PATCH] fix: make generated clients type-check with httpx and mypy Fixes #463 - HttpClient protocols now take request arguments as keyword-only and drop **kwargs, so httpx.Client, httpx.AsyncClient and requests.Session satisfy them structurally. Base clients only call post() with keywords. - Restore mypy-compatible `# type: ignore[...]` comments on the optional websockets and opentelemetry fallbacks (ty honours them as well). - Add a ty-checked regression test assigning httpx clients to every shipped HttpClient protocol. --- .../dependencies/async_base_client.py | 8 ++-- .../async_base_client_no_upload.py | 8 ++-- .../async_base_client_open_telemetry.py | 14 +++---- ...nc_base_client_open_telemetry_no_upload.py | 14 +++---- .../dependencies/base_client.py | 2 +- .../dependencies/base_client_no_upload.py | 2 +- .../base_client_open_telemetry.py | 8 ++-- .../base_client_open_telemetry_no_upload.py | 8 ++-- docs/02-guides/03-using-generated-client.md | 4 +- .../dependencies/test_http_client_protocol.py | 41 +++++++++++++++++++ .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/base_client.py | 2 +- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_client/async_base_client.py | 8 ++-- .../expected_single_file_client.py | 8 ++-- .../graphql_client/async_base_client.py | 8 ++-- 34 files changed, 168 insertions(+), 127 deletions(-) create mode 100644 tests/client_generators/dependencies/test_http_client_protocol.py diff --git a/ariadne_codegen/client_generators/dependencies/async_base_client.py b/ariadne_codegen/client_generators/dependencies/async_base_client.py index 3deb969a..e085e11f 100644 --- a/ariadne_codegen/client_generators/dependencies/async_base_client.py +++ b/ariadne_codegen/client_generators/dependencies/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/ariadne_codegen/client_generators/dependencies/async_base_client_no_upload.py b/ariadne_codegen/client_generators/dependencies/async_base_client_no_upload.py index df7d2300..2b1bc1e3 100644 --- a/ariadne_codegen/client_generators/dependencies/async_base_client_no_upload.py +++ b/ariadne_codegen/client_generators/dependencies/async_base_client_no_upload.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/ariadne_codegen/client_generators/dependencies/async_base_client_open_telemetry.py b/ariadne_codegen/client_generators/dependencies/async_base_client_open_telemetry.py index 95a187d3..cb056b28 100644 --- a/ariadne_codegen/client_generators/dependencies/async_base_client_open_telemetry.py +++ b/ariadne_codegen/client_generators/dependencies/async_base_client_open_telemetry.py @@ -44,9 +44,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -63,9 +63,9 @@ def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 set_span_in_context, ) except ImportError: - Context = Any # ty: ignore[invalid-assignment] - Span = Any # ty: ignore[invalid-assignment] - Tracer = Any # ty: ignore[invalid-assignment] + Context = Any # type: ignore[misc,assignment,unused-ignore] + Span = Any # type: ignore[misc,assignment,unused-ignore] + Tracer = Any # type: ignore[misc,assignment,unused-ignore] def get_tracer(*args, **kwargs) -> Tracer: # type: ignore raise NotImplementedError("Telemetry requires 'opentelemetry-api' package.") @@ -84,11 +84,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/ariadne_codegen/client_generators/dependencies/async_base_client_open_telemetry_no_upload.py b/ariadne_codegen/client_generators/dependencies/async_base_client_open_telemetry_no_upload.py index 6e9b9a44..edc1b5bf 100644 --- a/ariadne_codegen/client_generators/dependencies/async_base_client_open_telemetry_no_upload.py +++ b/ariadne_codegen/client_generators/dependencies/async_base_client_open_telemetry_no_upload.py @@ -43,9 +43,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -62,9 +62,9 @@ def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 set_span_in_context, ) except ImportError: - Context = Any # ty: ignore[invalid-assignment] - Span = Any # ty: ignore[invalid-assignment] - Tracer = Any # ty: ignore[invalid-assignment] + Context = Any # type: ignore[misc,assignment,unused-ignore] + Span = Any # type: ignore[misc,assignment,unused-ignore] + Tracer = Any # type: ignore[misc,assignment,unused-ignore] def get_tracer(*args, **kwargs) -> Tracer: # type: ignore raise NotImplementedError("Telemetry requires 'opentelemetry-api' package.") @@ -83,11 +83,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/ariadne_codegen/client_generators/dependencies/base_client.py b/ariadne_codegen/client_generators/dependencies/base_client.py index 1db9ac7f..384f3301 100644 --- a/ariadne_codegen/client_generators/dependencies/base_client.py +++ b/ariadne_codegen/client_generators/dependencies/base_client.py @@ -23,11 +23,11 @@ class HttpClient(Protocol): def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... def close(self) -> None: ... diff --git a/ariadne_codegen/client_generators/dependencies/base_client_no_upload.py b/ariadne_codegen/client_generators/dependencies/base_client_no_upload.py index 1496359d..eaabb80b 100644 --- a/ariadne_codegen/client_generators/dependencies/base_client_no_upload.py +++ b/ariadne_codegen/client_generators/dependencies/base_client_no_upload.py @@ -22,11 +22,11 @@ class HttpClient(Protocol): def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... def close(self) -> None: ... diff --git a/ariadne_codegen/client_generators/dependencies/base_client_open_telemetry.py b/ariadne_codegen/client_generators/dependencies/base_client_open_telemetry.py index b0b9dee0..762e221f 100644 --- a/ariadne_codegen/client_generators/dependencies/base_client_open_telemetry.py +++ b/ariadne_codegen/client_generators/dependencies/base_client_open_telemetry.py @@ -23,9 +23,9 @@ set_span_in_context, ) except ImportError: - Context = Any # ty: ignore[invalid-assignment] - Span = Any # ty: ignore[invalid-assignment] - Tracer = Any # ty: ignore[invalid-assignment] + Context = Any # type: ignore[misc,assignment,unused-ignore] + Span = Any # type: ignore[misc,assignment,unused-ignore] + Tracer = Any # type: ignore[misc,assignment,unused-ignore] def get_tracer(*args, **kwargs) -> Tracer: # type: ignore raise NotImplementedError("Telemetry requires 'opentelemetry-api' package.") @@ -44,11 +44,11 @@ class HttpClient(Protocol): def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... def close(self) -> None: ... diff --git a/ariadne_codegen/client_generators/dependencies/base_client_open_telemetry_no_upload.py b/ariadne_codegen/client_generators/dependencies/base_client_open_telemetry_no_upload.py index 27d6ca57..9fa3a29b 100644 --- a/ariadne_codegen/client_generators/dependencies/base_client_open_telemetry_no_upload.py +++ b/ariadne_codegen/client_generators/dependencies/base_client_open_telemetry_no_upload.py @@ -23,9 +23,9 @@ set_span_in_context, ) except ImportError: - Context = Any # ty: ignore[invalid-assignment] - Span = Any # ty: ignore[invalid-assignment] - Tracer = Any # ty: ignore[invalid-assignment] + Context = Any # type: ignore[misc,assignment,unused-ignore] + Span = Any # type: ignore[misc,assignment,unused-ignore] + Tracer = Any # type: ignore[misc,assignment,unused-ignore] def get_tracer(*args, **kwargs) -> Tracer: # type: ignore raise NotImplementedError("Telemetry requires 'opentelemetry-api' package.") @@ -44,11 +44,11 @@ class HttpClient(Protocol): def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... def close(self) -> None: ... diff --git a/docs/02-guides/03-using-generated-client.md b/docs/02-guides/03-using-generated-client.md index 88d31dc9..b30eaa55 100644 --- a/docs/02-guides/03-using-generated-client.md +++ b/docs/02-guides/03-using-generated-client.md @@ -138,11 +138,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... @@ -161,11 +161,11 @@ class HttpClient(Protocol): def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... def close(self) -> None: ... diff --git a/tests/client_generators/dependencies/test_http_client_protocol.py b/tests/client_generators/dependencies/test_http_client_protocol.py new file mode 100644 index 00000000..bc3721c9 --- /dev/null +++ b/tests/client_generators/dependencies/test_http_client_protocol.py @@ -0,0 +1,41 @@ +import httpx + +from ariadne_codegen.client_generators.dependencies import ( + async_base_client, + async_base_client_no_upload, + async_base_client_open_telemetry, + async_base_client_open_telemetry_no_upload, + base_client, + base_client_no_upload, + base_client_open_telemetry, + base_client_open_telemetry_no_upload, +) + +# Annotated assignments below are checked by ty during lint: httpx clients +# must structurally satisfy every HttpClient protocol shipped with the clients. + + +def test_httpx_client_satisfies_sync_http_client_protocols(): + http_client = httpx.Client() + + protocols: tuple[ + base_client.HttpClient, + base_client_no_upload.HttpClient, + base_client_open_telemetry.HttpClient, + base_client_open_telemetry_no_upload.HttpClient, + ] = (http_client, http_client, http_client, http_client) + + assert all(protocol is http_client for protocol in protocols) + + +def test_httpx_async_client_satisfies_async_http_client_protocols(): + http_client = httpx.AsyncClient() + + protocols: tuple[ + async_base_client.HttpClient, + async_base_client_no_upload.HttpClient, + async_base_client_open_telemetry.HttpClient, + async_base_client_open_telemetry_no_upload.HttpClient, + ] = (http_client, http_client, http_client, http_client) + + assert all(protocol is http_client for protocol in protocols) diff --git a/tests/main/clients/alias_generator/expected_client/async_base_client.py b/tests/main/clients/alias_generator/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/alias_generator/expected_client/async_base_client.py +++ b/tests/main/clients/alias_generator/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/client_forward_refs/expected_client/async_base_client.py b/tests/main/clients/client_forward_refs/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/client_forward_refs/expected_client/async_base_client.py +++ b/tests/main/clients/client_forward_refs/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/client_forward_refs_shorter_results/expected_client/async_base_client.py b/tests/main/clients/client_forward_refs_shorter_results/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/client_forward_refs_shorter_results/expected_client/async_base_client.py +++ b/tests/main/clients/client_forward_refs_shorter_results/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/custom_config_file/expected_client/async_base_client.py b/tests/main/clients/custom_config_file/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/custom_config_file/expected_client/async_base_client.py +++ b/tests/main/clients/custom_config_file/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/custom_files_names/expected_client/async_base_client.py b/tests/main/clients/custom_files_names/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/custom_files_names/expected_client/async_base_client.py +++ b/tests/main/clients/custom_files_names/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/custom_query_builder/expected_client/async_base_client.py b/tests/main/clients/custom_query_builder/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/custom_query_builder/expected_client/async_base_client.py +++ b/tests/main/clients/custom_query_builder/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/custom_query_builder_scalars/expected_client/async_base_client.py b/tests/main/clients/custom_query_builder_scalars/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/custom_query_builder_scalars/expected_client/async_base_client.py +++ b/tests/main/clients/custom_query_builder_scalars/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/custom_scalars/expected_client/async_base_client.py b/tests/main/clients/custom_scalars/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/custom_scalars/expected_client/async_base_client.py +++ b/tests/main/clients/custom_scalars/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/custom_sync_query_builder/expected_client/base_client.py b/tests/main/clients/custom_sync_query_builder/expected_client/base_client.py index 1db9ac7f..384f3301 100644 --- a/tests/main/clients/custom_sync_query_builder/expected_client/base_client.py +++ b/tests/main/clients/custom_sync_query_builder/expected_client/base_client.py @@ -23,11 +23,11 @@ class HttpClient(Protocol): def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... def close(self) -> None: ... diff --git a/tests/main/clients/defer_model_build/expected_client/async_base_client.py b/tests/main/clients/defer_model_build/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/defer_model_build/expected_client/async_base_client.py +++ b/tests/main/clients/defer_model_build/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/example/expected_client/async_base_client.py b/tests/main/clients/example/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/example/expected_client/async_base_client.py +++ b/tests/main/clients/example/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/extended_models/expected_client/async_base_client.py b/tests/main/clients/extended_models/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/extended_models/expected_client/async_base_client.py +++ b/tests/main/clients/extended_models/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/fragments_on_abstract_types/expected_client/async_base_client.py b/tests/main/clients/fragments_on_abstract_types/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/fragments_on_abstract_types/expected_client/async_base_client.py +++ b/tests/main/clients/fragments_on_abstract_types/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/inline_fragments/expected_client/async_base_client.py b/tests/main/clients/inline_fragments/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/inline_fragments/expected_client/async_base_client.py +++ b/tests/main/clients/inline_fragments/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/interface_as_fragment/expected_client/async_base_client.py b/tests/main/clients/interface_as_fragment/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/interface_as_fragment/expected_client/async_base_client.py +++ b/tests/main/clients/interface_as_fragment/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/multiple_fragments/expected_client/async_base_client.py b/tests/main/clients/multiple_fragments/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/multiple_fragments/expected_client/async_base_client.py +++ b/tests/main/clients/multiple_fragments/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/no_empty_files_generated/expected_client/async_base_client.py b/tests/main/clients/no_empty_files_generated/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/no_empty_files_generated/expected_client/async_base_client.py +++ b/tests/main/clients/no_empty_files_generated/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/no_multipart_upload/expected_client/async_base_client.py b/tests/main/clients/no_multipart_upload/expected_client/async_base_client.py index 80574a75..21943ff2 100644 --- a/tests/main/clients/no_multipart_upload/expected_client/async_base_client.py +++ b/tests/main/clients/no_multipart_upload/expected_client/async_base_client.py @@ -40,9 +40,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -58,11 +58,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/only_used_inputs_and_enums/expected_client/async_base_client.py b/tests/main/clients/only_used_inputs_and_enums/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/only_used_inputs_and_enums/expected_client/async_base_client.py +++ b/tests/main/clients/only_used_inputs_and_enums/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/operations/expected_client/async_base_client.py b/tests/main/clients/operations/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/operations/expected_client/async_base_client.py +++ b/tests/main/clients/operations/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/remote_schema/expected_client/async_base_client.py b/tests/main/clients/remote_schema/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/remote_schema/expected_client/async_base_client.py +++ b/tests/main/clients/remote_schema/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/shorter_results/expected_client/async_base_client.py b/tests/main/clients/shorter_results/expected_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/clients/shorter_results/expected_client/async_base_client.py +++ b/tests/main/clients/shorter_results/expected_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/clients/single_file_client/expected_single_file_client.py b/tests/main/clients/single_file_client/expected_single_file_client.py index 57f56dc9..a63af585 100644 --- a/tests/main/clients/single_file_client/expected_single_file_client.py +++ b/tests/main/clients/single_file_client/expected_single_file_client.py @@ -203,9 +203,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -221,11 +221,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ... diff --git a/tests/main/custom_operation_builder/graphql_client/async_base_client.py b/tests/main/custom_operation_builder/graphql_client/async_base_client.py index 3deb969a..e085e11f 100644 --- a/tests/main/custom_operation_builder/graphql_client/async_base_client.py +++ b/tests/main/custom_operation_builder/graphql_client/async_base_client.py @@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs): raise NotImplementedError("Subscriptions require 'websockets' package.") yield - ClientConnection = Any # ty: ignore[invalid-assignment] - Data = Any # ty: ignore[invalid-assignment] - Origin = str # ty: ignore[invalid-assignment] + ClientConnection = Any # type: ignore[misc,assignment,unused-ignore] + Data = Any # type: ignore[misc,assignment,unused-ignore] + Origin = str # type: ignore[misc,assignment,unused-ignore] def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803 raise NotImplementedError("Subscriptions require 'websockets' package.") @@ -56,11 +56,11 @@ class HttpClient(Protocol): async def post( self, url: Any | str, + *, json: Any | None = None, data: Any | None = None, files: Any | None = None, headers: Any | None = None, - **kwargs: Any, ) -> Response: ... async def aclose(self) -> None: ...