chunzhi/comfyui-deploy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: run with external inputs

Browse Source
This commit is contained in:
BennyKok 2023-12-15 12:03:40 +08:00
parent 1ea80e5e84
commit eac8d709f9
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/src/db/schema.ts
View File

@ -35,6 +35,22 @@ export const workflowRelations = relations(workflowTable, ({ many }) => ({
versions: many(workflowVersionTable), versions: many(workflowVersionTable),
})); }));
export type WorkflowJSONType = {
nodes: {
id: string;
type: string;
widgets_values: any[];
}[];
};
export type WorkflowAPIType = Record<
string,
{
inputs: Record<string, string>;
class_type: string;
}
>;
export const workflowVersionTable = dbSchema.table("workflow_versions", { export const workflowVersionTable = dbSchema.table("workflow_versions", {
workflow_id: uuid("workflow_id") workflow_id: uuid("workflow_id")
.notNull() .notNull()
@ -42,8 +58,8 @@ export const workflowVersionTable = dbSchema.table("workflow_versions", {
onDelete: "cascade", onDelete: "cascade",
}), }),
id: uuid("id").primaryKey().defaultRandom().notNull(), id: uuid("id").primaryKey().defaultRandom().notNull(),
workflow: jsonb("workflow").$type<any>(), workflow: jsonb("workflow").$type<WorkflowJSONType>(),
workflow_api: jsonb("workflow_api").$type<any>(), workflow_api: jsonb("workflow_api").$type<WorkflowAPIType>(),
version: integer("version").notNull(), version: integer("version").notNull(),
created_at: timestamp("created_at").defaultNow().notNull(), created_at: timestamp("created_at").defaultNow().notNull(),

11
web/src/server/createRun.ts
View File

@ -47,12 +47,16 @@ export async function createRun(
const comfyui_endpoint = `${machine.endpoint}/comfyui-deploy/run`; const comfyui_endpoint = `${machine.endpoint}/comfyui-deploy/run`;
let workflow_api = workflow_version_data.workflow_api; const workflow_api = workflow_version_data.workflow_api;
// Replace the inputs // Replace the inputs
if (inputs) { if (inputs && workflow_api) {
for (const key in inputs) { for (const key in inputs) {
workflow_api = workflow_api.replace(`"${key}"`, `"${inputs[key]}"`); Object.entries(workflow_api).forEach(([_, node]) => {
if (node.inputs["name"] === key) {
node.inputs["name"] = inputs[key];
}
});
} }
} }
@ -66,7 +70,6 @@ export async function createRun(
workflow_api: workflow_api, workflow_api: workflow_api,
status_endpoint: `${origin}/api/update-run`, status_endpoint: `${origin}/api/update-run`,
file_upload_endpoint: `${origin}/api/file-upload`, file_upload_endpoint: `${origin}/api/file-upload`,
inputs: inputs,
}), }),
}).then(async (res) => ComfyAPI_Run.parseAsync(await res.json())); }).then(async (res) => ComfyAPI_Run.parseAsync(await res.json()));
// .catch((error) => { // .catch((error) => {