datamodel-code-generator 0.27.3__tar.gz → 0.28.1__tar.gz

{datamodel_code_generator-0.27.3 → datamodel_code_generator-0.28.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datamodel-code-generator
-Version: 0.27.3
+Version: 0.28.1
 Summary: Datamodel Code Generator
 Project-URL: Homepage, https://github.com/koxudaxi/datamodel-code-generator
 Project-URL: Source, https://github.com/koxudaxi/datamodel-code-generator
@@ -11,14 +11,13 @@ Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3 :: Only
-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.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Requires-Dist: argcomplete<4,>=2.10.1
 Requires-Dist: black>=19.10b0
 Requires-Dist: genson<2,>=1.2.1
@@ -510,8 +509,8 @@ Model customization:
                         pydantic: datetime, dataclass: str, ...)
   --reuse-model         Reuse models on the field when a module has the model with the same
                         content
-  --target-python-version {3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13}
-                        target python version (default: 3.8)
+  --target-python-version {3.9,3.10,3.11,3.12,3.13}
+                        target python version
   --treat-dot-as-module
                         treat dotted module names as modules
   --use-exact-imports   import exact types instead of modules, for example: "from .foo

{datamodel_code_generator-0.27.3 → datamodel_code_generator-0.28.1}/README.md

@@ -462,8 +462,8 @@ Model customization:
                         pydantic: datetime, dataclass: str, ...)
   --reuse-model         Reuse models on the field when a module has the model with the same
                         content
-  --target-python-version {3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13}
-                        target python version (default: 3.8)
+  --target-python-version {3.9,3.10,3.11,3.12,3.13}
+                        target python version
   --treat-dot-as-module
                         treat dotted module names as modules
   --use-exact-imports   import exact types instead of modules, for example: "from .foo

{datamodel_code_generator-0.27.3 → datamodel_code_generator-0.28.1}/pyproject.toml

@@ -12,13 +12,12 @@ readme.content-type = "text/markdown"
 readme.file = "README.md"
 license = "MIT"
 authors = [ { name = "Koudai Aono", email = "koxudaxi@gmail.com" } ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 classifiers = [
   "Development Status :: 4 - Beta",
   "License :: OSI Approved :: MIT License",
   "Natural Language :: English",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
@@ -98,13 +97,10 @@ docs = [
   "mkdocs>=1.6",
   "mkdocs-material>=9.5.31",
 ]
-black19-pydantic18 = [ "black==19.10b0", "pydantic==1.8.2" ]
 black22 = [ "black==22.1" ]
 black23 = [ "black==23.12" ]
 black24 = [ "black==24.1" ]
-pydantic18 = [ "pydantic==1.8.2" ]
-isort4-pydantic15 = [ "isort[pyproject]==4.3.21", "pydantic==1.5.1" ]
-fix = [ "pre-commit>=3.5" ]
+fix = [ "pre-commit-uv>=4.1.4" ]
 pkg-meta = [ "check-wheel-contents>=0.6.1", "twine>=6.1", "uv>=0.5.22" ]
 coverage = [
   "covdefaults>=2.3",
@@ -220,18 +216,6 @@ conflicts = [
     { group = "black24" },
     { group = "black22" },
     { group = "black23" },
-    { group = "black19-pydantic18" },
-    { group = "pydantic18" },
-    { group = "isort4-pydantic15" },
-    { group = "pkg-meta" },
-  ],
-  [
-    { group = "black24" },
-    { group = "black22" },
-    { group = "black23" },
-    { group = "black19-pydantic18" },
-    { group = "pydantic18" },
-    { group = "isort4-pydantic15" },
     { group = "dev" },
   ],
 ]

{datamodel_code_generator-0.27.3 → datamodel_code_generator-0.28.1}/src/datamodel_code_generator/__init__.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import contextlib
 import os
 import sys
+from collections.abc import Iterator, Mapping, Sequence
 from datetime import datetime, timezone
 from enum import Enum
 from pathlib import Path
@@ -11,10 +12,7 @@ from typing import (
     TYPE_CHECKING,
     Any,
     Callable,
-    Dict,
-    Iterator,
-    Mapping,
-    Sequence,
+    Final,
     TextIO,
     TypeVar,
     cast,
@@ -24,10 +22,13 @@ from urllib.parse import ParseResult
 import yaml
 
 import datamodel_code_generator.pydantic_patch  # noqa: F401
-from datamodel_code_generator.format import DatetimeClassType, PythonVersion
+from datamodel_code_generator.format import DatetimeClassType, PythonVersion, PythonVersionMin
 from datamodel_code_generator.parser import DefaultPutDict, LiteralType
 from datamodel_code_generator.util import SafeLoader
 
+MIN_VERSION: Final[int] = 9
+MAX_VERSION: Final[int] = 13
+
 T = TypeVar("T")
 
 try:
@@ -212,7 +213,7 @@ def generate(  # noqa: PLR0912, PLR0913, PLR0914, PLR0915
     input_file_type: InputFileType = InputFileType.Auto,
     output: Path | None = None,
     output_model_type: DataModelType = DataModelType.PydanticBaseModel,
-    target_python_version: PythonVersion = PythonVersion.PY_38,
+    target_python_version: PythonVersion = PythonVersionMin,
     base_class: str = "",
     additional_imports: list[str] | None = None,
     custom_template_dir: Path | None = None,
@@ -367,7 +368,7 @@ def generate(  # noqa: PLR0912, PLR0913, PLR0914, PLR0915
                     obj = (
                         ast.literal_eval(input_.read_text(encoding=encoding))
                         if isinstance(input_, Path)
-                        else cast("Dict[Any, Any]", input_)
+                        else cast("dict[Any, Any]", input_)
                     )
                 else:  # pragma: no cover
                     msg = f"Unsupported input file type: {input_file_type}"
@@ -554,6 +555,8 @@ inferred_message = (
 )
 
 __all__ = [
+    "MAX_VERSION",
+    "MIN_VERSION",
     "DefaultPutDict",
     "Error",
     "InputFileType",

{datamodel_code_generator-0.27.3 → datamodel_code_generator-0.28.1}/src/datamodel_code_generator/__main__.py

@@ -9,20 +9,11 @@ import signal
 import sys
 import warnings
 from collections import defaultdict
+from collections.abc import Sequence  # noqa: TC003  # pydantic needs it
 from enum import IntEnum
 from io import TextIOBase
 from pathlib import Path
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    List,
-    Optional,
-    Sequence,
-    Set,
-    Tuple,
-    Union,
-    cast,
-)
+from typing import TYPE_CHECKING, Any, Optional, Union, cast
 from urllib.parse import ParseResult, urlparse
 
 import argcomplete
@@ -47,6 +38,7 @@ from datamodel_code_generator.arguments import DEFAULT_ENCODING, arg_parser, nam
 from datamodel_code_generator.format import (
     DatetimeClassType,
     PythonVersion,
+    PythonVersionMin,
     is_supported_in_black,
 )
 from datamodel_code_generator.model.pydantic_v2 import UnionMode  # noqa: TC001 # needed for pydantic
@@ -142,34 +134,21 @@ class Config(BaseModel):
         msg = f"This protocol doesn't support only http/https. --input={value}"
         raise Error(msg)  # pragma: no cover
 
-    @model_validator(mode="after")
-    def validate_use_generic_container_types(cls, values: dict[str, Any]) -> dict[str, Any]:  # noqa: N805
-        if values.get("use_generic_container_types"):
-            target_python_version: PythonVersion = values["target_python_version"]
-            if target_python_version == target_python_version.PY_36:
-                msg = (
-                    f"`--use-generic-container-types` can not be used with `--target-python-version` "
-                    f"{target_python_version.PY_36.value}.\n"
-                    " The version will be not supported in a future version"
-                )
-                raise Error(msg)
-        return values
-
-    @model_validator(mode="after")
+    @model_validator()
     def validate_original_field_name_delimiter(cls, values: dict[str, Any]) -> dict[str, Any]:  # noqa: N805
         if values.get("original_field_name_delimiter") is not None and not values.get("snake_case_field"):
             msg = "`--original-field-name-delimiter` can not be used without `--snake-case-field`."
             raise Error(msg)
         return values
 
-    @model_validator(mode="after")
+    @model_validator()
     def validate_custom_file_header(cls, values: dict[str, Any]) -> dict[str, Any]:  # noqa: N805
         if values.get("custom_file_header") and values.get("custom_file_header_path"):
             msg = "`--custom_file_header_path` can not be used with `--custom_file_header`."
             raise Error(msg)  # pragma: no cover
         return values
 
-    @model_validator(mode="after")
+    @model_validator()
     def validate_keyword_only(cls, values: dict[str, Any]) -> dict[str, Any]:  # noqa: N805
         output_model_type: DataModelType = values.get("output_model_type")  # pyright: ignore[reportAssignmentType]
         python_target: PythonVersion = values.get("target_python_version")  # pyright: ignore[reportAssignmentType]
@@ -182,7 +161,7 @@ class Config(BaseModel):
             raise Error(msg)
         return values
 
-    @model_validator(mode="after")
+    @model_validator()
     def validate_output_datetime_class(cls, values: dict[str, Any]) -> dict[str, Any]:  # noqa: N805
         datetime_class_type: DatetimeClassType | None = values.get("output_datetime_class")
         if (
@@ -246,7 +225,7 @@ class Config(BaseModel):
 
     if PYDANTIC_V2:
 
-        @model_validator(mode="after")  # pyright: ignore[reportArgumentType]
+        @model_validator()  # pyright: ignore[reportArgumentType]
         def validate_root(self: Self) -> Self:
             if self.use_annotated:
                 self.field_constraints = True
@@ -254,7 +233,7 @@ class Config(BaseModel):
 
     else:
 
-        @model_validator(mode="after")
+        @model_validator()
         def validate_root(cls, values: Any) -> Any:  # noqa: N805
             if values.get("use_annotated"):
                 values["field_constraints"] = True
@@ -266,9 +245,9 @@ class Config(BaseModel):
     output: Optional[Path] = None  # noqa: UP045
     debug: bool = False
     disable_warnings: bool = False
-    target_python_version: PythonVersion = PythonVersion.PY_38
+    target_python_version: PythonVersion = PythonVersionMin
     base_class: str = ""
-    additional_imports: Optional[List[str]] = None  # noqa: UP006, UP045
+    additional_imports: Optional[list[str]] = None  # noqa: UP045
     custom_template_dir: Optional[Path] = None  # noqa: UP045
     extra_template_data: Optional[TextIOBase] = None  # noqa: UP045
     validation: bool = False
@@ -299,17 +278,17 @@ class Config(BaseModel):
     enable_faux_immutability: bool = False
     url: Optional[ParseResult] = None  # noqa: UP045
     disable_appending_item_suffix: bool = False
-    strict_types: List[StrictTypes] = []  # noqa: UP006
+    strict_types: list[StrictTypes] = []
     empty_enum_field_name: Optional[str] = None  # noqa: UP045
-    field_extra_keys: Optional[Set[str]] = None  # noqa: UP006, UP045
+    field_extra_keys: Optional[set[str]] = None  # noqa: UP045
     field_include_all_keys: bool = False
-    field_extra_keys_without_x_prefix: Optional[Set[str]] = None  # noqa: UP006, UP045
-    openapi_scopes: Optional[List[OpenAPIScope]] = [OpenAPIScope.Schemas]  # noqa: UP006, UP045
+    field_extra_keys_without_x_prefix: Optional[set[str]] = None  # noqa: UP045
+    openapi_scopes: Optional[list[OpenAPIScope]] = [OpenAPIScope.Schemas]  # noqa: UP045
     wrap_string_literal: Optional[bool] = None  # noqa: UP045
     use_title_as_name: bool = False
     use_operation_id_as_name: bool = False
     use_unique_items_as_set: bool = False
-    http_headers: Optional[Sequence[Tuple[str, str]]] = None  # noqa: UP006, UP045
+    http_headers: Optional[Sequence[tuple[str, str]]] = None  # noqa: UP045
     http_ignore_tls: bool = False
     use_annotated: bool = False
     use_non_positive_negative_number_constrained_types: bool = False
@@ -322,10 +301,10 @@ class Config(BaseModel):
     keep_model_order: bool = False
     custom_file_header: Optional[str] = None  # noqa: UP045
     custom_file_header_path: Optional[Path] = None  # noqa: UP045
-    custom_formatters: Optional[List[str]] = None  # noqa: UP006, UP045
+    custom_formatters: Optional[list[str]] = None  # noqa: UP045
     custom_formatters_kwargs: Optional[TextIOBase] = None  # noqa: UP045
     use_pendulum: bool = False
-    http_query_parameters: Optional[Sequence[Tuple[str, str]]] = None  # noqa: UP006, UP045
+    http_query_parameters: Optional[Sequence[tuple[str, str]]] = None  # noqa: UP045
     treat_dot_as_module: bool = False
     use_exact_imports: bool = False
     union_mode: Optional[UnionMode] = None  # noqa: UP045

{datamodel_code_generator-0.27.3 → datamodel_code_generator-0.28.1}/src/datamodel_code_generator/arguments.py

@@ -13,7 +13,7 @@ from datamodel_code_generator.types import StrictTypes
 
 if TYPE_CHECKING:
     from argparse import Action
-    from typing import Iterable
+    from collections.abc import Iterable
 
 DEFAULT_ENCODING = locale.getpreferredencoding()
 
@@ -161,7 +161,7 @@ model_options.add_argument(
 )
 model_options.add_argument(
     "--target-python-version",
-    help="target python version (default: 3.8)",
+    help="target python version",
     choices=[v.value for v in PythonVersion],
 )
 model_options.add_argument(

{datamodel_code_generator-0.27.3 → datamodel_code_generator-0.28.1}/src/datamodel_code_generator/format.py

@@ -1,15 +1,16 @@
 from __future__ import annotations
 
 from enum import Enum
+from functools import cached_property
 from importlib import import_module
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Sequence
+from typing import TYPE_CHECKING, Any
 from warnings import warn
 
 import black
 import isort
 
-from datamodel_code_generator.util import cached_property, load_toml
+from datamodel_code_generator.util import load_toml
 
 try:
     import black.mode
@@ -24,58 +25,24 @@ class DatetimeClassType(Enum):
 
 
 class PythonVersion(Enum):
-    PY_36 = "3.6"
-    PY_37 = "3.7"
-    PY_38 = "3.8"
     PY_39 = "3.9"
     PY_310 = "3.10"
     PY_311 = "3.11"
     PY_312 = "3.12"
     PY_313 = "3.13"
 
-    @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}
-
-    @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}
-
     @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,
-        }
+        return self.value != self.PY_39.value
 
     @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,
-        }
-
-    @property
-    def has_literal_type(self) -> bool:
-        return self._is_py_38_or_later
+        return self.value not in {self.PY_39.value, self.PY_310.value}
 
     @property
     def has_union_operator(self) -> bool:  # pragma: no cover
         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
@@ -85,7 +52,10 @@ class PythonVersion(Enum):
         return self._is_py_310_or_later
 
 
+PythonVersionMin = PythonVersion.PY_39
+
 if TYPE_CHECKING:
+    from collections.abc import Sequence
 
     class _TargetVersion(Enum): ...
 
@@ -104,7 +74,7 @@ def is_supported_in_black(python_version: PythonVersion) -> bool:  # pragma: no
 
 def black_find_project_root(sources: Sequence[Path]) -> Path:
     if TYPE_CHECKING:
-        from typing import Iterable  # noqa: PLC0415
+        from collections.abc import Iterable  # noqa: PLC0415
 
         def _find_project_root(
             srcs: Sequence[str] | Iterable[str],

{datamodel_code_generator-0.27.3 → datamodel_code_generator-0.28.1}/src/datamodel_code_generator/http.py

@@ -1,6 +1,9 @@
 from __future__ import annotations
 
-from typing import Sequence
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
 
 try:
     import httpx

{datamodel_code_generator-0.27.3 → datamodel_code_generator-0.28.1}/src/datamodel_code_generator/imports.py

@@ -3,10 +3,13 @@ from __future__ import annotations
 from collections import defaultdict
 from functools import lru_cache
 from itertools import starmap
-from typing import DefaultDict, Iterable, Optional, Set
+from typing import TYPE_CHECKING, Optional
 
 from datamodel_code_generator.util import BaseModel
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
 
 class Import(BaseModel):
     from_: Optional[str] = None  # noqa: UP045
@@ -21,7 +24,7 @@ class Import(BaseModel):
         return Import(from_=".".join(split_class_path[:-1]) or None, import_=split_class_path[-1])
 
 
-class Imports(DefaultDict[Optional[str], Set[str]]):
+class Imports(defaultdict[Optional[str], set[str]]):
     def __str__(self) -> str:
         return self.dump()
 
@@ -89,7 +92,6 @@ 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_SET = Import.from_full_path("typing.Set")
@@ -97,7 +99,6 @@ IMPORT_UNION = Import.from_full_path("typing.Union")
 IMPORT_OPTIONAL = Import.from_full_path("typing.Optional")
 IMPORT_LITERAL = Import.from_full_path("typing.Literal")
 IMPORT_TYPE_ALIAS = Import.from_full_path("typing.TypeAlias")
-IMPORT_LITERAL_BACKPORT = Import.from_full_path("typing_extensions.Literal")
 IMPORT_SEQUENCE = Import.from_full_path("typing.Sequence")
 IMPORT_FROZEN_SET = Import.from_full_path("typing.FrozenSet")
 IMPORT_MAPPING = Import.from_full_path("typing.Mapping")

{datamodel_code_generator-0.27.3 → datamodel_code_generator-0.28.1}/src/datamodel_code_generator/model/__init__.py

@@ -1,13 +1,15 @@
 from __future__ import annotations
 
 import sys
-from typing import TYPE_CHECKING, Callable, Iterable, NamedTuple
+from typing import TYPE_CHECKING, Callable, NamedTuple
 
 from datamodel_code_generator import DatetimeClassType, PythonVersion
 
 from .base import ConstraintsBase, DataModel, DataModelFieldBase
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
     from datamodel_code_generator import DataModelType
     from datamodel_code_generator.types import DataTypeManager as DataTypeManagerABC
 
@@ -62,7 +64,7 @@ def get_data_model_types(
         )
     if data_model_type == DataModelType.TypingTypedDict:
         return DataModelSet(
-            data_model=(typed_dict.TypedDict if target_python_version.has_typed_dict else typed_dict.TypedDictBackport),
+            data_model=typed_dict.TypedDict,
             root_model=rootmodel.RootModel,
             field_model=(
                 typed_dict.DataModelField

{datamodel_code_generator-0.27.3 → datamodel_code_generator-0.28.1}/src/datamodel_code_generator/model/base.py

@@ -3,19 +3,9 @@ from __future__ import annotations
 from abc import ABC, abstractmethod
 from collections import defaultdict
 from copy import deepcopy
-from functools import lru_cache
+from functools import cached_property, lru_cache
 from pathlib import Path
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    ClassVar,
-    Dict,
-    Iterator,
-    Optional,
-    Set,
-    Tuple,
-    TypeVar,
-)
+from typing import TYPE_CHECKING, Any, ClassVar, Optional, TypeVar
 from warnings import warn
 
 from jinja2 import Environment, FileSystemLoader, Template
@@ -23,7 +13,6 @@ from pydantic import Field
 
 from datamodel_code_generator.imports import (
     IMPORT_ANNOTATED,
-    IMPORT_ANNOTATED_BACKPORT,
     IMPORT_OPTIONAL,
     IMPORT_UNION,
     Import,
@@ -38,7 +27,10 @@ from datamodel_code_generator.types import (
     chain_as_tuple,
     get_optional_type,
 )
-from datamodel_code_generator.util import PYDANTIC_V2, ConfigDict, cached_property
+from datamodel_code_generator.util import PYDANTIC_V2, ConfigDict
+
+if TYPE_CHECKING:
+    from collections.abc import Iterator
 
 TEMPLATE_DIR: Path = Path(__file__).parents[0] / "template"
 
@@ -49,7 +41,7 @@ ConstraintsBaseT = TypeVar("ConstraintsBaseT", bound="ConstraintsBase")
 
 class ConstraintsBase(_BaseModel):
     unique_items: Optional[bool] = Field(None, alias="uniqueItems")  # noqa: UP045
-    _exclude_fields: ClassVar[Set[str]] = {"has_constraints"}  # noqa: UP006
+    _exclude_fields: ClassVar[set[str]] = {"has_constraints"}
     if PYDANTIC_V2:
         model_config = ConfigDict(  # pyright: ignore[reportAssignmentType]
             arbitrary_types_allowed=True, ignored_types=(cached_property,)
@@ -98,7 +90,7 @@ class DataModelFieldBase(_BaseModel):
     strip_default_none: bool = False
     nullable: Optional[bool] = None  # noqa: UP045
     parent: Optional[Any] = None  # noqa: UP045
-    extras: Dict[str, Any] = {}  # noqa: RUF012, UP006
+    extras: dict[str, Any] = {}  # noqa: RUF012
     use_annotated: bool = False
     has_default: bool = False
     use_field_description: bool = False
@@ -106,8 +98,8 @@ class DataModelFieldBase(_BaseModel):
     original_name: Optional[str] = None  # noqa: UP045
     use_default_kwarg: bool = False
     use_one_literal_as_default: bool = False
-    _exclude_fields: ClassVar[Set[str]] = {"parent"}  # noqa: UP006
-    _pass_fields: ClassVar[Set[str]] = {"parent", "data_type"}  # noqa: UP006
+    _exclude_fields: ClassVar[set[str]] = {"parent"}
+    _pass_fields: ClassVar[set[str]] = {"parent", "data_type"}
     can_have_extra_keys: ClassVar[bool] = True
     type_has_null: Optional[bool] = None  # noqa: UP045
 
@@ -163,10 +155,7 @@ class DataModelFieldBase(_BaseModel):
         elif self.nullable and not self.data_type.use_union_operator:  # pragma: no cover
             imports.append((IMPORT_OPTIONAL,))
         if self.use_annotated and self.annotated:
-            import_annotated = (
-                IMPORT_ANNOTATED if self.data_type.python_version.has_annotated_type else IMPORT_ANNOTATED_BACKPORT
-            )
-            imports.append((import_annotated,))
+            imports.append((IMPORT_ANNOTATED,))
         return chain_as_tuple(*imports)
 
     @property
@@ -258,7 +247,7 @@ UNDEFINED: Any = object()
 class DataModel(TemplateBase, Nullable, ABC):
     TEMPLATE_FILE_PATH: ClassVar[str] = ""
     BASE_CLASS: ClassVar[str] = ""
-    DEFAULT_IMPORTS: ClassVar[Tuple[Import, ...]] = ()  # noqa: UP006
+    DEFAULT_IMPORTS: ClassVar[tuple[Import, ...]] = ()
 
     def __init__(  # noqa: PLR0913
         self,

{datamodel_code_generator-0.27.3 → datamodel_code_generator-0.28.1}/src/datamodel_code_generator/model/dataclass.py

@@ -1,16 +1,8 @@
 from __future__ import annotations
 
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    ClassVar,
-    Optional,
-    Sequence,
-    Set,
-    Tuple,
-)
+from typing import TYPE_CHECKING, Any, ClassVar, Optional
 
-from datamodel_code_generator import DatetimeClassType, PythonVersion
+from datamodel_code_generator import DatetimeClassType, PythonVersion, PythonVersionMin
 from datamodel_code_generator.imports import (
     IMPORT_DATE,
     IMPORT_DATETIME,
@@ -27,6 +19,7 @@ from datamodel_code_generator.types import DataType, StrictTypes, Types, chain_a
 
 if TYPE_CHECKING:
     from collections import defaultdict
+    from collections.abc import Sequence
     from pathlib import Path
 
     from datamodel_code_generator.reference import Reference
@@ -42,7 +35,7 @@ def _has_field_assignment(field: DataModelFieldBase) -> bool:
 
 class DataClass(DataModel):
     TEMPLATE_FILE_PATH: ClassVar[str] = "dataclass.jinja2"
-    DEFAULT_IMPORTS: ClassVar[Tuple[Import, ...]] = (IMPORT_DATACLASS,)  # noqa: UP006
+    DEFAULT_IMPORTS: ClassVar[tuple[Import, ...]] = (IMPORT_DATACLASS,)
 
     def __init__(  # noqa: PLR0913
         self,
@@ -63,7 +56,7 @@ class DataClass(DataModel):
     ) -> None:
         super().__init__(
             reference=reference,
-            fields=sorted(fields, key=_has_field_assignment, reverse=False),
+            fields=sorted(fields, key=_has_field_assignment),
             decorators=decorators,
             base_classes=base_classes,
             custom_base_class=custom_base_class,
@@ -79,7 +72,7 @@ class DataClass(DataModel):
 
 
 class DataModelField(DataModelFieldBase):
-    _FIELD_KEYS: ClassVar[Set[str]] = {  # noqa: UP006
+    _FIELD_KEYS: ClassVar[set[str]] = {
         "default_factory",
         "init",
         "repr",
@@ -143,7 +136,7 @@ class DataModelField(DataModelFieldBase):
 class DataTypeManager(_DataTypeManager):
     def __init__(  # noqa: PLR0913, PLR0917
         self,
-        python_version: PythonVersion = PythonVersion.PY_38,
+        python_version: PythonVersion = PythonVersionMin,
         use_standard_collections: bool = False,  # noqa: FBT001, FBT002
         use_generic_container_types: bool = False,  # noqa: FBT001, FBT002
         strict_types: Sequence[StrictTypes] | None = None,

{datamodel_code_generator-0.27.3 → datamodel_code_generator-0.28.1}/src/datamodel_code_generator/model/enum.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, ClassVar, Optional, Tuple
+from typing import TYPE_CHECKING, Any, ClassVar, Optional
 
 from datamodel_code_generator.imports import IMPORT_ANY, IMPORT_ENUM, Import
 from datamodel_code_generator.model import DataModel, DataModelFieldBase
@@ -33,7 +33,7 @@ SUBCLASS_BASE_CLASSES: dict[Types, str] = {
 class Enum(DataModel):
     TEMPLATE_FILE_PATH: ClassVar[str] = "Enum.jinja2"
     BASE_CLASS: ClassVar[str] = "enum.Enum"
-    DEFAULT_IMPORTS: ClassVar[Tuple[Import, ...]] = (IMPORT_ENUM,)  # noqa: UP006
+    DEFAULT_IMPORTS: ClassVar[tuple[Import, ...]] = (IMPORT_ENUM,)
 
     def __init__(  # noqa: PLR0913
         self,