Invalidate static extraction on nested wildcard imports
This commit is contained in:
@@ -414,6 +414,34 @@ 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_nested_wildcard_import_invalidates_static_env_values(self):
|
||||||
|
source = '''
|
||||||
|
INPUTS = {
|
||||||
|
"required": {
|
||||||
|
"image": ("IMAGE",),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
if True:
|
||||||
|
from something import *
|
||||||
|
|
||||||
|
|
||||||
|
class NestedWildcardImportInputNode:
|
||||||
|
RETURN_TYPES = ("IMAGE",)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(cls):
|
||||||
|
return INPUTS
|
||||||
|
|
||||||
|
|
||||||
|
NODE_CLASS_MAPPINGS = {
|
||||||
|
"NestedWildcardImportInputNode": NestedWildcardImportInputNode,
|
||||||
|
}
|
||||||
|
'''
|
||||||
|
result = self._extract_source(source, "nested-wildcard-import-input-pack")
|
||||||
|
|
||||||
|
self.assertEqual({}, result["nodes"])
|
||||||
|
self.assertEqual("no_static_nodes", result["pack"]["status"])
|
||||||
|
|
||||||
def test_annotated_reassignment_invalidates_static_env_value(self):
|
def test_annotated_reassignment_invalidates_static_env_value(self):
|
||||||
source = '''
|
source = '''
|
||||||
def build_inputs():
|
def build_inputs():
|
||||||
@@ -763,6 +791,31 @@ from something import *
|
|||||||
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_nested_wildcard_import_invalidates_static_node_mapping(self):
|
||||||
|
source = '''
|
||||||
|
class NestedWildcardImportMappingNode:
|
||||||
|
RETURN_TYPES = ("IMAGE",)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(cls):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"image": ("IMAGE",),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
NODE_CLASS_MAPPINGS = {
|
||||||
|
"NestedWildcardImportMappingNode": NestedWildcardImportMappingNode,
|
||||||
|
}
|
||||||
|
if True:
|
||||||
|
from something import *
|
||||||
|
'''
|
||||||
|
result = self._extract_source(source, "nested-wildcard-import-mapping-pack")
|
||||||
|
|
||||||
|
self.assertEqual({}, result["nodes"])
|
||||||
|
self.assertEqual("no_static_nodes", result["pack"]["status"])
|
||||||
|
|
||||||
def test_dynamic_display_mapping_reassignment_falls_back_to_node_type(self):
|
def test_dynamic_display_mapping_reassignment_falls_back_to_node_type(self):
|
||||||
source = '''
|
source = '''
|
||||||
def build_displays():
|
def build_displays():
|
||||||
|
|||||||
@@ -251,6 +251,28 @@ def _assigned_names_in_control_flow(stmt):
|
|||||||
return names
|
return names
|
||||||
|
|
||||||
|
|
||||||
|
def _has_wildcard_import_in_control_flow(stmt):
|
||||||
|
found = False
|
||||||
|
|
||||||
|
class WildcardImportVisitor(ast.NodeVisitor):
|
||||||
|
def visit_FunctionDef(self, node):
|
||||||
|
return None
|
||||||
|
|
||||||
|
def visit_AsyncFunctionDef(self, node):
|
||||||
|
return None
|
||||||
|
|
||||||
|
def visit_ClassDef(self, node):
|
||||||
|
return None
|
||||||
|
|
||||||
|
def visit_ImportFrom(self, node):
|
||||||
|
nonlocal found
|
||||||
|
if _has_wildcard_import(node):
|
||||||
|
found = True
|
||||||
|
|
||||||
|
WildcardImportVisitor().visit(stmt)
|
||||||
|
return found
|
||||||
|
|
||||||
|
|
||||||
def _collect_module_env(tree):
|
def _collect_module_env(tree):
|
||||||
env = {}
|
env = {}
|
||||||
for stmt in tree.body:
|
for stmt in tree.body:
|
||||||
@@ -311,6 +333,9 @@ def _collect_module_env(tree):
|
|||||||
env.pop(name, None)
|
env.pop(name, None)
|
||||||
continue
|
continue
|
||||||
if isinstance(stmt, (ast.If, ast.For, ast.AsyncFor, ast.While, ast.Try, ast.With, ast.AsyncWith, ast.Match)):
|
if isinstance(stmt, (ast.If, ast.For, ast.AsyncFor, ast.While, ast.Try, ast.With, ast.AsyncWith, ast.Match)):
|
||||||
|
if _has_wildcard_import_in_control_flow(stmt):
|
||||||
|
env.clear()
|
||||||
|
continue
|
||||||
for name in _assigned_names_in_control_flow(stmt):
|
for name in _assigned_names_in_control_flow(stmt):
|
||||||
env.pop(name, None)
|
env.pop(name, None)
|
||||||
continue
|
continue
|
||||||
@@ -374,6 +399,8 @@ def _class_attr(cls, name, env):
|
|||||||
if isinstance(stmt, (ast.If, ast.For, ast.AsyncFor, ast.While, ast.Try, ast.With, ast.AsyncWith, ast.Match)):
|
if isinstance(stmt, (ast.If, ast.For, ast.AsyncFor, ast.While, ast.Try, ast.With, ast.AsyncWith, ast.Match)):
|
||||||
if name in _assigned_names_in_control_flow(stmt):
|
if name in _assigned_names_in_control_flow(stmt):
|
||||||
value = _INVALID
|
value = _INVALID
|
||||||
|
if _has_wildcard_import_in_control_flow(stmt):
|
||||||
|
value = _INVALID
|
||||||
continue
|
continue
|
||||||
if name in _bound_names(stmt):
|
if name in _bound_names(stmt):
|
||||||
value = _INVALID
|
value = _INVALID
|
||||||
@@ -468,6 +495,8 @@ def _final_module_dict(tree, env, name, value_converter):
|
|||||||
if isinstance(stmt, (ast.If, ast.For, ast.AsyncFor, ast.While, ast.Try, ast.With, ast.AsyncWith, ast.Match)):
|
if isinstance(stmt, (ast.If, ast.For, ast.AsyncFor, ast.While, ast.Try, ast.With, ast.AsyncWith, ast.Match)):
|
||||||
if name in _assigned_names_in_control_flow(stmt):
|
if name in _assigned_names_in_control_flow(stmt):
|
||||||
value = _INVALID
|
value = _INVALID
|
||||||
|
if _has_wildcard_import_in_control_flow(stmt):
|
||||||
|
value = _INVALID
|
||||||
continue
|
continue
|
||||||
if _has_wildcard_import(stmt):
|
if _has_wildcard_import(stmt):
|
||||||
value = _INVALID
|
value = _INVALID
|
||||||
|
|||||||
Reference in New Issue
Block a user