Track chained input type aliases
This commit is contained in:
@@ -3880,6 +3880,58 @@ NODE_CLASS_MAPPINGS = {
|
|||||||
self.assertEqual({}, result["nodes"])
|
self.assertEqual({}, result["nodes"])
|
||||||
self.assertEqual("no_static_nodes", result["pack"]["status"])
|
self.assertEqual("no_static_nodes", result["pack"]["status"])
|
||||||
|
|
||||||
|
def test_input_types_chained_alias_observed_by_arbitrary_call_skips_node(self):
|
||||||
|
source = '''
|
||||||
|
class ChainedAliasObservedInputTypesNode:
|
||||||
|
RETURN_TYPES = ("IMAGE",)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(cls):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"image": ("IMAGE",),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
A = B = INPUT_TYPES
|
||||||
|
observe(A)
|
||||||
|
|
||||||
|
|
||||||
|
NODE_CLASS_MAPPINGS = {
|
||||||
|
"ChainedAliasObservedInputTypesNode": ChainedAliasObservedInputTypesNode,
|
||||||
|
}
|
||||||
|
'''
|
||||||
|
result = self._extract_source(source, "chained-alias-observed-input-types-pack")
|
||||||
|
|
||||||
|
self.assertEqual({}, result["nodes"])
|
||||||
|
self.assertEqual("no_static_nodes", result["pack"]["status"])
|
||||||
|
|
||||||
|
def test_input_types_chained_alias_used_as_callee_skips_node(self):
|
||||||
|
source = '''
|
||||||
|
class ChainedAliasCalleeInputTypesNode:
|
||||||
|
RETURN_TYPES = ("IMAGE",)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(cls):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"image": ("IMAGE",),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
A = B = INPUT_TYPES
|
||||||
|
A()
|
||||||
|
|
||||||
|
|
||||||
|
NODE_CLASS_MAPPINGS = {
|
||||||
|
"ChainedAliasCalleeInputTypesNode": ChainedAliasCalleeInputTypesNode,
|
||||||
|
}
|
||||||
|
'''
|
||||||
|
result = self._extract_source(source, "chained-alias-callee-input-types-pack")
|
||||||
|
|
||||||
|
self.assertEqual({}, result["nodes"])
|
||||||
|
self.assertEqual("no_static_nodes", result["pack"]["status"])
|
||||||
|
|
||||||
def test_input_types_default_observed_by_arbitrary_call_skips_node(self):
|
def test_input_types_default_observed_by_arbitrary_call_skips_node(self):
|
||||||
source = '''
|
source = '''
|
||||||
class DefaultObservedInputTypesNode:
|
class DefaultObservedInputTypesNode:
|
||||||
|
|||||||
@@ -1172,6 +1172,18 @@ def _input_types(cls, env, decorator_env):
|
|||||||
classmethod_shadowed = True
|
classmethod_shadowed = True
|
||||||
if isinstance(stmt, ast.Assign):
|
if isinstance(stmt, ast.Assign):
|
||||||
target_names = _assignment_target_names(stmt)
|
target_names = _assignment_target_names(stmt)
|
||||||
|
if len(stmt.targets) > 1 and _input_types_alias_sources(stmt.value, aliases):
|
||||||
|
target_aliases = []
|
||||||
|
for target in stmt.targets:
|
||||||
|
target_name = _alias_target_name(target)
|
||||||
|
if target_name is None:
|
||||||
|
value = _INVALID
|
||||||
|
target_aliases = []
|
||||||
|
break
|
||||||
|
target_aliases.append(target_name)
|
||||||
|
aliases.update(alias for alias in target_aliases if alias != "INPUT_TYPES")
|
||||||
|
if "INPUT_TYPES" not in target_names:
|
||||||
|
continue
|
||||||
if (
|
if (
|
||||||
len(stmt.targets) == 1
|
len(stmt.targets) == 1
|
||||||
and isinstance(stmt.targets[0], ast.Name)
|
and isinstance(stmt.targets[0], ast.Name)
|
||||||
|
|||||||
Reference in New Issue
Block a user