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
2 changes: 1 addition & 1 deletion src/datamodel_code_generator/parser/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1794,7 +1794,7 @@ def get_enum_from_base(
has_one_literal = True
if isinstance(discriminator_model, msgspec_model.Struct): # pragma: no cover
discriminator_model.add_base_class_kwarg("tag_field", f"'{field_name}'")
discriminator_model.add_base_class_kwarg("tag", discriminator_field.represented_default)
discriminator_model.add_base_class_kwarg("tag", repr(expected_value))
discriminator_field.extras["is_classvar"] = True
# Found the discriminator field, no need to keep looking
break
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# generated by datamodel-codegen:
# filename: discriminator_enum_single_value_msgspec.yaml
# timestamp: 2019-07-26T00:00:00+00:00

from __future__ import annotations

from typing import TypeAlias

from msgspec import Struct


class StartedEvent(Struct, tag_field='type', tag='started'):
pass


class StoppedEvent(Struct, tag_field='type', tag='stopped'):
pass


Event: TypeAlias = StartedEvent | StoppedEvent
31 changes: 31 additions & 0 deletions tests/data/openapi/discriminator_enum_single_value_msgspec.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
openapi: 3.1.0
info:
title: Repro
version: 0.0.1
paths: {}
components:
schemas:
Event:
discriminator:
propertyName: type
oneOf:
- $ref: '#/components/schemas/StartedEvent'
- $ref: '#/components/schemas/StoppedEvent'
StartedEvent:
type: object
properties:
type:
type: string
enum:
- started
required:
- type
StoppedEvent:
type: object
properties:
type:
type: string
enum:
- stopped
required:
- type
22 changes: 22 additions & 0 deletions tests/main/openapi/test_main_openapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,28 @@ def test_main_openapi_discriminator_enum_single_value_anyof_use_enum(output_file
)


def test_main_openapi_discriminator_enum_single_value_msgspec(output_file: Path) -> None:
"""Single-value enum discriminator is used as the msgspec tag."""
run_main_and_assert(
input_path=OPEN_API_DATA_PATH / "discriminator_enum_single_value_msgspec.yaml",
output_path=output_file,
input_file_type="openapi",
assert_func=assert_file_content,
expected_file=EXPECTED_OPENAPI_PATH / "discriminator" / "enum_single_value_msgspec.py",
extra_args=[
"--target-python-version",
"3.10",
"--output-model-type",
"msgspec.Struct",
"--enum-field-as-literal",
"all",
"--use-one-literal-as-default",
"--disable-warnings",
],
force_exec_validation=True,
)


def test_main_openapi_discriminator_with_properties(output_file: Path) -> None:
"""Test OpenAPI generation with discriminator properties."""
run_main_and_assert(
Expand Down
Loading