Remove WithJsonSchema from ExtraTemplateDataType

Author: koxudaxi

src/datamodel_code_generator/_types/generate_config_dict.py

@@ -8,7 +8,6 @@
 from typing_extensions import NotRequired
 
 if TYPE_CHECKING:
-    from collections import defaultdict
     from collections.abc import Callable, Mapping, Sequence
     from pathlib import Path
 
@@ -47,7 +46,7 @@ class GenerateConfigDict(TypedDict):
     additional_imports: NotRequired[list[str] | None]
     class_decorators: NotRequired[list[str] | None]
     custom_template_dir: NotRequired[Path | None]
-    extra_template_data: NotRequired[defaultdict[str, dict[str, Any]] | None]
+    extra_template_data: NotRequired[dict[str, dict[str, Any]] | None]
     validation: NotRequired[bool]
     field_constraints: NotRequired[bool]
     snake_case_field: NotRequired[bool]

src/datamodel_code_generator/_types/parser_config_dict.py

@@ -8,7 +8,6 @@
 from typing_extensions import NotRequired
 
 if TYPE_CHECKING:
-    from collections import defaultdict
     from collections.abc import Callable, Iterable, Mapping, Sequence
     from pathlib import Path
 
@@ -39,7 +38,7 @@ class ParserConfigDict(TypedDict):
     additional_imports: NotRequired[list[str] | None]
     class_decorators: NotRequired[list[str] | None]
     custom_template_dir: NotRequired[Path | None]
-    extra_template_data: NotRequired[defaultdict[str, dict[str, Any]] | None]
+    extra_template_data: NotRequired[dict[str, dict[str, Any]] | None]
     target_python_version: NotRequired[PythonVersion]
     dump_resolve_reference_action: NotRequired[Callable[[Iterable[str]], str] | None]
     validation: NotRequired[bool]

src/datamodel_code_generator/config.py

@@ -7,7 +7,7 @@
 from pathlib import Path  # noqa: TC003 - used at runtime by Pydantic
 from typing import TYPE_CHECKING, Annotated, Any
 
-from pydantic import BaseModel, Field, WithJsonSchema
+from pydantic import BaseModel, Field
 
 from datamodel_code_generator.enums import (
     DEFAULT_SHARED_MODULE_NAME,
@@ -48,10 +48,12 @@
 CallableSchema = Callable[[str], str]
 DumpResolveReferenceAction = Callable[[Iterable[str]], str]
 DefaultPutDictSchema = DefaultPutDict[str, str]
-ExtraTemplateDataType = Annotated[
-    defaultdict[str, Annotated[dict[str, Any], Field(default_factory=dict)]],
-    WithJsonSchema({"type": "object", "x-python-type": "defaultdict[str, dict[str, Any]]"}),
-]
+if TYPE_CHECKING:
+    ExtraTemplateDataType = defaultdict[str, dict[str, Any]]
+elif is_pydantic_v2():
+    ExtraTemplateDataType = defaultdict[str, Annotated[dict[str, Any], Field(default_factory=dict)]]
+else:
+    ExtraTemplateDataType = defaultdict[str, dict[str, Any]]
 
 
 class GenerateConfig(BaseModel):