-
Notifications
You must be signed in to change notification settings - Fork 13k
fix: make NodeReplaceManager.register() idempotent #13596
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
Kosinkadink
wants to merge
2
commits into
Comfy-Org:master
Choose a base branch
from
Kosinkadink:fix-node-replace-manager-idempotent
base: master
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.
+108
−2
Open
Changes from 1 commit
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
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 |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| """Tests for NodeReplaceManager registration behavior.""" | ||
| import sys | ||
| import types | ||
|
|
||
| # Stub `nodes` to avoid the heavy torch + ComfyUI import chain — register() | ||
| # only touches its own dict, so it doesn't actually need NODE_CLASS_MAPPINGS. | ||
| if "nodes" not in sys.modules: | ||
| _fake_nodes = types.ModuleType("nodes") | ||
| _fake_nodes.NODE_CLASS_MAPPINGS = {} | ||
| sys.modules["nodes"] = _fake_nodes | ||
|
|
||
| from app.node_replace_manager import NodeReplaceManager # noqa: E402 | ||
|
|
||
|
|
||
| class FakeNodeReplace: | ||
| """Lightweight stand-in for comfy_api.latest._io.NodeReplace.""" | ||
| def __init__(self, new_node_id, old_node_id, old_widget_ids=None, | ||
| input_mapping=None, output_mapping=None): | ||
| self.new_node_id = new_node_id | ||
| self.old_node_id = old_node_id | ||
| self.old_widget_ids = old_widget_ids | ||
| self.input_mapping = input_mapping | ||
| self.output_mapping = output_mapping | ||
|
|
||
|
|
||
| def test_register_adds_replacement(): | ||
| manager = NodeReplaceManager() | ||
| manager.register(FakeNodeReplace(new_node_id="NewNode", old_node_id="OldNode")) | ||
| assert manager.has_replacement("OldNode") | ||
| assert len(manager.get_replacement("OldNode")) == 1 | ||
|
|
||
|
|
||
| def test_register_allows_multiple_alternatives_for_same_old_node(): | ||
| """Different new_node_ids for the same old_node_id should all be kept.""" | ||
| manager = NodeReplaceManager() | ||
| manager.register(FakeNodeReplace(new_node_id="AltA", old_node_id="OldNode")) | ||
| manager.register(FakeNodeReplace(new_node_id="AltB", old_node_id="OldNode")) | ||
| replacements = manager.get_replacement("OldNode") | ||
| assert len(replacements) == 2 | ||
| assert {r.new_node_id for r in replacements} == {"AltA", "AltB"} | ||
|
|
||
|
|
||
| def test_register_is_idempotent_for_duplicate_pair(): | ||
| """Re-registering the same (old_node_id, new_node_id) should be a no-op.""" | ||
| manager = NodeReplaceManager() | ||
| manager.register(FakeNodeReplace(new_node_id="NewNode", old_node_id="OldNode")) | ||
| manager.register(FakeNodeReplace(new_node_id="NewNode", old_node_id="OldNode")) | ||
| manager.register(FakeNodeReplace(new_node_id="NewNode", old_node_id="OldNode")) | ||
| assert len(manager.get_replacement("OldNode")) == 1 | ||
|
|
||
|
|
||
| def test_register_idempotent_preserves_first_registration(): | ||
| """First registration wins; later duplicates with different mappings are ignored.""" | ||
| manager = NodeReplaceManager() | ||
| first = FakeNodeReplace( | ||
| new_node_id="NewNode", old_node_id="OldNode", | ||
| input_mapping=[{"new_id": "a", "old_id": "x"}], | ||
| ) | ||
| second = FakeNodeReplace( | ||
| new_node_id="NewNode", old_node_id="OldNode", | ||
| input_mapping=[{"new_id": "b", "old_id": "y"}], | ||
| ) | ||
| manager.register(first) | ||
| manager.register(second) | ||
| replacements = manager.get_replacement("OldNode") | ||
| assert len(replacements) == 1 | ||
| assert replacements[0] is first | ||
|
|
||
|
|
||
| def test_register_dedupe_does_not_affect_other_old_nodes(): | ||
| manager = NodeReplaceManager() | ||
| manager.register(FakeNodeReplace(new_node_id="NewA", old_node_id="OldA")) | ||
| manager.register(FakeNodeReplace(new_node_id="NewA", old_node_id="OldA")) | ||
| manager.register(FakeNodeReplace(new_node_id="NewB", old_node_id="OldB")) | ||
| assert len(manager.get_replacement("OldA")) == 1 | ||
| assert len(manager.get_replacement("OldB")) == 1 | ||
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.
Uh oh!
There was an error while loading. Please reload this page.