Full refresh with additional resolutions, custom options and latent output.
This commit is contained in:
BRADSEC
+397
-57
@@ -1,91 +1,431 @@
|
||||
# Resolution presets
|
||||
BASE_RESOLUTIONS = [
|
||||
(1024, 1024),
|
||||
(704, 1408),
|
||||
(704, 1344),
|
||||
(768, 1344),
|
||||
(768, 1280),
|
||||
(832, 1216),
|
||||
(832, 1152),
|
||||
(896, 1152),
|
||||
(896, 1088),
|
||||
(960, 1088),
|
||||
(960, 1024),
|
||||
(1024, 960),
|
||||
(1088, 960),
|
||||
(1088, 896),
|
||||
(1152, 896),
|
||||
(1152, 832),
|
||||
(1216, 832),
|
||||
(1280, 768),
|
||||
(1344, 768),
|
||||
(1344, 704),
|
||||
(1408, 704),
|
||||
(1472, 704),
|
||||
(1536, 640),
|
||||
(1600, 640),
|
||||
(1664, 576),
|
||||
(1728, 576)
|
||||
]
|
||||
import torch
|
||||
|
||||
try:
|
||||
import comfy.model_management
|
||||
COMFY_AVAILABLE = True
|
||||
except ImportError:
|
||||
COMFY_AVAILABLE = False
|
||||
|
||||
|
||||
# Model-specific resolution presets with constraints
|
||||
MODEL_RESOLUTIONS = {
|
||||
"Flux": {
|
||||
"square": [(512, 512), (768, 768), (1024, 1024), (1280, 1280), (1536, 1536), (1920, 1920), (2048, 2048)],
|
||||
"portrait": [(768, 1344), (832, 1216), (896, 1152), (928, 1664), (1024, 1536), (1024, 1792), (1080, 1920), (1152, 2048)],
|
||||
"landscape": [(1344, 768), (1216, 832), (1152, 896), (1536, 1024), (1664, 928), (1792, 1024), (1920, 1080), (2048, 1152)],
|
||||
"constraints": {"divisible_by": 16, "min": 256, "max": 2048}
|
||||
},
|
||||
"Qwen Image": {
|
||||
"square": [(1024, 1024), (1280, 1280), (1328, 1328), (1536, 1536), (1920, 1920), (2048, 2048)],
|
||||
"portrait": [(928, 1664), (1024, 1536), (1080, 1920), (1140, 1472), (1152, 2048)],
|
||||
"landscape": [(1472, 1140), (1536, 1024), (1664, 928), (1920, 1080), (2048, 1152)],
|
||||
"constraints": {"divisible_by": 8, "min": 256, "max": 2048}
|
||||
},
|
||||
"Z-Image": {
|
||||
"square": [(512, 512), (768, 768), (1024, 1024), (1280, 1280), (1536, 1536), (1920, 1920), (2048, 2048)],
|
||||
"portrait": [(720, 1280), (768, 1024), (1080, 1920), (1152, 2048)],
|
||||
"landscape": [(1024, 768), (1280, 720), (1920, 1080), (2048, 1152)],
|
||||
"constraints": {"divisible_by": 8, "min": 256, "max": 2048}
|
||||
},
|
||||
"SD 1.5": {
|
||||
"square": [(512, 512), (768, 768), (1024, 1024), (1280, 1280), (1536, 1536)],
|
||||
"portrait": [(512, 768), (512, 682), (512, 1024), (768, 1024), (768, 1344), (1080, 1920)],
|
||||
"landscape": [(768, 512), (1024, 512), (1024, 768), (1344, 768), (1536, 512), (1920, 1080)],
|
||||
"constraints": {"divisible_by": 8, "min": 256, "max": 2048}
|
||||
},
|
||||
"SDXL": {
|
||||
"square": [(1024, 1024), (1280, 1280), (1536, 1536), (1920, 1920), (2048, 2048)],
|
||||
"portrait": [(640, 1536), (768, 1344), (832, 1216), (896, 1152), (1024, 1536), (1080, 1920), (1152, 2048)],
|
||||
"landscape": [(1152, 896), (1216, 832), (1344, 768), (1536, 640), (1536, 1024), (1920, 1080), (2048, 1152)],
|
||||
"constraints": {"divisible_by": 8, "min": 256, "max": 2048}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
def gcd(a, b):
|
||||
"""
|
||||
Calculate greatest common divisor using Euclidean algorithm.
|
||||
|
||||
Args:
|
||||
a (int): First number
|
||||
b (int): Second number
|
||||
|
||||
Returns:
|
||||
int: Greatest common divisor
|
||||
"""
|
||||
while b != 0:
|
||||
a, b = b, a % b
|
||||
return a
|
||||
|
||||
|
||||
def calculate_aspect_ratio(width, height):
|
||||
"""
|
||||
Calculate simplified aspect ratio from dimensions, rounding to common ratios.
|
||||
|
||||
Args:
|
||||
width (int): Width in pixels
|
||||
height (int): Height in pixels
|
||||
|
||||
Returns:
|
||||
str: Aspect ratio like "16:9" or "1:1"
|
||||
"""
|
||||
# Calculate actual ratio as decimal
|
||||
actual_ratio = width / height
|
||||
|
||||
# Common aspect ratios (ratio_value, "width:height" string)
|
||||
common_ratios = [
|
||||
(1.0, "1:1"), # Square
|
||||
(1.25, "5:4"), # 1.25
|
||||
(1.33, "4:3"), # 1.333...
|
||||
(1.5, "3:2"), # 1.5
|
||||
(1.6, "16:10"), # 1.6
|
||||
(1.78, "16:9"), # 1.777...
|
||||
(2.0, "2:1"), # 2.0
|
||||
(2.35, "21:9"), # 2.333... (ultrawide)
|
||||
(2.4, "12:5"), # 2.4
|
||||
(3.0, "3:1"), # 3.0
|
||||
# Portrait ratios
|
||||
(0.75, "3:4"), # 0.75
|
||||
(0.67, "2:3"), # 0.666...
|
||||
(0.625, "5:8"), # 0.625
|
||||
(0.56, "9:16"), # 0.5625
|
||||
(0.5, "1:2"), # 0.5
|
||||
(0.42, "5:12"), # 0.4166...
|
||||
]
|
||||
|
||||
# Find closest common ratio (within 5% tolerance)
|
||||
tolerance = 0.05
|
||||
for ratio_value, ratio_str in common_ratios:
|
||||
if abs(actual_ratio - ratio_value) / ratio_value < tolerance:
|
||||
return ratio_str
|
||||
|
||||
# If no close match, calculate GCD-based ratio
|
||||
divisor = gcd(width, height)
|
||||
ratio_width = width // divisor
|
||||
ratio_height = height // divisor
|
||||
return f"{ratio_width}:{ratio_height}"
|
||||
|
||||
|
||||
def format_resolution(width, height):
|
||||
"""
|
||||
Format resolution tuple into display string with aspect ratio and orientation.
|
||||
Uses fixed-width formatting for better alignment in dropdowns.
|
||||
|
||||
Args:
|
||||
width (int): Width in pixels
|
||||
height (int): Height in pixels
|
||||
|
||||
Returns:
|
||||
str: Formatted string like "1920x1080 (16:9 Landscape)" with consistent spacing
|
||||
"""
|
||||
aspect_ratio = calculate_aspect_ratio(width, height)
|
||||
|
||||
if width == height:
|
||||
orientation = "Square"
|
||||
elif width < height:
|
||||
orientation = "Portrait"
|
||||
else:
|
||||
orientation = "Landscape"
|
||||
|
||||
# Format with fixed width for better alignment (e.g., "1920x1080 ")
|
||||
# Most resolutions are 4 digits, so we pad to 9 characters (4x4 + 'x')
|
||||
resolution_str = f"{width}x{height}"
|
||||
padded_resolution = resolution_str.ljust(13) # Pad to 13 chars for alignment
|
||||
|
||||
return f"{padded_resolution}({aspect_ratio} {orientation})"
|
||||
|
||||
|
||||
def get_resolution_list(model_name):
|
||||
"""
|
||||
Generate ordered list of resolution strings for a specific model.
|
||||
|
||||
Args:
|
||||
model_name (str): Name of the model (or "All" for all unique resolutions)
|
||||
|
||||
Returns:
|
||||
list: Formatted resolution strings in order: square, portrait, landscape
|
||||
"""
|
||||
if model_name == "All":
|
||||
return get_all_resolutions()
|
||||
|
||||
if model_name not in MODEL_RESOLUTIONS:
|
||||
return []
|
||||
|
||||
model_data = MODEL_RESOLUTIONS[model_name]
|
||||
resolutions = []
|
||||
|
||||
# Order: square first, then portrait, then landscape
|
||||
for category in ["square", "portrait", "landscape"]:
|
||||
for width, height in model_data[category]:
|
||||
resolutions.append(format_resolution(width, height))
|
||||
|
||||
return resolutions
|
||||
|
||||
|
||||
def get_default_resolution(model_name):
|
||||
"""
|
||||
Get the default/native resolution for a specific model.
|
||||
|
||||
Args:
|
||||
model_name (str): Name of the model
|
||||
|
||||
Returns:
|
||||
str: Formatted resolution string for the model's native resolution
|
||||
"""
|
||||
# Model-specific native/optimal resolutions
|
||||
default_resolutions = {
|
||||
"Flux": (1024, 1024), # Flux native
|
||||
"Qwen Image": (1328, 1328), # Qwen native
|
||||
"Z-Image": (1024, 1024), # Z-Image native
|
||||
"SD 1.5": (512, 512), # SD 1.5 native
|
||||
"SDXL": (1024, 1024), # SDXL native
|
||||
"All": (1024, 1024), # Default for "All"
|
||||
}
|
||||
|
||||
if model_name in default_resolutions:
|
||||
width, height = default_resolutions[model_name]
|
||||
return format_resolution(width, height)
|
||||
|
||||
# Fallback to 1024x1024
|
||||
return format_resolution(1024, 1024)
|
||||
|
||||
|
||||
def get_all_resolutions():
|
||||
"""
|
||||
Get all unique resolution strings across all models, sorted by dimensions.
|
||||
|
||||
Returns:
|
||||
list: All unique resolution strings sorted by total pixels
|
||||
"""
|
||||
unique_resolutions = {}
|
||||
|
||||
# Collect all unique width×height pairs
|
||||
for model_name in MODEL_RESOLUTIONS.keys():
|
||||
model_data = MODEL_RESOLUTIONS[model_name]
|
||||
for category in ["square", "portrait", "landscape"]:
|
||||
for width, height in model_data[category]:
|
||||
key = (width, height)
|
||||
if key not in unique_resolutions:
|
||||
unique_resolutions[key] = format_resolution(width, height)
|
||||
|
||||
# Sort by total pixels, then by width
|
||||
sorted_resolutions = sorted(
|
||||
unique_resolutions.items(),
|
||||
key=lambda item: (item[0][0] * item[0][1], item[0][0])
|
||||
)
|
||||
|
||||
return [res_str for _, res_str in sorted_resolutions]
|
||||
|
||||
|
||||
def parse_resolution_string(resolution_str):
|
||||
"""
|
||||
Parse formatted resolution string back to width, height integers.
|
||||
|
||||
Args:
|
||||
resolution_str (str): Format "1920x1080 (16:9 Landscape)" with possible padding
|
||||
|
||||
Returns:
|
||||
tuple: (width, height)
|
||||
|
||||
Raises:
|
||||
ValueError: If string format is invalid
|
||||
"""
|
||||
try:
|
||||
# Format: "1920x1080 (16:9 Landscape)" - may have padding spaces
|
||||
# Extract the dimension part (before the opening parenthesis)
|
||||
dimension_part = resolution_str.split("(")[0].strip()
|
||||
|
||||
if not dimension_part or 'x' not in dimension_part:
|
||||
raise ValueError(f"No dimension part found in: {resolution_str}")
|
||||
|
||||
# Split on 'x' and convert to integers
|
||||
width, height = map(int, dimension_part.split("x"))
|
||||
|
||||
return (width, height)
|
||||
except (ValueError, IndexError) as e:
|
||||
raise ValueError(f"Invalid resolution format: {resolution_str}")
|
||||
|
||||
|
||||
class ResolutionSelector:
|
||||
"""
|
||||
A node to provide a drop-down list of resolutions and returns two int values (width and height).
|
||||
Enhanced resolution selector supporting multiple image generation models.
|
||||
Provides model-specific resolution presets, custom dimension inputs, and empty latent output.
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
pass
|
||||
"""Initialize device for latent tensor generation."""
|
||||
if COMFY_AVAILABLE:
|
||||
self.device = comfy.model_management.intermediate_device()
|
||||
else:
|
||||
self.device = torch.device("cpu")
|
||||
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
"""
|
||||
Return a dictionary which contains config for all input fields.
|
||||
"""
|
||||
|
||||
# Create a list of resolution strings for the drop-down menu
|
||||
resolution_strings = [
|
||||
f"{width} x {height}" for width, height in BASE_RESOLUTIONS]
|
||||
Returns:
|
||||
dict: Input configuration with required and optional fields
|
||||
"""
|
||||
model_list = ["All"] + list(MODEL_RESOLUTIONS.keys())
|
||||
|
||||
# Get all possible resolutions across all models (JavaScript will filter dynamically)
|
||||
all_resolutions = get_all_resolutions()
|
||||
|
||||
return {
|
||||
"required": {
|
||||
"base_resolution": (resolution_strings,),
|
||||
"base_adjustment": (["SDXL (None)", "SD21 (75%)", "SD15 (50%)"],),
|
||||
"model": (model_list, {
|
||||
"default": "SDXL"
|
||||
}),
|
||||
"resolution": (all_resolutions, {
|
||||
"default": "1024x1024 (1:1 Square)"
|
||||
}),
|
||||
"resolution_multiplier": (["1x", "2x", "3x", "4x"], {
|
||||
"default": "1x"
|
||||
}),
|
||||
},
|
||||
"optional": {
|
||||
"custom_width": ("INT", {
|
||||
"default": 0,
|
||||
"min": 0,
|
||||
"max": 4096,
|
||||
"step": 8,
|
||||
"display": "number"
|
||||
}),
|
||||
"custom_height": ("INT", {
|
||||
"default": 0,
|
||||
"min": 0,
|
||||
"max": 4096,
|
||||
"step": 8,
|
||||
"display": "number"
|
||||
}),
|
||||
"custom_multiplier": (["1x", "2x", "3x", "4x"], {
|
||||
"default": "1x"
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
RETURN_TYPES = ("INT", "INT")
|
||||
RETURN_NAMES = ("width", "height")
|
||||
RETURN_TYPES = ("INT", "INT", "LATENT", "INT", "INT", "LATENT")
|
||||
RETURN_NAMES = ("width", "height", "latent", "custom_width", "custom_height", "custom_latent")
|
||||
FUNCTION = "select_resolution"
|
||||
CATEGORY = 'utils'
|
||||
CATEGORY = "utils"
|
||||
|
||||
def select_resolution(self, base_resolution, base_adjustment):
|
||||
def select_resolution(self, model, resolution, resolution_multiplier="1x", custom_width=0, custom_height=0, custom_multiplier="1x"):
|
||||
"""
|
||||
Returns the width and height based on the selected resolution and adjustment.
|
||||
Select and validate resolution, generate outputs.
|
||||
|
||||
Args:
|
||||
base_resolution (str): Selected resolution in the format "width x height".
|
||||
base_adjustment (str): Selected adjustment (resolution value reduction) based on SD version.
|
||||
model (str): Selected model name
|
||||
resolution (str): Selected preset resolution string
|
||||
resolution_multiplier (str): Multiplier for resolution (1x-4x)
|
||||
custom_width (int, optional): Custom width override
|
||||
custom_height (int, optional): Custom height override
|
||||
custom_multiplier (str, optional): Multiplier for custom dimensions (1x-4x)
|
||||
|
||||
Returns:
|
||||
Tuple[int, int]: Adjusted width and height.
|
||||
tuple: (width: int, height: int, latent: dict, custom_width: int, custom_height: int, custom_latent: dict)
|
||||
"""
|
||||
try:
|
||||
width, height = map(int, base_resolution.split(' x '))
|
||||
except ValueError:
|
||||
raise ValueError("Invalid base_resolution format.")
|
||||
# Parse multipliers (e.g., "2x" -> 2)
|
||||
multiplier = int(resolution_multiplier.replace("x", ""))
|
||||
custom_mult = int(custom_multiplier.replace("x", ""))
|
||||
|
||||
adjustment_factors = {
|
||||
"SDXL (None)": 1, "SD21 (75%)": 0.75, "SD15 (50%)": 0.5}
|
||||
factor = adjustment_factors.get(base_adjustment)
|
||||
# Parse preset resolution
|
||||
width, height = parse_resolution_string(resolution)
|
||||
|
||||
if factor is None:
|
||||
raise ValueError("Invalid base_adjustment value.")
|
||||
# Apply multiplier to preset resolution
|
||||
width *= multiplier
|
||||
height *= multiplier
|
||||
|
||||
width = int(width * factor)
|
||||
height = int(height * factor)
|
||||
# Generate latent for preset resolution
|
||||
latent = self._generate_empty_latent(width, height)
|
||||
|
||||
return width, height
|
||||
# Determine final custom dimensions
|
||||
if custom_width > 0 and custom_height > 0:
|
||||
# Use custom dimensions with custom multiplier
|
||||
final_custom_width = custom_width * custom_mult
|
||||
final_custom_height = custom_height * custom_mult
|
||||
|
||||
# Validate against model constraints (if not "All" model)
|
||||
if model != "All":
|
||||
self._validate_dimensions(model, final_custom_width, final_custom_height)
|
||||
|
||||
# Generate custom latent
|
||||
custom_latent = self._generate_empty_latent(final_custom_width, final_custom_height)
|
||||
|
||||
return (width, height, latent, final_custom_width, final_custom_height, custom_latent)
|
||||
else:
|
||||
# No custom dimensions, return zeros and minimal empty custom latent
|
||||
custom_latent = self._generate_empty_latent(1, 1)
|
||||
|
||||
return (width, height, latent, 0, 0, custom_latent)
|
||||
|
||||
def _validate_dimensions(self, model, width, height):
|
||||
"""
|
||||
Validate dimensions against model-specific constraints.
|
||||
|
||||
Args:
|
||||
model (str): Model name
|
||||
width (int): Width in pixels
|
||||
height (int): Height in pixels
|
||||
|
||||
Raises:
|
||||
ValueError: If dimensions violate model constraints
|
||||
"""
|
||||
if model not in MODEL_RESOLUTIONS:
|
||||
return
|
||||
|
||||
constraints = MODEL_RESOLUTIONS[model]["constraints"]
|
||||
divisible_by = constraints.get("divisible_by", 8)
|
||||
min_dim = constraints.get("min", 64)
|
||||
max_dim = constraints.get("max", 4096)
|
||||
|
||||
# Check divisibility
|
||||
if width % divisible_by != 0:
|
||||
raise ValueError(
|
||||
f"{model} requires width divisible by {divisible_by}. "
|
||||
f"Got {width} (remainder: {width % divisible_by})"
|
||||
)
|
||||
|
||||
if height % divisible_by != 0:
|
||||
raise ValueError(
|
||||
f"{model} requires height divisible by {divisible_by}. "
|
||||
f"Got {height} (remainder: {height % divisible_by})"
|
||||
)
|
||||
|
||||
# Check bounds
|
||||
if width < min_dim or width > max_dim:
|
||||
raise ValueError(
|
||||
f"{model} requires width between {min_dim} and {max_dim}. Got {width}"
|
||||
)
|
||||
|
||||
if height < min_dim or height > max_dim:
|
||||
raise ValueError(
|
||||
f"{model} requires height between {min_dim} and {max_dim}. Got {height}"
|
||||
)
|
||||
|
||||
def _generate_empty_latent(self, width, height, batch_size=1):
|
||||
"""
|
||||
Generate empty latent tensor for VAE input.
|
||||
|
||||
Args:
|
||||
width (int): Image width in pixels
|
||||
height (int): Image height in pixels
|
||||
batch_size (int): Number of latent samples (default: 1)
|
||||
|
||||
Returns:
|
||||
dict: LATENT dict with 'samples' key containing empty tensor
|
||||
"""
|
||||
# Latent space is 1/8 the image dimensions for SD-based models
|
||||
latent_width = width // 8
|
||||
latent_height = height // 8
|
||||
|
||||
# Shape: [batch_size, channels=4, height//8, width//8]
|
||||
latent_tensor = torch.zeros(
|
||||
[batch_size, 4, latent_height, latent_width],
|
||||
device=self.device
|
||||
)
|
||||
|
||||
return {"samples": latent_tensor}
|
||||
|
||||
|
||||
NODE_CLASS_MAPPINGS = {
|
||||
|
||||
Reference in New Issue
Block a user