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

Prevent connecting non matching combos

Browse Source
This commit is contained in:
pythongosssss 2023-10-16 11:46:54 +01:00
parent bc3fa627c7
commit 017248f6ff
1 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
web/extensions/core/widgetInputs.js
View File

@ -100,6 +100,27 @@ function getWidgetType(config) {
return { type }; return { type };
} }
function isValidCombo(combo, obj) {
// New input isnt a combo
if (!(obj instanceof Array)) {
console.log(`connection rejected: tried to connect combo to ${obj}`);
return false;
}
// New imput combo has a different size
if (combo.length !== obj.length) {
console.log(`connection rejected: combo lists dont match`);
return false;
}
// New input combo has different elements
if (combo.find((v, i) => obj[i] !== v)) {
console.log(`connection rejected: combo lists dont match`);
return false;
}
return true;
}
app.registerExtension({ app.registerExtension({
name: "Comfy.WidgetInputs", name: "Comfy.WidgetInputs",
async beforeRegisterNodeDef(nodeType, nodeData, app) { async beforeRegisterNodeDef(nodeType, nodeData, app) {
@ -256,6 +277,28 @@ app.registerExtension({
return r; return r;
}; };
// Prevent connecting COMBO lists to converted inputs that dont match types
const onConnectInput = nodeType.prototype.onConnectInput;
nodeType.prototype.onConnectInput = function (targetSlot, type, output, originNode, originSlot) {
const v = onConnectInput?.(this, arguments);
// Not a combo, ignore
if (type !== "COMBO") return v;
// Primitive output, allow that to handle
if (originNode.outputs[originSlot].widget) return v;
// Ensure target is also a combo
const targetCombo = this.inputs[targetSlot].widget?.[GET_CONFIG]?.()?.[0];
if (!targetCombo || !(targetCombo instanceof Array)) return v;
// Check they match
const originConfig = originNode.constructor?.nodeData?.output?.[originSlot];
if (!originConfig || !isValidCombo(targetCombo, originConfig)) {
return false;
}
return v;
};
}, },
registerCustomNodes() { registerCustomNodes() {
class PrimitiveNode { class PrimitiveNode {
@ -315,7 +358,7 @@ app.registerExtension({
onAfterGraphConfigured() { onAfterGraphConfigured() {
if (this.outputs[0].links?.length && !this.widgets?.length) { if (this.outputs[0].links?.length && !this.widgets?.length) {
if(!this.#onFirstConnection()) return; if (!this.#onFirstConnection()) return;
// Populate widget values from config data // Populate widget values from config data
if (this.widgets) { if (this.widgets) {
@ -387,7 +430,7 @@ app.registerExtension({
} }
const config = widget[GET_CONFIG]?.(); const config = widget[GET_CONFIG]?.();
if(!config) return; if (!config) return;
const { type } = getWidgetType(config); const { type } = getWidgetType(config);
// Update our output to restrict to the widget type // Update our output to restrict to the widget type
@ -500,21 +543,7 @@ app.registerExtension({
const config2 = input.widget[GET_CONFIG](); const config2 = input.widget[GET_CONFIG]();
if (config1[0] instanceof Array) { if (config1[0] instanceof Array) {
// New input isnt a combo if (!isValidCombo(config1[0], config2[0])) return false;
if (!(config2[0] instanceof Array)) {
console.log(`connection rejected: tried to connect combo to ${config2[0]}`);
return false;
}
// New imput combo has a different size
if (config1[0].length !== config2[0].length) {
console.log(`connection rejected: combo lists dont match`);
return false;
}
// New input combo has different elements
if (config1[0].find((v, i) => config2[0][i] !== v)) {
console.log(`connection rejected: combo lists dont match`);
return false;
}
} else if (config1[0] !== config2[0]) { } else if (config1[0] !== config2[0]) {
// Types dont match // Types dont match
console.log(`connection rejected: types dont match`, config1[0], config2[0]); console.log(`connection rejected: types dont match`, config1[0], config2[0]);