datamodel-code-generator 0.21.2__py3-none-any.whl → 0.21.3__py3-none-any.whl

datamodel_code_generator/__init__.py

@@ -224,7 +224,7 @@ 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,

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/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/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/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/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/model/pydantic_v2/types.py

@@ -1,9 +1,30 @@
 from __future__ import annotations
 
-from typing import ClassVar
+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/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/parser/openapi.py

@@ -479,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/version.py

@@ -1 +1 @@
-version: str = '0.21.2'
+version: str = '0.21.3'

{datamodel_code_generator-0.21.2.dist-info → datamodel_code_generator-0.21.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datamodel-code-generator
-Version: 0.21.2
+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.2.dist-info → datamodel_code_generator-0.21.3.dist-info}/RECORD

@@ -1,24 +1,24 @@
-datamodel_code_generator/__init__.py,sha256=7uANEoX7YDo-dzmUAHbPbseOJAezVvfIiUH7TA6BWDo,16720
+datamodel_code_generator/__init__.py,sha256=UYRcDyUBQMfCNJrAYoBrBPI8hyE3kl7b3RUlbJPUSDA,16704
 datamodel_code_generator/__main__.py,sha256=5DPtsGfqSpnMwB8CTbvOqiwlEiRvQu6Xw5ZpkOIK_pk,26786
 datamodel_code_generator/format.py,sha256=o1TzhqZBeb2w-nXFlZEDnbMx0iOAUlaUTEfdgmIMoOw,5703
 datamodel_code_generator/http.py,sha256=Mf4_fTV-2Ni_4Slz-ey3Dtggw1eFAHVyJHnyMgXlmQM,586
 datamodel_code_generator/imports.py,sha256=fWxlydNOEFriihI9yEx65XsbcstxJVVBXPL_W-QQ3eA,3431
-datamodel_code_generator/model/__init__.py,sha256=fXz_QiAXEAIgxNWia8u7MTsDWpfUwBuH7q9Y59geAjU,2660
-datamodel_code_generator/model/base.py,sha256=OjisraT2mQ57i0Uo5dzCmsi5bje6_NzxLAvcd1hynV4,12389
-datamodel_code_generator/model/dataclass.py,sha256=gUsjMhnQMVowBStY8ycbykaaQBEENoHl2EL7vcr3AJ8,3842
+datamodel_code_generator/model/__init__.py,sha256=r3T6VXrmuUhkcqKH-tdpowKORGOl73NQ1kLMVaHPG3A,2663
+datamodel_code_generator/model/base.py,sha256=GP9eUALhHDqn6K_F9ZBD3IKw8cdAOoILD-0RSgyMgck,12801
+datamodel_code_generator/model/dataclass.py,sha256=JGf9JF-sq7fdxWOJEOmoemVw8vXMQGlc4ADub_yNhzM,3842
 datamodel_code_generator/model/enum.py,sha256=Giehhtij2DZs2LssSJnG_CIIHsSA7Mkz471GU-Cb5kI,3338
-datamodel_code_generator/model/improts.py,sha256=uQJgWKmH-afM3UJtRymJndxZfM6NvDOpde3BvvxPmt8,473
+datamodel_code_generator/model/imports.py,sha256=uQJgWKmH-afM3UJtRymJndxZfM6NvDOpde3BvvxPmt8,473
 datamodel_code_generator/model/pydantic/__init__.py,sha256=vJkESKKIEp8pxwP1p6uQAAfxLwAiAKHYopj675PwIOM,1371
 datamodel_code_generator/model/pydantic/base_model.py,sha256=c6Y5Wb4SkOKqXhgx8DyRakiVTe2twwQKp583elpXWDM,11499
 datamodel_code_generator/model/pydantic/custom_root_type.py,sha256=XOeJqzUEAYE21C3hPAnRIz9iDWIjZvUOWDc9MCrpdvw,299
 datamodel_code_generator/model/pydantic/dataclass.py,sha256=sbqTmutl8Fjf1pYngfdv0NMXt904QcTRpHqmZy6GUiQ,424
 datamodel_code_generator/model/pydantic/imports.py,sha256=2nSLYwphBUMQEa0PTSNwoLjEBslu02EQb6BdZ-S51yk,2189
-datamodel_code_generator/model/pydantic/types.py,sha256=ZyCpP5ZacFdGoU_Q2Qz0F6kdTZ9Cu1bAkZM-XyYXat0,12133
-datamodel_code_generator/model/pydantic_v2/__init__.py,sha256=75HtoLkpL-KO_FlF9I0YB3Sy_VoImPs_rdAhC8cDppU,577
+datamodel_code_generator/model/pydantic/types.py,sha256=KAA7pRQ6UkDdfZxwVJ0WPlANi1Y_XDUxLcv1SM_K4Tk,12387
+datamodel_code_generator/model/pydantic_v2/__init__.py,sha256=f6N9vb_s3Uv7vkHrUcSTUF_OUTYfF-b395WaV5sVc_g,799
 datamodel_code_generator/model/pydantic_v2/base_model.py,sha256=EcvFnJ_7LvN7sxMHie27PUgMwdJ3oMWdTCzGR9Nvz3s,4930
 datamodel_code_generator/model/pydantic_v2/imports.py,sha256=ukTU6UqB-o7dP3xq6CmwL5ZJConILiiMZGl0itLiLq8,119
 datamodel_code_generator/model/pydantic_v2/root_model.py,sha256=Y8nzV_4O8brgJULRflI-npR59YCRnArwyAB5UliZgYQ,295
-datamodel_code_generator/model/pydantic_v2/types.py,sha256=WXrdGSiSCR5y8b1GoRfjF-oD2JVxECztoc5CLB_vqEg,239
+datamodel_code_generator/model/pydantic_v2/types.py,sha256=FndSBApBPfno7wmVBO4ttE-b2WUGjP0sTxlS4yBGeC0,1280
 datamodel_code_generator/model/rootmodel.py,sha256=8bW7emVQtDGe2iUAmqtlQb607LvTRL0TBSP66pIeNzY,202
 datamodel_code_generator/model/template/Enum.jinja2,sha256=k9lB8iQUsB94bPi8e3xJEd0AGk2ciWL-pSZuGY5kNPQ,378
 datamodel_code_generator/model/template/TypedDict.jinja2,sha256=J_Pe_CiuvTOb-EUCExXPaeTEFzn2keyrKB0wglZ8HgA,135
@@ -33,19 +33,19 @@ datamodel_code_generator/model/template/pydantic_v2/BaseModel.jinja2,sha256=AZDG
 datamodel_code_generator/model/template/pydantic_v2/ConfigDict.jinja2,sha256=xHvBYrh__32O1xRCSl6_u5zbyYIjB8a5k8fZiTo0spY,149
 datamodel_code_generator/model/template/pydantic_v2/RootModel.jinja2,sha256=DrJifAOsIcQn-qLeSnsAwz1uCPz0if4dKYcT-ckKea8,992
 datamodel_code_generator/model/template/root.jinja2,sha256=3OTtibxLcGA-FMdR0QDCJUJQgf_kRW0OafeCTPFSFFo,162
-datamodel_code_generator/model/typed_dict.py,sha256=yCih5a7UWM0Mm9pogdpfIxBL7oclZIMISUS7B2e5R0Q,4655
+datamodel_code_generator/model/typed_dict.py,sha256=hEtpq3BrFFkYumrQCULQxYthKmZPCim1cBakxk64fFU,4753
 datamodel_code_generator/model/types.py,sha256=GmKGPrpbJRgcsfRv9Khpo26e8DgMrPBnmLw6cpdjdiE,2891
 datamodel_code_generator/parser/__init__.py,sha256=zHbw6RPlJC0SAQjb-XyVlyZhcOu5PfYgPidy6jlUM8M,793
 datamodel_code_generator/parser/base.py,sha256=FNJjC8TWjMMEj9VGl3E-mkLn6xTsBwwgY_DKMn1dLU0,45803
 datamodel_code_generator/parser/jsonschema.py,sha256=ICPQy_WVTO0j_D5_l2J_QDMC4lUyeuRKMSJcsj7Uue8,64933
-datamodel_code_generator/parser/openapi.py,sha256=KYDq9OEJgEFcaY-ZWzqjTXTwC2v_Ji4JbMpl1FR_jNs,23782
+datamodel_code_generator/parser/openapi.py,sha256=cAChTjJwnpousjz76PykP_zkaAveTspVVAAiSfOv2Bc,23896
 datamodel_code_generator/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datamodel_code_generator/reference.py,sha256=mWW5zi_NUX1NjmbRNEYEMW4eIU6CKa8J2QW77cVl-Cg,25993
 datamodel_code_generator/types.py,sha256=lwP7g18vnaNEmQWTUgSa1boq_0p6XdyQBCu-b7SKYog,18872
 datamodel_code_generator/util.py,sha256=yWH-SeYRevrzJ6VH8H6-CWRrI1FcTB5RhHXxVZaRwSU,3136
-datamodel_code_generator/version.py,sha256=RzuXq3COwtl02Iy3dSXMqd6ovaqJPKM9XI1q7jHdn3o,24
-datamodel_code_generator-0.21.2.dist-info/LICENSE,sha256=K54Lwc6_jduycsy8oFFjQEeSSuEiqvVIjCGIXOMnuTQ,1068
-datamodel_code_generator-0.21.2.dist-info/METADATA,sha256=9WQHDAHbdAV-B_BdjK5mpA_6rvHo-w89wACOR3ut8NE,22372
-datamodel_code_generator-0.21.2.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-datamodel_code_generator-0.21.2.dist-info/entry_points.txt,sha256=bykbUWqOCiKfxJPGe8jpNqTqD1NG7uyRmozdnwzu7rk,76
-datamodel_code_generator-0.21.2.dist-info/RECORD,,
+datamodel_code_generator/version.py,sha256=OUQXbNCNGUtH27WirMU_Bx389ZgMgHrEvb0nHRlNk04,24
+datamodel_code_generator-0.21.3.dist-info/LICENSE,sha256=K54Lwc6_jduycsy8oFFjQEeSSuEiqvVIjCGIXOMnuTQ,1068
+datamodel_code_generator-0.21.3.dist-info/METADATA,sha256=tKaNvUyot6LTjkZgWHsYY0EFBVeRkFsQPPUmqUYnKlY,22372
+datamodel_code_generator-0.21.3.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+datamodel_code_generator-0.21.3.dist-info/entry_points.txt,sha256=bykbUWqOCiKfxJPGe8jpNqTqD1NG7uyRmozdnwzu7rk,76
+datamodel_code_generator-0.21.3.dist-info/RECORD,,