datamodel-code-generator 0.21.1__tar.gz → 0.21.3__tar.gz

{datamodel_code_generator-0.21.1 → datamodel_code_generator-0.21.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datamodel-code-generator
-Version: 0.21.1
+Version: 0.21.3
 Summary: Datamodel Code Generator
 Home-page: https://github.com/koxudaxi/datamodel-code-generator
 License: MIT
@@ -321,7 +321,7 @@ $ docker pull koxudaxi/datamodel-code-generator
 ```
 
 ## Advanced Uses
-You can genearte models from a URL.
+You can generate models from a URL.
 ```bash
 $ datamodel-codegen --url https://<INPUT FILE URL> --output model.py
 ```

{datamodel_code_generator-0.21.1 → datamodel_code_generator-0.21.3}/README.md

@@ -283,7 +283,7 @@ $ docker pull koxudaxi/datamodel-code-generator
 ```
 
 ## Advanced Uses
-You can genearte models from a URL.
+You can generate models from a URL.
 ```bash
 $ datamodel-codegen --url https://<INPUT FILE URL> --output model.py
 ```

{datamodel_code_generator-0.21.1 → datamodel_code_generator-0.21.3}/datamodel_code_generator/__init__.py

@@ -224,7 +224,8 @@ def generate(
     output: Optional[Path] = None,
     output_model_type: DataModelType = DataModelType.PydanticBaseModel,
     target_python_version: PythonVersion = PythonVersion.PY_37,
-    base_class: str = DEFAULT_BASE_CLASS,
+    base_class: str = '',
+    additional_imports: Optional[List[str]] = None,
     custom_template_dir: Optional[Path] = None,
     extra_template_data: Optional[DefaultDict[str, Dict[str, Any]]] = None,
     validation: bool = False,
@@ -369,6 +370,7 @@ def generate(
         data_model_field_type=data_model_types.field_model,
         data_type_manager_type=data_model_types.data_type_manager,
         base_class=base_class,
+        additional_imports=additional_imports,
         custom_template_dir=custom_template_dir,
         extra_template_data=extra_template_data,
         target_python_version=target_python_version,

{datamodel_code_generator-0.21.1 → datamodel_code_generator-0.21.3}/datamodel_code_generator/model/__init__.py

@@ -38,7 +38,7 @@ def get_data_model_types(
             root_model=pydantic_v2.RootModel,
             field_model=pydantic_v2.DataModelField,
             data_type_manager=pydantic_v2.DataTypeManager,
-            dump_resolve_reference_action=pydantic.dump_resolve_reference_action,
+            dump_resolve_reference_action=pydantic_v2.dump_resolve_reference_action,
         )
     elif data_model_type == DataModelType.DataclassesDataclass:
         return DataModelSet(

{datamodel_code_generator-0.21.1 → datamodel_code_generator-0.21.3}/datamodel_code_generator/model/base.py

@@ -114,7 +114,10 @@ class DataModelFieldBase(_BaseModel):
             return type_hint
         elif self.required:
             return type_hint
-        return get_optional_type(type_hint, self.data_type.use_union_operator)
+        elif self.fall_back_to_nullable:
+            return get_optional_type(type_hint, self.data_type.use_union_operator)
+        else:
+            return type_hint
 
     @property
     def imports(self) -> Tuple[Import, ...]:
@@ -128,10 +131,16 @@ class DataModelFieldBase(_BaseModel):
             )
         ]
 
-        if (
-            self.nullable or (self.nullable is None and not self.required)
-        ) and not self.data_type.use_union_operator:
-            imports.append((IMPORT_OPTIONAL,))
+        if self.fall_back_to_nullable:
+            if (
+                self.nullable or (self.nullable is None and not self.required)
+            ) and not self.data_type.use_union_operator:
+                imports.append((IMPORT_OPTIONAL,))
+        else:
+            if (
+                self.nullable and not self.data_type.use_union_operator
+            ):  # pragma: no cover
+                imports.append((IMPORT_OPTIONAL,))
         if self.use_annotated:
             import_annotated = (
                 IMPORT_ANNOTATED
@@ -174,6 +183,10 @@ class DataModelFieldBase(_BaseModel):
     def has_default_factory(self) -> bool:
         return 'default_factory' in self.extras
 
+    @property
+    def fall_back_to_nullable(self) -> bool:
+        return True
+
 
 @lru_cache()
 def get_template(template_file_path: Path) -> Template:

{datamodel_code_generator-0.21.1 → datamodel_code_generator-0.21.3}/datamodel_code_generator/model/dataclass.py

@@ -6,7 +6,7 @@ from typing import Any, ClassVar, DefaultDict, Dict, List, Optional, Set, Tuple
 from datamodel_code_generator.imports import Import
 from datamodel_code_generator.model import DataModel, DataModelFieldBase
 from datamodel_code_generator.model.base import UNDEFINED
-from datamodel_code_generator.model.improts import IMPORT_DATACLASS, IMPORT_FIELD
+from datamodel_code_generator.model.imports import IMPORT_DATACLASS, IMPORT_FIELD
 from datamodel_code_generator.model.pydantic.base_model import Constraints
 from datamodel_code_generator.reference import Reference
 from datamodel_code_generator.types import chain_as_tuple

{datamodel_code_generator-0.21.1 → datamodel_code_generator-0.21.3}/datamodel_code_generator/model/pydantic/__init__.py

@@ -23,6 +23,7 @@ class Config(_BaseModel):
     allow_extra_fields: Optional[bool] = None
     allow_mutation: Optional[bool] = None
     arbitrary_types_allowed: Optional[bool] = None
+    orm_mode: Optional[bool] = None
 
 
 # def get_validator_template() -> Template:

{datamodel_code_generator-0.21.1 → datamodel_code_generator-0.21.3}/datamodel_code_generator/model/pydantic/types.py

@@ -155,7 +155,7 @@ class DataTypeManager(_DataTypeManager):
             use_union_operator,
         )
 
-        self.type_map: Dict[Types, DataType] = type_map_factory(
+        self.type_map: Dict[Types, DataType] = self.type_map_factory(
             self.data_type,
             strict_types=self.strict_types,
             pattern_key=self.PATTERN_KEY,
@@ -177,6 +177,14 @@ class DataTypeManager(_DataTypeManager):
             'pattern': self.PATTERN_KEY,
         }
 
+    def type_map_factory(
+        self,
+        data_type: Type[DataType],
+        strict_types: Sequence[StrictTypes],
+        pattern_key: str,
+    ) -> Dict[Types, DataType]:
+        return type_map_factory(data_type, strict_types, pattern_key)
+
     def transform_kwargs(
         self, kwargs: Dict[str, Any], filter_: Set[str]
     ) -> Dict[str, str]:

{datamodel_code_generator-0.21.1 → datamodel_code_generator-0.21.3}/datamodel_code_generator/model/pydantic_v2/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Optional
+from typing import Iterable, Optional
 
 from pydantic import BaseModel as _BaseModel
 
@@ -9,6 +9,10 @@ from .root_model import RootModel
 from .types import DataTypeManager
 
 
+def dump_resolve_reference_action(class_names: Iterable[str]) -> str:
+    return '\n'.join(f'{class_name}.model_rebuild()' for class_name in class_names)
+
+
 class ConfigDict(_BaseModel):
     extra: Optional[str] = None
     title: Optional[str] = None
@@ -18,4 +22,10 @@ class ConfigDict(_BaseModel):
     arbitrary_types_allowed: Optional[bool] = None
 
 
-__all__ = ['BaseModel', 'DataModelField', 'RootModel', 'DataTypeManager']
+__all__ = [
+    'BaseModel',
+    'DataModelField',
+    'RootModel',
+    'dump_resolve_reference_action',
+    'DataTypeManager',
+]

datamodel_code_generator-0.21.3/datamodel_code_generator/model/pydantic_v2/types.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from typing import ClassVar, Dict, Sequence, Type
+
+from datamodel_code_generator.model.pydantic import DataTypeManager as _DataTypeManager
+from datamodel_code_generator.model.pydantic.imports import IMPORT_CONSTR
+from datamodel_code_generator.types import DataType, StrictTypes, Types
+
+
+class DataTypeManager(_DataTypeManager):
+    PATTERN_KEY: ClassVar[str] = 'pattern'
+
+    def type_map_factory(
+        self,
+        data_type: Type[DataType],
+        strict_types: Sequence[StrictTypes],
+        pattern_key: str,
+    ) -> Dict[Types, DataType]:
+        return {
+            **super().type_map_factory(data_type, strict_types, pattern_key),
+            Types.hostname: self.data_type.from_import(
+                IMPORT_CONSTR,
+                strict=StrictTypes.str in strict_types,
+                # https://github.com/horejsek/python-fastjsonschema/blob/61c6997a8348b8df9b22e029ca2ba35ef441fbb8/fastjsonschema/draft04.py#L31
+                kwargs={
+                    pattern_key: r"r'^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]{0,61}[A-Za-z0-9])$'",
+                    **({'strict': True} if StrictTypes.str in strict_types else {}),
+                },
+            ),
+        }

{datamodel_code_generator-0.21.1 → datamodel_code_generator-0.21.3}/datamodel_code_generator/model/typed_dict.py

@@ -16,7 +16,7 @@ from typing import (
 from datamodel_code_generator.imports import Import
 from datamodel_code_generator.model import DataModel, DataModelFieldBase
 from datamodel_code_generator.model.base import UNDEFINED
-from datamodel_code_generator.model.improts import (
+from datamodel_code_generator.model.imports import (
     IMPORT_NOT_REQUIRED,
     IMPORT_NOT_REQUIRED_BACKPORT,
     IMPORT_TYPED_DICT,
@@ -139,6 +139,10 @@ class DataModelField(DataModelFieldBase):
     def _not_required(self) -> bool:
         return not self.required and isinstance(self.parent, TypedDict)
 
+    @property
+    def fall_back_to_nullable(self) -> bool:
+        return not self._not_required
+
     @property
     def imports(self) -> Tuple[Import, ...]:
         return (

{datamodel_code_generator-0.21.1 → datamodel_code_generator-0.21.3}/datamodel_code_generator/parser/base.py

@@ -314,6 +314,7 @@ class Parser(ABC):
         data_type_manager_type: Type[DataTypeManager] = pydantic_model.DataTypeManager,
         data_model_field_type: Type[DataModelFieldBase] = pydantic_model.DataModelField,
         base_class: Optional[str] = None,
+        additional_imports: Optional[List[str]] = None,
         custom_template_dir: Optional[Path] = None,
         extra_template_data: Optional[DefaultDict[str, Dict[str, Any]]] = None,
         target_python_version: PythonVersion = PythonVersion.PY_37,
@@ -380,7 +381,10 @@ class Parser(ABC):
         self.data_model_type: Type[DataModel] = data_model_type
         self.data_model_root_type: Type[DataModel] = data_model_root_type
         self.data_model_field_type: Type[DataModelFieldBase] = data_model_field_type
+
         self.imports: Imports = Imports()
+        self._append_additional_imports(additional_imports=additional_imports)
+
         self.base_class: Optional[str] = base_class
         self.target_python_version: PythonVersion = target_python_version
         self.results: List[DataModel] = []
@@ -504,6 +508,16 @@ class Parser(ABC):
                 ),
             )
 
+    def _append_additional_imports(
+        self, additional_imports: Optional[List[str]]
+    ) -> None:
+        if additional_imports is None:
+            additional_imports = []
+
+        for additional_import_string in additional_imports:
+            new_import = Import.from_full_path(additional_import_string)
+            self.imports.append(new_import)
+
     def _get_text_from_url(self, url: str) -> str:
         from datamodel_code_generator.http import get_body
 
@@ -854,7 +868,9 @@ class Parser(ABC):
                     data_type.remove_reference()
 
                     root_type_model.reference.children = [
-                        c for c in root_type_model.reference.children if c.parent
+                        c
+                        for c in root_type_model.reference.children
+                        if getattr(c, 'parent', None)
                     ]
 
                     if not root_type_model.reference.children:

{datamodel_code_generator-0.21.1 → datamodel_code_generator-0.21.3}/datamodel_code_generator/parser/jsonschema.py

@@ -371,6 +371,7 @@ class JsonSchemaParser(Parser):
         data_type_manager_type: Type[DataTypeManager] = pydantic_model.DataTypeManager,
         data_model_field_type: Type[DataModelFieldBase] = pydantic_model.DataModelField,
         base_class: Optional[str] = None,
+        additional_imports: Optional[List[str]] = None,
         custom_template_dir: Optional[Path] = None,
         extra_template_data: Optional[DefaultDict[str, Dict[str, Any]]] = None,
         target_python_version: PythonVersion = PythonVersion.PY_37,
@@ -432,6 +433,7 @@ class JsonSchemaParser(Parser):
             data_type_manager_type=data_type_manager_type,
             data_model_field_type=data_model_field_type,
             base_class=base_class,
+            additional_imports=additional_imports,
             custom_template_dir=custom_template_dir,
             extra_template_data=extra_template_data,
             target_python_version=target_python_version,

{datamodel_code_generator-0.21.1 → datamodel_code_generator-0.21.3}/datamodel_code_generator/parser/openapi.py

@@ -161,6 +161,7 @@ class OpenAPIParser(JsonSchemaParser):
         data_type_manager_type: Type[DataTypeManager] = pydantic_model.DataTypeManager,
         data_model_field_type: Type[DataModelFieldBase] = pydantic_model.DataModelField,
         base_class: Optional[str] = None,
+        additional_imports: Optional[List[str]] = None,
         custom_template_dir: Optional[Path] = None,
         extra_template_data: Optional[DefaultDict[str, Dict[str, Any]]] = None,
         target_python_version: PythonVersion = PythonVersion.PY_37,
@@ -223,6 +224,7 @@ class OpenAPIParser(JsonSchemaParser):
             data_type_manager_type=data_type_manager_type,
             data_model_field_type=data_model_field_type,
             base_class=base_class,
+            additional_imports=additional_imports,
             custom_template_dir=custom_template_dir,
             extra_template_data=extra_template_data,
             target_python_version=target_python_version,
@@ -477,7 +479,11 @@ class OpenAPIParser(JsonSchemaParser):
 
         if OpenAPIScope.Parameters in self.open_api_scopes and fields:
             self.results.append(
-                self.data_model_type(fields=fields, reference=reference)
+                self.data_model_type(
+                    fields=fields,
+                    reference=reference,
+                    custom_base_class=self.base_class,
+                )
             )
 
     def parse_operation(

datamodel_code_generator-0.21.3/datamodel_code_generator/version.py

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

{datamodel_code_generator-0.21.1 → datamodel_code_generator-0.21.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamodel-code-generator"
-version = "0.21.1"
+version = "0.21.3"
 description = "Datamodel Code Generator"
 authors = ["Koudai Aono <koxudaxi@gmail.com>"]
 readme = "README.md"

datamodel_code_generator-0.21.1/datamodel_code_generator/model/pydantic_v2/types.py

@@ -1,9 +0,0 @@
-from __future__ import annotations
-
-from typing import ClassVar
-
-from datamodel_code_generator.model.pydantic import DataTypeManager as _DataTypeManager
-
-
-class DataTypeManager(_DataTypeManager):
-    PATTERN_KEY: ClassVar[str] = 'pattern'

datamodel_code_generator-0.21.1/datamodel_code_generator/version.py

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