Remove unnecessary logic for definitions schema gen with discriminated unions #8951
Conversation
This file contains hidden or 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
Deploying with
|
| Latest commit: |
0717cb4
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://4f8005f6.pydantic-docs2.pages.dev |
| Branch Preview URL: | https://test-alternative-fix.pydantic-docs2.pages.dev |
sydney-runkle
changed the title
CodSpeed Performance ReportMerging #8951 will not alter performanceComparing Summary
|
sydney-runkle
commented
Mar 5, 2024
Comment on lines
+38
to
+41
| # We recursively walk through the `schema` passed to `apply_discriminators`, applying discriminators | ||
| # where necessary at each level. During this recursion, we allow references to be resolved from the definitions | ||
| # that are originally present on the original, outermost `schema`. Before `apply_discriminators` is called, | ||
| # `simplify_schema_references` is called on the schema (in the `clean_schema` function), |
There was a problem hiding this comment.
Just making this a bit more clear
sydney-runkle
commented
Mar 5, 2024
| @@ -55,7 +55,7 @@ def inner(s: core_schema.CoreSchema, recurse: _core_utils.Recurse) -> core_schem | |||
| s = apply_discriminator(s, discriminator, global_definitions) | |||
| return s | |||
|
|
|||
| return simplify_schema_references(_core_utils.walk_core_schema(schema, inner)) | |||
| return _core_utils.walk_core_schema(schema, inner) | |||
There was a problem hiding this comment.
Woohoo! Performance benefit!
adriangb
approved these changes
Mar 5, 2024
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.
Alternative to #8950.
This breaks the test modified in #7646, though I'm not entirely convinced that's a bad thing. I don't understand the use case where we'd have a dangling ref in an inner schema by the time that we get to the
apply_discriminatorsfunction call, as we've already calledsimplify_schema_referenceswithin theclean_schemafunction...Would love some feedback @adriangb!
Update -- modified the test from #7646 that was failing, as this use case doesn't seem plausible. This changes our discriminated union application logic such that now we:
Instead of previously, what we were doing: