nodes/rgthree-rgthree-comfy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Dynamic Context] More fixes for input disconnecting.

Browse Source
This commit is contained in:
rgthree
2023-11-20 00:04:54 -05:00
parent 47d0836ca7
commit 5f940ddfbb
2 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ts/context_dynamic.ts
+20 -19
View File
@@ -17,7 +17,7 @@
* remove them, but keep them linked, and make them owned by the current context node.
* [x] Also, keep them if they have an output connected at the downstream node that has the
* connection.
* [ ] Also, do the above 3 through Switches..
* [ ] If a Switches output is connected, keep it even if no inputs have it (b/c they were removed).
* [ ] If keeping nodes with outputs connected that may not have an owned input, alert the user.
* [ ] Better handle combo support in weird ComfyUI way, rather than hacking it right now.
* [ ] Allow reording of inputs (and, thus, outputs)?
@@ -26,6 +26,7 @@
* [ ] Add option to convert old Context nodes to Dynamic Context nodes.
* [ ] Add a Dynamic Context Merger, like a switch, but merges in all data, not passes first None.
* [ ] Fix Reroute regression not having a correct type when connecting one-way
* [x] Don't allow user to rename delete the "+" input
*/
import type {
@@ -268,6 +269,9 @@ class ContextDynamicNodeBase extends BaseContextNode {
newName = this.addOwnedPrefix(newName);
}
input.name = newName;
this.outputs[index]!.name = this.stripOwnedPrefix(inputs[index]!.name).toUpperCase();
this.updateDownstream("update", {index, name: newName});
}
@@ -381,22 +385,19 @@ class ContextDynamicNode extends ContextDynamicNodeBase {
name = name.toLowerCase();
}
name = this.getNextUniqueNameForThisNode(name);
inputs[slotIndex]!.type = cxn.type as string;
inputs[slotIndex]!.name = this.addOwnedPrefix(name);
inputs[slotIndex]!.removable = true;
if (!this.outputs[slotIndex]) {
this.addOutput("*", "*");
}
inputs[slotIndex]!.type = cxn.type as string;
inputs[slotIndex]!.removable = true;
this.outputs[slotIndex]!.type = cxn.type as string;
this.outputs[slotIndex]!.name = this.stripOwnedPrefix(name).toLocaleUpperCase();
this.updateDownstream("connect", {index: slotIndex, name: this.stripOwnedPrefix(name)});
this.renameContextInput(slotIndex, name, true);
if (cxn.type === "COMBO" || cxn.type.includes(",") || Array.isArray(cxn.type)) {
// TODO: This is a hack to get around the absurd restrictions in widgetInput and COMBOS
(this.outputs[slotIndex] as any)!.widget = true;
}
this.addInput("+", "*");
this.updateDownstream("connect", {index: slotIndex, name: this.stripOwnedPrefix(name)});
}
}
}
@@ -469,9 +470,7 @@ class ContextDynamicNode extends ContextDynamicNodeBase {
const baseInputsData = node.provideInputsData();
const baseIndex = updatedSlotData.index;
const baseInput = baseInputsData[baseIndex]!;
inputs[baseIndex]!.name = this.stripOwnedPrefix(baseInput.name);
this.outputs[baseIndex]!.name = inputs[baseIndex]!.name.toUpperCase();
this.updateDownstream(update, updatedSlotData);
this.renameContextInput(baseIndex, baseInput.name);
this.stabilizeNames();
}
@@ -541,9 +540,9 @@ class ContextDynamicNode extends ContextDynamicNodeBase {
const opts: ContextMenuItem[] = [];
if (info.input) {
if (this.isOwnedInput(info.input.name)) {
if (this.isOwnedInput(info.input.name) && info.input.type !== '*') {
opts.push({
content: "Rename Label",
content: "✏️ Rename Input",
callback: () => {
var dialog = app.canvas.createDialog(
"<span class='name'>Name</span><input autofocus type='text'/><button>OK</button>",
@@ -580,7 +579,7 @@ class ContextDynamicNode extends ContextDynamicNodeBase {
});
opts.push({
content: "Delete Input",
content: "🗑️ Delete Input",
callback: () => {
this.removeInput(info.slot);
},
@@ -789,7 +788,7 @@ class ContextDynamicSwitchNode extends ContextDynamicNodeBase {
return;
}
const inputsDataLists = postInputsList.filter((d) => d.slot == slotIndex && d.nodeIndex > 0);
const inputsDataLists = postInputsList.filter((d) => d.slot == slotIndex && d.nodeIndex > 0 && d.type !== '*');
for (const data of inputsDataLists) {
this.connectSlotFromUpdateOrInput(data);
}
@@ -829,11 +828,13 @@ class ContextDynamicSwitchNode extends ContextDynamicNodeBase {
this.moveContextInput(foundIndex, data.shadowIndex);
}
}
while (this.shadowInputs[lastIndex + 1]) {
console.log("remving", lastIndex + 1);
this.removeContextInput(lastIndex + 1);
for (let index = inputs.length - 1; index > lastIndex; index--) {
const input = this.shadowInputs[index]!;
if (input.type !== '*') {
this.removeContextInput(index);
}
}
this.addContextInput("+", "*");
// this.addContextInput("+", "*");
console.log([...this.shadowInputs]);
}
web/context_dynamic.js
+15 -16
View File
@@ -168,6 +168,7 @@ class ContextDynamicNodeBase extends BaseContextNode {
newName = this.addOwnedPrefix(newName);
}
input.name = newName;
this.outputs[index].name = this.stripOwnedPrefix(inputs[index].name).toUpperCase();
this.updateDownstream("update", { index, name: newName });
}
fixInputsOutputsLinkSlots() {
@@ -256,19 +257,18 @@ class ContextDynamicNode extends ContextDynamicNodeBase {
name = name.toLowerCase();
}
name = this.getNextUniqueNameForThisNode(name);
inputs[slotIndex].type = cxn.type;
inputs[slotIndex].name = this.addOwnedPrefix(name);
inputs[slotIndex].removable = true;
if (!this.outputs[slotIndex]) {
this.addOutput("*", "*");
}
inputs[slotIndex].type = cxn.type;
inputs[slotIndex].removable = true;
this.outputs[slotIndex].type = cxn.type;
this.outputs[slotIndex].name = this.stripOwnedPrefix(name).toLocaleUpperCase();
this.updateDownstream("connect", { index: slotIndex, name: this.stripOwnedPrefix(name) });
this.renameContextInput(slotIndex, name, true);
if (cxn.type === "COMBO" || cxn.type.includes(",") || Array.isArray(cxn.type)) {
this.outputs[slotIndex].widget = true;
}
this.addInput("+", "*");
this.updateDownstream("connect", { index: slotIndex, name: this.stripOwnedPrefix(name) });
}
}
}
@@ -329,9 +329,7 @@ class ContextDynamicNode extends ContextDynamicNodeBase {
const baseInputsData = node.provideInputsData();
const baseIndex = updatedSlotData.index;
const baseInput = baseInputsData[baseIndex];
inputs[baseIndex].name = this.stripOwnedPrefix(baseInput.name);
this.outputs[baseIndex].name = inputs[baseIndex].name.toUpperCase();
this.updateDownstream(update, updatedSlotData);
this.renameContextInput(baseIndex, baseInput.name);
this.stabilizeNames();
}
this.setSize(this.computeSize());
@@ -378,9 +376,9 @@ class ContextDynamicNode extends ContextDynamicNodeBase {
getSlotMenuOptions(info) {
const opts = [];
if (info.input) {
if (this.isOwnedInput(info.input.name)) {
if (this.isOwnedInput(info.input.name) && info.input.type !== '*') {
opts.push({
content: "Rename Label",
content: "✏️ Rename Input",
callback: () => {
var dialog = app.canvas.createDialog("<span class='name'>Name</span><input autofocus type='text'/><button>OK</button>", {});
var dialogInput = dialog.querySelector("input");
@@ -415,7 +413,7 @@ class ContextDynamicNode extends ContextDynamicNodeBase {
},
});
opts.push({
content: "Delete Input",
content: "🗑️ Delete Input",
callback: () => {
this.removeInput(info.slot);
},
@@ -548,7 +546,7 @@ class ContextDynamicSwitchNode extends ContextDynamicNodeBase {
console.error("hmmm... no node foun to handle connect.");
return;
}
const inputsDataLists = postInputsList.filter((d) => d.slot == slotIndex && d.nodeIndex > 0);
const inputsDataLists = postInputsList.filter((d) => d.slot == slotIndex && d.nodeIndex > 0 && d.type !== '*');
for (const data of inputsDataLists) {
this.connectSlotFromUpdateOrInput(data);
}
@@ -578,11 +576,12 @@ class ContextDynamicSwitchNode extends ContextDynamicNodeBase {
this.moveContextInput(foundIndex, data.shadowIndex);
}
}
while (this.shadowInputs[lastIndex + 1]) {
console.log("remving", lastIndex + 1);
this.removeContextInput(lastIndex + 1);
for (let index = inputs.length - 1; index > lastIndex; index--) {
const input = this.shadowInputs[index];
if (input.type !== '*') {
this.removeContextInput(index);
}
}
this.addContextInput("+", "*");
console.log([...this.shadowInputs]);
}
updateFromUpstream(update, node, updatedSlotData) {