Fail closed on dynamic mapping duplicate safety
This commit is contained in:
@@ -585,6 +585,70 @@ class DynamicDupNode:
|
||||
"namespace-alias-dunder-setitem-replacement-duplicate-node-pack",
|
||||
)
|
||||
|
||||
def test_dynamic_node_class_mapping_assignment_suppresses_static_duplicate_safety(self):
|
||||
source_a = '''
|
||||
class StaticDupNode:
|
||||
RETURN_TYPES = ("IMAGE",)
|
||||
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"image": ("IMAGE",),
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
NODE_CLASS_MAPPINGS = {
|
||||
"DupNode": StaticDupNode,
|
||||
}
|
||||
'''
|
||||
source_b = '''
|
||||
def build_mappings():
|
||||
return {"DupNode": object}
|
||||
|
||||
|
||||
NODE_CLASS_MAPPINGS = build_mappings()
|
||||
'''
|
||||
result = self._extract_two_sources(
|
||||
source_a,
|
||||
source_b,
|
||||
"dynamic-assignment-duplicate-safety-pack",
|
||||
)
|
||||
|
||||
self.assertEqual({}, result["nodes"])
|
||||
self.assertEqual("no_static_nodes", result["pack"]["status"])
|
||||
|
||||
def test_wildcard_import_suppresses_static_duplicate_safety(self):
|
||||
source_a = '''
|
||||
class StaticDupNode:
|
||||
RETURN_TYPES = ("IMAGE",)
|
||||
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"image": ("IMAGE",),
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
NODE_CLASS_MAPPINGS = {
|
||||
"DupNode": StaticDupNode,
|
||||
}
|
||||
'''
|
||||
source_b = '''
|
||||
from dynamic_nodes import *
|
||||
'''
|
||||
result = self._extract_two_sources(
|
||||
source_a,
|
||||
source_b,
|
||||
"wildcard-import-duplicate-safety-pack",
|
||||
)
|
||||
|
||||
self.assertEqual({}, result["nodes"])
|
||||
self.assertEqual("no_static_nodes", result["pack"]["status"])
|
||||
|
||||
def test_unsupported_reassignment_invalidates_static_env_value(self):
|
||||
source = '''
|
||||
def build_inputs():
|
||||
|
||||
@@ -2273,7 +2273,7 @@ def _node_class_mapping_mutation_string_keys(stmt, env, aliases=None, namespace_
|
||||
|
||||
def _node_class_mapping_keys(tree):
|
||||
if _has_module_wildcard_import(tree):
|
||||
return set()
|
||||
return _INVALID
|
||||
keys = set()
|
||||
env = {}
|
||||
class_bindings = {}
|
||||
@@ -2281,6 +2281,8 @@ def _node_class_mapping_keys(tree):
|
||||
namespace_aliases = set()
|
||||
for stmt in tree.body:
|
||||
if isinstance(stmt, ast.Assign) and _name_is_assigned(stmt, "NODE_CLASS_MAPPINGS"):
|
||||
if not isinstance(stmt.value, ast.Dict):
|
||||
return _INVALID
|
||||
literal_keys, literal_ambiguous = _literal_module_dict_string_keys_state(stmt.value, env)
|
||||
keys.update(literal_keys)
|
||||
if literal_ambiguous:
|
||||
@@ -2290,6 +2292,8 @@ def _node_class_mapping_keys(tree):
|
||||
and _name_is_assigned(stmt, "NODE_CLASS_MAPPINGS")
|
||||
and stmt.value is not None
|
||||
):
|
||||
if not isinstance(stmt.value, ast.Dict):
|
||||
return _INVALID
|
||||
literal_keys, literal_ambiguous = _literal_module_dict_string_keys_state(stmt.value, env)
|
||||
keys.update(literal_keys)
|
||||
if literal_ambiguous:
|
||||
|
||||
Reference in New Issue
Block a user