Add --jsonschema-version and --openapi-version CLI options

Author: koxudaxi

src/datamodel_code_generator/_types/parser_config_dicts.py

@@ -19,8 +19,10 @@
         CollapseRootModelsNameStrategy,
         DataclassArguments,
         FieldTypeCollisionStrategy,
+        JsonSchemaVersion,
         NamingStrategy,
         OpenAPIScope,
+        OpenAPIVersion,
         ReadOnlyWriteOnlyModelType,
         ReuseScope,
         StrictTypes,
@@ -167,14 +169,15 @@ class GraphQLParserConfigDict(ParserConfigDict):
 
 
 class JSONSchemaParserConfigDict(ParserConfigDict):
-    pass
+    jsonschema_version: NotRequired[JsonSchemaVersion | None]
 
 
 class OpenAPIParserConfigDict(JSONSchemaParserConfigDict):
     openapi_scopes: NotRequired[list[OpenAPIScope] | None]
     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

src/datamodel_code_generator/arguments.py

@@ -26,9 +26,11 @@
     FieldTypeCollisionStrategy,
     InputFileType,
     InputModelRefStrategy,
+    JsonSchemaVersion,
     ModuleSplitMode,
     NamingStrategy,
     OpenAPIScope,
+    OpenAPIVersion,
     ReadOnlyWriteOnlyModelType,
     ReuseScope,
     StrictTypes,
@@ -984,6 +986,24 @@ def start_section(self, heading: str | None) -> None:
     action="store_true",
     default=None,
 )
+openapi_options.add_argument(
+    "--openapi-version",
+    help="OpenAPI version to use (default: auto-detect from 'openapi' field). "
+    "Use 'auto' for auto-detection, '3.0' for OpenAPI 3.0.x, '3.1' for OpenAPI 3.1.x.",
+    choices=[v.value for v in OpenAPIVersion],
+    default=None,
+)
+
+# ======================================================================================
+# Options specific to JSON Schema input
+# ======================================================================================
+base_options.add_argument(
+    "--jsonschema-version",
+    help="JSON Schema version to use (default: auto-detect from '$schema' field). "
+    "Use 'auto' for auto-detection, or specify a draft version explicitly.",
+    choices=[v.value for v in JsonSchemaVersion],
+    default=None,
+)
 
 # ======================================================================================
 # Options specific to GraphQL input schemas

src/datamodel_code_generator/config.py

@@ -22,9 +22,11 @@
     FieldTypeCollisionStrategy,
     GraphQLScope,
     InputFileType,
+    JsonSchemaVersion,
     ModuleSplitMode,
     NamingStrategy,
     OpenAPIScope,
+    OpenAPIVersion,
     ReadOnlyWriteOnlyModelType,
     ReuseScope,
     TargetPydanticVersion,
@@ -350,6 +352,8 @@ class GraphQLParserConfig(ParserConfig):
 class JSONSchemaParserConfig(ParserConfig):
     """Configuration model for JsonSchemaParser.__init__()."""
 
+    jsonschema_version: JsonSchemaVersion | None = None
+
 
 class OpenAPIParserConfig(JSONSchemaParserConfig):
     """Configuration model for OpenAPIParser.__init__()."""
@@ -358,6 +362,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):

src/datamodel_code_generator/parser/jsonschema.py

@@ -773,12 +773,15 @@ def schema_paths(self) -> list[tuple[str, list[str]]]:
 
     @cached_property
     def schema_features(self) -> JsonSchemaFeatures:
-        """Get schema features based on detected version."""
+        """Get schema features based on config or detected version."""
         from datamodel_code_generator.parser.schema_version import (  # noqa: PLC0415
             JsonSchemaFeatures,
             detect_jsonschema_version,
         )
 
+        config_version = getattr(self.config, "jsonschema_version", None)
+        if config_version is not None and config_version != JsonSchemaVersion.Auto:
+            return JsonSchemaFeatures.from_version(config_version)
         version = detect_jsonschema_version(self.raw_obj) if self.raw_obj else JsonSchemaVersion.Auto
         return JsonSchemaFeatures.from_version(version)
 

src/datamodel_code_generator/parser/openapi.py

@@ -172,12 +172,15 @@ class OpenAPIParser(JsonSchemaParser):
 
     @cached_property
     def schema_features(self) -> OpenAPISchemaFeatures:
-        """Get schema features based on detected OpenAPI version."""
+        """Get schema features based on config or detected OpenAPI version."""
         from datamodel_code_generator.parser.schema_version import (  # noqa: PLC0415
             OpenAPISchemaFeatures,
             detect_openapi_version,
         )
 
+        config_version = getattr(self.config, "openapi_version", None)
+        if config_version is not None and config_version != OpenAPIVersion.Auto:
+            return OpenAPISchemaFeatures.from_openapi_version(config_version)
         version = detect_openapi_version(self.raw_obj) if self.raw_obj else OpenAPIVersion.Auto
         return OpenAPISchemaFeatures.from_openapi_version(version)