fix logic for merging object schemas within a property #1159
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
eli-bl
changed the title
eli-bl
force-pushed
the
issue1123-merge-model
branch
from
10cae28 to
e6cdf95
Compare
eli-bl
commented
Nov 5, 2024
| prop1: Property, | ||
| prop2: Property, | ||
| parent_name: str, | ||
| config: Config, |
There was a problem hiding this comment.
We need parent_name and config now because it might be necessary to generate a new inline schema.
eli-bl
commented
Nov 5, 2024
| optional_properties: list[Property] | None = None | ||
| additional_properties: Property | None = None | ||
| relative_imports: set[str] = field(factory=set) | ||
| lazy_imports: set[str] = field(factory=set) |
There was a problem hiding this comment.
This is similar to the _PropertyData class that previously existed just to be a return type for _process_properties. Since they were so close already, and ModelProperty also had all of these properties, I figured it made sense to encapsulate them and have ModelProperty just own an instance of this class. I added accessor methods so that model.required_properties still works as an alias for model.details.required_properties.
eli-bl
force-pushed
the
issue1123-merge-model
branch
from
fccd382 to
c363974
Compare
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.
Fixes #1123.
Details are as described in the changeset.
This is a breaking change only in cases where the previous logic was producing an unambiguously wrong result. That is, in the example shown in the changeset, any code that had previously relied on
ModelB.resultbeing an instance ofBaseResultrather thanExtendedResultwould now fail.