datamodel-code-generator 0.28.0__py3-none-any.whl → 0.28.2__py3-none-any.whl

datamodel_code_generator/parser/__init__.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from collections import UserDict
 from enum import Enum
 from typing import Callable, TypeVar
 
@@ -12,7 +13,7 @@ class LiteralType(Enum):
     One = "one"
 
 
-class DefaultPutDict(dict[TK, TV]):
+class DefaultPutDict(UserDict[TK, TV]):
     def get_or_put(
         self,
         key: TK,

datamodel_code_generator/parser/base.py

@@ -1242,7 +1242,8 @@ class Parser(ABC):
             else:
                 module = ("__init__.py",)
 
-            scoped_model_resolver = ModelResolver()
+            all_module_fields = {field.name for model in models for field in model.fields if field.name is not None}
+            scoped_model_resolver = ModelResolver(exclude_names=all_module_fields)
 
             self.__override_required_field(models)
             self.__replace_unique_list_to_set(models)

datamodel_code_generator/parser/graphql.py

@@ -386,9 +386,15 @@ class GraphQLParser(Parser):
             elif graphql.is_non_null_type(obj):  # pragma: no cover
                 data_type.is_optional = False
 
-            obj = obj.of_type  # pyright: ignore[reportAttributeAccessIssue]
+            obj = graphql.assert_wrapping_type(obj)
+            obj = obj.of_type
 
-        data_type.type = obj.name  # pyright: ignore[reportAttributeAccessIssue]
+        if graphql.is_enum_type(obj):
+            obj = graphql.assert_enum_type(obj)
+            data_type.reference = self.references[obj.name]
+
+        obj = graphql.assert_named_type(obj)
+        data_type.type = obj.name
 
         required = (not self.force_optional_for_required_fields) and (not final_data_type.is_optional)
 

{datamodel_code_generator-0.28.0.dist-info → datamodel_code_generator-0.28.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datamodel-code-generator
-Version: 0.28.0
+Version: 0.28.2
 Summary: Datamodel Code Generator
 Project-URL: Homepage, https://github.com/koxudaxi/datamodel-code-generator
 Project-URL: Source, https://github.com/koxudaxi/datamodel-code-generator

{datamodel_code_generator-0.28.0.dist-info → datamodel_code_generator-0.28.2.dist-info}/RECORD

@@ -47,13 +47,13 @@ datamodel_code_generator/model/template/pydantic/dataclass.jinja2,sha256=hM4OZTV
 datamodel_code_generator/model/template/pydantic_v2/BaseModel.jinja2,sha256=XdSCvA0hSdjkMtI9CA3M-2xBgieCOV-sWIfQvJPnJ4I,1119
 datamodel_code_generator/model/template/pydantic_v2/ConfigDict.jinja2,sha256=xHvBYrh__32O1xRCSl6_u5zbyYIjB8a5k8fZiTo0spY,149
 datamodel_code_generator/model/template/pydantic_v2/RootModel.jinja2,sha256=XQBlML7Hm5hN6_AExENNvVc_yxNWijcIfTTbbmegCpE,1223
-datamodel_code_generator/parser/__init__.py,sha256=rC48GTtjexex8g15iKlWJswi2TUzk8letyyCCVN_8ew,814
-datamodel_code_generator/parser/base.py,sha256=ZECK7DEDwXkANRsKQJF9NLPafgFm9hJZ_KfCb5YvA4E,59060
-datamodel_code_generator/parser/graphql.py,sha256=-sPUXpDnH5KDjCyOyLurLre1exy55HLcVP8ZFP3L6t4,22256
+datamodel_code_generator/parser/__init__.py,sha256=3XtFcDPocaetfjmWFqj_CubqNCDipb7vXZHsYKdJXXU,851
+datamodel_code_generator/parser/base.py,sha256=cGguXxF7DNRPz4Nq-AmpLKZL5SKBFr-qOGNp_1e7WlY,59208
+datamodel_code_generator/parser/graphql.py,sha256=n3WwlzdDndNKIRZXXVUPImdfJfqreC9AUEb7fB6UwpA,22406
 datamodel_code_generator/parser/jsonschema.py,sha256=5qz5zfX-eWrq9XZCQheTV6-ZzCGG87rvTrbYn6qLars,69148
 datamodel_code_generator/parser/openapi.py,sha256=TPefYZoQ8NosYLuj7htXpTwhBQHIGzvXpmtvt0RZyBk,26993
-datamodel_code_generator-0.28.0.dist-info/METADATA,sha256=5950BPksQ9vaVoCGsNQwtp9N17MB8z9Di7-DCakuExo,24912
-datamodel_code_generator-0.28.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-datamodel_code_generator-0.28.0.dist-info/entry_points.txt,sha256=cJVcHiEViQMANaoM5C1xR5hzmyCqH6hHHMpV8W00in8,77
-datamodel_code_generator-0.28.0.dist-info/licenses/LICENSE,sha256=K54Lwc6_jduycsy8oFFjQEeSSuEiqvVIjCGIXOMnuTQ,1068
-datamodel_code_generator-0.28.0.dist-info/RECORD,,
+datamodel_code_generator-0.28.2.dist-info/METADATA,sha256=Rn5ls_a2VIEh_5Ip3UJzfM2QAdMeG6NOHiugmoHCYn8,24912
+datamodel_code_generator-0.28.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+datamodel_code_generator-0.28.2.dist-info/entry_points.txt,sha256=cJVcHiEViQMANaoM5C1xR5hzmyCqH6hHHMpV8W00in8,77
+datamodel_code_generator-0.28.2.dist-info/licenses/LICENSE,sha256=K54Lwc6_jduycsy8oFFjQEeSSuEiqvVIjCGIXOMnuTQ,1068
+datamodel_code_generator-0.28.2.dist-info/RECORD,,