chris.dumas/DumasNodes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Expand H3 ref2v slots and tag routing

Browse Source
This commit is contained in:
chris.dumas
2026-08-25 19:35:48 +00:00
parent 27d1b76cd5
commit efce589cc5
3 changed files with 163 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dumas_h3_longvideos.py
+116 -91
View File
@@ -255,16 +255,17 @@ def split_paragraphs(text, delimiter):
# INPUT_TYPES so a workflow saved before they existed still maps its stored values
# onto the right widgets (ComfyUI matches them by position, not by name).
# APPEND to this tuple when adding a widget; never insert into the middle.
ADDED_WIDGETS = (
"beat_split", "per_beat_length",
"watermark_text", "watermark_position", "watermark_size", "watermark_opacity",
"watermark_margin", "intro_text", "intro_position", "intro_seconds",
"intro_fade", "intro_size", "overlay_font", "overlay_stroke",
"ref_mode", "ref_image_size", "ref_noise_aug", "auto_props", "prevent_nudity",
"exposed_terms", "anatomy_guard", "lock_restraints", "solidity_guard",
"motion_guard", "contact_guard",
"auto_soundscape", "allow_nonspeech_vocals",
)
ADDED_WIDGETS = (
"beat_split", "per_beat_length",
"watermark_text", "watermark_position", "watermark_size", "watermark_opacity",
"watermark_margin", "intro_text", "intro_position", "intro_seconds",
"intro_fade", "intro_size", "overlay_font", "overlay_stroke",
"ref_mode", "ref_image_size", "ref_noise_aug", "auto_props", "prevent_nudity",
"exposed_terms", "anatomy_guard", "lock_restraints", "solidity_guard",
"motion_guard", "contact_guard",
"auto_soundscape", "allow_nonspeech_vocals",
"ref_image_5", "ref_image_6", "ref_image_7", "ref_image_8", "ref_image_9",
)
NL = "\n"
# Lines that CONFIGURE a beat rather than being one. They attach to the beat that
@@ -3992,26 +3993,31 @@ def keyframe_rides_with_refs(ref_noise_aug):
_PICTURE_TAG = re.compile(r"<\s*picture[\s_\-]*(\d+)\s*>", re.I)
def picture_tags(text):
"""The reference slots a shot's text asks for, in ascending order."""
return sorted({int(m.group(1)) for m in _PICTURE_TAG.finditer(text or "")})
def resolve_tagged_refs(text, ref_list):
"""(rewritten text, images, dropped) for the <Picture N> tags in ONE shot.
The tokenizer numbers references by their position in the list it is handed, so
a shot that uses only <Picture 2> would receive that image labelled
def picture_tags(text):
"""The reference slots a shot's text asks for, in ascending order."""
return sorted({int(m.group(1)) for m in _PICTURE_TAG.finditer(text or "")})
def _connected_refs(ref_slots):
"""Connected refs only, preserving slot order and skipping empty sockets."""
return [ref for ref in (ref_slots or []) if ref is not None]
def resolve_tagged_refs(text, ref_list):
"""(rewritten text, images, dropped) for the <Picture N> tags in ONE shot.
The tokenizer numbers references by their position in the list it is handed, so
a shot that uses only <Picture 2> would receive that image labelled
<Picture 1> and the text would point at nothing. The tags are therefore
RENUMBERED per shot to match what that shot actually carries: slot 2 alone
becomes <Picture 1>, slots 2 and 4 become <Picture 1> and <Picture 2>.
A tag naming a slot with no image connected refers to nothing at all, so it is
removed from the text rather than left to confuse the encoder, and reported."""
wanted = picture_tags(text)
live = [n for n in wanted if 1 <= n <= len(ref_list or [])]
dropped = [n for n in wanted if n not in live]
renumber = {old: new for new, old in enumerate(live, 1)}
A tag naming a slot with no image connected refers to nothing at all, so it is
removed from the text rather than left to confuse the encoder, and reported."""
wanted = picture_tags(text)
live = [n for n in wanted if 1 <= n <= len(ref_list or []) and ref_list[n - 1] is not None]
dropped = [n for n in wanted if n not in live]
renumber = {old: new for new, old in enumerate(live, 1)}
def sub(m):
n = int(m.group(1))
@@ -4025,7 +4031,7 @@ def resolve_tagged_refs(text, ref_list):
return out.strip(), [ref_list[n - 1] for n in live], dropped
def shot_references(ref_list, ref_mode, shot_index, handoff):
def shot_references(ref_list, ref_mode, shot_index, handoff):
"""Pure: which reference images shot `shot_index` is conditioned on, or [] when
the shot should use the keyframe handoff instead.
@@ -4043,19 +4049,20 @@ def shot_references(ref_list, ref_mode, shot_index, handoff):
continuous take.
'every shot + handoff ref'
-- every shot is ref-conditioned AND the previous shot's last
frame is appended as one more reference. Continuity comes
back as a soft signal (the model is shown where the last
shot ended rather than told to start exactly there), and it
stays a single ref2va task, so nothing conflicts."""
if not ref_list:
return []
if ref_mode == "first shot":
return list(ref_list) if shot_index == 0 else []
if ref_mode == "every shot":
return list(ref_list)
if ref_mode == "every shot + handoff ref":
return list(ref_list) + ([handoff] if handoff is not None else [])
return list(ref_list) if shot_index == 0 else [] # unknown value -> safest
frame is appended as one more reference. Continuity comes
back as a soft signal (the model is shown where the last
shot ended rather than told to start exactly there), and it
stays a single ref2va task, so nothing conflicts."""
refs = _connected_refs(ref_list)
if not refs:
return []
if ref_mode == "first shot":
return list(refs) if shot_index == 0 else []
if ref_mode == "every shot":
return list(refs)
if ref_mode == "every shot + handoff ref":
return list(refs) + ([handoff] if handoff is not None else [])
return list(refs) if shot_index == 0 else [] # unknown value -> safest
# --- text-encoder / DiT compatibility -------------------------------------
@@ -5239,18 +5246,27 @@ class H3LongVideos:
},
"optional": {
"first_frame": ("IMAGE",),
# ref2va inputs. Order matters and is the ONLY thing that decides the
# roster: the tokenizer labels these <Picture 1>..<Picture 4> in the
# order they appear here, then appends the prompt. Refer to them by
# those tags in the prompt if you want a reference bound to a named
# character ("Kristy, <Picture 1>, walks in").
"ref_image_1": ("IMAGE", {"tooltip": "Reference image <Picture 1> -- identity/appearance "
"carried into the shots. Which shots receive it is set by ref_mode (or <Picture N> "
"tags in the beats); a referenced shot ALSO carries the previous frame as its "
"keyframe, so taking a reference never costs continuity."}),
"ref_image_2": ("IMAGE", {"tooltip": "Reference image <Picture 2>."}),
"ref_image_3": ("IMAGE", {"tooltip": "Reference image <Picture 3>."}),
"ref_image_4": ("IMAGE", {"tooltip": "Reference image <Picture 4>."}),
# ref2va inputs. SOCKET NUMBER matters: prompt tags refer to these
# exact slots, even when some intermediate sockets are left empty.
# A shot using only ref_image_7 is still tagged as <Picture 7> in the
# prompt and renumbered only for the per-shot tokenizer payload.
# When a mode uses all connected refs, they keep socket order.
# The tokenizer labels the carried refs <Picture 1>..<Picture N> in
# the order they are handed that shot.
# Refer to socket tags in the prompt if you want a reference bound to
# a named character ("Kristy, <Picture 7>, walks in").
"ref_image_1": ("IMAGE", {"tooltip": "Reference image <Picture 1> -- identity/appearance "
"carried into the shots. Which shots receive it is set by ref_mode (or <Picture N> "
"tags in the beats); a referenced shot ALSO carries the previous frame as its "
"keyframe, so taking a reference never costs continuity."}),
"ref_image_2": ("IMAGE", {"tooltip": "Reference image <Picture 2>."}),
"ref_image_3": ("IMAGE", {"tooltip": "Reference image <Picture 3>."}),
"ref_image_4": ("IMAGE", {"tooltip": "Reference image <Picture 4>."}),
"ref_image_5": ("IMAGE", {"tooltip": "Reference image <Picture 5>."}),
"ref_image_6": ("IMAGE", {"tooltip": "Reference image <Picture 6>."}),
"ref_image_7": ("IMAGE", {"tooltip": "Reference image <Picture 7>."}),
"ref_image_8": ("IMAGE", {"tooltip": "Reference image <Picture 8>."}),
"ref_image_9": ("IMAGE", {"tooltip": "Reference image <Picture 9>."}),
"plan_only": ("BOOLEAN", {"default": False,
"tooltip": "Preview the shot split WITHOUT rendering. Uses THIS node's own settings (no "
"second node, no duplicate entry): returns the plan in 'info' and the "
@@ -5743,11 +5759,13 @@ class H3LongVideos:
mute_nonspeech_audio=True, mute_fade_ms=40,
watermark_text="", watermark_position="bottom-right", watermark_size=4.0,
watermark_opacity=0.75, watermark_margin=3.0,
intro_text="", intro_position="center", intro_seconds=3.0, intro_fade=0.6,
intro_size=9.0, overlay_font="arial.ttf", overlay_stroke=0,
ref_image_1=None, ref_image_2=None, ref_image_3=None, ref_image_4=None,
ref_mode="where tagged", ref_image_size="match", ref_noise_aug=0.999,
graph=None, node_id=None):
intro_text="", intro_position="center", intro_seconds=3.0, intro_fade=0.6,
intro_size=9.0, overlay_font="arial.ttf", overlay_stroke=0,
ref_image_1=None, ref_image_2=None, ref_image_3=None, ref_image_4=None,
ref_image_5=None, ref_image_6=None, ref_image_7=None, ref_image_8=None,
ref_image_9=None,
ref_mode="where tagged", ref_image_size="match", ref_noise_aug=0.999,
graph=None, node_id=None):
# FIRST: detect a checkpoint swap since the previous execution and hard-flush.
# A stale resident model from a different checkpoint would otherwise poison
@@ -6024,21 +6042,24 @@ class H3LongVideos:
else "prompt/soundscape silencing only"))
# Same reference accounting the render reports: which shots lose the
# handoff is a composition decision, so it belongs in the preview.
n_refs = len([r for r in (ref_image_1, ref_image_2, ref_image_3, ref_image_4)
if r is not None])
ref_slots = [
ref_image_1, ref_image_2, ref_image_3, ref_image_4, ref_image_5,
ref_image_6, ref_image_7, ref_image_8, ref_image_9,
]
n_refs = len(_connected_refs(ref_slots))
plan_ref = ""
if n_refs:
# Mirror the render's placement exactly: 'where tagged' reads the
# prompts and falls back to first shot when nothing is tagged --
# reporting by ref_mode alone described shots the render never gave
# references to.
if ref_mode == "where tagged" and any(picture_tags(g) for g in gens):
on = [n + 1 for n, g in enumerate(gens) if picture_tags(g)]
how = "placed by <Picture N> tags"
else:
# prompts and falls back to first shot when nothing is tagged --
# reporting by ref_mode alone described shots the render never gave
# references to.
if ref_mode == "where tagged" and any(picture_tags(g) for g in gens):
on = [n + 1 for n, g in enumerate(gens) if resolve_tagged_refs(g, ref_slots)[1]]
how = "placed by <Picture N> tags"
else:
mode_eff = "first shot" if ref_mode == "where tagged" else ref_mode
on = [n + 1 for n in range(shots)
if shot_references([1] * n_refs, mode_eff, n, 1 if n else None)]
on = [n + 1 for n in range(shots)
if shot_references(ref_slots, mode_eff, n, 1 if n else None)]
how = (f"ref_mode '{mode_eff}'"
+ (" -- no tags found anywhere" if ref_mode == "where tagged" else ""))
plan_ref = (f" ref2va: {n_refs} reference image(s) at '{ref_image_size}' on shot(s) "
@@ -6076,18 +6097,22 @@ class H3LongVideos:
latent_chunks = [] # per-shot sampled latents, pre-decode
mouth_settled = [] # shots seeded from a settled (closed) mouth
handoff, sr = first_frame, None
ref_list = [r for r in (ref_image_1, ref_image_2, ref_image_3, ref_image_4) if r is not None]
ref_shots = [] # which shots ended up ref-conditioned
ref_missing = [] # <Picture N> tags naming an unconnected slot
ref_carried = [] # tagged shots that kept continuity as an extra ref
ref_keyframed = [] # tagged shots that kept it as a real keyframe
# 'where tagged' reads the prompt instead of counting shots. If references are
# connected but nothing is tagged anywhere, fall back to first-shot placement
# rather than silently conditioning nothing at all.
tag_driven = bool(ref_list) and ref_mode == "where tagged" and any(
picture_tags(g) for g in gens)
if ref_list and ref_mode == "where tagged" and not tag_driven:
ref_mode = "first shot"
ref_list = [
ref_image_1, ref_image_2, ref_image_3, ref_image_4, ref_image_5,
ref_image_6, ref_image_7, ref_image_8, ref_image_9,
]
connected_ref_count = len(_connected_refs(ref_list))
ref_shots = [] # which shots ended up ref-conditioned
ref_missing = [] # <Picture N> tags naming an unconnected slot
ref_carried = [] # tagged shots that kept continuity as an extra ref
ref_keyframed = [] # tagged shots that kept it as a real keyframe
# 'where tagged' reads the prompt instead of counting shots. If references are
# connected but nothing is tagged anywhere, fall back to first-shot placement
# rather than silently conditioning nothing at all.
tag_driven = bool(connected_ref_count) and ref_mode == "where tagged" and any(
picture_tags(g) for g in gens)
if connected_ref_count and ref_mode == "where tagged" and not tag_driven:
ref_mode = "first shot"
if cleanup_between_shots:
_deep_cleanup() # start the first (heaviest) shot with max free VRAM
@@ -6384,10 +6409,10 @@ class H3LongVideos:
f"dropped from the text")
else:
ref_note_missing = ""
if ref_list and ref_shots:
if connected_ref_count and ref_shots:
kept = [n for n in range(1, len(gens) + 1) if n not in ref_shots]
ref_placement = "placed by <Picture N> tags" if tag_driven else f"ref_mode '{ref_mode}'"
ref_note = (f" ref2va: {len(ref_list)} reference image(s) at '{ref_image_size}' on shot(s) "
ref_note = (f" ref2va: {connected_ref_count} reference image(s) at '{ref_image_size}' on shot(s) "
f"{','.join(str(n) for n in ref_shots)} "
f"({ref_placement})"
+ (f", ref_noise_aug {ref_noise_aug:.3f}" if ref_noise_aug is not None
@@ -6401,14 +6426,14 @@ class H3LongVideos:
f"{','.join(str(n) for n in ref_carried)} -- weaker than a keyframe, but "
f"ref_noise_aug below {KEYFRAME_SAFE_AUG:g} would soften a keyframe too "
f"(one aug covers every cond latent)" if ref_carried else "")
+ ("" if (ref_keyframed or ref_carried or kept)
else ", so every cut between beats is a CUT, not a continuous take")
+ ref_note_missing)
elif ref_list:
ref_note = (f" ref2va: {len(ref_list)} reference image(s) connected but ref_mode "
f"'{ref_mode}' applied them to no shot")
else:
ref_note = ""
+ ("" if (ref_keyframed or ref_carried or kept)
else ", so every cut between beats is a CUT, not a continuous take")
+ ref_note_missing)
elif connected_ref_count:
ref_note = (f" ref2va: {connected_ref_count} reference image(s) connected but ref_mode "
f"'{ref_mode}' applied them to no shot")
else:
ref_note = ""
info = ((anchor_note + " ") if anchor_note else "") + \
(f"{shape_str} at {w}x{h}; {all_frames.shape[0]} frames (~{actual:.1f}s actual). "
f"decode {'tiled' if tiled else 'full'}. {vram_str}.{hoff_str}"