6.1

6.1

Author: chrisgoringe

README.md

@@ -75,57 +75,13 @@ UE nodes mostly work with group nodes. But there are a couple of important thing
 
 ## Latest updates
 
+6.1 (May 2025)
+- Mostly some bug-fixes (#216, #217, #300)
+- New option to show UE links differently without animation for better performance
+
 6.0 (April 2025)
 - Very major rebuild to deal with latest version of Comfy
 
-5.0 (6th August 2024)
-- Significant change to core logic. Should greatly reduce incompatibility issues, but may have unexpoected consequences!
-- Added to right-click menu on nodes the option to make a node reject all UE connections.
-
-4.9 (2nd May 2024)
-- Fix incompatibility with Efficiency Nodes (#182)
-
-4.8 (18th March 2024)
-- Group and color sending have a `send to unmatched` mode
-- UE link animations can be the classic dots, or a pulsing glow (or both, or neither)
-- Show UE links can now be on, off, mouseover, selected nodes, or mouseover and selected nodes
-
-4.7 (1st March 2024)
-- UE now works in group nodes
-- Autocomplete on `Anything Everywhere?` nodes
-
-4.6
-- add Group Regex to `Anything Everywhere?` node
-- if you have workflow json files saved that now don't work, try 'workflow_fixer.py'
-
-4.5
-- add support for Comfy UI Group Nodes (UE nodes can be used to connect to group node inputs and outputs, but not within a group node)
-- add `convert to real links`
-
-4.4
-- add (limited) support for converting regex in the `Anything Everywhere?` node with inputs (only works if the link is from a node that is a simple string source)
-
-4.3
-- added support for targetting [Highway nodes](https://github.com/chrisgoringe/cg-use-everywhere#highway-nodes) 
-
-4.2
-- improved performance of loop detection, especially with [highway nodes](https://github.com/Trung0246/ComfyUI-0246)
-- updated docs to not use other custom nodes in examples
-
-4.1.2
-- tweaks to improve handling of bypass 
-- fixed connecting to Seed Everywhere 
-
-4.1.1
-- added option to turn animation off
-
-4.1 
-
-- added [loop detection](https://github.com/chrisgoringe/cg-use-everywhere#loop-checking) 
-- added [group restriction](https://github.com/chrisgoringe/cg-use-everywhere#group-restriction).
-
-The v1 nodes have been fully removed. If you were using one, you can just replace it with an `Anything Everywhere` node.
-
 ## Installing
 
 Use Comfy Manager. If you really want to do it manually, just clone this repository in your custom_nodes directory.

__init__.py

@@ -1,6 +1,6 @@
 from .use_everywhere import SeedEverywhere, AnythingEverywherePrompts
 
-UE_VERSION = "6.0.4"
+UE_VERSION = "6.1"
 
 NODE_CLASS_MAPPINGS = { "Seed Everywhere": SeedEverywhere }
 

js/use_everywhere.js

@@ -2,7 +2,7 @@ import { app } from "../../scripts/app.js";
 import { api } from "../../scripts/api.js";
 
 import { is_UEnode, is_helper, inject, Logger, get_real_node, defineProperty, graphConverter } from "./use_everywhere_utilities.js";
-import { displayMessage, update_input_label, indicate_restriction } from "./use_everywhere_ui.js";
+import { update_input_label, indicate_restriction } from "./use_everywhere_ui.js";
 import { LinkRenderController } from "./use_everywhere_ui.js";
 import { GraphAnalyser } from "./use_everywhere_graph_analysis.js";
 import { node_menu_settings, canvas_menu_settings, non_ue_menu_settings, SETTINGS } from "./use_everywhere_settings.js";
@@ -127,8 +127,7 @@ app.registerExtension({
 
         node.IS_UE = is_UEnode(node);
         if (node.IS_UE) {
-            node.input_type = [undefined, undefined, undefined]; // for dynamic input types
-            node.displayMessage = displayMessage;                // receive messages from the python code           
+            node.input_type = [undefined, undefined, undefined]; // for dynamic input types       
 
             // If a widget on a UE node is edited, link list is dirty
             inject_outdating_into_objects(node.widgets,'callback',`widget callback on ${node.id}`);
@@ -161,17 +160,6 @@ app.registerExtension({
     },
 
 	async setup() {
-        /*
-        Listen for message-handler event from python code
-        */
-        function messageHandler(event) {
-            const id = event.detail.id;
-            const message = event.detail.message;
-            const node = get_real_node(id);
-            if (node && node.displayMessage) node.displayMessage(id, message);
-            else (console.log(`node ${id} couldn't handle a message`));
-        }
-        api.addEventListener("ue-message-handler", messageHandler);
 
         api.addEventListener("status", ({detail}) => {
             if (linkRenderController) linkRenderController.note_queue_size(detail ? detail.exec_info.queue_remaining : 0)
@@ -185,7 +173,7 @@ app.registerExtension({
                     graphConverter.store_node_input_map(data);
                 } catch (e) { Logger.log_error(Logger.ERROR, `in loadGraphData ${e}`); }
                 const cvw_was = settingsCache.getSettingValue("Comfy.Validation.Workflows")
-                if (settingsCache.getSettingValue("AE.block_graph_validation")) {
+                if (settingsCache.getSettingValue("Use Everywhere.Options.block_graph_validation")) {
                     app.ui.settings.setSettingValue("Comfy.Validation.Workflows", false);
                 }
                 original_loadGraphData.apply(this, arguments);
@@ -241,12 +229,6 @@ app.registerExtension({
                 Logger.log_error(Logger.ERROR, e)
             }
         }
-
-        /*
-        Add to the main settings 
-        now specified as a parameter of register
-        */
-        //main_menu_settings();
 
         /* 
         Canvas menu is the right click on backdrop.
@@ -271,10 +253,13 @@ app.registerExtension({
         TODO: Ought to delete this._widgetNameMap when widgets are added or removed.
         */
         LGraphNode.prototype._getWidgetByName = function(nm) {
-            if (this._widgetNameMap === undefined) {
+            if (this._widgetNameMap === undefined || !this._widgetNameMap[nm]) {
                 this._widgetNameMap = {}
                 this.widgets?.forEach((w)=>{this._widgetNameMap[w.name] = w})
             }
+            if (!this._widgetNameMap[nm]) {
+                let breakpoint_be_here; // someone is asking for a widget that doesn't exist
+            }
             return this._widgetNameMap[nm]
         }
 
@@ -314,6 +299,23 @@ app.registerExtension({
 
         if (false) add_debug();
 
+        const export_api_label = Array.from(document.getElementsByClassName('p-menubar-item-label')).find((e)=>e.innerText=='Export (API)')
+        if (export_api_label) {
+            export_api_label.addEventListener('click', (e)=>{
+                //const ues = GraphAnalyser.instance().analyse_graph(true);
+                const ue_links = app.graph.extra['ue_links'];
+                if (ue_links.length>0) {
+                    if (!confirm("This model contains links added by Use Everywhere which won't work with the API. " + 
+                        "You probably want to use 'Convert all UEs to real links' on the canvas right click menu before saving.\n\n" + 
+                        "Save anyway?")) 
+                    {
+                        e.stopImmediatePropagation()
+                        e.stopPropagation()
+                        e.preventDefault()
+                    }
+                }
+            })
+        }
     },
 
     beforeConfigureGraph() {

js/use_everywhere_graph_analysis.js

@@ -49,7 +49,8 @@ class GraphAnalyser extends Pausable {
         }
         this.ambiguity_messages = [];
         var p = { workflow:app.graph.serialize() };
-        const live_nodes = p.workflow.nodes.filter((node) => node_is_live(node))
+        const treat_bypassed_as_live = settingsCache.getSettingValue("Use Everywhere.Options.connect_to_bypassed")
+        const live_nodes = p.workflow.nodes.filter((node) => node_is_live(node, treat_bypassed_as_live))
 
         // Create a UseEverywhereList and populate it from all live (not bypassed) UE nodes
         const ues = new UseEverywhereList();
@@ -74,7 +75,7 @@ class GraphAnalyser extends Pausable {
                 const o2n = isGrp ? Object.entries(gpData.oldToNewInputMap) : null;
                 //if (!real_node._widget_name_map) real_node._widget_name_map =  real_node.widgets?.map(w => w.name) || [];
                 real_node.inputs?.forEach((input,index) => {
-                    if (is_connected(input)) return;  
+                    if (is_connected(input, treat_bypassed_as_live)) return;  
                     if (real_node.reject_ue_connection && real_node.reject_ue_connection(input)) return;
                     if (real_node._getWidgetByName(input.name) && !(real_node.properties['widget_ue_connectable'] && real_node.properties['widget_ue_connectable'][input.name])) return;
                     connectable.push({node, input, index, isGrp, real_node, o2n});
@@ -124,7 +125,7 @@ class GraphAnalyser extends Pausable {
         if (this.ambiguity_messages.length) Logger.log(Logger.PROBLEM, "Ambiguous connections", this.ambiguity_messages, Logger.CAT_AMBIGUITY);
 
         // if there are loops report them and raise an exception
-        if (about_to_submit && settingsCache.getSettingValue('AE.checkloops')) {
+        if (about_to_submit && settingsCache.getSettingValue('Use Everywhere.Options.checkloops')) {
             try {
                 node_in_loop(live_nodes, links_added);
             } catch (e) {

js/use_everywhere_settings.js

@@ -7,59 +7,75 @@ import { settingsCache } from "./use_everywhere_cache.js";
 
 export const SETTINGS = [
     {
-        id: "AE.details",
-        name: "Anything Everywhere show node details",
-        type: "boolean",
-        defaultValue: false,
-        onChange: settingsCache.onSettingChange,
-    },
-    {
-        id: "AE.checkloops",
-        name: "Anything Everywhere check loops",
-        type: "boolean",
-        defaultValue: true,
-        onChange: settingsCache.onSettingChange,
-    },
+        id: "Use Everywhere.About",
+        name: "Version 6.1",
+        type: () => {return document.createElement('span')},
+    },  
     {
-        id: "AE.showlinks",
-        name: "Anything Everywhere show links",
+        id: "Use Everywhere.Graphics.showlinks",
+        name: "Show links",
         type: "combo",
         options: [ {value:0, text:"All off"}, {value:1, text:"Selected nodes"}, {value:2, text:"Mouseover node"}, {value:3, text:"Selected and mouseover nodes"}, {value:4, text:"All on"}],
-        defaultValue: 0,
+        defaultValue: 3,
         onChange: settingsCache.onSettingChangeChange,
     },      
     {
-        id: "AE.animate",
-        name: "Anything Everywhere animate UE links",
+        id: "Use Everywhere.Graphics.fuzzlinks",
+        name: "Statically distinguish UE links",
+        type: "boolean",
+        tooltip: "Render UE links, when shown, differently from normal links. Much lower performance cost than animation.",
+        defaultValue: true,
+        onChange: settingsCache.onSettingChangeChange,
+    },  
+    {
+        id: "Use Everywhere.Graphics.animate",
+        name: "Animate UE links",
         type: "combo",
         options: [ {value:0, text:"Off"}, {value:1, text:"Dots"}, {value:2, text:"Pulse"}, {value:3, text:"Both"}, ],
-        defaultValue: 3,
+        defaultValue: 0,
         onChange: settingsCache.onSettingChangeChange,
+        tooltip: "Animating links may have a negative impact on UI performance. Consider using Statically distinguish UE links instead."
     },
     {
-        id: "AE.stop_animation_when_running",
-        name: "Anything Everywhere turn animation off when running",
+        id: "Use Everywhere.Graphics.stop_animation_when_running",
+        name: "Turn animation off when workflow is running",
         type: "boolean",
         defaultValue: true,
         onChange: settingsCache.onSettingChangeChange,
     },    
     {
-        id: "AE.highlight",
-        name: "Anything Everywhere highlight connected nodes",
+        id: "Use Everywhere.Graphics.highlight",
+        name: "Highlight connected and connectable inputs",
         type: "boolean",
         defaultValue: true,
         onChange: settingsCache.onSettingChangeChange,
     },
     {
-        id: "AE.logging",
-        name: "Anything Everywhere logging",
+        id: "Use Everywhere.Options.connect_to_bypassed",
+        name: "Connect to bypassed nodes",
+        type: "boolean",
+        defaultValue: false,
+        onChange: settingsCache.onSettingChange,
+        tooltip: "By default UE links are made to the node downstream of bypassed nodes."
+    },
+    {
+        id: "Use Everywhere.Options.checkloops",
+        name: "Check for loops before submitting",
+        type: "boolean",
+        defaultValue: true,
+        onChange: settingsCache.onSettingChange,
+        tooltip: "Check to see if UE links have created a loop that wasn't there before"
+    },
+    {
+        id: "Use Everywhere.Options.logging",
+        name: "Logging",
         type: "combo",
         options: [ {value:0, text:"Errors Only"}, {value:1, text:"Problems"}, {value:2, text:"Information"}, {value:3, text:"Detail"}, ],
         defaultValue: 1,
         onChange: settingsCache.onSettingChange,
     },
     {
-        id: "AE.block_graph_validation",
+        id: "Use Everywhere.Options.block_graph_validation",
         name: "Block workflow validation",
         type: "boolean",
         defaultValue: true,
@@ -128,10 +144,19 @@ function highlight_selected(submenu_root, node, names) {
 
 function widget_ue_submenu(value, options, e, menu, node) {
     if (!(node.properties['widget_ue_connectable'])) node.properties['widget_ue_connectable'] = {};
-    const names = []
+    
     const linkedWidgets = new Set()
-    node.widgets.forEach((widget) => { widget.linkedWidgets?.forEach((lw)=>{linkedWidgets.add(lw)}) });
-    node.widgets.filter(w => !linkedWidgets.has(w)).filter(w => !w.hidden).forEach((widget) => { names.push(widget.name) });
+    node.widgets
+        .filter(w => w.linkedWidgets)
+        .forEach((widget) => { widget.linkedWidgets.forEach((lw)=>{linkedWidgets.add(lw)}) });
+
+    const names = []
+    node.widgets
+        .filter(w => !linkedWidgets.has(w))
+        .filter(w => !w.hidden)
+        .filter(w => !w.name?.includes('$$'))
+        .forEach((widget) => { names.push(widget.name) });
+
     const submenu = new LiteGraph.ContextMenu(
         names,
         { event: e, callback: function (v) { 
@@ -201,10 +226,10 @@ export function node_menu_settings(options, node) {
 export function canvas_menu_settings(options) {
     options.push(null); // divider
     options.push({
-        content: (app.ui.settings.getSettingValue('AE.showlinks')>0) ? "Hide UE links" : "Show UE links",
+        content: (app.ui.settings.getSettingValue('Use Everywhere.Graphics.showlinks')>0) ? "Hide UE links" : "Show UE links",
         callback: () => {
-            const setTo = (app.ui.settings.getSettingValue('AE.showlinks')>0) ? 0 : 4;
-            app.ui.settings.setSettingValue('AE.showlinks', setTo);
+            const setTo = (app.ui.settings.getSettingValue('Use Everywhere.Graphics.showlinks')>0) ? 0 : 4;
+            app.ui.settings.setSettingValue('Use Everywhere.Graphics.showlinks', setTo);
             app.graph.change();
         }
     },