diff --git a/dumas_h3_prompt_nodes.py b/dumas_h3_prompt_nodes.py index 3899c76..51714e3 100644 --- a/dumas_h3_prompt_nodes.py +++ b/dumas_h3_prompt_nodes.py @@ -144,6 +144,7 @@ def normalize_sequence(value: Any, *, clip_count: int, default_seconds: float) - # there must be no unassigned tail on the editor track. slots[-1]["end"] = duration clips.append({"duration": duration, "slots": slots}) + clips[-1]["enabled"] = bool(raw_clip.get("enabled", True)) return {"version": 1, "clips": clips} @@ -166,7 +167,7 @@ def format_sequence_prompt( music_text = str(music or "").strip() or "N/A" sections: list[str] = [] cursor = 0.0 - for clip in sequence["clips"]: + for clip in (item for item in sequence["clips"] if item.get("enabled", True)): duration = float(clip["duration"]) chunk_lines = [f"[{cursor:g}-{cursor + duration:g}s]"] if directive: @@ -231,6 +232,13 @@ class DumasH3SequencePromptBuilder: clip_count=int(clip_count), default_seconds=float(default_chunk_seconds), ) + # Disabled tabs are deliberately removed before formatting and + # routing. The remaining enabled clips become a compact output + # sequence, so downstream nodes never receive gaps in chunk indices. + active_sequence = { + "version": sequence.get("version", 1), + "clips": [clip for clip in sequence["clips"] if clip.get("enabled", True)], + } selectors = [] routing_directive = str(shared_directive or "").strip() directive = routing_directive @@ -249,7 +257,7 @@ class DumasH3SequencePromptBuilder: directive = "\n\n".join(part for part in (directive, generated) if part) for reference_index in range(1, 10): chunks = [] - for chunk_index, clip in enumerate(sequence["clips"], start=1): + for chunk_index, clip in enumerate(active_sequence["clips"], start=1): # Match against the same per-chunk content emitted by # format_sequence_prompt, not only the editable shot lines. text = "\n".join([ @@ -278,11 +286,11 @@ class DumasH3SequencePromptBuilder: return ( format_sequence_prompt( shared_directive=directive, - sequence=sequence, + sequence=active_sequence, soundscape=soundscape, music=music, ), - len(sequence["clips"]), + len(active_sequence["clips"]), float(default_chunk_seconds), reference_bundle, refmods, diff --git a/js/sequence_prompt_builder.js b/js/sequence_prompt_builder.js index 0cebd84..0612493 100644 --- a/js/sequence_prompt_builder.js +++ b/js/sequence_prompt_builder.js @@ -91,7 +91,7 @@ function refModDescriptorsForNode(node, inputName = "ref_mods") { function defaultState(count, seconds) { return { version: 1, clips: Array.from({ length: count }, () => ({ - duration: seconds, slots: [{ start: 0, end: seconds, text: "" }], prompt: "", + duration: seconds, enabled: true, slots: [{ start: 0, end: seconds, text: "" }], prompt: "", })) }; } @@ -297,13 +297,14 @@ function configure(node) { DURATION_OPTIONS[6]); if (Number(secondsWidget.value) !== selectedDuration.seconds) secondsWidget.value = selectedDuration.seconds; const chunkDuration = selectedDuration.seconds; - while (state.clips.length < count) state.clips.push({ duration: chunkDuration, slots: [] }); + while (state.clips.length < count) state.clips.push({ duration: chunkDuration, enabled: true, slots: [] }); state.clips = state.clips.slice(0, count); active = Math.min(active, count - 1); panel.replaceChildren(); const tabs = el("div"); tabs.style.cssText = "display:flex;flex-wrap:wrap;gap:4px;margin-bottom:8px;border-bottom:1px solid #444;padding-bottom:6px"; state.clips.forEach((clip, index) => { - const button = el("button", `Clip ${index + 1}`); button.type = "button"; button.disabled = index === active; - button.style.cssText = `padding:3px 10px;border:1px solid ${index === active ? "#8bc99b" : "#555"};border-radius:3px;background:${index === active ? "#4b6f55" : "#333"};color:${index === active ? "#fff" : "#bbb"};cursor:pointer`; + const enabled = clip.enabled !== false; + const button = el("button", `${enabled ? "" : "× "}Clip ${index + 1}`); button.type = "button"; button.disabled = index === active; + button.style.cssText = `padding:3px 10px;border:1px solid ${index === active ? (enabled ? "#8bc99b" : "#c98b8b") : "#555"};border-radius:3px;background:${index === active ? (enabled ? "#4b6f55" : "#6f4b4b") : "#333"};color:${index === active ? "#fff" : (enabled ? "#bbb" : "#888")};cursor:pointer`; button.onclick = () => { active = index; render(); }; tabs.append(button); }); panel.append(tabs); @@ -334,7 +335,16 @@ function configure(node) { durationControl.append(durationLabel, durationSelect); panel.append(durationControl); const durationRow = el("div"); durationRow.style.cssText = "display:flex;align-items:center;gap:8px;margin:4px 0 6px;color:#b7d6bf"; - durationRow.append(el("strong", `Clip ${active + 1}`), el("span", `· ${selectedDuration.actual} actual frames · ${selectedDuration.latent} latent frames · ${selectedDuration.labelSeconds.toFixed(2)}s shared chunk duration`)); panel.append(durationRow); + const enabledLabel = el("label"); enabledLabel.style.cssText = "display:inline-flex;align-items:center;gap:4px;margin-left:auto;color:#c7d8cb;font-weight:normal;cursor:pointer"; + const enabledToggle = document.createElement("input"); enabledToggle.type = "checkbox"; enabledToggle.checked = clip.enabled !== false; enabledToggle.title = "Include this chunk in the output sockets"; + enabledToggle.onchange = () => { clip.enabled = enabledToggle.checked; persistState(); render(); }; + enabledLabel.append(enabledToggle, el("span", "Enabled")); + durationRow.append(el("strong", `Clip ${active + 1}`), el("span", `· ${selectedDuration.actual} actual frames · ${selectedDuration.latent} latent frames · ${selectedDuration.labelSeconds.toFixed(2)}s shared chunk duration`), enabledLabel); panel.append(durationRow); + if (clip.enabled === false) { + const disabledNote = el("div", "This chunk is disabled and will not be sent to the output sockets."); + disabledNote.style.cssText = "padding:5px 7px;margin:0 0 6px;background:#3a2525;border:1px solid #704848;border-radius:4px;color:#e2b4b4;font:11px monospace"; + panel.append(disabledNote); + } const timeline = el("div"); timeline.style.cssText = "position:relative;height:38px;margin:8px 0 4px;background:#171717;border-radius:4px;overflow:hidden;border:1px solid #555"; const palette = ["#4b9b67", "#4d7fb1", "#a87945", "#8c5aa8", "#a44f5d", "#3f8e8a"]; let prompt = null; diff --git a/tests/test_dumas_h3_nodes.py b/tests/test_dumas_h3_nodes.py index 1fa298b..36c2dfb 100644 --- a/tests/test_dumas_h3_nodes.py +++ b/tests/test_dumas_h3_nodes.py @@ -118,6 +118,27 @@ class H3NodeTests(unittest.TestCase): finally: sys.modules.pop(reference_module.__name__, None) + def test_disabled_chunks_are_removed_from_prompt_and_routing_outputs(self): + reference_module = types.ModuleType("upstream.v3.reference_images_v39") + reference_module.ReferenceImagesV39Bundle = FakeReferenceBundle + sys.modules[reference_module.__name__] = reference_module + try: + result = PROMPT.DumasH3SequencePromptBuilder().build( + 3, 4, "", '{"clips":[' + '{"enabled":true,"slots":[{"start":0,"end":4,"text":"Use @R1."}]},' + '{"enabled":false,"slots":[{"start":0,"end":4,"text":"Do not emit @R1."}]},' + '{"enabled":true,"slots":[{"start":0,"end":4,"text":"Continue @R1."}]}]}', + "", "", ref_mod_1=[(FakeRefMod("hero"), 1.0)], + ) + self.assertEqual(result[1], 2) + self.assertEqual(result[3].selectors[0], "1,2") + self.assertNotIn("Do not emit", result[0]) + self.assertIn("[0-4s]", result[0]) + self.assertIn("[4-8s]", result[0]) + self.assertNotIn("[8-12s]", result[0]) + finally: + sys.modules.pop(reference_module.__name__, None) + def test_per_clip_upscale_uses_connected_sigmas(self): original = UPSCALE._native_node original_helper = UPSCALE._continuum_helper