DirectorNode: add director_notes output with selected elements

core/prompt_engine.py

@@ -48,12 +48,58 @@ def _select_custom_intro(
     return str(random.choice(values))
 
 
+from __future__ import annotations
+
+import random
+from typing import Any, Dict, List, Optional, Tuple
+
+
+def _pick(arr: Any, fallback: str = "") -> str:
+    if isinstance(arr, list) and arr:
+        return str(random.choice(arr))
+    return fallback
+
+
+def _join_nonempty(parts: List[str]) -> str:
+    return ", ".join([p.strip() for p in parts if p and p.strip()])
+
+
+def _select_custom_intro(
+    world: Dict[str, Any],
+    mode: str = "auto",
+    index: Optional[int] = None,
+) -> str:
+    ci = world.get("CUSTOM_INTRO")
+    if not isinstance(ci, dict) or not ci:
+        return ""
+
+    values = [str(v) for v in ci.values() if v is not None]
+    if not values:
+        return ""
+
+    mode = (mode or "auto").lower().strip()
+
+    if mode == "index":
+        if index is None:
+            return ""
+        k = str(index)
+        return str(ci.get(k, "")) if k in ci else ""
+
+    if mode == "random":
+        return str(random.choice(values))
+
+    for k in ["0", "1", "2", "3", "4", "5", "6"]:
+        if k in ci:
+            return str(ci[k])
+    return str(random.choice(values))
+
+
 def build_prompt_from_world(
     world: Dict[str, Any],
     seed: Optional[int] = None,
     custom_intro_mode: str = "auto",
     custom_intro_index: Optional[int] = None,
-) -> Tuple[str, str]:
+) -> Tuple[str, str, str]:
     if seed is not None:
         random.seed(seed)
 
@@ -65,27 +111,45 @@ def build_prompt_from_world(
         index=custom_intro_index,
     )
 
-    outfits = _pick(world.get("OUTFITS"), "simple dark outfit")
+    outfit = _pick(world.get("OUTFITS"), "simple dark outfit")
     lighting = _pick(world.get("LIGHTING"), "low ambient light")
-    backgrounds = _pick(world.get("BACKGROUNDS"), "intimate interior")
+    background = _pick(world.get("BACKGROUNDS"), "intimate interior")
     objects = _pick(world.get("OBJECTS"), "personal items")
-    poses = _pick(world.get("POSES"), "relaxed pose")
-    expressions = _pick(world.get("EXPRESSIONS"), "calm expression")
+    pose = _pick(world.get("POSES"), "relaxed pose")
+    expression = _pick(world.get("EXPRESSIONS"), "calm expression")
     camera = _pick(world.get("CAMERA_ANGLES"), "eye-level framing")
-    atmos = _pick(world.get("ATMOSPHERES"), "quiet cinematic mood")
-    accessories = _pick(world.get("ACCESSORIES"), "")
+    atmosphere = _pick(world.get("ATMOSPHERES"), "quiet cinematic mood")
+    accessory = _pick(world.get("ACCESSORIES"), "")
 
     prompt = _join_nonempty([
         custom_intro,
-        outfits,
+        outfit,
         lighting,
-        backgrounds,
+        background,
         objects,
-        poses,
-        expressions,
+        pose,
+        expression,
         camera,
-        atmos,
-        accessories,
+        atmosphere,
+        accessory,
     ])
 
-    return (prompt.strip(), system_prompt)
+    selections = {
+        "custom_intro": custom_intro,
+        "outfit": outfit,
+        "lighting": lighting,
+        "background": background,
+        "objects": objects,
+        "pose": pose,
+        "expression": expression,
+        "camera": camera,
+        "atmosphere": atmosphere,
+        "accessory": accessory,
+    }
+
+    director_notes = "\n".join(
+        [f"{k}: {v}" for k, v in selections.items() if v and str(v).strip()]
+    ).strip()
+
+    return (prompt.strip(), system_prompt, director_notes)
+

nodes/director.py

@@ -28,8 +28,8 @@ class DirectorNode:
             }
         }
 
-    RETURN_TYPES = ("STRING", "STRING", "STRING", "INT")
-    RETURN_NAMES = ("prompt", "system_prompt", "final_prompt", "next_seed")
+    RETURN_TYPES = ("STRING", "STRING", "STRING", "STRING", "INT")
+    RETURN_NAMES = ("prompt", "system_prompt", "final_prompt", "director_notes", "next_seed")
     FUNCTION = "run"
     CATEGORY = "PFN/Director"
 
@@ -57,7 +57,7 @@ class DirectorNode:
         if (custom_intro_mode == "index") and (custom_intro_index is not None) and (int(custom_intro_index) >= 0):
             idx = int(custom_intro_index)
 
-        prompt, system_prompt = build_prompt_from_world(
+        prompt, system_prompt, director_notes = build_prompt_from_world(
             w,
             seed=effective_seed,
             custom_intro_mode=custom_intro_mode,
@@ -87,4 +87,5 @@ class DirectorNode:
             else:
                 next_seed = effective_seed
 
-        return (prompt, sp, final_prompt, next_seed)
+        return (prompt, sp, final_prompt, director_notes, next_seed)
+