alphard/ComfyUI-Lora-Manager
1
0
Fork 0
mirror of https://github.com/willmiao/ComfyUI-Lora-Manager.git synced 2026-03-24 22:52:12 -03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Lora widget callback to prevent recursive updates and improve code clarity

Browse Source
This commit is contained in:
Will Miao
2025-03-02 17:55:33 +08:00
parent 3e68a7f772
commit ac07cbcd55
1 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
web/comfyui/lora_loader.js
View File

@@ -39,6 +39,7 @@ app.registerExtension({
let existingLoras = []; let existingLoras = [];
if (node.widgets_values && node.widgets_values.length > 0) { if (node.widgets_values && node.widgets_values.length > 0) {
const savedValue = node.widgets_values[1]; const savedValue = node.widgets_values[1];
// TODO: clean up this code
try { try {
// Check if the value is already an array/object // Check if the value is already an array/object
if (typeof savedValue === 'object' && savedValue !== null) { if (typeof savedValue === 'object' && savedValue !== null) {
@@ -53,37 +54,55 @@ app.registerExtension({
} }
// Merge the loras data // Merge the loras data
const mergedLoras = mergeLoras(node.widgets[0].value, existingLoras); const mergedLoras = mergeLoras(node.widgets[0].value, existingLoras);
// Add flag to prevent callback loops
let isUpdating = false;
// Get the widget object directly from the returned object // Get the widget object directly from the returned object
const result = addLorasWidget(node, "loras", { const result = addLorasWidget(node, "loras", {
defaultVal: mergedLoras // Pass object directly defaultVal: mergedLoras // Pass object directly
}, (value) => { }, (value) => {
// Remove loras that are not in the value array // Prevent recursive calls
const inputWidget = node.widgets[0]; if (isUpdating) return;
const pattern = /<lora:([^:]+):([\d\.]+)>/g; isUpdating = true;
const currentLoras = value.map(l => l.name);
let newText = inputWidget.value.replace(pattern, (match, name, strength) => { try {
return currentLoras.includes(name) ? match : ''; // Remove loras that are not in the value array
}); const inputWidget = node.widgets[0];
const pattern = /<lora:([^:]+):([\d\.]+)>/g;
// Clean up multiple spaces and trim const currentLoras = value.map(l => l.name);
newText = newText.replace(/\s+/g, ' ').trim();
let newText = inputWidget.value.replace(pattern, (match, name, strength) => {
inputWidget.value = newText; return currentLoras.includes(name) ? match : '';
});
// Clean up multiple spaces and trim
newText = newText.replace(/\s+/g, ' ').trim();
inputWidget.value = newText;
} finally {
isUpdating = false;
}
}); });
node.lorasWidget = result.widget; node.lorasWidget = result.widget;
// get the input widget and set a callback // get the input widget and set a callback
const inputWidget = node.widgets[0]; const inputWidget = node.widgets[0];
inputWidget.callback = (value) => { inputWidget.callback = (value) => {
// Merge the loras data with widget value // Prevent recursive calls
const currentLoras = node.lorasWidget.value || []; if (isUpdating) return;
const mergedLoras = mergeLoras(value, currentLoras); isUpdating = true;
node.lorasWidget.value = mergedLoras; try {
// node.graph.setDirtyCanvas(true, true); // Merge the loras data with widget value
const currentLoras = node.lorasWidget.value || [];
const mergedLoras = mergeLoras(value, currentLoras);
node.lorasWidget.value = mergedLoras;
} finally {
isUpdating = false;
}
}; };
}); });
} }