diff --git a/web/scripts/app.js b/web/scripts/app.js index de59e4e4f..0fbf47440 100644 --- a/web/scripts/app.js +++ b/web/scripts/app.js @@ -1373,6 +1373,11 @@ export class ComfyApp { }); await Promise.all(extensionPromises); + try { + this.menu.workflows.registerExtension(this); + } catch (error) { + console.error(error); + } } async #migrateSettings() { @@ -1880,6 +1885,9 @@ export class ComfyApp { this.showMissingNodesError(missingNodeTypes); } await this.#invokeExtensionsAsync("afterConfigureGraph", missingNodeTypes); + requestAnimationFrame(() => { + this.graph.setDirtyCanvas(true, true); + }); } /** diff --git a/web/scripts/changeTracker.js b/web/scripts/changeTracker.js index fcfb1a80c..83f8d9e65 100644 --- a/web/scripts/changeTracker.js +++ b/web/scripts/changeTracker.js @@ -3,29 +3,33 @@ import { api } from "./api.js"; import { clone } from "./utils.js"; + export class ChangeTracker { static MAX_HISTORY = 50; - + #app; undo = []; redo = []; activeState = null; isOurLoad = false; - /** @type { import("./workflows").ComfyWorkflowInstance } */ + /** @type { import("./workflows").ComfyWorkflow | null } */ workflow; ds; nodeOutputs; get app() { - return this.workflow.manager.app; + return this.#app ?? this.workflow.manager.app; } constructor(workflow) { this.workflow = workflow; } + #setApp(app) { + this.#app = app; + } + store() { - this.nodeOutputs = clone(this.app.nodeOutputs); this.ds = { scale: this.app.canvas.ds.scale, offset: [...this.app.canvas.ds.offset] }; } @@ -81,7 +85,8 @@ export class ChangeTracker { /** @param { import("./app.js").ComfyApp } app */ static init(app) { - const changeTracker = () => app.workflowManager.activeWorkflow.changeTracker; + const changeTracker = () => app.workflowManager.activeWorkflow?.changeTracker ?? globalTracker; + globalTracker.#setApp(app); const loadGraphData = app.loadGraphData; app.loadGraphData = async function () { @@ -162,6 +167,26 @@ export class ChangeTracker { changeTracker().checkState(); return v; }; + + // Store node outputs + api.addEventListener("executed", ({ detail }) => { + const prompt = app.workflowManager.queuedPrompts[detail.prompt_id]; + if(!prompt.workflow) return; + const nodeOutputs = prompt.workflow.changeTracker.nodeOutputs ??= {}; + const output = nodeOutputs[detail.node]; + if (detail.merge && output) { + for (const k in detail.output ?? {}) { + const v = output[k]; + if (v instanceof Array) { + output[k] = v.concat(detail.output[k]); + } else { + output[k] = detail.output[k]; + } + } + } else { + nodeOutputs[detail.node] = detail.output; + } + }); } static bindInput(app, activeEl) { @@ -208,3 +233,5 @@ export class ChangeTracker { return false; } } + +const globalTracker = new ChangeTracker({}); \ No newline at end of file diff --git a/web/scripts/domWidget.js b/web/scripts/domWidget.js index ef6cf2b31..9a4a2b64b 100644 --- a/web/scripts/domWidget.js +++ b/web/scripts/domWidget.js @@ -253,7 +253,7 @@ LGraphNode.prototype.addDOMWidget = function (name, type, element, options) { const transform = new DOMMatrix() .scaleSelf(elRect.width / ctx.canvas.width, elRect.height / ctx.canvas.height) .multiplySelf(ctx.getTransform()) - .translateSelf(margin, margin + y + elRect.top); + .translateSelf(margin, margin + y ); const scale = new DOMMatrix().scaleSelf(transform.a, transform.d); @@ -261,7 +261,7 @@ LGraphNode.prototype.addDOMWidget = function (name, type, element, options) { transformOrigin: "0 0", transform: scale, left: `${transform.a + transform.e}px`, - top: `${transform.d + transform.f}px`, + top: `${transform.d + transform.f + + elRect.top}px`, width: `${widgetWidth - margin * 2}px`, height: `${(widget.computedHeight ?? 50) - margin * 2}px`, position: "absolute", diff --git a/web/scripts/ui/menu/menu.css b/web/scripts/ui/menu/menu.css index 0743b648c..c19ef619f 100644 --- a/web/scripts/ui/menu/menu.css +++ b/web/scripts/ui/menu/menu.css @@ -250,6 +250,9 @@ } @media only screen and (max-width: 520px) { + .comfyui-workflows-button-inner { + width: unset !important; + } .comfyui-workflows-label { display: none; } diff --git a/web/scripts/ui/menu/workflows.js b/web/scripts/ui/menu/workflows.js index f36d1c9df..514dfdbbe 100644 --- a/web/scripts/ui/menu/workflows.js +++ b/web/scripts/ui/menu/workflows.js @@ -6,7 +6,7 @@ import { $el } from "../../ui.js"; import { api } from "../../api.js"; import { ComfyPopup } from "../components/popup.js"; import { createSpinner } from "../spinner.js"; -import { ComfyWorkflow } from "../../workflows.js"; +import { ComfyWorkflow, trimJsonExt } from "../../workflows.js"; export class ComfyWorkflowsMenu { #first = true; @@ -100,6 +100,161 @@ export class ComfyWorkflowsMenu { this.unsaved = true; }); } + + #getMenuOptions(callback) { + const menu = []; + const directories = new Map(); + for (const workflow of this.app.workflowManager.workflows || []) { + const path = workflow.pathParts; + if (!path) continue; + let parent = menu; + let currentPath = ""; + for (let i = 0; i < path.length - 1; i++) { + currentPath += "/" + path[i]; + let newParent = directories.get(currentPath); + if (!newParent) { + newParent = { + title: path[i], + has_submenu: true, + submenu: { + options: [], + }, + }; + parent.push(newParent); + newParent = newParent.submenu.options; + directories.set(currentPath, newParent); + } + parent = newParent; + } + parent.push({ + title: trimJsonExt(path[path.length - 1]), + callback: () => callback(workflow), + }); + } + return menu; + } + + #getFavoriteMenuOptions(callback) { + const menu = []; + for (const workflow of this.app.workflowManager.workflows || []) { + if (workflow.isFavorite) { + menu.push({ + title: "⭐ " + workflow.name, + callback: () => callback(workflow), + }); + } + } + return menu; + } + + /** + * @param {import("../../app.js").ComfyApp} app + */ + registerExtension(app) { + const self = this; + app.registerExtension({ + name: "Comfy.Workflows", + async beforeRegisterNodeDef(nodeType) { + function getImageWidget(node) { + const inputs = { ...node.constructor?.nodeData?.input?.required, ...node.constructor?.nodeData?.input?.optional }; + for (const input in inputs) { + if (inputs[input][0] === "IMAGEUPLOAD") { + const imageWidget = node.widgets.find((w) => w.name === (inputs[input]?.[1]?.widget ?? "image")); + if (imageWidget) return imageWidget; + } + } + } + + function setWidgetImage(node, widget, img) { + const url = new URL(img.src); + const filename = url.searchParams.get("filename"); + const subfolder = url.searchParams.get("subfolder"); + const type = url.searchParams.get("type"); + const imageId = `${subfolder ? subfolder + "/" : ""}${filename} [${type}]`; + widget.value = imageId; + node.imgs = [img]; + } + + /** + * @param {HTMLImageElement} img + * @param {ComfyWorkflow} workflow + */ + async function sendToWorkflow(img, workflow) { + await workflow.load(); + let targetNode; + let targetWidget; + const nodes = app.graph.computeExecutionOrder(false); + for (const n of nodes) { + const widget = getImageWidget(n); + if (widget == null) continue; + + if (n.title?.toLowerCase().includes("input")) { + targetWidget = widget; + targetNode = n; + break; + } else if (!targetWidget) { + targetWidget = widget; + targetNode = n; + } else { + alert( + "Multiple image nodes have been found, the first one has been selected. You can include 'input' in the title of the node to use a specific node." + ); + break; + } + } + + if(!targetWidget) { + alert("No image nodes have been found in this workflow!"); + return; + } + + + setWidgetImage(targetNode, targetWidget, img); + } + + const getExtraMenuOptions = nodeType.prototype["getExtraMenuOptions"]; + nodeType.prototype["getExtraMenuOptions"] = function (_, options) { + const r = getExtraMenuOptions?.apply?.(this, arguments); + const t = /** @type { {imageIndex?: number, overIndex?: number, imgs: string[]} } */ /** @type {any} */ (this); + let img; + if (t.imageIndex != null) { + // An image is selected so select that + img = t.imgs?.[t.imageIndex]; + } else if (t.overIndex != null) { + // No image is selected but one is hovered + img = t.img?.s[t.overIndex]; + } + + if (img) { + let pos = options.findIndex((o) => o.content === "Save Image"); + if (pos === -1) { + pos = 0; + } else { + pos++; + } + + options.splice(pos, 0, { + content: "Send to workflow", + has_submenu: true, + submenu: { + options: [ + { + callback: () => sendToWorkflow(img, app.workflowManager.activeWorkflow), + title: "[Current workflow]", + }, + ...self.#getFavoriteMenuOptions(sendToWorkflow.bind(null, img)), + null, + ...self.#getMenuOptions(sendToWorkflow.bind(null, img)), + ], + }, + }); + } + + return r; + }; + }, + }); + } } export class ComfyWorkflowsContent { @@ -191,18 +346,9 @@ export class ComfyWorkflowsContent { $el("h3", "Open"), ...this.app.workflowManager.openWorkflows.map((w) => { const wrapper = new WorkflowElement(this, w, { - primary: { element: $el("i.mdi.mdi-18px.mdi-circle-small") }, + primary: { element: $el("i.mdi.mdi-18px.mdi-progress-pencil") }, buttons: [ - new ComfyButton({ - icon: "content-save", - iconSize: 18, - classList: "comfyui-button comfyui-workflows-file-action", - enabled: w.unsaved, - action: (e) => { - e.stopImmediatePropagation(); - w.save(); - }, - }), + this.#getRenameButton(w), new ComfyButton({ icon: "close", iconSize: 18, @@ -303,7 +449,7 @@ export class ComfyWorkflowsContent { const percent = done.length / total.length; open.element.classList.add("running"); open.element.style.setProperty("--progress", percent * 100 + "%"); - open.primary.element.classList.remove("mdi-circle-small"); + open.primary.element.classList.remove("mdi-progress-pencil"); open.primary.element.classList.add("mdi-play"); } @@ -311,7 +457,7 @@ export class ComfyWorkflowsContent { if (!this.activeElement) return; this.activeElement.element.classList.remove("running"); this.activeElement.element.style.removeProperty("--progress"); - this.activeElement.primary.element.classList.add("mdi-circle-small"); + this.activeElement.primary.element.classList.add("mdi-progress-pencil"); this.activeElement.primary.element.classList.remove("mdi-play"); } diff --git a/web/scripts/workflows.js b/web/scripts/workflows.js index f429b3851..38e9ebfeb 100644 --- a/web/scripts/workflows.js +++ b/web/scripts/workflows.js @@ -4,13 +4,17 @@ import { api } from "./api.js"; import { ChangeTracker } from "./changeTracker.js"; import { getStorageValue, setStorageValue } from "./utils.js"; -function appendJson(path) { +function appendJsonExt(path) { if (!path.toLowerCase().endsWith(".json")) { path += ".json"; } return path; } +export function trimJsonExt(path) { + return path?.replace(/\.json$/, ""); +} + export class ComfyWorkflowManager extends EventTarget { /** @type {string | null} */ #activePromptId = null; @@ -256,7 +260,7 @@ export class ComfyWorkflow { } this.#pathParts = pathParts; - this.#name = pathParts[pathParts.length - 1].replace(/\.json$/, ""); + this.#name = trimJsonExt(pathParts[pathParts.length - 1]); } async getWorkflowData() { @@ -304,7 +308,7 @@ export class ComfyWorkflow { * @param {string} path */ async rename(path) { - path = appendJson(path); + path = appendJsonExt(path); let resp = await api.moveUserData("workflows/" + this.path, "workflows/" + path); if (resp.status === 409) { @@ -374,11 +378,11 @@ export class ComfyWorkflow { */ async #save(path, overwrite) { if (!path) { - path = prompt("Save workflow as:", this.path ?? this.name ?? "workflow"); + path = prompt("Save workflow as:", trimJsonExt(this.path) ?? this.name ?? "workflow"); if (!path) return; } - path = appendJson(path); + path = appendJsonExt(path); const p = await this.manager.app.graphToPrompt(); const json = JSON.stringify(p.workflow, null, 2); @@ -399,8 +403,8 @@ export class ComfyWorkflow { // Saved new workflow, patch this instance this.#updatePath(path, null); await this.manager.loadWorkflows(); - this.manager.dispatchEvent(new CustomEvent("rename", { detail: this })); this.unsaved = false; + this.manager.dispatchEvent(new CustomEvent("rename", { detail: this })); } else if (path !== this.path) { // Saved as, open the new copy await this.manager.loadWorkflows(); diff --git a/web/types/comfy.d.ts b/web/types/comfy.d.ts index f7129b555..9a338b349 100644 --- a/web/types/comfy.d.ts +++ b/web/types/comfy.d.ts @@ -10,24 +10,24 @@ export interface ComfyExtension { * Allows any initialisation, e.g. loading resources. Called after the canvas is created but before nodes are added * @param app The ComfyUI app instance */ - init(app: ComfyApp): Promise; + init?(app: ComfyApp): Promise; /** * Allows any additonal setup, called after the application is fully set up and running * @param app The ComfyUI app instance */ - setup(app: ComfyApp): Promise; + setup?(app: ComfyApp): Promise; /** * Called before nodes are registered with the graph * @param defs The collection of node definitions, add custom ones or edit existing ones * @param app The ComfyUI app instance */ - addCustomNodeDefs(defs: Record, app: ComfyApp): Promise; + addCustomNodeDefs?(defs: Record, app: ComfyApp): Promise; /** * Allows the extension to add custom widgets * @param app The ComfyUI app instance * @returns An array of {[widget name]: widget data} */ - getCustomWidgets( + getCustomWidgets?( app: ComfyApp ): Promise< Record { widget?: IWidget; minWidth?: number; minHeight?: number }> @@ -38,12 +38,12 @@ export interface ComfyExtension { * @param nodeData The original node object info config object * @param app The ComfyUI app instance */ - beforeRegisterNodeDef(nodeType: typeof LGraphNode, nodeData: ComfyObjectInfo, app: ComfyApp): Promise; + beforeRegisterNodeDef?(nodeType: typeof LGraphNode, nodeData: ComfyObjectInfo, app: ComfyApp): Promise; /** * Allows the extension to register additional nodes with LGraph after standard nodes are added * @param app The ComfyUI app instance */ - registerCustomNodes(app: ComfyApp): Promise; + registerCustomNodes?(app: ComfyApp): Promise; /** * Allows the extension to modify a node that has been reloaded onto the graph. * If you break something in the backend and want to patch workflows in the frontend @@ -51,13 +51,13 @@ export interface ComfyExtension { * @param node The node that has been loaded * @param app The ComfyUI app instance */ - loadedGraphNode(node: LGraphNode, app: ComfyApp); + loadedGraphNode?(node: LGraphNode, app: ComfyApp); /** * Allows the extension to run code after the constructor of the node * @param node The node that has been created * @param app The ComfyUI app instance */ - nodeCreated(node: LGraphNode, app: ComfyApp); + nodeCreated?(node: LGraphNode, app: ComfyApp); } export type ComfyObjectInfo = {