mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-06-12 17:27:26 +08:00
2c0821bed7
- Harden EagerEval.validate with type checks and strip() for empty strings - Add _positional_alias for spreadsheet-style names beyond z (aa, ab...) - Validate JSONata result is numeric before returning - Add jsonata to requirements.txt Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
91 lines
2.8 KiB
Python
91 lines
2.8 KiB
Python
"""Math expression node using JSONata for evaluation.
|
|
|
|
Provides a ComfyMathExpression node that evaluates JSONata expressions
|
|
against dynamically-grown numeric inputs. Supports frontend eager
|
|
evaluation via the eager_eval schema field.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import jsonata as jsonata_lib
|
|
from typing_extensions import override
|
|
|
|
from comfy_api.latest import ComfyExtension, io
|
|
|
|
|
|
def _positional_alias(index: int) -> str:
|
|
"""Convert 0-based index to spreadsheet-style column name: a..z, aa..az, ba..."""
|
|
s = ""
|
|
n = index
|
|
while True:
|
|
n, rem = divmod(n, 26)
|
|
s = chr(ord("a") + rem) + s
|
|
if n == 0:
|
|
break
|
|
n -= 1
|
|
return s
|
|
|
|
|
|
class MathExpressionNode(io.ComfyNode):
|
|
"""Evaluates a JSONata expression against dynamically-grown inputs."""
|
|
|
|
@classmethod
|
|
def define_schema(cls) -> io.Schema:
|
|
template = io.MatchType.Template(
|
|
"num", allowed_types=[io.Float, io.Int]
|
|
)
|
|
autogrow = io.Autogrow.TemplatePrefix(
|
|
input=io.MatchType.Input("value", template=template),
|
|
prefix="value",
|
|
min=1,
|
|
max=100,
|
|
)
|
|
return io.Schema(
|
|
node_id="ComfyMathExpression",
|
|
display_name="Math Expression",
|
|
category="math",
|
|
search_aliases=[
|
|
"expression", "formula", "calculate", "eval", "math"
|
|
],
|
|
inputs=[
|
|
io.String.Input("expression", default="a + b"),
|
|
io.Autogrow.Input("values", template=autogrow),
|
|
],
|
|
outputs=[
|
|
io.MatchType.Output(
|
|
template=template, display_name="result"
|
|
),
|
|
],
|
|
is_output_node=True,
|
|
eager_eval=io.EagerEval(expr_widget="expression"),
|
|
)
|
|
|
|
@classmethod
|
|
def execute(
|
|
cls, expression: str, values: io.Autogrow.Type
|
|
) -> io.NodeOutput:
|
|
context: dict = {}
|
|
for i, (key, val) in enumerate(values.items()):
|
|
context[_positional_alias(i)] = val # positional: a, b, c, ... aa, ab, ...
|
|
context[key] = val # also by input name: value0, value1, ...
|
|
context["values"] = list(values.values()) # for $sum(values) etc.
|
|
|
|
result = jsonata_lib.Jsonata(expression).evaluate(context)
|
|
if isinstance(result, bool) or not isinstance(result, (int, float)):
|
|
raise ValueError(
|
|
f"Math Expression must evaluate to a numeric result, got {type(result).__name__}."
|
|
)
|
|
return io.NodeOutput(
|
|
result, ui={"result": [result], "context": [context]}
|
|
)
|
|
|
|
|
|
class MathExtension(ComfyExtension):
|
|
@override
|
|
async def get_node_list(self) -> list[type[io.ComfyNode]]:
|
|
return [MathExpressionNode]
|
|
|
|
|
|
async def comfy_entrypoint() -> MathExtension:
|
|
return MathExtension()
|