Skip to content
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.

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

[python] Fix Circular imports on inherited discriminators. #17886

Merged
merged 12 commits into from
Feb 20, 2024

Conversation

fa0311
Copy link
Contributor

@fa0311 fa0311 commented Feb 18, 2024

Same as #17882, but passed type analysis and added a test

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh ./bin/configs/*.yaml
    ./bin/utils/export_docs_generators.sh
    
    (For Windows users, please run the script in Git BASH)
    Commit all changed files.
    This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
    These must match the expectations made by your contribution.
    You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
    IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
  • File the PR against the correct branch: master (upcoming 7.1.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@cbornet (2017/09) @tomplus (2018/10) @krjakbrjak (2023/02) @fa0311 (2023/10) @multani (2023/10)

@fa0311 fa0311 changed the title [python] [python] Fix Circular imports on inherited discriminators. [python] Fix Circular imports on inherited discriminators. Feb 18, 2024
@@ -10,6 +10,16 @@ import json
{{{.}}}
{{/vendorExtensions.x-py-model-imports}}

{{#hasChildren}}{{#discriminator}}
Copy link
Member

@wing328 wing328 Feb 19, 2024

Choose a reason for hiding this comment

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

thanks for the PR.

minor suggestions:

  1. use the following to avoid the empty line break

{{#hasChildren}}
{{#discriminator}}
...
{{/discriminator}}
{{/hasChildren}}

  1. for line 22 (empty line), move it between line 20 and 21 so that it will only be included when both hasChilden and discriminator are non-emtpy (or true)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This issue has been fixed.

@wing328
Copy link
Member

wing328 commented Feb 20, 2024

lgtm. thanks for the fix 👍

@wing328 wing328 merged commit ad08581 into OpenAPITools:master Feb 20, 2024
34 checks passed
@wing328 wing328 added this to the 7.4.0 milestone Feb 20, 2024
kota65535 pushed a commit to kota65535/openapi-generator that referenced this pull request Feb 23, 2024
…ols#17886)

* [python] add inheritance discriminators test OpenAPITools#16808

* [python] update samples

* [python] fix assert in test

* [python] fix inheritance discriminators circular import

* [python] update samples

* [python] undo type changes related to discriminator

* [python] remove extraneous processing

* [python-pydantic-v1] fix inheritance discriminators circular import

* [python] remove type ignore comment

* [python] update samples

* [python] fix avoid the empty line break

* [python] update samples
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants