datamodel-code-generator 0.28.5__py3-none-any.whl → 0.30.0__py3-none-any.whl

datamodel_code_generator/__init__.py

@@ -287,6 +287,7 @@ def generate(  # noqa: PLR0912, PLR0913, PLR0914, PLR0915
     keyword_only: bool = False,
     no_alias: bool = False,
     formatters: list[Formatter] = DEFAULT_FORMATTERS,
+    parent_scoped_naming: bool = False,
 ) -> None:
     remote_text_cache: DefaultPutDict[str, str] = DefaultPutDict()
     if isinstance(input_, str):
@@ -482,6 +483,8 @@ def generate(  # noqa: PLR0912, PLR0913, PLR0914, PLR0915
         keyword_only=keyword_only,
         no_alias=no_alias,
         formatters=formatters,
+        encoding=encoding,
+        parent_scoped_naming=parent_scoped_naming,
         **kwargs,
     )
 

datamodel_code_generator/__main__.py

@@ -314,6 +314,7 @@ class Config(BaseModel):
     keyword_only: bool = False
     no_alias: bool = False
     formatters: list[Formatter] = DEFAULT_FORMATTERS
+    parent_scoped_naming: bool = False
 
     def merge_args(self, args: Namespace) -> None:
         set_args = {f: getattr(args, f) for f in self.get_fields() if getattr(args, f) is not None}
@@ -329,7 +330,7 @@ class Config(BaseModel):
             setattr(self, field_name, getattr(parsed_args, field_name))
 
 
-def _get_pyproject_toml_config(source: Path) -> dict[str, Any] | None:
+def _get_pyproject_toml_config(source: Path) -> dict[str, Any]:
     """Find and return the [tool.datamodel-codgen] section of the closest
     pyproject.toml if it exists.
     """
@@ -339,14 +340,20 @@ def _get_pyproject_toml_config(source: Path) -> dict[str, Any] | None:
         if (current_path / "pyproject.toml").is_file():
             pyproject_toml = load_toml(current_path / "pyproject.toml")
             if "datamodel-codegen" in pyproject_toml.get("tool", {}):
-                return pyproject_toml["tool"]["datamodel-codegen"]
+                pyproject_config = pyproject_toml["tool"]["datamodel-codegen"]
+                # Convert options from kebap- to snake-case
+                pyproject_config = {k.replace("-", "_"): v for k, v in pyproject_config.items()}
+                # Replace US-american spelling if present (ignore if british spelling is present)
+                if "capitalize_enum_members" in pyproject_config and "capitalise_enum_members" not in pyproject_config:
+                    pyproject_config["capitalise_enum_members"] = pyproject_config.pop("capitalize_enum_members")
+                return pyproject_config
 
         if (current_path / ".git").exists():
             # Stop early if we see a git repository root.
-            return None
+            return {}
 
         current_path = current_path.parent
-    return None
+    return {}
 
 
 def main(args: Sequence[str] | None = None) -> Exit:  # noqa: PLR0911, PLR0912, PLR0915
@@ -367,13 +374,9 @@ def main(args: Sequence[str] | None = None) -> Exit:  # noqa: PLR0911, PLR0912,
         sys.exit(0)
 
     pyproject_config = _get_pyproject_toml_config(Path.cwd())
-    if pyproject_config is not None:
-        pyproject_toml = {k.replace("-", "_"): v for k, v in pyproject_config.items()}
-    else:
-        pyproject_toml = {}
 
     try:
-        config = Config.parse_obj(pyproject_toml)
+        config = Config.parse_obj(pyproject_config)
         config.merge_args(namespace)
     except Error as e:
         print(e.message, file=sys.stderr)  # noqa: T201
@@ -523,6 +526,7 @@ def main(args: Sequence[str] | None = None) -> Exit:  # noqa: PLR0911, PLR0912,
             keyword_only=config.keyword_only,
             no_alias=config.no_alias,
             formatters=config.formatters,
+            parent_scoped_naming=config.parent_scoped_naming,
         )
     except InvalidClassNameError as e:
         print(f"{e} You have to set `--class-name` option", file=sys.stderr)  # noqa: T201

datamodel_code_generator/arguments.py

@@ -202,6 +202,12 @@ model_options.add_argument(
     choices=[i.value for i in DatetimeClassType],
     default=None,
 )
+model_options.add_argument(
+    "--parent-scoped-naming",
+    help="Set name of models defined inline from the parent model",
+    action="store_true",
+    default=None,
+)
 
 # ======================================================================================
 # Typing options for generated models

datamodel_code_generator/model/template/pydantic_v2/BaseModel.jinja2

@@ -1,3 +1,11 @@
+{% if base_class != "BaseModel" and "," not in base_class and not fields and not config -%}
+
+{# if this is just going to be `class Foo(Bar): pass`, then might as well just make Foo
+an alias for Bar: every pydantic model class consumes considerable memory. #}
+{{ class_name }} = {{ base_class }}
+
+{% else -%}
+
 {% for decorator in decorators -%}
 {{ decorator }}
 {% endfor -%}
@@ -37,3 +45,5 @@ class {{ class_name }}({{ base_class }}):{% if comment is defined %}  # {{ comme
     {{ method }}
 {%- endfor -%}
 {%- endfor -%}
+
+{%- endif %}

datamodel_code_generator/parser/base.py

@@ -377,6 +377,7 @@ class Parser(ABC):
         keyword_only: bool = False,
         no_alias: bool = False,
         formatters: list[Formatter] = DEFAULT_FORMATTERS,
+        parent_scoped_naming: bool = False,
     ) -> None:
         self.keyword_only = keyword_only
         self.data_type_manager: DataTypeManager = data_type_manager_type(
@@ -463,6 +464,7 @@ class Parser(ABC):
             remove_special_field_name_prefix=remove_special_field_name_prefix,
             capitalise_enum_members=capitalise_enum_members,
             no_alias=no_alias,
+            parent_scoped_naming=parent_scoped_naming,
         )
         self.class_name: str | None = class_name
         self.wrap_string_literal: bool | None = wrap_string_literal
@@ -949,10 +951,14 @@ class Parser(ABC):
                             model_field.constraints = ConstraintsBase.merge_constraints(
                                 root_type_field.constraints, model_field.constraints
                             )
-                        if isinstance(
-                            root_type_field,
-                            pydantic_model.DataModelField,
-                        ) and not model_field.extras.get("discriminator"):
+                        if (
+                            isinstance(
+                                root_type_field,
+                                pydantic_model.DataModelField,
+                            )
+                            and not model_field.extras.get("discriminator")
+                            and not any(t.is_list for t in model_field.data_type.data_types)
+                        ):
                             discriminator = root_type_field.extras.get("discriminator")
                             if discriminator:
                                 model_field.extras["discriminator"] = discriminator
@@ -1148,7 +1154,7 @@ class Parser(ABC):
                 else:
                     r.append(item)
 
-            r = r[:-2] + [f"{r[-2]}.{r[-1]}"]
+            r = [*r[:-2], f"{r[-2]}.{r[-1]}"]
             return tuple(r)
 
         results = {process(k): v for k, v in results.items()}
@@ -1184,6 +1190,24 @@ class Parser(ABC):
                 class_name=True,
             ).name
 
+    def __alias_shadowed_imports(  # noqa: PLR6301
+        self,
+        models: list[DataModel],
+        all_model_field_names: set[str],
+    ) -> None:
+        for model in models:
+            for model_field in model.fields:
+                if model_field.data_type.type in all_model_field_names:
+                    alias = model_field.data_type.type + "_aliased"
+                    model_field.data_type.type = alias
+                    if model_field.data_type.import_:  # pragma: no cover
+                        model_field.data_type.import_ = Import(
+                            from_=model_field.data_type.import_.from_,
+                            import_=model_field.data_type.import_.import_,
+                            alias=alias,
+                            reference_path=model_field.data_type.import_.reference_path,
+                        )
+
     def parse(  # noqa: PLR0912, PLR0914, PLR0915
         self,
         with_import: bool | None = True,  # noqa: FBT001, FBT002
@@ -1278,6 +1302,7 @@ class Parser(ABC):
             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.__alias_shadowed_imports(models, all_module_fields)
             self.__override_required_field(models)
             self.__replace_unique_list_to_set(models)
             self.__change_from_import(models, imports, scoped_model_resolver, init)

datamodel_code_generator/parser/graphql.py

@@ -154,6 +154,7 @@ class GraphQLParser(Parser):
         keyword_only: bool = False,
         no_alias: bool = False,
         formatters: list[Formatter] = DEFAULT_FORMATTERS,
+        parent_scoped_naming: bool = False,
     ) -> None:
         super().__init__(
             source=source,
@@ -228,6 +229,7 @@ class GraphQLParser(Parser):
             keyword_only=keyword_only,
             no_alias=no_alias,
             formatters=formatters,
+            parent_scoped_naming=parent_scoped_naming,
         )
 
         self.data_model_scalar_type = data_model_scalar_type

datamodel_code_generator/parser/jsonschema.py

@@ -423,6 +423,7 @@ class JsonSchemaParser(Parser):
         keyword_only: bool = False,
         no_alias: bool = False,
         formatters: list[Formatter] = DEFAULT_FORMATTERS,
+        parent_scoped_naming: bool = False,
     ) -> None:
         super().__init__(
             source=source,
@@ -497,6 +498,7 @@ class JsonSchemaParser(Parser):
             keyword_only=keyword_only,
             no_alias=no_alias,
             formatters=formatters,
+            parent_scoped_naming=parent_scoped_naming,
         )
 
         self.remote_object_cache: DefaultPutDict[str, dict[str, Any]] = DefaultPutDict()

datamodel_code_generator/parser/openapi.py

@@ -216,6 +216,7 @@ class OpenAPIParser(JsonSchemaParser):
         keyword_only: bool = False,
         no_alias: bool = False,
         formatters: list[Formatter] = DEFAULT_FORMATTERS,
+        parent_scoped_naming: bool = False,
     ) -> None:
         super().__init__(
             source=source,
@@ -290,6 +291,7 @@ class OpenAPIParser(JsonSchemaParser):
             keyword_only=keyword_only,
             no_alias=no_alias,
             formatters=formatters,
+            parent_scoped_naming=parent_scoped_naming,
         )
         self.open_api_scopes: list[OpenAPIScope] = openapi_scopes or [OpenAPIScope.Schemas]
 

datamodel_code_generator/reference.py

@@ -318,6 +318,7 @@ class ModelResolver:  # noqa: PLR0904
         capitalise_enum_members: bool = False,  # noqa: FBT001, FBT002
         no_alias: bool = False,  # noqa: FBT001, FBT002
         remove_suffix_number: bool = False,  # noqa: FBT001, FBT002
+        parent_scoped_naming: bool = False,  # noqa: FBT001, FBT002
     ) -> None:
         self.references: dict[str, Reference] = {}
         self._current_root: Sequence[str] = []
@@ -351,6 +352,7 @@ class ModelResolver:  # noqa: PLR0904
         self._base_path: Path = base_path or Path.cwd()
         self._current_base_path: Path | None = self._base_path
         self.remove_suffix_number: bool = remove_suffix_number
+        self.parent_scoped_naming = parent_scoped_naming
 
     @property
     def current_base_path(self) -> Path | None:
@@ -512,6 +514,19 @@ class ModelResolver:  # noqa: PLR0904
         self.references[path] = reference
         return reference
 
+    def _check_parent_scope_option(self, name: str, path: Sequence[str]) -> str:
+        if self.parent_scoped_naming:
+            parent_reference = None
+            parent_path = path[:-1]
+            while parent_path:
+                parent_reference = self.references.get(self.join_path(parent_path))
+                if parent_reference is not None:
+                    break
+                parent_path = parent_path[:-1]
+            if parent_reference:
+                name = f"{parent_reference.name}_{name}"
+        return name
+
     def add(  # noqa: PLR0913
         self,
         path: Sequence[str],
@@ -533,6 +548,7 @@ class ModelResolver:  # noqa: PLR0904
         name = original_name
         duplicate_name: str | None = None
         if class_name:
+            name = self._check_parent_scope_option(name, path)
             name, duplicate_name = self.get_class_name(
                 name=name,
                 unique=unique,

{datamodel_code_generator-0.28.5.dist-info → datamodel_code_generator-0.30.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datamodel-code-generator
-Version: 0.28.5
+Version: 0.30.0
 Summary: Datamodel Code Generator
 Project-URL: Homepage, https://github.com/koxudaxi/datamodel-code-generator
 Project-URL: Source, https://github.com/koxudaxi/datamodel-code-generator
@@ -21,7 +21,7 @@ Requires-Python: >=3.9
 Requires-Dist: argcomplete<4,>=2.10.1
 Requires-Dist: black>=19.10b0
 Requires-Dist: genson<2,>=1.2.1
-Requires-Dist: inflect<6,>=4.1
+Requires-Dist: inflect<8,>=4.1
 Requires-Dist: isort<7,>=4.3.21
 Requires-Dist: jinja2<4,>=2.10.1
 Requires-Dist: packaging
@@ -512,6 +512,8 @@ Model customization:
                         Choose Datetime class between AwareDatetime, NaiveDatetime or
                         datetime. Each output model has its default mapping (for example
                         pydantic: datetime, dataclass: str, ...)
+  --parent-scoped-naming
+                        Set name of models defined inline from the parent model
   --reuse-model         Reuse models on the field when a module has the model with the same
                         content
   --target-python-version {3.9,3.10,3.11,3.12,3.13}

{datamodel_code_generator-0.28.5.dist-info → datamodel_code_generator-0.30.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
-datamodel_code_generator/__init__.py,sha256=sguYwixd5tfTNpa0TwfKFiYqEgwunUaVY2Aea7mCavk,20327
-datamodel_code_generator/__main__.py,sha256=LMD988WjkqmzWjHXoNiiEI3KFnrq3kupbyiObDf1HpA,22137
-datamodel_code_generator/arguments.py,sha256=LQyCC7tsDdy7ie7nbQVVW_79usVumX8O5pd99ZZ51ds,16466
+datamodel_code_generator/__init__.py,sha256=2h8FA8O_x1VGRVlXKJHt3jwuC34MIEnmHwHv-zGuF_I,20445
+datamodel_code_generator/__main__.py,sha256=rF1Se8R0rfqDmJ4_INBdOYlU7G4XIthPCe3ldDwtgQI,22608
+datamodel_code_generator/arguments.py,sha256=xPAnid2-dC_Hj4o1hY9fL13NMJl5wCPphTsCHZ3QeNQ,16637
 datamodel_code_generator/format.py,sha256=zvX0KH1uWwGnTYoVM4KhAuKZn5erjkH5eyi4t3leirw,8962
 datamodel_code_generator/http.py,sha256=LE94GC7I9D8lWIg_YAGWedfy0XNxOXTmiYKuNMTwouo,887
 datamodel_code_generator/imports.py,sha256=Nq83WbEGCegntg3WX4VbKfzAIs84alZ7IrYyNPrlUbc,5517
 datamodel_code_generator/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datamodel_code_generator/pydantic_patch.py,sha256=co1IUDvZqQ-xEZ3C9gbV-BVm2Cin1vfyZNr2Dr0LdHY,718
-datamodel_code_generator/reference.py,sha256=cnD6gGevRomez1dr16-KBz-GgDN8gCMQZqpwmb16CwA,26021
+datamodel_code_generator/reference.py,sha256=OobfjN5hWaKzv4ECdCPc9Q3ODkoG93B4qaKlzDEcDrY,26748
 datamodel_code_generator/types.py,sha256=fobUZnNTOGpzF4qZMraoLogVkAU7zBdFVG-8SOFoDD4,21163
 datamodel_code_generator/util.py,sha256=mZW8-6CbFe6T4IY5OM9Av6cH-0VknQGe2eIKjTM6Jzo,2729
 datamodel_code_generator/model/__init__.py,sha256=pJlJ1juQ-Gv17ZKXy6OAfJSSoOAmYQ7QCbdneu1BENU,3594
@@ -44,16 +44,16 @@ datamodel_code_generator/model/template/pydantic/BaseModel.jinja2,sha256=sYZa-47
 datamodel_code_generator/model/template/pydantic/BaseModel_root.jinja2,sha256=WDdTXYNTrkIw-B4OvPVxOaETTknLs0zdNuq_iDQ2Bcw,1000
 datamodel_code_generator/model/template/pydantic/Config.jinja2,sha256=Ik028qdqQhDfEP207TCbwVv2b5Do1-nRNDPKzBHKzwM,135
 datamodel_code_generator/model/template/pydantic/dataclass.jinja2,sha256=hM4OZTVhtOokqlPNSdh5drhBXfQLPvbyO88jipSPr5Y,629
-datamodel_code_generator/model/template/pydantic_v2/BaseModel.jinja2,sha256=XdSCvA0hSdjkMtI9CA3M-2xBgieCOV-sWIfQvJPnJ4I,1119
+datamodel_code_generator/model/template/pydantic_v2/BaseModel.jinja2,sha256=i1Wg9W20c4UGUkGJUf2rjuRNO52zLbktndfYupgJA78,1442
 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=3XtFcDPocaetfjmWFqj_CubqNCDipb7vXZHsYKdJXXU,851
-datamodel_code_generator/parser/base.py,sha256=COceRiOHtaOOS0gvDvKLNboxD4KY0ofJdmSdoyPBfNw,60618
-datamodel_code_generator/parser/graphql.py,sha256=ODbkMp42fYh8kH81KNeAffcFTmJb6_hgMyCsLUmdpMo,22585
-datamodel_code_generator/parser/jsonschema.py,sha256=J5Ec5Vf4LGjCRWPraBmpTkepq-tN0ri5MKB9bUSDdFc,69912
-datamodel_code_generator/parser/openapi.py,sha256=MfHSVfwq7qx_YEOiNel-ABbwISdH-kp87Q09WeNr_5w,27180
-datamodel_code_generator-0.28.5.dist-info/METADATA,sha256=UVX-nQFVHIBUGD1dqfDNsZ4qw4eOyiOsQI8MzkGrKUs,25189
-datamodel_code_generator-0.28.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-datamodel_code_generator-0.28.5.dist-info/entry_points.txt,sha256=cJVcHiEViQMANaoM5C1xR5hzmyCqH6hHHMpV8W00in8,77
-datamodel_code_generator-0.28.5.dist-info/licenses/LICENSE,sha256=K54Lwc6_jduycsy8oFFjQEeSSuEiqvVIjCGIXOMnuTQ,1068
-datamodel_code_generator-0.28.5.dist-info/RECORD,,
+datamodel_code_generator/parser/base.py,sha256=iI57e61U2YgG9K8vuBjw72dM034bgsBrfOFL1zG7Y-w,61839
+datamodel_code_generator/parser/graphql.py,sha256=scotG-q8zTS40i5rP9HfhriSVhXVnxEKtuBoXvbzECg,22684
+datamodel_code_generator/parser/jsonschema.py,sha256=bwXNvXjG8tiUPCNZsEXbo2TlCYJVKIzeYWEKfvlPzo8,70011
+datamodel_code_generator/parser/openapi.py,sha256=3IWF40DK0a710rVqXCod7Hi3Fh9u7neD4YR_kn_6VD4,27279
+datamodel_code_generator-0.30.0.dist-info/METADATA,sha256=u9lGxU2--PWj6uTxDi6AA-Dvyw06mhn2KQy_j4ewbds,25294
+datamodel_code_generator-0.30.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+datamodel_code_generator-0.30.0.dist-info/entry_points.txt,sha256=cJVcHiEViQMANaoM5C1xR5hzmyCqH6hHHMpV8W00in8,77
+datamodel_code_generator-0.30.0.dist-info/licenses/LICENSE,sha256=K54Lwc6_jduycsy8oFFjQEeSSuEiqvVIjCGIXOMnuTQ,1068
+datamodel_code_generator-0.30.0.dist-info/RECORD,,