Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
173205ca51 | ||
|
|
98833ba99d | ||
|
|
a7f7225b3a | ||
|
|
5dc5c2ce8b | ||
|
|
83645811f4 | ||
|
|
216bc05762 | ||
|
|
49e099ee7f | ||
|
|
32a16645b5 | ||
|
|
7bb0b0abea | ||
|
|
0b189dcf7a | ||
|
|
e8599055a1 | ||
|
|
618a48e4d9 | ||
|
|
cbabcf8208 | ||
|
|
fbfbe4ef5a | ||
|
|
5b52793fad | ||
|
|
7e45c81589 | ||
|
|
027865b9ca | ||
|
|
9f0c546681 | ||
|
|
30ae81b86b | ||
|
|
179fa0778e | ||
|
|
a34c9eb4ff | ||
|
|
782a7d658b | ||
|
|
04a61af874 | ||
|
|
a0d80bcc47 | ||
|
|
fbb5f799cd | ||
|
|
9dc3c405a6 | ||
|
|
21ae4d62e0 | ||
|
|
836a6eba33 | ||
|
|
3b63d33ec7 | ||
|
|
c62921c3e8 | ||
|
|
3ab6342ce5 | ||
|
|
51e03a39b7 | ||
|
|
f7b94ccaef | ||
|
|
f6120a8500 | ||
|
|
0e119646ab | ||
|
|
c89570eae9 | ||
|
|
36d9f4369c | ||
|
|
2cb3c694f0 | ||
|
|
5c12cd18a3 | ||
|
|
c1d937e0e2 | ||
|
|
306816534b | ||
|
|
e098e44bf1 | ||
|
|
769257513b | ||
|
|
ab6ba86d76 | ||
|
|
ecd8ca6336 | ||
|
|
76b88b0c59 | ||
|
|
62fbbdd98e | ||
|
|
85e15c910a | ||
|
|
30400038c2 | ||
|
|
c8ddedbd57 | ||
|
|
6684c5f2e0 | ||
|
|
08630964d5 | ||
|
|
271e7de300 | ||
|
|
130b268d1e | ||
|
|
a2dabaab7e | ||
|
|
b7c3bba199 | ||
|
|
35ec12159e | ||
|
|
58b1c77c19 | ||
|
|
4a0f5cfcd4 | ||
|
|
6a7bec5d03 | ||
|
|
dfead66b9e | ||
|
|
00985b73b3 | ||
|
|
ffae1d87a5 | ||
|
|
74aca203ab | ||
|
|
e08281c12b | ||
|
|
faaeb374e0 | ||
|
|
0bac83a689 | ||
|
|
08365c7df5 | ||
|
|
9cbab72e86 | ||
|
|
e29d01ad24 | ||
|
|
ddd7dbb5af | ||
|
|
1ad68ee9e4 | ||
|
|
e64ad0fae4 | ||
|
|
deb6f1d033 | ||
|
|
72d4d74dd3 | ||
|
|
c42cf436c5 | ||
|
|
eeca789c27 |
File diff suppressed because it is too large
Load Diff
@@ -38,17 +38,31 @@
|
||||
- Outputs: `images`, `audio`, `info`, `script`, `frames_per_shot`, `total_frames`, `shots`, `video_seconds`, `fps`, `fps_int`, `latent`, `soundscape`
|
||||
- First-pass Dumas port of the `MiniMax-H3-Longvideos` sampler, brought in as a local starting point for long-form H3 chaining work.
|
||||
- Keeps the upstream split-beats / handoff / ref-routing behavior close to source so future Dumas-specific improvements can be compared against a known baseline.
|
||||
- Full user guide: [`H3_LONG_VIDEOS_GUIDE.md`](./H3_LONG_VIDEOS_GUIDE.md)
|
||||
- Only the canonical `DumasH3LongVideos` node key is exposed now; the older FL2VA/REF2VA alias entries are no longer duplicated in the Add Node menu.
|
||||
- Prompt `<Picture N>` tags now map to the actual ref socket numbers you wire, even with gaps such as only `ref_2` and `ref_7` connected.
|
||||
- Character refs now contribute appearance and wardrobe context from the same structured object, while location refs contribute environment context from theirs.
|
||||
- The default ref2v bias is now stronger: `ref_mode` defaults to `auto ref2v` so untagged prompts condition every shot instead of only shot 1, and `ref_noise_aug` defaults to `0.95` rather than the upstream-literal `0.999`.
|
||||
- `Dumas H3 Latent Upscale Params` provides the optional pre-decode latent refinement stage for the long-video node.
|
||||
- Per-shot directives now support `continuity:`, `ref_mode:`, `ref_noise_aug:`, `anchor_add:`, `soundscape:`, and `music:` in addition to the existing timing and wardrobe directives.
|
||||
|
||||
- `Dumas H3 Latent Upscale Params`
|
||||
- Inputs: `mode`, `model_name`, `method`, `width`, `height`, `device`, `precision`, `sampler_name`, `scheduler`, `steps`, `denoise`, `megapixels`, `tile_width`, `tile_height`, `overlap`, `fade_width`, `fade_height`, `overlap_mode`, `overlap_blend`, `tile_size_mode`, `grid_rows`, `grid_cols`, `spatial_w_overlap`, `spatial_h_overlap`, `min_tile_size`, `masked_area_noise`, `brightness_match`, `dynamic_fade`, `dynamic_fade_min`, `chunk_length`, `temporal_overlap`, `resize_conditioning`, `anchor_strength`
|
||||
- Output: `latent_upscale_param`
|
||||
- Bundles the optional latent-space upscaler settings used by `Dumas H3 Long Videos` before decode, so the main node can rebuild conditioning at the target size and run a short refinement pass with your chosen sampler, scheduler, step count, denoise, and the full upstream spatial split controls.
|
||||
|
||||
- `Dumas H3 Beat Prompt`
|
||||
- Inputs: authored through the custom front-end beat editor
|
||||
- Output: `prompt`
|
||||
- Builds one H3 prompt block per beat, with quick controls for per-shot timing, continuity, ref behavior, anchor additions, soundscape, and music while staying compatible with direct text editing.
|
||||
|
||||
- `Dumas H3 Prompt Curator`
|
||||
- Inputs: `action_prompt`, `anatomy_guard`, optional `anchor`, optional `soundscape`, optional `ref_1` through `ref_9`
|
||||
- Outputs: `prompt`, `ref_image_1` through `ref_image_9`, `reference_count`, `debug`
|
||||
- Builds one standalone MiniMax H3 prompt from your final action text plus structured character/location references.
|
||||
- The action text can mention references by character/location name, alias, `<Picture N>`, or `<refN>`. Only mentioned references are emitted, and the output images are compacted/renumbered so skipped inputs do not leave gaps.
|
||||
- Adds curated reference context, optional anatomy guard text, anchor/style text, and `overall_soundscape:` text while respecting MiniMax H3's reference-generation shape: one prompt plus up to nine reference images.
|
||||
|
||||
- `Dumas H3 Shot Length`
|
||||
- Inputs: `shot_seconds`, `fps`, optional `cap_to_h3_max`
|
||||
- Outputs: `seconds`, `frames`, `info`
|
||||
@@ -60,15 +74,25 @@
|
||||
- Reports the detected H3 base precision / quant format and the relevant compute-capability hints for the current card.
|
||||
|
||||
- `Dumas Character Reference`
|
||||
- Inputs: `image`, `picture_id`, `character_id`, `name`, `alias`, `gender`, `age`, `nationality`, `occupation`, `height_feet`, `height_inches`, `accent`, `description`, `general`, `wardrobe`
|
||||
- Inputs: `image`, `character_id`, `name`, `alias`, `gender`, `age`, `nationality`, `occupation`, `height_feet`, `height_inches`, `accent`, `description`, `general`, `wardrobe`
|
||||
- Output: `reference`
|
||||
- Builds one structured `REFERENCE` object carrying the conditioning image, identity description, wardrobe, general notes, and simple facts together.
|
||||
|
||||
- `Dumas Location Reference`
|
||||
- Inputs: `image`, `picture_id`, `location_id`, `name`, `alias`, `description`, `general`
|
||||
- Inputs: `image`, `location_id`, `name`, `alias`, `description`, `general`
|
||||
- Output: `reference`
|
||||
- Builds one structured `REFERENCE` object for a location/environment so H3 can use the same socket type for both character and scenic refs.
|
||||
|
||||
- `Dumas Character Helper`
|
||||
- Inputs: `image1`, `image2`, picture IDs, character identity fields, `general`, `wardrobe`
|
||||
- Outputs: `image1`, `image2`, `reference_prompt`, `wardrobe`
|
||||
- Restores the original general-purpose helper shape: pass two images through unchanged and emit prompt text/wardrobe text for manual wiring.
|
||||
|
||||
- `Dumas Location Helper`
|
||||
- Inputs: `image1`, `image2`, picture IDs, `location_id`, `name`, `alias`, `description`, `general`
|
||||
- Outputs: `image1`, `image2`, `reference_prompt`
|
||||
- Matching general-purpose helper for environments/locations: pass two images through unchanged and emit location reference prompt text.
|
||||
|
||||
- `Dumas Anchor Style`
|
||||
- Inputs: `anchor_style`, `style_description`
|
||||
- Output: `anchor`
|
||||
@@ -76,6 +100,11 @@
|
||||
- The preset wording is tuned for H3-safe persistent anchors: camera language, lighting, texture, production treatment, and tone, without naming characters or describing one-off actions.
|
||||
- Selecting a preset fills the editable description field, and the edited multiline description is the `STRING` value passed downstream into H3 anchor sockets such as `anchor_override`.
|
||||
|
||||
- `Dumas Soundscape Helper`
|
||||
- Inputs: `soundscape`, `soundscape_description`
|
||||
- Output: `soundscape`
|
||||
- Matching soundscape helper for standalone H3 prompts. Pick a preset such as quiet interior, rainy street, cafe, city night, forest, industrial, or silent, then edit the text that flows into `Dumas H3 Prompt Curator`.
|
||||
|
||||
- `Dumas JSON String to Object`
|
||||
- Input: `json_string`
|
||||
- Output: parsed `JSON`
|
||||
@@ -232,7 +261,7 @@ decr -> use index - 1
|
||||
|
||||
`Dumas H3 Plan Attach Scene Images` and `Dumas H3 Plan Extract Scene Images` are a companion pair for `ComfyUI-MiniMaxH3-Contex-Loop` and the local `ref2v` lane. The upstream H3 plan node cannot dynamically grow nine new image sockets for every JSON-defined scene, so Dumas stores scene image bindings beside the plan using a lightweight token and an in-memory registry. That keeps `plan.json` archiving intact while still letting you wire up nine IMAGE sockets per scene through chained helper nodes.
|
||||
|
||||
`Dumas Character Reference` and `Dumas Location Reference` live in `Dumas/MiniMax`. Both output a structured `REFERENCE` object that carries the image plus its semantic payload. `Dumas H3 Long Videos` accepts those `REFERENCE` sockets directly on `ref_1`..`ref_9`, resolves `<Picture N>` against the wired slot positions, and can also pull character wardrobe context from the structured ref data when `character_memory` is left blank.
|
||||
`Dumas Character Helper` is the restored two-image/text helper for general H3 workflows, and `Dumas Location Helper` mirrors it for scene/environment references. The structured `Dumas Character Reference` and `Dumas Location Reference` nodes remain available separately for workflows that want a single `REFERENCE` socket. `Dumas H3 Prompt Curator` consumes those structured references, assigns the final `<Picture N>` numbering, and outputs only the compacted images the prompt actually mentions.
|
||||
|
||||
`Dumas Strip Iteration Suffix` keeps the part before the first underscore and drops the rest. Names like `char123_pose_final.png` become `char123.png`, while names with no underscore such as `char123.png` are left untouched.
|
||||
|
||||
|
||||
@@ -119,8 +119,10 @@ For locations:
|
||||
- Optional list of alternate match names.
|
||||
|
||||
- `picture_id`
|
||||
- Optional integer representing the intended `<Picture N>` identity.
|
||||
- This is authoring metadata, not the final socket position.
|
||||
- Optional integer representing the effective `<Picture N>` identity.
|
||||
- It is inferred by consumer nodes such as `Dumas H3 Long Videos` from the
|
||||
connected socket position when that position is known.
|
||||
- Producer nodes do not need a manual `picture_id` input.
|
||||
|
||||
- `picture_label`
|
||||
- Derived convenience text like `<Picture 1>`.
|
||||
@@ -167,7 +169,6 @@ Recommended name:
|
||||
Inputs:
|
||||
|
||||
- `image`
|
||||
- `picture_id`
|
||||
- `character_id`
|
||||
- `name`
|
||||
- `alias`
|
||||
@@ -202,7 +203,6 @@ Recommended name:
|
||||
Inputs:
|
||||
|
||||
- `image`
|
||||
- `picture_id`
|
||||
- `location_id`
|
||||
- `name`
|
||||
- `alias`
|
||||
@@ -383,4 +383,3 @@ That is the change that removes the current ambiguity between:
|
||||
- character identity
|
||||
- wardrobe data
|
||||
- location / environment description
|
||||
|
||||
|
||||
@@ -14,6 +14,10 @@ from .dumas_h3_longvideos import (
|
||||
NODE_CLASS_MAPPINGS as H3_LONGVIDEO_NODE_CLASS_MAPPINGS,
|
||||
NODE_DISPLAY_NAME_MAPPINGS as H3_LONGVIDEO_NODE_DISPLAY_NAME_MAPPINGS,
|
||||
)
|
||||
from .dumas_h3_latent_upscale import (
|
||||
NODE_CLASS_MAPPINGS as H3_LATENT_UPSCALE_NODE_CLASS_MAPPINGS,
|
||||
NODE_DISPLAY_NAME_MAPPINGS as H3_LATENT_UPSCALE_NODE_DISPLAY_NAME_MAPPINGS,
|
||||
)
|
||||
from .dumas_h3_shot_length import (
|
||||
NODE_CLASS_MAPPINGS as H3_SHOT_LENGTH_NODE_CLASS_MAPPINGS,
|
||||
NODE_DISPLAY_NAME_MAPPINGS as H3_SHOT_LENGTH_NODE_DISPLAY_NAME_MAPPINGS,
|
||||
@@ -31,6 +35,7 @@ NODE_CLASS_MAPPINGS = {}
|
||||
NODE_CLASS_MAPPINGS.update(JSON_NODE_CLASS_MAPPINGS)
|
||||
NODE_CLASS_MAPPINGS.update(IMAGE_NODE_CLASS_MAPPINGS)
|
||||
NODE_CLASS_MAPPINGS.update(H3_LONGVIDEO_NODE_CLASS_MAPPINGS)
|
||||
NODE_CLASS_MAPPINGS.update(H3_LATENT_UPSCALE_NODE_CLASS_MAPPINGS)
|
||||
NODE_CLASS_MAPPINGS.update(H3_SHOT_LENGTH_NODE_CLASS_MAPPINGS)
|
||||
NODE_CLASS_MAPPINGS.update(H3_INSPECTOR_NODE_CLASS_MAPPINGS)
|
||||
NODE_CLASS_MAPPINGS.update(H3_BEAT_PROMPT_NODE_CLASS_MAPPINGS)
|
||||
@@ -39,6 +44,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {}
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(JSON_NODE_DISPLAY_NAME_MAPPINGS)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(IMAGE_NODE_DISPLAY_NAME_MAPPINGS)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(H3_LONGVIDEO_NODE_DISPLAY_NAME_MAPPINGS)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(H3_LATENT_UPSCALE_NODE_DISPLAY_NAME_MAPPINGS)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(H3_SHOT_LENGTH_NODE_DISPLAY_NAME_MAPPINGS)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(H3_INSPECTOR_NODE_DISPLAY_NAME_MAPPINGS)
|
||||
NODE_DISPLAY_NAME_MAPPINGS.update(H3_BEAT_PROMPT_NODE_DISPLAY_NAME_MAPPINGS)
|
||||
|
||||
+10
-1
@@ -150,7 +150,16 @@ class H3ModelInspector:
|
||||
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {"required": {"model": ("MODEL",)}}
|
||||
return {
|
||||
"required": {
|
||||
"model": (
|
||||
"MODEL",
|
||||
{
|
||||
"tooltip": "MiniMax / H3 model to inspect for quantization and tensor format."
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
def inspect(self, model):
|
||||
label, _counts, report = _detect(model)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+1063
-280
File diff suppressed because it is too large
Load Diff
@@ -39,10 +39,11 @@ class H3ShotLength:
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"shot_seconds": ("FLOAT", {"default": 5.0, "min": 0.2, "max": 15.1, "step": 0.5,
|
||||
"shot_seconds": ("FLOAT", {"default": 3.0, "min": 0.2, "max": 15.1, "step": 0.5,
|
||||
"tooltip": "Length of each shot. Feeds the sampler's shot_seconds AND (as frames) "
|
||||
"the preview override. Max ~15s (362 frames)."}),
|
||||
"fps": ("INT", {"default": 24, "min": 1, "max": 60}),
|
||||
"the preview override. Default 3s matches the common one-beat H3 test shot. Max ~15s (362 frames)."}),
|
||||
"fps": ("INT", {"default": 24, "min": 1, "max": 60,
|
||||
"tooltip": "Frame rate used for the seconds->frames conversion. H3 itself renders at 24fps, so 24 is the realistic default."}),
|
||||
},
|
||||
"optional": {
|
||||
"cap_to_h3_max": ("BOOLEAN", {"default": True,
|
||||
|
||||
+747
-28
@@ -26,9 +26,15 @@ _H3_PLAN_IMAGE_BINDINGS = OrderedDict()
|
||||
_H3_PLAN_IMAGE_BINDINGS_CAP = 128
|
||||
_H3_PLAN_IMAGE_SLOTS = 9
|
||||
_FOLDER_IMAGE_EXTS = (".png", ".jpg", ".jpeg", ".webp", ".bmp", ".gif", ".tiff", ".tif")
|
||||
_ANCHOR_STYLE_H3_NOTE = (
|
||||
" Keep this anchor focused on persistent camera language, lighting, texture, environment treatment, and tone; "
|
||||
"do not name characters or describe one-off actions."
|
||||
_ANCHOR_STYLE_H3_NOTE = ""
|
||||
_H3_PROMPT_REF_SLOTS = 9
|
||||
_H3_PROMPT_MAX_CHARS = 7000
|
||||
_PICTURE_TAG_RE = re.compile(r"<\s*picture[\s_\-]*(\d+)\s*>", re.I)
|
||||
_REF_TAG_RE = re.compile(r"<\s*ref[\s_\-]*(\d+)\s*>", re.I)
|
||||
_ANATOMY_GUARD_TEXT = (
|
||||
"Each person has one head, two arms, two hands with five fingers on each hand, "
|
||||
"and two legs with two feet. Limbs stay attached to the correct body and move "
|
||||
"only with the person they belong to."
|
||||
)
|
||||
_ANCHOR_STYLE_PRESETS = OrderedDict(
|
||||
[
|
||||
@@ -349,6 +355,47 @@ _ANCHOR_STYLE_PRESETS = OrderedDict(
|
||||
),
|
||||
]
|
||||
)
|
||||
_SOUNDSCAPE_PRESETS = OrderedDict(
|
||||
[
|
||||
(
|
||||
"quiet interior",
|
||||
"quiet indoor room tone, faint ventilation and distant household ambience",
|
||||
),
|
||||
(
|
||||
"rainy street",
|
||||
"steady rain, wet pavement, distant traffic hum",
|
||||
),
|
||||
(
|
||||
"cafe",
|
||||
"low room tone, faint glassware, cutlery, and muted conversation",
|
||||
),
|
||||
(
|
||||
"city night",
|
||||
"distant traffic hum, occasional horn, night air",
|
||||
),
|
||||
(
|
||||
"forest",
|
||||
"wind in leaves, distant birds, soft natural ambience",
|
||||
),
|
||||
(
|
||||
"industrial",
|
||||
"large interior reverb, distant metal ticks, low machine hum",
|
||||
),
|
||||
(
|
||||
"silent",
|
||||
"no dialogue, no vocals, only the natural ambient bed of the scene",
|
||||
),
|
||||
("custom", ""),
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
def _soundscape_options():
|
||||
return list(_SOUNDSCAPE_PRESETS.keys())
|
||||
|
||||
|
||||
def _soundscape_description(soundscape_name):
|
||||
return _SOUNDSCAPE_PRESETS.get(soundscape_name, "")
|
||||
_LOAD_IMAGES_FOLDER_DEFAULT_STATE = {
|
||||
"version": 1,
|
||||
"folder": "",
|
||||
@@ -889,6 +936,8 @@ def normalize_reference(value, picture_id=None, allow_image_fallback=True):
|
||||
if image is None and allow_image_fallback:
|
||||
image = value
|
||||
reference["image"] = image
|
||||
existing_picture_id = _coerce_picture_id(reference.get("picture_id"))
|
||||
previous_summary = _ensure_sentence(reference.get("summary") or "")
|
||||
if picture_id is not None and not reference.get("picture_id"):
|
||||
reference["picture_id"] = _coerce_picture_id(picture_id)
|
||||
reference["picture_label"] = _reference_label(reference.get("picture_id"))
|
||||
@@ -896,10 +945,16 @@ def normalize_reference(value, picture_id=None, allow_image_fallback=True):
|
||||
reference.setdefault("id", _reference_id("", reference.get("name"), reference["kind"]))
|
||||
reference.setdefault("name", "")
|
||||
reference["aliases"] = _parse_aliases(reference.get("aliases"))
|
||||
reference["summary"] = _ensure_sentence(
|
||||
reference.get("summary")
|
||||
or _reference_summary(reference["kind"], reference.get("name"), reference.get("picture_id"))
|
||||
auto_summary_before = _ensure_sentence(
|
||||
_reference_summary(reference["kind"], reference.get("name"), existing_picture_id)
|
||||
)
|
||||
auto_summary_after = _ensure_sentence(
|
||||
_reference_summary(reference["kind"], reference.get("name"), reference.get("picture_id"))
|
||||
)
|
||||
if not previous_summary or previous_summary == auto_summary_before:
|
||||
reference["summary"] = auto_summary_after
|
||||
else:
|
||||
reference["summary"] = previous_summary
|
||||
reference["description"] = _normalize_free_text(reference.get("description"))
|
||||
reference["wardrobe"] = _normalize_free_text(reference.get("wardrobe"))
|
||||
reference["general"] = _normalize_free_text(reference.get("general"))
|
||||
@@ -915,6 +970,206 @@ def normalize_reference(value, picture_id=None, allow_image_fallback=True):
|
||||
)
|
||||
|
||||
|
||||
def _reference_text(value):
|
||||
return " ".join(str(value or "").split()).strip()
|
||||
|
||||
|
||||
def _reference_sentence(value):
|
||||
text = _reference_text(value)
|
||||
if text and text[-1] not in ".!?":
|
||||
text += "."
|
||||
return text
|
||||
|
||||
|
||||
def _reference_name_keys(ref):
|
||||
names = []
|
||||
for key in ("name", "id"):
|
||||
value = _reference_text(ref.get(key))
|
||||
if value:
|
||||
names.append(value)
|
||||
for alias in ref.get("aliases") or []:
|
||||
value = _reference_text(alias)
|
||||
if value:
|
||||
names.append(value)
|
||||
seen = set()
|
||||
out = []
|
||||
for name in names:
|
||||
key = name.lower()
|
||||
if key in seen:
|
||||
continue
|
||||
seen.add(key)
|
||||
out.append(name)
|
||||
return out
|
||||
|
||||
|
||||
def _reference_image(ref):
|
||||
if not isinstance(ref, dict):
|
||||
return None
|
||||
return ref.get("image")
|
||||
|
||||
|
||||
def _normalize_prompt_refs(raw_refs):
|
||||
refs = []
|
||||
for slot_number, raw in enumerate(raw_refs or (), 1):
|
||||
if raw is None:
|
||||
refs.append(None)
|
||||
continue
|
||||
try:
|
||||
ref = normalize_reference(raw, picture_id=slot_number, allow_image_fallback=False)
|
||||
except Exception:
|
||||
refs.append(None)
|
||||
continue
|
||||
if _reference_image(ref) is None:
|
||||
refs.append(None)
|
||||
else:
|
||||
refs.append(ref)
|
||||
return refs
|
||||
|
||||
|
||||
def _explicit_reference_tags(text):
|
||||
return sorted(
|
||||
{
|
||||
int(match.group(1))
|
||||
for pattern in (_PICTURE_TAG_RE, _REF_TAG_RE)
|
||||
for match in pattern.finditer(text or "")
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
def _name_matches_reference(text, ref):
|
||||
haystack = str(text or "")
|
||||
for name in _reference_name_keys(ref):
|
||||
if re.search(r"\b" + re.escape(name) + r"\b", haystack, re.I):
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def _selected_prompt_refs(action_prompt, refs):
|
||||
selected = []
|
||||
seen_slots = set()
|
||||
for slot_number in _explicit_reference_tags(action_prompt):
|
||||
if not (1 <= slot_number <= len(refs)):
|
||||
continue
|
||||
ref = refs[slot_number - 1]
|
||||
if ref is None:
|
||||
continue
|
||||
selected.append((slot_number, ref))
|
||||
seen_slots.add(slot_number)
|
||||
for slot_number, ref in enumerate(refs, 1):
|
||||
if slot_number in seen_slots or ref is None:
|
||||
continue
|
||||
if _name_matches_reference(action_prompt, ref):
|
||||
selected.append((slot_number, ref))
|
||||
seen_slots.add(slot_number)
|
||||
return selected
|
||||
|
||||
|
||||
def _replace_reference_tags(text, picture_map):
|
||||
def repl(match):
|
||||
original = int(match.group(1))
|
||||
compacted = picture_map.get(original)
|
||||
if compacted is None:
|
||||
return ""
|
||||
return f"<Picture {compacted}>"
|
||||
|
||||
rewritten = _PICTURE_TAG_RE.sub(repl, str(text or ""))
|
||||
rewritten = _REF_TAG_RE.sub(repl, rewritten)
|
||||
return re.sub(r"[ \t]{2,}", " ", rewritten).strip()
|
||||
|
||||
|
||||
def _reference_fact_sentence(ref, label):
|
||||
if ref.get("kind") != "character":
|
||||
return ""
|
||||
facts = dict(ref.get("facts") or {})
|
||||
bits = []
|
||||
aliases = [_reference_text(alias) for alias in (ref.get("aliases") or []) if _reference_text(alias)]
|
||||
if aliases:
|
||||
bits.append(f"also known as {aliases[0]}")
|
||||
for key in ("gender", "nationality", "occupation"):
|
||||
value = _reference_text(facts.get(key))
|
||||
if value:
|
||||
bits.append(value if key != "occupation" else f"works as {value}")
|
||||
age = _parse_positive_int(facts.get("age"))
|
||||
if age is not None:
|
||||
bits.append(f"{age} years old")
|
||||
feet = _reference_text(facts.get("height_feet"))
|
||||
inches = _reference_text(facts.get("height_inches"))
|
||||
if feet and inches:
|
||||
bits.append(f"{feet} foot {inches} tall")
|
||||
elif feet:
|
||||
bits.append(f"{feet} foot tall")
|
||||
accent = _reference_text(facts.get("accent"))
|
||||
if accent:
|
||||
bits.append(f"speaks with a {accent} accent")
|
||||
if not bits:
|
||||
return ""
|
||||
return f"Character facts for {label}: " + ", ".join(bits) + "."
|
||||
|
||||
|
||||
def _reference_context(ref, compact_picture_number):
|
||||
label_name = _reference_text(ref.get("name")) or _reference_text(ref.get("id")) or "this reference"
|
||||
label = f"<Picture {compact_picture_number}> {label_name}"
|
||||
parts = [_reference_sentence(_reference_summary(ref.get("kind"), label_name, compact_picture_number))]
|
||||
description = _reference_sentence(ref.get("description"))
|
||||
wardrobe = _reference_sentence(ref.get("wardrobe"))
|
||||
general = _reference_sentence(ref.get("general"))
|
||||
facts = _reference_fact_sentence(ref, label)
|
||||
if ref.get("kind") == "location":
|
||||
if description:
|
||||
parts.append(f"Location context for {label}: {description}")
|
||||
if general:
|
||||
parts.append(f"Location notes for {label}: {general}")
|
||||
else:
|
||||
if facts:
|
||||
parts.append(facts)
|
||||
if description:
|
||||
parts.append(f"Persistent appearance for {label}: {description}")
|
||||
if wardrobe:
|
||||
parts.append(f"Persistent wardrobe/style for {label}: {wardrobe}")
|
||||
if general:
|
||||
parts.append(f"Character notes for {label}: {general}")
|
||||
return " ".join(part for part in parts if part).strip()
|
||||
|
||||
|
||||
def _append_prompt_section(parts, label, text):
|
||||
clean = _reference_text(text)
|
||||
if clean:
|
||||
parts.append(f"{label}: {clean}")
|
||||
|
||||
|
||||
def curate_h3_prompt(action_prompt, anchor="", soundscape="", refs=(), anatomy_guard="auto"):
|
||||
normalized_refs = _normalize_prompt_refs(refs)
|
||||
selected = _selected_prompt_refs(action_prompt, normalized_refs)
|
||||
picture_map = {slot_number: index for index, (slot_number, _ref) in enumerate(selected, 1)}
|
||||
action = _replace_reference_tags(action_prompt, picture_map)
|
||||
|
||||
prompt_parts = []
|
||||
_append_prompt_section(prompt_parts, "Scene anchor", anchor)
|
||||
if selected:
|
||||
contexts = [_reference_context(ref, picture_number) for picture_number, (_slot, ref) in enumerate(selected, 1)]
|
||||
_append_prompt_section(prompt_parts, "Reference context", " ".join(contexts))
|
||||
_append_prompt_section(prompt_parts, "Action", action)
|
||||
if anatomy_guard == "on" or (anatomy_guard == "auto" and any(ref.get("kind") == "character" for _slot, ref in selected)):
|
||||
_append_prompt_section(prompt_parts, "Anatomy guard", _ANATOMY_GUARD_TEXT)
|
||||
_append_prompt_section(prompt_parts, "overall_soundscape", soundscape)
|
||||
|
||||
prompt = "\n\n".join(prompt_parts).strip()
|
||||
if len(prompt) > _H3_PROMPT_MAX_CHARS:
|
||||
prompt = prompt[: _H3_PROMPT_MAX_CHARS - 3].rstrip() + "..."
|
||||
images = [_reference_image(ref) for _slot, ref in selected]
|
||||
images.extend([None] * (_H3_PROMPT_REF_SLOTS - len(images)))
|
||||
debug = (
|
||||
f"Selected {len(selected)} reference(s): "
|
||||
+ ", ".join(
|
||||
f"input {slot}-><Picture {index}> {_reference_text(ref.get('name')) or ref.get('id')}"
|
||||
for index, (slot, ref) in enumerate(selected, 1)
|
||||
)
|
||||
if selected
|
||||
else "Selected 0 references."
|
||||
)
|
||||
return (prompt, *images[:_H3_PROMPT_REF_SLOTS], len(selected), debug)
|
||||
|
||||
|
||||
def _parse_positive_int(value):
|
||||
text = str(value or "").strip()
|
||||
if not text:
|
||||
@@ -1037,6 +1292,65 @@ def _build_character_wardrobe_text(wardrobe, character_id, name, alias):
|
||||
return text
|
||||
|
||||
|
||||
def _label_for_location(name, location_id):
|
||||
return _normalize_free_text(name) or _normalize_free_text(location_id) or "the location"
|
||||
|
||||
|
||||
def _build_location_helper_text(
|
||||
primary_picture_id,
|
||||
secondary_picture_id,
|
||||
location_id,
|
||||
name,
|
||||
alias,
|
||||
description,
|
||||
general,
|
||||
):
|
||||
primary_picture = int(primary_picture_id)
|
||||
secondary_picture = int(secondary_picture_id)
|
||||
location_name = _normalize_free_text(name)
|
||||
location_id = _normalize_free_text(location_id)
|
||||
alias = _normalize_free_text(alias)
|
||||
description = _ensure_sentence(description)
|
||||
general = _ensure_sentence(general)
|
||||
location_label = _label_for_location(location_name, location_id)
|
||||
|
||||
if location_name:
|
||||
first_line = (
|
||||
f"<Picture {primary_picture}> and <Picture {secondary_picture}> reference "
|
||||
f"the same location called {location_name}."
|
||||
)
|
||||
elif location_id:
|
||||
first_line = (
|
||||
f"<Picture {primary_picture}> and <Picture {secondary_picture}> reference "
|
||||
f'the same location with ID "{location_id}".'
|
||||
)
|
||||
else:
|
||||
first_line = (
|
||||
f"<Picture {primary_picture}> and <Picture {secondary_picture}> reference "
|
||||
"the same location."
|
||||
)
|
||||
|
||||
lines = [
|
||||
first_line,
|
||||
f"<Picture {primary_picture}> is the primary wide/environment reference for {location_label}.",
|
||||
f"<Picture {secondary_picture}> is the secondary detail/angle reference for {location_label}.",
|
||||
]
|
||||
|
||||
facts = []
|
||||
if alias:
|
||||
facts.append(f"is also known as {alias}")
|
||||
if description:
|
||||
facts.append(description)
|
||||
|
||||
if facts:
|
||||
lines.append(f"{location_label} {', '.join(facts)}")
|
||||
|
||||
if general:
|
||||
lines.append(general)
|
||||
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
class DumasImageCompareNode:
|
||||
DESCRIPTION = (
|
||||
"Dumas Image Compare shows the difference between two images directly on "
|
||||
@@ -1599,6 +1913,274 @@ class DumasH3PlanExtractSceneImagesNode:
|
||||
return (passthrough_plan, *images, _connected_image_count(images))
|
||||
|
||||
|
||||
class DumasCharacterHelperNode:
|
||||
DESCRIPTION = (
|
||||
"Build a general character reference prompt and wardrobe sheet from two "
|
||||
"IMAGE sockets plus simple identity fields, while passing both images "
|
||||
"through unchanged."
|
||||
)
|
||||
RETURN_TYPES = ("IMAGE", "IMAGE", "STRING", "STRING")
|
||||
RETURN_NAMES = ("image1", "image2", "reference_prompt", "wardrobe")
|
||||
FUNCTION = "build_character_text"
|
||||
CATEGORY = "Dumas/MiniMax"
|
||||
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"image1": ("IMAGE", {"tooltip": "Primary image to pass through and describe."}),
|
||||
"image2": ("IMAGE", {"tooltip": "Secondary image to pass through and describe."}),
|
||||
"image1_picture_id": (
|
||||
["1", "2", "3", "4", "5", "6", "7", "8", "9"],
|
||||
{
|
||||
"default": "1",
|
||||
"tooltip": "Picture number to mention for image1 in the reference prompt.",
|
||||
},
|
||||
),
|
||||
"image2_picture_id": (
|
||||
["1", "2", "3", "4", "5", "6", "7", "8", "9"],
|
||||
{
|
||||
"default": "2",
|
||||
"tooltip": "Picture number to mention for image2 in the reference prompt.",
|
||||
},
|
||||
),
|
||||
"character_id": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": False,
|
||||
"tooltip": "Optional character ID string to include in the output text.",
|
||||
},
|
||||
),
|
||||
"name": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": False,
|
||||
"tooltip": "Character name used in the main reference sentences.",
|
||||
},
|
||||
),
|
||||
"alias": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": False,
|
||||
"tooltip": "Optional alternate name, codename, or nickname.",
|
||||
},
|
||||
),
|
||||
"gender": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": False,
|
||||
"tooltip": "Optional gender field for non-visual character facts.",
|
||||
},
|
||||
),
|
||||
"age": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": False,
|
||||
"tooltip": "Optional numeric age. Invalid values are omitted.",
|
||||
},
|
||||
),
|
||||
"nationality": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": False,
|
||||
"tooltip": "Optional nationality, origin, or cultural background.",
|
||||
},
|
||||
),
|
||||
"occupation": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": False,
|
||||
"tooltip": "Optional job, role, or function that is not visually obvious.",
|
||||
},
|
||||
),
|
||||
"height_feet": (
|
||||
["", "3", "4", "5", "6", "7", "8"],
|
||||
{
|
||||
"default": "",
|
||||
"tooltip": "Optional feet component for the character's height.",
|
||||
},
|
||||
),
|
||||
"height_inches": (
|
||||
["", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11"],
|
||||
{
|
||||
"default": "",
|
||||
"tooltip": "Optional inches component for the character's height.",
|
||||
},
|
||||
),
|
||||
"accent": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": False,
|
||||
"tooltip": "Optional short accent description.",
|
||||
},
|
||||
),
|
||||
"general": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": True,
|
||||
"tooltip": "Optional non-clothing details appended as the last sentence of the reference prompt.",
|
||||
},
|
||||
),
|
||||
"wardrobe": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": True,
|
||||
"tooltip": "Optional wardrobe/channel text. Plain clothing lists are auto-wrapped as 'Name = ...' when a name, alias, or character ID is present.",
|
||||
},
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
def build_character_text(
|
||||
self,
|
||||
image1,
|
||||
image2,
|
||||
image1_picture_id,
|
||||
image2_picture_id,
|
||||
character_id,
|
||||
name,
|
||||
alias,
|
||||
gender,
|
||||
age,
|
||||
nationality,
|
||||
occupation,
|
||||
height_feet,
|
||||
height_inches,
|
||||
accent,
|
||||
general,
|
||||
wardrobe,
|
||||
):
|
||||
text = _build_character_helper_text(
|
||||
image1_picture_id,
|
||||
image2_picture_id,
|
||||
character_id,
|
||||
name,
|
||||
alias,
|
||||
gender,
|
||||
age,
|
||||
nationality,
|
||||
occupation,
|
||||
height_feet,
|
||||
height_inches,
|
||||
accent,
|
||||
general,
|
||||
)
|
||||
wardrobe_text = _build_character_wardrobe_text(
|
||||
wardrobe,
|
||||
character_id,
|
||||
name,
|
||||
alias,
|
||||
)
|
||||
return (image1, image2, text, wardrobe_text)
|
||||
|
||||
|
||||
class DumasLocationHelperNode:
|
||||
DESCRIPTION = (
|
||||
"Build a general location reference prompt from two IMAGE sockets plus "
|
||||
"simple environment fields, while passing both images through unchanged."
|
||||
)
|
||||
RETURN_TYPES = ("IMAGE", "IMAGE", "STRING")
|
||||
RETURN_NAMES = ("image1", "image2", "reference_prompt")
|
||||
FUNCTION = "build_location_text"
|
||||
CATEGORY = "Dumas/MiniMax"
|
||||
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"image1": ("IMAGE", {"tooltip": "Primary location image to pass through and describe."}),
|
||||
"image2": ("IMAGE", {"tooltip": "Secondary location image to pass through and describe."}),
|
||||
"image1_picture_id": (
|
||||
["1", "2", "3", "4", "5", "6", "7", "8", "9"],
|
||||
{
|
||||
"default": "1",
|
||||
"tooltip": "Picture number to mention for image1 in the reference prompt.",
|
||||
},
|
||||
),
|
||||
"image2_picture_id": (
|
||||
["1", "2", "3", "4", "5", "6", "7", "8", "9"],
|
||||
{
|
||||
"default": "2",
|
||||
"tooltip": "Picture number to mention for image2 in the reference prompt.",
|
||||
},
|
||||
),
|
||||
"location_id": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": False,
|
||||
"tooltip": "Optional location ID string to include in the output text.",
|
||||
},
|
||||
),
|
||||
"name": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": False,
|
||||
"tooltip": "Location name used in the main reference sentences.",
|
||||
},
|
||||
),
|
||||
"alias": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": False,
|
||||
"tooltip": "Optional alternate name, label, or area name.",
|
||||
},
|
||||
),
|
||||
"description": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": True,
|
||||
"tooltip": "Persistent environment, layout, and atmosphere description.",
|
||||
},
|
||||
),
|
||||
"general": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": True,
|
||||
"tooltip": "Optional extra notes appended as the last sentence of the reference prompt.",
|
||||
},
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
def build_location_text(
|
||||
self,
|
||||
image1,
|
||||
image2,
|
||||
image1_picture_id,
|
||||
image2_picture_id,
|
||||
location_id,
|
||||
name,
|
||||
alias,
|
||||
description,
|
||||
general,
|
||||
):
|
||||
text = _build_location_helper_text(
|
||||
image1_picture_id,
|
||||
image2_picture_id,
|
||||
location_id,
|
||||
name,
|
||||
alias,
|
||||
description,
|
||||
general,
|
||||
)
|
||||
return (image1, image2, text)
|
||||
|
||||
|
||||
class DumasCharacterReferenceNode:
|
||||
DESCRIPTION = (
|
||||
"Build one structured REFERENCE object for a character so H3 can carry "
|
||||
@@ -1614,13 +2196,6 @@ class DumasCharacterReferenceNode:
|
||||
return {
|
||||
"required": {
|
||||
"image": ("IMAGE", {"tooltip": "Character reference image."}),
|
||||
"picture_id": (
|
||||
["1", "2", "3", "4", "5", "6", "7", "8", "9"],
|
||||
{
|
||||
"default": "1",
|
||||
"tooltip": "Authoring picture number for this reference.",
|
||||
},
|
||||
),
|
||||
"character_id": (
|
||||
"STRING",
|
||||
{
|
||||
@@ -1729,7 +2304,6 @@ class DumasCharacterReferenceNode:
|
||||
def build_reference(
|
||||
self,
|
||||
image,
|
||||
picture_id,
|
||||
character_id,
|
||||
name,
|
||||
alias,
|
||||
@@ -1750,7 +2324,6 @@ class DumasCharacterReferenceNode:
|
||||
explicit_id=character_id,
|
||||
name=name,
|
||||
aliases=alias,
|
||||
picture_id=picture_id,
|
||||
description=description,
|
||||
wardrobe=wardrobe,
|
||||
general=general,
|
||||
@@ -1782,13 +2355,6 @@ class DumasLocationReferenceNode:
|
||||
return {
|
||||
"required": {
|
||||
"image": ("IMAGE", {"tooltip": "Location or environment reference image."}),
|
||||
"picture_id": (
|
||||
["1", "2", "3", "4", "5", "6", "7", "8", "9"],
|
||||
{
|
||||
"default": "1",
|
||||
"tooltip": "Authoring picture number for this reference.",
|
||||
},
|
||||
),
|
||||
"location_id": (
|
||||
"STRING",
|
||||
{
|
||||
@@ -1832,7 +2398,7 @@ class DumasLocationReferenceNode:
|
||||
}
|
||||
}
|
||||
|
||||
def build_reference(self, image, picture_id, location_id, name, alias, description, general):
|
||||
def build_reference(self, image, location_id, name, alias, description, general):
|
||||
return (
|
||||
make_reference(
|
||||
kind="location",
|
||||
@@ -1840,7 +2406,6 @@ class DumasLocationReferenceNode:
|
||||
explicit_id=location_id,
|
||||
name=name,
|
||||
aliases=alias,
|
||||
picture_id=picture_id,
|
||||
description=description,
|
||||
general=general,
|
||||
facts={},
|
||||
@@ -1848,6 +2413,154 @@ class DumasLocationReferenceNode:
|
||||
)
|
||||
|
||||
|
||||
class DumasSoundscapeHelperNode:
|
||||
DESCRIPTION = (
|
||||
"Choose a soundscape preset, auto-fill its editable description, and pass "
|
||||
"the final soundscape text downstream for MiniMax H3 prompts."
|
||||
)
|
||||
RETURN_TYPES = ("STRING",)
|
||||
RETURN_NAMES = ("soundscape",)
|
||||
FUNCTION = "build_soundscape"
|
||||
CATEGORY = "Dumas/MiniMax"
|
||||
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
default_soundscape = "quiet interior"
|
||||
return {
|
||||
"required": {
|
||||
"soundscape": (
|
||||
_soundscape_options(),
|
||||
{
|
||||
"default": default_soundscape,
|
||||
"tooltip": "Preset title used to seed the editable soundscape description.",
|
||||
},
|
||||
),
|
||||
"soundscape_description": (
|
||||
"STRING",
|
||||
{
|
||||
"default": _soundscape_description(default_soundscape),
|
||||
"multiline": True,
|
||||
"tooltip": (
|
||||
"Editable environmental audio description. Whatever text is here "
|
||||
"is what the node outputs to the soundscape socket."
|
||||
),
|
||||
},
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
def build_soundscape(self, soundscape, soundscape_description):
|
||||
text = str(soundscape_description or "").strip()
|
||||
if not text:
|
||||
text = _soundscape_description(soundscape)
|
||||
return (text,)
|
||||
|
||||
|
||||
class DumasH3PromptCuratorNode:
|
||||
DESCRIPTION = (
|
||||
"Curate one MiniMax H3 prompt from an action textbox, anchor text, "
|
||||
"soundscape text, and up to nine structured references. References are "
|
||||
"compacted so only mentioned names, aliases, or explicit <Picture N>/<refN> "
|
||||
"tags are sent onward."
|
||||
)
|
||||
RETURN_TYPES = ("STRING",) + ("IMAGE",) * _H3_PROMPT_REF_SLOTS + ("INT", "STRING")
|
||||
RETURN_NAMES = (
|
||||
"prompt",
|
||||
"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",
|
||||
"reference_count",
|
||||
"debug",
|
||||
)
|
||||
FUNCTION = "curate_prompt"
|
||||
CATEGORY = "Dumas/MiniMax"
|
||||
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
optional = {
|
||||
"anchor": (
|
||||
"STRING",
|
||||
{
|
||||
"forceInput": True,
|
||||
"tooltip": "Optional anchor/style text, usually from Dumas Anchor Style.",
|
||||
},
|
||||
),
|
||||
"soundscape": (
|
||||
"STRING",
|
||||
{
|
||||
"forceInput": True,
|
||||
"tooltip": "Optional soundscape text, usually from Dumas Soundscape Helper.",
|
||||
},
|
||||
),
|
||||
}
|
||||
for slot in range(1, _H3_PROMPT_REF_SLOTS + 1):
|
||||
optional[f"ref_{slot}"] = (
|
||||
_REFERENCE_TYPE,
|
||||
{
|
||||
"tooltip": (
|
||||
f"Optional structured reference {slot}. The curator only outputs "
|
||||
"it if the action prompt mentions its name/alias or an explicit "
|
||||
f"<Picture {slot}>/<ref{slot}> tag."
|
||||
)
|
||||
},
|
||||
)
|
||||
return {
|
||||
"required": {
|
||||
"action_prompt": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": True,
|
||||
"tooltip": (
|
||||
"Write the final shot action here using character/location names. "
|
||||
"Mention a reference by name, alias, <Picture N>, or <refN> to use it."
|
||||
),
|
||||
},
|
||||
),
|
||||
"anatomy_guard": (
|
||||
["auto", "on", "off"],
|
||||
{
|
||||
"default": "auto",
|
||||
"tooltip": (
|
||||
"Add the anatomy guard. Auto adds it when a character reference is used."
|
||||
),
|
||||
},
|
||||
),
|
||||
},
|
||||
"optional": optional,
|
||||
}
|
||||
|
||||
def curate_prompt(
|
||||
self,
|
||||
action_prompt,
|
||||
anatomy_guard,
|
||||
anchor="",
|
||||
soundscape="",
|
||||
ref_1=None,
|
||||
ref_2=None,
|
||||
ref_3=None,
|
||||
ref_4=None,
|
||||
ref_5=None,
|
||||
ref_6=None,
|
||||
ref_7=None,
|
||||
ref_8=None,
|
||||
ref_9=None,
|
||||
):
|
||||
return curate_h3_prompt(
|
||||
action_prompt,
|
||||
anchor=anchor,
|
||||
soundscape=soundscape,
|
||||
refs=(ref_1, ref_2, ref_3, ref_4, ref_5, ref_6, ref_7, ref_8, ref_9),
|
||||
anatomy_guard=anatomy_guard,
|
||||
)
|
||||
|
||||
|
||||
class DumasAnchorStyleNode:
|
||||
DESCRIPTION = (
|
||||
"Choose an anchor-style preset, auto-fill its full description, and pass "
|
||||
@@ -1899,9 +2612,12 @@ NODE_CLASS_MAPPINGS = {
|
||||
"DumasH3PlanExtractSceneImages": DumasH3PlanExtractSceneImagesNode,
|
||||
"DumasCharacterReference": DumasCharacterReferenceNode,
|
||||
"DumasLocationReference": DumasLocationReferenceNode,
|
||||
"DumasSoundscapeHelper": DumasSoundscapeHelperNode,
|
||||
"DumasH3PromptCurator": DumasH3PromptCuratorNode,
|
||||
"DumasAnchorStyle": DumasAnchorStyleNode,
|
||||
"DumasCharacterHelper": DumasCharacterReferenceNode,
|
||||
"DumasH3CharacterHelper": DumasCharacterReferenceNode,
|
||||
"DumasCharacterHelper": DumasCharacterHelperNode,
|
||||
"DumasLocationHelper": DumasLocationHelperNode,
|
||||
"DumasH3CharacterHelper": DumasCharacterHelperNode,
|
||||
}
|
||||
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
@@ -1912,7 +2628,10 @@ NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
"DumasH3PlanExtractSceneImages": "Dumas H3 Plan Extract Scene Images",
|
||||
"DumasCharacterReference": "Dumas Character Reference",
|
||||
"DumasLocationReference": "Dumas Location Reference",
|
||||
"DumasSoundscapeHelper": "Dumas Soundscape Helper",
|
||||
"DumasH3PromptCurator": "Dumas H3 Prompt Curator",
|
||||
"DumasAnchorStyle": "Dumas Anchor Style",
|
||||
"DumasCharacterHelper": "Dumas Character Reference",
|
||||
"DumasH3CharacterHelper": "Dumas Character Reference",
|
||||
"DumasCharacterHelper": "Dumas Character Helper",
|
||||
"DumasLocationHelper": "Dumas Location Helper",
|
||||
"DumasH3CharacterHelper": "Dumas Character Helper",
|
||||
}
|
||||
|
||||
+50
-29
@@ -277,7 +277,14 @@ class DumasJSONStringToObjectNode:
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"json_string": ("STRING", {"multiline": True}),
|
||||
"json_string": (
|
||||
"STRING",
|
||||
{
|
||||
"multiline": True,
|
||||
"default": '{\n "shots": [\n {\n "prompt": "Francine stands by the window."\n }\n ]\n}',
|
||||
"tooltip": "Raw JSON text to parse into a structured JSON object."
|
||||
},
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -299,7 +306,14 @@ class DumasStripIterationSuffixNode:
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"filename": ("STRING", {"default": "", "multiline": False}),
|
||||
"filename": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "francine_pose_final.png",
|
||||
"multiline": False,
|
||||
"tooltip": "Filename to normalize by removing everything after the first underscore in the stem."
|
||||
},
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -316,7 +330,14 @@ class DumasSlugifyStringNode:
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"text": ("STRING", {"default": "", "multiline": False}),
|
||||
"text": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "Francine Coffee Shop",
|
||||
"multiline": False,
|
||||
"tooltip": "Text to slugify into lowercase ASCII words joined with hyphens."
|
||||
},
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -334,8 +355,8 @@ class DumasJSONObjectToStringNode:
|
||||
return {
|
||||
"required": {
|
||||
"json_object": ("JSON",),
|
||||
"pretty": ("BOOLEAN", {"default": True}),
|
||||
"sort_keys": ("BOOLEAN", {"default": False}),
|
||||
"pretty": ("BOOLEAN", {"default": True, "tooltip": "Pretty-print the JSON with indentation."}),
|
||||
"sort_keys": ("BOOLEAN", {"default": False, "tooltip": "Sort object keys alphabetically before serializing."}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -355,7 +376,7 @@ class DumasJSONGetValueNode:
|
||||
return {
|
||||
"required": {
|
||||
"json_object": ("JSON",),
|
||||
"path": ("STRING", {"default": "", "multiline": False}),
|
||||
"path": ("STRING", {"default": "shots.0.prompt", "multiline": False, "tooltip": "Dot-path to read, such as 'shots.0.prompt'."}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -373,8 +394,8 @@ class DumasJSONSetValueNode:
|
||||
return {
|
||||
"required": {
|
||||
"json_object": ("JSON",),
|
||||
"path": ("STRING", {"default": "", "multiline": False}),
|
||||
"value_json": ("STRING", {"multiline": True, "default": "null"}),
|
||||
"path": ("STRING", {"default": "shots.0.prompt", "multiline": False, "tooltip": "Dot-path to write, such as 'shots.0.prompt' or 'shots.1.duration'."}),
|
||||
"value_json": ("STRING", {"multiline": True, "default": '"Francine stands by the window."', "tooltip": "JSON value to store at the path. Must be valid JSON, so strings need quotes."}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -398,7 +419,7 @@ class DumasJSONHasKeyNode:
|
||||
return {
|
||||
"required": {
|
||||
"json_object": ("JSON",),
|
||||
"path": ("STRING", {"default": "", "multiline": False}),
|
||||
"path": ("STRING", {"default": "shots.0.prompt", "multiline": False, "tooltip": "Dot-path to test for existence."}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -416,7 +437,7 @@ class DumasJSONRemoveKeyNode:
|
||||
return {
|
||||
"required": {
|
||||
"json_object": ("JSON",),
|
||||
"path": ("STRING", {"default": "", "multiline": False}),
|
||||
"path": ("STRING", {"default": "shots.0.prompt", "multiline": False, "tooltip": "Dot-path to remove from the object."}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -434,7 +455,7 @@ class DumasJSONPickFieldsNode:
|
||||
return {
|
||||
"required": {
|
||||
"json_object": ("JSON",),
|
||||
"paths": ("STRING", {"multiline": True, "default": ""}),
|
||||
"paths": ("STRING", {"multiline": True, "default": "shots.0.prompt\nshots.0.duration", "tooltip": "One dot-path per line. Only those fields are copied into the output object."}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -463,8 +484,8 @@ class DumasJSONMergeObjectsNode:
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"base_object": ("JSON",),
|
||||
"overlay_object": ("JSON",),
|
||||
"base_object": ("JSON", {"tooltip": "Base JSON object to start from."}),
|
||||
"overlay_object": ("JSON", {"tooltip": "Overlay JSON object whose keys replace or merge into the base object."}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -482,7 +503,7 @@ class DumasJSONKeysNode:
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"json_object": ("JSON",),
|
||||
"json_object": ("JSON", {"tooltip": "JSON object whose top-level keys should be listed."}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -502,7 +523,7 @@ class DumasJSONArrayLengthNode:
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"json_array": ("JSON",),
|
||||
"json_array": ("JSON", {"tooltip": "JSON array whose length should be measured."}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -521,8 +542,8 @@ class DumasJSONArrayAppendNode:
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"json_array": ("JSON",),
|
||||
"value_json": ("STRING", {"multiline": True, "default": "null"}),
|
||||
"json_array": ("JSON", {"tooltip": "JSON array to append to."}),
|
||||
"value_json": ("STRING", {"multiline": True, "default": '{"prompt":"Francine looks toward the door."}', "tooltip": "JSON value to append. Must be valid JSON."}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -548,10 +569,10 @@ class DumasJSONArraySliceNode:
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"json_array": ("JSON",),
|
||||
"start": ("INT", {"default": 0, "step": 1}),
|
||||
"end": ("INT", {"default": 0, "step": 1}),
|
||||
"step": ("INT", {"default": 1, "step": 1, "min": 1}),
|
||||
"json_array": ("JSON", {"tooltip": "JSON array to slice."}),
|
||||
"start": ("INT", {"default": 0, "step": 1, "tooltip": "Zero-based start index."}),
|
||||
"end": ("INT", {"default": 0, "step": 1, "tooltip": "Zero-based end index. Use 0 to mean 'to the end'."}),
|
||||
"step": ("INT", {"default": 1, "step": 1, "min": 1, "tooltip": "Slice step size."}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -572,9 +593,9 @@ class DumasJSONArrayIteratorNode:
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"json_input": ("JSON",),
|
||||
"index": ("INT", {"default": 0, "min": 0, "step": 1}),
|
||||
"mode": (["fixed", "incr", "decr"], {"default": "fixed"}),
|
||||
"json_input": ("JSON", {"tooltip": "JSON array to iterate over."}),
|
||||
"index": ("INT", {"default": 0, "min": 0, "step": 1, "tooltip": "Current zero-based index."}),
|
||||
"mode": (["fixed", "incr", "decr"], {"default": "fixed", "tooltip": "Keep the index fixed, increment it, or decrement it before reading."}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -600,9 +621,9 @@ class DumasJSONObjectIteratorNode:
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"json_input": ("JSON",),
|
||||
"index": ("INT", {"default": 0, "min": 0, "step": 1}),
|
||||
"mode": (["fixed", "incr", "decr"], {"default": "fixed"}),
|
||||
"json_input": ("JSON", {"tooltip": "JSON object whose key/value pairs should be iterated in insertion order."}),
|
||||
"index": ("INT", {"default": 0, "min": 0, "step": 1, "tooltip": "Current zero-based index into the object's items."}),
|
||||
"mode": (["fixed", "incr", "decr"], {"default": "fixed", "tooltip": "Keep the index fixed, increment it, or decrement it before reading."}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -628,7 +649,7 @@ class DumasJSONFlattenNode:
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"json_input": ("JSON",),
|
||||
"json_input": ("JSON", {"tooltip": "Nested JSON value to flatten into dot-path keys."}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -645,7 +666,7 @@ class DumasJSONUnflattenNode:
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"flat_json_object": ("JSON",),
|
||||
"flat_json_object": ("JSON", {"tooltip": "Flat JSON object whose keys are dot-paths to rebuild into nested JSON."}),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,375 @@
|
||||
import { app } from "/scripts/app.js";
|
||||
import { applyAdaptiveCanvasOnly } from "../shared/nodes2.mjs";
|
||||
|
||||
const COMFY_CLASS = "DumasH3LongVideos";
|
||||
const STATE_PROPERTY = "dumas_h3_longvideos_section_state";
|
||||
const DOM_WIDGET_NAME = "dumas_h3_longvideos_sections";
|
||||
const MIN_WIDTH = 520;
|
||||
const MIN_HEIGHT = 280;
|
||||
|
||||
const GROUPS = [
|
||||
{
|
||||
id: "prompt",
|
||||
label: "Prompt",
|
||||
defaultCollapsed: false,
|
||||
widgets: ["prompt", "resolution", "megapixels", "beat_split", "anchor_override", "shot_seconds", "plan_only", "fps"],
|
||||
},
|
||||
{
|
||||
id: "refs",
|
||||
label: "Refs",
|
||||
defaultCollapsed: true,
|
||||
widgets: ["ref_mode", "ref_image_size", "ref_noise_aug", "character_memory", "trim_seam", "vary_seed_per_shot", "handoff_offset"],
|
||||
},
|
||||
{
|
||||
id: "sampling",
|
||||
label: "Sampling",
|
||||
defaultCollapsed: true,
|
||||
widgets: [
|
||||
"steps", "cfg", "sampler_name", "scheduler", "seed",
|
||||
"apply_model_sampling", "shift_video", "shift_audio",
|
||||
"vram_headroom_gb", "allow_res_backoff",
|
||||
"decode_tile_frames", "decode_tile_size",
|
||||
],
|
||||
},
|
||||
{
|
||||
id: "audio",
|
||||
label: "Audio",
|
||||
defaultCollapsed: true,
|
||||
widgets: [
|
||||
"global_soundscape", "non_diegetic_music", "auto_soundscape",
|
||||
"auto_silence_nonspeech", "allow_nonspeech_vocals",
|
||||
"mute_nonspeech_audio", "mute_fade_ms",
|
||||
],
|
||||
},
|
||||
{
|
||||
id: "scene",
|
||||
label: "Scene Logic",
|
||||
defaultCollapsed: true,
|
||||
widgets: [
|
||||
"auto_wardrobe", "auto_props", "prevent_nudity", "exposed_terms",
|
||||
"anatomy_guard", "subject_count_guard", "lock_restraints",
|
||||
"contact_guard", "motion_guard", "solidity_guard",
|
||||
],
|
||||
},
|
||||
{
|
||||
id: "finish",
|
||||
label: "Upscale",
|
||||
defaultCollapsed: true,
|
||||
widgets: [
|
||||
"upscale", "upscale_model", "upscale_target_short_edge", "upscale_batch",
|
||||
],
|
||||
},
|
||||
{
|
||||
id: "overlay",
|
||||
label: "Overlays",
|
||||
defaultCollapsed: true,
|
||||
widgets: [
|
||||
"watermark_text", "watermark_position", "watermark_size", "watermark_opacity", "watermark_margin",
|
||||
"intro_text", "intro_position", "intro_seconds", "intro_fade", "intro_size",
|
||||
"overlay_font", "overlay_stroke",
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
function injectCSS() {
|
||||
if (document.getElementById("dumas-h3lv-sections-css")) return;
|
||||
const style = document.createElement("style");
|
||||
style.id = "dumas-h3lv-sections-css";
|
||||
style.textContent = `
|
||||
.dh3lv-sections {
|
||||
box-sizing: border-box;
|
||||
width: 100%;
|
||||
padding: 8px 10px 6px;
|
||||
color: #e6e7eb;
|
||||
font: 12px/1.35 "Segoe UI", sans-serif;
|
||||
pointer-events: auto;
|
||||
background: linear-gradient(180deg, rgba(33, 36, 42, 0.96), rgba(22, 24, 29, 0.96));
|
||||
border-bottom: 1px solid rgba(255, 255, 255, 0.06);
|
||||
}
|
||||
.dh3lv-sections-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 8px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
.dh3lv-sections-title {
|
||||
font-size: 11px;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.08em;
|
||||
color: #9da5b1;
|
||||
}
|
||||
.dh3lv-sections-actions {
|
||||
display: flex;
|
||||
gap: 6px;
|
||||
}
|
||||
.dh3lv-sections-list {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 6px;
|
||||
}
|
||||
.dh3lv-chip,
|
||||
.dh3lv-action {
|
||||
appearance: none;
|
||||
border: 1px solid #464d59;
|
||||
background: #262c35;
|
||||
color: #d7dce3;
|
||||
border-radius: 999px;
|
||||
padding: 5px 9px;
|
||||
cursor: pointer;
|
||||
font: inherit;
|
||||
line-height: 1.1;
|
||||
}
|
||||
.dh3lv-chip[data-open="true"] {
|
||||
background: #d96f2b;
|
||||
border-color: #f09358;
|
||||
color: #fff7f0;
|
||||
}
|
||||
.dh3lv-chip:hover,
|
||||
.dh3lv-action:hover {
|
||||
filter: brightness(1.06);
|
||||
}
|
||||
.dh3lv-count {
|
||||
opacity: 0.78;
|
||||
margin-left: 4px;
|
||||
font-size: 11px;
|
||||
}
|
||||
`;
|
||||
document.head.appendChild(style);
|
||||
}
|
||||
|
||||
function defaultState() {
|
||||
const state = {};
|
||||
for (const group of GROUPS) state[group.id] = !group.defaultCollapsed;
|
||||
return state;
|
||||
}
|
||||
|
||||
function parseState(value) {
|
||||
let parsed = value;
|
||||
if (typeof parsed === "string") {
|
||||
try {
|
||||
parsed = JSON.parse(parsed);
|
||||
} catch (_error) {
|
||||
parsed = null;
|
||||
}
|
||||
}
|
||||
const base = defaultState();
|
||||
if (!parsed || typeof parsed !== "object") return base;
|
||||
for (const group of GROUPS) {
|
||||
if (typeof parsed[group.id] === "boolean") base[group.id] = parsed[group.id];
|
||||
}
|
||||
return base;
|
||||
}
|
||||
|
||||
function readState(node) {
|
||||
return parseState(node.properties?.[STATE_PROPERTY] || node._dh3lvSectionState || "");
|
||||
}
|
||||
|
||||
function writeState(node, state) {
|
||||
const normalized = parseState(state);
|
||||
const serialized = JSON.stringify(normalized);
|
||||
node._dh3lvSectionState = serialized;
|
||||
node.properties = node.properties || {};
|
||||
node.properties[STATE_PROPERTY] = serialized;
|
||||
}
|
||||
|
||||
function findWidget(node, name) {
|
||||
return (node.widgets || []).find((widget) => widget?.name === name) || null;
|
||||
}
|
||||
|
||||
function isInteractiveTarget(target) {
|
||||
return !!target?.closest?.("button, input, textarea, select, label");
|
||||
}
|
||||
|
||||
function stopCanvasEvent(event) {
|
||||
if (isInteractiveTarget(event.target)) event.stopPropagation();
|
||||
}
|
||||
|
||||
function stopCanvasKeyboard(event) {
|
||||
if (isInteractiveTarget(event.target)) event.stopImmediatePropagation();
|
||||
}
|
||||
|
||||
function setWidgetHidden(widget, hidden) {
|
||||
if (!widget) return;
|
||||
if (!widget._dh3lvOriginal) {
|
||||
widget._dh3lvOriginal = {
|
||||
type: widget.type,
|
||||
computeSize: widget.computeSize,
|
||||
hidden: widget.hidden,
|
||||
};
|
||||
}
|
||||
if (hidden) {
|
||||
widget.type = "hidden";
|
||||
widget.hidden = true;
|
||||
widget.computeSize = () => [0, -4];
|
||||
return;
|
||||
}
|
||||
widget.type = widget._dh3lvOriginal.type;
|
||||
widget.hidden = !!widget._dh3lvOriginal.hidden;
|
||||
widget.computeSize = widget._dh3lvOriginal.computeSize;
|
||||
}
|
||||
|
||||
function applyVisibility(node) {
|
||||
const state = readState(node);
|
||||
for (const group of GROUPS) {
|
||||
for (const name of group.widgets) {
|
||||
const widget = findWidget(node, name);
|
||||
if (!widget || widget.name === DOM_WIDGET_NAME) continue;
|
||||
setWidgetHidden(widget, !state[group.id]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function resizeNode(node) {
|
||||
requestAnimationFrame(() => {
|
||||
const size = node.computeSize?.();
|
||||
if (Array.isArray(size)) {
|
||||
node.size[0] = Math.max(MIN_WIDTH, size[0] || 0, node.size?.[0] || 0);
|
||||
node.size[1] = Math.max(MIN_HEIGHT, size[1] || 0);
|
||||
}
|
||||
node.setDirtyCanvas?.(true, true);
|
||||
});
|
||||
}
|
||||
|
||||
function renderToolbar(node) {
|
||||
const ui = node._dh3lvUI;
|
||||
if (!ui) return;
|
||||
const state = readState(node);
|
||||
ui.list.innerHTML = "";
|
||||
for (const group of GROUPS) {
|
||||
const button = document.createElement("button");
|
||||
button.type = "button";
|
||||
button.className = "dh3lv-chip";
|
||||
button.dataset.open = state[group.id] ? "true" : "false";
|
||||
button.textContent = state[group.id] ? `Hide ${group.label}` : `Show ${group.label}`;
|
||||
|
||||
const count = document.createElement("span");
|
||||
count.className = "dh3lv-count";
|
||||
count.textContent = String(group.widgets.filter((name) => findWidget(node, name)).length);
|
||||
button.appendChild(count);
|
||||
|
||||
button.addEventListener("click", () => {
|
||||
const next = readState(node);
|
||||
next[group.id] = !next[group.id];
|
||||
writeState(node, next);
|
||||
applyVisibility(node);
|
||||
renderToolbar(node);
|
||||
resizeNode(node);
|
||||
});
|
||||
ui.list.appendChild(button);
|
||||
}
|
||||
}
|
||||
|
||||
function setAll(node, open) {
|
||||
const next = {};
|
||||
for (const group of GROUPS) next[group.id] = !!open;
|
||||
writeState(node, next);
|
||||
applyVisibility(node);
|
||||
renderToolbar(node);
|
||||
resizeNode(node);
|
||||
}
|
||||
|
||||
function setupNode(node) {
|
||||
if (node._dh3lvUI) return;
|
||||
injectCSS();
|
||||
writeState(node, readState(node));
|
||||
|
||||
const root = document.createElement("div");
|
||||
root.className = "dh3lv-sections";
|
||||
|
||||
const head = document.createElement("div");
|
||||
head.className = "dh3lv-sections-head";
|
||||
|
||||
const title = document.createElement("div");
|
||||
title.className = "dh3lv-sections-title";
|
||||
title.textContent = "Sections";
|
||||
|
||||
const actions = document.createElement("div");
|
||||
actions.className = "dh3lv-sections-actions";
|
||||
|
||||
const expandAll = document.createElement("button");
|
||||
expandAll.type = "button";
|
||||
expandAll.className = "dh3lv-action";
|
||||
expandAll.textContent = "Expand All";
|
||||
expandAll.addEventListener("click", () => setAll(node, true));
|
||||
|
||||
const collapseAll = document.createElement("button");
|
||||
collapseAll.type = "button";
|
||||
collapseAll.className = "dh3lv-action";
|
||||
collapseAll.textContent = "Collapse Extras";
|
||||
collapseAll.addEventListener("click", () => {
|
||||
const next = defaultState();
|
||||
writeState(node, next);
|
||||
applyVisibility(node);
|
||||
renderToolbar(node);
|
||||
resizeNode(node);
|
||||
});
|
||||
|
||||
actions.append(expandAll, collapseAll);
|
||||
head.append(title, actions);
|
||||
|
||||
const list = document.createElement("div");
|
||||
list.className = "dh3lv-sections-list";
|
||||
root.append(head, list);
|
||||
root.addEventListener("pointerdown", stopCanvasEvent);
|
||||
root.addEventListener("mousedown", stopCanvasEvent);
|
||||
root.addEventListener("click", stopCanvasEvent);
|
||||
root.addEventListener("dblclick", stopCanvasEvent);
|
||||
root.addEventListener("keydown", stopCanvasKeyboard, true);
|
||||
|
||||
node._dh3lvUI = { root, list };
|
||||
const widget = node.addDOMWidget(DOM_WIDGET_NAME, "custom", root, {
|
||||
getValue: () => null,
|
||||
setValue: () => {},
|
||||
serialize: false,
|
||||
getMinHeight: () => 52,
|
||||
hideOnZoom: false,
|
||||
});
|
||||
applyAdaptiveCanvasOnly(widget);
|
||||
const widgets = node.widgets || [];
|
||||
const index = widgets.indexOf(widget);
|
||||
if (index > 0) {
|
||||
widgets.splice(index, 1);
|
||||
widgets.unshift(widget);
|
||||
}
|
||||
|
||||
applyVisibility(node);
|
||||
renderToolbar(node);
|
||||
resizeNode(node);
|
||||
}
|
||||
|
||||
app.registerExtension({
|
||||
name: "Dumas.H3LongVideosSections",
|
||||
async beforeRegisterNodeDef(nodeType, nodeData) {
|
||||
if (nodeData?.name !== COMFY_CLASS) return;
|
||||
|
||||
const originalOnNodeCreated = nodeType.prototype.onNodeCreated;
|
||||
nodeType.prototype.onNodeCreated = function onNodeCreated() {
|
||||
const result = originalOnNodeCreated?.apply(this, arguments);
|
||||
setupNode(this);
|
||||
return result;
|
||||
};
|
||||
|
||||
const originalConfigure = nodeType.prototype.onConfigure;
|
||||
nodeType.prototype.onConfigure = function onConfigure() {
|
||||
const result = originalConfigure?.apply(this, arguments);
|
||||
setupNode(this);
|
||||
writeState(this, readState(this));
|
||||
applyVisibility(this);
|
||||
renderToolbar(this);
|
||||
resizeNode(this);
|
||||
return result;
|
||||
};
|
||||
|
||||
const originalSerialize = nodeType.prototype.onSerialize;
|
||||
nodeType.prototype.onSerialize = function onSerialize(o) {
|
||||
writeState(this, readState(this));
|
||||
const result = originalSerialize?.apply(this, arguments);
|
||||
if (o && this.properties?.[STATE_PROPERTY]) {
|
||||
o.properties = o.properties || {};
|
||||
o.properties[STATE_PROPERTY] = this.properties[STATE_PROPERTY];
|
||||
}
|
||||
return result;
|
||||
};
|
||||
},
|
||||
});
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
[project]
|
||||
name = "dumasnodes"
|
||||
description = "Dumas-branded generic utility nodes for ComfyUI, starting with JSON helpers."
|
||||
version = "0.1.0"
|
||||
version = "0.1.1"
|
||||
license = { file = "LICENSE" }
|
||||
|
||||
[project.urls]
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+205
-12
@@ -245,7 +245,6 @@ class DumasImageNodeTests(unittest.TestCase):
|
||||
|
||||
result = node.build_reference(
|
||||
image=image,
|
||||
picture_id="2",
|
||||
character_id="char_dave",
|
||||
name="Dave",
|
||||
alias="The Locksmith",
|
||||
@@ -270,10 +269,10 @@ class DumasImageNodeTests(unittest.TestCase):
|
||||
"id": "char-dave",
|
||||
"name": "Dave",
|
||||
"aliases": ["The Locksmith"],
|
||||
"picture_id": 2,
|
||||
"picture_label": "<Picture 2>",
|
||||
"picture_id": None,
|
||||
"picture_label": "",
|
||||
"image": image,
|
||||
"summary": "Dave shown in <Picture 2>.",
|
||||
"summary": "Dave reference.",
|
||||
"description": "Square jaw, tired eyes, cropped brown hair.",
|
||||
"wardrobe": "weathered red flight jacket, grey cargo shorts, black boots",
|
||||
"general": "wears a long grey coat",
|
||||
@@ -289,13 +288,16 @@ class DumasImageNodeTests(unittest.TestCase):
|
||||
},
|
||||
)
|
||||
|
||||
def test_character_reference_input_types_do_not_expose_picture_id(self):
|
||||
required = self.image_nodes.DumasCharacterReferenceNode.INPUT_TYPES()["required"]
|
||||
self.assertNotIn("picture_id", required)
|
||||
|
||||
def test_character_reference_handles_missing_optional_fields(self):
|
||||
node = self.image_nodes.DumasCharacterReferenceNode()
|
||||
image = FakeTensorBatch()
|
||||
|
||||
result = node.build_reference(
|
||||
image=image,
|
||||
picture_id="4",
|
||||
character_id="",
|
||||
name="",
|
||||
alias="",
|
||||
@@ -313,8 +315,8 @@ class DumasImageNodeTests(unittest.TestCase):
|
||||
|
||||
reference = result[0]
|
||||
self.assertEqual(reference["kind"], "character")
|
||||
self.assertEqual(reference["picture_id"], 4)
|
||||
self.assertEqual(reference["picture_label"], "<Picture 4>")
|
||||
self.assertIsNone(reference["picture_id"])
|
||||
self.assertEqual(reference["picture_label"], "")
|
||||
self.assertEqual(reference["wardrobe"], "")
|
||||
self.assertEqual(reference["general"], "")
|
||||
self.assertEqual(reference["facts"]["age"], "")
|
||||
@@ -325,7 +327,6 @@ class DumasImageNodeTests(unittest.TestCase):
|
||||
|
||||
result = node.build_reference(
|
||||
image=image,
|
||||
picture_id="9",
|
||||
location_id="coffee-shop-01",
|
||||
name="Coffee Shop",
|
||||
alias="Cafe Interior",
|
||||
@@ -340,10 +341,10 @@ class DumasImageNodeTests(unittest.TestCase):
|
||||
"id": "coffee-shop-01",
|
||||
"name": "Coffee Shop",
|
||||
"aliases": ["Cafe Interior"],
|
||||
"picture_id": 9,
|
||||
"picture_label": "<Picture 9>",
|
||||
"picture_id": None,
|
||||
"picture_label": "",
|
||||
"image": image,
|
||||
"summary": "Coffee Shop shown in <Picture 9>.",
|
||||
"summary": "Coffee Shop reference.",
|
||||
"description": "Warm tungsten lighting, narrow counter, rainy front window.",
|
||||
"wardrobe": "",
|
||||
"general": "Evening ambience, cramped but cozy.",
|
||||
@@ -351,6 +352,198 @@ class DumasImageNodeTests(unittest.TestCase):
|
||||
},
|
||||
)
|
||||
|
||||
def test_location_reference_input_types_do_not_expose_picture_id(self):
|
||||
required = self.image_nodes.DumasLocationReferenceNode.INPUT_TYPES()["required"]
|
||||
self.assertNotIn("picture_id", required)
|
||||
|
||||
def test_character_helper_restores_image_and_text_outputs(self):
|
||||
node = self.image_nodes.DumasCharacterHelperNode()
|
||||
image1 = FakeTensorBatch()
|
||||
image2 = FakeTensorBatch()
|
||||
|
||||
result = node.build_character_text(
|
||||
image1=image1,
|
||||
image2=image2,
|
||||
image1_picture_id="1",
|
||||
image2_picture_id="2",
|
||||
character_id="char_dave",
|
||||
name="Dave",
|
||||
alias="The Locksmith",
|
||||
gender="male",
|
||||
age="41",
|
||||
nationality="English",
|
||||
occupation="a detective",
|
||||
height_feet="6",
|
||||
height_inches="2",
|
||||
accent="English",
|
||||
general="Moves carefully and notices every exit",
|
||||
wardrobe="weathered red flight jacket, grey cargo shorts, black boots",
|
||||
)
|
||||
|
||||
self.assertIs(result[0], image1)
|
||||
self.assertIs(result[1], image2)
|
||||
self.assertIn("<Picture 1> and <Picture 2> reference the same character", result[2])
|
||||
self.assertIn("Dave is also known as The Locksmith", result[2])
|
||||
self.assertIn("is 41 years old", result[2])
|
||||
self.assertEqual(result[3], "Dave = weathered red flight jacket, grey cargo shorts, black boots")
|
||||
|
||||
def test_location_helper_matches_character_helper_shape_without_wardrobe(self):
|
||||
node = self.image_nodes.DumasLocationHelperNode()
|
||||
image1 = FakeTensorBatch()
|
||||
image2 = FakeTensorBatch()
|
||||
|
||||
result = node.build_location_text(
|
||||
image1=image1,
|
||||
image2=image2,
|
||||
image1_picture_id="3",
|
||||
image2_picture_id="4",
|
||||
location_id="coffee-shop-01",
|
||||
name="Coffee Shop",
|
||||
alias="Cafe Interior",
|
||||
description="Warm tungsten lighting, narrow counter, rainy front window",
|
||||
general="Evening ambience, cramped but cozy",
|
||||
)
|
||||
|
||||
self.assertIs(result[0], image1)
|
||||
self.assertIs(result[1], image2)
|
||||
self.assertIn("<Picture 3> and <Picture 4> reference the same location", result[2])
|
||||
self.assertIn("Coffee Shop is also known as Cafe Interior", result[2])
|
||||
self.assertIn("Warm tungsten lighting, narrow counter, rainy front window.", result[2])
|
||||
self.assertIn("Evening ambience, cramped but cozy.", result[2])
|
||||
self.assertEqual(len(result), 3)
|
||||
|
||||
def test_soundscape_helper_defaults_to_selected_preset_description(self):
|
||||
node = self.image_nodes.DumasSoundscapeHelperNode()
|
||||
|
||||
result = node.build_soundscape("rainy street", "")
|
||||
|
||||
self.assertEqual(result[0], "steady rain, wet pavement, distant traffic hum")
|
||||
|
||||
def test_h3_prompt_curator_compacts_named_references(self):
|
||||
node = self.image_nodes.DumasH3PromptCuratorNode()
|
||||
dave_image = FakeTensorBatch()
|
||||
cafe_image = FakeTensorBatch()
|
||||
van_image = FakeTensorBatch()
|
||||
dave = self.image_nodes.make_reference(
|
||||
kind="character",
|
||||
image=dave_image,
|
||||
name="Dave",
|
||||
aliases="The Locksmith",
|
||||
description="tired eyes, cropped brown hair",
|
||||
wardrobe="red flight jacket",
|
||||
)
|
||||
cafe = self.image_nodes.make_reference(
|
||||
kind="location",
|
||||
image=cafe_image,
|
||||
name="Coffee Shop",
|
||||
description="warm tungsten lighting and rainy windows",
|
||||
)
|
||||
van = self.image_nodes.make_reference(
|
||||
kind="location",
|
||||
image=van_image,
|
||||
name="Blue Van",
|
||||
description="scuffed blue delivery van",
|
||||
)
|
||||
|
||||
result = node.curate_prompt(
|
||||
action_prompt="Dave runs from the Coffee Shop into the rain.",
|
||||
anatomy_guard="auto",
|
||||
anchor="grounded handheld thriller",
|
||||
soundscape="steady rain",
|
||||
ref_1=dave,
|
||||
ref_2=van,
|
||||
ref_3=cafe,
|
||||
)
|
||||
|
||||
prompt = result[0]
|
||||
self.assertIn("<Picture 1> Dave", prompt)
|
||||
self.assertIn("<Picture 2> Coffee Shop", prompt)
|
||||
self.assertIn("Action: Dave runs from the Coffee Shop into the rain.", prompt)
|
||||
self.assertIn("Anatomy guard:", prompt)
|
||||
self.assertIs(result[1], dave_image)
|
||||
self.assertIs(result[2], cafe_image)
|
||||
self.assertIsNone(result[3])
|
||||
self.assertEqual(result[10], 2)
|
||||
self.assertIn("input 3-><Picture 2> Coffee Shop", result[11])
|
||||
|
||||
def test_h3_prompt_curator_renumbers_explicit_reference_tags(self):
|
||||
node = self.image_nodes.DumasH3PromptCuratorNode()
|
||||
image1 = FakeTensorBatch()
|
||||
image3 = FakeTensorBatch()
|
||||
unused = FakeTensorBatch()
|
||||
first = self.image_nodes.make_reference(kind="character", image=image1, name="Maya")
|
||||
second = self.image_nodes.make_reference(kind="location", image=unused, name="Lobby")
|
||||
third = self.image_nodes.make_reference(kind="location", image=image3, name="Rooftop")
|
||||
|
||||
result = node.curate_prompt(
|
||||
action_prompt="<Picture 1> Maya crosses to <ref3> as the wind rises.",
|
||||
anatomy_guard="off",
|
||||
ref_1=first,
|
||||
ref_2=second,
|
||||
ref_3=third,
|
||||
)
|
||||
|
||||
prompt = result[0]
|
||||
self.assertIn("<Picture 1> Maya crosses to <Picture 2>", prompt)
|
||||
self.assertNotIn("<Picture 3>", prompt)
|
||||
self.assertIs(result[1], image1)
|
||||
self.assertIs(result[2], image3)
|
||||
self.assertIsNone(result[3])
|
||||
self.assertEqual(result[10], 2)
|
||||
|
||||
def test_helper_node_mappings_use_general_purpose_helpers(self):
|
||||
mappings = self.image_nodes.NODE_CLASS_MAPPINGS
|
||||
display = self.image_nodes.NODE_DISPLAY_NAME_MAPPINGS
|
||||
|
||||
self.assertIs(mappings["DumasCharacterHelper"], self.image_nodes.DumasCharacterHelperNode)
|
||||
self.assertIs(mappings["DumasLocationHelper"], self.image_nodes.DumasLocationHelperNode)
|
||||
self.assertIs(mappings["DumasSoundscapeHelper"], self.image_nodes.DumasSoundscapeHelperNode)
|
||||
self.assertIs(mappings["DumasH3PromptCurator"], self.image_nodes.DumasH3PromptCuratorNode)
|
||||
self.assertEqual(display["DumasCharacterHelper"], "Dumas Character Helper")
|
||||
self.assertEqual(display["DumasLocationHelper"], "Dumas Location Helper")
|
||||
self.assertEqual(display["DumasSoundscapeHelper"], "Dumas Soundscape Helper")
|
||||
self.assertEqual(display["DumasH3PromptCurator"], "Dumas H3 Prompt Curator")
|
||||
|
||||
def test_h3_prompt_curator_uses_documented_reference_limits(self):
|
||||
node = self.image_nodes.DumasH3PromptCuratorNode()
|
||||
self.assertEqual(len(node.RETURN_TYPES), 12)
|
||||
self.assertEqual(node.RETURN_NAMES[1:10], tuple(f"ref_image_{i}" for i in range(1, 10)))
|
||||
|
||||
def test_normalize_reference_upgrades_generic_summary_with_socket_picture_id(self):
|
||||
image = FakeTensorBatch()
|
||||
|
||||
reference = self.image_nodes.normalize_reference(
|
||||
{
|
||||
"kind": "character",
|
||||
"name": "Dave",
|
||||
"image": image,
|
||||
"summary": "Dave reference.",
|
||||
},
|
||||
picture_id=3,
|
||||
allow_image_fallback=False,
|
||||
)
|
||||
|
||||
self.assertEqual(reference["picture_id"], 3)
|
||||
self.assertEqual(reference["picture_label"], "<Picture 3>")
|
||||
self.assertEqual(reference["summary"], "Dave shown in <Picture 3>.")
|
||||
|
||||
def test_normalize_reference_keeps_custom_summary_when_socket_picture_id_is_added(self):
|
||||
image = FakeTensorBatch()
|
||||
|
||||
reference = self.image_nodes.normalize_reference(
|
||||
{
|
||||
"kind": "character",
|
||||
"name": "Dave",
|
||||
"image": image,
|
||||
"summary": "Primary hero look for the opening close-up.",
|
||||
},
|
||||
picture_id=3,
|
||||
allow_image_fallback=False,
|
||||
)
|
||||
|
||||
self.assertEqual(reference["picture_id"], 3)
|
||||
self.assertEqual(reference["summary"], "Primary hero look for the opening close-up.")
|
||||
|
||||
def test_anchor_style_node_exposes_requested_presets(self):
|
||||
input_types = self.image_nodes.DumasAnchorStyleNode.INPUT_TYPES()
|
||||
options = input_types["required"]["anchor_style"][0]
|
||||
@@ -375,7 +568,7 @@ class DumasImageNodeTests(unittest.TestCase):
|
||||
|
||||
self.assertIn("found-footage", result[0])
|
||||
self.assertIn("real time", result[0])
|
||||
self.assertIn("persistent camera language", result[0])
|
||||
self.assertNotIn("persistent camera language", result[0])
|
||||
|
||||
def test_anchor_style_node_prefers_manual_description_edits(self):
|
||||
node = self.image_nodes.DumasAnchorStyleNode()
|
||||
|
||||
Reference in New Issue
Block a user