diff --git a/tests/inference/test_execution.py b/tests/inference/test_execution.py index bb8cf2216..8ecd11c5b 100644 --- a/tests/inference/test_execution.py +++ b/tests/inference/test_execution.py @@ -106,7 +106,7 @@ class TestExecution: ]) async def client(self, request) -> Client: from comfy.cmd.execution import nodes - from .testing_nodes.testing_pack import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS + from .testing_pack import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS nodes.update(ExportedNodes(NODE_CLASS_MAPPINGS=NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS=NODE_DISPLAY_NAME_MAPPINGS)) lru_size, = request.param diff --git a/tests/inference/testing_nodes/__init__.py b/tests/inference/testing_nodes/__init__.py deleted file mode 100644 index 8b1378917..000000000 --- a/tests/inference/testing_nodes/__init__.py +++ /dev/null @@ -1 +0,0 @@ - diff --git a/tests/inference/testing_nodes/testing_pack/__init__.py b/tests/inference/testing_pack/__init__.py similarity index 98% rename from tests/inference/testing_nodes/testing_pack/__init__.py rename to tests/inference/testing_pack/__init__.py index dcc71659a..bb0dd71fe 100644 --- a/tests/inference/testing_nodes/testing_pack/__init__.py +++ b/tests/inference/testing_pack/__init__.py @@ -1,23 +1,23 @@ -from .specific_tests import TEST_NODE_CLASS_MAPPINGS, TEST_NODE_DISPLAY_NAME_MAPPINGS -from .flow_control import FLOW_CONTROL_NODE_CLASS_MAPPINGS, FLOW_CONTROL_NODE_DISPLAY_NAME_MAPPINGS -from .util import UTILITY_NODE_CLASS_MAPPINGS, UTILITY_NODE_DISPLAY_NAME_MAPPINGS -from .conditions import CONDITION_NODE_CLASS_MAPPINGS, CONDITION_NODE_DISPLAY_NAME_MAPPINGS -from .stubs import TEST_STUB_NODE_CLASS_MAPPINGS, TEST_STUB_NODE_DISPLAY_NAME_MAPPINGS - -# NODE_CLASS_MAPPINGS = GENERAL_NODE_CLASS_MAPPINGS.update(COMPONENT_NODE_CLASS_MAPPINGS) -# NODE_DISPLAY_NAME_MAPPINGS = GENERAL_NODE_DISPLAY_NAME_MAPPINGS.update(COMPONENT_NODE_DISPLAY_NAME_MAPPINGS) - -NODE_CLASS_MAPPINGS = {} -NODE_CLASS_MAPPINGS.update(TEST_NODE_CLASS_MAPPINGS) -NODE_CLASS_MAPPINGS.update(FLOW_CONTROL_NODE_CLASS_MAPPINGS) -NODE_CLASS_MAPPINGS.update(UTILITY_NODE_CLASS_MAPPINGS) -NODE_CLASS_MAPPINGS.update(CONDITION_NODE_CLASS_MAPPINGS) -NODE_CLASS_MAPPINGS.update(TEST_STUB_NODE_CLASS_MAPPINGS) - -NODE_DISPLAY_NAME_MAPPINGS = {} -NODE_DISPLAY_NAME_MAPPINGS.update(TEST_NODE_DISPLAY_NAME_MAPPINGS) -NODE_DISPLAY_NAME_MAPPINGS.update(FLOW_CONTROL_NODE_DISPLAY_NAME_MAPPINGS) -NODE_DISPLAY_NAME_MAPPINGS.update(UTILITY_NODE_DISPLAY_NAME_MAPPINGS) -NODE_DISPLAY_NAME_MAPPINGS.update(CONDITION_NODE_DISPLAY_NAME_MAPPINGS) -NODE_DISPLAY_NAME_MAPPINGS.update(TEST_STUB_NODE_DISPLAY_NAME_MAPPINGS) - +from .specific_tests import TEST_NODE_CLASS_MAPPINGS, TEST_NODE_DISPLAY_NAME_MAPPINGS +from .flow_control import FLOW_CONTROL_NODE_CLASS_MAPPINGS, FLOW_CONTROL_NODE_DISPLAY_NAME_MAPPINGS +from .util import UTILITY_NODE_CLASS_MAPPINGS, UTILITY_NODE_DISPLAY_NAME_MAPPINGS +from .conditions import CONDITION_NODE_CLASS_MAPPINGS, CONDITION_NODE_DISPLAY_NAME_MAPPINGS +from .stubs import TEST_STUB_NODE_CLASS_MAPPINGS, TEST_STUB_NODE_DISPLAY_NAME_MAPPINGS + +# NODE_CLASS_MAPPINGS = GENERAL_NODE_CLASS_MAPPINGS.update(COMPONENT_NODE_CLASS_MAPPINGS) +# NODE_DISPLAY_NAME_MAPPINGS = GENERAL_NODE_DISPLAY_NAME_MAPPINGS.update(COMPONENT_NODE_DISPLAY_NAME_MAPPINGS) + +NODE_CLASS_MAPPINGS = {} +NODE_CLASS_MAPPINGS.update(TEST_NODE_CLASS_MAPPINGS) +NODE_CLASS_MAPPINGS.update(FLOW_CONTROL_NODE_CLASS_MAPPINGS) +NODE_CLASS_MAPPINGS.update(UTILITY_NODE_CLASS_MAPPINGS) +NODE_CLASS_MAPPINGS.update(CONDITION_NODE_CLASS_MAPPINGS) +NODE_CLASS_MAPPINGS.update(TEST_STUB_NODE_CLASS_MAPPINGS) + +NODE_DISPLAY_NAME_MAPPINGS = {} +NODE_DISPLAY_NAME_MAPPINGS.update(TEST_NODE_DISPLAY_NAME_MAPPINGS) +NODE_DISPLAY_NAME_MAPPINGS.update(FLOW_CONTROL_NODE_DISPLAY_NAME_MAPPINGS) +NODE_DISPLAY_NAME_MAPPINGS.update(UTILITY_NODE_DISPLAY_NAME_MAPPINGS) +NODE_DISPLAY_NAME_MAPPINGS.update(CONDITION_NODE_DISPLAY_NAME_MAPPINGS) +NODE_DISPLAY_NAME_MAPPINGS.update(TEST_STUB_NODE_DISPLAY_NAME_MAPPINGS) + diff --git a/tests/inference/testing_nodes/testing_pack/conditions.py b/tests/inference/testing_pack/conditions.py similarity index 100% rename from tests/inference/testing_nodes/testing_pack/conditions.py rename to tests/inference/testing_pack/conditions.py diff --git a/tests/inference/testing_nodes/testing_pack/flow_control.py b/tests/inference/testing_pack/flow_control.py similarity index 100% rename from tests/inference/testing_nodes/testing_pack/flow_control.py rename to tests/inference/testing_pack/flow_control.py diff --git a/tests/inference/testing_nodes/testing_pack/specific_tests.py b/tests/inference/testing_pack/specific_tests.py similarity index 100% rename from tests/inference/testing_nodes/testing_pack/specific_tests.py rename to tests/inference/testing_pack/specific_tests.py diff --git a/tests/inference/testing_nodes/testing_pack/stubs.py b/tests/inference/testing_pack/stubs.py similarity index 100% rename from tests/inference/testing_nodes/testing_pack/stubs.py rename to tests/inference/testing_pack/stubs.py diff --git a/tests/inference/testing_nodes/testing_pack/tools.py b/tests/inference/testing_pack/tools.py similarity index 100% rename from tests/inference/testing_nodes/testing_pack/tools.py rename to tests/inference/testing_pack/tools.py diff --git a/tests/inference/testing_nodes/testing_pack/util.py b/tests/inference/testing_pack/util.py similarity index 100% rename from tests/inference/testing_nodes/testing_pack/util.py rename to tests/inference/testing_pack/util.py