datamodel-code-generator 0.18.1__tar.gz → 0.20.0__tar.gz

{datamodel_code_generator-0.18.1 → datamodel_code_generator-0.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datamodel-code-generator
-Version: 0.18.1
+Version: 0.20.0
 Summary: Datamodel Code Generator
 Home-page: https://github.com/koxudaxi/datamodel-code-generator
 License: MIT
@@ -16,12 +16,6 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Provides-Extra: http
 Requires-Dist: PySnooper (>=0.4.1,<2.0.0)
@@ -32,7 +26,7 @@ Requires-Dist: httpx ; extra == "http"
 Requires-Dist: inflect (>=4.1.0,<6.0)
 Requires-Dist: isort (>=4.3.21,<6.0)
 Requires-Dist: jinja2 (>=2.10.1,<4.0)
-Requires-Dist: openapi-spec-validator (>=0.2.8,<=0.5.1)
+Requires-Dist: openapi-spec-validator (>=0.2.8,<=0.5.2)
 Requires-Dist: packaging
 Requires-Dist: prance (>=0.18.2,<1.0)
 Requires-Dist: pydantic[email] (>=1.10.0,<2.0.0) ; python_version >= "3.11" and python_version < "4.0"
@@ -44,10 +38,11 @@ Description-Content-Type: text/markdown
 
 # datamodel-code-generator
 
-This code generator creates [pydantic](https://docs.pydantic.dev/) model and [dataclasses.dataclass](https://docs.python.org/3/library/dataclasses.html) from an openapi file and others.
+This code generator creates [pydantic](https://docs.pydantic.dev/) model, [dataclasses.dataclass](https://docs.python.org/3/library/dataclasses.html) and [typing.TypedDict](https://docs.python.org/3/library/typing.html#typing.TypedDict) from an openapi file and others.
 
 [![Build Status](https://github.com/koxudaxi/datamodel-code-generator/workflows/Test/badge.svg)](https://github.com/koxudaxi/datamodel-code-generator/actions?query=workflow%3ATest)
 [![PyPI version](https://badge.fury.io/py/datamodel-code-generator.svg)](https://pypi.python.org/pypi/datamodel-code-generator)
+[![Conda-forge](https://img.shields.io/conda/v/conda-forge/datamodel-code-generator)](https://anaconda.org/conda-forge/datamodel-code-generator)
 [![Downloads](https://pepy.tech/badge/datamodel-code-generator/month)](https://pepy.tech/project/datamodel-code-generator)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/datamodel-code-generator)](https://pypi.python.org/pypi/datamodel-code-generator)
 [![codecov](https://codecov.io/gh/koxudaxi/datamodel-code-generator/branch/master/graph/badge.svg)](https://codecov.io/gh/koxudaxi/datamodel-code-generator)
@@ -68,7 +63,7 @@ To install `datamodel-code-generator`:
 $ pip install datamodel-code-generator
 ```
 
-## Simple usage
+## Simple Usage
 You can generate models from a local file.
 ```bash
 $ datamodel-codegen --input api.yaml --output model.py
@@ -278,14 +273,14 @@ class Apis(BaseModel):
 ```
 </details>
 
-## Which project uses it?
-These OSS use datamodel-code-generator to generate many models. We can learn about use-cases from these projects.
+## Projects that use datamodel-code-generator
+These OSS projects use datamodel-code-generator to generate many models. See the following linked projects for real world examples and inspiration.
 - [Netflix/consoleme](https://github.com/Netflix/consoleme)
   - *[How do I generate models from the Swagger specification?](https://github.com/Netflix/consoleme/blob/master/docs/gitbook/faq.md#how-do-i-generate-models-from-the-swagger-specification)*
 - [DataDog/integrations-core](https://github.com/DataDog/integrations-core)
   - *[Config models](https://github.com/DataDog/integrations-core/blob/master/docs/developer/meta/config-models.md)*
 - [awslabs/aws-lambda-powertools-python](https://github.com/awslabs/aws-lambda-powertools-python)
-  - *Not used. But, introduced [advanced-use-cases](https://awslabs.github.io/aws-lambda-powertools-python/2.6.0/utilities/parser/#advanced-use-cases) in the official document*
+  - *Recommended for [advanced-use-cases](https://awslabs.github.io/aws-lambda-powertools-python/2.6.0/utilities/parser/#advanced-use-cases) in the official documentation*
 - [open-metadata/OpenMetadata](https://github.com/open-metadata/OpenMetadata)
   - [Makefile](https://github.com/open-metadata/OpenMetadata/blob/main/Makefile)
 - [airbytehq/airbyte](https://github.com/airbytehq/airbyte)
@@ -303,6 +298,7 @@ These OSS use datamodel-code-generator to generate many models. We can learn abo
 ## Supported output types
 - [pydantic](https://docs.pydantic.dev/).BaseModel
 - [dataclasses.dataclass](https://docs.python.org/3/library/dataclasses.html)
+- [typing.TypedDict](https://docs.python.org/3/library/typing.html#typing.TypedDict)
 
 ## Installation
 
@@ -328,7 +324,7 @@ You can genearte models from a URL.
 ```bash
 $ datamodel-codegen --url https://<INPUT FILE URL> --output model.py
 ```
-This method needs  [http extra option](#http-extra-option)
+This method needs the [http extra option](#http-extra-option)
 
 
 ## All Command Options
@@ -339,7 +335,7 @@ usage: datamodel-codegen [-h] [--input INPUT] [--url URL]
                          [--http-headers HTTP_HEADER [HTTP_HEADER ...]]
                          [--http-ignore-tls]
                          [--input-file-type {auto,openapi,jsonschema,json,yaml,dict,csv}]
-                         [--output-model-type {pydantic.BaseModel,dataclasses.dataclass}]
+                         [--output-model-type {pydantic.BaseModel,dataclasses.dataclass,typing.TypedDict}]
                          [--openapi-scopes {schemas,paths,tags,parameters} [{schemas,paths,tags,parameters} ...]]
                          [--output OUTPUT] [--base-class BASE_CLASS]
                          [--field-constraints] [--use-annotated]
@@ -390,7 +386,7 @@ options:
                         certificate
   --input-file-type {auto,openapi,jsonschema,json,yaml,dict,csv}
                         Input file type (default: auto)
-  --output-model-type {pydantic.BaseModel,dataclasses.dataclass}
+  --output-model-type {pydantic.BaseModel,dataclasses.dataclass,typing.TypedDict}
                         Output model type (default: pydantic.BaseModel)
   --openapi-scopes {schemas,paths,tags,parameters} [{schemas,paths,tags,parameters} ...]
                         Scopes of OpenAPI model generation (default: schemas)
@@ -496,41 +492,6 @@ options:
   --version             show version
 ```
 
-
-## Implemented list
-### OpenAPI 3 and JsonSchema
-#### DataType
--  string (include patter/minLength/maxLenght)
--  number (include maximum/exclusiveMaximum/minimum/exclusiveMinimum/multipleOf/le/ge)
--  integer (include maximum/exclusiveMaximum/minimum/exclusiveMinimum/multipleOf/le/ge)
--  boolean
--  array
--  object
-
-##### String Format
--  date
--  datetime
--  time
--  password
--  email
--  idn-email
--  uuid (uuid1/uuid2/uuid3/uuid4/uuid5)
--  ipv4
--  ipv6
--  ipv4-network
--  ipv6-network
--  hostname
--  decimal
-
-#### Other schema
--  enum (as enum.Enum or typing.Literal)
--  allOf (as Multiple inheritance)
--  anyOf (as typing.Union)
--  oneOf (as typing.Union)
--  $ref ([http extra](#http-extra-option) is required when resolving $ref for remote files.)
--  $id (for [JSONSchema](https://json-schema.org/understanding-json-schema/structuring.html#the-id-property))
-
-
 ## Related projects
 ### fastapi-code-generator
 This code generator creates [FastAPI](https://github.com/tiangolo/fastapi) app from an openapi file.

{datamodel_code_generator-0.18.1 → datamodel_code_generator-0.20.0}/README.md

@@ -1,9 +1,10 @@
 # datamodel-code-generator
 
-This code generator creates [pydantic](https://docs.pydantic.dev/) model and [dataclasses.dataclass](https://docs.python.org/3/library/dataclasses.html) from an openapi file and others.
+This code generator creates [pydantic](https://docs.pydantic.dev/) model, [dataclasses.dataclass](https://docs.python.org/3/library/dataclasses.html) and [typing.TypedDict](https://docs.python.org/3/library/typing.html#typing.TypedDict) from an openapi file and others.
 
 [![Build Status](https://github.com/koxudaxi/datamodel-code-generator/workflows/Test/badge.svg)](https://github.com/koxudaxi/datamodel-code-generator/actions?query=workflow%3ATest)
 [![PyPI version](https://badge.fury.io/py/datamodel-code-generator.svg)](https://pypi.python.org/pypi/datamodel-code-generator)
+[![Conda-forge](https://img.shields.io/conda/v/conda-forge/datamodel-code-generator)](https://anaconda.org/conda-forge/datamodel-code-generator)
 [![Downloads](https://pepy.tech/badge/datamodel-code-generator/month)](https://pepy.tech/project/datamodel-code-generator)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/datamodel-code-generator)](https://pypi.python.org/pypi/datamodel-code-generator)
 [![codecov](https://codecov.io/gh/koxudaxi/datamodel-code-generator/branch/master/graph/badge.svg)](https://codecov.io/gh/koxudaxi/datamodel-code-generator)
@@ -24,7 +25,7 @@ To install `datamodel-code-generator`:
 $ pip install datamodel-code-generator
 ```
 
-## Simple usage
+## Simple Usage
 You can generate models from a local file.
 ```bash
 $ datamodel-codegen --input api.yaml --output model.py
@@ -234,14 +235,14 @@ class Apis(BaseModel):
 ```
 </details>
 
-## Which project uses it?
-These OSS use datamodel-code-generator to generate many models. We can learn about use-cases from these projects.
+## Projects that use datamodel-code-generator
+These OSS projects use datamodel-code-generator to generate many models. See the following linked projects for real world examples and inspiration.
 - [Netflix/consoleme](https://github.com/Netflix/consoleme)
   - *[How do I generate models from the Swagger specification?](https://github.com/Netflix/consoleme/blob/master/docs/gitbook/faq.md#how-do-i-generate-models-from-the-swagger-specification)*
 - [DataDog/integrations-core](https://github.com/DataDog/integrations-core)
   - *[Config models](https://github.com/DataDog/integrations-core/blob/master/docs/developer/meta/config-models.md)*
 - [awslabs/aws-lambda-powertools-python](https://github.com/awslabs/aws-lambda-powertools-python)
-  - *Not used. But, introduced [advanced-use-cases](https://awslabs.github.io/aws-lambda-powertools-python/2.6.0/utilities/parser/#advanced-use-cases) in the official document*
+  - *Recommended for [advanced-use-cases](https://awslabs.github.io/aws-lambda-powertools-python/2.6.0/utilities/parser/#advanced-use-cases) in the official documentation*
 - [open-metadata/OpenMetadata](https://github.com/open-metadata/OpenMetadata)
   - [Makefile](https://github.com/open-metadata/OpenMetadata/blob/main/Makefile)
 - [airbytehq/airbyte](https://github.com/airbytehq/airbyte)
@@ -259,6 +260,7 @@ These OSS use datamodel-code-generator to generate many models. We can learn abo
 ## Supported output types
 - [pydantic](https://docs.pydantic.dev/).BaseModel
 - [dataclasses.dataclass](https://docs.python.org/3/library/dataclasses.html)
+- [typing.TypedDict](https://docs.python.org/3/library/typing.html#typing.TypedDict)
 
 ## Installation
 
@@ -284,7 +286,7 @@ You can genearte models from a URL.
 ```bash
 $ datamodel-codegen --url https://<INPUT FILE URL> --output model.py
 ```
-This method needs  [http extra option](#http-extra-option)
+This method needs the [http extra option](#http-extra-option)
 
 
 ## All Command Options
@@ -295,7 +297,7 @@ usage: datamodel-codegen [-h] [--input INPUT] [--url URL]
                          [--http-headers HTTP_HEADER [HTTP_HEADER ...]]
                          [--http-ignore-tls]
                          [--input-file-type {auto,openapi,jsonschema,json,yaml,dict,csv}]
-                         [--output-model-type {pydantic.BaseModel,dataclasses.dataclass}]
+                         [--output-model-type {pydantic.BaseModel,dataclasses.dataclass,typing.TypedDict}]
                          [--openapi-scopes {schemas,paths,tags,parameters} [{schemas,paths,tags,parameters} ...]]
                          [--output OUTPUT] [--base-class BASE_CLASS]
                          [--field-constraints] [--use-annotated]
@@ -346,7 +348,7 @@ options:
                         certificate
   --input-file-type {auto,openapi,jsonschema,json,yaml,dict,csv}
                         Input file type (default: auto)
-  --output-model-type {pydantic.BaseModel,dataclasses.dataclass}
+  --output-model-type {pydantic.BaseModel,dataclasses.dataclass,typing.TypedDict}
                         Output model type (default: pydantic.BaseModel)
   --openapi-scopes {schemas,paths,tags,parameters} [{schemas,paths,tags,parameters} ...]
                         Scopes of OpenAPI model generation (default: schemas)
@@ -452,41 +454,6 @@ options:
   --version             show version
 ```
 
-
-## Implemented list
-### OpenAPI 3 and JsonSchema
-#### DataType
--  string (include patter/minLength/maxLenght)
--  number (include maximum/exclusiveMaximum/minimum/exclusiveMinimum/multipleOf/le/ge)
--  integer (include maximum/exclusiveMaximum/minimum/exclusiveMinimum/multipleOf/le/ge)
--  boolean
--  array
--  object
-
-##### String Format
--  date
--  datetime
--  time
--  password
--  email
--  idn-email
--  uuid (uuid1/uuid2/uuid3/uuid4/uuid5)
--  ipv4
--  ipv6
--  ipv4-network
--  ipv6-network
--  hostname
--  decimal
-
-#### Other schema
--  enum (as enum.Enum or typing.Literal)
--  allOf (as Multiple inheritance)
--  anyOf (as typing.Union)
--  oneOf (as typing.Union)
--  $ref ([http extra](#http-extra-option) is required when resolving $ref for remote files.)
--  $id (for [JSONSchema](https://json-schema.org/understanding-json-schema/structuring.html#the-id-property))
-
-
 ## Related projects
 ### fastapi-code-generator
 This code generator creates [FastAPI](https://github.com/tiangolo/fastapi) app from an openapi file.

{datamodel_code_generator-0.18.1 → datamodel_code_generator-0.20.0}/datamodel_code_generator/__init__.py

@@ -220,6 +220,7 @@ RAW_DATA_TYPES: List[InputFileType] = [
 class DataModelType(Enum):
     PydanticBaseModel = 'pydantic.BaseModel'
     DataclassesDataclass = 'dataclasses.dataclass'
+    TypingTypedDict = 'typing.TypedDict'
 
 
 class OpenAPIScope(Enum):
@@ -314,6 +315,7 @@ def generate(
     capitalise_enum_members: bool = False,
     keep_model_order: bool = False,
     custom_file_header: Optional[str] = None,
+    custom_file_header_path: Optional[Path] = None,
 ) -> None:
     remote_text_cache: DefaultPutDict[str, str] = DefaultPutDict()
     if isinstance(input_, str):
@@ -397,7 +399,7 @@ def generate(
 
     from datamodel_code_generator.model import get_data_model_types
 
-    data_model_types = get_data_model_types(output_model_type)
+    data_model_types = get_data_model_types(output_model_type, target_python_version)
     parser = parser_class(
         source=input_text or input_,
         data_model_type=data_model_types.data_model,
@@ -427,7 +429,9 @@ def generate(
         use_field_description=use_field_description,
         use_default_kwarg=use_default_kwarg,
         reuse_model=reuse_model,
-        enum_field_as_literal=enum_field_as_literal,
+        enum_field_as_literal=LiteralType.All
+        if output_model_type == DataModelType.TypingTypedDict
+        else enum_field_as_literal,
         use_one_literal_as_default=use_one_literal_as_default,
         set_default_enum_member=set_default_enum_member,
         use_subclass_enum=use_subclass_enum,
@@ -488,6 +492,9 @@ def generate(
 
     timestamp = datetime.now(timezone.utc).replace(microsecond=0).isoformat()
 
+    if custom_file_header is None and custom_file_header_path:
+        custom_file_header = custom_file_header_path.read_text(encoding=encoding)
+
     header = """\
 # generated by datamodel-codegen:
 #   filename:  {}"""
@@ -497,8 +504,7 @@ def generate(
         header += f'\n#   version:   {get_version()}'
 
     file: Optional[IO[Any]]
-    for path, body_and_filename in modules.items():
-        body, filename = body_and_filename
+    for path, (body, filename) in modules.items():
         if path is None:
             file = None
         else:

{datamodel_code_generator-0.18.1 → datamodel_code_generator-0.20.0}/datamodel_code_generator/__main__.py

@@ -433,6 +433,15 @@ arg_parser.add_argument(
 arg_parser.add_argument(
     '--custom-file-header', help='Custom file header', type=str, default=None
 )
+
+arg_parser.add_argument(
+    '--custom-file-header-path',
+    help='Custom file header file path',
+    default=None,
+    type=str,
+)
+
+
 arg_parser.add_argument('--version', help='show version', action='store_true')
 
 
@@ -448,7 +457,9 @@ class Config(BaseModel):
             return value
         return cast(TextIOBase, Path(value).expanduser().resolve().open('rt'))
 
-    @validator('input', 'output', 'custom_template_dir', pre=True)
+    @validator(
+        'input', 'output', 'custom_template_dir', 'custom_file_header_path', pre=True
+    )
     def validate_path(cls, value: Any) -> Optional[Path]:
         if value is None or isinstance(value, Path):
             return value  # pragma: no cover
@@ -488,6 +499,14 @@ class Config(BaseModel):
                 )
         return values
 
+    @root_validator
+    def validate_custom_file_header(cls, values: Dict[str, Any]) -> Dict[str, Any]:
+        if values.get('custom_file_header') and values.get('custom_file_header_path'):
+            raise Error(
+                '`--custom_file_header_path` can not be used with `--custom_file_header`.'
+            )  # pragma: no cover
+        return values
+
     # Pydantic 1.5.1 doesn't support each_item=True correctly
     @validator('http_headers', pre=True)
     def validate_http_headers(cls, value: Any) -> Optional[List[Tuple[str, str]]]:
@@ -583,6 +602,7 @@ class Config(BaseModel):
     capitalise_enum_members: bool = False
     keep_model_order: bool = False
     custom_file_header: Optional[str] = None
+    custom_file_header_path: Optional[Path] = None
 
     def merge_args(self, args: Namespace) -> None:
         set_args = {
@@ -742,6 +762,8 @@ def main(args: Optional[Sequence[str]] = None) -> Exit:
             remove_special_field_name_prefix=config.remove_special_field_name_prefix,
             capitalise_enum_members=config.capitalise_enum_members,
             keep_model_order=config.keep_model_order,
+            custom_file_header=config.custom_file_header,
+            custom_file_header_path=config.custom_file_header_path,
         )
         return Exit.OK
     except InvalidClassNameError as e:

{datamodel_code_generator-0.18.1 → datamodel_code_generator-0.20.0}/datamodel_code_generator/format.py

@@ -9,6 +9,8 @@ import black
 import isort
 import toml
 
+from datamodel_code_generator import cached_property
+
 
 class PythonVersion(Enum):
     PY_36 = '3.6'
@@ -18,13 +20,41 @@ class PythonVersion(Enum):
     PY_310 = '3.10'
     PY_311 = '3.11'
 
+    @cached_property
+    def _is_py_38_or_later(self) -> bool:  # pragma: no cover
+        return self.value not in {self.PY_36.value, self.PY_37.value}  # type: ignore
+
+    @cached_property
+    def _is_py_39_or_later(self) -> bool:  # pragma: no cover
+        return self.value not in {self.PY_36.value, self.PY_37.value, self.PY_38.value}  # type: ignore
+
+    @cached_property
+    def _is_py_310_or_later(self) -> bool:  # pragma: no cover
+        return self.value not in {self.PY_36.value, self.PY_37.value, self.PY_38.value, self.PY_39.value}  # type: ignore
+
+    @cached_property
+    def _is_py_311_or_later(self) -> bool:  # pragma: no cover
+        return self.value not in {self.PY_36.value, self.PY_37.value, self.PY_38.value, self.PY_39.value, self.PY_310.value}  # type: ignore
+
     @property
     def has_literal_type(self) -> bool:
-        return self.value not in {self.PY_36.value, self.PY_37.value}  # type: ignore
+        return self._is_py_38_or_later
 
     @property
     def has_union_operator(self) -> bool:  # pragma: no cover
-        return self.value not in {self.PY_36.value, self.PY_37.value, self.PY_38.value, self.PY_39.value}  # type: ignore
+        return self._is_py_310_or_later
+
+    @property
+    def has_annotated_type(self) -> bool:
+        return self._is_py_39_or_later
+
+    @property
+    def has_typed_dict(self) -> bool:
+        return self._is_py_38_or_later
+
+    @property
+    def has_typed_dict_non_required(self) -> bool:
+        return self._is_py_311_or_later
 
 
 if TYPE_CHECKING:

{datamodel_code_generator-0.18.1 → datamodel_code_generator-0.20.0}/datamodel_code_generator/imports.py

@@ -61,6 +61,7 @@ class Imports(DefaultDict[Optional[str], Set[str]]):
 
 
 IMPORT_ANNOTATED = Import.from_full_path('typing.Annotated')
+IMPORT_ANNOTATED_BACKPORT = Import.from_full_path('typing_extensions.Annotated')
 IMPORT_ANY = Import.from_full_path('typing.Any')
 IMPORT_LIST = Import.from_full_path('typing.List')
 IMPORT_UNION = Import.from_full_path('typing.Union')

{datamodel_code_generator-0.18.1 → datamodel_code_generator-0.20.0}/datamodel_code_generator/model/__init__.py

@@ -6,7 +6,7 @@ from ..types import DataTypeManager as DataTypeManagerABC
 from .base import ConstraintsBase, DataModel, DataModelFieldBase
 
 if TYPE_CHECKING:
-    from .. import DataModelType
+    from .. import DataModelType, PythonVersion
 
 
 class DataModelSet(NamedTuple):
@@ -17,9 +17,11 @@ class DataModelSet(NamedTuple):
     dump_resolve_reference_action: Optional[Callable[[Iterable[str]], str]]
 
 
-def get_data_model_types(data_model_type: DataModelType) -> DataModelSet:
+def get_data_model_types(
+    data_model_type: DataModelType, target_python_version: PythonVersion
+) -> DataModelSet:
     from .. import DataModelType
-    from . import dataclass, pydantic, rootmodel
+    from . import dataclass, pydantic, rootmodel, typed_dict
     from .types import DataTypeManager
 
     if data_model_type == DataModelType.PydanticBaseModel:
@@ -38,6 +40,18 @@ def get_data_model_types(data_model_type: DataModelType) -> DataModelSet:
             data_type_manager=DataTypeManager,
             dump_resolve_reference_action=None,
         )
+    elif data_model_type == DataModelType.TypingTypedDict:
+        return DataModelSet(
+            data_model=typed_dict.TypedDict
+            if target_python_version.has_typed_dict
+            else typed_dict.TypedDictBackport,
+            root_model=rootmodel.RootModel,
+            field_model=typed_dict.DataModelField
+            if target_python_version.has_typed_dict_non_required
+            else typed_dict.DataModelFieldBackport,
+            data_type_manager=DataTypeManager,
+            dump_resolve_reference_action=None,
+        )
     raise ValueError(
         f'{data_model_type} is unsupported data model type'
     )  # pragma: no cover

{datamodel_code_generator-0.18.1 → datamodel_code_generator-0.20.0}/datamodel_code_generator/model/base.py

@@ -25,6 +25,7 @@ from jinja2 import Environment, FileSystemLoader, Template
 from datamodel_code_generator import cached_property
 from datamodel_code_generator.imports import (
     IMPORT_ANNOTATED,
+    IMPORT_ANNOTATED_BACKPORT,
     IMPORT_OPTIONAL,
     IMPORT_UNION,
     Import,
@@ -125,7 +126,12 @@ class DataModelFieldBase(_BaseModel):
         ) and not self.data_type.use_union_operator:
             imports.append((IMPORT_OPTIONAL,))
         if self.use_annotated:
-            imports.append((IMPORT_ANNOTATED,))
+            import_annotated = (
+                IMPORT_ANNOTATED
+                if self.data_type.python_version.has_annotated_type
+                else IMPORT_ANNOTATED_BACKPORT
+            )
+            imports.append((import_annotated,))
         return chain_as_tuple(*imports)
 
     @property

{datamodel_code_generator-0.18.1 → datamodel_code_generator-0.20.0}/datamodel_code_generator/model/dataclass.py

@@ -12,6 +12,13 @@ from datamodel_code_generator.reference import Reference
 from datamodel_code_generator.types import chain_as_tuple
 
 
+def _has_field_assignment(field: DataModelFieldBase) -> bool:
+    return bool(field.field) or not (
+        field.required
+        or (field.represented_default == 'None' and field.strip_default_none)
+    )
+
+
 class DataClass(DataModel):
     TEMPLATE_FILE_PATH: ClassVar[str] = 'dataclass.jinja2'
     DEFAULT_IMPORTS: ClassVar[Tuple[Import, ...]] = (IMPORT_DATACLASS,)
@@ -34,7 +41,7 @@ class DataClass(DataModel):
     ) -> None:
         super().__init__(
             reference=reference,
-            fields=fields,
+            fields=sorted(fields, key=_has_field_assignment, reverse=False),
             decorators=decorators,
             base_classes=base_classes,
             custom_base_class=custom_base_class,
@@ -46,7 +53,6 @@ class DataClass(DataModel):
             default=default,
             nullable=nullable,
         )
-        self.fields.sort(key=str, reverse=False)
 
     @property
     def imports(self) -> Tuple[Import, ...]:

datamodel_code_generator-0.20.0/datamodel_code_generator/model/improts.py

@@ -0,0 +1,8 @@
+from datamodel_code_generator.imports import Import
+
+IMPORT_DATACLASS = Import.from_full_path('dataclasses.dataclass')
+IMPORT_FIELD = Import.from_full_path('dataclasses.field')
+IMPORT_TYPED_DICT = Import.from_full_path('typing.TypedDict')
+IMPORT_TYPED_DICT_BACKPORT = Import.from_full_path('typing_extensions.TypedDict')
+IMPORT_NOT_REQUIRED = Import.from_full_path('typing.NotRequired')
+IMPORT_NOT_REQUIRED_BACKPORT = Import.from_full_path('typing_extensions.NotRequired')

{datamodel_code_generator-0.18.1 → datamodel_code_generator-0.20.0}/datamodel_code_generator/model/pydantic/types.py

@@ -93,7 +93,7 @@ def type_map_factory(
         Types.ipv6_network: data_type.from_import(IMPORT_IPV6NETWORKS),
         Types.boolean: data_type(type='bool'),
         Types.object: data_type.from_import(IMPORT_ANY, is_dict=True),
-        Types.null: data_type.from_import(IMPORT_ANY, is_optional=True),
+        Types.null: data_type(type='None'),
         Types.array: data_type.from_import(IMPORT_ANY, is_list=True),
         Types.any: data_type.from_import(IMPORT_ANY),
     }

datamodel_code_generator-0.20.0/datamodel_code_generator/model/template/TypedDict.jinja2

@@ -0,0 +1,5 @@
+{%- if is_functional_syntax %}
+{% include 'TypedDictFunction.jinja2' %}
+{%- else %}
+{% include 'TypedDictClass.jinja2' %}
+{%- endif %}

datamodel_code_generator-0.20.0/datamodel_code_generator/model/template/TypedDictClass.jinja2

@@ -0,0 +1,17 @@
+class {{ class_name }}({{ base_class }}):
+{%- if description %}
+    """
+    {{ description | indent(4) }}
+    """
+{%- endif %}
+{%- if not fields and not description %}
+    pass
+{%- endif %}
+{%- for field in fields %}
+    {{ field.name }}: {{ field.type_hint }}
+    {%- if field.docstring %}
+    """
+    {{ field.docstring | indent(4) }}
+    """
+    {%- endif %}
+{%- endfor -%}

datamodel_code_generator-0.20.0/datamodel_code_generator/model/template/TypedDictFunction.jinja2

@@ -0,0 +1,16 @@
+{%- if description %}
+"""
+{{ description | indent(4) }}
+"""
+{%- endif %}
+{{ class_name }} = TypedDict('{{ class_name }}', {
+{%- for field in all_fields %}
+    '{{ field.key }}': {{ field.type_hint }},
+    {%- if field.docstring %}
+    """
+    {{ field.docstring | indent(4) }}
+    """
+    {%- endif %}
+{%- endfor -%}
+})
+