Skip to content

Commit c0ba293

Browse files
DamianCzajkowskiDamianCzajkowski
authored
fix(types): align ty suppressions for GraphQL and optional imports (#427)
1 parent 8f97602 commit c0ba293

23 files changed

Lines changed: 1179 additions & 66 deletions

File tree

‎ariadne_codegen/client_generators/dependencies/async_base_client.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs):
3838
raise NotImplementedError("Subscriptions require 'websockets' package.")
3939
yield
4040

41-
ClientConnection = Any # type: ignore[misc,assignment,unused-ignore]
42-
Data = Any # type: ignore[misc,assignment,unused-ignore]
43-
Origin = Any # type: ignore[misc,assignment,unused-ignore]
41+
ClientConnection = Any # ty: ignore[invalid-assignment]
42+
Data = Any # ty: ignore[invalid-assignment]
43+
Origin = Any # ty: ignore[invalid-assignment]
4444

4545
def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803
4646
raise NotImplementedError("Subscriptions require 'websockets' package.")

‎ariadne_codegen/client_generators/dependencies/async_base_client_open_telemetry.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ async def ws_connect(*args, **kwargs):
4343
raise NotImplementedError("Subscriptions require 'websockets' package.")
4444
yield
4545

46-
ClientConnection = Any # type: ignore[misc,assignment,unused-ignore]
47-
Data = Any # type: ignore[misc,assignment,unused-ignore]
48-
Origin = Any # type: ignore[misc,assignment,unused-ignore]
46+
ClientConnection = Any # ty: ignore[invalid-assignment]
47+
Data = Any # ty: ignore[invalid-assignment]
48+
Origin = Any # ty: ignore[invalid-assignment]
4949

5050
def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803
5151
raise NotImplementedError("Subscriptions require 'websockets' package.")
@@ -62,9 +62,9 @@ def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803
6262
set_span_in_context,
6363
)
6464
except ImportError:
65-
Context = Any # type: ignore[misc,assignment,unused-ignore]
66-
Span = Any # type: ignore[misc,assignment,unused-ignore]
67-
Tracer = Any # type: ignore[misc,assignment,unused-ignore]
65+
Context = Any # ty: ignore[invalid-assignment]
66+
Span = Any # ty: ignore[invalid-assignment]
67+
Tracer = Any # ty: ignore[invalid-assignment]
6868

6969
def get_tracer(*args, **kwargs) -> Tracer: # type: ignore
7070
raise NotImplementedError("Telemetry requires 'opentelemetry-api' package.")

‎ariadne_codegen/client_generators/dependencies/base_client_open_telemetry.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
set_span_in_context,
2424
)
2525
except ImportError:
26-
Context = Any # type: ignore[misc,assignment,unused-ignore]
27-
Span = Any # type: ignore[misc,assignment,unused-ignore]
28-
Tracer = Any # type: ignore[misc,assignment,unused-ignore]
26+
Context = Any # ty: ignore[invalid-assignment]
27+
Span = Any # ty: ignore[invalid-assignment]
28+
Tracer = Any # ty: ignore[invalid-assignment]
2929

3030
def get_tracer(*args, **kwargs) -> Tracer: # type: ignore
3131
raise NotImplementedError("Telemetry requires 'opentelemetry-api' package.")

‎ariadne_codegen/client_generators/result_types.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,11 @@ def _get_field_from_schema(self, type_name: str, field_name: str) -> GraphQLFiel
431431
]
432432
except KeyError as exc:
433433
if field_name == TYPENAME_FIELD_NAME:
434-
return GraphQLField(type_=GraphQLNonNull(type_=GraphQLString))
434+
return GraphQLField(
435+
type_=GraphQLNonNull(
436+
type_=GraphQLString, # ty: ignore[invalid-argument-type]
437+
),
438+
)
435439
raise ParsingError(
436440
f"Field {field_name} not found in type {type_name}."
437441
) from exc

‎ariadne_codegen/schema.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,12 @@ def add_mixin_directive_to_schema(schema: GraphQLSchema) -> GraphQLSchema:
180180
name=MIXIN_NAME,
181181
locations=[DirectiveLocation.FIELD, DirectiveLocation.FRAGMENT_DEFINITION],
182182
args={
183-
MIXIN_IMPORT_NAME: GraphQLArgument(type_=GraphQLString),
184-
MIXIN_FROM_NAME: GraphQLArgument(type_=GraphQLString),
183+
MIXIN_IMPORT_NAME: GraphQLArgument(
184+
type_=GraphQLString, # ty: ignore[invalid-argument-type]
185+
),
186+
MIXIN_FROM_NAME: GraphQLArgument(
187+
type_=GraphQLString, # ty: ignore[invalid-argument-type]
188+
),
185189
},
186190
is_repeatable=True,
187191
),

‎tests/main/clients/client_forward_refs/expected_client/async_base_client.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs):
3838
raise NotImplementedError("Subscriptions require 'websockets' package.")
3939
yield
4040

41-
ClientConnection = Any # type: ignore[misc,assignment,unused-ignore]
42-
Data = Any # type: ignore[misc,assignment,unused-ignore]
43-
Origin = Any # type: ignore[misc,assignment,unused-ignore]
41+
ClientConnection = Any # ty: ignore[invalid-assignment]
42+
Data = Any # ty: ignore[invalid-assignment]
43+
Origin = Any # ty: ignore[invalid-assignment]
4444

4545
def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803
4646
raise NotImplementedError("Subscriptions require 'websockets' package.")

‎tests/main/clients/client_forward_refs_shorter_results/expected_client/async_base_client.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs):
3838
raise NotImplementedError("Subscriptions require 'websockets' package.")
3939
yield
4040

41-
ClientConnection = Any # type: ignore[misc,assignment,unused-ignore]
42-
Data = Any # type: ignore[misc,assignment,unused-ignore]
43-
Origin = Any # type: ignore[misc,assignment,unused-ignore]
41+
ClientConnection = Any # ty: ignore[invalid-assignment]
42+
Data = Any # ty: ignore[invalid-assignment]
43+
Origin = Any # ty: ignore[invalid-assignment]
4444

4545
def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803
4646
raise NotImplementedError("Subscriptions require 'websockets' package.")

‎tests/main/clients/custom_config_file/expected_client/async_base_client.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs):
3838
raise NotImplementedError("Subscriptions require 'websockets' package.")
3939
yield
4040

41-
ClientConnection = Any # type: ignore[misc,assignment,unused-ignore]
42-
Data = Any # type: ignore[misc,assignment,unused-ignore]
43-
Origin = Any # type: ignore[misc,assignment,unused-ignore]
41+
ClientConnection = Any # ty: ignore[invalid-assignment]
42+
Data = Any # ty: ignore[invalid-assignment]
43+
Origin = Any # ty: ignore[invalid-assignment]
4444

4545
def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803
4646
raise NotImplementedError("Subscriptions require 'websockets' package.")

‎tests/main/clients/custom_files_names/expected_client/async_base_client.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs):
3838
raise NotImplementedError("Subscriptions require 'websockets' package.")
3939
yield
4040

41-
ClientConnection = Any # type: ignore[misc,assignment,unused-ignore]
42-
Data = Any # type: ignore[misc,assignment,unused-ignore]
43-
Origin = Any # type: ignore[misc,assignment,unused-ignore]
41+
ClientConnection = Any # ty: ignore[invalid-assignment]
42+
Data = Any # ty: ignore[invalid-assignment]
43+
Origin = Any # ty: ignore[invalid-assignment]
4444

4545
def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803
4646
raise NotImplementedError("Subscriptions require 'websockets' package.")

‎tests/main/clients/custom_query_builder/expected_client/async_base_client.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ async def ws_connect(*args, **kwargs):
3838
raise NotImplementedError("Subscriptions require 'websockets' package.")
3939
yield
4040

41-
ClientConnection = Any # type: ignore[misc,assignment,unused-ignore]
42-
Data = Any # type: ignore[misc,assignment,unused-ignore]
43-
Origin = Any # type: ignore[misc,assignment,unused-ignore]
41+
ClientConnection = Any # ty: ignore[invalid-assignment]
42+
Data = Any # ty: ignore[invalid-assignment]
43+
Origin = Any # ty: ignore[invalid-assignment]
4444

4545
def Subprotocol(*args, **kwargs): # type: ignore # noqa: N802, N803
4646
raise NotImplementedError("Subscriptions require 'websockets' package.")

0 commit comments

Comments
 (0)
⚡