Publish V3.9 source with per-chunk references and retained V3.8X2 workflows
This commit is contained in:
@@ -0,0 +1,242 @@
|
||||
const CLASS = "H3ContinuumReferenceImagesV39";
|
||||
const SAMPLER = "H3ContinuumSamplerV39";
|
||||
const MAX = 16;
|
||||
const LEGACY_SAMPLER_INPUTS = new Set([
|
||||
...Array.from({ length: 5 }, (_, index) => `reference_image_${index + 1}`),
|
||||
"image_references",
|
||||
]);
|
||||
const getWidget = (node, name) => node.widgets?.find((item) => item.name === name);
|
||||
const element = (tag, value = "") => {
|
||||
const item = document.createElement(tag);
|
||||
item.textContent = value;
|
||||
return item;
|
||||
};
|
||||
|
||||
function savedChunks(value) {
|
||||
const text = String(value ?? "off").trim().toLowerCase();
|
||||
if (text === "off") return new Set();
|
||||
if (text === "all") return new Set(Array.from({ length: MAX }, (_, i) => i + 1));
|
||||
const result = new Set();
|
||||
for (const token of text.split(",")) {
|
||||
const match = token.trim().match(/^(\d+)(?:\s*-\s*(\d+))?$/);
|
||||
if (!match) return null;
|
||||
const first = Number(match[1]);
|
||||
const last = Number(match[2] || match[1]);
|
||||
if (first < 1 || last > MAX || first > last) return null;
|
||||
for (let n = first; n <= last; n += 1) result.add(n);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
function linkedSamplers(node) {
|
||||
const output = node.outputs?.find((item) => item.name === "reference_images");
|
||||
return (output?.links || []).map((id) => {
|
||||
const link = node.graph?.links?.[id];
|
||||
return node.graph?.getNodeById?.(link?.target_id);
|
||||
}).filter((target) => target?.comfyClass === SAMPLER);
|
||||
}
|
||||
|
||||
function destination(node) {
|
||||
const targets = linkedSamplers(node);
|
||||
const counts = targets.map((target) => Number(getWidget(target, "chunks")?.value));
|
||||
const known = counts.length && counts.every((n) => Number.isInteger(n) && n >= 1 && n <= MAX && n === counts[0]);
|
||||
return { count: known ? counts[0] : MAX, known: Boolean(known) };
|
||||
}
|
||||
|
||||
function invalidate(node) {
|
||||
for (const target of linkedSamplers(node)) {
|
||||
target.__h3ContinuumReferencePlan = null;
|
||||
target.__h3ContinuumIntuitiveUxRefresh?.();
|
||||
target.setDirtyCanvas?.(true, true);
|
||||
}
|
||||
}
|
||||
|
||||
export function connectedV39LegacyReferenceInputs(node) {
|
||||
if (node?.comfyClass !== SAMPLER) return [];
|
||||
return (node.inputs || []).filter((input) =>
|
||||
LEGACY_SAMPLER_INPUTS.has(input.name) && input.link != null
|
||||
).map((input) => input.name);
|
||||
}
|
||||
|
||||
export function pruneV39LegacyReferenceInputs(node) {
|
||||
if (node?.comfyClass !== SAMPLER || typeof node.removeInput !== "function") return 0;
|
||||
let removed = 0;
|
||||
for (let index = (node.inputs?.length || 0) - 1; index >= 0; index -= 1) {
|
||||
const input = node.inputs[index];
|
||||
if (!LEGACY_SAMPLER_INPUTS.has(input.name) || input.link != null) continue;
|
||||
node.removeInput(index);
|
||||
removed += 1;
|
||||
}
|
||||
if (removed) {
|
||||
node.__h3ContinuumReferencePlan = null;
|
||||
node.setDirtyCanvas?.(true, true);
|
||||
}
|
||||
return removed;
|
||||
}
|
||||
|
||||
export function configureV39ReferenceImages(node) {
|
||||
if (node?.comfyClass !== CLASS || typeof document === "undefined") return;
|
||||
const mode = getWidget(node, "reference_use");
|
||||
const selectors = Array.from({ length: 9 }, (_, i) => getWidget(node, `reference_r${i + 1}_chunks`));
|
||||
if (!mode || selectors.some((item) => !item)) return;
|
||||
if (node.__h3ReferenceImagesRefresh) return node.__h3ReferenceImagesRefresh();
|
||||
if (typeof node.addDOMWidget !== "function") return;
|
||||
// The standard STRING widgets remain serializable; only their presentation is hidden.
|
||||
for (const item of selectors) {
|
||||
item.type = "hidden";
|
||||
item.hidden = true;
|
||||
item.options ||= {};
|
||||
item.options.hidden = true;
|
||||
item.computeSize = () => [0, 0];
|
||||
item.draw = () => {};
|
||||
}
|
||||
const panel = element("div");
|
||||
panel.style.cssText = "box-sizing:border-box;min-width:340px;max-height:360px;overflow:auto;padding:7px;color:#e7f4e9;background:#203827;font:12px Arial;pointer-events:auto";
|
||||
const host = element("div");
|
||||
host.style.cssText = "box-sizing:border-box;padding-top:8px;pointer-events:auto";
|
||||
host.append(panel);
|
||||
for (const name of ["pointerdown", "mousedown", "mouseup", "dblclick"]) {
|
||||
host.addEventListener(name, (event) => event.stopPropagation());
|
||||
}
|
||||
const display = node.addDOMWidget("reference_assignment", "h3_reference_assignment", host, { serialize: false });
|
||||
display.options ||= {};
|
||||
display.options.serialize = false;
|
||||
let panelHeight = 54;
|
||||
display.computeSize = (width) => [Math.max(340, Number(width) || Number(node.size?.[0]) || 340), panelHeight + 8];
|
||||
const reservePanelSpace = (height) => {
|
||||
panelHeight = height;
|
||||
panel.style.height = `${height}px`;
|
||||
const computedHeight = Number(node.computeSize?.()[1]);
|
||||
if (Number.isFinite(computedHeight) && typeof node.setSize === "function") {
|
||||
node.setSize([Number(node.size?.[0]) || 340, computedHeight]);
|
||||
}
|
||||
};
|
||||
let page = 0;
|
||||
let previousKey = null;
|
||||
const setSelection = (slot, selection) => {
|
||||
const target = selectors[slot - 1];
|
||||
target.value = [...selection].sort((a, b) => a - b).join(",") || "off";
|
||||
target.callback?.(target.value);
|
||||
invalidate(node);
|
||||
refresh();
|
||||
};
|
||||
const refresh = () => {
|
||||
const { count, known } = destination(node);
|
||||
const rows = Array.from({ length: 9 }, (_, i) => i + 1).filter((slot) =>
|
||||
node.inputs?.some((input) => input.name === `reference_image_${slot}` && input.link != null));
|
||||
const key = JSON.stringify([mode.value, count, known, rows, selectors.map((item) => item.value), page]);
|
||||
if (key === previousKey) return;
|
||||
previousKey = key;
|
||||
panel.replaceChildren();
|
||||
if (mode.value !== "Per chunk") {
|
||||
panel.append(element("div", "Connected images are used in all chunks."));
|
||||
reservePanelSpace(54);
|
||||
return;
|
||||
}
|
||||
panel.append(element("div", known ? `Per-chunk assignments · ${count} chunks` : "Destination unknown · show chunks 1–16"));
|
||||
if (!rows.length) {
|
||||
panel.append(element("div", "Connect Reference Images to assign them."));
|
||||
reservePanelSpace(64);
|
||||
return;
|
||||
}
|
||||
page = Math.min(page, Math.ceil(count / 6) - 1);
|
||||
const first = page * 6 + 1;
|
||||
const last = Math.min(first + 5, count);
|
||||
if (count > 6) {
|
||||
const nav = element("div");
|
||||
for (const [label, targetPage] of [["◀", page - 1], [`${first}–${last} / ${count}`, page], ["▶", page + 1]]) {
|
||||
const button = element("button", label);
|
||||
button.type = "button";
|
||||
button.disabled = targetPage < 0 || targetPage >= Math.ceil(count / 6) || targetPage === page;
|
||||
button.onclick = () => { page = targetPage; previousKey = null; refresh(); };
|
||||
nav.append(button);
|
||||
}
|
||||
panel.append(nav);
|
||||
}
|
||||
const table = element("table");
|
||||
table.style.cssText = "width:100%;border-collapse:collapse;text-align:center;color:#e7f4e9";
|
||||
const header = element("tr");
|
||||
header.append(element("th", "Image"));
|
||||
for (let n = first; n <= last; n += 1) header.append(element("th", String(n)));
|
||||
header.append(element("th", "All / Off"));
|
||||
table.append(header);
|
||||
for (const slot of rows) {
|
||||
const selected = savedChunks(selectors[slot - 1].value);
|
||||
const row = element("tr");
|
||||
row.append(element("td", `Image ${slot} · @R${slot}`));
|
||||
for (let n = first; n <= last; n += 1) {
|
||||
const cell = element("td");
|
||||
const checkbox = element("input");
|
||||
checkbox.type = "checkbox";
|
||||
checkbox.checked = selected?.has(n) || false;
|
||||
checkbox.disabled = selected === null;
|
||||
checkbox.setAttribute("aria-label", `Image ${slot}, Chunk ${n}`);
|
||||
checkbox.onchange = () => {
|
||||
const updated = new Set(selected);
|
||||
if (checkbox.checked) updated.add(n); else updated.delete(n);
|
||||
setSelection(slot, updated);
|
||||
};
|
||||
cell.append(checkbox);
|
||||
row.append(cell);
|
||||
}
|
||||
const actions = element("td");
|
||||
for (const [label, on] of [["All", true], ["Off", false]]) {
|
||||
const button = element("button", label);
|
||||
button.type = "button";
|
||||
button.disabled = selected === null;
|
||||
button.onclick = () => {
|
||||
const updated = new Set(selected);
|
||||
for (let n = 1; n <= count; n += 1) {
|
||||
if (on) updated.add(n); else updated.delete(n);
|
||||
}
|
||||
setSelection(slot, updated);
|
||||
};
|
||||
actions.append(button);
|
||||
}
|
||||
row.append(actions);
|
||||
table.append(row);
|
||||
}
|
||||
panel.append(table);
|
||||
for (const slot of rows) {
|
||||
const selected = savedChunks(selectors[slot - 1].value);
|
||||
if (selected === null) {
|
||||
panel.append(element("div", `Image ${slot}: invalid saved selection.`));
|
||||
continue;
|
||||
}
|
||||
const active = [...selected].filter((n) => n <= count).sort((a, b) => a - b);
|
||||
const future = [...selected].filter((n) => n > count).sort((a, b) => a - b);
|
||||
panel.append(element("div", `Image ${slot} → Chunks ${active.join(", ") || "none"}${future.length ? ` · saved beyond range: ${future.join(", ")}` : ""}`));
|
||||
}
|
||||
if (rows.every((slot) => ![...(savedChunks(selectors[slot - 1].value) || [])].some((n) => n <= count))) {
|
||||
panel.append(element("div", "No references assigned. Check the chunks to use."));
|
||||
}
|
||||
reservePanelSpace(Math.min(360, 77 + rows.length * 36 + (count > 6 ? 32 : 0)));
|
||||
node.setDirtyCanvas?.(true, true);
|
||||
};
|
||||
node.__h3ReferenceImagesRefresh = refresh;
|
||||
const oldConnections = node.onConnectionsChange;
|
||||
node.onConnectionsChange = function(...args) {
|
||||
const result = oldConnections?.apply(this, args);
|
||||
invalidate(this);
|
||||
refresh();
|
||||
return result;
|
||||
};
|
||||
for (const control of [mode, ...selectors]) {
|
||||
const previous = control.callback;
|
||||
control.callback = function(...args) {
|
||||
const result = previous?.apply(this, args);
|
||||
invalidate(node);
|
||||
refresh();
|
||||
return result;
|
||||
};
|
||||
}
|
||||
refresh();
|
||||
}
|
||||
|
||||
export function refreshV39ReferenceImagesForSampler(node) {
|
||||
if (node?.comfyClass !== SAMPLER) return;
|
||||
const input = node.inputs?.find((item) => item.name === "reference_images");
|
||||
const link = node.graph?.links?.[input?.link];
|
||||
const source = node.graph?.getNodeById?.(link?.origin_id);
|
||||
if (source?.comfyClass === CLASS) configureV39ReferenceImages(source);
|
||||
}
|
||||
Reference in New Issue
Block a user