Refactor code to meet 3.10 3.9 python needs

DamianCzajkowski · DamianCzajkowski · commit be193fd92025 · 2024-07-12T11:51:04.000+02:00
diff --git a/ariadne_codegen/client_generators/client.py b/ariadne_codegen/client_generators/client.py
@@ -278,8 +278,9 @@ def create_combine_variables_method(self):
                 lineno=1,
             ),
             generate_return(
-                value=generate_tuple(
-                    elts=[
+                value=generate_dict(
+                    keys=[generate_constant("types"), generate_constant("values")],
+                    values=[
                         generate_name("variables_types_combined"),
                         generate_name("processed_variables_combined"),
                     ],
@@ -306,13 +307,10 @@ def create_combine_variables_method(self):
         )
 
         returns = generate_subscript(
-            generate_name(TUPLE),
+            generate_name(DICT),
             generate_tuple(
                 [
-                    generate_subscript(
-                        generate_name(DICT),
-                        generate_tuple([generate_name("str"), generate_name("Any")]),
-                    ),
+                    generate_name("str"),
                     generate_subscript(
                         generate_name(DICT),
                         generate_tuple([generate_name("str"), generate_name("Any")]),
@@ -508,8 +506,6 @@ def create_build_operation_ast_method(self):
         )
 
     def create_execute_custom_operation_method(self):
-        variables_types_combined = generate_name("variables_types_combined")
-        processed_variables_combined = generate_name("processed_variables_combined")
         method_body = [
             generate_assign(
                 targets=["selections"],
@@ -521,11 +517,7 @@ def create_execute_custom_operation_method(self):
                 ),
             ),
             ast.Assign(
-                targets=[
-                    generate_tuple(
-                        elts=[variables_types_combined, processed_variables_combined],
-                    )
-                ],
+                targets=[generate_name("combined_variables")],
                 value=generate_call(
                     func=generate_attribute(
                         value=generate_name("self"), attr="_combine_variables"
@@ -540,7 +532,7 @@ def create_execute_custom_operation_method(self):
                     func=generate_attribute(
                         value=generate_name("self"), attr="_build_variable_definitions"
                     ),
-                    args=[generate_name("variables_types_combined")],
+                    args=[generate_name('combined_variables["types"]')],
                 ),
             ),
             generate_assign(
@@ -574,7 +566,7 @@ def create_execute_custom_operation_method(self):
                         keywords=[
                             generate_keyword(
                                 arg="variables",
-                                value=generate_name("processed_variables_combined"),
+                                value=generate_name('combined_variables["values"]'),
                             ),
                             generate_keyword(
                                 arg="operation_name",
diff --git a/tests/main/clients/custom_query_builder/expected_client/client.py b/tests/main/clients/custom_query_builder/expected_client/client.py
@@ -26,25 +26,23 @@ async def execute_custom_operation(
         self, *fields: GraphQLField, operation_type: OperationType, operation_name: str
     ) -> Dict[str, Any]:
         selections = self._build_selection_set(fields)
-        variables_types_combined, processed_variables_combined = (
-            self._combine_variables(fields)
-        )
+        combined_variables = self._combine_variables(fields)
         variable_definitions = self._build_variable_definitions(
-            variables_types_combined
+            combined_variables["types"]
         )
         operation_ast = self._build_operation_ast(
             selections, operation_type, operation_name, variable_definitions
         )
         response = await self.execute(
             print_ast(operation_ast),
-            variables=processed_variables_combined,
+            variables=combined_variables["values"],
             operation_name=operation_name,
         )
         return self.get_data(response)
 
     def _combine_variables(
         self, fields: Tuple[GraphQLField, ...]
-    ) -> Tuple[Dict[str, Any], Dict[str, Any]]:
+    ) -> Dict[str, Dict[str, Any]]:
         variables_types_combined = {}
         processed_variables_combined = {}
         for field in fields:
@@ -55,7 +53,10 @@ def _combine_variables(
             processed_variables_combined.update(
                 {k: v["value"] for k, v in formatted_variables.items()}
             )
-        return (variables_types_combined, processed_variables_combined)
+        return {
+            "types": variables_types_combined,
+            "values": processed_variables_combined,
+        }
 
     def _build_variable_definitions(
         self, variables_types_combined: Dict[str, str]
diff --git a/tests/main/custom_operation_builder/graphql_client/client.py b/tests/main/custom_operation_builder/graphql_client/client.py
@@ -26,25 +26,23 @@ async def execute_custom_operation(
         self, *fields: GraphQLField, operation_type: OperationType, operation_name: str
     ) -> Dict[str, Any]:
         selections = self._build_selection_set(fields)
-        variables_types_combined, processed_variables_combined = (
-            self._combine_variables(fields)
-        )
+        combined_variables = self._combine_variables(fields)
         variable_definitions = self._build_variable_definitions(
-            variables_types_combined
+            combined_variables["types"]
         )
         operation_ast = self._build_operation_ast(
             selections, operation_type, operation_name, variable_definitions
         )
         response = await self.execute(
             print_ast(operation_ast),
-            variables=processed_variables_combined,
+            variables=combined_variables["values"],
             operation_name=operation_name,
         )
         return self.get_data(response)
 
     def _combine_variables(
         self, fields: Tuple[GraphQLField, ...]
-    ) -> Tuple[Dict[str, Any], Dict[str, Any]]:
+    ) -> Dict[str, Dict[str, Any]]:
         variables_types_combined = {}
         processed_variables_combined = {}
         for field in fields:
@@ -55,7 +53,10 @@ def _combine_variables(
             processed_variables_combined.update(
                 {k: v["value"] for k, v in formatted_variables.items()}
             )
-        return (variables_types_combined, processed_variables_combined)
+        return {
+            "types": variables_types_combined,
+            "values": processed_variables_combined,
+        }
 
     def _build_variable_definitions(
         self, variables_types_combined: Dict[str, str]
@@ -86,7 +87,9 @@ def _build_operation_ast(
             ]
         )
 
-    def _build_selection_set(self, fields: List[GraphQLField]) -> List[SelectionNode]:
+    def _build_selection_set(
+        self, fields: Tuple[GraphQLField, ...]
+    ) -> List[SelectionNode]:
         return [field.to_ast(idx) for idx, field in enumerate(fields)]
 
     async def query(self, *fields: GraphQLField, operation_name: str) -> Dict[str, Any]:
diff --git a/tests/main/custom_operation_builder/graphql_client/custom_fields.py b/tests/main/custom_operation_builder/graphql_client/custom_fields.py
@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Any, Optional, Union
 
 from . import (
     AdminGraphQLField,
diff --git a/tests/main/custom_operation_builder/graphql_client/custom_mutations.py b/tests/main/custom_operation_builder/graphql_client/custom_mutations.py
@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Any, Dict, Optional
 
 from .custom_fields import PostFields, UserFields
 from .input_types import AddUserInput, UpdateUserInput
@@ -7,15 +7,17 @@
 class Mutation:
     @classmethod
     def add_user(cls, user_input: AddUserInput) -> UserFields:
-        arguments = {"user_input": {"type": "AddUserInput!", "value": user_input}}
+        arguments: Dict[str, Dict[str, Any]] = {
+            "user_input": {"type": "AddUserInput!", "value": user_input}
+        }
         cleared_arguments = {
             key: value for key, value in arguments.items() if value["value"] is not None
         }
         return UserFields(field_name="addUser", arguments=cleared_arguments)
 
     @classmethod
     def update_user(cls, user_id: str, user_input: UpdateUserInput) -> UserFields:
-        arguments = {
+        arguments: Dict[str, Dict[str, Any]] = {
             "user_id": {"type": "ID!", "value": user_id},
             "user_input": {"type": "UpdateUserInput!", "value": user_input},
         }
@@ -26,7 +28,9 @@ def update_user(cls, user_id: str, user_input: UpdateUserInput) -> UserFields:
 
     @classmethod
     def delete_user(cls, user_id: str) -> UserFields:
-        arguments = {"user_id": {"type": "ID!", "value": user_id}}
+        arguments: Dict[str, Dict[str, Any]] = {
+            "user_id": {"type": "ID!", "value": user_id}
+        }
         cleared_arguments = {
             key: value for key, value in arguments.items() if value["value"] is not None
         }
@@ -36,7 +40,7 @@ def delete_user(cls, user_id: str) -> UserFields:
     def add_post(
         cls, title: str, content: str, author_id: str, published_at: str
     ) -> PostFields:
-        arguments = {
+        arguments: Dict[str, Dict[str, Any]] = {
             "title": {"type": "String!", "value": title},
             "content": {"type": "String!", "value": content},
             "authorId": {"type": "ID!", "value": author_id},
@@ -56,7 +60,7 @@ def update_post(
         content: Optional[str] = None,
         published_at: Optional[str] = None
     ) -> PostFields:
-        arguments = {
+        arguments: Dict[str, Dict[str, Any]] = {
             "post_id": {"type": "ID!", "value": post_id},
             "title": {"type": "String", "value": title},
             "content": {"type": "String", "value": content},
@@ -69,7 +73,9 @@ def update_post(
 
     @classmethod
     def delete_post(cls, post_id: str) -> PostFields:
-        arguments = {"post_id": {"type": "ID!", "value": post_id}}
+        arguments: Dict[str, Dict[str, Any]] = {
+            "post_id": {"type": "ID!", "value": post_id}
+        }
         cleared_arguments = {
             key: value for key, value in arguments.items() if value["value"] is not None
         }
diff --git a/tests/main/custom_operation_builder/graphql_client/custom_queries.py b/tests/main/custom_operation_builder/graphql_client/custom_queries.py
@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Any, Dict, Optional
 
 from .custom_fields import PersonInterfaceInterface, PostFields, UserFields
 from .custom_typing_fields import GraphQLField, SearchResultUnion
@@ -7,55 +7,63 @@
 class Query:
     @classmethod
     def hello(cls) -> GraphQLField:
-        arguments = {}
+        arguments: Dict[str, Dict[str, Any]] = {}
         cleared_arguments = {
             key: value for key, value in arguments.items() if value["value"] is not None
         }
         return GraphQLField(field_name="hello", arguments=cleared_arguments)
 
     @classmethod
     def greeting(cls, *, name: Optional[str] = None) -> GraphQLField:
-        arguments = {"name": {"type": "String", "value": name}}
+        arguments: Dict[str, Dict[str, Any]] = {
+            "name": {"type": "String", "value": name}
+        }
         cleared_arguments = {
             key: value for key, value in arguments.items() if value["value"] is not None
         }
         return GraphQLField(field_name="greeting", arguments=cleared_arguments)
 
     @classmethod
     def user(cls, user_id: str) -> UserFields:
-        arguments = {"user_id": {"type": "ID!", "value": user_id}}
+        arguments: Dict[str, Dict[str, Any]] = {
+            "user_id": {"type": "ID!", "value": user_id}
+        }
         cleared_arguments = {
             key: value for key, value in arguments.items() if value["value"] is not None
         }
         return UserFields(field_name="user", arguments=cleared_arguments)
 
     @classmethod
     def users(cls) -> UserFields:
-        arguments = {}
+        arguments: Dict[str, Dict[str, Any]] = {}
         cleared_arguments = {
             key: value for key, value in arguments.items() if value["value"] is not None
         }
         return UserFields(field_name="users", arguments=cleared_arguments)
 
     @classmethod
     def search(cls, text: str) -> SearchResultUnion:
-        arguments = {"text": {"type": "String!", "value": text}}
+        arguments: Dict[str, Dict[str, Any]] = {
+            "text": {"type": "String!", "value": text}
+        }
         cleared_arguments = {
             key: value for key, value in arguments.items() if value["value"] is not None
         }
         return SearchResultUnion(field_name="search", arguments=cleared_arguments)
 
     @classmethod
     def posts(cls) -> PostFields:
-        arguments = {}
+        arguments: Dict[str, Dict[str, Any]] = {}
         cleared_arguments = {
             key: value for key, value in arguments.items() if value["value"] is not None
         }
         return PostFields(field_name="posts", arguments=cleared_arguments)
 
     @classmethod
     def person(cls, person_id: str) -> PersonInterfaceInterface:
-        arguments = {"person_id": {"type": "ID!", "value": person_id}}
+        arguments: Dict[str, Dict[str, Any]] = {
+            "person_id": {"type": "ID!", "value": person_id}
+        }
         cleared_arguments = {
             key: value for key, value in arguments.items() if value["value"] is not None
         }
@@ -65,7 +73,7 @@ def person(cls, person_id: str) -> PersonInterfaceInterface:
 
     @classmethod
     def people(cls) -> PersonInterfaceInterface:
-        arguments = {}
+        arguments: Dict[str, Dict[str, Any]] = {}
         cleared_arguments = {
             key: value for key, value in arguments.items() if value["value"] is not None
         }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from typing import Union`
	`1`	`+from typing import Any, Optional, Union`
`2`	`2`
`3`	`3`	`from . import (`
`4`	`4`	`AdminGraphQLField,`