Fix test, revert accidental changes to groupNode

This commit is contained in:
pythongosssss 2024-03-21 17:50:14 +00:00
parent 9be066014e
commit a0d505a34a
2 changed files with 38 additions and 97 deletions

View File

@ -72,6 +72,7 @@ export function mockApi(config = {}) {
storeUserData: jest.fn((file, data) => { storeUserData: jest.fn((file, data) => {
userData[file] = data; userData[file] = data;
}), }),
listUserData: jest.fn(() => [])
}; };
jest.mock("../../web/scripts/api", () => ({ jest.mock("../../web/scripts/api", () => ({
get api() { get api() {

View File

@ -142,7 +142,6 @@ export class GroupNodeConfig {
this.inputCount = 0; this.inputCount = 0;
this.oldToNewOutputMap = {}; this.oldToNewOutputMap = {};
this.newToOldOutputMap = {}; this.newToOldOutputMap = {};
this.newToOldInputMap = {};
this.oldToNewInputMap = {}; this.oldToNewInputMap = {};
this.oldToNewWidgetMap = {}; this.oldToNewWidgetMap = {};
this.newToOldWidgetMap = {}; this.newToOldWidgetMap = {};
@ -439,8 +438,6 @@ export class GroupNodeConfig {
this.nodeDef.input.required[name] = config; this.nodeDef.input.required[name] = config;
inputMap[i] = this.inputCount++; inputMap[i] = this.inputCount++;
this.newToOldInputMap[name] = [node.index, inputName];
} }
} }
@ -650,41 +647,44 @@ export class GroupNodeHandler {
}; };
this.node.updateLink = (link) => { this.node.updateLink = (link) => {
// // Replace the group node reference with the internal node // Replace the group node reference with the internal node
// link = { ...link }; link = { ...link };
// const output = this.groupData.newToOldOutputMap[link.origin_slot]; const output = this.groupData.newToOldOutputMap[link.origin_slot];
// let innerNode = this.innerNodes[output.node.index]; let innerNode = this.innerNodes[output.node.index];
// let l; let l;
// while (innerNode?.type === "Reroute") { while (innerNode?.type === "Reroute") {
// l = innerNode.getInputLink(0); l = innerNode.getInputLink(0);
// innerNode = innerNode.getInputNode(0); innerNode = innerNode.getInputNode(0);
// } }
// if (!innerNode) {
// return null; if (!innerNode) {
// } return null;
// if (l && GroupNodeHandler.isGroupNode(innerNode)) { }
// return innerNode.updateLink(l);
// } if (l && GroupNodeHandler.isGroupNode(innerNode)) {
// link.origin_id = innerNode.id; return innerNode.updateLink(l);
// link.origin_slot = l?.origin_slot ?? output.slot; }
// return link;
link.origin_id = innerNode.id;
link.origin_slot = l?.origin_slot ?? output.slot;
return link;
}; };
this.node.getInnerNodes = () => { this.node.getInnerNodes = () => {
// if (!this.innerNodes) { if (!this.innerNodes) {
// this.node.setInnerNodes( this.node.setInnerNodes(
// this.groupData.nodeData.nodes.map((n, i) => { this.groupData.nodeData.nodes.map((n, i) => {
// const innerNode = LiteGraph.createNode(n.type); const innerNode = LiteGraph.createNode(n.type);
// innerNode.configure(n); innerNode.configure(n);
// innerNode.id = `${this.node.id}:${i}`; innerNode.id = `${this.node.id}:${i}`;
// return innerNode; return innerNode;
// }) })
// ); );
// } }
// this.updateInnerWidgets(); this.updateInnerWidgets();
return [this.node]; return this.innerNodes;
}; };
this.node.recreate = async () => { this.node.recreate = async () => {
@ -1172,7 +1172,7 @@ export class GroupNodeHandler {
} }
static isGroupNode(node) { static isGroupNode(node) {
return !!node?.constructor?.nodeData?.[GROUP]; return !!node.constructor?.nodeData?.[GROUP];
} }
static async fromNodes(nodes) { static async fromNodes(nodes) {
@ -1252,66 +1252,6 @@ const ext = {
name: id, name: id,
setup() { setup() {
addConvertToGroupOptions(); addConvertToGroupOptions();
const graphToPrompt = app.graphToPrompt;
app.graphToPrompt = async function () {
const graph = arguments[0] ?? app.graph;
const prompt = await graphToPrompt.apply(this, [graph, false]);
for (const nodeId in prompt.output) {
const node = graph.getNodeById(nodeId);
if (GroupNodeHandler.isGroupNode(node)) {
const groupData = GroupNodeHandler.getGroupData(node);
const innerGraph = new LGraph();
const canvas = new LGraphCanvas(null, innerGraph, { skip_events: true, skip_render: true });
const old = localStorage.getItem("litegrapheditor_clipboard");
localStorage.setItem("litegrapheditor_clipboard", JSON.stringify(groupData.nodeData));
canvas.pasteFromClipboard();
localStorage.setItem("litegrapheditor_clipboard", old);
// Add internal nodes to output
const innerPrompt = await app.graphToPrompt(innerGraph, false);
for (const innerNodeId in innerPrompt.output) {
const p = (prompt.output[`${nodeId}:${innerNodeId}`] = innerPrompt.output[innerNodeId]);
if (!p.inputs) continue;
for (const inputId in p.inputs) {
const input = p.inputs[inputId];
if (input instanceof Array) {
// Rewrite IDs
p.inputs[inputId][0] = `${nodeId}:${input[0]}`;
}
}
}
for (const inputId in prompt.output[nodeId].inputs ?? {}) {
const input = prompt.output[nodeId].inputs[inputId];
if (!(input instanceof Array)) continue;
const mapping = groupData.newToOldInputMap[inputId];
const toSlot = groupData.nodeData.nodes[mapping[0]].inputs.findIndex((inp) => inp.name === mapping[1]);
debugger;
const toNode = `${nodeId}:${mapping[0]}`;
prompt.output[toNode].inputs ??= {};
prompt.output[toNode].inputs[toSlot] = input;
}
for (let i = 0; i < node.outputs?.length; i++) {
const output = node.outputs[i];
if (!output.links) continue;
for (const linkId of output.links) {
const link = graph.links[linkId];
const targetNode = graph.getNodeById(link.target_id);
const input = (prompt.output[link.target_id].inputs ??= {});
const mapping = groupData.newToOldOutputMap[i];
input[targetNode.inputs[link.target_slot].name] = [`${nodeId}:${mapping.node.index + 1}`, mapping.slot];
}
}
delete prompt.output[nodeId];
}
}
return prompt;
};
}, },
async beforeConfigureGraph(graphData, missingNodeTypes) { async beforeConfigureGraph(graphData, missingNodeTypes) {
const nodes = graphData?.extra?.groupNodes; const nodes = graphData?.extra?.groupNodes;
@ -1335,7 +1275,7 @@ const ext = {
if (nodes) { if (nodes) {
await GroupNodeConfig.registerFromWorkflow(nodes, {}); await GroupNodeConfig.registerFromWorkflow(nodes, {});
} }
}, }
}; };
app.registerExtension(ext); app.registerExtension(ext);