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

Merge 1ff7347993 into 7bbf1e8169

Browse Source
This commit is contained in:
LaVie024 2026-05-09 14:33:02 +03:00 committed by GitHub
commit 648e3c3918
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
comfy_extras/nodes_math.py
View File

@ -63,7 +63,7 @@ class MathExpressionNode(io.ComfyNode):
@classmethod @classmethod
def define_schema(cls) -> io.Schema: def define_schema(cls) -> io.Schema:
autogrow = io.Autogrow.TemplateNames( autogrow = io.Autogrow.TemplateNames(
input=io.MultiType.Input("value", [io.Float, io.Int]), input=io.MultiType.Input("value", [io.Float, io.Int, io.Boolean]),
names=list(string.ascii_lowercase), names=list(string.ascii_lowercase),
min=1, min=1,
) )
@ -82,6 +82,7 @@ class MathExpressionNode(io.ComfyNode):
outputs=[ outputs=[
io.Float.Output(display_name="FLOAT"), io.Float.Output(display_name="FLOAT"),
io.Int.Output(display_name="INT"), io.Int.Output(display_name="INT"),
io.Boolean.Output(display_name="BOOL"),
], ],
) )
@ -97,7 +98,7 @@ class MathExpressionNode(io.ComfyNode):
result = simple_eval(expression, names=context, functions=MATH_FUNCTIONS) result = simple_eval(expression, names=context, functions=MATH_FUNCTIONS)
# bool check must come first because bool is a subclass of int in Python # bool check must come first because bool is a subclass of int in Python
if isinstance(result, bool) or not isinstance(result, (int, float)): if not isinstance(result, (int, float)):
raise ValueError( raise ValueError(
f"Math Expression '{expression}' must evaluate to a numeric result, " f"Math Expression '{expression}' must evaluate to a numeric result, "
f"got {type(result).__name__}: {result!r}" f"got {type(result).__name__}: {result!r}"
@ -106,7 +107,7 @@ class MathExpressionNode(io.ComfyNode):
raise ValueError( raise ValueError(
f"Math Expression '{expression}' produced a non-finite result: {result}" f"Math Expression '{expression}' produced a non-finite result: {result}"
) )
return io.NodeOutput(float(result), int(result)) return io.NodeOutput(float(result), int(result), bool(result))
class MathExtension(ComfyExtension): class MathExtension(ComfyExtension):

8
tests-unit/comfy_extras_test/nodes_math_test.py
View File

@ -124,9 +124,11 @@ class TestMathExpressionExecute:
with pytest.raises(Exception, match="not defined"): with pytest.raises(Exception, match="not defined"):
self._exec("str(a)", a=42) self._exec("str(a)", a=42)
def test_boolean_result_raises(self): def test_boolean_result(self):
with pytest.raises(ValueError, match="got bool"): result = self._exec("a > b", a=5, b=3)
self._exec("a > b", a=5, b=3) assert result[2] is True
result = self._exec("a > b", a=3, b=5)
assert result[2] is False
def test_empty_expression_raises(self): def test_empty_expression_raises(self):
with pytest.raises(ValueError, match="Expression cannot be empty"): with pytest.raises(ValueError, match="Expression cannot be empty"):