-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Fix: Prevent name collision between coords and data variables #7794
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
twiecki
wants to merge
2
commits into
main
Choose a base branch
from
fix-duplicate-tests-7788
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -948,6 +948,11 @@ def add_coord( | |||||
FutureWarning, | ||||||
) | ||||||
|
||||||
if name in self.named_vars: | ||||||
raise ValueError( | ||||||
f"Name '{name}' already exists as a variable name in the model. Please choose a different name for the dimension." | ||||||
) | ||||||
|
||||||
if name in {"draw", "chain", "__sample__"}: | ||||||
raise ValueError( | ||||||
"Dimensions can not be named `draw`, `chain` or `__sample__`, " | ||||||
|
@@ -1463,6 +1468,10 @@ def add_named_variable(self, var, dims: tuple[str | None, ...] | None = None): | |||||
""" | ||||||
if var.name is None: | ||||||
raise ValueError("Variable is unnamed.") | ||||||
if var.name in self.coords: | ||||||
raise ValueError( | ||||||
f"Name '{var.name}' already exists as a coordinate name in the model. Please choose a different name for the variable." | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
) | ||||||
if self.named_vars.tree_contains(var.name): | ||||||
raise ValueError(f"Variable name {var.name} already exists.") | ||||||
|
||||||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -99,6 +99,16 @@ def test_setattr_properly_works(self): | |
assert len(submodel.value_vars) == 2 | ||
assert len(model.value_vars) == 3 | ||
|
||
def test_name_conflict_variable_and_coord(self): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. wrong test class to put this test in, this is for nested models tests |
||
with pm.Model(coords={"test_name": [1, 2, 3]}) as model1: | ||
with pytest.raises(ValueError, match="already exists as a coordinate name"): | ||
pm.Data("test_name", [4, 5, 6]) | ||
|
||
with pm.Model() as model2: | ||
pm.Data("another_name", [7, 8, 9]) | ||
with pytest.raises(ValueError, match="already exists as a variable name"): | ||
model2.add_coord("another_name", [10, 11, 12]) | ||
|
||
def test_context_passes_vars_to_parent_model(self): | ||
with pm.Model() as model: | ||
assert pm.model.modelcontext(None) == model | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] The collision check logic in
add_coord
andadd_named_variable
is duplicated. Consider extracting a shared helper method to centralize name‐conflict validation and maintain consistent error messages.Copilot uses AI. Check for mistakes.