From bacc2db4078fe07bf7d1249499062a5178f22828 Mon Sep 17 00:00:00 2001 From: Chris Dumas Date: Tue, 20 Oct 2026 16:11:50 +0000 Subject: [PATCH] filter prompt builder refmods by authored tags --- dumas_h3_prompt_nodes.py | 29 +++++++++++++++++++++++++---- tests/test_dumas_h3_nodes.py | 18 ++++++++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dumas_h3_prompt_nodes.py b/dumas_h3_prompt_nodes.py index 51714e3..3229d12 100644 --- a/dumas_h3_prompt_nodes.py +++ b/dumas_h3_prompt_nodes.py @@ -48,11 +48,11 @@ def _visual_refmods(mods): return result -def _refmod_directive(refmods, start_slot): +def _refmod_directive(refmods, start_slot, slots=None): """Build conservative default definitions for RefMods in the prompt.""" lines = [] for offset, (mod, _strength) in enumerate(refmods): - slot = start_slot + offset + slot = slots[offset] if slots is not None else start_slot + offset name = str(getattr(mod, "name", "visual reference") or "visual reference").strip() lines.append( f"@R{slot} is the {name} visual reference; preserve its identity, " @@ -252,7 +252,28 @@ class DumasH3SequencePromptBuilder: refmods.extend(_visual_refmods(kwargs.get(f"ref_mod_{index}"))) if len(refmods) > 9: raise ValueError("The prompt builder supports at most nine RefMod slots.") - generated = _refmod_directive(refmods, 1) + authored_text_by_chunk = [] + for clip in active_sequence["clips"]: + authored_text_by_chunk.append("\n".join([ + routing_directive, + *(str(slot.get("text", "")) for slot in clip["slots"]), + f"overall_soundscape: {sound}", + f"non_diegetic_music: {music_text}", + ])) + # RefMod slots are defined by socket order, but only referenced slots + # should be passed to the sampler. Keep the original @R number in the + # generated definition so a sparse use such as @R2 remains accurate. + referenced_slots = { + index for index in range(1, len(refmods) + 1) + if any(re.search(rf"@R{index}(?![A-Za-z0-9_])", text, re.IGNORECASE) + for text in authored_text_by_chunk) + } + selected_refmods = [ + refmod for index, refmod in enumerate(refmods, start=1) + if index in referenced_slots + ] + selected_slots = [index for index in range(1, len(refmods) + 1) if index in referenced_slots] + generated = _refmod_directive(selected_refmods, 1, selected_slots) if generated: directive = "\n\n".join(part for part in (directive, generated) if part) for reference_index in range(1, 10): @@ -293,7 +314,7 @@ class DumasH3SequencePromptBuilder: len(active_sequence["clips"]), float(default_chunk_seconds), reference_bundle, - refmods, + selected_refmods, 0, ) diff --git a/tests/test_dumas_h3_nodes.py b/tests/test_dumas_h3_nodes.py index 36c2dfb..013b4d8 100644 --- a/tests/test_dumas_h3_nodes.py +++ b/tests/test_dumas_h3_nodes.py @@ -139,6 +139,24 @@ class H3NodeTests(unittest.TestCase): finally: sys.modules.pop(reference_module.__name__, None) + def test_only_authored_refmod_tags_are_emitted(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( + 2, 4, "Shared @R2 definition.", '{"clips":[' + '{"slots":[{"start":0,"end":4,"text":"Use @R2."}]},' + '{"slots":[{"start":0,"end":4,"text":"No extra reference."}]}]}', + "", "", ref_mod_1=[(FakeRefMod("unused"), 1.0)], + ref_mod_2=[(FakeRefMod("used"), 1.0)], + ) + self.assertEqual([mod.name for mod, _strength in result[4]], ["used"]) + self.assertIn("@R2 is the used visual reference", result[0]) + self.assertNotIn("unused visual reference", 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