DynamicSlot: forbid AnyType inside list/MultiType when

Grouping AnyType with concrete types conflates the known-type case with
the unresolvable-wildcard case under one branch and muddies slotType.
AnyType must stand alone as when=io.AnyType so the two states stay
distinct in both dispatch and the serialized schema.

Amp-Thread-ID: https://ampcode.com/threads/T-019e8568-f382-743d-a97f-0de3ff29d501
Co-authored-by: Amp <amp@ampcode.com>
This commit is contained in:
Jedrzej Kosinski 2026-06-01 19:18:10 -07:00
parent 16dd7d115c
commit 346ee898cb
2 changed files with 25 additions and 1 deletions

View File

@ -1242,7 +1242,13 @@ class DynamicSlot(ComfyTypeI):
if isinstance(when, type) and issubclass(when, _ComfyType): if isinstance(when, type) and issubclass(when, _ComfyType):
return (when.io_type,) return (when.io_type,)
if isinstance(when, MultiType.Input): if isinstance(when, MultiType.Input):
return tuple(dict.fromkeys(t.io_type for t in when.io_types)) result = tuple(dict.fromkeys(t.io_type for t in when.io_types))
if "*" in result and len(result) > 1:
raise ValueError(
"DynamicSlot.Option: AnyType cannot be grouped with concrete types; "
"use a separate Option(when=io.AnyType, ...) instead"
)
return result
if isinstance(when, Iterable) and not isinstance(when, str): if isinstance(when, Iterable) and not isinstance(when, str):
types: list[str] = [] types: list[str] = []
for t in when: for t in when:
@ -1254,6 +1260,11 @@ class DynamicSlot(ComfyTypeI):
types.append(t.io_type) types.append(t.io_type)
if not types: if not types:
raise ValueError("DynamicSlot.Option: when=[] is not allowed; use when=None instead") raise ValueError("DynamicSlot.Option: when=[] is not allowed; use when=None instead")
if "*" in types and len(types) > 1:
raise ValueError(
"DynamicSlot.Option: AnyType cannot be grouped with concrete types; "
"use a separate Option(when=io.AnyType, ...) instead"
)
return tuple(types) return tuple(types)
raise ValueError( raise ValueError(
"DynamicSlot.Option: when must be None, a ComfyType class, a list of ComfyType classes, " "DynamicSlot.Option: when must be None, a ComfyType class, a list of ComfyType classes, "

View File

@ -69,6 +69,19 @@ def test_option_when_list_with_non_comfytype_rejected():
io.DynamicSlot.Option(when=[io.Image, "MASK"], inputs=[]) io.DynamicSlot.Option(when=[io.Image, "MASK"], inputs=[])
def test_option_when_list_with_anytype_rejected():
"""AnyType must stand alone — it represents the unresolvable-wildcard
state, not a concrete type that can share a branch with concrete types."""
with pytest.raises(ValueError, match="AnyType cannot be grouped"):
io.DynamicSlot.Option(when=[io.Image, io.AnyType], inputs=[])
def test_option_when_multitype_with_anytype_rejected():
mt = io.MultiType.Input("x", types=[io.Image, io.AnyType])
with pytest.raises(ValueError, match="AnyType cannot be grouped"):
io.DynamicSlot.Option(when=mt, inputs=[])
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# DynamicSlot.Input construction and serialization # DynamicSlot.Input construction and serialization
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------