Skip to content

Fix: Model generation using oneOf, allOf & anyOf #1424

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

Open
egormanga wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Model generation using oneOf, allOf & anyOf #1424

Show file tree
Hide file tree
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
11 changes: 10 additions & 1 deletion openapi_python_client/parser/properties/union.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from typing import Any, ClassVar, cast

from attr import define, evolve
from deepmerge import always_merger

from ... import Config
from ... import schema as oai
Expand Down Expand Up @@ -74,6 +75,14 @@ def build(
else:
subscript = f"type_{i}"

sub_prop_data = oai.Schema.model_validate(always_merger.merge(
data.model_dump(exclude_unset=True),
sub_prop_data.model_dump(exclude_unset=True),
))
sub_prop_data.oneOf.clear()
sub_prop_data.allOf.clear()
sub_prop_data.anyOf.clear()

sub_prop, schemas = property_from_data(
name=f"{name}_{subscript}",
required=True,
Expand Down Expand Up @@ -144,7 +153,7 @@ def _get_inner_type_strings(self, json: bool) -> set[str]:
@staticmethod
def _get_type_string_from_inner_type_strings(inner_types: set[str]) -> str:
if len(inner_types) == 1:
return inner_types.pop()
return next(iter(inner_types))
return " | ".join(sorted(inner_types, key=lambda x: x.lower()))

def get_base_type_string(self) -> str:
Expand Down
16 changes: 15 additions & 1 deletion pdm.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencies = [
"httpx>=0.23.0,<0.29.0",
"ruamel.yaml>=0.18.6,<0.20.0",
"ruff>=0.2",
"deepmerge>=2.0",
]
name = "openapi-python-client"
version = "0.28.3"
Expand Down