FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix: Model generation using `oneOf`, `anyOf` & `type` lists by egormanga · Pull Request #1424 · openapi-generators/openapi-python-client · GitHub

  1. openapi-generators
  2. openapi-python-client

Repository navigation

Fix: Model generation using oneOf, anyOf & type lists #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
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 0 Commits 1 Checks 1 Files changed
Open

Fix: Model generation using oneOf, anyOf & type lists #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 .lock  (1) .py  (2) .toml  (1) All 3 file types selected
Only manifest files
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
14 changes: 13 additions & 1 deletion openapi_python_client/parser/properties/union.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
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,17 @@ def build(
else:
subscript = f"type_{i}"

if isinstance(sub_prop_data, oai.Schema):
merged_data = oai.Schema.model_validate(always_merger.merge(
data.model_dump(exclude_unset=True),
sub_prop_data.model_dump(exclude_unset=True),
))
merged_data.oneOf = sub_prop_data.oneOf
merged_data.anyOf = sub_prop_data.anyOf
if getattr(sub_prop_data, 'type', None) is not None:
merged_data.type = sub_prop_data.type
sub_prop_data = merged_data

sub_prop, schemas = property_from_data(
name=f"{name}_{subscript}",
required=True,
Expand Down Expand Up @@ -144,7 +156,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
1 change: 1 addition & 0 deletions openapi_python_client/schema/openapi_schema_pydantic/reference.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class Reference(BaseModel):
model_config = ConfigDict(
extra="allow",
populate_by_name=True,
serialize_by_alias=True,
json_schema_extra={
"examples": [{"$ref": "#/components/schemas/Pet"}, {"$ref": "Pet.json"}, {"$ref": "definitions.json#/Pet"}]
},
Expand Down
16 changes: 15 additions & 1 deletion pdm.lock
Show comments
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
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
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
Back | FazBrowse Home | New Git URL