feat(core): add strict validation for with_vars conflicts(Fixes #688) - #689
Merged
Conversation
skxeve
approved these changes
Jun 19, 2026
skxeve
left a comment
Collaborator
There was a problem hiding this comment.
Thanks for your PR!
LGTM!
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.
Brief
Fixes #688
This PR introduces a strict validation (fail-fast mechanism) when merging
with_varsto prevent silent overwrites.Previously, if the same
with_varskey was defined in multiple places (e.g., across multiple common files passed toScenarioManager, or between global and step scopes), the framework silently overwrote the value. This PR updatesScenarioModeland_BaseWithVarsto explicitly raise anInvalidFormatexception whenever awith_varsconflict is detected.Note: The shallow-merge behavior for step
argumentsremains unchanged.Points to Check
InvalidFormatin_BaseWithVars._merge_static_varswhen there is a scope conflict between global and step levels.InvalidFormatinScenarioModel.mergewhen there is a globalwith_varsconflict across multiple files.InvalidFormatinScenarioModel._merge_stepwhen there is a step-levelwith_varsconflict across multiple files.Test
Confirmed
Updated
test_model.pyto cover both normal scenarios (successful merges without overlaps) and abnormal scenarios (triggeringInvalidFormatonwith_varsconflicts). All tests andlint.shchecks (including Black, isort, and flake8) passed successfully.Review Limit