Skip to content

Type generation models #3590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
koxudaxi merged 1 commit into from
Jul 7, 2026
+13 −9
Merged

Type generation models #3590

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/datamodel_code_generator/parser/generation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,21 @@
from collections.abc import Callable, Generator, Iterable, Iterator
from pathlib import Path

from datamodel_code_generator.model.base import BaseClassDataType, DataModel, DataModelFieldBase
from datamodel_code_generator.types import DataType

BaseClassDataType: TypeAlias = Any
DataModel: TypeAlias = Any
DataModelFieldBase: TypeAlias = Any
DataType: TypeAlias = Any
else:
BaseClassDataType: TypeAlias = Any
DataModel: TypeAlias = Any
DataModelFieldBase: TypeAlias = Any
DataType: TypeAlias = Any

Reference: TypeAlias = Any
ModelId: TypeAlias = int
DataTypeId: TypeAlias = int
DataTypeRole = Literal["field", "base", "nested", "dict_key"]
_OrderedSetItem = TypeVar("_OrderedSetItem")
OrderedSet: TypeAlias = dict[_OrderedSetItem, None]
Reference: TypeAlias = Any
_PYDANTIC_V2_MODEL_MODULE_PREFIX = "datamodel_code_generator.model.pydantic_v2."

GENERATION_STORE_MUTATION_METHODS: frozenset[str] = frozenset({
Expand Down Expand Up @@ -196,7 +200,7 @@ def __setitem__(
index: SupportsIndex | slice,
item: Any | Iterable[Any],
) -> None: # ty: ignore[invalid-method-override]
super().__setitem__(index, item)
super().__setitem__(index, item) # ty: ignore[no-matching-overload]
self._invalidate()

@overload
Expand Down Expand Up @@ -798,7 +802,7 @@ def redirect_model_reference_users(
for child in model.reference.children[:]:
if id(_outermost_parent(child)) in model_ids and hasattr(child, "replace_reference"):
owner_models.append(self._owner_model_for_data_type(child))
child.replace_reference(new_reference)
child.replace_reference(new_reference) # ty: ignore[call-non-callable]
self._clear_imports_cache_for_models(owner_models)
self._invalidate_after_mutation()

Expand Down Expand Up @@ -866,8 +870,8 @@ def _owner_model_for_field(field_: DataModelFieldBase) -> DataModel | None:
return owner_model if hasattr(owner_model, "clear_imports_cache") else None

@staticmethod
def _owner_model_for_data_type(data_type: DataType) -> DataModel | None:
owner_model = _outermost_parent(data_type)
def _owner_model_for_data_type(data_type: object) -> Any:
owner_model: Any = _outermost_parent(data_type)
return owner_model if hasattr(owner_model, "clear_imports_cache") else None

@staticmethod
Expand Down
Loading