Change unset constant names to be more verbose

Author: mat-sop

ariadne_codegen/client_generators/arguments.py

@@ -27,7 +27,7 @@
 from ..exceptions import ParsingError
 from ..plugins.manager import PluginManager
 from ..utils import process_name
-from .constants import ANY, OPTIONAL, SIMPLE_TYPE_MAP, UNSET, UNSET_TYPE
+from .constants import ANY, OPTIONAL, SIMPLE_TYPE_MAP, UNSET_NAME, UNSET_TYPE_NAME
 from .scalars import ScalarData
 
 
@@ -77,7 +77,7 @@ def generate(
 
         arguments = generate_arguments(
             args=required_args + optional_args,
-            defaults=[generate_name(UNSET) for _ in optional_args],
+            defaults=[generate_name(UNSET_NAME) for _ in optional_args],
         )
 
         if self.plugin_manager:
@@ -155,7 +155,7 @@ def _process_optional_arg_annotation(
         self, annotation: ast.Subscript
     ) -> ast.Subscript:
         return generate_union_annotation(
-            types=[annotation, generate_name(UNSET_TYPE)], nullable=False
+            types=[annotation, generate_name(UNSET_TYPE_NAME)], nullable=False
         )
 
     def _get_dict_value(

ariadne_codegen/client_generators/constants.py

@@ -53,5 +53,5 @@
 SCALARS_PARSE_DICT_NAME = "SCALARS_PARSE_FUNCTIONS"
 SCALARS_SERIALIZE_DICT_NAME = "SCALARS_SERIALIZE_FUNCTIONS"
 
-UNSET = "UNSET"
-UNSET_TYPE = "UnsetType"
+UNSET_NAME = "UNSET"
+UNSET_TYPE_NAME = "UnsetType"

ariadne_codegen/client_generators/package.py

@@ -19,8 +19,8 @@
     GRAPHQL_CLIENT_EXCEPTIONS_NAMES,
     SOURCE_COMMENT,
     TIMESTAMP_COMMENT,
-    UNSET,
-    UNSET_TYPE,
+    UNSET_NAME,
+    UNSET_TYPE_NAME,
 )
 from .enums import EnumsGenerator
 from .init_file import InitFileGenerator
@@ -72,7 +72,7 @@ def __init__(
             [BASE_MODEL_CLASS_NAME], self.base_model_file_path.stem, 1
         )
         self.unset_import = generate_import_from(
-            [UNSET, UNSET_TYPE], self.base_model_file_path.stem, 1
+            [UNSET_NAME, UNSET_TYPE_NAME], self.base_model_file_path.stem, 1
         )
         self.exceptions_file_path = (
             Path(__file__).parent / "dependencies" / "exceptions.py"

tests/client_generators/test_arguments_generator.py

@@ -7,8 +7,8 @@
     ANY,
     OPTIONAL,
     UNION,
-    UNSET,
-    UNSET_TYPE,
+    UNSET_NAME,
+    UNSET_TYPE_NAME,
 )
 from ariadne_codegen.client_generators.scalars import ScalarData
 
@@ -83,7 +83,7 @@ def test_generate_returns_arguments_with_correct_optional_annotation():
                             ast.Subscript(
                                 value=ast.Name(id=OPTIONAL), slice=ast.Name(id="str")
                             ),
-                            ast.Name(id=UNSET_TYPE),
+                            ast.Name(id=UNSET_TYPE_NAME),
                         ]
                     ),
                 ),
@@ -124,7 +124,7 @@ def test_generate_returns_arguments_with_default_value_for_optional_args():
                             ast.Subscript(
                                 value=ast.Name(id=OPTIONAL), slice=ast.Name(id="str")
                             ),
-                            ast.Name(id=UNSET_TYPE),
+                            ast.Name(id=UNSET_TYPE_NAME),
                         ]
                     ),
                 ),
@@ -138,15 +138,15 @@ def test_generate_returns_arguments_with_default_value_for_optional_args():
                             ast.Subscript(
                                 value=ast.Name(id=OPTIONAL), slice=ast.Name(id="int")
                             ),
-                            ast.Name(id=UNSET_TYPE),
+                            ast.Name(id=UNSET_TYPE_NAME),
                         ]
                     ),
                 ),
             ),
         ],
         kwonlyargs=[],
         kw_defaults=[],
-        defaults=[ast.Name(id=UNSET), ast.Name(id=UNSET)],
+        defaults=[ast.Name(id=UNSET_NAME), ast.Name(id=UNSET_NAME)],
     )
 
     arguments, _ = generator.generate(variable_definitions)

tests/client_generators/test_client_generator.py

@@ -11,8 +11,8 @@
     OPTIONAL,
     TYPING_MODULE,
     UNION,
-    UNSET,
-    UNSET_TYPE,
+    UNSET_NAME,
+    UNSET_TYPE_NAME,
 )
 from ariadne_codegen.client_generators.scalars import ScalarData
 
@@ -168,7 +168,7 @@ def test_generate_returns_module_with_correct_imports():
         ),
         unset_import=ast.ImportFrom(
             module="base_model",
-            names=[ast.alias(name=UNSET), ast.alias(name=UNSET_TYPE)],
+            names=[ast.alias(name=UNSET_NAME), ast.alias(name=UNSET_TYPE_NAME)],
             level=1,
         ),
         custom_scalars=scalars,
@@ -179,7 +179,7 @@ def test_generate_returns_module_with_correct_imports():
         ),
         ast.ImportFrom(
             module="base_model",
-            names=[ast.alias(name=UNSET), ast.alias(name=UNSET_TYPE)],
+            names=[ast.alias(name=UNSET_NAME), ast.alias(name=UNSET_TYPE_NAME)],
             level=1,
         ),
         ast.ImportFrom(module="enums", names=[ast.alias(name="TestEnum")], level=1),