wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-03-10 03:37:33 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Fix initial primitive values on connect

Browse Source
This commit is contained in:
pythongosssss 2023-12-11 17:57:34 +00:00
parent f17249cb51
commit 1361adb29a
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tests-ui/tests/groupNode.test.js
View File

@ -1,7 +1,7 @@
// @ts-check // @ts-check
/// <reference path="../node_modules/@types/jest/index.d.ts" /> /// <reference path="../node_modules/@types/jest/index.d.ts" />
const { start, createDefaultWorkflow, getNodeDef } = require("../utils"); const { start, createDefaultWorkflow, getNodeDef, checkBeforeAndAfterReload } = require("../utils");
const lg = require("../utils/litegraph"); const lg = require("../utils/litegraph");
describe("group node", () => { describe("group node", () => {
@ -682,12 +682,13 @@ describe("group node", () => {
test("correctly handles widget inputs", async () => { test("correctly handles widget inputs", async () => {
const { ez, graph, app } = await start(); const { ez, graph, app } = await start();
const upscaleMethods = (await getNodeDef("ImageScaleBy")).input.required["upscale_method"][0]; const upscaleMethods = (await getNodeDef("ImageScaleBy")).input.required["upscale_method"][0];
const image = ez.LoadImage(); const image = ez.LoadImage();
const scale1 = ez.ImageScaleBy(image.outputs[0]); const scale1 = ez.ImageScaleBy(image.outputs[0]);
const scale2 = ez.ImageScaleBy(image.outputs[0]); const scale2 = ez.ImageScaleBy(image.outputs[0]);
const preview1 = ez.PreviewImage(scale1.outputs[0]); const preview1 = ez.PreviewImage(scale1.outputs[0]);
const preview2 = ez.PreviewImage(scale2.outputs[0]); const preview2 = ez.PreviewImage(scale2.outputs[0]);
scale1.widgets.upscale_method.value = upscaleMethods[1];
scale1.widgets.upscale_method.convertToInput(); scale1.widgets.upscale_method.convertToInput();
const group = await convertToGroup(app, graph, "test", [scale1, scale2]); const group = await convertToGroup(app, graph, "test", [scale1, scale2]);
@ -705,22 +706,26 @@ describe("group node", () => {
const primitive = ez.PrimitiveNode(); const primitive = ez.PrimitiveNode();
primitive.outputs[0].connectTo(group.inputs[2]); primitive.outputs[0].connectTo(group.inputs[2]);
expect(primitive.widgets.value.widget.options.values).toBe(upscaleMethods); expect(primitive.widgets.value.widget.options.values).toBe(upscaleMethods);
expect(primitive.widgets.value.value).toBe(upscaleMethods[0]); expect(primitive.widgets.value.value).toBe(upscaleMethods[1]); // Ensure value is copied
primitive.widgets.value.value = upscaleMethods[1]; primitive.widgets.value.value = upscaleMethods[1];
// Ensure widget value is applied to prompt await checkBeforeAndAfterReload(graph, async (r) => {
expect((await graph.toPrompt()).output).toStrictEqual({ const scale1id = r ? `${group.id}:0` : scale1.id;
[image.id]: { inputs: { image: "example.png", upload: "image" }, class_type: "LoadImage" }, const scale2id = r ? `${group.id}:1` : scale2.id;
[scale1.id]: { // Ensure widget value is applied to prompt
inputs: { upscale_method: upscaleMethods[1], scale_by: 1, image: [`${image.id}`, 0] }, expect((await graph.toPrompt()).output).toStrictEqual({
class_type: "ImageScaleBy", [image.id]: { inputs: { image: "example.png", upload: "image" }, class_type: "LoadImage" },
}, [scale1id]: {
[scale2.id]: { inputs: { upscale_method: upscaleMethods[1], scale_by: 1, image: [`${image.id}`, 0] },
inputs: { upscale_method: "nearest-exact", scale_by: 1, image: [`${image.id}`, 0] }, class_type: "ImageScaleBy",
class_type: "ImageScaleBy", },
}, [scale2id]: {
[preview1.id]: { inputs: { images: [`${scale1.id}`, 0] }, class_type: "PreviewImage" }, inputs: { upscale_method: "nearest-exact", scale_by: 1, image: [`${image.id}`, 0] },
[preview2.id]: { inputs: { images: [`${scale2.id}`, 0] }, class_type: "PreviewImage" }, class_type: "ImageScaleBy",
},
[preview1.id]: { inputs: { images: [`${scale1id}`, 0] }, class_type: "PreviewImage" },
[preview2.id]: { inputs: { images: [`${scale2id}`, 0] }, class_type: "PreviewImage" },
});
}); });
}); });
test("adds widgets in node execution order", async () => { test("adds widgets in node execution order", async () => {

14
web/extensions/core/groupNode.js
View File

@ -426,6 +426,12 @@ export class GroupNodeConfig {
}); });
this.nodeDef.input.required[name] = config; this.nodeDef.input.required[name] = config;
this.newToOldWidgetMap[name] = { node, inputName }; this.newToOldWidgetMap[name] = { node, inputName };
if (!this.oldToNewWidgetMap[node.index]) {
this.oldToNewWidgetMap[node.index] = {};
}
this.oldToNewWidgetMap[node.index][inputName] = name;
inputMap[slots.length + i] = this.inputCount++; inputMap[slots.length + i] = this.inputCount++;
} }
} }
@ -916,6 +922,7 @@ export class GroupNodeHandler {
this.node.widgets[targetWidgetIndex + i].value = primitiveNode.widgets[i].value; this.node.widgets[targetWidgetIndex + i].value = primitiveNode.widgets[i].value;
} }
} }
return true;
} }
populateWidgets() { populateWidgets() {
@ -933,16 +940,11 @@ export class GroupNodeHandler {
const newName = map[oldName]; const newName = map[oldName];
const widgetIndex = this.node.widgets.findIndex((w) => w.name === newName); const widgetIndex = this.node.widgets.findIndex((w) => w.name === newName);
const mainWidget = this.node.widgets[widgetIndex]; const mainWidget = this.node.widgets[widgetIndex];
if (!newName) { if (this.populatePrimitive(node, nodeId, oldName, i, linkedShift)) {
// New name will be null if its a converted widget
this.populatePrimitive(node, nodeId, oldName, i, linkedShift);
// Find the inner widget and shift by the number of linked widgets as they will have been removed too // Find the inner widget and shift by the number of linked widgets as they will have been removed too
const innerWidget = this.innerNodes[nodeId].widgets?.find((w) => w.name === oldName); const innerWidget = this.innerNodes[nodeId].widgets?.find((w) => w.name === oldName);
linkedShift += innerWidget.linkedWidgets?.length ?? 0; linkedShift += innerWidget.linkedWidgets?.length ?? 0;
continue;
} }
if (widgetIndex === -1) { if (widgetIndex === -1) {
continue; continue;
} }