Ensure __get_pydantic_json_schema__ always gets the schema passed down from a wrapping handler
#5876
Conversation
This file contains 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
adriangb
commented
May 26, 2023
Comment on lines
-493
to
-498
| with pytest.warns( | ||
| DeprecationWarning, | ||
| match=re.escape('The `schema_json` method is deprecated; use `model_json_schema` and json.dumps instead.'), | ||
| ): | ||
| schema_json = Model.schema_json(indent=2) | ||
| loaded_schema_json = json.loads(schema_json) |
There was a problem hiding this comment.
This just made no sense to have here
Deploying with
|
| Latest commit: |
d7a0527
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://e378669c.pydantic-docs2.pages.dev |
| Branch Preview URL: | https://get-json-schema-bug.pydantic-docs2.pages.dev |
|
please review |
dmontagu
reviewed
May 26, 2023
dmontagu
approved these changes
May 26, 2023
dmontagu
approved these changes
May 26, 2023
Unfortunately, no. This still needs the changes in #5861 but since we should fix this anyway I didn't bother trying that branch on top of these changes, etc. |
adriangb
commented
May 26, 2023
pydantic/_internal/_dataclasses.py
Outdated
Comment on lines
101
to
108
| schema = get_core_schema(cls, partial(gen_schema.generate_schema, from_dunder_get_core_schema=False)) | ||
| schema = get_core_schema( | ||
| cls, | ||
| CallbackGetCoreSchemaHandler( | ||
| partial(gen_schema.generate_schema_for_type, from_dunder_get_core_schema=False), | ||
| gen_schema.generate_schema, | ||
| ), | ||
| ) |
There was a problem hiding this comment.
We fixed this bug for BaseModel recently, just neglected to do so for dataclasses
Co-authored-by: David Montague <35119617+dmontagu@users.noreply.github.com>
adriangb
force-pushed
the
get-json-schema-bug
branch
from
7fd116d
to
01d8e91
Compare
|
please review |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Selected Reviewer: @dmontagu