More subgraph cleanup.

Author: rgthree

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "rgthree-comfy"
 description = "Making ComfyUI more comfortable."
-version = "1.0.2508161550"
+version = "1.0.2508162219"
 license = { file = "LICENSE" }
 dependencies = []
 

src_web/comfyui/bookmark.ts

@@ -10,6 +10,7 @@ import type {
 import {app} from "scripts/app.js";
 import {RgthreeBaseVirtualNode} from "./base_node.js";
 import {SERVICE as KEY_EVENT_SERVICE} from "./services/key_events_services.js";
+import {SERVICE as BOOKMARKS_SERVICE} from "./services/bookmarks_services.js";
 import {NodeTypesString} from "./constants.js";
 import {getClosestOrSelf, query} from "rgthree/common/utils_dom.js";
 import {wait} from "rgthree/common/shared_utils.js";
@@ -52,7 +53,7 @@ export class Bookmark extends RgthreeBaseVirtualNode {
 
   constructor(title = Bookmark.title) {
     super(title);
-    const nextShortcutChar = getNextShortcut();
+    const nextShortcutChar = BOOKMARKS_SERVICE.getNextShortcut();
     this.addWidget(
       "text",
       "shortcut_key",
@@ -152,20 +153,3 @@ app.registerExtension({
     Bookmark.setUp();
   },
 });
-
-function isBookmark(node: LGraphNode): node is Bookmark {
-  return node.type === NodeTypesString.BOOKMARK;
-}
-
-function getExistingShortcuts() {
-  const graph: LGraph = app.graph;
-  const bookmarkNodes = graph._nodes.filter(isBookmark);
-  const usedShortcuts = new Set(bookmarkNodes.map((n) => n.shortcutKey));
-  return usedShortcuts;
-}
-
-const SHORTCUT_DEFAULTS = "1234567890abcdefghijklmnopqrstuvwxyz".split("");
-function getNextShortcut() {
-  const existingShortcuts = getExistingShortcuts();
-  return SHORTCUT_DEFAULTS.find((char) => !existingShortcuts.has(char)) ?? "1";
-}

src_web/comfyui/fast_groups_muter.ts

@@ -15,7 +15,7 @@ import {NodeTypesString} from "./constants.js";
 import {SERVICE as FAST_GROUPS_SERVICE} from "./services/fast_groups_service.js";
 import {drawNodeWidget, fitString} from "./utils_canvas.js";
 import {RgthreeBaseWidget} from "./utils_widgets.js";
-import { changeModeOfNodes } from "./utils.js";
+import { changeModeOfNodes, getGroupNodes } from "./utils.js";
 
 const PROPERTY_SORT = "sort";
 const PROPERTY_SORT_CUSTOM_ALPHA = "customSortAlphabet";
@@ -395,7 +395,7 @@ class FastGroupsToggleRowWidget extends RgthreeBaseWidget<{toggled: boolean}> {
 
   doModeChange(force?: boolean, skipOtherNodeCheck?: boolean) {
     this.group.recomputeInsideNodes();
-    const hasAnyActiveNodes = this.group._nodes.some((n) => n.mode === LiteGraph.ALWAYS);
+    const hasAnyActiveNodes = getGroupNodes(this.group).some((n) => n.mode === LiteGraph.ALWAYS);
     let newValue = force != null ? force : !hasAnyActiveNodes;
     if (skipOtherNodeCheck !== true) {
       // TODO: This work should probably live in BaseFastGroupsModeChanger instead of the widgets.
@@ -409,7 +409,7 @@ class FastGroupsToggleRowWidget extends RgthreeBaseWidget<{toggled: boolean}> {
         newValue = this.node.widgets.every((w) => !w.value || w === this);
       }
     }
-    changeModeOfNodes(this.group._nodes, (newValue ? this.node.modeOn : this.node.modeOff));
+    changeModeOfNodes(getGroupNodes(this.group), (newValue ? this.node.modeOn : this.node.modeOff));
     this.group.rgthree_hasAnyActiveNode = newValue;
     this.toggled = newValue;
     this.group.graph?.setDirtyCanvas(true, false);

src_web/comfyui/menu_queue_node.ts

@@ -7,7 +7,7 @@ import type {ComfyNodeDef} from "typings/comfy.js";
 
 import {app} from "scripts/app.js";
 import {rgthree} from "./rgthree.js";
-import {getOutputNodes} from "./utils.js";
+import {getGroupNodes, getOutputNodes} from "./utils.js";
 import {SERVICE as CONFIG_SERVICE} from "./services/config_service.js";
 
 function showQueueNodesMenuIfOutputNodesAreSelected(
@@ -40,12 +40,12 @@ function showQueueGroupNodesMenuIfGroupIsSelected(
   }
   const group =
     rgthree.lastCanvasMouseEvent &&
-    app.graph.getGroupOnPos(
+    (app.canvas.getCurrentGraph() || app.graph).getGroupOnPos(
       rgthree.lastCanvasMouseEvent.canvasX,
       rgthree.lastCanvasMouseEvent.canvasY,
     );
 
-  const outputNodes: LGraphNode[] | null = (group && getOutputNodes(group._nodes)) || null;
+  const outputNodes: LGraphNode[] | null = (group && getOutputNodes(getGroupNodes(group))) || null;
   const menuItem = {
     content: `Queue Group Output Nodes (rgthree)  `,
     className: "rgthree-contextmenu-item",

src_web/comfyui/node_collector.ts

@@ -107,19 +107,20 @@ async function updateCombinerToCollector(node: TLGraphNode) {
     // We now collect the links data, inputs and outputs, of the old node since these will be
     // lost when we remove it.
     const links: any[] = [];
+    const graph = (node.graph || app.graph);
     for (const [index, output] of node.outputs.entries()) {
       for (const linkId of output.links || []) {
-        const link: LLink = (app.graph as LGraph).links[linkId]!;
+        const link: LLink = graph.links[linkId]!;
         if (!link) continue;
-        const targetNode = app.graph.getNodeById(link.target_id);
+        const targetNode = graph.getNodeById(link.target_id);
         links.push({node: newNode, slot: index, targetNode, targetSlot: link.target_slot});
       }
     }
     for (const [index, input] of node.inputs.entries()) {
       const linkId = input.link;
       if (linkId) {
-        const link: LLink = (app.graph as LGraph).links[linkId]!;
-        const originNode = app.graph.getNodeById(link.origin_id);
+        const link: LLink = graph.links[linkId]!;
+        const originNode = graph.getNodeById(link.origin_id);
         links.push({
           node: originNode,
           slot: link.origin_slot,
@@ -129,14 +130,14 @@ async function updateCombinerToCollector(node: TLGraphNode) {
       }
     }
     // Add the new node, remove the old node.
-    app.graph.add(newNode);
+    graph.add(newNode);
     await wait();
     // Now go through and connect the other nodes up as they were.
     for (const link of links) {
       link.node.connect(link.slot, link.targetNode, link.targetSlot);
     }
     await wait();
-    app.graph.remove(node);
+    graph.remove(node);
   }
 }
 

src_web/comfyui/node_mode_repeater.ts

@@ -16,6 +16,7 @@ import {
   changeModeOfNodes,
   getConnectedInputNodesAndFilterPassThroughs,
   getConnectedOutputNodesAndFilterPassThroughs,
+  getGroupNodes,
 } from "./utils.js";
 
 class NodeModeRepeater extends BaseCollectorNode {
@@ -161,12 +162,13 @@ class NodeModeRepeater extends BaseCollectorNode {
           changeModeOfNodes(node, to);
         }
       }
-    } else if (app.graph._groups?.length) {
+    } else if (this.graph?._groups?.length) {
       // No linked nodes.. check if we're in a group.
-      for (const group of app.graph._groups as LGraphGroup[]) {
+      for (const group of this.graph._groups as LGraphGroup[]) {
         group.recomputeInsideNodes();
-        if (group._nodes?.includes(this)) {
-          for (const node of group._nodes) {
+        const groupNodes = getGroupNodes(group);
+        if (groupNodes?.includes(this)) {
+          for (const node of groupNodes) {
             if (node !== this) {
               // Use "to" as there may be other getters in the way to access this.mode directly.
               changeModeOfNodes(node, to);

src_web/comfyui/power_conductor.ts

@@ -8,7 +8,7 @@ import {RgthreeBetterButtonWidget} from "./utils_widgets.js";
 import {NodeTypesString} from "./constants.js";
 import {ComfyWidgets} from "scripts/widgets.js";
 import {SERVICE as CONFIG_SERVICE} from "./services/config_service.js";
-import { changeModeOfNodes } from "./utils.js";
+import { changeModeOfNodes, getNodeById } from "./utils.js";
 
 const BUILT_INS = {
   node: {
@@ -63,7 +63,7 @@ class ComfyNodeWrapper {
   }
 
   private getNode() {
-    return app.graph.getNodeById(this.#id)!;
+    return getNodeById(this.#id)!;
   }
 
   @Exposed get id() {

src_web/comfyui/power_prompt.ts

@@ -33,7 +33,7 @@ app.registerExtension({
             node.outputs[3]!.links = node.outputs[3]!.links || [];
             for (const link of node.outputs[0]!.links) {
               node.outputs[3]!.links.push(link);
-              app.graph.links[link]!.origin_slot = 3;
+              (node.graph || app.graph).links[link]!.origin_slot = 3;
             }
             node.outputs[0]!.links = null;
           }

src_web/comfyui/rgthree.ts

@@ -11,7 +11,6 @@ import type {
   ISerialisedNode,
 } from "@comfyorg/frontend";
 import type {ComfyApiFormat, ComfyApiPrompt} from "typings/comfy.js";
-import type {Bookmark} from "./bookmark.js";
 import type {ComfyApp} from "@comfyorg/frontend";
 
 import {app} from "scripts/app.js";
@@ -21,8 +20,8 @@ import {SERVICE as BOOKMARKS_SERVICE} from "./services/bookmarks_services.js";
 import {SERVICE as KEY_EVENT_SERVICE} from "./services/key_events_services.js";
 import {WorkflowLinkFixer} from "rgthree/common/link_fixer.js";
 import {injectCss, wait} from "rgthree/common/shared_utils.js";
-import {replaceNode, traverseNodesDepthFirst, waitForCanvas, waitForGraph} from "./utils.js";
-import {NodeTypesString, addRgthree, getNodeTypeStrings, stripRgthree} from "./constants.js";
+import {replaceNode, waitForCanvas, waitForGraph} from "./utils.js";
+import {NodeTypesString, addRgthree, getNodeTypeStrings} from "./constants.js";
 import {RgthreeProgressBar} from "rgthree/common/progress_bar.js";
 import {RgthreeConfigDialog} from "./config.js";
 import {

src_web/comfyui/services/bookmarks_services.ts

@@ -2,20 +2,31 @@ import type {Bookmark} from "../bookmark.js";
 
 import {app} from "scripts/app.js";
 import {NodeTypesString} from "../constants.js";
-import {traverseNodesDepthFirst} from "../utils.js";
+import {reduceNodesDepthFirst} from "../utils.js";
+
+const SHORTCUT_DEFAULTS = "1234567890abcdefghijklmnopqrstuvwxyz".split("");
 
 class BookmarksService {
   /**
    * Gets a list of the current bookmarks within the current workflow.
    */
   getCurrentBookmarks(): Bookmark[] {
-    const bookmarks: Bookmark[] = [];
-    traverseNodesDepthFirst(app.graph.nodes, (n) => {
+    return reduceNodesDepthFirst<Bookmark[]>(app.graph.nodes, (n, acc) => {
       if (n.type === NodeTypesString.BOOKMARK) {
-        bookmarks.push(n as Bookmark);
+        acc.push(n as Bookmark);
       }
-    });
-    return bookmarks.sort((a, b) => a.title.localeCompare(b.title));
+    }, []).sort((a, b) => a.title.localeCompare(b.title));
+  }
+
+  getExistingShortcuts() {
+    const bookmarkNodes = this.getCurrentBookmarks();
+    const usedShortcuts = new Set(bookmarkNodes.map((n) => n.shortcutKey));
+    return usedShortcuts;
+  }
+
+  getNextShortcut() {
+    const existingShortcuts = this.getExistingShortcuts();
+    return SHORTCUT_DEFAULTS.find((char) => !existingShortcuts.has(char)) ?? "1";
   }
 }