Skip to content

Commit c057a51

Browse files
fix invalid-assignment rule (#420)
1 parent aa3610a commit c057a51

File tree

24 files changed

+186
-106
lines changed

24 files changed

+186
-106
lines changed

ariadne_codegen/client_generators/client.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import ast
2-
from typing import Optional, Union
2+
from typing import Optional, Union, cast
33

44
from graphql import OperationDefinitionNode, OperationType
55

@@ -330,7 +330,7 @@ def create_combine_variables_method(self):
330330
method_def = generate_method_definition(
331331
name="_combine_variables",
332332
arguments=args,
333-
body=method_body,
333+
body=cast(list[ast.stmt], method_body),
334334
decorator_list=[],
335335
return_type=returns,
336336
)
@@ -416,7 +416,7 @@ def create_build_variable_definitions_method(self):
416416
),
417417
]
418418
),
419-
body=method_body,
419+
body=cast(list[ast.stmt], method_body),
420420
return_type=generate_subscript(
421421
generate_name("list"), generate_name("VariableDefinitionNode")
422422
),
@@ -509,7 +509,7 @@ def create_build_operation_ast_method(self):
509509
),
510510
]
511511
),
512-
body=method_body,
512+
body=cast(list[ast.stmt], method_body),
513513
return_type=generate_name("DocumentNode"),
514514
)
515515

@@ -607,7 +607,7 @@ def create_execute_custom_operation_method(self, async_client: bool):
607607
generate_arg("operation_name", annotation=generate_name("str")),
608608
]
609609
),
610-
body=method_body,
610+
body=cast(list[ast.stmt], method_body),
611611
return_type=generate_subscript(
612612
generate_name(DICT),
613613
generate_tuple([generate_name("str"), generate_name("Any")]),

ariadne_codegen/client_generators/custom_arguments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,4 +323,4 @@ def generate_clear_arguments_section(
323323
arguments_keyword = [
324324
generate_keyword(arg="arguments", value=generate_name("cleared_arguments"))
325325
]
326-
return arguments_body, arguments_keyword
326+
return (cast(list[ast.stmt], arguments_body), arguments_keyword)

ariadne_codegen/client_generators/dependencies/async_base_client.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,15 +335,19 @@ async def _send_subscribe(
335335
operation_name: Optional[str] = None,
336336
variables: Optional[dict[str, Any]] = None,
337337
) -> None:
338-
payload: dict[str, Any] = {
339-
"id": operation_id,
340-
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
341-
"payload": {"query": query, "operationName": operation_name},
338+
payload_inner: dict[str, Any] = {
339+
"query": query,
340+
"operationName": operation_name,
342341
}
343342
if variables:
344-
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
343+
payload_inner["variables"] = self._convert_dict_to_json_serializable(
345344
variables
346345
)
346+
payload: dict[str, Any] = {
347+
"id": operation_id,
348+
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
349+
"payload": payload_inner,
350+
}
347351
await websocket.send(json.dumps(payload))
348352

349353
async def _handle_ws_message(

ariadne_codegen/client_generators/dependencies/async_base_client_open_telemetry.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -407,15 +407,19 @@ async def _send_subscribe(
407407
operation_name: Optional[str] = None,
408408
variables: Optional[dict[str, Any]] = None,
409409
) -> None:
410-
payload: dict[str, Any] = {
411-
"id": operation_id,
412-
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
413-
"payload": {"query": query, "operationName": operation_name},
410+
payload_inner: dict[str, Any] = {
411+
"query": query,
412+
"operationName": operation_name,
414413
}
415414
if variables:
416-
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
415+
payload_inner["variables"] = self._convert_dict_to_json_serializable(
417416
variables
418417
)
418+
payload: dict[str, Any] = {
419+
"id": operation_id,
420+
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
421+
"payload": payload_inner,
422+
}
419423
await websocket.send(json.dumps(payload))
420424

421425
async def _handle_ws_message(

ariadne_codegen/codegen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ def generate_async_for(
393393
return ast.AsyncFor(
394394
target=target,
395395
iter=iter_,
396-
body=body or [ast.Pass()],
396+
body=cast(list[ast.stmt], body or [ast.Pass()]),
397397
orelse=orelse or [],
398398
lineno=lineno,
399399
)

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ test = [
4848
"websockets>=14.2",
4949
"opentelemetry-api",
5050
]
51-
types = ["ty"]
51+
types = ["ty>=0.0.20,<0.1.0"]
5252
subscriptions = ["websockets>=15"]
5353
opentelemetry = ["opentelemetry-api"]
5454

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,15 +335,19 @@ async def _send_subscribe(
335335
operation_name: Optional[str] = None,
336336
variables: Optional[dict[str, Any]] = None,
337337
) -> None:
338-
payload: dict[str, Any] = {
339-
"id": operation_id,
340-
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
341-
"payload": {"query": query, "operationName": operation_name},
338+
payload_inner: dict[str, Any] = {
339+
"query": query,
340+
"operationName": operation_name,
342341
}
343342
if variables:
344-
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
343+
payload_inner["variables"] = self._convert_dict_to_json_serializable(
345344
variables
346345
)
346+
payload: dict[str, Any] = {
347+
"id": operation_id,
348+
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
349+
"payload": payload_inner,
350+
}
347351
await websocket.send(json.dumps(payload))
348352

349353
async def _handle_ws_message(

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,15 +335,19 @@ async def _send_subscribe(
335335
operation_name: Optional[str] = None,
336336
variables: Optional[dict[str, Any]] = None,
337337
) -> None:
338-
payload: dict[str, Any] = {
339-
"id": operation_id,
340-
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
341-
"payload": {"query": query, "operationName": operation_name},
338+
payload_inner: dict[str, Any] = {
339+
"query": query,
340+
"operationName": operation_name,
342341
}
343342
if variables:
344-
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
343+
payload_inner["variables"] = self._convert_dict_to_json_serializable(
345344
variables
346345
)
346+
payload: dict[str, Any] = {
347+
"id": operation_id,
348+
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
349+
"payload": payload_inner,
350+
}
347351
await websocket.send(json.dumps(payload))
348352

349353
async def _handle_ws_message(

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,15 +335,19 @@ async def _send_subscribe(
335335
operation_name: Optional[str] = None,
336336
variables: Optional[dict[str, Any]] = None,
337337
) -> None:
338-
payload: dict[str, Any] = {
339-
"id": operation_id,
340-
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
341-
"payload": {"query": query, "operationName": operation_name},
338+
payload_inner: dict[str, Any] = {
339+
"query": query,
340+
"operationName": operation_name,
342341
}
343342
if variables:
344-
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
343+
payload_inner["variables"] = self._convert_dict_to_json_serializable(
345344
variables
346345
)
346+
payload: dict[str, Any] = {
347+
"id": operation_id,
348+
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
349+
"payload": payload_inner,
350+
}
347351
await websocket.send(json.dumps(payload))
348352

349353
async def _handle_ws_message(

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -335,15 +335,19 @@ async def _send_subscribe(
335335
operation_name: Optional[str] = None,
336336
variables: Optional[dict[str, Any]] = None,
337337
) -> None:
338-
payload: dict[str, Any] = {
339-
"id": operation_id,
340-
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
341-
"payload": {"query": query, "operationName": operation_name},
338+
payload_inner: dict[str, Any] = {
339+
"query": query,
340+
"operationName": operation_name,
342341
}
343342
if variables:
344-
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
343+
payload_inner["variables"] = self._convert_dict_to_json_serializable(
345344
variables
346345
)
346+
payload: dict[str, Any] = {
347+
"id": operation_id,
348+
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
349+
"payload": payload_inner,
350+
}
347351
await websocket.send(json.dumps(payload))
348352

349353
async def _handle_ws_message(

0 commit comments

Comments
 (0)