datamodel-code-generator 0.25.3__tar.gz → 0.25.5__tar.gz

{datamodel_code_generator-0.25.3 → datamodel_code_generator-0.25.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datamodel-code-generator
-Version: 0.25.3
+Version: 0.25.5
 Summary: Datamodel Code Generator
 Home-page: https://github.com/koxudaxi/datamodel-code-generator
 License: MIT
@@ -377,7 +377,7 @@ Options:
   --http-ignore-tls     Disable verification of the remote host's TLS
                         certificate
   --input INPUT         Input file/directory (default: stdin)
-  --input-file-type {auto,openapi,jsonschema,json,yaml,dict,csv}
+  --input-file-type {auto,openapi,graphql,jsonschema,json,yaml,dict,csv}
                         Input file type (default: auto)
   --output OUTPUT       Output file (default: stdout)
   --output-model-type {pydantic.BaseModel,pydantic_v2.BaseModel,dataclasses.dataclass,typing.TypedDict,msgspec.Struct}
@@ -467,7 +467,7 @@ Model customization:
   --enable-version-header
                         Enable package version on file headers
   --keep-model-order    Keep generated models' order
-  --reuse-model         Re-use models on the field when a module has the model
+  --reuse-model         Reuse models on the field when a module has the model
                         with the same content
   --target-python-version {3.6,3.7,3.8,3.9,3.10,3.11}
                         target python version (default: 3.7)

{datamodel_code_generator-0.25.3 → datamodel_code_generator-0.25.5}/README.md

@@ -332,7 +332,7 @@ Options:
   --http-ignore-tls     Disable verification of the remote host's TLS
                         certificate
   --input INPUT         Input file/directory (default: stdin)
-  --input-file-type {auto,openapi,jsonschema,json,yaml,dict,csv}
+  --input-file-type {auto,openapi,graphql,jsonschema,json,yaml,dict,csv}
                         Input file type (default: auto)
   --output OUTPUT       Output file (default: stdout)
   --output-model-type {pydantic.BaseModel,pydantic_v2.BaseModel,dataclasses.dataclass,typing.TypedDict,msgspec.Struct}
@@ -422,7 +422,7 @@ Model customization:
   --enable-version-header
                         Enable package version on file headers
   --keep-model-order    Keep generated models' order
-  --reuse-model         Re-use models on the field when a module has the model
+  --reuse-model         Reuse models on the field when a module has the model
                         with the same content
   --target-python-version {3.6,3.7,3.8,3.9,3.10,3.11}
                         target python version (default: 3.7)

{datamodel_code_generator-0.25.3 → datamodel_code_generator-0.25.5}/datamodel_code_generator/__init__.py

@@ -58,8 +58,7 @@ def load_yaml_from_path(path: Path, encoding: str) -> Any:
 
 if TYPE_CHECKING:
 
-    def get_version() -> str:
-        ...
+    def get_version() -> str: ...
 
 else:
 
@@ -525,7 +524,7 @@ def infer_input_type(text: str) -> InputFileType:
 
 
 inferred_message = (
-    'The input file type was determined to be: {}\nThis can be specificied explicitly with the '
+    'The input file type was determined to be: {}\nThis can be specified explicitly with the '
     '`--input-file-type` option.'
 )
 

{datamodel_code_generator-0.25.3 → datamodel_code_generator-0.25.5}/datamodel_code_generator/__main__.py

@@ -94,8 +94,7 @@ class Config(BaseModel):
         if TYPE_CHECKING:
 
             @classmethod
-            def get_fields(cls) -> Dict[str, Any]:
-                ...
+            def get_fields(cls) -> Dict[str, Any]: ...
 
         else:
 

{datamodel_code_generator-0.25.3 → datamodel_code_generator-0.25.5}/datamodel_code_generator/format.py

@@ -7,11 +7,15 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Sequence
 from warnings import warn
 
 import black
-import black.mode
 import isort
 
 from datamodel_code_generator.util import cached_property, load_toml
 
+try:
+    import black.mode
+except ImportError:  # pragma: no cover
+    black.mode = None
+
 
 class PythonVersion(Enum):
     PY_36 = '3.6'
@@ -72,8 +76,7 @@ class PythonVersion(Enum):
 
 if TYPE_CHECKING:
 
-    class _TargetVersion(Enum):
-        ...
+    class _TargetVersion(Enum): ...
 
     BLACK_PYTHON_VERSION: Dict[PythonVersion, _TargetVersion]
 else:
@@ -94,8 +97,7 @@ def black_find_project_root(sources: Sequence[Path]) -> Path:
 
         def _find_project_root(
             srcs: Union[Sequence[str], Iterable[str]],
-        ) -> Union[Tuple[Path, str], Path]:
-            ...
+        ) -> Union[Tuple[Path, str], Path]: ...
 
     else:
         from black import find_project_root as _find_project_root
@@ -149,9 +151,9 @@ class CodeFormatter:
                     f' for wrapping string literal in {black.__version__}'
                 )
             elif black.__version__ < '24.1.0':  # type: ignore
-                black_kwargs[
-                    'experimental_string_processing'
-                ] = experimental_string_processing
+                black_kwargs['experimental_string_processing'] = (
+                    experimental_string_processing
+                )
             elif experimental_string_processing:
                 black_kwargs['preview'] = True
                 black_kwargs['unstable'] = config.get('unstable', False)
@@ -236,8 +238,7 @@ class CodeFormatter:
 
     if TYPE_CHECKING:
 
-        def apply_isort(self, code: str) -> str:
-            ...
+        def apply_isort(self, code: str) -> str: ...
 
     else:
         if isort.__version__.startswith('4.'):

{datamodel_code_generator-0.25.3 → datamodel_code_generator-0.25.5}/datamodel_code_generator/imports.py

@@ -116,5 +116,6 @@ IMPORT_DICT = Import.from_full_path('typing.Dict')
 IMPORT_DECIMAL = Import.from_full_path('decimal.Decimal')
 IMPORT_DATE = Import.from_full_path('datetime.date')
 IMPORT_DATETIME = Import.from_full_path('datetime.datetime')
+IMPORT_PATH = Import.from_full_path('pathlib.Path')
 IMPORT_TIME = Import.from_full_path('datetime.time')
 IMPORT_UUID = Import.from_full_path('uuid.UUID')

{datamodel_code_generator-0.25.3 → datamodel_code_generator-0.25.5}/datamodel_code_generator/model/base.py

@@ -63,7 +63,7 @@ class ConstraintsBase(_BaseModel):
 
     @cached_property
     def has_constraints(self) -> bool:
-        return any(v for v in self.dict().values() if v is not None)
+        return any(v is not None for v in self.dict().values())
 
     @staticmethod
     def merge_constraints(
@@ -267,8 +267,7 @@ class TemplateBase(ABC):
         return self.render()
 
 
-class BaseClassDataType(DataType):
-    ...
+class BaseClassDataType(DataType): ...
 
 
 UNDEFINED: Any = object()

{datamodel_code_generator-0.25.3 → datamodel_code_generator-0.25.5}/datamodel_code_generator/model/pydantic/base_model.py

@@ -87,7 +87,9 @@ class DataModelField(DataModelFieldBase):
         return result
 
     def self_reference(self) -> bool:
-        return isinstance(self.parent, BaseModel) and self.parent.reference.path in {
+        return isinstance(
+            self.parent, BaseModelBase
+        ) and self.parent.reference.path in {
             d.reference.path for d in self.data_type.all_data_types if d.reference
         }
 
@@ -111,12 +113,12 @@ class DataModelField(DataModelFieldBase):
                 data_type = data_type.data_types[0]
                 if (
                     data_type.reference
-                    and isinstance(data_type.reference.source, BaseModel)
+                    and isinstance(data_type.reference.source, BaseModelBase)
                     and isinstance(self.default, list)
                 ):  # pragma: no cover
                     return f'lambda :[{data_type.alias or data_type.reference.source.class_name}.{self._PARSE_METHOD}(v) for v in {repr(self.default)}]'
             elif data_type.reference and isinstance(
-                data_type.reference.source, BaseModel
+                data_type.reference.source, BaseModelBase
             ):  # pragma: no cover
                 return f'lambda :{data_type.alias or data_type.reference.source.class_name}.{self._PARSE_METHOD}({repr(self.default)})'
         return None

{datamodel_code_generator-0.25.3 → datamodel_code_generator-0.25.5}/datamodel_code_generator/model/pydantic/types.py

@@ -9,6 +9,7 @@ from datamodel_code_generator.imports import (
     IMPORT_DATE,
     IMPORT_DATETIME,
     IMPORT_DECIMAL,
+    IMPORT_PATH,
     IMPORT_TIME,
     IMPORT_UUID,
 )
@@ -70,6 +71,7 @@ def type_map_factory(
         Types.binary: data_type(type='bytes'),
         Types.date: data_type.from_import(IMPORT_DATE),
         Types.date_time: data_type.from_import(IMPORT_DATETIME),
+        Types.path: data_type.from_import(IMPORT_PATH),
         Types.password: data_type.from_import(IMPORT_SECRET_STR),
         Types.email: data_type.from_import(IMPORT_EMAIL_STR),
         Types.uuid: data_type.from_import(IMPORT_UUID),

{datamodel_code_generator-0.25.3 → datamodel_code_generator-0.25.5}/datamodel_code_generator/parser/base.py

@@ -408,19 +408,19 @@ class Parser(ABC):
         self.base_class: Optional[str] = base_class
         self.target_python_version: PythonVersion = target_python_version
         self.results: List[DataModel] = []
-        self.dump_resolve_reference_action: Optional[
-            Callable[[Iterable[str]], str]
-        ] = dump_resolve_reference_action
+        self.dump_resolve_reference_action: Optional[Callable[[Iterable[str]], str]] = (
+            dump_resolve_reference_action
+        )
         self.validation: bool = validation
         self.field_constraints: bool = field_constraints
         self.snake_case_field: bool = snake_case_field
         self.strip_default_none: bool = strip_default_none
-        self.apply_default_values_for_required_fields: (
-            bool
-        ) = apply_default_values_for_required_fields
-        self.force_optional_for_required_fields: (
-            bool
-        ) = force_optional_for_required_fields
+        self.apply_default_values_for_required_fields: bool = (
+            apply_default_values_for_required_fields
+        )
+        self.force_optional_for_required_fields: bool = (
+            force_optional_for_required_fields
+        )
         self.use_schema_description: bool = use_schema_description
         self.use_field_description: bool = use_field_description
         self.use_default_kwarg: bool = use_default_kwarg
@@ -433,9 +433,9 @@ class Parser(ABC):
         self.use_generic_container_types: bool = use_generic_container_types
         self.use_union_operator: bool = use_union_operator
         self.enable_faux_immutability: bool = enable_faux_immutability
-        self.custom_class_name_generator: Optional[
-            Callable[[str], str]
-        ] = custom_class_name_generator
+        self.custom_class_name_generator: Optional[Callable[[str], str]] = (
+            custom_class_name_generator
+        )
         self.field_extra_keys: Set[str] = field_extra_keys or set()
         self.field_extra_keys_without_x_prefix: Set[str] = (
             field_extra_keys_without_x_prefix or set()
@@ -568,9 +568,9 @@ class Parser(ABC):
 
     def __delete_duplicate_models(self, models: List[DataModel]) -> None:
         model_class_names: Dict[str, DataModel] = {}
-        model_to_duplicate_models: DefaultDict[
-            DataModel, List[DataModel]
-        ] = defaultdict(list)
+        model_to_duplicate_models: DefaultDict[DataModel, List[DataModel]] = (
+            defaultdict(list)
+        )
         for model in models[:]:
             if isinstance(model, self.data_model_root_type):
                 root_data_type = model.fields[0].data_type
@@ -756,7 +756,7 @@ class Parser(ABC):
                         (pydantic_model.BaseModel, pydantic_model_v2.BaseModel),
                     ):
                         continue  # pragma: no cover
-                    type_name = None
+                    type_names = []
                     if mapping:
                         for name, path in mapping.items():
                             if (
@@ -765,10 +765,10 @@ class Parser(ABC):
                             ):
                                 # TODO: support external reference
                                 continue
-                            type_name = name
+                            type_names.append(name)
                     else:
-                        type_name = discriminator_model.path.split('/')[-1]
-                    if not type_name:  # pragma: no cover
+                        type_names = [discriminator_model.path.split('/')[-1]]
+                    if not type_names:  # pragma: no cover
                         raise RuntimeError(
                             f'Discriminator type is not found. {data_type.reference.path}'
                         )
@@ -780,7 +780,11 @@ class Parser(ABC):
                         ) != property_name:
                             continue
                         literals = discriminator_field.data_type.literals
-                        if len(literals) == 1 and literals[0] == type_name:
+                        if (
+                            len(literals) == 1 and literals[0] == type_names[0]
+                            if type_names
+                            else None
+                        ):
                             has_one_literal = True
                             continue
                         for (
@@ -789,7 +793,7 @@ class Parser(ABC):
                             if field_data_type.reference:  # pragma: no cover
                                 field_data_type.remove_reference()
                         discriminator_field.data_type = self.data_type(
-                            literals=[type_name]
+                            literals=type_names
                         )
                         discriminator_field.data_type.parent = discriminator_field
                         discriminator_field.required = True
@@ -799,7 +803,7 @@ class Parser(ABC):
                         discriminator_model.fields.append(
                             self.data_model_field_type(
                                 name=property_name,
-                                data_type=self.data_type(literals=[type_name]),
+                                data_type=self.data_type(literals=type_names),
                                 required=True,
                             )
                         )
@@ -1235,6 +1239,7 @@ class Parser(ABC):
 
             scoped_model_resolver = ModelResolver()
 
+            self.__override_required_field(models)
             self.__replace_unique_list_to_set(models)
             self.__change_from_import(models, imports, scoped_model_resolver, init)
             self.__extract_inherited_enum(models)
@@ -1242,7 +1247,6 @@ class Parser(ABC):
             self.__reuse_model(models, require_update_action_models)
             self.__collapse_root_models(models, unused_models, imports)
             self.__set_default_enum_member(models)
-            self.__override_required_field(models)
             self.__sort_models(models, imports)
             self.__set_one_literal_on_default(models)
             self.__apply_discriminator_type(models, imports)

{datamodel_code_generator-0.25.3 → datamodel_code_generator-0.25.5}/datamodel_code_generator/parser/jsonschema.py

@@ -118,6 +118,7 @@ json_schema_data_formats: Dict[str, Dict[str, Types]] = {
         'date-time': Types.date_time,
         'time': Types.time,
         'password': Types.password,
+        'path': Types.path,
         'email': Types.email,
         'idn-email': Types.email,
         'uuid': Types.uuid,
@@ -632,9 +633,9 @@ class JsonSchemaParser(Parser):
 
     def set_additional_properties(self, name: str, obj: JsonSchemaObject) -> None:
         if isinstance(obj.additionalProperties, bool):
-            self.extra_template_data[name][
-                'additionalProperties'
-            ] = obj.additionalProperties
+            self.extra_template_data[name]['additionalProperties'] = (
+                obj.additionalProperties
+            )
 
     def set_title(self, name: str, obj: JsonSchemaObject) -> None:
         if obj.title:

{datamodel_code_generator-0.25.3 → datamodel_code_generator-0.25.5}/datamodel_code_generator/types.py

@@ -548,6 +548,7 @@ class Types(Enum):
     date = auto()
     date_time = auto()
     password = auto()
+    path = auto()
     email = auto()
     uuid = auto()
     uuid1 = auto()

{datamodel_code_generator-0.25.3 → datamodel_code_generator-0.25.5}/datamodel_code_generator/util.py

@@ -23,8 +23,7 @@ if TYPE_CHECKING:
 
     from typing_extensions import Literal
 
-    def load_toml(path: Path) -> Dict[str, Any]:
-        ...
+    def load_toml(path: Path) -> Dict[str, Any]: ...
 
 else:
     try:

datamodel_code_generator-0.25.5/datamodel_code_generator/version.py

@@ -0,0 +1 @@
+version: str = '0.25.5'

{datamodel_code_generator-0.25.3 → datamodel_code_generator-0.25.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamodel-code-generator"
-version = "0.25.3"
+version = "0.25.5"
 description = "Datamodel Code Generator"
 authors = ["Koudai Aono <koxudaxi@gmail.com>"]
 readme = "README.md"
@@ -78,7 +78,7 @@ types-setuptools = ">=67.6.0.5,<70.0.0.0"
 pydantic = "*"
 httpx = ">=0.24.1"
 PySnooper = "*"
-ruff = ">=0.0.290,<0.1.16"
+ruff = ">=0.0.290,<0.3.3"
 ruff-lsp = ">=0.0.39,<0.0.41"
 pre-commit = "*"
 pytest-xdist = "^3.3.1"
@@ -153,3 +153,10 @@ ignore-init-method-arguments = true
 [tool.pydantic-pycharm-plugin.parsable-types]
 # str field may parse int and float
 str = ["int", "float"]
+
+[tool.codespell]
+# Ref: https://github.com/codespell-project/codespell#using-a-config-file
+skip = '.git,*.lock,tests'
+# check-hidden = true
+# ignore-regex = ''
+# ignore-words-list = ''

datamodel_code_generator-0.25.3/datamodel_code_generator/version.py

@@ -1 +0,0 @@
-version: str = '0.25.3'