datamodel-code-generator 0.29.0__tar.gz → 0.30.1__tar.gz

{datamodel_code_generator-0.29.0 → datamodel_code_generator-0.30.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datamodel-code-generator
-Version: 0.29.0
+Version: 0.30.1
 Summary: Datamodel Code Generator
 Project-URL: Homepage, https://github.com/koxudaxi/datamodel-code-generator
 Project-URL: Source, https://github.com/koxudaxi/datamodel-code-generator
@@ -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.29.0 → datamodel_code_generator-0.30.1}/README.md

@@ -462,6 +462,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.29.0 → datamodel_code_generator-0.30.1}/src/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):
@@ -483,6 +484,7 @@ def generate(  # noqa: PLR0912, PLR0913, PLR0914, PLR0915
         no_alias=no_alias,
         formatters=formatters,
         encoding=encoding,
+        parent_scoped_naming=parent_scoped_naming,
         **kwargs,
     )
 

{datamodel_code_generator-0.29.0 → datamodel_code_generator-0.30.1}/src/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}
@@ -525,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-0.29.0 → datamodel_code_generator-0.30.1}/src/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-0.29.0 → datamodel_code_generator-0.30.1}/src/datamodel_code_generator/parser/base.py

@@ -88,6 +88,8 @@ def to_hashable(item: Any) -> Any:
         return frozenset(to_hashable(i) for i in item)
     if isinstance(item, BaseModel):
         return to_hashable(item.dict())
+    if item is None:
+        return ""
     return item
 
 
@@ -377,6 +379,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 +466,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
@@ -1117,6 +1121,9 @@ class Parser(ABC):
         if self.data_model_type != pydantic_model_v2.BaseModel:
             return
         for model in models:
+            if model.base_class == "Enum":
+                continue
+
             for field in model.fields:
                 filed_name = field.name
                 filed_name_resolver = ModelResolver(snake_case_field=self.snake_case_field, remove_suffix_number=True)

{datamodel_code_generator-0.29.0 → datamodel_code_generator-0.30.1}/src/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-0.29.0 → datamodel_code_generator-0.30.1}/src/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-0.29.0 → datamodel_code_generator-0.30.1}/src/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-0.29.0 → datamodel_code_generator-0.30.1}/src/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.30.1/tests/data/expected/main/openapi/duplicate_models2.py

@@ -0,0 +1,42 @@
+# generated by datamodel-codegen:
+#   filename:  duplicate_models2.yaml
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from enum import Enum
+from typing import Optional
+
+from pydantic import BaseModel
+
+
+class PetType(Enum):
+    pet = 'pet'
+
+
+class PetDetails(BaseModel):
+    race: Optional[str] = None
+
+
+class Pet(BaseModel):
+    id: int
+    name: str
+    tag: Optional[str] = None
+    type: PetType
+    details: Optional[PetDetails] = None
+
+
+class CarType(Enum):
+    car = 'car'
+
+
+class CarDetails(BaseModel):
+    brand: Optional[str] = None
+
+
+class Car(BaseModel):
+    id: int
+    name: str
+    tag: Optional[str] = None
+    type: CarType
+    details: Optional[CarDetails] = None

datamodel_code_generator-0.30.1/tests/data/openapi/duplicate_models2.yaml

@@ -0,0 +1,72 @@
+openapi: "3.0.0"
+info:
+  version: 1.0.0
+  title: Swagger Petstore
+  license:
+    name: MIT
+servers:
+  - url: http://petstore.swagger.io/v1
+paths:
+  /pets:
+    get:
+      summary: Get pet
+      operationId: getPets
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Pet"
+  /cars:
+    get:
+      summary: Get car
+      operationId: getCar
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Cars"
+
+components:
+  schemas:
+    Pet:
+      required:
+        - id
+        - name
+        - type
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+        tag:
+          type: string
+        type:
+          type: string
+          enum: [ 'pet' ]
+        details:
+          type: object
+          properties:
+            race: { type: string }
+    Car:
+      required:
+        - id
+        - name
+        - type
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+        tag:
+          type: string
+        type:
+          type: string
+          enum: [ 'car' ]
+        details:
+          type: object
+          properties:
+            brand: { type: string }

{datamodel_code_generator-0.29.0 → datamodel_code_generator-0.30.1}/tests/main/openapi/test_main_openapi.py

@@ -2570,6 +2570,28 @@ def test_main_openapi_referenced_default() -> None:
         assert output_file.read_text() == (EXPECTED_OPENAPI_PATH / "referenced_default.py").read_text()
 
 
+@freeze_time("2019-07-26")
+def test_duplicate_models() -> None:
+    with TemporaryDirectory() as output_dir:
+        output_file: Path = Path(output_dir) / "output.py"
+        return_code: Exit = main([
+            "--input",
+            str(OPEN_API_DATA_PATH / "duplicate_models2.yaml"),
+            "--output",
+            str(output_file),
+            "--use-operation-id-as-name",
+            "--openapi-scopes",
+            "paths",
+            "schemas",
+            "parameters",
+            "--output-model-type",
+            "pydantic_v2.BaseModel",
+            "--parent-scoped-naming",
+        ])
+        assert return_code == Exit.OK
+        assert output_file.read_text() == (EXPECTED_OPENAPI_PATH / "duplicate_models2.py").read_text()
+
+
 @freeze_time("2019-07-26")
 def test_main_openapi_shadowed_imports() -> None:
     with TemporaryDirectory() as output_dir:

{datamodel_code_generator-0.29.0 → datamodel_code_generator-0.30.1}/tests/test_main_kr.py

@@ -304,3 +304,61 @@ def test_main_use_field_description() -> None:
         generated = output_file.read_text()
         expected = (EXPECTED_MAIN_KR_PATH / "main_use_field_description" / "output.py").read_text()
         assert generated == expected
+
+
+def test_capitalise_enum_members(tmp_path: Path) -> None:
+    """capitalise-enum-members not working since v0.28.5
+
+    From https://github.com/koxudaxi/datamodel-code-generator/issues/2370
+    """
+    input_data = """
+openapi: 3.0.3
+info:
+  version: X.Y.Z
+  title: example schema
+servers:
+  - url: "https://acme.org"
+paths: {}
+components:
+  schemas:
+    EnumSystems:
+      type: enum
+      enum:
+        - linux
+        - osx
+        - windows
+"""
+    input_file = tmp_path / "myschema.yaml"
+    input_file.write_text(input_data, encoding="utf_8")
+
+    expected_output = """# generated by datamodel-codegen:
+#   filename:  myschema.yaml
+
+from __future__ import annotations
+
+from enum import Enum
+
+
+class EnumSystems(Enum):
+    LINUX = 'linux'
+    OSX = 'osx'
+    WINDOWS = 'windows'
+"""
+
+    output_file: Path = tmp_path / "output.py"
+    return_code: Exit = main([
+        "--output-model-type",
+        "pydantic_v2.BaseModel",
+        "--disable-timestamp",
+        "--capitalise-enum-members",
+        "--snake-case-field",
+        "--input",
+        str(input_file),
+        "--output",
+        str(output_file),
+    ])
+    assert return_code == Exit.OK
+    output_file_read_text = output_file.read_text(encoding="utf_8")
+    assert output_file_read_text == expected_output, (
+        f"\nExpected  output:\n{expected_output}\n\nGenerated output:\n{output_file_read_text}"
+    )