fix(loaders): sanitize invalid control_after_generate values when loading old workflows

Old workflows (saved before the control_after_generate feature) carry a
shorter widgets_values array. The frontend's index-based widget restore
then shifts the old weight_dtype value into the hidden control widget
(leaving an invalid value like 'default') and silently resets
weight_dtype to its default. On graph load, hand the shifted value back
to weight_dtype when it still sits at its default, then reset the
control mode to 'fixed' so old workflows keep loading deterministically.
This commit is contained in:
Will Miao
2026-08-25 08:30:17 +08:00
parent 41ed03e5c6
commit e05046af10
2 changed files with 332 additions and 1 deletions
+77 -1
View File
@@ -9,9 +9,26 @@ const NODE_CONFIGS = {
"Unet Loader (LoraManager)": {
modelWidget: "unet_name",
subType: "diffusion_model",
// Old workflows (saved before the control_after_generate feature) carry a
// shorter widgets_values array; the frontend's index-based restore then
// shifts the old weight_dtype value into the hidden control widget and
// silently resets weight_dtype to its default. Sanitization hands the
// shifted value back to this widget.
dtypeWidget: "weight_dtype",
},
};
// Fallback set of valid control modes, used only when the widget's
// options.values list is unavailable. Combo targets additionally get
// 'increment-wrap' appended by ComfyUI.
const CONTROL_MODES = new Set([
"fixed",
"increment",
"decrement",
"randomize",
"increment-wrap",
]);
const poolCache = new Map();
async function fetchPool(subType) {
@@ -66,10 +83,69 @@ function applyBaseModelFilter(node, config) {
}
}
function isControlWidget(widget) {
if (!widget || widget.type !== "combo") return false;
const values = widget.options?.values;
return (
Array.isArray(values) &&
values.length > 0 &&
values.every((value) => CONTROL_MODES.has(value))
);
}
/**
* Repair a control_after_generate widget that holds a value outside its option
* list after loading an old workflow. The invalid value is a side effect of
* the frontend's index-based widget restore: old workflows serialized fewer
* widget values (no control slot), so the value that followed the model combo
* (e.g. weight_dtype) shifted into the control widget while its real widget
* was silently reset to its default. Hand the shifted value back, then reset
* the control mode to 'fixed' (the node's declared default) so old workflows
* keep loading deterministically and the invalid value stops persisting.
*/
export function sanitizeControlWidget(node, config) {
const controlWidget = node.widgets?.find(
(widget) =>
// ComfyUI names the widget after the input option string when it is a
// string (e.g. 'fixed'), so it cannot be located by name alone.
widget.name === "control_after_generate" || isControlWidget(widget)
);
if (!controlWidget) return;
const validModes = controlWidget.options?.values;
if (Array.isArray(validModes)) {
if (validModes.includes(controlWidget.value)) return;
} else if (CONTROL_MODES.has(controlWidget.value)) {
return;
}
if (config.dtypeWidget) {
const dtypeWidget = node.widgets?.find(
(widget) => widget.name === config.dtypeWidget
);
const dtypeOptions = dtypeWidget?.options?.values;
if (
dtypeWidget &&
Array.isArray(dtypeOptions) &&
// Only hand the value back when the real widget still sits at its
// default; a non-default value means it was restored or edited
// correctly and the control value is just stale workflow data.
dtypeWidget.value === dtypeOptions[0] &&
dtypeOptions.includes(controlWidget.value)
) {
dtypeWidget.value = controlWidget.value;
}
}
controlWidget.value = "fixed";
}
function applyToAllNodes() {
app.graph?.nodes?.forEach((node) => {
const config = NODE_CONFIGS[node.comfyClass];
if (config) applyBaseModelFilter(node, config);
if (!config) return;
sanitizeControlWidget(node, config);
applyBaseModelFilter(node, config);
});
}