datamodel-code-generator 0.52.2__tar.gz → 0.53.0__tar.gz

{datamodel_code_generator-0.52.2 → datamodel_code_generator-0.53.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datamodel-code-generator
-Version: 0.52.2
+Version: 0.53.0
 Summary: Datamodel Code Generator
 Project-URL: Homepage, https://github.com/koxudaxi/datamodel-code-generator
 Project-URL: Source, https://github.com/koxudaxi/datamodel-code-generator

{datamodel_code_generator-0.52.2 → datamodel_code_generator-0.53.0}/pyproject.toml

@@ -85,8 +85,6 @@ test = [
   "msgspec>=0.18",
   "pytest>=6.1",
   "pytest>=8.3.4",
-  "pytest-benchmark",
-  "pytest-codspeed>=2.2",
   "pytest-cov>=2.12.1",
   "pytest-cov>=5",
   "pytest-mock>=3.14",
@@ -106,6 +104,10 @@ type = [
 docs = [
   "zensical>=0.0.15; python_version>='3.10'",
 ]
+benchmark = [
+  "pytest-benchmark",
+  "pytest-codspeed>=2.2",
+]
 black22 = [ "black==22.1" ]
 black23 = [ "black==23.12" ]
 black24 = [ "black==24.1" ]
@@ -230,7 +232,10 @@ filterwarnings = [
 ]
 norecursedirs = [ "tests/data/*", ".tox" ]
 verbosity_assertions = 2
-markers = [ "perf: marks tests as performance tests (excluded from CI benchmarks)" ]
+markers = [
+  "perf: marks tests as performance tests (excluded from CI benchmarks)",
+  "benchmark: marks tests as benchmark tests",
+]
 
 [tool.coverage]
 html.skip_covered = false

{datamodel_code_generator-0.52.2 → datamodel_code_generator-0.53.0}/src/datamodel_code_generator/__init__.py

@@ -43,12 +43,15 @@ from datamodel_code_generator.enums import (
     GraphQLScope,
     InputFileType,
     InputModelRefStrategy,
+    JsonSchemaVersion,
     ModuleSplitMode,
     NamingStrategy,
     OpenAPIScope,
+    OpenAPIVersion,
     ReadOnlyWriteOnlyModelType,
     ReuseScope,
     TargetPydanticVersion,
+    VersionMode,
 )
 from datamodel_code_generator.format import (
     DEFAULT_FORMATTERS,
@@ -62,7 +65,12 @@ from datamodel_code_generator.format import (
 from datamodel_code_generator.parser import DefaultPutDict, LiteralType
 
 if TYPE_CHECKING:
-    from datamodel_code_generator._types import GraphQLParserConfigDict, OpenAPIParserConfigDict, ParserConfigDict
+    from datamodel_code_generator._types import (
+        GraphQLParserConfigDict,
+        JSONSchemaParserConfigDict,
+        OpenAPIParserConfigDict,
+        ParserConfigDict,
+    )
     from datamodel_code_generator._types.generate_config_dict import GenerateConfigDict
     from datamodel_code_generator.config import GenerateConfig, ParserConfig
 
@@ -453,7 +461,10 @@ def _build_module_content(
 def _create_parser_config(
     config_class: type[_ConfigT],
     generate_config: GenerateConfig,
-    additional_options: ParserConfigDict | OpenAPIParserConfigDict | GraphQLParserConfigDict,
+    additional_options: ParserConfigDict
+    | JSONSchemaParserConfigDict
+    | OpenAPIParserConfigDict
+    | GraphQLParserConfigDict,
 ) -> _ConfigT:
     """Create a parser config from GenerateConfig with additional options.
 
@@ -732,6 +743,28 @@ def generate(  # noqa: PLR0912, PLR0914, PLR0915
         ),
     }
 
+    # Convert schema_version string to appropriate enum based on input type
+    jsonschema_version: JsonSchemaVersion | None = None
+    openapi_version: OpenAPIVersion | None = None
+    if config.schema_version and config.schema_version != "auto":
+        if input_file_type == InputFileType.OpenAPI:
+            try:
+                openapi_version = OpenAPIVersion(config.schema_version)
+            except ValueError:
+                valid = [v.value for v in OpenAPIVersion]
+                msg = f"Invalid OpenAPI version: {config.schema_version}. Valid values: {valid}"
+                raise Error(msg) from None
+        elif input_file_type == InputFileType.GraphQL:
+            msg = f"--schema-version is not supported for {input_file_type.value}"
+            raise Error(msg)
+        else:
+            try:
+                jsonschema_version = JsonSchemaVersion(config.schema_version)
+            except ValueError:
+                valid = [v.value for v in JsonSchemaVersion]
+                msg = f"Invalid JSON Schema version: {config.schema_version}. Valid values: {valid}"
+                raise Error(msg) from None
+
     if input_file_type == InputFileType.OpenAPI:
         from datamodel_code_generator.parser.openapi import OpenAPIParser  # noqa: PLC0415
 
@@ -740,6 +773,7 @@ def generate(  # noqa: PLR0912, PLR0914, PLR0915
             "include_path_parameters": config.include_path_parameters,
             "use_status_code_in_response_name": config.use_status_code_in_response_name,
             "openapi_include_paths": config.openapi_include_paths,
+            "openapi_version": openapi_version,
             **additional_options,
         }
         parser_config = _create_parser_config(OpenAPIParserConfig, config, openapi_additional_options)
@@ -757,7 +791,11 @@ def generate(  # noqa: PLR0912, PLR0914, PLR0915
     else:
         from datamodel_code_generator.parser.jsonschema import JsonSchemaParser  # noqa: PLC0415
 
-        parser_config = _create_parser_config(JSONSchemaParserConfig, config, additional_options)
+        jsonschema_additional_options: JSONSchemaParserConfigDict = {
+            "jsonschema_version": jsonschema_version,
+            **additional_options,
+        }
+        parser_config = _create_parser_config(JSONSchemaParserConfig, config, jsonschema_additional_options)
         parser = JsonSchemaParser(source=source, config=parser_config)  # ty: ignore
 
     with chdir(config.output):
@@ -930,7 +968,10 @@ inferred_message = (
 
 _LAZY_IMPORTS = {
     "clear_dynamic_models_cache": "datamodel_code_generator.dynamic",
+    "detect_jsonschema_version": "datamodel_code_generator.parser.schema_version",
+    "detect_openapi_version": "datamodel_code_generator.parser.schema_version",
     "generate_dynamic_models": "datamodel_code_generator.dynamic",
+    "GenerateConfig": "datamodel_code_generator.config",
 }
 
 
@@ -938,6 +979,13 @@ def __getattr__(name: str) -> Any:
     if name in _LAZY_IMPORTS:
         import importlib  # noqa: PLC0415
 
+        if name == "GenerateConfig" and not is_pydantic_v2():  # pragma: no cover
+            msg = (
+                f"'{name}' is only available in Pydantic v2 environments. "
+                "Use 'from datamodel_code_generator.config import GenerateConfig' instead."
+            )
+            raise ImportError(msg)
+
         module = importlib.import_module(_LAZY_IMPORTS[name])
         return getattr(module, name)
     msg = f"module {__name__!r} has no attribute {name!r}"
@@ -966,17 +1014,25 @@ __all__ = [
     "InputModelRefStrategy",
     "InvalidClassNameError",
     "InvalidFileFormatError",
+    "JsonSchemaVersion",
     "LiteralType",
     "ModuleSplitMode",
     "NamingStrategy",
     "OpenAPIScope",
+    "OpenAPIVersion",
     "PythonVersion",
     "PythonVersionMin",
     "ReadOnlyWriteOnlyModelType",
     "ReuseScope",
     "SchemaParseError",
     "TargetPydanticVersion",
+    "VersionMode",
     "clear_dynamic_models_cache",  # noqa: F822
+    "detect_jsonschema_version",  # noqa: F822
+    "detect_openapi_version",  # noqa: F822
     "generate",
     "generate_dynamic_models",  # noqa: F822
 ]
+
+if is_pydantic_v2():  # pragma: no cover
+    __all__ += ["GenerateConfig"]

{datamodel_code_generator-0.52.2 → datamodel_code_generator-0.53.0}/src/datamodel_code_generator/__main__.py

@@ -69,6 +69,7 @@ from datamodel_code_generator import (
     ReadOnlyWriteOnlyModelType,
     ReuseScope,
     TargetPydanticVersion,
+    VersionMode,
     enable_debug_message,
     generate,
 )
@@ -565,6 +566,7 @@ class Config(BaseModel):
     use_operation_id_as_name: bool = False
     use_unique_items_as_set: bool = False
     use_tuple_for_fixed_items: bool = False
+    use_closed_typed_dict: bool = True
     allof_merge_mode: AllOfMergeMode = AllOfMergeMode.Constraints
     allof_class_hierarchy: AllOfClassHierarchy = AllOfClassHierarchy.IfNoConflict
     http_headers: Optional[Sequence[tuple[str, str]]] = None  # noqa: UP045
@@ -620,6 +622,8 @@ class Config(BaseModel):
     module_split_mode: Optional[ModuleSplitMode] = None  # noqa: UP045
     watch: bool = False
     watch_delay: float = 0.5
+    schema_version: Optional[str] = None  # noqa: UP045
+    schema_version_mode: Optional[VersionMode] = None  # noqa: UP045
 
     def merge_args(self, args: Namespace) -> None:
         """Merge command-line arguments into config."""
@@ -1006,6 +1010,7 @@ def run_generate_from_config(  # noqa: PLR0913, PLR0917
         use_operation_id_as_name=config.use_operation_id_as_name,
         use_unique_items_as_set=config.use_unique_items_as_set,
         use_tuple_for_fixed_items=config.use_tuple_for_fixed_items,
+        use_closed_typed_dict=config.use_closed_typed_dict,
         allof_merge_mode=config.allof_merge_mode,
         allof_class_hierarchy=config.allof_class_hierarchy,
         http_headers=config.http_headers,
@@ -1063,6 +1068,8 @@ def run_generate_from_config(  # noqa: PLR0913, PLR0917
         module_split_mode=config.module_split_mode,
         validators=validators,
         default_value_overrides=default_value_overrides,
+        schema_version=config.schema_version,
+        schema_version_mode=config.schema_version_mode,
     )
 
     if output is None and result is not None:  # pragma: no cover

{datamodel_code_generator-0.52.2 → datamodel_code_generator-0.53.0}/src/datamodel_code_generator/_types/generate_config_dict.py

@@ -32,6 +32,7 @@ if TYPE_CHECKING:
         StrictTypes,
         TargetPydanticVersion,
         UnionMode,
+        VersionMode,
     )
     from datamodel_code_generator.format import DateClassType, DatetimeClassType, Formatter, PythonVersion
     from datamodel_code_generator.parser import LiteralType
@@ -112,6 +113,7 @@ class GenerateConfigDict(TypedDict, closed=True):
     use_operation_id_as_name: NotRequired[bool]
     use_unique_items_as_set: NotRequired[bool]
     use_tuple_for_fixed_items: NotRequired[bool]
+    use_closed_typed_dict: NotRequired[bool]
     allof_merge_mode: NotRequired[AllOfMergeMode]
     allof_class_hierarchy: NotRequired[AllOfClassHierarchy]
     http_headers: NotRequired[Sequence[tuple[str, str]] | None]
@@ -168,6 +170,8 @@ class GenerateConfigDict(TypedDict, closed=True):
     field_type_collision_strategy: NotRequired[FieldTypeCollisionStrategy | None]
     module_split_mode: NotRequired[ModuleSplitMode | None]
     default_value_overrides: NotRequired[Mapping[str, Any] | None]
+    schema_version: NotRequired[str | None]
+    schema_version_mode: NotRequired[VersionMode | None]
 
 
 class ValidatorDefinition(TypedDict):

{datamodel_code_generator-0.52.2 → datamodel_code_generator-0.53.0}/src/datamodel_code_generator/_types/parser_config_dicts.py

@@ -19,12 +19,15 @@ if TYPE_CHECKING:
         CollapseRootModelsNameStrategy,
         DataclassArguments,
         FieldTypeCollisionStrategy,
+        JsonSchemaVersion,
         NamingStrategy,
         OpenAPIScope,
+        OpenAPIVersion,
         ReadOnlyWriteOnlyModelType,
         ReuseScope,
         StrictTypes,
         TargetPydanticVersion,
+        VersionMode,
     )
     from datamodel_code_generator.format import DateClassType, DatetimeClassType, Formatter, PythonVersion
     from datamodel_code_generator.model.base import DataModel, DataModelFieldBase
@@ -105,6 +108,7 @@ class ParserConfigDict(TypedDict):
     use_operation_id_as_name: NotRequired[bool]
     use_unique_items_as_set: NotRequired[bool]
     use_tuple_for_fixed_items: NotRequired[bool]
+    use_closed_typed_dict: NotRequired[bool]
     allof_merge_mode: NotRequired[AllOfMergeMode]
     allof_class_hierarchy: NotRequired[AllOfClassHierarchy]
     http_headers: NotRequired[Sequence[tuple[str, str]] | None]
@@ -167,7 +171,8 @@ class GraphQLParserConfigDict(ParserConfigDict, closed=True):
 
 
 class JSONSchemaParserConfigDict(ParserConfigDict):
-    pass
+    jsonschema_version: NotRequired[JsonSchemaVersion | None]
+    schema_version_mode: NotRequired[VersionMode | None]
 
 
 class OpenAPIParserConfigDict(JSONSchemaParserConfigDict, closed=True):
@@ -175,6 +180,7 @@ class OpenAPIParserConfigDict(JSONSchemaParserConfigDict, closed=True):
     include_path_parameters: NotRequired[bool]
     use_status_code_in_response_name: NotRequired[bool]
     openapi_include_paths: NotRequired[list[str] | None]
+    openapi_version: NotRequired[OpenAPIVersion | None]
 
 
 ModelDict: TypeAlias = ParserConfigDict | GraphQLParserConfigDict | JSONSchemaParserConfigDict | OpenAPIParserConfigDict

{datamodel_code_generator-0.52.2 → datamodel_code_generator-0.53.0}/src/datamodel_code_generator/arguments.py

@@ -34,6 +34,7 @@ from datamodel_code_generator.enums import (
     StrictTypes,
     TargetPydanticVersion,
     UnionMode,
+    VersionMode,
 )
 from datamodel_code_generator.format import DateClassType, DatetimeClassType, Formatter, PythonVersion
 from datamodel_code_generator.parser import LiteralType
@@ -599,6 +600,13 @@ typing_options.add_argument(
     action="store_true",
     default=None,
 )
+typing_options.add_argument(
+    "--use-closed-typed-dict",
+    help="Generate TypedDict with PEP 728 closed=True/extra_items for additionalProperties constraints. "
+    "Use --no-use-closed-typed-dict for type checkers that don't yet support PEP 728 (e.g., mypy).",
+    action=BooleanOptionalAction,
+    default=None,
+)
 typing_options.add_argument(
     "--allof-merge-mode",
     help="Mode for field merging in allOf schemas. "
@@ -984,6 +992,25 @@ openapi_options.add_argument(
     action="store_true",
     default=None,
 )
+# ======================================================================================
+# Schema version options (for both JSON Schema and OpenAPI)
+# ======================================================================================
+base_options.add_argument(
+    "--schema-version",
+    help="Schema version. Valid values depend on input type: "
+    "JsonSchema: auto, draft-04, draft-06, draft-07, 2019-09, 2020-12. "
+    "OpenAPI: auto, 3.0, 3.1. "
+    "(default: auto - detected from $schema or openapi field)",
+    default=None,
+)
+base_options.add_argument(
+    "--schema-version-mode",
+    help="Schema version validation mode. "
+    "'lenient': accept all features regardless of version (default). "
+    "'strict': warn on features outside declared/detected version.",
+    choices=[m.value for m in VersionMode],
+    default=None,
+)
 
 # ======================================================================================
 # Options specific to GraphQL input schemas

{datamodel_code_generator-0.52.2 → datamodel_code_generator-0.53.0}/src/datamodel_code_generator/cli_options.py

@@ -70,6 +70,8 @@ CLI_OPTION_META: dict[str, CLIOptionMeta] = {
     "--input-model-ref-strategy": CLIOptionMeta(name="--input-model-ref-strategy", category=OptionCategory.BASE),
     "--input-file-type": CLIOptionMeta(name="--input-file-type", category=OptionCategory.BASE),
     "--encoding": CLIOptionMeta(name="--encoding", category=OptionCategory.BASE),
+    "--schema-version": CLIOptionMeta(name="--schema-version", category=OptionCategory.BASE),
+    "--schema-version-mode": CLIOptionMeta(name="--schema-version-mode", category=OptionCategory.BASE),
     # ==========================================================================
     # Model Customization
     # ==========================================================================
@@ -201,6 +203,8 @@ CLI_OPTION_META: dict[str, CLIOptionMeta] = {
     ),
     "--use-unique-items-as-set": CLIOptionMeta(name="--use-unique-items-as-set", category=OptionCategory.TYPING),
     "--use-tuple-for-fixed-items": CLIOptionMeta(name="--use-tuple-for-fixed-items", category=OptionCategory.TYPING),
+    "--use-closed-typed-dict": CLIOptionMeta(name="--use-closed-typed-dict", category=OptionCategory.TYPING),
+    "--no-use-closed-typed-dict": CLIOptionMeta(name="--no-use-closed-typed-dict", category=OptionCategory.TYPING),
     "--type-mappings": CLIOptionMeta(name="--type-mappings", category=OptionCategory.TYPING),
     "--type-overrides": CLIOptionMeta(name="--type-overrides", category=OptionCategory.TYPING),
     "--no-use-specialized-enum": CLIOptionMeta(name="--no-use-specialized-enum", category=OptionCategory.TYPING),

{datamodel_code_generator-0.52.2 → datamodel_code_generator-0.53.0}/src/datamodel_code_generator/config.py

@@ -22,12 +22,15 @@ from datamodel_code_generator.enums import (
     FieldTypeCollisionStrategy,
     GraphQLScope,
     InputFileType,
+    JsonSchemaVersion,
     ModuleSplitMode,
     NamingStrategy,
     OpenAPIScope,
+    OpenAPIVersion,
     ReadOnlyWriteOnlyModelType,
     ReuseScope,
     TargetPydanticVersion,
+    VersionMode,
 )
 from datamodel_code_generator.format import (
     DateClassType,
@@ -41,6 +44,7 @@ from datamodel_code_generator.model.base import (  # noqa: TC001 - used by Pydan
     DataModel,
     DataModelFieldBase,
 )
+from datamodel_code_generator.model.pydantic_v2 import UnionMode  # noqa: TC001 - used by Pydantic at runtime
 from datamodel_code_generator.model.scalar import DataTypeScalar
 from datamodel_code_generator.model.union import DataTypeUnion
 from datamodel_code_generator.parser import DefaultPutDict, LiteralType
@@ -48,10 +52,6 @@ from datamodel_code_generator.types import DataTypeManager, StrictTypes  # noqa:
 from datamodel_code_generator.util import ConfigDict, is_pydantic_v2
 from datamodel_code_generator.validators import ModelValidators  # noqa: TC001 - used by Pydantic at runtime
 
-if TYPE_CHECKING:
-    from datamodel_code_generator.model.pydantic_v2 import UnionMode
-
-
 CallableSchema = Callable[[str], str]
 DumpResolveReferenceAction = Callable[[Iterable[str]], str]
 DefaultPutDictSchema = DefaultPutDict[str, str]
@@ -149,6 +149,7 @@ class GenerateConfig(BaseModel):
     use_operation_id_as_name: bool = False
     use_unique_items_as_set: bool = False
     use_tuple_for_fixed_items: bool = False
+    use_closed_typed_dict: bool = True
     allof_merge_mode: AllOfMergeMode = AllOfMergeMode.Constraints
     allof_class_hierarchy: AllOfClassHierarchy = AllOfClassHierarchy.IfNoConflict
     http_headers: Sequence[tuple[str, str]] | None = None
@@ -205,6 +206,8 @@ class GenerateConfig(BaseModel):
     field_type_collision_strategy: FieldTypeCollisionStrategy | None = None
     module_split_mode: ModuleSplitMode | None = None
     default_value_overrides: Mapping[str, Any] | None = None
+    schema_version: str | None = None
+    schema_version_mode: VersionMode | None = None
 
 
 class ParserConfig(BaseModel):
@@ -284,6 +287,7 @@ class ParserConfig(BaseModel):
     use_operation_id_as_name: bool = False
     use_unique_items_as_set: bool = False
     use_tuple_for_fixed_items: bool = False
+    use_closed_typed_dict: bool = True
     allof_merge_mode: AllOfMergeMode = AllOfMergeMode.Constraints
     allof_class_hierarchy: AllOfClassHierarchy = AllOfClassHierarchy.IfNoConflict
     http_headers: Sequence[tuple[str, str]] | None = None
@@ -350,6 +354,9 @@ class GraphQLParserConfig(ParserConfig):
 class JSONSchemaParserConfig(ParserConfig):
     """Configuration model for JsonSchemaParser.__init__()."""
 
+    jsonschema_version: JsonSchemaVersion | None = None
+    schema_version_mode: VersionMode | None = None
+
 
 class OpenAPIParserConfig(JSONSchemaParserConfig):
     """Configuration model for OpenAPIParser.__init__()."""
@@ -358,6 +365,7 @@ class OpenAPIParserConfig(JSONSchemaParserConfig):
     include_path_parameters: bool = False
     use_status_code_in_response_name: bool = False
     openapi_include_paths: list[str] | None = None
+    openapi_version: OpenAPIVersion | None = None
 
 
 class ParseConfig(BaseModel):

{datamodel_code_generator-0.52.2 → datamodel_code_generator-0.53.0}/src/datamodel_code_generator/enums.py

@@ -240,6 +240,42 @@ class StrictTypes(Enum):
     bool = "bool"
 
 
+class JsonSchemaVersion(Enum):
+    """JSON Schema draft versions.
+
+    Auto: Auto-detect from $schema field or heuristics (default).
+    """
+
+    Draft4 = "draft-04"
+    Draft6 = "draft-06"
+    Draft7 = "draft-07"
+    Draft201909 = "2019-09"
+    Draft202012 = "2020-12"
+    Auto = "auto"
+
+
+class OpenAPIVersion(Enum):
+    """OpenAPI specification versions.
+
+    Auto: Auto-detect from openapi field (default).
+    """
+
+    V30 = "3.0"
+    V31 = "3.1"
+    Auto = "auto"
+
+
+class VersionMode(Enum):
+    """Schema version validation mode.
+
+    Lenient: Accept all features regardless of declared version (default).
+    Strict: Warn on features outside declared/detected version.
+    """
+
+    Lenient = "lenient"
+    Strict = "strict"
+
+
 __all__ = [
     "DEFAULT_SHARED_MODULE_NAME",
     "MAX_VERSION",
@@ -256,12 +292,15 @@ __all__ = [
     "GraphQLScope",
     "InputFileType",
     "InputModelRefStrategy",
+    "JsonSchemaVersion",
     "ModuleSplitMode",
     "NamingStrategy",
     "OpenAPIScope",
+    "OpenAPIVersion",
     "ReadOnlyWriteOnlyModelType",
     "ReuseScope",
     "StrictTypes",
     "TargetPydanticVersion",
     "UnionMode",
+    "VersionMode",
 ]

{datamodel_code_generator-0.52.2 → datamodel_code_generator-0.53.0}/src/datamodel_code_generator/model/pydantic/base_model.py

@@ -19,7 +19,7 @@ from datamodel_code_generator.model import (
     DataModelFieldBase,
 )
 from datamodel_code_generator.model._types import WrappedDefault
-from datamodel_code_generator.model.base import UNDEFINED
+from datamodel_code_generator.model.base import UNDEFINED, repr_set_sorted
 from datamodel_code_generator.model.pydantic.imports import (
     IMPORT_ANYURL,
     IMPORT_EXTRA,
@@ -91,6 +91,8 @@ class DataModelField(DataModelFieldBase):
     @property
     def field(self) -> str | None:
         """For backwards compatibility."""
+        if self.is_class_var:
+            return None
         result = str(self)
         if (
             self.use_default_kwarg
@@ -124,9 +126,22 @@ class DataModelField(DataModelFieldBase):
             return value
         return int(value)
 
-    def _get_default_as_pydantic_model(self) -> str | None:
+    def _get_default_as_pydantic_model(self) -> str | None:  # noqa: PLR0911, PLR0912
         if isinstance(self.default, WrappedDefault):
             return f"lambda :{self.default!r}"
+        if self.data_type.is_list and len(self.data_type.data_types) == 1:
+            data_type_child = self.data_type.data_types[0]
+            if (
+                data_type_child.reference
+                and isinstance(data_type_child.reference.source, BaseModelBase)
+                and isinstance(self.default, list)
+            ):
+                if not self.default:
+                    return STANDARD_LIST
+                return (  # pragma: no cover
+                    f"lambda :[{data_type_child.alias or data_type_child.reference.source.class_name}."
+                    f"{self._PARSE_METHOD}(v) for v in {self.default!r}]"
+                )
         for data_type in self.data_type.data_types or (self.data_type,):
             # TODO: Check nested data_types
             if data_type.is_dict:
@@ -218,7 +233,7 @@ class DataModelField(DataModelFieldBase):
             elif isinstance(discriminator, dict):  # pragma: no cover
                 data["discriminator"] = discriminator["propertyName"]
 
-        if self.required:
+        if self.required and not self.has_default:
             default_factory = None
         elif self.default is not UNDEFINED and self.default is not None and "default_factory" not in data:
             default_factory = self._get_default_as_pydantic_model()
@@ -247,20 +262,35 @@ class DataModelField(DataModelFieldBase):
 
         if self.use_annotated:
             field_arguments = self._process_annotated_field_arguments(field_arguments)
-        elif self.required:
+        elif self.required and not default_factory:
             field_arguments = ["...", *field_arguments]
         elif not default_factory:
-            from datamodel_code_generator.model.base import repr_set_sorted  # noqa: PLC0415
-
             default_repr = repr_set_sorted(self.default) if isinstance(self.default, set) else repr(self.default)
             field_arguments = [default_repr, *field_arguments]
 
+        if self.is_class_var:
+            if self.default is UNDEFINED:  # pragma: no cover
+                return ""
+            return repr_set_sorted(self.default) if isinstance(self.default, set) else repr(self.default)
+
         return f"Field({', '.join(field_arguments)})"
 
+    @property
+    def is_class_var(self) -> bool:
+        """Check if this field is a ClassVar."""
+        return self.extras.get("x-is-classvar") is True
+
+    @property
+    def type_hint(self) -> str:
+        """Get the type hint including ClassVar if applicable."""
+        if self.is_class_var:
+            return f"ClassVar[{super().type_hint}]"
+        return super().type_hint
+
     @property
     def annotated(self) -> str | None:
         """Get the Annotated type hint if use_annotated is enabled."""
-        if not self.use_annotated or not str(self):
+        if not self.use_annotated or not str(self) or self.is_class_var:
             return None
         return f"Annotated[{self.type_hint}, {self!s}]"
 

{datamodel_code_generator-0.52.2 → datamodel_code_generator-0.53.0}/src/datamodel_code_generator/model/pydantic_v2/base_model.py

@@ -14,6 +14,7 @@ from pydantic import Field
 
 from datamodel_code_generator.imports import IMPORT_ANY, Import
 from datamodel_code_generator.model.base import ALL_MODEL, UNDEFINED, BaseClassDataType, DataModelFieldBase
+from datamodel_code_generator.model.imports import IMPORT_CLASSVAR
 from datamodel_code_generator.model.pydantic.base_model import (
     BaseModelBase,
 )
@@ -192,6 +193,8 @@ class DataModelField(DataModelFieldV1):
         """Get all required imports including AliasChoices and Field for discriminator."""
         base_imports = super().imports
         extra_imports: list[Import] = []
+        if self.is_class_var:
+            extra_imports.append(IMPORT_CLASSVAR)
         if self.validation_aliases:
             from datamodel_code_generator.model.pydantic_v2.imports import IMPORT_ALIAS_CHOICES  # noqa: PLC0415