alphard/Bjornulf_custom_nodes
1
0
Fork 0
mirror of https://github.com/justUmen/Bjornulf_custom_nodes.git synced 2026-03-21 20:52:11 -03:00
Code Issues Packages Projects Releases Wiki Activity

0.80

Browse Source
This commit is contained in:
justumen
2025-04-24 15:06:44 +02:00
parent bbf0bd7046
commit e02f54b685
5 changed files with 329 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
API_openai.py Normal file
View File

@@ -0,0 +1,112 @@
import os
import requests
from PIL import Image
import numpy as np
import torch
import base64
class APIGenerateGPT4o:
@classmethod
def INPUT_TYPES(cls):
return {
"required": {
"api_key": ("STRING", {
"multiline": False,
"default": "" # User provides their OpenAI API key
}),
"prompt": ("STRING", {
"multiline": True,
"default": "A cute baby sea otter"
}),
"size": (["1024x1024", "1536x1024", "1024x1536", "auto"], {
"default": "1536x1024"
}),
},
"optional": {
"background": (["auto", "transparent", "opaque"], {
"default": "auto"
}),
"moderation": (["auto", "low"], {
"default": "auto"
}),
"output_format": (["png", "jpeg", "webp"], {
"default": "png"
}),
"quality": (["auto", "high", "medium", "low"], {
"default": "auto"
}),
"n": ("INT", {
"default": 1,
"min": 1,
"max": 1
}),
}
}
RETURN_TYPES = ("IMAGE",)
FUNCTION = "generate"
CATEGORY = "OpenAI API"
def get_next_number(self):
"""Get the next available number for naming saved image files."""
save_dir = "output/API/OpenAI_GPT4o"
os.makedirs(save_dir, exist_ok=True)
files = [f for f in os.listdir(save_dir) if f.endswith('.png')]
if not files:
return 1
numbers = [int(f.split('.')[0]) for f in files]
return max(numbers) + 1
def generate(self, api_key, prompt, size, background="auto", moderation="auto", output_format="png", quality="auto", n=1):
"""Generate an image using the OpenAI gpt-image-1 model and return it as a tensor."""
# API headers
headers = {
"Authorization": f"Bearer {api_key}",
"Content-Type": "application/json"
}
# API payload
payload = {
"model": "gpt-image-1",
"prompt": prompt,
"n": n,
"size": size,
"background": background,
"moderation": moderation,
"output_format": output_format,
"quality": quality
}
# Send request to OpenAI API
response = requests.post(
"https://api.openai.com/v1/images/generations",
headers=headers,
json=payload
)
if response.status_code != 200:
raise Exception(f"API request failed: {response.text}")
# Parse response and extract base64 image data
data = response.json()
b64_data = data["data"][0]["b64_json"]
# Decode base64 data into image bytes
image_bytes = base64.b64decode(b64_data)
# Save the image with an incrementing filename
next_num = self.get_next_number()
filename = f"{next_num:03d}.png"
filepath = os.path.join("output/API/OpenAI_GPT4o", filename)
with open(filepath, "wb") as f:
f.write(image_bytes)
# Load and process the image
img = Image.open(filepath)
if img.mode != "RGB":
img = img.convert("RGB")
# Convert to tensor for ComfyUI
img_tensor = torch.from_numpy(np.array(img).astype(np.float32) / 255.0)
img_tensor = img_tensor.unsqueeze(0)
return (img_tensor,)

13
README.md
View File

@@ -1,6 +1,6 @@
# 🔗 Comfyui : Bjornulf_custom_nodes v0.79 🔗
# 🔗 Comfyui : Bjornulf_custom_nodes v0.80 🔗
A list of 162 custom nodes for Comfyui : Display, manipulate, create and edit text, images, videos, loras, generate characters and more.
A list of 163 custom nodes for Comfyui : Display, manipulate, create and edit text, images, videos, loras, generate characters and more.
You can manage looping operations, generate randomized content, trigger logical conditions, pause and manually control your workflows and even work with external AI tools, like Ollama or Text To Speech.
⚠️ Warning : Very active development. Work in progress. 🏗
@@ -186,6 +186,7 @@ Support me, this project and my other AI exciting projects : ❤️❤️❤️
`109.` [☁🎨 API Image Generator (Black Forest Labs - Flux) ☁](#109----api-image-generator-black-forest-labs---flux-)
`110.` [☁🎨 API Image Generator (Stability - Stable Diffusion) ☁](#110----api-image-generator-stability---stable-diffusion-)
`151` [📥🕑🤖 Load CivitAI Links](#151----load-civitai-links)
`163` [☁🎨 API Image Generator (openai, gpt-image-1)](#163)
## 📥 Take from CivitAI / Hugginface 📥
`98.` [📥 Load checkpoint SD1.5 (+Download from CivitAi)](#98----load-checkpoint-sd15-download-from-civitai)
@@ -463,6 +464,7 @@ Rewrite of FFMPEG nodes, COnfiguration and Video preview.
Many other bug fixes and improvements on many nodes, thx for the reports.
- **0.78**: Fix Line selector Reset button javascript. (not showing on refresh)
- **0.79**: Fix Ollama Talk
- **0.780**: gtp-image-1 api node
# 📝 Nodes descriptions
@@ -2309,3 +2311,10 @@ In the future I will make a system to "inject" a specific reusable character, pr
**Description:**
Connect to Fix Face node to modify a specific face.
#### 163 - ☁🎨 API Image Generator (openai, gpt-image-1)
**Description:**
Create an image with GPT-Image-1 API.
![gpt 4 image](screenshots/gpt_image_1.jpg)

3
__init__.py
View File

@@ -125,6 +125,7 @@ from .audio_preview import AudioPreview
from .style_selector import StyleSelector
# from .switches import ConditionalSwitch
from .split_image import SplitImageGrid, ReassembleImageGrid
from .API_openai import APIGenerateGPT4o
# from .video_text_generator import VideoTextGenerator
# from .run_workflow_from_api import ExecuteWorkflowNode, ApiDynamicTextInputs
@@ -147,6 +148,7 @@ NODE_CLASS_MAPPINGS = {
# "Bjornulf_VideoTextGenerator": VideoTextGenerator,
# "Bjornulf_ExecuteWorkflowNode": ExecuteWorkflowNode,
# "Bjornulf_ApiDynamicTextInputs": ApiDynamicTextInputs,
"Bjornulf_APIGenerateGPT4o": APIGenerateGPT4o,
# "Bjornulf_ConditionalSwitch": ConditionalSwitch,
"Bjornulf_LoadCivitAILinks": LoadCivitAILinks,
@@ -496,6 +498,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
"Bjornulf_IfElse": "🔀 If-Else (input / compare_with)",
"Bjornulf_ImageDetails": "🖼🔍 Image Details",
"Bjornulf_CombineImages": "🖼🔗 Combine Images",
"Bjornulf_APIGenerateGPT4o": "☁🎨 API Image Generator (openai, gpt-image-1)",
}
WEB_DIRECTORY = "./web"

4
pyproject.toml
View File

@@ -1,7 +1,7 @@
[project]
name = "bjornulf_custom_nodes"
description = "162 ComfyUI nodes : Display, manipulate, and edit text, images, videos, loras, generate characters and more. Manage looping operations, generate randomized content, use logical conditions and work with external AI tools, like Ollama or Text To Speech, etc..."
version = "0.79"
description = "163 ComfyUI nodes : Display, manipulate, and edit text, images, videos, loras, generate characters and more. Manage looping operations, generate randomized content, use logical conditions and work with external AI tools, like Ollama or Text To Speech, etc..."
version = "0.80"
license = {file = "LICENSE"}
[project.urls]

294
text_generator.py
View File

@@ -719,12 +719,46 @@ class SharedLists:
]
# Style-related lists
ARTISTIC_STYLES = [
"photography", "oil painting", "watercolor", "digital art", "pencil sketch", "anime",
"photorealistic", "comic book", "impressionist", "pop art", "minimalist",
"concept art", "3D render", "cinematic", "studio photography", "film noir"
]
CATEGORIES = ["Painting", "Photography", "Digital Art", "3D Rendering", "Illustration"]
# Define specific styles (branches) within each category
BRANCHES = {
"Painting": [
"Renaissance", "Baroque", "Rococo", "Neoclassicism",
"Romanticism", "Realism", "Impressionism", "Post-Impressionism",
"Expressionism", "Fauvism", "Cubism", "Futurism", "Dadaism",
"Surrealism", "Abstract Expressionism", "Pop Art", "Op Art",
"Minimalism"
],
"Photography": [
"Black and White", "Color", "Vintage", "Sepia Tone", "HDR",
"Long Exposure", "Macro", "Portrait", "Landscape", "Street",
"Fashion", "Analog Film", "Cinematic"
],
"Digital Art": [
"Digital Painting", "Vector Art", "Pixel Art", "Fractal Art",
"Algorithmic Art", "Glitch Art"
],
"3D Rendering": [
"Low Poly", "Voxel", "Isometric", "Ray Tracing"
],
"Illustration": [
"Line Art", "Cartoon", "Comic Book", "Manga", "Anime",
"Technical Illustration", "Botanical Illustration",
"Architectural Rendering", "Concept Art", "Storyboard Art"
],
}
# Suffixes to append to branches for natural phrasing
CATEGORY_SUFFIXES = {
"Painting": "painting",
"Photography": "photography",
"Digital Art": "",
"3D Rendering": "3D rendering",
"Illustration": "illustration"
}
# Define other style elements (optional, kept for completeness)
COLOR_PALETTES = [
"vibrant", "muted", "monochromatic", "pastel", "dark and moody",
"warm", "cool", "high contrast", "earthy", "neon",
@@ -743,11 +777,6 @@ class SharedLists:
"dark", "cheerful", "nostalgic", "dreamy", "epic"
]
COMPOSITIONS = [
"rule of thirds", "symmetrical", "dynamic", "minimalist", "centered",
"diagonal", "framed", "leading lines", "golden ratio", "panoramic", "dutch angle"
]
# Scene-related lists
SCENE_TYPES = [
"urban", "natural", "fantasy", "sci-fi", "historical",
@@ -1092,8 +1121,8 @@ class SharedLists:
# Character-related lists
POSITIONS = [
"left", "center", "right", "top", "bottom",
"top-left", "top-right", "bottom-left", "bottom-right"
"on the left", "in the center", "on the right", "at the top", "at the bottom",
"at the top-left", "at the top-right", "at the bottom-left", "at the bottom-right"
]
ETHNICITIES = {
@@ -1536,7 +1565,7 @@ class SharedLists:
"swaying arms to music", "bending sideways", "laying sideways"
]
BODY_SHAPES = [
FEMALE_BODY_SHAPES = [
"athletic", "muscular", "slim", "slender", "petite", "average", "curvy",
"full-figured", "tall and lean", "short and stocky", "broad-shouldered",
"narrow-waisted", "hourglass figure", "pear-shaped", "apple-shaped",
@@ -1549,6 +1578,17 @@ class SharedLists:
"sturdy", "delicate", "graceful", "imposing"
]
MALE_BODY_SHAPES = [
"athletic", "muscular", "slim", "slender", "average", "tall", "very tall",
"short", "very short", "average height", "thin", "skinny", "plump", "heavy-set",
"robust", "long-legged", "short-legged", "broad-shouldered", "narrow-waisted",
"toned", "well-built", "lean muscular", "bodybuilder physique", "tall and lean",
"short and stocky", "compact", "lanky", "lithe", "sturdy", "imposing",
"barrel-chested", "stocky", "burly", "wiry", "rangy", "sinewy", "hulking",
"V-shaped torso", "triangular build", "ectomorphic", "mesomorphic", "endomorphic",
"inverted triangle", "rectangle", "chiseled", "ripped", "beefy", "scrawny"
]
HAIR_STYLES = [
"long", "short", "curly", "straight", "wavy", "braided",
"bald", "buzzcut", "bob", "pixie", "ponytail", "buns", "double ponytail",
@@ -1580,9 +1620,16 @@ class SharedLists:
]
SHOT_TYPES = [
"close-up", "medium shot", "full body", "wide shot",
"extreme close-up", "medium close-up", "medium long shot",
"long shot", "extreme long shot", "establishing shot"
"close-up shot", # A tight focus on a subject, often a face or small detail
"medium shot", # Frames the subject from the waist up, balancing detail and context
"full body shot", # Captures the entire subject from head to toe
"wide shot", # Shows the subject within a broader environment or scene
"extreme close-up shot", # Zooms in intensely, highlighting minute details like eyes or texture
"medium close-up shot", # A slightly wider close-up, typically from the chest or shoulders up
"medium long shot", # Frames the subject from the knees or thighs up, blending foreground and background
"long shot", # Places the subject at a distance, emphasizing surroundings over detail
"extreme long shot", # A vast, far-off perspective, often dwarfing the subject in a massive landscape
"establishing shot" # Sets the scene, providing context for location or atmosphere
]
LIGHTING = [
@@ -1596,12 +1643,55 @@ class SharedLists:
]
ACTIONS = [
"talking to each other", "fighting", "dancing", "walking together",
"having dinner", "playing games", "working together", "arguing",
"celebrating", "performing", "studying", "shopping"
"posing for the camera",
"looking at the camera",
"walking arm in arm",
"talking to each other",
"gesturing while talking",
"fighting with fists up",
"dodging a punch",
"dancing in a ballroom hold",
"spinning in a dance",
"walking together",
"passing food at dinner",
"toasting with glasses",
"playing a board game",
"acting out charades",
"painting a wall together",
"looking at a blueprint",
"arguing with hands on hips",
"arguing with arms crossed",
"celebrating with arms raised",
"lifting in celebration",
"singing a duet",
"dancing in sync",
"pointing at a book",
"huddled over a laptop",
"holding up a product",
"carrying shopping bags",
"posing for the camera",
"making bunny ears",
"kissing on the cheek",
"kissing romantically",
"hugging tightly",
"hugging from the side",
"helping up",
"whispering",
"comforting",
"high-fiving",
"riding piggyback",
"proposing with a ring",
"taking a selfie",
"fist bumping",
"exchanging gifts",
"doing a trust fall",
"in a group hug",
"in a team huddle",
"posing for a family photo",
"in a conga line",
"forming a human pyramid"
]
class TextGeneratorOutfitFemale:
@classmethod
def INPUT_TYPES(cls):
@@ -1968,7 +2058,7 @@ class TextGeneratorCharacterFemale:
"nationality": (["NONE", "RANDOM"] + SharedLists.NATIONALITIES,),
"age": (["RANDOM"] + SharedLists.AGES_FEMALE, {"default": "woman"}),
"add_specific_age": ("STRING", {"multiline": False, "default": ""}),
"body_shape": (["RANDOM", "NONE"] + SharedLists.BODY_SHAPES,),
"body_shape": (["RANDOM", "NONE"] + SharedLists.FEMALE_BODY_SHAPES,),
"breasts": (["RANDOM", "NONE"] + SharedLists.BREAST_SHAPES,),
"ass": (["RANDOM", "NONE"] + SharedLists.ASS_SHAPES,),
"skin_tone": (["NONE", "RANDOM"] + SharedLists.SKIN_TONES,),
@@ -2025,7 +2115,7 @@ class TextGeneratorCharacterFemale:
# Location
if values['location_on_image']:
desc_parts.append(f"On the {values['location_on_image']} of the image:")
desc_parts.append(f"{values['location_on_image']} of the image:")
# Age and ethnicity description
if values['age']:
@@ -2114,7 +2204,7 @@ class TextGeneratorCharacterMale:
"nationality": (["NONE", "RANDOM"] + SharedLists.NATIONALITIES,),
"age": (["RANDOM"] + SharedLists.AGES_MALE, {"default": "man"}),
"add_specific_age": ("STRING", {"multiline": False, "default": ""}),
"body_shape": (["RANDOM", "NONE"] + SharedLists.BODY_SHAPES,),
"body_shape": (["RANDOM", "NONE"] + SharedLists.MALE_BODY_SHAPES,),
"skin_tone": (["NONE", "RANDOM"] + SharedLists.SKIN_TONES,),
"facial_hair": (["NONE", "RANDOM"] + SharedLists.FACIAL_HAIR_TYPES,),
"eye_color": (["NONE", "RANDOM"] + SharedLists.EYE_COLORS,),
@@ -2169,7 +2259,7 @@ class TextGeneratorCharacterMale:
# Location
if values['location_on_image']:
desc_parts.append(f"On the {values['location_on_image']} of the image:")
desc_parts.append(f"{values['location_on_image']} of the image:")
# Age and ethnicity description
if values['age']:
@@ -2240,20 +2330,34 @@ class TextGeneratorCharacterMale:
return (f"{add_GEN_CHARACTER}\n{final_description}",)
return (final_description,)
class TextGeneratorStyle:
@classmethod
def INPUT_TYPES(cls):
return {
"required": {
"category": (SharedLists.CATEGORIES,),
"style": ([
"Renaissance", "Baroque", "Rococo", "Neoclassicism",
"Romanticism", "Realism", "Impressionism", "Post-Impressionism",
"Expressionism", "Fauvism", "Cubism", "Futurism", "Dadaism",
"Surrealism", "Abstract Expressionism", "Pop Art", "Op Art",
"Minimalism",
"Black and White", "Color", "Vintage", "Sepia Tone", "HDR",
"Long Exposure", "Macro", "Portrait", "Landscape", "Street",
"Fashion", "Analog Film", "Cinematic",
"Digital Painting", "Vector Art", "Pixel Art", "Fractal Art",
"Algorithmic Art", "Glitch Art",
"Low Poly", "Voxel", "Isometric", "Ray Tracing",
"Line Art", "Cartoon", "Comic Book", "Manga", "Anime",
"Technical Illustration", "Botanical Illustration",
"Architectural Rendering", "Concept Art", "Storyboard Art"
],),
"color_palette": (["NONE", "RANDOM"] + SharedLists.COLOR_PALETTES,),
"lighting_type": (["NONE", "RANDOM"] + SharedLists.LIGHTING_TYPES,),
"mood": (["NONE", "RANDOM"] + SharedLists.MOODS,),
"ambiance": (["NONE", "RANDOM"] + SharedLists.AMBIANCE_TYPES,),
"CUSTOM_PROMPT": ("STRING", {"multiline": True, "default": ""}),
"seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
"artistic_style": (["RANDOM", "NONE"] + SharedLists.ARTISTIC_STYLES,),
"color_palette": (["RANDOM", "NONE"] + SharedLists.COLOR_PALETTES,),
"lighting_type": (["RANDOM", "NONE"] + SharedLists.LIGHTING_TYPES,),
"mood": (["RANDOM", "NONE"] + SharedLists.MOODS,),
"composition": (["RANDOM", "NONE"] + SharedLists.COMPOSITIONS,),
"CUSTOM_PROMPT": ("STRING", {"multiline": True, "default": ""})
}
}
@@ -2264,39 +2368,33 @@ class TextGeneratorStyle:
def select_random_element(self, available_options, selected_value, random_generator):
if selected_value == "RANDOM":
valid_choices = [
opt for opt in available_options if opt not in ["RANDOM", "NONE"]]
valid_choices = [opt for opt in available_options if opt not in ["RANDOM", "NONE"]]
return random_generator.choice(valid_choices)
elif selected_value == "NONE":
return ""
return selected_value
def generate(self, seed, artistic_style, color_palette, lighting_type, mood, composition, CUSTOM_PROMPT):
def generate(self, category, style, color_palette, lighting_type, mood, ambiance, CUSTOM_PROMPT, seed):
random_generator = random.Random(seed)
style_elements = {
k: self.select_random_element(
self.INPUT_TYPES()["required"][k][0], v, random_generator)
for k, v in locals().items()
if k not in ['self', 'seed', 'random_generator', 'CUSTOM_PROMPT']
}
artistic_style = f"{style} {SharedLists.CATEGORY_SUFFIXES.get(category, '')}".strip()
color_palette = self.select_random_element(SharedLists.COLOR_PALETTES, color_palette, random_generator)
lighting_type = self.select_random_element(SharedLists.LIGHTING_TYPES, lighting_type, random_generator)
mood = self.select_random_element(SharedLists.MOODS, mood, random_generator)
ambiance = self.select_random_element(SharedLists.AMBIANCE_TYPES, ambiance, random_generator)
style_components = []
if style_elements['artistic_style']:
style_components.append(
f"{style_elements['artistic_style']} style")
if style_elements['color_palette']:
style_components.append(
f"using a {style_elements['color_palette']} color scheme")
if style_elements['lighting_type']:
style_components.append(
f"with {style_elements['lighting_type']} lighting")
if style_elements['mood']:
style_components.append(
f"conveying a {style_elements['mood']} mood")
if style_elements['composition']:
style_components.append(
f"in a {style_elements['composition']} composition")
if artistic_style:
style_components.append(artistic_style)
if color_palette:
style_components.append(f"using a {color_palette} color scheme")
if lighting_type:
style_components.append(f"with {lighting_type} lighting")
if mood:
style_components.append(f"conveying a {mood} mood")
if ambiance:
style_components.append(f"with a {ambiance} ambiance")
style_description = ", ".join(style_components)
@@ -2305,18 +2403,16 @@ class TextGeneratorStyle:
return (style_description,)
class TextGeneratorScene:
@classmethod
def INPUT_TYPES(cls):
return {
"required": {
"seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
"scene_type": (["RANDOM", "NONE"] + SharedLists.SCENE_TYPES,),
"time_period": (["RANDOM", "NONE"] + SharedLists.TIME_PERIODS,),
"weather_condition": (["RANDOM", "NONE"] + SharedLists.WEATHER_CONDITIONS,),
"ambiance": (["RANDOM", "NONE"] + SharedLists.AMBIANCE_TYPES,),
"setting": (["RANDOM", "NONE"] + SharedLists.SETTINGS,),
"scene_type": (["NONE", "RANDOM"] + SharedLists.SCENE_TYPES,),
"time_period": (["NONE", "RANDOM"] + SharedLists.TIME_PERIODS,),
"weather_condition": (["NONE", "RANDOM"] + SharedLists.WEATHER_CONDITIONS,),
"setting": (["NONE", "RANDOM"] + SharedLists.SETTINGS,),
"CUSTOM_PROMPT": ("STRING", {"multiline": True, "default": ""})
}
}
@@ -2328,35 +2424,31 @@ class TextGeneratorScene:
def select_random_element(self, available_options, selected_value, random_generator):
if selected_value == "RANDOM":
valid_choices = [
opt for opt in available_options if opt not in ["RANDOM", "NONE"]]
valid_choices = [opt for opt in available_options if opt not in ["RANDOM", "NONE"]]
return random_generator.choice(valid_choices)
elif selected_value == "NONE":
return ""
return selected_value
def generate(self, seed, scene_type, time_period, weather_condition, ambiance, setting, CUSTOM_PROMPT):
def generate(self, seed, scene_type, time_period, weather_condition, setting, CUSTOM_PROMPT):
random_generator = random.Random(seed)
scene_elements = {
k: self.select_random_element(
self.INPUT_TYPES()["required"][k][0], v, random_generator)
for k, v in locals().items()
if k not in ['self', 'seed', 'random_generator', 'CUSTOM_PROMPT']
'scene_type': self.select_random_element(SharedLists.SCENE_TYPES, scene_type, random_generator),
'time_period': self.select_random_element(SharedLists.TIME_PERIODS, time_period, random_generator),
'weather_condition': self.select_random_element(SharedLists.WEATHER_CONDITIONS, weather_condition, random_generator),
'setting': self.select_random_element(SharedLists.SETTINGS, setting, random_generator),
}
scene_components = []
if scene_elements['ambiance'] and scene_elements['scene_type']:
scene_components.append(
f"in a {scene_elements['ambiance']} {scene_elements['scene_type']} scene")
if scene_elements['scene_type']:
scene_components.append(f"in a {scene_elements['scene_type']} scene")
if scene_elements['setting']:
scene_components.append(f"located in {scene_elements['setting']}")
if scene_elements['time_period']:
scene_components.append(
f"during the {scene_elements['time_period']}")
scene_components.append(f"during the {scene_elements['time_period']}")
if scene_elements['weather_condition']:
scene_components.append(
f"with {scene_elements['weather_condition']} conditions")
scene_components.append(f"with {scene_elements['weather_condition']} conditions")
scene_description = ", ".join(scene_components)
@@ -2365,7 +2457,6 @@ class TextGeneratorScene:
return (scene_description,)
class TextGenerator:
@classmethod
def INPUT_TYPES(cls):
@@ -2415,14 +2506,12 @@ class TextGenerator:
for line in GEN_CHARACTER.split('\n'):
line = line.strip()
if line.startswith('-'):
# Count the number of consecutive dashes at the start
dash_count = len(line) - len(line.lstrip('-'))
character_count += dash_count
else:
character_count = 0
prompt_parts = []
if values['shot_type'] or values['camera_angle']:
shot_description = []
if values['shot_type']:
@@ -2443,32 +2532,22 @@ class TextGenerator:
technical_desc = ", ".join(prompt_parts) if prompt_parts else ""
final_parts = []
if technical_desc:
if CUSTOM_PROMPT.strip():
technical_desc += f", {CUSTOM_PROMPT.strip()}"
final_parts.append(technical_desc)
if character_intro:
final_parts.append(character_intro)
# Combine all parts
# Combine all parts, each on its own line
final_prompt_parts = []
if GEN_STYLE:
final_prompt_parts.append(GEN_STYLE)
if final_parts:
final_prompt_parts.append(", ".join(final_parts))
if technical_desc:
final_prompt_parts.append(technical_desc)
if character_intro:
final_prompt_parts.append(character_intro)
if CUSTOM_PROMPT.strip():
final_prompt_parts.append(CUSTOM_PROMPT.strip())
if GEN_CHARACTER:
final_prompt_parts.append(GEN_CHARACTER)
if GEN_SCENE:
final_prompt_parts.append(GEN_SCENE)
final_prompt = "\n".join(
part for part in final_prompt_parts if part.strip())
final_prompt = "\n".join(part for part in final_prompt_parts if part.strip())
return (final_prompt,)
class ListLooperOutfitMale:
@@ -2625,7 +2704,8 @@ class ListLooperCharacter:
"nationality",
"age_male",
"age_female",
"body_shape",
"body_shape_female",
"body_shape_male",
"skin_tone",
"eye_color",
"hair_style",
@@ -2650,7 +2730,8 @@ class ListLooperCharacter:
"nationality": ([f"ALL ({len(SharedLists.NATIONALITIES)})"] + SharedLists.NATIONALITIES,),
"age_male": ([f"ALL ({len(SharedLists.AGES_MALE)})"] + SharedLists.AGES_MALE,),
"age_female": ([f"ALL ({len(SharedLists.AGES_FEMALE)})"] + SharedLists.AGES_FEMALE,),
"body_shape": ([f"ALL ({len(SharedLists.BODY_SHAPES)})"] + SharedLists.BODY_SHAPES,),
"body_shape_female": ([f"ALL ({len(SharedLists.FEMALE_BODY_SHAPES)})"] + SharedLists.FEMALE_BODY_SHAPES,),
"body_shape_male": ([f"ALL ({len(SharedLists.MALE_BODY_SHAPES)})"] + SharedLists.MALE_BODY_SHAPES,),
"skin_tone": ([f"ALL ({len(SharedLists.SKIN_TONES)})"] + SharedLists.SKIN_TONES,),
"eye_color": ([f"ALL ({len(SharedLists.EYE_COLORS)})"] + SharedLists.EYE_COLORS,),
"hair_style": ([f"ALL ({len(SharedLists.HAIR_STYLES)})"] + SharedLists.HAIR_STYLES,),
@@ -2676,7 +2757,7 @@ class ListLooperCharacter:
CATEGORY = "Bjornulf"
def get_list(self, SELECTION, location_on_image, ethnicity, nationality,
age_male, age_female, body_shape, skin_tone, eye_color,
age_male, age_female, body_shape_female, body_shape_male, skin_tone, eye_color,
hair_style, hair_color, facial_hair, breasts, ass,
creature_type, creature_size, creature_temperament, water_animal, land_animal,
creature_ability, creature_features, magical_properties):
@@ -2690,7 +2771,8 @@ class ListLooperCharacter:
"nationality": (nationality, SharedLists.NATIONALITIES),
"age_male": (age_male, SharedLists.AGES_MALE),
"age_female": (age_female, SharedLists.AGES_FEMALE),
"body_shape": (body_shape, SharedLists.BODY_SHAPES),
"body_shape_male": (body_shape_male, SharedLists.MALE_BODY_SHAPES),
"body_shape_female": (body_shape_female, SharedLists.FEMALE_BODY_SHAPES),
"skin_tone": (skin_tone, SharedLists.SKIN_TONES),
"eye_color": (eye_color, SharedLists.EYE_COLORS),
"hair_style": (hair_style, SharedLists.HAIR_STYLES),
@@ -2731,11 +2813,11 @@ class ListLooperStyle:
"mood",
"composition"
], {"forceInput": False}),
"artistic_style": ([f"ALL ({len(SharedLists.ARTISTIC_STYLES)})"] + SharedLists.ARTISTIC_STYLES,),
"artistic_style": ([f"ALL ({len(SharedLists.COLOR_PALETTES)})"] + SharedLists.COLOR_PALETTES,),
"color_palette": ([f"ALL ({len(SharedLists.COLOR_PALETTES)})"] + SharedLists.COLOR_PALETTES,),
"lighting_type": ([f"ALL ({len(SharedLists.LIGHTING_TYPES)})"] + SharedLists.LIGHTING_TYPES,),
"mood": ([f"ALL ({len(SharedLists.MOODS)})"] + SharedLists.MOODS,),
"composition": ([f"ALL ({len(SharedLists.COMPOSITIONS)})"] + SharedLists.COMPOSITIONS,),
"composition": ([f"ALL ({len(SharedLists.MOODS)})"] + SharedLists.MOODS,),
}
}
@@ -2747,11 +2829,11 @@ class ListLooperStyle:
def get_list(self, SELECTION, artistic_style, color_palette,
lighting_type, mood, composition):
selection_map = {
"artistic_style": (artistic_style, SharedLists.ARTISTIC_STYLES),
"artistic_style": (artistic_style, SharedLists.COLOR_PALETTES),
"color_palette": (color_palette, SharedLists.COLOR_PALETTES),
"lighting_type": (lighting_type, SharedLists.LIGHTING_TYPES),
"mood": (mood, SharedLists.MOODS),
"composition": (composition, SharedLists.COMPOSITIONS)
"composition": (composition, SharedLists.MOODS)
}
selected_value, full_list = selection_map[SELECTION]
return (full_list,) if "ALL" in selected_value else ([selected_value],)
@@ -3068,7 +3150,7 @@ class TextGeneratorCharacterCreature:
# Location
if values['location_on_image']:
desc_parts.append(f"On the {values['location_on_image']} of the image:")
desc_parts.append(f"{values['location_on_image']} of the image:")
# Basic description
base_desc = f"{number_to_word(number_of_creatures)} {values['size']} {values['creature_type']}"