datamodel-code-generator 0.18.1__py3-none-any.whl → 0.20.0__py3-none-any.whl

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/__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/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/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/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/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/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/model/improts.py

@@ -2,3 +2,7 @@ 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/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/model/template/TypedDict.jinja2

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

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/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 -%}
+})
+

datamodel_code_generator/model/typed_dict.py

@@ -0,0 +1,151 @@
+from __future__ import annotations
+
+import keyword
+from pathlib import Path
+from typing import (
+    Any,
+    ClassVar,
+    DefaultDict,
+    Dict,
+    Iterator,
+    List,
+    Optional,
+    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_NOT_REQUIRED,
+    IMPORT_NOT_REQUIRED_BACKPORT,
+    IMPORT_TYPED_DICT,
+    IMPORT_TYPED_DICT_BACKPORT,
+)
+from datamodel_code_generator.reference import Reference
+from datamodel_code_generator.types import NOT_REQUIRED_PREFIX
+
+escape_characters = str.maketrans(
+    {
+        '\\': r'\\',
+        "'": r"\'",
+        '\b': r'\b',
+        '\f': r'\f',
+        '\n': r'\n',
+        '\r': r'\r',
+        '\t': r'\t',
+    }
+)
+
+
+def _is_valid_field_name(field: DataModelFieldBase) -> bool:
+    name = field.original_name or field.name
+    if name is None:  # pragma: no cover
+        return False
+    return name.isidentifier() and not keyword.iskeyword(name)
+
+
+class TypedDict(DataModel):
+    TEMPLATE_FILE_PATH: ClassVar[str] = 'TypedDict.jinja2'
+    BASE_CLASS: ClassVar[str] = 'typing.TypedDict'
+    DEFAULT_IMPORTS: ClassVar[Tuple[Import, ...]] = (IMPORT_TYPED_DICT,)
+
+    def __init__(
+        self,
+        *,
+        reference: Reference,
+        fields: List[DataModelFieldBase],
+        decorators: Optional[List[str]] = None,
+        base_classes: Optional[List[Reference]] = None,
+        custom_base_class: Optional[str] = None,
+        custom_template_dir: Optional[Path] = None,
+        extra_template_data: Optional[DefaultDict[str, Dict[str, Any]]] = None,
+        methods: Optional[List[str]] = None,
+        path: Optional[Path] = None,
+        description: Optional[str] = None,
+        default: Any = UNDEFINED,
+        nullable: bool = False,
+    ) -> None:
+        super().__init__(
+            reference=reference,
+            fields=fields,
+            decorators=decorators,
+            base_classes=base_classes,
+            custom_base_class=custom_base_class,
+            custom_template_dir=custom_template_dir,
+            extra_template_data=extra_template_data,
+            methods=methods,
+            path=path,
+            description=description,
+            default=default,
+            nullable=nullable,
+        )
+
+    @property
+    def is_functional_syntax(self) -> bool:
+        return any(not _is_valid_field_name(f) for f in self.fields)
+
+    @property
+    def all_fields(self) -> Iterator[DataModelFieldBase]:
+        for base_class in self.base_classes:
+            if base_class.reference is None:  # pragma: no cover
+                continue
+            data_model = base_class.reference.source
+            if not isinstance(data_model, DataModel):  # pragma: no cover
+                continue
+
+            if isinstance(data_model, TypedDict):  # pragma: no cover
+                yield from data_model.all_fields
+
+        yield from self.fields
+
+    def render(self, *, class_name: Optional[str] = None) -> str:
+        response = self._render(
+            class_name=class_name or self.class_name,
+            fields=self.fields,
+            decorators=self.decorators,
+            base_class=self.base_class,
+            methods=self.methods,
+            description=self.description,
+            is_functional_syntax=self.is_functional_syntax,
+            all_fields=self.all_fields,
+            **self.extra_template_data,
+        )
+        return response
+
+
+class TypedDictBackport(TypedDict):
+    BASE_CLASS: ClassVar[str] = 'typing_extensions.TypedDict'
+    DEFAULT_IMPORTS: ClassVar[Tuple[Import, ...]] = (IMPORT_TYPED_DICT_BACKPORT,)
+
+
+class DataModelField(DataModelFieldBase):
+    DEFAULT_IMPORTS: ClassVar[Tuple[Import, ...]] = (IMPORT_NOT_REQUIRED,)
+
+    @property
+    def key(self) -> str:
+        return (self.original_name or self.name or '').translate(  # pragma: no cover
+            escape_characters
+        )
+
+    @property
+    def type_hint(self) -> str:
+        type_hint = super().type_hint
+        if self._not_required:
+            return f'{NOT_REQUIRED_PREFIX}{type_hint}]'
+        return type_hint
+
+    @property
+    def _not_required(self) -> bool:
+        return not self.required and isinstance(self.parent, TypedDict)
+
+    @property
+    def imports(self) -> Tuple[Import, ...]:
+        return (
+            *super().imports,
+            *(self.DEFAULT_IMPORTS if self._not_required else ()),
+        )
+
+
+class DataModelFieldBackport(DataModelField):
+    DEFAULT_IMPORTS: ClassVar[Tuple[Import, ...]] = (IMPORT_NOT_REQUIRED_BACKPORT,)

datamodel_code_generator/model/types.py

@@ -43,7 +43,7 @@ def type_map_factory(
         Types.ipv6_network: data_type_str,
         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/parser/base.py

@@ -485,12 +485,7 @@ class Parser(ABC):
             yield Source(path=Path(), text=self.source)
         elif isinstance(self.source, Path):  # pragma: no cover
             if self.source.is_dir():
-                paths = (
-                    sorted(self.source.rglob('*'))
-                    if self.keep_model_order
-                    else self.source.rglob('*')
-                )
-                for path in paths:
+                for path in sorted(self.source.rglob('*'), key=lambda p: p.name):
                     if path.is_file():
                         yield Source.from_path(path, self.base_path, self.encoding)
             else:

datamodel_code_generator/parser/jsonschema.py

@@ -14,6 +14,7 @@ from typing import (
     Dict,
     Generator,
     Iterable,
+    Iterator,
     List,
     Mapping,
     Optional,
@@ -43,6 +44,7 @@ from datamodel_code_generator.model.enum import Enum
 from datamodel_code_generator.parser import DefaultPutDict, LiteralType
 from datamodel_code_generator.parser.base import (
     Parser,
+    Source,
     escape_characters,
     title_to_class_name,
 )
@@ -224,6 +226,7 @@ class JsonSchemaObject(BaseModel):
     default: Any
     id: Optional[str] = Field(default=None, alias='$id')
     custom_type_path: Optional[str] = Field(default=None, alias='customTypePath')
+    custom_base_path: Optional[str] = Field(default=None, alias='customBasePath')
     extras: Dict[str, Any] = Field(alias=__extra_key__, default_factory=dict)
     discriminator: Union[Discriminator, str, None]
 
@@ -661,7 +664,7 @@ class JsonSchemaParser(Parser):
             reference=reference,
             fields=fields,
             base_classes=base_classes,
-            custom_base_class=self.base_class,
+            custom_base_class=obj.custom_base_path or self.base_class,
             custom_template_dir=self.custom_template_dir,
             extra_template_data=self.extra_template_data,
             path=self.current_source_path,
@@ -679,6 +682,7 @@ class JsonSchemaParser(Parser):
         fields: List[DataModelFieldBase],
         base_classes: List[Reference],
         required: List[str],
+        union_models: List[Reference],
     ) -> None:
         for all_of_item in obj.allOf:
             if all_of_item.ref:  # $ref
@@ -697,8 +701,26 @@ class JsonSchemaParser(Parser):
                     if all_of_item.required:
                         required.extend(all_of_item.required)
                 self._parse_all_of_item(
-                    name, all_of_item, path, fields, base_classes, required
+                    name,
+                    all_of_item,
+                    path,
+                    fields,
+                    base_classes,
+                    required,
+                    union_models,
                 )
+                if all_of_item.anyOf:
+                    union_models.extend(
+                        d.reference
+                        for d in self.parse_any_of(name, all_of_item, path)
+                        if d.reference
+                    )
+                if all_of_item.oneOf:
+                    union_models.extend(
+                        d.reference
+                        for d in self.parse_one_of(name, all_of_item, path)
+                        if d.reference
+                    )
 
     def parse_all_of(
         self,
@@ -717,10 +739,58 @@ class JsonSchemaParser(Parser):
         fields: List[DataModelFieldBase] = []
         base_classes: List[Reference] = []
         required: List[str] = []
-        self._parse_all_of_item(name, obj, path, fields, base_classes, required)
-        return self._parse_object_common_part(
-            name, obj, path, ignore_duplicate_model, fields, base_classes, required
+        union_models: List[Reference] = []
+        self._parse_all_of_item(
+            name, obj, path, fields, base_classes, required, union_models
+        )
+        if not union_models:
+            return self._parse_object_common_part(
+                name, obj, path, ignore_duplicate_model, fields, base_classes, required
+            )
+        reference = self.model_resolver.add(path, name, class_name=True, loaded=True)
+        all_of_data_type = self._parse_object_common_part(
+            name,
+            obj,
+            get_special_path('allOf', path),
+            ignore_duplicate_model,
+            fields,
+            base_classes,
+            required,
+        )
+        data_type = self.data_type(
+            data_types=[
+                self._parse_object_common_part(
+                    name,
+                    obj,
+                    get_special_path(f'union_model-{index}', path),
+                    ignore_duplicate_model,
+                    [],
+                    [union_model, all_of_data_type.reference],  # type: ignore
+                    [],
+                )
+                for index, union_model in enumerate(union_models)
+            ]
+        )
+        field = self.get_object_field(
+            field_name=None,
+            field=obj,
+            required=True,
+            field_type=data_type,
+            alias=None,
+            original_field_name=None,
+        )
+        data_model_root = self.data_model_root_type(
+            reference=reference,
+            fields=[field],
+            custom_base_class=obj.custom_base_path or self.base_class,
+            custom_template_dir=self.custom_template_dir,
+            extra_template_data=self.extra_template_data,
+            path=self.current_source_path,
+            description=obj.description if self.use_schema_description else None,
+            nullable=obj.type_has_null,
         )
+        self.results.append(data_model_root)
+        return self.data_type(reference=reference)
 
     def parse_object_fields(
         self, obj: JsonSchemaObject, path: List[str], module_name: Optional[str] = None
@@ -834,7 +904,7 @@ class JsonSchemaParser(Parser):
         data_model_type = data_model_type_class(
             reference=reference,
             fields=fields,
-            custom_base_class=self.base_class,
+            custom_base_class=obj.custom_base_path or self.base_class,
             custom_template_dir=self.custom_template_dir,
             extra_template_data=self.extra_template_data,
             path=self.current_source_path,
@@ -1084,7 +1154,7 @@ class JsonSchemaParser(Parser):
         data_model_root = self.data_model_root_type(
             reference=reference,
             fields=[field],
-            custom_base_class=self.base_class,
+            custom_base_class=obj.custom_base_path or self.base_class,
             custom_template_dir=self.custom_template_dir,
             extra_template_data=self.extra_template_data,
             path=self.current_source_path,
@@ -1164,7 +1234,7 @@ class JsonSchemaParser(Parser):
                     has_default=obj.has_default,
                 )
             ],
-            custom_base_class=self.base_class,
+            custom_base_class=obj.custom_base_path or self.base_class,
             custom_template_dir=self.custom_template_dir,
             extra_template_data=self.extra_template_data,
             path=self.current_source_path,
@@ -1297,7 +1367,7 @@ class JsonSchemaParser(Parser):
                     original_name=None,
                 )
             ],
-            custom_base_class=self.base_class,
+            custom_base_class=obj.custom_base_path or self.base_class,
             custom_template_dir=self.custom_template_dir,
             extra_template_data=self.extra_template_data,
             path=self.current_source_path,
@@ -1458,7 +1528,7 @@ class JsonSchemaParser(Parser):
             self.parse_root_type(name, obj, path)
         self.parse_ref(obj, path)
 
-    def parse_raw(self) -> None:
+    def _get_context_source_path_parts(self) -> Iterator[Tuple[Source, List[str]]]:
         if isinstance(self.source, list) or (
             isinstance(self.source, Path) and self.source.is_dir()
         ):
@@ -1478,26 +1548,28 @@ class JsonSchemaParser(Parser):
             with self.model_resolver.current_base_path_context(
                 source.path.parent
             ), self.model_resolver.current_root_context(path_parts):
-                self.raw_obj = load_yaml(source.text)
-                if self.custom_class_name_generator:
-                    obj_name = self.raw_obj.get('title', 'Model')
+                yield source, path_parts
+
+    def parse_raw(self) -> None:
+        for source, path_parts in self._get_context_source_path_parts():
+            self.raw_obj = load_yaml(source.text)
+            if self.custom_class_name_generator:
+                obj_name = self.raw_obj.get('title', 'Model')
+            else:
+                if self.class_name:
+                    obj_name = self.class_name
                 else:
-                    if self.class_name:
-                        obj_name = self.class_name
-                    else:
-                        # backward compatible
-                        obj_name = self.raw_obj.get('title', 'Model')
-                        if not self.model_resolver.validate_name(obj_name):
-                            obj_name = title_to_class_name(obj_name)
+                    # backward compatible
+                    obj_name = self.raw_obj.get('title', 'Model')
                     if not self.model_resolver.validate_name(obj_name):
-                        raise InvalidClassNameError(obj_name)
-                self._parse_file(self.raw_obj, obj_name, path_parts)
+                        obj_name = title_to_class_name(obj_name)
+                if not self.model_resolver.validate_name(obj_name):
+                    raise InvalidClassNameError(obj_name)
+            self._parse_file(self.raw_obj, obj_name, path_parts)
 
         self._resolve_unparsed_json_pointer()
 
-    def _resolve_unparsed_json_pointer(
-        self, exclude_path_prefixes: Optional[List[str]] = None
-    ) -> None:
+    def _resolve_unparsed_json_pointer(self) -> None:
         model_count: int = len(self.results)
         for source in self.iter_source:
             path_parts = list(source.path.parts)
@@ -1511,14 +1583,6 @@ class JsonSchemaParser(Parser):
                 source.path.parent
             ), self.model_resolver.current_root_context(path_parts):
                 for reserved_ref in sorted(reserved_refs):
-                    if exclude_path_prefixes:
-                        reserved_ref_path_prefix = reserved_ref.split('#/', 1)[-1]
-                        if any(
-                            e
-                            for e in exclude_path_prefixes
-                            if reserved_ref_path_prefix.startswith(e)
-                        ):  # pragma: no cover
-                            continue
                     if self.model_resolver.add_ref(reserved_ref, resolved=True).loaded:
                         continue
                     # for root model
@@ -1560,6 +1624,8 @@ class JsonSchemaParser(Parser):
                 path, obj_name, unique=False, class_name=True
             ).name
             with self.root_id_context(raw):
+                # Some jsonschema docs include attribute self to have include version details
+                raw.pop('self', None)
                 # parse $id before parsing $ref
                 root_obj = JsonSchemaObject.parse_obj(raw)
                 self.parse_id(root_obj, path_parts)

datamodel_code_generator/parser/openapi.py

@@ -301,10 +301,7 @@ class OpenAPIParser(JsonSchemaParser):
         path: List[str],
     ) -> DataType:
         if obj.is_array:
-            data_type: DataType = self.parse_array_fields(
-                name, obj, [*path, name], False
-            ).data_type
-            # TODO: The List model is not created by this method. Some scenarios may necessitate it.
+            data_type = self.parse_array(name, obj, [*path, name])
         elif obj.allOf:  # pragma: no cover
             data_type = self.parse_all_of(name, obj, path)
         elif obj.oneOf or obj.anyOf:  # pragma: no cover
@@ -522,7 +519,7 @@ class OpenAPIParser(JsonSchemaParser):
             )
 
     def parse_raw(self) -> None:
-        for source in self.iter_source:
+        for source, path_parts in self._get_context_source_path_parts():
             if self.validation:
                 from prance import BaseParser
 
@@ -539,55 +536,49 @@ class OpenAPIParser(JsonSchemaParser):
             security: Optional[List[Dict[str, List[str]]]] = specification.get(
                 'security'
             )
-            if isinstance(self.source, ParseResult):
-                path_parts: List[str] = self.get_url_path_parts(self.source)
-            else:
-                path_parts = list(source.path.parts)
-            with self.model_resolver.current_root_context(path_parts):
-                if OpenAPIScope.Schemas in self.open_api_scopes:
-                    for (
+            if OpenAPIScope.Schemas in self.open_api_scopes:
+                for (
+                    obj_name,
+                    raw_obj,
+                ) in schemas.items():  # type: str, Dict[Any, Any]
+                    self.parse_raw_obj(
                         obj_name,
                         raw_obj,
-                    ) in schemas.items():  # type: str, Dict[Any, Any]
-                        self.parse_raw_obj(
-                            obj_name,
-                            raw_obj,
-                            [*path_parts, '#/components', 'schemas', obj_name],
+                        [*path_parts, '#/components', 'schemas', obj_name],
+                    )
+            if OpenAPIScope.Paths in self.open_api_scopes:
+                paths: Dict[str, Dict[str, Any]] = specification.get('paths', {})
+                parameters: List[Dict[str, Any]] = [
+                    self._get_ref_body(p['$ref']) if '$ref' in p else p
+                    for p in paths.get('parameters', [])
+                    if isinstance(p, dict)
+                ]
+                paths_path = [*path_parts, '#/paths']
+                for path_name, methods in paths.items():
+                    # Resolve path items if applicable
+                    if '$ref' in methods:
+                        methods = self.get_ref_model(methods['$ref'])
+                    paths_parameters = parameters[:]
+                    if 'parameters' in methods:
+                        paths_parameters.extend(methods['parameters'])
+                    relative_path_name = path_name[1:]
+                    if relative_path_name:
+                        path = [*paths_path, relative_path_name]
+                    else:  # pragma: no cover
+                        path = get_special_path('root', paths_path)
+                    for operation_name, raw_operation in methods.items():
+                        if operation_name not in OPERATION_NAMES:
+                            continue
+                        if paths_parameters:
+                            if 'parameters' in raw_operation:  # pragma: no cover
+                                raw_operation['parameters'].extend(paths_parameters)
+                            else:
+                                raw_operation['parameters'] = paths_parameters
+                        if security is not None and 'security' not in raw_operation:
+                            raw_operation['security'] = security
+                        self.parse_operation(
+                            raw_operation,
+                            [*path, operation_name],
                         )
-                if OpenAPIScope.Paths in self.open_api_scopes:
-                    paths: Dict[str, Dict[str, Any]] = specification.get('paths', {})
-                    parameters: List[Dict[str, Any]] = [
-                        self._get_ref_body(p['$ref']) if '$ref' in p else p
-                        for p in paths.get('parameters', [])
-                        if isinstance(p, dict)
-                    ]
-                    paths_path = [*path_parts, '#/paths']
-                    for path_name, methods in paths.items():
-                        paths_parameters = parameters[:]
-                        if 'parameters' in methods:
-                            paths_parameters.extend(methods['parameters'])
-                        relative_path_name = path_name[1:]
-                        if relative_path_name:
-                            path = [*paths_path, relative_path_name]
-                        else:  # pragma: no cover
-                            path = get_special_path('root', paths_path)
-                        for operation_name, raw_operation in methods.items():
-                            if operation_name not in OPERATION_NAMES:
-                                continue
-                            if paths_parameters:
-                                if 'parameters' in raw_operation:  # pragma: no cover
-                                    raw_operation['parameters'].extend(paths_parameters)
-                                else:
-                                    raw_operation['parameters'] = paths_parameters
-                            if security is not None and 'security' not in raw_operation:
-                                raw_operation['security'] = security
-                            self.parse_operation(
-                                raw_operation,
-                                [*path, operation_name],
-                            )
-
-        if OpenAPIScope.Schemas not in self.open_api_scopes:
-            exclude_path_prefixes: Optional[List[str]] = ['components/schemas/']
-        else:
-            exclude_path_prefixes = None
-        self._resolve_unparsed_json_pointer(exclude_path_prefixes)
+
+        self._resolve_unparsed_json_pointer()

datamodel_code_generator/types.py

@@ -68,6 +68,9 @@ STANDARD_DICT = 'dict'
 STANDARD_LIST = 'list'
 STR = 'str'
 
+NOT_REQUIRED = 'NotRequired'
+NOT_REQUIRED_PREFIX = f'{NOT_REQUIRED}['
+
 
 class StrictTypes(Enum):
     str = 'str'
@@ -344,7 +347,7 @@ class DataType(_BaseModel):
                         for t in self.data_types
                         if not (t.type == ANY and t.is_optional)
                     ]
-                break
+                break  # pragma: no cover
 
         for data_type in self.data_types:
             if data_type.reference or data_type.data_types:
@@ -364,10 +367,16 @@ class DataType(_BaseModel):
                     if data_type_type in data_types:  # pragma: no cover
                         continue
                     data_types.append(data_type_type)
-                if self.use_union_operator:
-                    type_ = UNION_OPERATOR_DELIMITER.join(data_types)
+                if NONE in data_types:
+                    data_types = [d for d in data_types if d != NONE]
+                    self.is_optional = True
+                if len(data_types) == 1:
+                    type_ = data_types[0]
                 else:
-                    type_ = f'{UNION_PREFIX}{UNION_DELIMITER.join(data_types)}]'
+                    if self.use_union_operator:
+                        type_ = UNION_OPERATOR_DELIMITER.join(data_types)
+                    else:
+                        type_ = f'{UNION_PREFIX}{UNION_DELIMITER.join(data_types)}]'
             elif len(self.data_types) == 1:
                 type_ = self.data_types[0].type_hint
             elif self.literals:

datamodel_code_generator/version.py

@@ -1 +1 @@
-version: str = '0.18.1'
+version: str = '0.20.0'

{datamodel_code_generator-0.18.1.dist-info → datamodel_code_generator-0.20.0.dist-info}/METADATA

@@ -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.20.0.dist-info/RECORD

@@ -0,0 +1,42 @@
+datamodel_code_generator/__init__.py,sha256=ny6ibAH0NzzZOmEEWea591gFiF5ZwRRNfnnHwN_mCMk,17703
+datamodel_code_generator/__main__.py,sha256=dCis7YXh4wwnkz9txKZfyokQy9GYbH7NzC6A9Xjpkt0,25270
+datamodel_code_generator/format.py,sha256=3P8WeWWubSretQbrMj3BKjt0z3081hEv0D0EBrl4Zqs,5698
+datamodel_code_generator/http.py,sha256=Mf4_fTV-2Ni_4Slz-ey3Dtggw1eFAHVyJHnyMgXlmQM,586
+datamodel_code_generator/imports.py,sha256=9qVskiTei-38Z1zQvu9sW0wBa95x9iPhHt686pDlTvI,3230
+datamodel_code_generator/model/__init__.py,sha256=8mv8jt1MWSRZEZuWIBrk8F7UwGyvKvrQ2P3s58TzrIo,2260
+datamodel_code_generator/model/base.py,sha256=O2aC8HXWlXKMeyHUzo1nOR1IP8wlV-4HUNN3hbT8Dzk,12081
+datamodel_code_generator/model/dataclass.py,sha256=gUsjMhnQMVowBStY8ycbykaaQBEENoHl2EL7vcr3AJ8,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/pydantic/__init__.py,sha256=LtgJEdAkeUAa3AyElEQL6ZbVI7vq7c0P1FBU4dIblN8,1335
+datamodel_code_generator/model/pydantic/base_model.py,sha256=DTo7nxNPv3eVLQXWh06Rds2oMjJ9_FRfYWBL-6N8Sds,10341
+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=PZINYgsBDAS3RZwYi_4iu9-kL3G3UwKDn2TSzo8mS5I,11765
+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
+datamodel_code_generator/model/template/TypedDictClass.jinja2,sha256=URwp5__WyR8G21Hoyc17aMzoast-NppXnXe19VFi5wQ,377
+datamodel_code_generator/model/template/TypedDictFunction.jinja2,sha256=KjSij5_w4ow4a12SR3orYOndmXGkIvJBBUN735bQ6G0,321
+datamodel_code_generator/model/template/dataclass.jinja2,sha256=U-zwO9xoClVcNmNCDBnvZQo0_xcRWsPYh2QfsNMyUsQ,816
+datamodel_code_generator/model/template/pydantic/BaseModel.jinja2,sha256=sYZa-47YAXqZrd5cYKVnPrsbDvLkHEJOUd7M0nAosP8,1084
+datamodel_code_generator/model/template/pydantic/BaseModel_root.jinja2,sha256=WDdTXYNTrkIw-B4OvPVxOaETTknLs0zdNuq_iDQ2Bcw,1000
+datamodel_code_generator/model/template/pydantic/Config.jinja2,sha256=Ik028qdqQhDfEP207TCbwVv2b5Do1-nRNDPKzBHKzwM,135
+datamodel_code_generator/model/template/pydantic/dataclass.jinja2,sha256=hM4OZTVhtOokqlPNSdh5drhBXfQLPvbyO88jipSPr5Y,629
+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/types.py,sha256=GmKGPrpbJRgcsfRv9Khpo26e8DgMrPBnmLw6cpdjdiE,2891
+datamodel_code_generator/parser/__init__.py,sha256=zHbw6RPlJC0SAQjb-XyVlyZhcOu5PfYgPidy6jlUM8M,793
+datamodel_code_generator/parser/base.py,sha256=MqLWSynkovpt_kDfkvfxtqLB-bjgaMTdTt-i4FzdSEM,43374
+datamodel_code_generator/parser/jsonschema.py,sha256=EhEnAUfCOaRrPqhm1t2MvecwLqn5EMVbysVg5iBWpSM,63897
+datamodel_code_generator/parser/openapi.py,sha256=EX55EW1Zv6hPfWOD4J9vdcnObm5bFrilB5GJwcpNooM,23306
+datamodel_code_generator/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+datamodel_code_generator/reference.py,sha256=q0QGhSckXtIvJG6SQlHEC3iGxy_vUDZY7EMlSZW5-Z8,24326
+datamodel_code_generator/types.py,sha256=NJfGgNXOIC7LzFCr40r-AJnOJosBusAH7PS6RiJm8W4,16606
+datamodel_code_generator/version.py,sha256=ywZOtUnDPsvM30GK-r8kjO_kBnrpneA4wWZ_zZKvII0,24
+datamodel_code_generator-0.20.0.dist-info/LICENSE,sha256=K54Lwc6_jduycsy8oFFjQEeSSuEiqvVIjCGIXOMnuTQ,1068
+datamodel_code_generator-0.20.0.dist-info/METADATA,sha256=ZdGd5YpgmIVmsImsJcoRsMKW5NNl6-MEBAzzfdOSJPg,22038
+datamodel_code_generator-0.20.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+datamodel_code_generator-0.20.0.dist-info/entry_points.txt,sha256=bykbUWqOCiKfxJPGe8jpNqTqD1NG7uyRmozdnwzu7rk,76
+datamodel_code_generator-0.20.0.dist-info/RECORD,,

{datamodel_code_generator-0.18.1.dist-info → datamodel_code_generator-0.20.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.5.2
+Generator: poetry-core 1.6.1
 Root-Is-Purelib: true
 Tag: py3-none-any

datamodel_code_generator-0.18.1.dist-info/RECORD

@@ -1,38 +0,0 @@
-datamodel_code_generator/__init__.py,sha256=9jyLRpb_P4FwQfT4Mwx5o-Hgn1g7mHRkprYKA0xG2UY,17394
-datamodel_code_generator/__main__.py,sha256=rEM6wEBEfzfxz-DFHM3YLi5qpsdfcxKFIRG3cv7tqqc,24552
-datamodel_code_generator/format.py,sha256=RG-6GsU6d90hI9gKXapsVbTVn1INQvZvuPAc2Xiekao,4688
-datamodel_code_generator/http.py,sha256=Mf4_fTV-2Ni_4Slz-ey3Dtggw1eFAHVyJHnyMgXlmQM,586
-datamodel_code_generator/imports.py,sha256=h76smoWEmKQQQ7TenLzDwvAolkR8_VXo0VvlQWbhJUs,3149
-datamodel_code_generator/model/__init__.py,sha256=DX9cdzYTYMYnZJpRm2aSmJMP48ZHBCtJijStWM7ynoA,1642
-datamodel_code_generator/model/base.py,sha256=0eWdmNpIehxhY8fTe2gIDi5ULzkFL0iz8g4Ctg_Icho,11855
-datamodel_code_generator/model/dataclass.py,sha256=mxZZWqZqUVFSYRoL4uNDJ4HZz20D9vB_LyR_7FTfCIE,3632
-datamodel_code_generator/model/enum.py,sha256=Giehhtij2DZs2LssSJnG_CIIHsSA7Mkz471GU-Cb5kI,3338
-datamodel_code_generator/model/improts.py,sha256=osEpBubK1ZjS4oqvlLuTRxMsKuWtO4FU4TkMoeSVJ2c,177
-datamodel_code_generator/model/pydantic/__init__.py,sha256=LtgJEdAkeUAa3AyElEQL6ZbVI7vq7c0P1FBU4dIblN8,1335
-datamodel_code_generator/model/pydantic/base_model.py,sha256=DTo7nxNPv3eVLQXWh06Rds2oMjJ9_FRfYWBL-6N8Sds,10341
-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=rHKqIZFu0lzjGiQJdO27kyIXuGzH1PevPXwlTKMPSwU,11794
-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/dataclass.jinja2,sha256=U-zwO9xoClVcNmNCDBnvZQo0_xcRWsPYh2QfsNMyUsQ,816
-datamodel_code_generator/model/template/pydantic/BaseModel.jinja2,sha256=sYZa-47YAXqZrd5cYKVnPrsbDvLkHEJOUd7M0nAosP8,1084
-datamodel_code_generator/model/template/pydantic/BaseModel_root.jinja2,sha256=WDdTXYNTrkIw-B4OvPVxOaETTknLs0zdNuq_iDQ2Bcw,1000
-datamodel_code_generator/model/template/pydantic/Config.jinja2,sha256=Ik028qdqQhDfEP207TCbwVv2b5Do1-nRNDPKzBHKzwM,135
-datamodel_code_generator/model/template/pydantic/dataclass.jinja2,sha256=hM4OZTVhtOokqlPNSdh5drhBXfQLPvbyO88jipSPr5Y,629
-datamodel_code_generator/model/template/root.jinja2,sha256=3OTtibxLcGA-FMdR0QDCJUJQgf_kRW0OafeCTPFSFFo,162
-datamodel_code_generator/model/types.py,sha256=YwJfPcvrBPsSF16Bft-2j8lPajGpx9pUaQC2y_aRWAo,2920
-datamodel_code_generator/parser/__init__.py,sha256=zHbw6RPlJC0SAQjb-XyVlyZhcOu5PfYgPidy6jlUM8M,793
-datamodel_code_generator/parser/base.py,sha256=KVkpFCWUI9DstQQgAHqX6AIGC6FmkOTCDo800lg-y-M,43515
-datamodel_code_generator/parser/jsonschema.py,sha256=gKwqjej3Exy_umA8wjUpqieUwd-uTCB5xkZ1_zsPRzY,61423
-datamodel_code_generator/parser/openapi.py,sha256=Ntx_9V_fIGcdwjlaC2l3PAn8prwSBOQVdJbIfOXobh4,23925
-datamodel_code_generator/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datamodel_code_generator/reference.py,sha256=q0QGhSckXtIvJG6SQlHEC3iGxy_vUDZY7EMlSZW5-Z8,24326
-datamodel_code_generator/types.py,sha256=ZhLw5kg7DtwjlaFicpSFx7E1BWCsq90HnJ-9mlWV06k,16241
-datamodel_code_generator/version.py,sha256=QepimqfEl3aW511yrvGuH1zmF7a8cIxFX_5WL6-nReM,24
-datamodel_code_generator-0.18.1.dist-info/LICENSE,sha256=K54Lwc6_jduycsy8oFFjQEeSSuEiqvVIjCGIXOMnuTQ,1068
-datamodel_code_generator-0.18.1.dist-info/METADATA,sha256=WczeWspzpXhigVl6wtId-we_sqrHfF1IOuD3VMjpziI,22802
-datamodel_code_generator-0.18.1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-datamodel_code_generator-0.18.1.dist-info/entry_points.txt,sha256=bykbUWqOCiKfxJPGe8jpNqTqD1NG7uyRmozdnwzu7rk,76
-datamodel_code_generator-0.18.1.dist-info/RECORD,,