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

Replace ... usage with a MISSING sentinel for clarity in nodes_logic.py

Browse Source
This commit is contained in:
Jedrzej Kosinski 2025-12-03 16:04:27 -08:00
parent 154bf49204
commit 23cd5bbe0e
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
comfy_extras/nodes_logic.py
View File

@ -3,6 +3,8 @@ from typing_extensions import override
from comfy_api.latest import ComfyExtension, io from comfy_api.latest import ComfyExtension, io
from comfy_api.latest import _io from comfy_api.latest import _io
# sentinel for missing inputs
MISSING = object()
class SwitchNode(io.ComfyNode): class SwitchNode(io.ComfyNode):
@ -25,14 +27,14 @@ class SwitchNode(io.ComfyNode):
) )
@classmethod @classmethod
def check_lazy_status(cls, switch, on_false=..., on_true=...): def check_lazy_status(cls, switch, on_false=MISSING, on_true=MISSING):
# We use ... instead of None, as None is passed for connected-but-unevaluated inputs. # We use MISSING 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(). # 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 # One of the inputs may be missing, in which case we need to evaluate the other input
if on_false is ...: if on_false is MISSING:
return ["on_true"] return ["on_true"]
if on_true is ...: if on_true is MISSING:
return ["on_false"] return ["on_false"]
# Normal lazy switch operation # Normal lazy switch operation
if switch and on_true is None: if switch and on_true is None:
@ -41,18 +43,18 @@ class SwitchNode(io.ComfyNode):
return ["on_false"] return ["on_false"]
@classmethod @classmethod
def validate_inputs(cls, switch, on_false=..., on_true=...): def validate_inputs(cls, switch, on_false=MISSING, on_true=MISSING):
# This check happens before check_lazy_status(), so we can eliminate the case where # This check happens before check_lazy_status(), so we can eliminate the case where
# both inputs are missing. # both inputs are missing.
if on_false is ... and on_true is ...: if on_false is MISSING and on_true is MISSING:
return "At least one of on_false or on_true must be connected to Switch node" return "At least one of on_false or on_true must be connected to Switch node"
return True return True
@classmethod @classmethod
def execute(cls, switch, on_true=..., on_false=...) -> io.NodeOutput: def execute(cls, switch, on_true=MISSING, on_false=MISSING) -> io.NodeOutput:
if on_true is ...: if on_true is MISSING:
return io.NodeOutput(on_false) return io.NodeOutput(on_false)
if on_false is ...: if on_false is MISSING:
return io.NodeOutput(on_true) 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)