Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ariadne_codegen/client_generators/client.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ast
from typing import Optional, Union
from typing import Optional, Union, cast

from graphql import OperationDefinitionNode, OperationType

Expand Down Expand Up @@ -330,7 +330,7 @@ def create_combine_variables_method(self):
method_def = generate_method_definition(
name="_combine_variables",
arguments=args,
body=method_body,
body=cast(list[ast.stmt], method_body),
decorator_list=[],
return_type=returns,
)
Expand Down Expand Up @@ -416,7 +416,7 @@ def create_build_variable_definitions_method(self):
),
]
),
body=method_body,
body=cast(list[ast.stmt], method_body),
return_type=generate_subscript(
generate_name("list"), generate_name("VariableDefinitionNode")
),
Expand Down Expand Up @@ -509,7 +509,7 @@ def create_build_operation_ast_method(self):
),
]
),
body=method_body,
body=cast(list[ast.stmt], method_body),
return_type=generate_name("DocumentNode"),
)

Expand Down Expand Up @@ -607,7 +607,7 @@ def create_execute_custom_operation_method(self, async_client: bool):
generate_arg("operation_name", annotation=generate_name("str")),
]
),
body=method_body,
body=cast(list[ast.stmt], method_body),
return_type=generate_subscript(
generate_name(DICT),
generate_tuple([generate_name("str"), generate_name("Any")]),
Expand Down
2 changes: 1 addition & 1 deletion ariadne_codegen/client_generators/custom_arguments.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,4 +323,4 @@ def generate_clear_arguments_section(
arguments_keyword = [
generate_keyword(arg="arguments", value=generate_name("cleared_arguments"))
]
return arguments_body, arguments_keyword
return (cast(list[ast.stmt], arguments_body), arguments_keyword)
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,19 @@ async def _send_subscribe(
operation_name: Optional[str] = None,
variables: Optional[dict[str, Any]] = None,
) -> None:
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": {"query": query, "operationName": operation_name},
payload_inner: dict[str, Any] = {
"query": query,
"operationName": operation_name,
}
if variables:
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
payload_inner["variables"] = self._convert_dict_to_json_serializable(
variables
)
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": payload_inner,
}
await websocket.send(json.dumps(payload))

async def _handle_ws_message(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -407,15 +407,19 @@ async def _send_subscribe(
operation_name: Optional[str] = None,
variables: Optional[dict[str, Any]] = None,
) -> None:
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": {"query": query, "operationName": operation_name},
payload_inner: dict[str, Any] = {
"query": query,
"operationName": operation_name,
}
if variables:
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
payload_inner["variables"] = self._convert_dict_to_json_serializable(
variables
)
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": payload_inner,
}
await websocket.send(json.dumps(payload))

async def _handle_ws_message(
Expand Down
2 changes: 1 addition & 1 deletion ariadne_codegen/codegen.py
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ def generate_async_for(
return ast.AsyncFor(
target=target,
iter=iter_,
body=body or [ast.Pass()],
body=cast(list[ast.stmt], body or [ast.Pass()]),
orelse=orelse or [],
lineno=lineno,
)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ test = [
"websockets>=14.2",
"opentelemetry-api",
]
types = ["ty"]
types = ["ty>=0.0.20,<0.1.0"]
subscriptions = ["websockets>=15"]
opentelemetry = ["opentelemetry-api"]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,19 @@ async def _send_subscribe(
operation_name: Optional[str] = None,
variables: Optional[dict[str, Any]] = None,
) -> None:
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": {"query": query, "operationName": operation_name},
payload_inner: dict[str, Any] = {
"query": query,
"operationName": operation_name,
}
if variables:
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
payload_inner["variables"] = self._convert_dict_to_json_serializable(
variables
)
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": payload_inner,
}
await websocket.send(json.dumps(payload))

async def _handle_ws_message(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,19 @@ async def _send_subscribe(
operation_name: Optional[str] = None,
variables: Optional[dict[str, Any]] = None,
) -> None:
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": {"query": query, "operationName": operation_name},
payload_inner: dict[str, Any] = {
"query": query,
"operationName": operation_name,
}
if variables:
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
payload_inner["variables"] = self._convert_dict_to_json_serializable(
variables
)
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": payload_inner,
}
await websocket.send(json.dumps(payload))

async def _handle_ws_message(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,19 @@ async def _send_subscribe(
operation_name: Optional[str] = None,
variables: Optional[dict[str, Any]] = None,
) -> None:
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": {"query": query, "operationName": operation_name},
payload_inner: dict[str, Any] = {
"query": query,
"operationName": operation_name,
}
if variables:
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
payload_inner["variables"] = self._convert_dict_to_json_serializable(
variables
)
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": payload_inner,
}
await websocket.send(json.dumps(payload))

async def _handle_ws_message(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,19 @@ async def _send_subscribe(
operation_name: Optional[str] = None,
variables: Optional[dict[str, Any]] = None,
) -> None:
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": {"query": query, "operationName": operation_name},
payload_inner: dict[str, Any] = {
"query": query,
"operationName": operation_name,
}
if variables:
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
payload_inner["variables"] = self._convert_dict_to_json_serializable(
variables
)
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": payload_inner,
}
await websocket.send(json.dumps(payload))

async def _handle_ws_message(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,19 @@ async def _send_subscribe(
operation_name: Optional[str] = None,
variables: Optional[dict[str, Any]] = None,
) -> None:
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": {"query": query, "operationName": operation_name},
payload_inner: dict[str, Any] = {
"query": query,
"operationName": operation_name,
}
if variables:
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
payload_inner["variables"] = self._convert_dict_to_json_serializable(
variables
)
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": payload_inner,
}
await websocket.send(json.dumps(payload))

async def _handle_ws_message(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,19 @@ async def _send_subscribe(
operation_name: Optional[str] = None,
variables: Optional[dict[str, Any]] = None,
) -> None:
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": {"query": query, "operationName": operation_name},
payload_inner: dict[str, Any] = {
"query": query,
"operationName": operation_name,
}
if variables:
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
payload_inner["variables"] = self._convert_dict_to_json_serializable(
variables
)
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": payload_inner,
}
await websocket.send(json.dumps(payload))

async def _handle_ws_message(
Expand Down
14 changes: 9 additions & 5 deletions tests/main/clients/example/expected_client/async_base_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,19 @@ async def _send_subscribe(
operation_name: Optional[str] = None,
variables: Optional[dict[str, Any]] = None,
) -> None:
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": {"query": query, "operationName": operation_name},
payload_inner: dict[str, Any] = {
"query": query,
"operationName": operation_name,
}
if variables:
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
payload_inner["variables"] = self._convert_dict_to_json_serializable(
variables
)
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": payload_inner,
}
await websocket.send(json.dumps(payload))

async def _handle_ws_message(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,19 @@ async def _send_subscribe(
operation_name: Optional[str] = None,
variables: Optional[dict[str, Any]] = None,
) -> None:
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": {"query": query, "operationName": operation_name},
payload_inner: dict[str, Any] = {
"query": query,
"operationName": operation_name,
}
if variables:
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
payload_inner["variables"] = self._convert_dict_to_json_serializable(
variables
)
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": payload_inner,
}
await websocket.send(json.dumps(payload))

async def _handle_ws_message(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,19 @@ async def _send_subscribe(
operation_name: Optional[str] = None,
variables: Optional[dict[str, Any]] = None,
) -> None:
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": {"query": query, "operationName": operation_name},
payload_inner: dict[str, Any] = {
"query": query,
"operationName": operation_name,
}
if variables:
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
payload_inner["variables"] = self._convert_dict_to_json_serializable(
variables
)
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": payload_inner,
}
await websocket.send(json.dumps(payload))

async def _handle_ws_message(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,19 @@ async def _send_subscribe(
operation_name: Optional[str] = None,
variables: Optional[dict[str, Any]] = None,
) -> None:
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": {"query": query, "operationName": operation_name},
payload_inner: dict[str, Any] = {
"query": query,
"operationName": operation_name,
}
if variables:
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
payload_inner["variables"] = self._convert_dict_to_json_serializable(
variables
)
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": payload_inner,
}
await websocket.send(json.dumps(payload))

async def _handle_ws_message(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,19 @@ async def _send_subscribe(
operation_name: Optional[str] = None,
variables: Optional[dict[str, Any]] = None,
) -> None:
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": {"query": query, "operationName": operation_name},
payload_inner: dict[str, Any] = {
"query": query,
"operationName": operation_name,
}
if variables:
payload["payload"]["variables"] = self._convert_dict_to_json_serializable(
payload_inner["variables"] = self._convert_dict_to_json_serializable(
variables
)
payload: dict[str, Any] = {
"id": operation_id,
"type": GraphQLTransportWSMessageType.SUBSCRIBE.value,
"payload": payload_inner,
}
await websocket.send(json.dumps(payload))

async def _handle_ws_message(
Expand Down
Loading
Loading