neuro_llc/ComfyBox
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix primitive node connected slot types

Browse Source
This commit is contained in:
space-nuko
2023-05-21 19:26:33 -05:00
parent 29666a5286
commit 4d93312731
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/lib/convertVanillaWorkflow.ts
View File

@@ -272,7 +272,7 @@ function convertPrimitiveNode(vanillaWorkflow: ComfyVanillaWorkflow, node: Seria
const widgetLayout = layoutState.addWidget(group, comfyWidgetNode)
widgetLayout.attrs.title = mainOutput.name;
// Rewrite links to point to the new widget node
// Follow the existing links on the original node and do some cleanup
const newLinkOutputSlot = serWidgetNode.outputs.findIndex(o => o.name === comfyWidgetNode.outputSlotName)
if (newLinkOutputSlot !== -1) {
const newLinkOutput = serWidgetNode.outputs[newLinkOutputSlot];
@@ -280,21 +280,28 @@ function convertPrimitiveNode(vanillaWorkflow: ComfyVanillaWorkflow, node: Seria
for (const linkID of mainOutput.links) {
const link = vanillaWorkflow.links.find(l => l[0] === linkID)
if (link) {
// Rewrite links to point to the new widget node
link[1] = serWidgetNode.id; // origin node ID
link[2] = newLinkOutputSlot; // origin node slot
newLinkOutput.links ||= []
newLinkOutput.links.push(linkID)
// Look up the node the link was connected to.
const targetNode = vanillaWorkflow.nodes.find(n => n.id === link[3]) // target node ID
const foundInput = targetNode != null ? targetNode.inputs[link[4]] : null // target node slot
// Make sure that the input type for the connected inputs is correct.
// ComfyUI seems to set them to the input def type instead of the litegraph type.
// For example a "number" input gets changed to type "INT" or "FLOAT"
link[5] = widgetInputType // link data type
if (foundInput != null) {
foundInput.type = widgetInputType;
}
// Change the title of the widget to the name of the first input connected to
if (foundTitle == null) {
const targetNode = vanillaWorkflow.nodes.find(n => n.id === link[3]) // target node ID
if (targetNode != null) {
const foundInput = targetNode.inputs[link[4]] // target node slot
if (foundInput != null && foundInput.name) {
foundTitle = foundInput.name;
widgetLayout.attrs.title = foundTitle;
}
}
if (foundTitle == null && foundInput != null && foundInput.name) {
foundTitle = foundInput.name;
widgetLayout.attrs.title = foundTitle;
}
}
}

4
src/tests/convertVanillaWorkflowTests.ts
View File

@@ -98,7 +98,11 @@ export default class convertVanillaWorkflowTests extends UnitTest {
const kSampler = convWorkflow.graph.findNodesByType("KSampler")[0];
expect(links[0].origin_id).toEqual(widget.node.id);
expect(links[0].target_id).toEqual(kSampler.id);
expect(widget.node.outputs[0].type).toEqual("number");
const targetNode = widget.node.getOutputNodes(0)[0]
expect(targetNode.inputs[links[0].target_slot].type).toEqual("number")
expect(links[0].type).toEqual("number");
}