[graphql-pydantic-converter] Fix missing inputs in extracted form whe… (#54)

* [graphql-pydantic-converter] Fix missing inputs in extracted form when input as an alias

---------

Co-authored-by: Jozef Volak <[email protected]>

Author: Jozefiel

utils/graphql-pydantic-converter/CHANGELOG.md

@@ -1,17 +1,3 @@
-# 0.0.3
-- Add unit tests to project
-- Fix mutation input rendering for list items
-- Generate graphql schema request with custom typeOf depth
-
-# 0.1.0
-- Changed default payload boolean value from True to False
-- In query or mutation must be defined response properties
-- Generating of pydantic dataclasses for response parsing
-
-# 0.1.2
-- Ignore generating of private graphql schema objects
-- Add graphql_pydantic_converter.graphql_types.concatenate_queries function
-
 # 1.0.0
 - Migration to pydantic v2
 
@@ -25,4 +11,8 @@
 
 # 1.1.0
 - Support inline and extracted variables for mutation and query
-- Stringify fix
+- Stringify fix
+
+# 1.1.1
+- Fix missing inputs for mutation and query render in extracted format
+- ENUM keys always uppercase

utils/graphql-pydantic-converter/graphql_pydantic_converter/graphql_types.py

@@ -212,7 +212,7 @@ def _extracted_variables(self, payload: str) -> QueryForm:
         for key, value in model.items():
             if key == 'payload':
                 continue
-            if input_dict.get(key) is None:
+            if input_dict.get(value.alias or key) is None:
                 continue
             if value.json_schema_extra:
                 extra_inputs: dict[str, str] = dict(**value.json_schema_extra)
@@ -340,7 +340,7 @@ def _extracted_variables(self, payload: str) -> QueryForm:
         for key, value in model.items():
             if key == 'payload':
                 continue
-            if input_dict.get(key) is None:
+            if input_dict.get(value.alias or key) is None:
                 continue
             if value.json_schema_extra:
                 extra_inputs: dict[str, str] = dict(**value.json_schema_extra)

utils/graphql-pydantic-converter/graphql_pydantic_converter/schema_converter.py

@@ -206,10 +206,6 @@ def __import_classes(self, items: dict[str, Any], worker_list: list[Optional[str
         ]
         self.__result += '\n'.join(imports)
 
-        self.__result += 'from pydantic import BaseModel\n'
-        self.__result += 'from pydantic import Field\n'
-        self.__result += 'from pydantic import PrivateAttr\n\n'
-
         if items[GraphqlJsonParser.TypeKind.ENUM]:
             self.__result += kv_template.substitute(type=GraphqlJsonParser.ConverterMap.ENUM.value)
         if items[GraphqlJsonParser.TypeKind.INPUT_OBJECT]:
@@ -224,7 +220,9 @@ def __import_classes(self, items: dict[str, Any], worker_list: list[Optional[str
             self.__result += kv_template.substitute(type=GraphqlJsonParser.ConverterMap.QUERY.value)
         if GraphqlJsonParser.ConverterMap.SUBSCRIPTION in worker_list:
             self.__result += kv_template.substitute(type=GraphqlJsonParser.ConverterMap.SUBSCRIPTION.value)
-
+        self.__result += 'from pydantic import BaseModel\n'
+        self.__result += 'from pydantic import Field\n'
+        self.__result += 'from pydantic import PrivateAttr\n'
         self.__result += '\n'
 
     def __extract_fields(self, of_type: OfType | Type, previous: list[Any]) -> list[Any]:
@@ -335,17 +333,19 @@ def __create_scalar(self, scalars: list[Type]) -> None:
                 self.__ignore_enums.append(scalar.name)
 
     def __create_enum(self, enums: list[Type]) -> None:
-        kv_template = Template("$indent$name = '$name'\n")
+        kv_template = Template("$indent$key = '$name'\n")
         for enum in enums:
 
             if enum.name:
                 if enum.name.startswith('__') and self.__ignore_private_objects:
                     return
-
                 tmp_enum = [self.__class_template.substitute(name=enum.name, type='ENUM')]
                 if enum.enum_values:
                     for i in enum.enum_values:
-                        tmp_enum.append(kv_template.substitute(indent=self.__INDENT, name=i.name))
+                        key: Optional[str] = None
+                        if i.name:
+                            key = i.name.upper()
+                        tmp_enum.append(kv_template.substitute(indent=self.__INDENT, name=i.name, key=key))
                     self.__result += (''.join(tmp_enum))
                     if enum.name:
                         self.__enums.append(enum.name)

utils/graphql-pydantic-converter/pyproject.toml

@@ -19,7 +19,7 @@ packages = [{ include = "graphql_pydantic_converter" }]
 name = "graphql-pydantic-converter"
 description = "Convert pydantic schema to pydantic datamodel and build request from it"
 authors = ["Jozef Volak <[email protected]>"]
-version = '1.1.0'
+version = '1.1.1'
 readme = ["README.md", "CHANGELOG.md"]
 keywords = ["graphql", "pydantic"]
 license = "Apache 2.0"
@@ -35,11 +35,11 @@ reportGeneralTypeIssues = "none"
 line-length = 120
 extend-select = ['Q', 'RUF100', 'C90', 'UP', 'I', 'E', 'F', 'N', 'PL']
 fixable = ["A", "B", "C", "D", "E", "F", "G", "I", "N", "Q", "S", "T", "W", "ANN", "ARG", "BLE", "COM", "DJ", "DTZ", "EM", "ERA", "EXE", "FBT", "ICN", "INP", "ISC", "NPY", "PD", "PGH", "PIE", "PL", "PT", "PTH", "PYI", "RET", "RSE", "RUF", "SIM", "SLF", "TCH", "TID", "TRY", "UP", "YTT"]
-
 target-version = "py310"
+exclude = ['tests']
 
 [tool.ruff.isort]
-known-first-party = ['graphql_pydantic_converter']
+known-first-party = ['graphql_pydantic_converter', 'tests']
 force-single-line = true
 
 [tool.ruff.flake8-quotes]

utils/graphql-pydantic-converter/tests/model.py

@@ -2,17 +2,16 @@
 
 import typing
 
-from pydantic import BaseModel
-from pydantic import Field
-from pydantic import PrivateAttr
-
 from graphql_pydantic_converter.graphql_types import ENUM
 from graphql_pydantic_converter.graphql_types import Input
 from graphql_pydantic_converter.graphql_types import Interface
 from graphql_pydantic_converter.graphql_types import Mutation
 from graphql_pydantic_converter.graphql_types import Payload
 from graphql_pydantic_converter.graphql_types import Query
 from graphql_pydantic_converter.graphql_types import Subscription
+from pydantic import BaseModel
+from pydantic import Field
+from pydantic import PrivateAttr
 
 String: typing.TypeAlias = str
 Int: typing.TypeAlias = int
@@ -34,8 +33,8 @@ class DeviceSize(ENUM):
 
 
 class GraphEdgeStatus(ENUM):
-    ok = 'ok'
-    unknown = 'unknown'
+    OK = 'ok'
+    UNKNOWN = 'unknown'
 
 
 class BaseGraphNode(Interface):