fix: Apply discriminator literals to allOf subtypes without field reference#101
Open
staging-devin-ai-integration[bot] wants to merge 1 commit intomainfrom
Open
fix: Apply discriminator literals to allOf subtypes without field reference#101staging-devin-ai-integration[bot] wants to merge 1 commit intomainfrom
staging-devin-ai-integration[bot] wants to merge 1 commit intomainfrom
Conversation
…erence When a schema has a discriminator and subtypes inherit from it via allOf, the discriminator literal types (e.g., Literal['cat']) should be applied to the subtypes even when the parent schema isn't referenced by any field. This follows the OpenAPI 3.1 spec example where Pet has a discriminator and Cat/Dog/Lizard extend it via allOf. Previously, the discriminator literal types were only applied when a field referenced the parent schema. Fixes koxudaxi#2528
dea4521 to
733e82a
Compare
Author
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
Note: I can only respond to comments from users who have write access to this repository. ⚙️ Control Options:
|
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
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.
Summary
Fixes koxudaxi#2528 - OpenAPI polymorphism with discriminator and allOf not working
When a schema has a discriminator and subtypes inherit from it via
allOf, the discriminator literal types (e.g.,Literal['cat']) should be applied to the subtypes even when the parent schema isn't referenced by any field.This follows the OpenAPI 3.1 spec example where Pet has a discriminator and Cat/Dog/Lizard extend it via allOf.
Problem
Previously, discriminator literal types were only applied when:
PetContainer.pet: Pet)__apply_discriminator_typeprocessingBut when schemas only use allOf inheritance without a containing field (the example from the spec), the discriminator literals were not applied.
Input Schema:
Before (incorrect):
After (correct):
Solution
Added a new method
_apply_allof_discriminator_to_modelsinOpenAPIParserthat:_collect_discriminator_schemas_process_single_moduleThe fix leverages the existing
_discriminator_schemasand_discriminator_subtypesdictionaries which were already being populated but not fully utilized.Testing
Added test case
test_main_openapi_discriminator_allof_standalonewith input schema and expected output matching the OpenAPI 3.1 spec example.All 29 existing discriminator-related tests continue to pass.
Notes