Resolve =replace= when it lands on an empty target - #322
Closed
julien-gadonneix wants to merge 2 commits into
Closed
julien-gadonneix wants to merge 2 commits into
julien-gadonneix wants to merge 2 commits into
Conversation
ConfDict.ops.REPLACE was only consumed when the target subtree was
truthy, so replacing a missing, null or empty subtree left the marker
in the config as data, later tripping model validation ("=replace=:
Extra inputs are not permitted").
Ops are now resolved when a patch is applied (update) and left pending
when one is merely materialized (__init__, from_yaml, list items),
which is what carrying a =replace= inside a grid value relies on.
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
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.
ConfDict.ops.REPLACEis only consumed when the target subtree is truthy:So replacing a subtree that is missing,
nullor empty leaves the marker in the config as data, which later surfaces as=replace=: Extra inputs are not permittedwhen the config reaches a pydantic model.This regressed in #310; before it, the marker was always popped. It also sits oddly with #311 ("an empty mapping is a value like any other") — an empty target is a value, so replacing it should resolve.
Dropping the
self andguard alone breaks carrying a pending=replace=inside a grid value, so instead ops are resolved when a patch is applied (update) and left pending when one is merely materialized (__init__,from_yaml, list items).to_uidstill rejects unresolved ops.pytest exca/test_confdict.pypasses, plus two new tests.Made with Cursor