Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions src/datamodel_code_generator/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,14 @@
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
from datamodel_code_generator.types import DataTypeManager, StrictTypes # noqa: TC001 - used by Pydantic at runtime
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]
Expand Down
10 changes: 10 additions & 0 deletions tests/data/expected/main/generate_config_union_mode.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# generated by datamodel-codegen:
# filename: <stdin>

from __future__ import annotations

from pydantic import BaseModel, Field


class Model(BaseModel):
value: str | int | None = Field(None, union_mode='left_to_right')
16 changes: 16 additions & 0 deletions tests/main/test_main_general.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from datamodel_code_generator.arguments import _dataclass_arguments
from datamodel_code_generator.config import GenerateConfig
from datamodel_code_generator.format import CodeFormatter, PythonVersion
from datamodel_code_generator.model.pydantic_v2 import UnionMode
from datamodel_code_generator.parser.openapi import OpenAPIParser
from tests.conftest import assert_output, create_assert_file_content, freeze_time
from tests.main.conftest import (
Expand Down Expand Up @@ -2062,6 +2063,21 @@ def test_generate_with_config_object(output_file: Path) -> None:
assert "user_name" in content


@pytest.mark.skipif(pydantic.VERSION < "2.0.0", reason="GenerateConfig requires Pydantic v2")
def test_generate_config_with_union_mode() -> None:
"""Test GenerateConfig with union_mode field."""
config = GenerateConfig(
output_model_type=DataModelType.PydanticV2BaseModel,
union_mode=UnionMode.left_to_right,
disable_timestamp=True,
)
result = generate(
input_='{"type": "object", "properties": {"value": {"anyOf": [{"type": "string"}, {"type": "integer"}]}}}',
config=config,
)
assert_output(result, EXPECTED_MAIN_PATH / "generate_config_union_mode.py")

Comment thread
coderabbitai[bot] marked this conversation as resolved.

@pytest.mark.skipif(pydantic.VERSION < "2.0.0", reason="GenerateConfig requires Pydantic v2")
def test_generate_with_config_and_kwargs_raises_error(output_file: Path) -> None:
"""Test generate() raises error when both config and kwargs are provided."""
Expand Down
Loading