Restore general character and location helpers
This commit is contained in:
+333
-4
@@ -1042,6 +1042,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 "
|
||||
@@ -1604,6 +1663,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 "
|
||||
@@ -1888,8 +2215,9 @@ NODE_CLASS_MAPPINGS = {
|
||||
"DumasCharacterReference": DumasCharacterReferenceNode,
|
||||
"DumasLocationReference": DumasLocationReferenceNode,
|
||||
"DumasAnchorStyle": DumasAnchorStyleNode,
|
||||
"DumasCharacterHelper": DumasCharacterReferenceNode,
|
||||
"DumasH3CharacterHelper": DumasCharacterReferenceNode,
|
||||
"DumasCharacterHelper": DumasCharacterHelperNode,
|
||||
"DumasLocationHelper": DumasLocationHelperNode,
|
||||
"DumasH3CharacterHelper": DumasCharacterHelperNode,
|
||||
}
|
||||
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
@@ -1901,6 +2229,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
"DumasCharacterReference": "Dumas Character Reference",
|
||||
"DumasLocationReference": "Dumas Location Reference",
|
||||
"DumasAnchorStyle": "Dumas Anchor Style",
|
||||
"DumasCharacterHelper": "Dumas Character Reference",
|
||||
"DumasH3CharacterHelper": "Dumas Character Reference",
|
||||
"DumasCharacterHelper": "Dumas Character Helper",
|
||||
"DumasLocationHelper": "Dumas Location Helper",
|
||||
"DumasH3CharacterHelper": "Dumas Character Helper",
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user