feat: Add comprehensive upscaler node with conditional parameters
- Add Runware Image Upscaler node with advanced parameters - Implement boolean toggles for conditional parameter groups - Support multiple upscaler models (Clarity, CCSR, Latent) - Add model-specific parameters with proper validation - Include prompts, steps, seed, CFG scale controls - Maintain backward compatibility with existing workflows
This commit is contained in:
Sirshendu Ganguly
+177
-17
@@ -8,11 +8,110 @@ class upscaler:
|
||||
"Image": ("IMAGE", {
|
||||
"tooltip": "Specifies the input image to be upscaled."
|
||||
}),
|
||||
"upscaleFactor": ("INT", {
|
||||
"upscaleFactor": ("FLOAT", {
|
||||
"tooltip": "Each level will increase the size of the image by the corresponding factor.",
|
||||
"default": 2,
|
||||
"min": 2,
|
||||
"max": 4,
|
||||
"default": 2.0,
|
||||
"min": 1.0,
|
||||
"max": 8.0,
|
||||
"step": 0.1,
|
||||
}),
|
||||
},
|
||||
"optional": {
|
||||
"model": ("STRING", {
|
||||
"tooltip": "Model AIR ID (runware:500@1, runware:501@1, runware:502@1, runware:503@1)",
|
||||
"default": "",
|
||||
}),
|
||||
# Common parameters toggles
|
||||
"useSteps": ("BOOLEAN", {
|
||||
"tooltip": "Enable quality steps parameter",
|
||||
"default": False,
|
||||
}),
|
||||
"steps": ("INT", {
|
||||
"tooltip": "Quality steps (4-60 depending on model)",
|
||||
"default": 20,
|
||||
"min": 1,
|
||||
"max": 100,
|
||||
}),
|
||||
"useSeed": ("BOOLEAN", {
|
||||
"tooltip": "Enable seed for reproducibility",
|
||||
"default": False,
|
||||
}),
|
||||
"seed": ("INT", {
|
||||
"tooltip": "Reproducibility toggle",
|
||||
"default": 0,
|
||||
"min": 0,
|
||||
}),
|
||||
"useCFGScale": ("BOOLEAN", {
|
||||
"tooltip": "Enable CFG Scale parameter",
|
||||
"default": False,
|
||||
}),
|
||||
"CFGScale": ("FLOAT", {
|
||||
"tooltip": "Guidance CFG (3-20 depending on model)",
|
||||
"default": 7.0,
|
||||
"min": 1.0,
|
||||
"max": 30.0,
|
||||
"step": 0.1,
|
||||
}),
|
||||
"usePrompts": ("BOOLEAN", {
|
||||
"tooltip": "Enable positive and negative prompts",
|
||||
"default": False,
|
||||
}),
|
||||
"positivePrompt": ("STRING", {
|
||||
"tooltip": "Positive prompt for upscaling",
|
||||
"multiline": True,
|
||||
"default": "",
|
||||
}),
|
||||
"negativePrompt": ("STRING", {
|
||||
"tooltip": "Negative prompt for upscaling",
|
||||
"multiline": True,
|
||||
"default": "",
|
||||
}),
|
||||
# Clarity upscaler specific toggles
|
||||
"useClarityParams": ("BOOLEAN", {
|
||||
"tooltip": "Enable Clarity upscaler specific parameters",
|
||||
"default": False,
|
||||
}),
|
||||
"controlNetWeight": ("FLOAT", {
|
||||
"tooltip": "Style preservation/Resemblance (0-1) - Clarity upscaler specific",
|
||||
"default": 0.5,
|
||||
"min": 0.0,
|
||||
"max": 1.0,
|
||||
"step": 0.01,
|
||||
}),
|
||||
"strength": ("FLOAT", {
|
||||
"tooltip": "Creativity (0-1) - Clarity upscaler specific",
|
||||
"default": 0.5,
|
||||
"min": 0.0,
|
||||
"max": 1.0,
|
||||
"step": 0.01,
|
||||
}),
|
||||
"scheduler": ("STRING", {
|
||||
"tooltip": "Controls noise addition/removal - Clarity upscaler specific",
|
||||
"default": "DPM++ 2M Karras",
|
||||
}),
|
||||
# CCSR and Latent upscaler specific toggles
|
||||
"useCCSRParams": ("BOOLEAN", {
|
||||
"tooltip": "Enable CCSR and Latent upscaler specific parameters",
|
||||
"default": False,
|
||||
}),
|
||||
"colorFix": ("BOOLEAN", {
|
||||
"tooltip": "Color correction (ADAIN/NOFIX) - CCSR and Latent upscaler specific",
|
||||
"default": False,
|
||||
}),
|
||||
"tileDiffusion": ("BOOLEAN", {
|
||||
"tooltip": "Tile diffusion for large images - CCSR and Latent upscaler specific",
|
||||
"default": False,
|
||||
}),
|
||||
# Latent upscaler specific toggle
|
||||
"useLatentParams": ("BOOLEAN", {
|
||||
"tooltip": "Enable Latent upscaler specific parameters",
|
||||
"default": False,
|
||||
}),
|
||||
"clipSkip": ("INT", {
|
||||
"tooltip": "Skip CLIP layers during guidance (0-2) - Latent upscaler specific",
|
||||
"default": 0,
|
||||
"min": 0,
|
||||
"max": 2,
|
||||
}),
|
||||
},
|
||||
}
|
||||
@@ -24,20 +123,81 @@ class upscaler:
|
||||
|
||||
def upscale(self, **kwargs):
|
||||
image = kwargs.get("Image")
|
||||
upscaleFactor = kwargs.get("upscaleFactor", 2)
|
||||
upscaleFactor = kwargs.get("upscaleFactor", 2.0)
|
||||
|
||||
# Get toggle parameters
|
||||
useSteps = kwargs.get("useSteps", False)
|
||||
useSeed = kwargs.get("useSeed", False)
|
||||
useCFGScale = kwargs.get("useCFGScale", False)
|
||||
usePrompts = kwargs.get("usePrompts", False)
|
||||
useClarityParams = kwargs.get("useClarityParams", False)
|
||||
useCCSRParams = kwargs.get("useCCSRParams", False)
|
||||
useLatentParams = kwargs.get("useLatentParams", False)
|
||||
|
||||
# Get optional parameters
|
||||
model = kwargs.get("model", "")
|
||||
steps = kwargs.get("steps", 20)
|
||||
seed = kwargs.get("seed", 0)
|
||||
CFGScale = kwargs.get("CFGScale", 7.0)
|
||||
positivePrompt = kwargs.get("positivePrompt", "")
|
||||
negativePrompt = kwargs.get("negativePrompt", "")
|
||||
controlNetWeight = kwargs.get("controlNetWeight", 0.5)
|
||||
strength = kwargs.get("strength", 0.5)
|
||||
scheduler = kwargs.get("scheduler", "DPM++ 2M Karras")
|
||||
colorFix = kwargs.get("colorFix", False)
|
||||
tileDiffusion = kwargs.get("tileDiffusion", False)
|
||||
clipSkip = kwargs.get("clipSkip", 0)
|
||||
|
||||
genConfig = [
|
||||
{
|
||||
"taskType": "imageUpscale",
|
||||
"taskUUID": rwUtils.genRandUUID(),
|
||||
"inputImage": rwUtils.convertTensor2IMG(image),
|
||||
"upscaleFactor": upscaleFactor,
|
||||
"outputFormat": rwUtils.OUTPUT_FORMAT,
|
||||
"outputQuality": rwUtils.OUTPUT_QUALITY,
|
||||
"outputType": "base64Data",
|
||||
}
|
||||
]
|
||||
# Build the base configuration
|
||||
genConfig = {
|
||||
"taskType": "imageUpscale",
|
||||
"taskUUID": rwUtils.genRandUUID(),
|
||||
"inputImage": rwUtils.convertTensor2IMG(image),
|
||||
"upscaleFactor": upscaleFactor,
|
||||
"outputFormat": rwUtils.OUTPUT_FORMAT,
|
||||
"outputQuality": rwUtils.OUTPUT_QUALITY,
|
||||
"outputType": "base64Data",
|
||||
}
|
||||
|
||||
# Add model if specified
|
||||
if model:
|
||||
genConfig["model"] = model
|
||||
|
||||
# Build settings object for advanced parameters
|
||||
settings = {}
|
||||
|
||||
# Common parameters - only add if their toggle is enabled
|
||||
if useSteps:
|
||||
settings["steps"] = steps
|
||||
if useSeed:
|
||||
settings["seed"] = seed
|
||||
if useCFGScale:
|
||||
settings["CFGScale"] = CFGScale
|
||||
if usePrompts:
|
||||
if positivePrompt:
|
||||
settings["positivePrompt"] = positivePrompt
|
||||
if negativePrompt:
|
||||
settings["negativePrompt"] = negativePrompt
|
||||
|
||||
# Clarity upscaler specific parameters
|
||||
if useClarityParams:
|
||||
settings["controlNetWeight"] = controlNetWeight
|
||||
settings["strength"] = strength
|
||||
settings["scheduler"] = scheduler
|
||||
|
||||
# CCSR and Latent upscaler specific parameters
|
||||
if useCCSRParams:
|
||||
settings["colorFix"] = colorFix
|
||||
settings["tileDiffusion"] = tileDiffusion
|
||||
|
||||
# Latent upscaler specific parameters
|
||||
if useLatentParams:
|
||||
settings["clipSkip"] = clipSkip
|
||||
|
||||
# Add settings to config if any settings were specified
|
||||
if settings:
|
||||
genConfig["settings"] = settings
|
||||
|
||||
genResult = rwUtils.inferenecRequest(genConfig)
|
||||
genResult = rwUtils.inferenecRequest([genConfig])
|
||||
images = rwUtils.convertImageB64List(genResult)
|
||||
return (images, )
|
||||
Reference in New Issue
Block a user