Skip to content

fix: Fail when duplicate names are generated #336

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 9 commits into from
Feb 10, 2021
Merged

fix: Fail when duplicate names are generated #336

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4ccbce9
Fail on duplicate names
forest-benchling Feb 10, 2021
3f86bee
Use PropertyError
forest-benchling Feb 10, 2021
2655a8f
Remove else
forest-benchling Feb 10, 2021
bb4d8d5
Revert openAPI
forest-benchling Feb 10, 2021
bb66d55
Add test and remove enum check
forest-benchling Feb 10, 2021
8c4ff2d
Merge remote-tracking branch 'upstream/main' into forest-clash
forest-benchling Feb 10, 2021
e2a2b9b
Remove whitespace
forest-benchling Feb 10, 2021
9b53646
Add back whitespace
forest-benchling Feb 10, 2021
3ae0f18
Remove mocker
forest-benchling Feb 10, 2021
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
10 changes: 10 additions & 0 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 @@ -234,6 +234,10 @@ def _string_based_property(
)


class NameClashException(Exception):
pass


def build_model_property(
*, data: oai.Schema, name: str, schemas: Schemas, required: bool, parent_name: Optional[str]
) -> Tuple[Union[ModelProperty, PropertyError], Schemas]:
Expand Down Expand Up @@ -302,6 +306,9 @@ def build_model_property(
name=name,
additional_properties=additional_properties,
)
if prop.reference.class_name in schemas.models:
raise NameClashException(f'Attempted to generate duplicate models with name "{prop.reference.class_name}"')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should return a PropertyError here instead so our higher level error handling code can manage it rather than printing a stack trace.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍. Thanks for the review!


schemas = attr.evolve(schemas, models={**schemas.models, prop.reference.class_name: prop})
return prop, schemas

Expand Down Expand Up @@ -374,6 +381,9 @@ def build_enum_property(
values=values,
value_type=value_type,
)
if prop.reference.class_name in schemas.enums:
raise NameClashException(f'Attempted to generate duplicate enums with name "{prop.reference.class_name}"')

schemas = attr.evolve(schemas, enums={**schemas.enums, prop.reference.class_name: prop})
return prop, schemas

Expand Down