-
-
Notifications
You must be signed in to change notification settings - Fork 6.7k
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-fastapi] Fix additionalProperties support & support pydantic v2 #19312
base: master
Are you sure you want to change the base?
[python-fastapi] Fix additionalProperties support & support pydantic v2 #19312
Conversation
Previously additionalProperties were indented wrongly so that they appeared as a regular property. Also, adjust the controller code correspondingly. Depends on the openapi-generator PR OpenAPITools/openapi-generator#19312 (otherwise additionalProperties support does not work with the python-fastapi generator)
Thanks for the PR! I'll need something like this PR to move off python-pydantic-v1. I have a question about this bit:
Why remove |
The idea is to let the generated code fully leverage the fastapi/pydantic platform idioms, which include letting the route methods return typed objects that pydantic then maps and validates based on the type annotation. |
24b70a9
to
371a3e5
Compare
I updated the PR correspondingly but unfortunately this is still a breaking change since
I can look into making the adjustments some other evening. |
ab40757
to
e99c74f
Compare
f3161f8
to
66d1ff9
Compare
I like it! I anticipate using this as a client to replace python-pydantic-v1. Hopefully a maintainer can chime in/approve when you are ready! |
d83b593
to
001894e
Compare
c7c5cf9
to
25c7fb1
Compare
Don't let models inherit the value type of additionalProperties and arrays. This is to fix a bug where the `python-fastapi` server generator generated invalid models that inherited the value type specified within additionalProperties.
Previously, the generated `additional_properties` field showed up within the response of the generated API as opposed marshaling the model so that its fields are added to the root object. Apparently that is because pydantic v2 does not honour the generated `to_dict` methods anymore (which would have mapped the object to the correct representation) but, instead, supports additional properties natively by specifying `extra=allow` within the `model_config`. Correspondingly, the following changes have been applied: * To allow additional fields, specify `extra=allow` within the `model_config`. * Don't generate the `additional_properties` field - users can use pydantic's built-in `model.extra_fields` instead. * Let the `{to|from}_{dict|json}` methods delegate to Pydantic's `model_dump[_json]` methods.
Exclude unset fields when marshalling api endpoint response bodies.
a21cf90
to
4dcfb22
Compare
8ec521a
to
1605ab8
Compare
* Support oneOf and anyOf schemas the pydantic v2 way by generating them as Unions. * Generate model constructor that forcefully sets the discriminator field to ensure it is included in the marshalled representation.
1605ab8
to
94330f0
Compare
I also made the generator generate |
Epic! I hope a maintainer can review it for you soon. |
Came across this while looking to convert an OpenAPI spec to a Python client. Would really like to try this out, but not going to bother until Pydantic V2 support is released. Fingers crossed this PR gets merged soon. |
additionalProperties
schema (or the array item schema) but the pydanticBaseModel
.additionalProperties
the pydantic v2 way within__dict__
: Previously, the generatedadditional_properties
field showed up within the response of the generated API as opposed marshaling the model so that its fields are added to/embedded into the root object. Apparently that is because pydantic v2 does not honour the generatedto_dict
methods (which would have mapped the object to the correct representation) but, instead, supports additional properties natively by specifyingextra=allow
within themodel_config
. Correspondingly, the following changes have been applied:extra=allow
within themodel_config
.additional_properties
field but use__dict__
- users can use pydantic's built-inmodel.model_extra
instead.Don't generate the{to|from}_{dict|json}
methods since pydantic is taking care of the model mapping based on the declared fields andmodel_config
- users can use pydantic'smodel.model_dump[_json]
instead.{to|from}_{dict|json}
methods delegate to Pydantic'smodel_dump[_json]
methods.exclude_unset
response marshalling option in order to omit fields from the response that weren't explicitly set by the code. This is so that non-required fields don't show up withnull
values within the response (which would be invalid according to the OpenAPI spec, unless those fields are explicitly marked asnullable
within the OpenAPI schema).oneOf
andanyOf
schemas the Pydantic v2 way:RootModel
.Union
s and leave it to Pydantic to validate and figure out the type.exclude_unset
marshalling option being enabled).Closes #19311
Relates to #17703 (might also close that one)
Relates to #19454
cc @cbornet @tomplus @krjakbrjak @fa0311 @multani
PR checklist
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.
master
(upcoming 7.6.0 minor release - breaking changes with fallbacks),8.0.x
(breaking changes without fallbacks)