wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-12-23 21:10:49 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Make Switch node inputs optional, disallow both inputs from being missing, and still work properly with lazy; when one input is missing, use the other no matter what the switch is set to

Browse Source
This commit is contained in:
Jedrzej Kosinski 2025-11-21 22:27:59 -08:00
parent cb7e7a0ff3
commit 0fd3a87d60
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
comfy_extras/nodes_logic.py
View File

@ -15,8 +15,8 @@ class SwitchNode(io.ComfyNode):
is_experimental=True, is_experimental=True,
inputs=[ inputs=[
io.Boolean.Input("switch"), io.Boolean.Input("switch"),
io.MatchType.Input("on_false", template=template, lazy=True), io.MatchType.Input("on_false", template=template, lazy=True, optional=True),
io.MatchType.Input("on_true", template=template, lazy=True), io.MatchType.Input("on_true", template=template, lazy=True, optional=True),
], ],
outputs=[ outputs=[
io.MatchType.Output(template=template, display_name="output"), io.MatchType.Output(template=template, display_name="output"),
@ -24,14 +24,35 @@ class SwitchNode(io.ComfyNode):
) )
@classmethod @classmethod
def check_lazy_status(cls, switch, on_false=None, on_true=None): def check_lazy_status(cls, switch, on_false=..., on_true=...):
# We use ... instead of None, as None is passed for connected-but-unevaluated inputs.
# This trick allows us to ignore the value of the switch and still be able to run execute().
# One of the inputs may be missing, in which case we need to evaluate the other input
if on_false is ...:
return ["on_true"]
if on_true is ...:
return ["on_false"]
# Normal lazy switch operation
if switch and on_true is None: if switch and on_true is None:
return ["on_true"] return ["on_true"]
if not switch and on_false is None: if not switch and on_false is None:
return ["on_false"] return ["on_false"]
@classmethod @classmethod
def execute(cls, switch, on_true, on_false) -> io.NodeOutput: def validate_inputs(cls, switch, on_false=..., on_true=...):
# This check happens before check_lazy_status(), so we can eliminate the case where
# both inputs are missing.
if on_false is ... and on_true is ...:
return "At least one of on_false or on_true must be connected to Switch node"
return True
@classmethod
def execute(cls, switch, on_true=..., on_false=...) -> io.NodeOutput:
if on_true is ...:
return io.NodeOutput(on_false)
if on_false is ...:
return io.NodeOutput(on_true)
return io.NodeOutput(on_true if switch else on_false) return io.NodeOutput(on_true if switch else on_false)