From 52fa16df185cd316f68c6e7e4ace1c55cdecbe20 Mon Sep 17 00:00:00 2001 From: Agustin Abreu Date: Thu, 11 Jan 2024 11:29:50 -0300 Subject: [PATCH 1/3] making extra_pnginfo argument optional. ComfyUI does not send the argument at all when using the API, and is making MathExpression node to crash --- py/math_expression.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/math_expression.py b/py/math_expression.py index aa7a17a..385eed2 100644 --- a/py/math_expression.py +++ b/py/math_expression.py @@ -130,7 +130,7 @@ class MathExpression: return target.shape[2] return target.shape[1] - def evaluate(self, expression, extra_pnginfo, prompt, a=None, b=None, c=None): + def evaluate(self, expression, prompt, extra_pnginfo={}, a=None, b=None, c=None): expression = expression.replace('\n', ' ').replace('\r', '') node = ast.parse(expression, mode='eval').body From 75d79f2b1acc2ec1cdefda9c86d3c883bcbc9838 Mon Sep 17 00:00:00 2001 From: mortael Date: Sun, 14 Jan 2024 00:19:58 +0100 Subject: [PATCH 2/3] Custom Colors on all selected nodes --- web/js/customColors.js | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/web/js/customColors.js b/web/js/customColors.js index 2975c87..660a79f 100644 --- a/web/js/customColors.js +++ b/web/js/customColors.js @@ -48,12 +48,25 @@ app.registerExtension({ }); picker.onchange = () => { if (activeNode) { - if (activeNode.constructor === LiteGraph.LGraphGroup) { - activeNode.color = picker.value; - } else { - activeNode.color = colorShade(picker.value, 20); - activeNode.bgcolor = picker.value; + const fApplyColor = function(node){ + if (picker.value) { + if (node.constructor === LiteGraph.LGraphGroup) { + node.color = picker.value; + } else { + node.color = colorShade(picker.value, 20); + node.bgcolor = picker.value; + } + } } + const graphcanvas = LGraphCanvas.active_canvas; + if (!graphcanvas.selected_nodes || Object.keys(graphcanvas.selected_nodes).length <= 1){ + fApplyColor(activeNode); + } else { + for (const i in graphcanvas.selected_nodes) { + fApplyColor(graphcanvas.selected_nodes[i]); + } + } + activeNode.setDirtyCanvas(true, true); } }; From 389c22ae8ee2fba13ff1db865dfbeb3dab7e89c5 Mon Sep 17 00:00:00 2001 From: mortael Date: Sun, 14 Jan 2024 00:22:39 +0100 Subject: [PATCH 3/3] let --- web/js/customColors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/js/customColors.js b/web/js/customColors.js index 660a79f..8138489 100644 --- a/web/js/customColors.js +++ b/web/js/customColors.js @@ -62,7 +62,7 @@ app.registerExtension({ if (!graphcanvas.selected_nodes || Object.keys(graphcanvas.selected_nodes).length <= 1){ fApplyColor(activeNode); } else { - for (const i in graphcanvas.selected_nodes) { + for (let i in graphcanvas.selected_nodes) { fApplyColor(graphcanvas.selected_nodes[i]); } }