Skip to content

fix: Support discriminators that map multiple keys to the same schema component BNCH-37105 #108

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
merged 1 commit into from
Feb 17, 2022
Merged

fix: Support discriminators that map multiple keys to the same schema component BNCH-37105 #108

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
20 changes: 8 additions & 12 deletions openapi_python_client/parser/properties/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,15 +432,7 @@ def build_union_property(
*, data: oai.Schema, name: str, required: bool, schemas: Schemas, parent_name: str
) -> Tuple[Union[UnionProperty, PropertyError], Schemas]:
sub_properties: List[Property] = []
inverted_mappings = {}
for k, v in (data.discriminator.mapping if data.discriminator else {}).items():
class_name = Reference.from_ref(v).class_name
if class_name in inverted_mappings:
raise ArgumentError(
f"Mapping more than one name to a class is currently not supported (class: {class_name})."
)
inverted_mappings[Reference.from_ref(v).class_name] = k
discriminator_mappings: Dict[str, Property] = {}
reference_name_to_subprop = {}
for sub_prop_data in chain(data.anyOf, data.oneOf):
sub_prop, schemas = property_from_data(
name=name, required=required, data=sub_prop_data, schemas=schemas, parent_name=parent_name
Expand All @@ -450,9 +442,13 @@ def build_union_property(

sub_properties.append(sub_prop)
if data.discriminator is not None:
discriminated_by = inverted_mappings.get(sub_prop.reference.class_name)
if discriminated_by is not None:
discriminator_mappings[discriminated_by] = sub_prop
reference_name_to_subprop[sub_prop.reference.class_name] = sub_prop

discriminator_mappings: Dict[str, Property] = {}
if data.discriminator is not None:
for k, v in (data.discriminator.mapping if data.discriminator else {}).items():
ref_class_name = Reference.from_ref(v).class_name
discriminator_mappings[k] = reference_name_to_subprop[ref_class_name]

default = convert_chain((prop._type_string for prop in sub_properties), data.default)
return (
Expand Down