mirror of
https://git.datalinker.icu/comfyanonymous/ComfyUI
synced 2026-11-22 05:47:02 +08:00
override api.js for serverless comfyui
This commit is contained in:
parent
632191611e
commit
c3e56dde28
@ -1,6 +1,4 @@
|
|||||||
import {serverNodeDefs} from "../../serverNodeDefs.js";
|
export class ComfyApi extends EventTarget {
|
||||||
|
|
||||||
class ComfyApi extends EventTarget {
|
|
||||||
#registered = new Set();
|
#registered = new Set();
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
@ -194,12 +192,11 @@ class ComfyApi extends EventTarget {
|
|||||||
"/extensions/core/noteNode.js",
|
"/extensions/core/noteNode.js",
|
||||||
"/extensions/core/rerouteNode.js",
|
"/extensions/core/rerouteNode.js",
|
||||||
"/extensions/core/saveImageExtraOutput.js",
|
"/extensions/core/saveImageExtraOutput.js",
|
||||||
|
'/extensions/core/simpleTouchSupport.js',
|
||||||
"/extensions/core/slotDefaults.js",
|
"/extensions/core/slotDefaults.js",
|
||||||
"/extensions/core/snapToGrid.js",
|
"/extensions/core/snapToGrid.js",
|
||||||
"/extensions/core/undoRedo.js",
|
|
||||||
"/extensions/core/uploadImage.js",
|
"/extensions/core/uploadImage.js",
|
||||||
"/extensions/core/widgetInputs.js",
|
"/extensions/core/widgetInputs.js",
|
||||||
"/extensions/dp.js",
|
|
||||||
]
|
]
|
||||||
// const resp = await this.fetchApi("/extensions", { cache: "no-store" });
|
// const resp = await this.fetchApi("/extensions", { cache: "no-store" });
|
||||||
// return await resp.json();
|
// return await resp.json();
|
||||||
@ -220,9 +217,8 @@ class ComfyApi extends EventTarget {
|
|||||||
* @returns The node definitions
|
* @returns The node definitions
|
||||||
*/
|
*/
|
||||||
async getNodeDefs() {
|
async getNodeDefs() {
|
||||||
// const resp = await this.fetchApi("/object_info", { cache: "no-store" });
|
const resp = await this.fetchApi("/object_info", { cache: "no-store" });
|
||||||
return serverNodeDefs;
|
return await resp.json();
|
||||||
// return await resp.json();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -366,9 +362,7 @@ class ComfyApi extends EventTarget {
|
|||||||
*/
|
*/
|
||||||
async getUserConfig() {
|
async getUserConfig() {
|
||||||
localStorage.setItem("Comfy.userId", "default");
|
localStorage.setItem("Comfy.userId", "default");
|
||||||
return { storage: "server", users: {'default':{}} };
|
return { storage: "browser", users: {'default':{}} };
|
||||||
// return { storage: "browser", users: Promise.resolve({}), migrated: false };
|
|
||||||
return (await this.fetchApi("/users")).json();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -517,4 +511,104 @@ class ComfyApi extends EventTarget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const api = new ComfyApi();
|
import { serverNodeDefs } from "/serverNodeDefs.js";
|
||||||
|
export class ServerlessComfyApi extends ComfyApi {
|
||||||
|
DEFAULT_MACHINE = "XzJ8p9wqc9vnp3kwt991P";
|
||||||
|
machine = null;
|
||||||
|
workflow = null
|
||||||
|
|
||||||
|
async getNodeDefs() {
|
||||||
|
const machineID = new URLSearchParams(location.search).get("machine") ?? this.DEFAULT_MACHINE;
|
||||||
|
const workfloID = new URLSearchParams(location.search).get("workflowID");
|
||||||
|
|
||||||
|
console.log("💖Machine ID:", machineID);
|
||||||
|
|
||||||
|
return serverNodeDefs;
|
||||||
|
this.machine = await fetch("/api/machine/getMachine?id="+ machineID)
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => {
|
||||||
|
console.log("machine Data:", data);
|
||||||
|
return data.data
|
||||||
|
});
|
||||||
|
if(workfloID) {
|
||||||
|
this.workflow = await fetch("/api/workflow/getWorkflow?id="+ workfloID)
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => {
|
||||||
|
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
async getUserConfig() {
|
||||||
|
localStorage.setItem("Comfy.userId", "default");
|
||||||
|
return { storage: "browser", users: {'default':{}} };
|
||||||
|
// return { storage: "browser", users: Promise.resolve({}), migrated: false };
|
||||||
|
return (await this.fetchApi("/users")).json();
|
||||||
|
}
|
||||||
|
async queuePrompt(number, { output, workflow }) {
|
||||||
|
console.log('output',output,'workflow',workflow);
|
||||||
|
const body = {
|
||||||
|
client_id: this.clientId,
|
||||||
|
prompt: output,
|
||||||
|
extra_data: { extra_pnginfo: { workflow } },
|
||||||
|
};
|
||||||
|
|
||||||
|
if (number === -1) {
|
||||||
|
body.front = true;
|
||||||
|
} else if (number != 0) {
|
||||||
|
body.number = number;
|
||||||
|
}
|
||||||
|
// validate workflow prompt deps first
|
||||||
|
const res = await fetch("/runWorkflow", {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
input: {
|
||||||
|
prompt: output,
|
||||||
|
deps: workflow.extra.deps,
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (res.status !== 200) {
|
||||||
|
throw {
|
||||||
|
response: await res.json(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return await res.json();
|
||||||
|
}
|
||||||
|
async getExtensions() {
|
||||||
|
const COMFYUI_CORE_EXTENSIONS = [
|
||||||
|
"/extensions/core/clipspace.js",
|
||||||
|
"/extensions/core/colorPalette.js",
|
||||||
|
"/extensions/core/contextMenuFilter.js",
|
||||||
|
"/extensions/core/dynamicPrompts.js",
|
||||||
|
"/extensions/core/editAttention.js",
|
||||||
|
"/extensions/core/groupNode.js",
|
||||||
|
"/extensions/core/groupNodeManage.js",
|
||||||
|
"/extensions/core/groupOptions.js",
|
||||||
|
"/extensions/core/invertMenuScrolling.js",
|
||||||
|
"/extensions/core/keybinds.js",
|
||||||
|
"/extensions/core/linkRenderMode.js",
|
||||||
|
"/extensions/core/maskeditor.js",
|
||||||
|
"/extensions/core/nodeTemplates.js",
|
||||||
|
"/extensions/core/noteNode.js",
|
||||||
|
"/extensions/core/rerouteNode.js",
|
||||||
|
"/extensions/core/saveImageExtraOutput.js",
|
||||||
|
'/extensions/core/simpleTouchSupport.js',
|
||||||
|
"/extensions/core/slotDefaults.js",
|
||||||
|
"/extensions/core/snapToGrid.js",
|
||||||
|
"/extensions/core/uploadImage.js",
|
||||||
|
"/extensions/core/widgetInputs.js",
|
||||||
|
]
|
||||||
|
// const resp = await this.fetchApi("/extensions", { cache: "no-store" });
|
||||||
|
// return await resp.json();
|
||||||
|
return COMFYUI_CORE_EXTENSIONS
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export let api = new ServerlessComfyApi();
|
||||||
@ -2,6 +2,7 @@ import { ComfyLogging } from "./logging.js";
|
|||||||
import { ComfyWidgets, initWidgets } from "./widgets.js";
|
import { ComfyWidgets, initWidgets } from "./widgets.js";
|
||||||
import { ComfyUI, $el } from "./ui.js";
|
import { ComfyUI, $el } from "./ui.js";
|
||||||
import { api } from "./api.js";
|
import { api } from "./api.js";
|
||||||
|
import {app} from "./app.js";
|
||||||
import { defaultGraph } from "./defaultGraph.js";
|
import { defaultGraph } from "./defaultGraph.js";
|
||||||
import { getPngMetadata, getWebpMetadata, importA1111, getLatentMetadata } from "./pnginfo.js";
|
import { getPngMetadata, getWebpMetadata, importA1111, getLatentMetadata } from "./pnginfo.js";
|
||||||
import { addDomClippingSetting } from "./domWidget.js";
|
import { addDomClippingSetting } from "./domWidget.js";
|
||||||
@ -29,6 +30,13 @@ function sanitizeNodeName(string) {
|
|||||||
/**
|
/**
|
||||||
* @typedef {import("types/comfy").ComfyExtension} ComfyExtension
|
* @typedef {import("types/comfy").ComfyExtension} ComfyExtension
|
||||||
*/
|
*/
|
||||||
|
import { ComfySettingsDialog } from "./ui/settings.js";
|
||||||
|
export class CustomComfyUI {
|
||||||
|
constructor(app) {
|
||||||
|
this.app = app;
|
||||||
|
this.settings = new ComfySettingsDialog(app);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export class ComfyViewWorkflowApp {
|
export class ComfyViewWorkflowApp {
|
||||||
/**
|
/**
|
||||||
@ -52,13 +60,13 @@ export class ComfyViewWorkflowApp {
|
|||||||
static clipspace_return_node = null;
|
static clipspace_return_node = null;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
// this.ui = new ComfyUI(this);
|
this.ui = new CustomComfyUI(this);
|
||||||
// this.logging = new ComfyLogging(this);
|
// this.logging = new ComfyLogging(this);
|
||||||
// this.workflowManager = new ComfyWorkflowManager(this);
|
// this.workflowManager = new ComfyWorkflowManager(this);
|
||||||
// this.bodyTop = $el("div.comfyui-body-top", { parent: document.body });
|
this.bodyTop = $el("div.comfyui-body-top", { parent: document.body });
|
||||||
// this.bodyLeft = $el("div.comfyui-body-left", { parent: document.body });
|
this.bodyLeft = $el("div.comfyui-body-left", { parent: document.body });
|
||||||
// this.bodyRight = $el("div.comfyui-body-right", { parent: document.body });
|
this.bodyRight = $el("div.comfyui-body-right", { parent: document.body });
|
||||||
// this.bodyBottom = $el("div.comfyui-body-bottom", { parent: document.body });
|
this.bodyBottom = $el("div.comfyui-body-bottom", { parent: document.body });
|
||||||
// this.menu = new ComfyAppMenu(this);
|
// this.menu = new ComfyAppMenu(this);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1551,11 +1559,11 @@ export class ComfyViewWorkflowApp {
|
|||||||
// await Promise.all([this.workflowManager.loadWorkflows(), this.ui.settings.load()]);
|
// await Promise.all([this.workflowManager.loadWorkflows(), this.ui.settings.load()]);
|
||||||
await this.#loadExtensions();
|
await this.#loadExtensions();
|
||||||
|
|
||||||
addDomClippingSetting();
|
// addDomClippingSetting();
|
||||||
this.#addProcessMouseHandler();
|
this.#addProcessMouseHandler();
|
||||||
this.#addProcessKeyHandler();
|
this.#addProcessKeyHandler();
|
||||||
this.#addConfigureHandler();
|
this.#addConfigureHandler();
|
||||||
this.#addApiUpdateHandlers();
|
// this.#addApiUpdateHandlers();
|
||||||
this.#addRestoreWorkflowView();
|
this.#addRestoreWorkflowView();
|
||||||
|
|
||||||
this.graph = new LGraph();
|
this.graph = new LGraph();
|
||||||
@ -1579,33 +1587,56 @@ export class ComfyViewWorkflowApp {
|
|||||||
ro.observe(this.bodyRight);
|
ro.observe(this.bodyRight);
|
||||||
ro.observe(this.bodyBottom);
|
ro.observe(this.bodyBottom);
|
||||||
|
|
||||||
|
// fetch and load workflow by ID
|
||||||
|
const queryParams = new URLSearchParams(window.location.search);
|
||||||
|
const workflowVersionID = queryParams.get('workflowVersionID');
|
||||||
|
const workflowVer = await fetch("/api/getCloudflowVersion/?id=" + workflowVersionID, {
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.then((response) => {
|
||||||
|
return response.json();
|
||||||
|
})
|
||||||
|
.then(async (data) => {
|
||||||
|
const workflowVer = data.data;
|
||||||
|
return workflowVer;
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.error(error);
|
||||||
|
});
|
||||||
|
if(!workflowVer) {
|
||||||
|
throw new Error("No workflow version found");
|
||||||
|
}
|
||||||
|
this.nodeDefs = JSON.parse(workflowVer.nodeDefs);
|
||||||
|
//// end of fetching workflow version //////
|
||||||
|
|
||||||
await this.#invokeExtensionsAsync("init");
|
await this.#invokeExtensionsAsync("init");
|
||||||
await this.registerNodes();
|
await this.registerNodes();
|
||||||
initWidgets(this);
|
initWidgets(this);
|
||||||
|
|
||||||
// Load previous workflow
|
// Load previous workflow
|
||||||
|
|
||||||
// fetch and load workflow by ID
|
const jsonObj = JSON.parse(workflowVer.json);
|
||||||
const queryParams = new URLSearchParams(window.location.search);
|
await this.loadGraphData(jsonObj, true);
|
||||||
const workflowVersionID = queryParams.get('workflowVersionID');
|
setTimeout(async () => {
|
||||||
const jsonStr = await fetch("/api/getCloudflowVersion/?id=" + workflowVersionID, {
|
if(!jsonObj.extra?.apiPrompt && !workflowVer.api_prompt && !jsonObj.extra?.workspace_info?.apiPrompt) {
|
||||||
headers: {
|
const p = await this.graphToPrompt();
|
||||||
"Content-Type": "application/json",
|
if(p.output) {
|
||||||
},
|
jsonObj.apiPrompt = p.output
|
||||||
})
|
await fetch("/api/workflow/updateWorkflowVersion", {
|
||||||
.then((response) => {
|
method: "POST",
|
||||||
return response.json();
|
headers: {
|
||||||
})
|
"Content-Type": "application/json",
|
||||||
.then((data) => {
|
},
|
||||||
console.log("getCloudflowVersion data", data);
|
body: JSON.stringify({
|
||||||
const workflowVer = data.data;
|
id: workflowVersionID,
|
||||||
this.nodeDefs = JSON.parse(workflowVer.nodeDefs);
|
api_prompt:JSON.stringify(p.output),
|
||||||
return JSON.parse(workflowVer.json)
|
}),
|
||||||
})
|
});
|
||||||
.catch((error) => {
|
}
|
||||||
console.error(error);
|
|
||||||
});
|
}}, 1);
|
||||||
await this.loadGraphData(workflow, true);
|
|
||||||
|
|
||||||
this.#addDrawNodeHandler();
|
this.#addDrawNodeHandler();
|
||||||
this.#addDrawGroupsHandler();
|
this.#addDrawGroupsHandler();
|
||||||
@ -1636,7 +1667,8 @@ export class ComfyViewWorkflowApp {
|
|||||||
async registerNodes() {
|
async registerNodes() {
|
||||||
const app = this;
|
const app = this;
|
||||||
// Load node definitions from the backend
|
// Load node definitions from the backend
|
||||||
const defs = await api.getNodeDefs();
|
const serverDefs = await api.getNodeDefs();
|
||||||
|
const defs = Object.assign({}, this.nodeDefs, serverDefs);
|
||||||
await this.registerNodesFromDefs(defs);
|
await this.registerNodesFromDefs(defs);
|
||||||
await this.#invokeExtensionsAsync("registerCustomNodes");
|
await this.#invokeExtensionsAsync("registerCustomNodes");
|
||||||
}
|
}
|
||||||
@ -1779,6 +1811,7 @@ export class ComfyViewWorkflowApp {
|
|||||||
}
|
}
|
||||||
|
|
||||||
showMissingNodesError(missingNodeTypes, hasAddedNodes = true) {
|
showMissingNodesError(missingNodeTypes, hasAddedNodes = true) {
|
||||||
|
return;
|
||||||
let seenTypes = new Set();
|
let seenTypes = new Set();
|
||||||
|
|
||||||
this.ui.dialog.show(
|
this.ui.dialog.show(
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user