zlei6/ComfyUI
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI.git synced 2026-08-24 18:10:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename and refactor io.List to io.DynamicGroup

Browse Source
This commit is contained in:
Talmaj Marinc
2026-06-24 22:17:01 +02:00
parent a1aaa1825d
commit 4cc4d944e7
2 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
tests-unit/comfy_api_test/io_list_test.py → tests-unit/comfy_api_test/io_dynamic_group_test.py
View File

@@ -1,4 +1,4 @@
"""Unit tests for io.List: expansion/reconstruction (0-row and N-row cases)."""
"""Unit tests for io.DynamicGroup: expansion/reconstruction (0-row and N-row cases)."""
import sys
import types
import pytest
@@ -10,7 +10,7 @@ if "torch" not in sys.modules:
sys.modules["torch"] = _torch_stub
from comfy_api.latest._io import ( # noqa: E402
List,
DynamicGroup,
Float,
Int,
String,
@@ -29,12 +29,12 @@ setup_dynamic_input_funcs()
# Helpers
# ---------------------------------------------------------------------------
def _make_class_inputs(list_input: List.Input) -> dict:
"""Wrap a List.Input into the required/optional dict structure."""
return create_input_dict_v1([list_input])
def _make_class_inputs(group_input: DynamicGroup.Input) -> dict:
"""Wrap a DynamicGroup.Input into the required/optional dict structure."""
return create_input_dict_v1([group_input])
def _run(list_input: List.Input, live_values: dict) -> dict:
def _run(group_input: DynamicGroup.Input, live_values: dict) -> dict:
"""End-to-end helper: expand schema + reconstruct values.
Mirrors the production split in execution.py:
@@ -44,7 +44,7 @@ def _run(list_input: List.Input, live_values: dict) -> dict:
The two steps are separate in production because the engine resolves
linked node outputs between them, but in tests we supply values directly.
"""
class_inputs = _make_class_inputs(list_input)
class_inputs = _make_class_inputs(group_input)
_, _, v3_data = get_finalized_class_inputs(class_inputs, live_values)
return build_nested_inputs(dict(live_values), v3_data)
@@ -53,9 +53,9 @@ def _run(list_input: List.Input, live_values: dict) -> dict:
# Schema construction
# ---------------------------------------------------------------------------
class TestListInputConstruction:
class TestDynamicGroupInputConstruction:
def test_basic_construction(self):
inp = List.Input(
inp = DynamicGroup.Input(
"loras",
template=[
Float.Input("strength", default=1.0),
@@ -70,7 +70,7 @@ class TestListInputConstruction:
assert len(inp.template) == 2
def test_get_all_includes_self_and_template(self):
inp = List.Input(
inp = DynamicGroup.Input(
"items",
template=[Float.Input("value")],
)
@@ -79,7 +79,7 @@ class TestListInputConstruction:
assert all_inputs[1].id == "value"
def test_as_dict_has_template_min_max(self):
inp = List.Input(
inp = DynamicGroup.Input(
"items",
template=[Float.Input("val", default=0.5)],
min=1,
@@ -92,32 +92,32 @@ class TestListInputConstruction:
def test_duplicate_field_ids_raises(self):
with pytest.raises(AssertionError):
List.Input(
DynamicGroup.Input(
"bad",
template=[Float.Input("x"), Float.Input("x")],
)
def test_empty_template_raises(self):
with pytest.raises(AssertionError):
List.Input("bad", template=[])
DynamicGroup.Input("bad", template=[])
def test_min_gt_max_raises(self):
with pytest.raises(AssertionError):
List.Input("bad", template=[Float.Input("x")], min=5, max=3)
DynamicGroup.Input("bad", template=[Float.Input("x")], min=5, max=3)
def test_max_exceeds_limit_raises(self):
with pytest.raises(AssertionError):
List.Input("bad", template=[Float.Input("x")], max=101)
DynamicGroup.Input("bad", template=[Float.Input("x")], max=101)
def test_dynamic_input_in_template_raises(self):
with pytest.raises(AssertionError):
List.Input(
DynamicGroup.Input(
"bad",
template=[List.Input("nested", template=[Float.Input("x")])],
template=[DynamicGroup.Input("nested", template=[Float.Input("x")])],
)
def test_validate_calls_through(self):
inp = List.Input("items", template=[Float.Input("val", min=-1.0, max=1.0)])
inp = DynamicGroup.Input("items", template=[Float.Input("val", min=-1.0, max=1.0)])
inp.validate() # should not raise
@@ -128,12 +128,12 @@ class TestListInputConstruction:
class TestZeroRows:
def test_empty_live_inputs_produces_empty_list(self):
"""With min=0 and no live values, the result should be an empty list."""
inp = List.Input("loras", template=[Float.Input("strength", default=1.0)], min=0, max=10)
inp = DynamicGroup.Input("loras", template=[Float.Input("strength", default=1.0)], min=0, max=10)
assert _run(inp, {}).get("loras") == []
def test_min_zero_with_values(self):
"""min=0 but 2 rows of live data."""
inp = List.Input("loras", template=[Float.Input("strength", default=1.0)], min=0, max=10)
inp = DynamicGroup.Input("loras", template=[Float.Input("strength", default=1.0)], min=0, max=10)
result = _run(inp, {"loras.0.strength": 0.8, "loras.1.strength": 0.5})
assert result["loras"] == [{"strength": 0.8}, {"strength": 0.5}]
@@ -145,7 +145,7 @@ class TestZeroRows:
class TestNRows:
def test_two_rows_two_fields(self):
"""Two rows with two fields each produce a list[dict]."""
inp = List.Input(
inp = DynamicGroup.Input(
"loras",
template=[String.Input("lora_name"), Float.Input("strength", default=1.0)],
min=0, max=50,
@@ -161,13 +161,13 @@ class TestNRows:
def test_rows_are_sorted_by_index(self):
"""Rows must be in ascending index order even if dict iteration is unordered."""
inp = List.Input("items", template=[Int.Input("v", default=0)], min=0, max=10)
inp = DynamicGroup.Input("items", template=[Int.Input("v", default=0)], min=0, max=10)
result = _run(inp, {"items.0.v": 10, "items.2.v": 30, "items.1.v": 20})
assert [row["v"] for row in result["items"]] == [10, 20, 30]
def test_min_rows_schema_slots(self):
"""With min=2 and no live data, 2 slots must appear in the expanded schema."""
inp = List.Input("items", template=[Float.Input("val", default=0.0)], min=2, max=5)
inp = DynamicGroup.Input("items", template=[Float.Input("val", default=0.0)], min=2, max=5)
out, _, _ = get_finalized_class_inputs(_make_class_inputs(inp), {})
all_slots = {**out.get("required", {}), **out.get("optional", {})}
assert "items.0.val" in all_slots
@@ -176,28 +176,28 @@ class TestNRows:
def test_min_rows_reconstructs_when_no_values(self):
"""min=2 with NO live values must still yield a 2-element list,
not collapse to [] (regression: parent-path clobber)."""
inp = List.Input("items", template=[Float.Input("val", default=0.0)], min=2, max=5)
inp = DynamicGroup.Input("items", template=[Float.Input("val", default=0.0)], min=2, max=5)
result = _run(inp, {})
assert len(result["items"]) == 2
assert all("val" in row for row in result["items"])
def test_min_rows_reconstructs_with_partial_values(self):
"""min=2 with only the first row's value present still yields 2 rows."""
inp = List.Input("items", template=[Float.Input("val", default=0.0)], min=2, max=5)
inp = DynamicGroup.Input("items", template=[Float.Input("val", default=0.0)], min=2, max=5)
result = _run(inp, {"items.0.val": 0.7})
assert len(result["items"]) == 2
assert result["items"][0]["val"] == 0.7
assert result["items"][1]["val"] is None
def test_list_paths_in_v3_data(self):
"""list_paths must contain the list id so build_nested_inputs knows to convert."""
inp = List.Input("things", template=[Boolean.Input("flag")], min=0, max=5)
"""list_paths must contain the group id so build_nested_inputs knows to convert."""
inp = DynamicGroup.Input("things", template=[Boolean.Input("flag")], min=0, max=5)
_, _, v3_data = get_finalized_class_inputs(_make_class_inputs(inp), {})
assert "things" in v3_data.get("list_paths", set())
def test_no_leftover_flat_keys(self):
"""Flat keys must be consumed; only the reconstructed list remains."""
inp = List.Input("rows", template=[Float.Input("x", default=0.0)], min=0, max=5)
inp = DynamicGroup.Input("rows", template=[Float.Input("x", default=0.0)], min=0, max=5)
result = _run(inp, {"rows.0.x": 1.0, "rows.1.x": 2.0})
assert "rows.0.x" not in result
assert "rows.1.x" not in result