diff --git a/README.md b/README.md
index ba1e844b3..eb07540cc 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ Put your VAE in: models/vae
### AMD GPUs (Linux only)
AMD users can install rocm and pytorch with pip if you don't have it already installed, this is the command to install the stable version:
-```pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/rocm5.7```
+```pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/rocm6.0```
This is the command to install the nightly with ROCm 6.0 which might have some performance improvements:
@@ -197,9 +197,7 @@ To use a textual inversion concepts/embeddings in a text prompt put them in the
## How to increase generation speed?
-Make sure you use the regular loaders/Load Checkpoint node to load checkpoints. It will auto pick the right settings depending on your GPU.
-
-You can set this command line setting to disable the upcasting to fp32 in some cross attention operations which will increase your speed. Note that this will very likely give you black images on SD2.x models. If you use xformers or pytorch attention this option does not do anything.
+On non Nvidia hardware you can set this command line setting to disable the upcasting to fp32 in some cross attention operations which will increase your speed. Note that this will very likely give you black images on SD2.x models. If you use xformers or pytorch attention this option does not do anything.
```--dont-upcast-attention```
@@ -209,6 +207,14 @@ Use ```--preview-method auto``` to enable previews.
The default installation includes a fast latent preview method that's low-resolution. To enable higher-quality previews with [TAESD](https://github.com/madebyollin/taesd), download the [taesd_decoder.pth](https://github.com/madebyollin/taesd/raw/main/taesd_decoder.pth) (for SD1.x and SD2.x) and [taesdxl_decoder.pth](https://github.com/madebyollin/taesd/raw/main/taesdxl_decoder.pth) (for SDXL) models and place them in the `models/vae_approx` folder. Once they're installed, restart ComfyUI to enable high-quality previews.
+## How to use TLS/SSL?
+Generate a self-signed certificate (not appropriate for shared/production use) and key by running the command: `openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -sha256 -days 3650 -nodes -subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=CommonNameOrHostname"`
+
+Use `--tls-keyfile key.pem --tls-certfile cert.pem` to enable TLS/SSL, the app will now be accessible with `https://...` instead of `http://...`.
+
+> Note: Windows users can use [alexisrolland/docker-openssl](https://github.com/alexisrolland/docker-openssl) or one of the [3rd party binary distributions](https://wiki.openssl.org/index.php/Binaries) to run the command example above.
+
If you use a container, note that the volume mount `-v` can be a relative path so `... -v ".\:/openssl-certs" ...` would create the key & cert files in the current directory of your command prompt or powershell terminal.
+
## Support and dev channel
[Matrix space: #comfyui_space:matrix.org](https://app.element.io/#/room/%23comfyui_space%3Amatrix.org) (it's like discord but open source).
diff --git a/comfy/cli_args.py b/comfy/cli_args.py
index 353bb51e7..569c79380 100644
--- a/comfy/cli_args.py
+++ b/comfy/cli_args.py
@@ -35,6 +35,8 @@ parser = argparse.ArgumentParser()
parser.add_argument("--listen", type=str, default="127.0.0.1", metavar="IP", nargs="?", const="0.0.0.0", help="Specify the IP address to listen on (default: 127.0.0.1). If --listen is provided without an argument, it defaults to 0.0.0.0. (listens on all)")
parser.add_argument("--port", type=int, default=8188, help="Set the listen port.")
+parser.add_argument("--tls-keyfile", type=str, help="Path to TLS (SSL) key file. Enables TLS, makes app accessible at https://... requires --tls-certfile to function")
+parser.add_argument("--tls-certfile", type=str, help="Path to TLS (SSL) certificate file. Enables TLS, makes app accessible at https://... requires --tls-keyfile to function")
parser.add_argument("--enable-cors-header", type=str, default=None, metavar="ORIGIN", nargs="?", const="*", help="Enable CORS (Cross-Origin Resource Sharing) with optional origin or allow all with default '*'.")
parser.add_argument("--max-upload-size", type=float, default=100, help="Set the maximum upload size in MB.")
diff --git a/comfy/k_diffusion/sampling.py b/comfy/k_diffusion/sampling.py
index 7af016829..f9b281894 100644
--- a/comfy/k_diffusion/sampling.py
+++ b/comfy/k_diffusion/sampling.py
@@ -527,6 +527,9 @@ def sample_dpmpp_2s_ancestral(model, x, sigmas, extra_args=None, callback=None,
@torch.no_grad()
def sample_dpmpp_sde(model, x, sigmas, extra_args=None, callback=None, disable=None, eta=1., s_noise=1., noise_sampler=None, r=1 / 2):
"""DPM-Solver++ (stochastic)."""
+ if len(sigmas) <= 1:
+ return x
+
sigma_min, sigma_max = sigmas[sigmas > 0].min(), sigmas.max()
seed = extra_args.get("seed", None)
noise_sampler = BrownianTreeNoiseSampler(x, sigma_min, sigma_max, seed=seed, cpu=True) if noise_sampler is None else noise_sampler
@@ -595,6 +598,8 @@ def sample_dpmpp_2m(model, x, sigmas, extra_args=None, callback=None, disable=No
@torch.no_grad()
def sample_dpmpp_2m_sde(model, x, sigmas, extra_args=None, callback=None, disable=None, eta=1., s_noise=1., noise_sampler=None, solver_type='midpoint'):
"""DPM-Solver++(2M) SDE."""
+ if len(sigmas) <= 1:
+ return x
if solver_type not in {'heun', 'midpoint'}:
raise ValueError('solver_type must be \'heun\' or \'midpoint\'')
@@ -642,6 +647,9 @@ def sample_dpmpp_2m_sde(model, x, sigmas, extra_args=None, callback=None, disabl
def sample_dpmpp_3m_sde(model, x, sigmas, extra_args=None, callback=None, disable=None, eta=1., s_noise=1., noise_sampler=None):
"""DPM-Solver++(3M) SDE."""
+ if len(sigmas) <= 1:
+ return x
+
seed = extra_args.get("seed", None)
sigma_min, sigma_max = sigmas[sigmas > 0].min(), sigmas.max()
noise_sampler = BrownianTreeNoiseSampler(x, sigma_min, sigma_max, seed=seed, cpu=True) if noise_sampler is None else noise_sampler
@@ -690,18 +698,27 @@ def sample_dpmpp_3m_sde(model, x, sigmas, extra_args=None, callback=None, disabl
@torch.no_grad()
def sample_dpmpp_3m_sde_gpu(model, x, sigmas, extra_args=None, callback=None, disable=None, eta=1., s_noise=1., noise_sampler=None):
+ if len(sigmas) <= 1:
+ return x
+
sigma_min, sigma_max = sigmas[sigmas > 0].min(), sigmas.max()
noise_sampler = BrownianTreeNoiseSampler(x, sigma_min, sigma_max, seed=extra_args.get("seed", None), cpu=False) if noise_sampler is None else noise_sampler
return sample_dpmpp_3m_sde(model, x, sigmas, extra_args=extra_args, callback=callback, disable=disable, eta=eta, s_noise=s_noise, noise_sampler=noise_sampler)
@torch.no_grad()
def sample_dpmpp_2m_sde_gpu(model, x, sigmas, extra_args=None, callback=None, disable=None, eta=1., s_noise=1., noise_sampler=None, solver_type='midpoint'):
+ if len(sigmas) <= 1:
+ return x
+
sigma_min, sigma_max = sigmas[sigmas > 0].min(), sigmas.max()
noise_sampler = BrownianTreeNoiseSampler(x, sigma_min, sigma_max, seed=extra_args.get("seed", None), cpu=False) if noise_sampler is None else noise_sampler
return sample_dpmpp_2m_sde(model, x, sigmas, extra_args=extra_args, callback=callback, disable=disable, eta=eta, s_noise=s_noise, noise_sampler=noise_sampler, solver_type=solver_type)
@torch.no_grad()
def sample_dpmpp_sde_gpu(model, x, sigmas, extra_args=None, callback=None, disable=None, eta=1., s_noise=1., noise_sampler=None, r=1 / 2):
+ if len(sigmas) <= 1:
+ return x
+
sigma_min, sigma_max = sigmas[sigmas > 0].min(), sigmas.max()
noise_sampler = BrownianTreeNoiseSampler(x, sigma_min, sigma_max, seed=extra_args.get("seed", None), cpu=False) if noise_sampler is None else noise_sampler
return sample_dpmpp_sde(model, x, sigmas, extra_args=extra_args, callback=callback, disable=disable, eta=eta, s_noise=s_noise, noise_sampler=noise_sampler, r=r)
diff --git a/comfy/ldm/modules/attention.py b/comfy/ldm/modules/attention.py
index f116efee3..d51a2fae1 100644
--- a/comfy/ldm/modules/attention.py
+++ b/comfy/ldm/modules/attention.py
@@ -297,8 +297,8 @@ def attention_split(q, k, v, heads, mask=None):
BROKEN_XFORMERS = False
try:
x_vers = xformers.__version__
- #I think 0.0.23 is also broken (q with bs bigger than 65535 gives CUDA error)
- BROKEN_XFORMERS = x_vers.startswith("0.0.21") or x_vers.startswith("0.0.22") or x_vers.startswith("0.0.23")
+ # XFormers bug confirmed on all versions from 0.0.21 to 0.0.26 (q with bs bigger than 65535 gives CUDA error)
+ BROKEN_XFORMERS = x_vers.startswith("0.0.2") and not x_vers.startswith("0.0.20")
except:
pass
diff --git a/comfy/model_detection.py b/comfy/model_detection.py
index 795af828a..23358a2c0 100644
--- a/comfy/model_detection.py
+++ b/comfy/model_detection.py
@@ -357,7 +357,14 @@ def unet_config_from_diffusers_unet(state_dict, dtype=None):
'context_dim': 1024, 'num_head_channels': 64, 'transformer_depth_output': [1, 1, 1, 1, 1, 1],
'use_temporal_attention': False, 'use_temporal_resblock': False, 'disable_self_attentions': [True, False, False]}
- supported_models = [SDXL, SDXL_refiner, SD21, SD15, SD21_uncliph, SD21_unclipl, SDXL_mid_cnet, SDXL_small_cnet, SDXL_diffusers_inpaint, SSD_1B, Segmind_Vega, KOALA_700M, KOALA_1B, SD09_XS, SDXL_diffusers_ip2p]
+ SD_XS = {'use_checkpoint': False, 'image_size': 32, 'out_channels': 4, 'use_spatial_transformer': True, 'legacy': False,
+ 'adm_in_channels': None, 'dtype': dtype, 'in_channels': 4, 'model_channels': 320, 'num_res_blocks': [1, 1, 1],
+ 'transformer_depth': [0, 1, 1], 'channel_mult': [1, 2, 4], 'transformer_depth_middle': -2, 'use_linear_in_transformer': False,
+ 'context_dim': 768, 'num_head_channels': 64, 'transformer_depth_output': [0, 0, 1, 1, 1, 1],
+ 'use_temporal_attention': False, 'use_temporal_resblock': False}
+
+
+ supported_models = [SDXL, SDXL_refiner, SD21, SD15, SD21_uncliph, SD21_unclipl, SDXL_mid_cnet, SDXL_small_cnet, SDXL_diffusers_inpaint, SSD_1B, Segmind_Vega, KOALA_700M, KOALA_1B, SD09_XS, SD_XS, SDXL_diffusers_ip2p]
for unet_config in supported_models:
matches = True
diff --git a/comfy/model_management.py b/comfy/model_management.py
index 310ec2537..913b6844f 100644
--- a/comfy/model_management.py
+++ b/comfy/model_management.py
@@ -83,7 +83,7 @@ def get_torch_device():
return torch.device("cpu")
else:
if is_intel_xpu():
- return torch.device("xpu")
+ return torch.device("xpu", torch.xpu.current_device())
else:
return torch.device(torch.cuda.current_device())
@@ -304,7 +304,7 @@ class LoadedModel:
raise e
if is_intel_xpu() and not args.disable_ipex_optimize:
- self.real_model = torch.xpu.optimize(self.real_model.eval(), inplace=True, auto_kernel_selection=True, graph_mode=True)
+ self.real_model = ipex.optimize(self.real_model.eval(), graph_mode=True, concat_linear=True)
self.weights_loaded = True
return self.real_model
@@ -552,8 +552,6 @@ def text_encoder_device():
if args.gpu_only:
return get_torch_device()
elif vram_state == VRAMState.HIGH_VRAM or vram_state == VRAMState.NORMAL_VRAM:
- if is_intel_xpu():
- return torch.device("cpu")
if should_use_fp16(prioritize_performance=False):
return get_torch_device()
else:
@@ -617,7 +615,8 @@ def supports_dtype(device, dtype): #TODO
def device_supports_non_blocking(device):
if is_device_mps(device):
return False #pytorch bug? mps doesn't support non blocking
- return True
+ return False
+ # return True #TODO: figure out why this causes issues
def cast_to_device(tensor, device, dtype, copy=False):
device_supports_cast = False
diff --git a/comfy/model_patcher.py b/comfy/model_patcher.py
index 657ddf843..cf51c4ad8 100644
--- a/comfy/model_patcher.py
+++ b/comfy/model_patcher.py
@@ -18,6 +18,26 @@ def apply_weight_decompose(dora_scale, weight):
return weight * (dora_scale / weight_norm)
+def set_model_options_patch_replace(model_options, patch, name, block_name, number, transformer_index=None):
+ to = model_options["transformer_options"].copy()
+
+ if "patches_replace" not in to:
+ to["patches_replace"] = {}
+ else:
+ to["patches_replace"] = to["patches_replace"].copy()
+
+ if name not in to["patches_replace"]:
+ to["patches_replace"][name] = {}
+ else:
+ to["patches_replace"][name] = to["patches_replace"][name].copy()
+
+ if transformer_index is not None:
+ block = (block_name, number, transformer_index)
+ else:
+ block = (block_name, number)
+ to["patches_replace"][name][block] = patch
+ model_options["transformer_options"] = to
+ return model_options
class ModelPatcher:
def __init__(self, model, load_device, offload_device, size=0, current_device=None, weight_inplace_update=False):
@@ -109,16 +129,7 @@ class ModelPatcher:
to["patches"][name] = to["patches"].get(name, []) + [patch]
def set_model_patch_replace(self, patch, name, block_name, number, transformer_index=None):
- to = self.model_options["transformer_options"]
- if "patches_replace" not in to:
- to["patches_replace"] = {}
- if name not in to["patches_replace"]:
- to["patches_replace"][name] = {}
- if transformer_index is not None:
- block = (block_name, number, transformer_index)
- else:
- block = (block_name, number)
- to["patches_replace"][name][block] = patch
+ self.model_options = set_model_options_patch_replace(self.model_options, patch, name, block_name, number, transformer_index=transformer_index)
def set_model_attn1_patch(self, patch):
self.set_model_patch(patch, "attn1_patch")
diff --git a/comfy/samplers.py b/comfy/samplers.py
index 415a35cc3..29962a916 100644
--- a/comfy/samplers.py
+++ b/comfy/samplers.py
@@ -34,7 +34,7 @@ def get_area_and_mult(conds, x_in, timestep_in):
mask = conds['mask']
assert(mask.shape[1] == x_in.shape[2])
assert(mask.shape[2] == x_in.shape[3])
- mask = mask[:,area[2]:area[0] + area[2],area[3]:area[1] + area[3]] * mask_strength
+ mask = mask[:input_x.shape[0],area[2]:area[0] + area[2],area[3]:area[1] + area[3]] * mask_strength
mask = mask.unsqueeze(1).repeat(input_x.shape[0] // mask.shape[0], input_x.shape[1], 1, 1)
else:
mask = torch.ones_like(input_x)
@@ -539,6 +539,9 @@ class KSAMPLER(Sampler):
def ksampler(sampler_name, extra_options={}, inpaint_options={}):
if sampler_name == "dpm_fast":
def dpm_fast_function(model, noise, sigmas, extra_args, callback, disable):
+ if len(sigmas) <= 1:
+ return noise
+
sigma_min = sigmas[-1]
if sigma_min == 0:
sigma_min = sigmas[-2]
@@ -547,6 +550,9 @@ def ksampler(sampler_name, extra_options={}, inpaint_options={}):
sampler_function = dpm_fast_function
elif sampler_name == "dpm_adaptive":
def dpm_adaptive_function(model, noise, sigmas, extra_args, callback, disable, **extra_options):
+ if len(sigmas) <= 1:
+ return noise
+
sigma_min = sigmas[-1]
if sigma_min == 0:
sigma_min = sigmas[-2]
diff --git a/comfy/sd.py b/comfy/sd.py
index 85821120e..16dc0b732 100644
--- a/comfy/sd.py
+++ b/comfy/sd.py
@@ -210,16 +210,26 @@ class VAE:
self.first_stage_model = StageC_coder()
self.downscale_ratio = 32
self.latent_channels = 16
- else:
+ elif "decoder.conv_in.weight" in sd:
#default SD1.x/SD2.x VAE parameters
ddconfig = {'double_z': True, 'z_channels': 4, 'resolution': 256, 'in_channels': 3, 'out_ch': 3, 'ch': 128, 'ch_mult': [1, 2, 4, 4], 'num_res_blocks': 2, 'attn_resolutions': [], 'dropout': 0.0}
- if 'encoder.down.2.downsample.conv.weight' not in sd: #Stable diffusion x4 upscaler VAE
+ if 'encoder.down.2.downsample.conv.weight' not in sd and 'decoder.up.3.upsample.conv.weight' not in sd: #Stable diffusion x4 upscaler VAE
ddconfig['ch_mult'] = [1, 2, 4]
self.downscale_ratio = 4
self.upscale_ratio = 4
- self.first_stage_model = AutoencoderKL(ddconfig=ddconfig, embed_dim=4)
+ self.latent_channels = ddconfig['z_channels'] = sd["decoder.conv_in.weight"].shape[1]
+ if 'quant_conv.weight' in sd:
+ self.first_stage_model = AutoencoderKL(ddconfig=ddconfig, embed_dim=4)
+ else:
+ self.first_stage_model = AutoencodingEngine(regularizer_config={'target': "comfy.ldm.models.autoencoder.DiagonalGaussianRegularizer"},
+ encoder_config={'target': "comfy.ldm.modules.diffusionmodules.model.Encoder", 'params': ddconfig},
+ decoder_config={'target': "comfy.ldm.modules.diffusionmodules.model.Decoder", 'params': ddconfig})
+ else:
+ logging.warning("WARNING: No VAE weights detected, VAE not initalized.")
+ self.first_stage_model = None
+ return
else:
self.first_stage_model = AutoencoderKL(**(config['params']))
self.first_stage_model = self.first_stage_model.eval()
@@ -600,7 +610,7 @@ def load_unet(unet_path):
raise RuntimeError("ERROR: Could not detect model type of: {}".format(unet_path))
return model
-def save_checkpoint(output_path, model, clip=None, vae=None, clip_vision=None, metadata=None):
+def save_checkpoint(output_path, model, clip=None, vae=None, clip_vision=None, metadata=None, extra_keys={}):
clip_sd = None
load_models = [model]
if clip is not None:
@@ -610,4 +620,7 @@ def save_checkpoint(output_path, model, clip=None, vae=None, clip_vision=None, m
model_management.load_models_gpu(load_models)
clip_vision_sd = clip_vision.get_sd() if clip_vision is not None else None
sd = model.model.state_dict_for_saving(clip_sd, vae.get_sd(), clip_vision_sd)
+ for k in extra_keys:
+ sd[k] = extra_keys[k]
+
comfy.utils.save_torch_file(sd, output_path, metadata=metadata)
diff --git a/comfy/supported_models_base.py b/comfy/supported_models_base.py
index 6196daabf..cf7cdff34 100644
--- a/comfy/supported_models_base.py
+++ b/comfy/supported_models_base.py
@@ -47,7 +47,8 @@ class BASE:
return self.unet_config["in_channels"] > 4
def __init__(self, unet_config):
- self.unet_config = unet_config
+ self.unet_config = unet_config.copy()
+ self.sampling_settings = self.sampling_settings.copy()
self.latent_format = self.latent_format()
for x in self.unet_extra_config:
self.unet_config[x] = self.unet_extra_config[x]
diff --git a/comfy_extras/nodes_advanced_samplers.py b/comfy_extras/nodes_advanced_samplers.py
new file mode 100644
index 000000000..d973def81
--- /dev/null
+++ b/comfy_extras/nodes_advanced_samplers.py
@@ -0,0 +1,61 @@
+import comfy.samplers
+import comfy.utils
+import torch
+import numpy as np
+from tqdm.auto import trange, tqdm
+import math
+
+
+@torch.no_grad()
+def sample_lcm_upscale(model, x, sigmas, extra_args=None, callback=None, disable=None, total_upscale=2.0, upscale_method="bislerp", upscale_steps=None):
+ extra_args = {} if extra_args is None else extra_args
+
+ if upscale_steps is None:
+ upscale_steps = max(len(sigmas) // 2 + 1, 2)
+ else:
+ upscale_steps += 1
+ upscale_steps = min(upscale_steps, len(sigmas) + 1)
+
+ upscales = np.linspace(1.0, total_upscale, upscale_steps)[1:]
+
+ orig_shape = x.size()
+ s_in = x.new_ones([x.shape[0]])
+ for i in trange(len(sigmas) - 1, disable=disable):
+ denoised = model(x, sigmas[i] * s_in, **extra_args)
+ if callback is not None:
+ callback({'x': x, 'i': i, 'sigma': sigmas[i], 'sigma_hat': sigmas[i], 'denoised': denoised})
+
+ x = denoised
+ if i < len(upscales):
+ x = comfy.utils.common_upscale(x, round(orig_shape[-1] * upscales[i]), round(orig_shape[-2] * upscales[i]), upscale_method, "disabled")
+
+ if sigmas[i + 1] > 0:
+ x += sigmas[i + 1] * torch.randn_like(x)
+ return x
+
+
+class SamplerLCMUpscale:
+ upscale_methods = ["bislerp", "nearest-exact", "bilinear", "area", "bicubic"]
+
+ @classmethod
+ def INPUT_TYPES(s):
+ return {"required":
+ {"scale_ratio": ("FLOAT", {"default": 1.0, "min": 0.1, "max": 20.0, "step": 0.01}),
+ "scale_steps": ("INT", {"default": -1, "min": -1, "max": 1000, "step": 1}),
+ "upscale_method": (s.upscale_methods,),
+ }
+ }
+ RETURN_TYPES = ("SAMPLER",)
+ CATEGORY = "sampling/custom_sampling/samplers"
+
+ FUNCTION = "get_sampler"
+
+ def get_sampler(self, scale_ratio, scale_steps, upscale_method):
+ if scale_steps < 0:
+ scale_steps = None
+ sampler = comfy.samplers.KSAMPLER(sample_lcm_upscale, extra_options={"total_upscale": scale_ratio, "upscale_steps": scale_steps, "upscale_method": upscale_method})
+ return (sampler, )
+
+NODE_CLASS_MAPPINGS = {
+ "SamplerLCMUpscale": SamplerLCMUpscale,
+}
diff --git a/comfy_extras/nodes_align_your_steps.py b/comfy_extras/nodes_align_your_steps.py
new file mode 100644
index 000000000..3ffe53187
--- /dev/null
+++ b/comfy_extras/nodes_align_your_steps.py
@@ -0,0 +1,53 @@
+#from: https://research.nvidia.com/labs/toronto-ai/AlignYourSteps/howto.html
+import numpy as np
+import torch
+
+def loglinear_interp(t_steps, num_steps):
+ """
+ Performs log-linear interpolation of a given array of decreasing numbers.
+ """
+ xs = np.linspace(0, 1, len(t_steps))
+ ys = np.log(t_steps[::-1])
+
+ new_xs = np.linspace(0, 1, num_steps)
+ new_ys = np.interp(new_xs, xs, ys)
+
+ interped_ys = np.exp(new_ys)[::-1].copy()
+ return interped_ys
+
+NOISE_LEVELS = {"SD1": [14.6146412293, 6.4745760956, 3.8636745985, 2.6946151520, 1.8841921177, 1.3943805092, 0.9642583904, 0.6523686016, 0.3977456272, 0.1515232662, 0.0291671582],
+ "SDXL":[14.6146412293, 6.3184485287, 3.7681790315, 2.1811480769, 1.3405244945, 0.8620721141, 0.5550693289, 0.3798540708, 0.2332364134, 0.1114188177, 0.0291671582],
+ "SVD": [700.00, 54.5, 15.886, 7.977, 4.248, 1.789, 0.981, 0.403, 0.173, 0.034, 0.002]}
+
+class AlignYourStepsScheduler:
+ @classmethod
+ def INPUT_TYPES(s):
+ return {"required":
+ {"model_type": (["SD1", "SDXL", "SVD"], ),
+ "steps": ("INT", {"default": 10, "min": 10, "max": 10000}),
+ "denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}),
+ }
+ }
+ RETURN_TYPES = ("SIGMAS",)
+ CATEGORY = "sampling/custom_sampling/schedulers"
+
+ FUNCTION = "get_sigmas"
+
+ def get_sigmas(self, model_type, steps, denoise):
+ total_steps = steps
+ if denoise < 1.0:
+ if denoise <= 0.0:
+ return (torch.FloatTensor([]),)
+ total_steps = round(steps * denoise)
+
+ sigmas = NOISE_LEVELS[model_type][:]
+ if (steps + 1) != len(sigmas):
+ sigmas = loglinear_interp(sigmas, steps + 1)
+
+ sigmas = sigmas[-(total_steps + 1):]
+ sigmas[-1] = 0
+ return (torch.FloatTensor(sigmas), )
+
+NODE_CLASS_MAPPINGS = {
+ "AlignYourStepsScheduler": AlignYourStepsScheduler,
+}
diff --git a/comfy_extras/nodes_attention_multiply.py b/comfy_extras/nodes_attention_multiply.py
new file mode 100644
index 000000000..4747eb395
--- /dev/null
+++ b/comfy_extras/nodes_attention_multiply.py
@@ -0,0 +1,120 @@
+
+def attention_multiply(attn, model, q, k, v, out):
+ m = model.clone()
+ sd = model.model_state_dict()
+
+ for key in sd:
+ if key.endswith("{}.to_q.bias".format(attn)) or key.endswith("{}.to_q.weight".format(attn)):
+ m.add_patches({key: (None,)}, 0.0, q)
+ if key.endswith("{}.to_k.bias".format(attn)) or key.endswith("{}.to_k.weight".format(attn)):
+ m.add_patches({key: (None,)}, 0.0, k)
+ if key.endswith("{}.to_v.bias".format(attn)) or key.endswith("{}.to_v.weight".format(attn)):
+ m.add_patches({key: (None,)}, 0.0, v)
+ if key.endswith("{}.to_out.0.bias".format(attn)) or key.endswith("{}.to_out.0.weight".format(attn)):
+ m.add_patches({key: (None,)}, 0.0, out)
+
+ return m
+
+
+class UNetSelfAttentionMultiply:
+ @classmethod
+ def INPUT_TYPES(s):
+ return {"required": { "model": ("MODEL",),
+ "q": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ "k": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ "v": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ "out": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ }}
+ RETURN_TYPES = ("MODEL",)
+ FUNCTION = "patch"
+
+ CATEGORY = "_for_testing/attention_experiments"
+
+ def patch(self, model, q, k, v, out):
+ m = attention_multiply("attn1", model, q, k, v, out)
+ return (m, )
+
+class UNetCrossAttentionMultiply:
+ @classmethod
+ def INPUT_TYPES(s):
+ return {"required": { "model": ("MODEL",),
+ "q": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ "k": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ "v": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ "out": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ }}
+ RETURN_TYPES = ("MODEL",)
+ FUNCTION = "patch"
+
+ CATEGORY = "_for_testing/attention_experiments"
+
+ def patch(self, model, q, k, v, out):
+ m = attention_multiply("attn2", model, q, k, v, out)
+ return (m, )
+
+class CLIPAttentionMultiply:
+ @classmethod
+ def INPUT_TYPES(s):
+ return {"required": { "clip": ("CLIP",),
+ "q": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ "k": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ "v": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ "out": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ }}
+ RETURN_TYPES = ("CLIP",)
+ FUNCTION = "patch"
+
+ CATEGORY = "_for_testing/attention_experiments"
+
+ def patch(self, clip, q, k, v, out):
+ m = clip.clone()
+ sd = m.patcher.model_state_dict()
+
+ for key in sd:
+ if key.endswith("self_attn.q_proj.weight") or key.endswith("self_attn.q_proj.bias"):
+ m.add_patches({key: (None,)}, 0.0, q)
+ if key.endswith("self_attn.k_proj.weight") or key.endswith("self_attn.k_proj.bias"):
+ m.add_patches({key: (None,)}, 0.0, k)
+ if key.endswith("self_attn.v_proj.weight") or key.endswith("self_attn.v_proj.bias"):
+ m.add_patches({key: (None,)}, 0.0, v)
+ if key.endswith("self_attn.out_proj.weight") or key.endswith("self_attn.out_proj.bias"):
+ m.add_patches({key: (None,)}, 0.0, out)
+ return (m, )
+
+class UNetTemporalAttentionMultiply:
+ @classmethod
+ def INPUT_TYPES(s):
+ return {"required": { "model": ("MODEL",),
+ "self_structural": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ "self_temporal": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ "cross_structural": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ "cross_temporal": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
+ }}
+ RETURN_TYPES = ("MODEL",)
+ FUNCTION = "patch"
+
+ CATEGORY = "_for_testing/attention_experiments"
+
+ def patch(self, model, self_structural, self_temporal, cross_structural, cross_temporal):
+ m = model.clone()
+ sd = model.model_state_dict()
+
+ for k in sd:
+ if (k.endswith("attn1.to_out.0.bias") or k.endswith("attn1.to_out.0.weight")):
+ if '.time_stack.' in k:
+ m.add_patches({k: (None,)}, 0.0, self_temporal)
+ else:
+ m.add_patches({k: (None,)}, 0.0, self_structural)
+ elif (k.endswith("attn2.to_out.0.bias") or k.endswith("attn2.to_out.0.weight")):
+ if '.time_stack.' in k:
+ m.add_patches({k: (None,)}, 0.0, cross_temporal)
+ else:
+ m.add_patches({k: (None,)}, 0.0, cross_structural)
+ return (m, )
+
+NODE_CLASS_MAPPINGS = {
+ "UNetSelfAttentionMultiply": UNetSelfAttentionMultiply,
+ "UNetCrossAttentionMultiply": UNetCrossAttentionMultiply,
+ "CLIPAttentionMultiply": CLIPAttentionMultiply,
+ "UNetTemporalAttentionMultiply": UNetTemporalAttentionMultiply,
+}
diff --git a/comfy_extras/nodes_canny.py b/comfy_extras/nodes_canny.py
index 8138b5f73..fab2ab7ac 100644
--- a/comfy_extras/nodes_canny.py
+++ b/comfy_extras/nodes_canny.py
@@ -1,4 +1,3 @@
-#From https://github.com/kornia/kornia
import math
import torch
diff --git a/comfy_extras/nodes_clip_sdxl.py b/comfy_extras/nodes_clip_sdxl.py
index dcf8859fa..3087b917b 100644
--- a/comfy_extras/nodes_clip_sdxl.py
+++ b/comfy_extras/nodes_clip_sdxl.py
@@ -8,7 +8,7 @@ class CLIPTextEncodeSDXLRefiner:
"ascore": ("FLOAT", {"default": 6.0, "min": 0.0, "max": 1000.0, "step": 0.01}),
"width": ("INT", {"default": 1024.0, "min": 0, "max": MAX_RESOLUTION}),
"height": ("INT", {"default": 1024.0, "min": 0, "max": MAX_RESOLUTION}),
- "text": ("STRING", {"multiline": True}), "clip": ("CLIP", ),
+ "text": ("STRING", {"multiline": True, "dynamicPrompts": True}), "clip": ("CLIP", ),
}}
RETURN_TYPES = ("CONDITIONING",)
FUNCTION = "encode"
@@ -30,8 +30,8 @@ class CLIPTextEncodeSDXL:
"crop_h": ("INT", {"default": 0, "min": 0, "max": MAX_RESOLUTION}),
"target_width": ("INT", {"default": 1024.0, "min": 0, "max": MAX_RESOLUTION}),
"target_height": ("INT", {"default": 1024.0, "min": 0, "max": MAX_RESOLUTION}),
- "text_g": ("STRING", {"multiline": True, "default": "CLIP_G"}), "clip": ("CLIP", ),
- "text_l": ("STRING", {"multiline": True, "default": "CLIP_L"}), "clip": ("CLIP", ),
+ "text_g": ("STRING", {"multiline": True, "dynamicPrompts": True}), "clip": ("CLIP", ),
+ "text_l": ("STRING", {"multiline": True, "dynamicPrompts": True}), "clip": ("CLIP", ),
}}
RETURN_TYPES = ("CONDITIONING",)
FUNCTION = "encode"
diff --git a/comfy_extras/nodes_cond.py b/comfy_extras/nodes_cond.py
index 646fefa17..4c3a1d5bf 100644
--- a/comfy_extras/nodes_cond.py
+++ b/comfy_extras/nodes_cond.py
@@ -3,7 +3,7 @@
class CLIPTextEncodeControlnet:
@classmethod
def INPUT_TYPES(s):
- return {"required": {"clip": ("CLIP", ), "conditioning": ("CONDITIONING", ), "text": ("STRING", {"multiline": True})}}
+ return {"required": {"clip": ("CLIP", ), "conditioning": ("CONDITIONING", ), "text": ("STRING", {"multiline": True, "dynamicPrompts": True})}}
RETURN_TYPES = ("CONDITIONING",)
FUNCTION = "encode"
diff --git a/comfy_extras/nodes_custom_sampler.py b/comfy_extras/nodes_custom_sampler.py
index 56cb505e6..f3dff000e 100644
--- a/comfy_extras/nodes_custom_sampler.py
+++ b/comfy_extras/nodes_custom_sampler.py
@@ -4,6 +4,7 @@ from comfy.k_diffusion import sampling as k_diffusion_sampling
import latent_preview
import torch
import comfy.utils
+import node_helpers
class BasicScheduler:
@@ -38,8 +39,8 @@ class KarrasScheduler:
def INPUT_TYPES(s):
return {"required":
{"steps": ("INT", {"default": 20, "min": 1, "max": 10000}),
- "sigma_max": ("FLOAT", {"default": 14.614642, "min": 0.0, "max": 1000.0, "step":0.01, "round": False}),
- "sigma_min": ("FLOAT", {"default": 0.0291675, "min": 0.0, "max": 1000.0, "step":0.01, "round": False}),
+ "sigma_max": ("FLOAT", {"default": 14.614642, "min": 0.0, "max": 5000.0, "step":0.01, "round": False}),
+ "sigma_min": ("FLOAT", {"default": 0.0291675, "min": 0.0, "max": 5000.0, "step":0.01, "round": False}),
"rho": ("FLOAT", {"default": 7.0, "min": 0.0, "max": 100.0, "step":0.01, "round": False}),
}
}
@@ -57,8 +58,8 @@ class ExponentialScheduler:
def INPUT_TYPES(s):
return {"required":
{"steps": ("INT", {"default": 20, "min": 1, "max": 10000}),
- "sigma_max": ("FLOAT", {"default": 14.614642, "min": 0.0, "max": 1000.0, "step":0.01, "round": False}),
- "sigma_min": ("FLOAT", {"default": 0.0291675, "min": 0.0, "max": 1000.0, "step":0.01, "round": False}),
+ "sigma_max": ("FLOAT", {"default": 14.614642, "min": 0.0, "max": 5000.0, "step":0.01, "round": False}),
+ "sigma_min": ("FLOAT", {"default": 0.0291675, "min": 0.0, "max": 5000.0, "step":0.01, "round": False}),
}
}
RETURN_TYPES = ("SIGMAS",)
@@ -75,8 +76,8 @@ class PolyexponentialScheduler:
def INPUT_TYPES(s):
return {"required":
{"steps": ("INT", {"default": 20, "min": 1, "max": 10000}),
- "sigma_max": ("FLOAT", {"default": 14.614642, "min": 0.0, "max": 1000.0, "step":0.01, "round": False}),
- "sigma_min": ("FLOAT", {"default": 0.0291675, "min": 0.0, "max": 1000.0, "step":0.01, "round": False}),
+ "sigma_max": ("FLOAT", {"default": 14.614642, "min": 0.0, "max": 5000.0, "step":0.01, "round": False}),
+ "sigma_min": ("FLOAT", {"default": 0.0291675, "min": 0.0, "max": 5000.0, "step":0.01, "round": False}),
"rho": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 100.0, "step":0.01, "round": False}),
}
}
@@ -106,8 +107,7 @@ class SDTurboScheduler:
def get_sigmas(self, model, steps, denoise):
start_step = 10 - int(10 * denoise)
timesteps = torch.flip(torch.arange(1, 11) * 100 - 1, (0,))[start_step:start_step + steps]
- comfy.model_management.load_models_gpu([model])
- sigmas = model.model.model_sampling.sigma(timesteps)
+ sigmas = model.get_model_object("model_sampling").sigma(timesteps)
sigmas = torch.cat([sigmas, sigmas.new_zeros([1])])
return (sigmas, )
@@ -116,8 +116,8 @@ class VPScheduler:
def INPUT_TYPES(s):
return {"required":
{"steps": ("INT", {"default": 20, "min": 1, "max": 10000}),
- "beta_d": ("FLOAT", {"default": 19.9, "min": 0.0, "max": 1000.0, "step":0.01, "round": False}), #TODO: fix default values
- "beta_min": ("FLOAT", {"default": 0.1, "min": 0.0, "max": 1000.0, "step":0.01, "round": False}),
+ "beta_d": ("FLOAT", {"default": 19.9, "min": 0.0, "max": 5000.0, "step":0.01, "round": False}), #TODO: fix default values
+ "beta_min": ("FLOAT", {"default": 0.1, "min": 0.0, "max": 5000.0, "step":0.01, "round": False}),
"eps_s": ("FLOAT", {"default": 0.001, "min": 0.0, "max": 1.0, "step":0.0001, "round": False}),
}
}
@@ -433,6 +433,7 @@ class Guider_DualCFG(comfy.samplers.CFGGuider):
self.cfg2 = cfg2
def set_conds(self, positive, middle, negative):
+ middle = node_helpers.conditioning_set_values(middle, {"prompt_type": "negative"})
self.inner_set_conds({"positive": positive, "middle": middle, "negative": negative})
def predict_noise(self, x, timestep, model_options={}, seed=None):
@@ -536,6 +537,52 @@ class SamplerCustomAdvanced:
out_denoised = out
return (out, out_denoised)
+class AddNoise:
+ @classmethod
+ def INPUT_TYPES(s):
+ return {"required":
+ {"model": ("MODEL",),
+ "noise": ("NOISE", ),
+ "sigmas": ("SIGMAS", ),
+ "latent_image": ("LATENT", ),
+ }
+ }
+
+ RETURN_TYPES = ("LATENT",)
+
+ FUNCTION = "add_noise"
+
+ CATEGORY = "_for_testing/custom_sampling/noise"
+
+ def add_noise(self, model, noise, sigmas, latent_image):
+ if len(sigmas) == 0:
+ return latent_image
+
+ latent = latent_image
+ latent_image = latent["samples"]
+
+ noisy = noise.generate_noise(latent)
+
+ model_sampling = model.get_model_object("model_sampling")
+ process_latent_out = model.get_model_object("process_latent_out")
+ process_latent_in = model.get_model_object("process_latent_in")
+
+ if len(sigmas) > 1:
+ scale = torch.abs(sigmas[0] - sigmas[-1])
+ else:
+ scale = sigmas[0]
+
+ if torch.count_nonzero(latent_image) > 0: #Don't shift the empty latent image.
+ latent_image = process_latent_in(latent_image)
+ noisy = model_sampling.noise_scaling(scale, noisy, latent_image)
+ noisy = process_latent_out(noisy)
+ noisy = torch.nan_to_num(noisy, nan=0.0, posinf=0.0, neginf=0.0)
+
+ out = latent.copy()
+ out["samples"] = noisy
+ return (out,)
+
+
NODE_CLASS_MAPPINGS = {
"SamplerCustom": SamplerCustom,
"BasicScheduler": BasicScheduler,
@@ -559,5 +606,6 @@ NODE_CLASS_MAPPINGS = {
"BasicGuider": BasicGuider,
"RandomNoise": RandomNoise,
"DisableNoise": DisableNoise,
+ "AddNoise": AddNoise,
"SamplerCustomAdvanced": SamplerCustomAdvanced,
}
diff --git a/comfy_extras/nodes_model_merging.py b/comfy_extras/nodes_model_merging.py
index a25b73ca7..2a431f65d 100644
--- a/comfy_extras/nodes_model_merging.py
+++ b/comfy_extras/nodes_model_merging.py
@@ -2,7 +2,9 @@ import comfy.sd
import comfy.utils
import comfy.model_base
import comfy.model_management
+import comfy.model_sampling
+import torch
import folder_paths
import json
import os
@@ -189,6 +191,13 @@ def save_checkpoint(model, clip=None, vae=None, clip_vision=None, filename_prefi
# "stable-diffusion-v2-768-v", "stable-diffusion-v2-unclip-l", "stable-diffusion-v2-unclip-h",
# "v2-inpainting"
+ extra_keys = {}
+ model_sampling = model.get_model_object("model_sampling")
+ if isinstance(model_sampling, comfy.model_sampling.ModelSamplingContinuousEDM):
+ if isinstance(model_sampling, comfy.model_sampling.V_PREDICTION):
+ extra_keys["edm_vpred.sigma_max"] = torch.tensor(model_sampling.sigma_max).float()
+ extra_keys["edm_vpred.sigma_min"] = torch.tensor(model_sampling.sigma_min).float()
+
if model.model.model_type == comfy.model_base.ModelType.EPS:
metadata["modelspec.predict_key"] = "epsilon"
elif model.model.model_type == comfy.model_base.ModelType.V_PREDICTION:
@@ -203,7 +212,7 @@ def save_checkpoint(model, clip=None, vae=None, clip_vision=None, filename_prefi
output_checkpoint = f"{filename}_{counter:05}_.safetensors"
output_checkpoint = os.path.join(full_output_folder, output_checkpoint)
- comfy.sd.save_checkpoint(output_checkpoint, model, clip, vae, clip_vision, metadata=metadata)
+ comfy.sd.save_checkpoint(output_checkpoint, model, clip, vae, clip_vision, metadata=metadata, extra_keys=extra_keys)
class CheckpointSave:
def __init__(self):
diff --git a/comfy_extras/nodes_model_merging_model_specific.py b/comfy_extras/nodes_model_merging_model_specific.py
new file mode 100644
index 000000000..f2d008d8b
--- /dev/null
+++ b/comfy_extras/nodes_model_merging_model_specific.py
@@ -0,0 +1,60 @@
+import comfy_extras.nodes_model_merging
+
+class ModelMergeSD1(comfy_extras.nodes_model_merging.ModelMergeBlocks):
+ CATEGORY = "advanced/model_merging/model_specific"
+ @classmethod
+ def INPUT_TYPES(s):
+ arg_dict = { "model1": ("MODEL",),
+ "model2": ("MODEL",)}
+
+ argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01})
+
+ arg_dict["time_embed."] = argument
+ arg_dict["label_emb."] = argument
+
+ for i in range(12):
+ arg_dict["input_blocks.{}.".format(i)] = argument
+
+ for i in range(3):
+ arg_dict["middle_block.{}.".format(i)] = argument
+
+ for i in range(12):
+ arg_dict["output_blocks.{}.".format(i)] = argument
+
+ arg_dict["out."] = argument
+
+ return {"required": arg_dict}
+
+
+class ModelMergeSDXL(comfy_extras.nodes_model_merging.ModelMergeBlocks):
+ CATEGORY = "advanced/model_merging/model_specific"
+
+ @classmethod
+ def INPUT_TYPES(s):
+ arg_dict = { "model1": ("MODEL",),
+ "model2": ("MODEL",)}
+
+ argument = ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01})
+
+ arg_dict["time_embed."] = argument
+ arg_dict["label_emb."] = argument
+
+ for i in range(9):
+ arg_dict["input_blocks.{}".format(i)] = argument
+
+ for i in range(3):
+ arg_dict["middle_block.{}".format(i)] = argument
+
+ for i in range(9):
+ arg_dict["output_blocks.{}".format(i)] = argument
+
+ arg_dict["out."] = argument
+
+ return {"required": arg_dict}
+
+
+NODE_CLASS_MAPPINGS = {
+ "ModelMergeSD1": ModelMergeSD1,
+ "ModelMergeSD2": ModelMergeSD1, #SD1 and SD2 have the same blocks
+ "ModelMergeSDXL": ModelMergeSDXL,
+}
diff --git a/comfy_extras/nodes_pag.py b/comfy_extras/nodes_pag.py
new file mode 100644
index 000000000..63f43fd62
--- /dev/null
+++ b/comfy_extras/nodes_pag.py
@@ -0,0 +1,56 @@
+#Modified/simplified version of the node from: https://github.com/pamparamm/sd-perturbed-attention
+#If you want the one with more options see the above repo.
+
+#My modified one here is more basic but has less chances of breaking with ComfyUI updates.
+
+import comfy.model_patcher
+import comfy.samplers
+
+class PerturbedAttentionGuidance:
+ @classmethod
+ def INPUT_TYPES(s):
+ return {
+ "required": {
+ "model": ("MODEL",),
+ "scale": ("FLOAT", {"default": 3.0, "min": 0.0, "max": 100.0, "step": 0.1, "round": 0.01}),
+ }
+ }
+
+ RETURN_TYPES = ("MODEL",)
+ FUNCTION = "patch"
+
+ CATEGORY = "_for_testing"
+
+ def patch(self, model, scale):
+ unet_block = "middle"
+ unet_block_id = 0
+ m = model.clone()
+
+ def perturbed_attention(q, k, v, extra_options, mask=None):
+ return v
+
+ def post_cfg_function(args):
+ model = args["model"]
+ cond_pred = args["cond_denoised"]
+ cond = args["cond"]
+ cfg_result = args["denoised"]
+ sigma = args["sigma"]
+ model_options = args["model_options"].copy()
+ x = args["input"]
+
+ if scale == 0:
+ return cfg_result
+
+ # Replace Self-attention with PAG
+ model_options = comfy.model_patcher.set_model_options_patch_replace(model_options, perturbed_attention, "attn1", unet_block, unet_block_id)
+ (pag,) = comfy.samplers.calc_cond_batch(model, [cond], x, sigma, model_options)
+
+ return cfg_result + (cond_pred - pag) * scale
+
+ m.set_model_sampler_post_cfg_function(post_cfg_function)
+
+ return (m,)
+
+NODE_CLASS_MAPPINGS = {
+ "PerturbedAttentionGuidance": PerturbedAttentionGuidance,
+}
diff --git a/comfy_extras/nodes_perpneg.py b/comfy_extras/nodes_perpneg.py
index 992e8ab62..306cf9cd0 100644
--- a/comfy_extras/nodes_perpneg.py
+++ b/comfy_extras/nodes_perpneg.py
@@ -3,9 +3,18 @@ import comfy.model_management
import comfy.sampler_helpers
import comfy.samplers
import comfy.utils
+import node_helpers
+def perp_neg(x, noise_pred_pos, noise_pred_neg, noise_pred_nocond, neg_scale, cond_scale):
+ pos = noise_pred_pos - noise_pred_nocond
+ neg = noise_pred_neg - noise_pred_nocond
-#TODO: This node should be removed and replaced with one that uses the new Guider/SamplerCustomAdvanced.
+ perp = neg - ((torch.mul(neg, pos).sum())/(torch.norm(pos)**2)) * pos
+ perp_neg = perp * neg_scale
+ cfg_result = noise_pred_nocond + cond_scale*(pos - perp_neg)
+ return cfg_result
+
+#TODO: This node should be removed, it has been replaced with PerpNegGuider
class PerpNeg:
@classmethod
def INPUT_TYPES(s):
@@ -34,12 +43,7 @@ class PerpNeg:
(noise_pred_nocond,) = comfy.samplers.calc_cond_batch(model, [nocond_processed], x, sigma, model_options)
- pos = noise_pred_pos - noise_pred_nocond
- neg = noise_pred_neg - noise_pred_nocond
- perp = neg - ((torch.mul(neg, pos).sum())/(torch.norm(pos)**2)) * pos
- perp_neg = perp * neg_scale
- cfg_result = noise_pred_nocond + cond_scale*(pos - perp_neg)
- cfg_result = x - cfg_result
+ cfg_result = x - perp_neg(x, noise_pred_pos, noise_pred_neg, noise_pred_nocond, neg_scale, cond_scale)
return cfg_result
m.set_model_sampler_cfg_function(cfg_function)
@@ -47,10 +51,52 @@ class PerpNeg:
return (m, )
+class Guider_PerpNeg(comfy.samplers.CFGGuider):
+ def set_conds(self, positive, negative, empty_negative_prompt):
+ empty_negative_prompt = node_helpers.conditioning_set_values(empty_negative_prompt, {"prompt_type": "negative"})
+ self.inner_set_conds({"positive": positive, "empty_negative_prompt": empty_negative_prompt, "negative": negative})
+
+ def set_cfg(self, cfg, neg_scale):
+ self.cfg = cfg
+ self.neg_scale = neg_scale
+
+ def predict_noise(self, x, timestep, model_options={}, seed=None):
+ positive_cond = self.conds.get("positive", None)
+ negative_cond = self.conds.get("negative", None)
+ empty_cond = self.conds.get("empty_negative_prompt", None)
+
+ out = comfy.samplers.calc_cond_batch(self.inner_model, [negative_cond, positive_cond, empty_cond], x, timestep, model_options)
+ return perp_neg(x, out[1], out[0], out[2], self.neg_scale, self.cfg)
+
+class PerpNegGuider:
+ @classmethod
+ def INPUT_TYPES(s):
+ return {"required":
+ {"model": ("MODEL",),
+ "positive": ("CONDITIONING", ),
+ "negative": ("CONDITIONING", ),
+ "empty_conditioning": ("CONDITIONING", ),
+ "cfg": ("FLOAT", {"default": 8.0, "min": 0.0, "max": 100.0, "step":0.1, "round": 0.01}),
+ "neg_scale": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 100.0, "step": 0.01}),
+ }
+ }
+
+ RETURN_TYPES = ("GUIDER",)
+
+ FUNCTION = "get_guider"
+ CATEGORY = "_for_testing"
+
+ def get_guider(self, model, positive, negative, empty_conditioning, cfg, neg_scale):
+ guider = Guider_PerpNeg(model)
+ guider.set_conds(positive, negative, empty_conditioning)
+ guider.set_cfg(cfg, neg_scale)
+ return (guider,)
+
NODE_CLASS_MAPPINGS = {
"PerpNeg": PerpNeg,
+ "PerpNegGuider": PerpNegGuider,
}
NODE_DISPLAY_NAME_MAPPINGS = {
- "PerpNeg": "Perp-Neg",
+ "PerpNeg": "Perp-Neg (DEPRECATED by PerpNegGuider)",
}
diff --git a/comfy_extras/nodes_photomaker.py b/comfy_extras/nodes_photomaker.py
index 90130142b..29d127d74 100644
--- a/comfy_extras/nodes_photomaker.py
+++ b/comfy_extras/nodes_photomaker.py
@@ -141,7 +141,7 @@ class PhotoMakerEncode:
return {"required": { "photomaker": ("PHOTOMAKER",),
"image": ("IMAGE",),
"clip": ("CLIP", ),
- "text": ("STRING", {"multiline": True, "default": "photograph of photomaker"}),
+ "text": ("STRING", {"multiline": True, "dynamicPrompts": True, "default": "photograph of photomaker"}),
}}
RETURN_TYPES = ("CONDITIONING",)
diff --git a/comfy_extras/nodes_post_processing.py b/comfy_extras/nodes_post_processing.py
index 0110b472f..68f6ef51e 100644
--- a/comfy_extras/nodes_post_processing.py
+++ b/comfy_extras/nodes_post_processing.py
@@ -5,6 +5,7 @@ from PIL import Image
import math
import comfy.utils
+import comfy.model_management
class Blend:
@@ -102,6 +103,7 @@ class Blur:
if blur_radius == 0:
return (image,)
+ image = image.to(comfy.model_management.get_torch_device())
batch_size, height, width, channels = image.shape
kernel_size = blur_radius * 2 + 1
@@ -112,7 +114,7 @@ class Blur:
blurred = F.conv2d(padded_image, kernel, padding=kernel_size // 2, groups=channels)[:,:,blur_radius:-blur_radius, blur_radius:-blur_radius]
blurred = blurred.permute(0, 2, 3, 1)
- return (blurred,)
+ return (blurred.to(comfy.model_management.intermediate_device()),)
class Quantize:
def __init__(self):
@@ -225,6 +227,7 @@ class Sharpen:
return (image,)
batch_size, height, width, channels = image.shape
+ image = image.to(comfy.model_management.get_torch_device())
kernel_size = sharpen_radius * 2 + 1
kernel = gaussian_kernel(kernel_size, sigma, device=image.device) * -(alpha*10)
@@ -239,7 +242,7 @@ class Sharpen:
result = torch.clamp(sharpened, 0, 1)
- return (result,)
+ return (result.to(comfy.model_management.intermediate_device()),)
class ImageScaleToTotalPixels:
upscale_methods = ["nearest-exact", "bilinear", "area", "bicubic", "lanczos"]
diff --git a/comfy_extras/nodes_upscale_model.py b/comfy_extras/nodes_upscale_model.py
index 2b5e49a55..52c95df23 100644
--- a/comfy_extras/nodes_upscale_model.py
+++ b/comfy_extras/nodes_upscale_model.py
@@ -37,9 +37,14 @@ class ImageUpscaleWithModel:
def upscale(self, upscale_model, image):
device = model_management.get_torch_device()
+
+ memory_required = model_management.module_size(upscale_model)
+ memory_required += (512 * 512 * 3) * image.element_size() * max(upscale_model.scale, 1.0) * 384.0 #The 384.0 is an estimate of how much some of these models take, TODO: make it more accurate
+ memory_required += image.nelement() * image.element_size()
+ model_management.free_memory(memory_required, device)
+
upscale_model.to(device)
in_img = image.movedim(-1,-3).to(device)
- free_memory = model_management.get_free_memory(device)
tile = 512
overlap = 32
diff --git a/execution.py b/execution.py
index 35bdb77a6..47d58b9d7 100644
--- a/execution.py
+++ b/execution.py
@@ -176,7 +176,7 @@ def recursive_execute(server, prompt, outputs, current_item, extra_data, execute
for node_id, node_outputs in outputs.items():
output_data_formatted[node_id] = [[format_value(x) for x in l] for l in node_outputs]
- logging.error("!!! Exception during processing !!!")
+ logging.error(f"!!! Exception during processing!!! {ex}")
logging.error(traceback.format_exc())
error_details = {
diff --git a/folder_paths.py b/folder_paths.py
index a84524d9f..489795002 100644
--- a/folder_paths.py
+++ b/folder_paths.py
@@ -2,7 +2,7 @@ import os
import time
import logging
-supported_pt_extensions = set(['.ckpt', '.pt', '.bin', '.pth', '.safetensors'])
+supported_pt_extensions = set(['.ckpt', '.pt', '.bin', '.pth', '.safetensors', '.pkl'])
folder_names_and_paths = {}
@@ -181,6 +181,8 @@ def get_full_path(folder_name, filename):
full_path = os.path.join(x, filename)
if os.path.isfile(full_path):
return full_path
+ elif os.path.islink(full_path):
+ logging.warning("WARNING path {} exists but doesn't link anywhere, skipping.".format(full_path))
return None
diff --git a/main.py b/main.py
index b3a3ebea8..a374f2b12 100644
--- a/main.py
+++ b/main.py
@@ -243,11 +243,11 @@ if __name__ == "__main__":
call_on_start = None
if args.auto_launch:
- def startup_server(address, port):
+ def startup_server(scheme, address, port):
import webbrowser
if os.name == 'nt' and address == '0.0.0.0':
address = '127.0.0.1'
- webbrowser.open(f"http://{address}:{port}")
+ webbrowser.open(f"{scheme}://{address}:{port}")
call_on_start = startup_server
try:
diff --git a/node_helpers.py b/node_helpers.py
new file mode 100644
index 000000000..60f8fa415
--- /dev/null
+++ b/node_helpers.py
@@ -0,0 +1,25 @@
+from PIL import Image, ImageFile, UnidentifiedImageError
+
+def conditioning_set_values(conditioning, values={}):
+ c = []
+ for t in conditioning:
+ n = [t[0], t[1].copy()]
+ for k in values:
+ n[1][k] = values[k]
+ c.append(n)
+
+ return c
+
+def open_image(path):
+ prev_value = None
+
+ try:
+ img = Image.open(path)
+ except (UnidentifiedImageError, ValueError): #PIL issues #4472 and #2445
+ prev_value = ImageFile.LOAD_TRUNCATED_IMAGES
+ ImageFile.LOAD_TRUNCATED_IMAGES = True
+ img = Image.open(path)
+ finally:
+ if prev_value is not None:
+ ImageFile.LOAD_TRUNCATED_IMAGES = prev_value
+ return img
diff --git a/nodes.py b/nodes.py
index cdb82f801..aa6d6fa9f 100644
--- a/nodes.py
+++ b/nodes.py
@@ -12,12 +12,12 @@ import logging
from PIL import Image, ImageOps, ImageSequence
from PIL.PngImagePlugin import PngInfo
+
import numpy as np
import safetensors.torch
sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), "comfy"))
-
import comfy.diffusers_load
import comfy.samplers
import comfy.sample
@@ -34,6 +34,7 @@ import importlib
import folder_paths
import latent_preview
+import node_helpers
def before_node_execution():
comfy.model_management.throw_exception_if_processing_interrupted()
@@ -46,7 +47,7 @@ MAX_RESOLUTION=16384
class CLIPTextEncode:
@classmethod
def INPUT_TYPES(s):
- return {"required": {"text": ("STRING", {"multiline": True}), "clip": ("CLIP", )}}
+ return {"required": {"text": ("STRING", {"multiline": True, "dynamicPrompts": True}), "clip": ("CLIP", )}}
RETURN_TYPES = ("CONDITIONING",)
FUNCTION = "encode"
@@ -151,13 +152,9 @@ class ConditioningSetArea:
CATEGORY = "conditioning"
def append(self, conditioning, width, height, x, y, strength):
- c = []
- for t in conditioning:
- n = [t[0], t[1].copy()]
- n[1]['area'] = (height // 8, width // 8, y // 8, x // 8)
- n[1]['strength'] = strength
- n[1]['set_area_to_bounds'] = False
- c.append(n)
+ c = node_helpers.conditioning_set_values(conditioning, {"area": (height // 8, width // 8, y // 8, x // 8),
+ "strength": strength,
+ "set_area_to_bounds": False})
return (c, )
class ConditioningSetAreaPercentage:
@@ -176,13 +173,9 @@ class ConditioningSetAreaPercentage:
CATEGORY = "conditioning"
def append(self, conditioning, width, height, x, y, strength):
- c = []
- for t in conditioning:
- n = [t[0], t[1].copy()]
- n[1]['area'] = ("percentage", height, width, y, x)
- n[1]['strength'] = strength
- n[1]['set_area_to_bounds'] = False
- c.append(n)
+ c = node_helpers.conditioning_set_values(conditioning, {"area": ("percentage", height, width, y, x),
+ "strength": strength,
+ "set_area_to_bounds": False})
return (c, )
class ConditioningSetAreaStrength:
@@ -197,11 +190,7 @@ class ConditioningSetAreaStrength:
CATEGORY = "conditioning"
def append(self, conditioning, strength):
- c = []
- for t in conditioning:
- n = [t[0], t[1].copy()]
- n[1]['strength'] = strength
- c.append(n)
+ c = node_helpers.conditioning_set_values(conditioning, {"strength": strength})
return (c, )
@@ -219,19 +208,15 @@ class ConditioningSetMask:
CATEGORY = "conditioning"
def append(self, conditioning, mask, set_cond_area, strength):
- c = []
set_area_to_bounds = False
if set_cond_area != "default":
set_area_to_bounds = True
if len(mask.shape) < 3:
mask = mask.unsqueeze(0)
- for t in conditioning:
- n = [t[0], t[1].copy()]
- _, h, w = mask.shape
- n[1]['mask'] = mask
- n[1]['set_area_to_bounds'] = set_area_to_bounds
- n[1]['mask_strength'] = strength
- c.append(n)
+
+ c = node_helpers.conditioning_set_values(conditioning, {"mask": mask,
+ "set_area_to_bounds": set_area_to_bounds,
+ "mask_strength": strength})
return (c, )
class ConditioningZeroOut:
@@ -266,13 +251,8 @@ class ConditioningSetTimestepRange:
CATEGORY = "advanced/conditioning"
def set_range(self, conditioning, start, end):
- c = []
- for t in conditioning:
- d = t[1].copy()
- d['start_percent'] = start
- d['end_percent'] = end
- n = [t[0], d]
- c.append(n)
+ c = node_helpers.conditioning_set_values(conditioning, {"start_percent": start,
+ "end_percent": end})
return (c, )
class VAEDecode:
@@ -413,13 +393,8 @@ class InpaintModelConditioning:
out = []
for conditioning in [positive, negative]:
- c = []
- for t in conditioning:
- d = t[1].copy()
- d["concat_latent_image"] = concat_latent
- d["concat_mask"] = mask
- n = [t[0], d]
- c.append(n)
+ c = node_helpers.conditioning_set_values(conditioning, {"concat_latent_image": concat_latent,
+ "concat_mask": mask})
out.append(c)
return (out[0], out[1], out_latent)
@@ -608,8 +583,8 @@ class LoraLoader:
return {"required": { "model": ("MODEL",),
"clip": ("CLIP", ),
"lora_name": (folder_paths.get_filename_list("loras"), ),
- "strength_model": ("FLOAT", {"default": 1.0, "min": -20.0, "max": 20.0, "step": 0.01}),
- "strength_clip": ("FLOAT", {"default": 1.0, "min": -20.0, "max": 20.0, "step": 0.01}),
+ "strength_model": ("FLOAT", {"default": 1.0, "min": -100.0, "max": 100.0, "step": 0.01}),
+ "strength_clip": ("FLOAT", {"default": 1.0, "min": -100.0, "max": 100.0, "step": 0.01}),
}}
RETURN_TYPES = ("MODEL", "CLIP")
FUNCTION = "load_lora"
@@ -642,7 +617,7 @@ class LoraLoaderModelOnly(LoraLoader):
def INPUT_TYPES(s):
return {"required": { "model": ("MODEL",),
"lora_name": (folder_paths.get_filename_list("loras"), ),
- "strength_model": ("FLOAT", {"default": 1.0, "min": -20.0, "max": 20.0, "step": 0.01}),
+ "strength_model": ("FLOAT", {"default": 1.0, "min": -100.0, "max": 100.0, "step": 0.01}),
}}
RETURN_TYPES = ("MODEL",)
FUNCTION = "load_lora_model_only"
@@ -991,7 +966,7 @@ class GLIGENTextBoxApply:
return {"required": {"conditioning_to": ("CONDITIONING", ),
"clip": ("CLIP", ),
"gligen_textbox_model": ("GLIGEN", ),
- "text": ("STRING", {"multiline": True}),
+ "text": ("STRING", {"multiline": True, "dynamicPrompts": True}),
"width": ("INT", {"default": 64, "min": 8, "max": MAX_RESOLUTION, "step": 8}),
"height": ("INT", {"default": 64, "min": 8, "max": MAX_RESOLUTION, "step": 8}),
"x": ("INT", {"default": 0, "min": 0, "max": MAX_RESOLUTION, "step": 8}),
@@ -1481,7 +1456,9 @@ class LoadImage:
FUNCTION = "load_image"
def load_image(self, image):
image_path = folder_paths.get_annotated_filepath(image)
- img = Image.open(image_path)
+
+ img = node_helpers.open_image(image_path)
+
output_images = []
output_masks = []
for i in ImageSequence.Iterator(img):
@@ -1966,6 +1943,11 @@ def init_custom_nodes():
"nodes_stable_cascade.py",
"nodes_differential_diffusion.py",
"nodes_ip2p.py",
+ "nodes_model_merging_model_specific.py",
+ "nodes_pag.py",
+ "nodes_align_your_steps.py",
+ "nodes_attention_multiply.py",
+ "nodes_advanced_samplers.py",
]
import_failed = []
diff --git a/server.py b/server.py
index 5642bd5e2..bab3b0600 100644
--- a/server.py
+++ b/server.py
@@ -11,6 +11,7 @@ import urllib
import json
import glob
import struct
+import ssl
from PIL import Image, ImageOps
from PIL.PngImagePlugin import PngInfo
from io import BytesIO
@@ -623,14 +624,22 @@ class PromptServer():
async def start(self, address, port, verbose=True, call_on_start=None):
runner = web.AppRunner(self.app, access_log=None)
await runner.setup()
- site = web.TCPSite(runner, address, port)
+ ssl_ctx = None
+ scheme = "http"
+ if args.tls_keyfile and args.tls_certfile:
+ ssl_ctx = ssl.SSLContext(protocol=ssl.PROTOCOL_TLS_SERVER, verify_mode=ssl.CERT_NONE)
+ ssl_ctx.load_cert_chain(certfile=args.tls_certfile,
+ keyfile=args.tls_keyfile)
+ scheme = "https"
+
+ site = web.TCPSite(runner, address, port, ssl_context=ssl_ctx)
await site.start()
if verbose:
logging.info("Starting server\n")
- logging.info("To see the GUI go to: http://{}:{}".format(address, port))
+ logging.info("To see the GUI go to: {}://{}:{}".format(scheme, address, port))
if call_on_start is not None:
- call_on_start(address, port)
+ call_on_start(scheme, address, port)
def add_on_prompt_handler(self, handler):
self.on_prompt_handlers.append(handler)
diff --git a/tests-ui/utils/ezgraph.js b/tests-ui/utils/ezgraph.js
index 8a55246ee..97be7aa72 100644
--- a/tests-ui/utils/ezgraph.js
+++ b/tests-ui/utils/ezgraph.js
@@ -204,13 +204,17 @@ export class EzWidget {
convertToWidget() {
if (!this.isConvertedToInput)
throw new Error(`Widget ${this.widget.name} cannot be converted as it is already a widget.`);
- this.node.menu[`Convert ${this.widget.name} to widget`].call();
+ var menu = this.node.menu["Convert Input to Widget"].item.submenu.options;
+ var index = menu.findIndex(a => a.content == `Convert ${this.widget.name} to widget`);
+ menu[index].callback.call();
}
convertToInput() {
if (this.isConvertedToInput)
throw new Error(`Widget ${this.widget.name} cannot be converted as it is already an input.`);
- this.node.menu[`Convert ${this.widget.name} to input`].call();
+ var menu = this.node.menu["Convert Widget to Input"].item.submenu.options;
+ var index = menu.findIndex(a => a.content == `Convert ${this.widget.name} to input`);
+ menu[index].callback.call();
}
}
diff --git a/web/extensions/core/colorPalette.js b/web/extensions/core/colorPalette.js
index ccbf9b142..245f3b93e 100644
--- a/web/extensions/core/colorPalette.js
+++ b/web/extensions/core/colorPalette.js
@@ -20,6 +20,10 @@ const colorPalettes = {
"MODEL": "#B39DDB", // light lavender-purple
"STYLE_MODEL": "#C2FFAE", // light green-yellow
"VAE": "#FF6E6E", // bright red
+ "NOISE": "#B0B0B0", // gray
+ "GUIDER": "#66FFFF", // cyan
+ "SAMPLER": "#ECB4B4", // very soft red
+ "SIGMAS": "#CDFFCD", // soft lime green
"TAESD": "#DCC274", // cheesecake
},
"litegraph_base": {
diff --git a/web/extensions/core/dynamicPrompts.js b/web/extensions/core/dynamicPrompts.js
index 599a9e685..7417361ba 100644
--- a/web/extensions/core/dynamicPrompts.js
+++ b/web/extensions/core/dynamicPrompts.js
@@ -17,7 +17,7 @@ app.registerExtension({
// Locate dynamic prompt text widgets
// Include any widgets with dynamicPrompts set to true, and customtext
const widgets = node.widgets.filter(
- (n) => (n.type === "customtext" && n.dynamicPrompts !== false) || n.dynamicPrompts
+ (n) => n.dynamicPrompts
);
for (const widget of widgets) {
// Override the serialization of the value to resolve dynamic prompts for all widgets supporting it in this node
diff --git a/web/extensions/core/widgetInputs.js b/web/extensions/core/widgetInputs.js
index 23f51d812..f1a1d22cd 100644
--- a/web/extensions/core/widgetInputs.js
+++ b/web/extensions/core/widgetInputs.js
@@ -256,8 +256,18 @@ export function mergeIfValid(output, config2, forceUpdate, recreateWidget, confi
return { customConfig };
}
+let useConversionSubmenusSetting;
app.registerExtension({
name: "Comfy.WidgetInputs",
+ init() {
+ useConversionSubmenusSetting = app.ui.settings.addSetting({
+ id: "Comfy.NodeInputConversionSubmenus",
+ name: "Node widget/input conversion sub-menus",
+ tooltip: "In the node context menu, place the entries that convert between input/widget in sub-menus.",
+ type: "boolean",
+ defaultValue: true,
+ });
+ },
async beforeRegisterNodeDef(nodeType, nodeData, app) {
// Add menu options to conver to/from widgets
const origGetExtraMenuOptions = nodeType.prototype.getExtraMenuOptions;
@@ -292,12 +302,31 @@ app.registerExtension({
}
}
}
+
+ //Convert.. main menu
if (toInput.length) {
- options.push(...toInput, null);
+ if (useConversionSubmenusSetting.value) {
+ options.push({
+ content: "Convert Widget to Input",
+ submenu: {
+ options: toInput,
+ },
+ });
+ } else {
+ options.push(...toInput, null);
+ }
}
-
if (toWidget.length) {
- options.push(...toWidget, null);
+ if (useConversionSubmenusSetting.value) {
+ options.push({
+ content: "Convert Input to Widget",
+ submenu: {
+ options: toWidget,
+ },
+ });
+ } else {
+ options.push(...toWidget, null);
+ }
}
}
diff --git a/web/scripts/ui.js b/web/scripts/ui.js
index 8e28fa786..6ac2aa331 100644
--- a/web/scripts/ui.js
+++ b/web/scripts/ui.js
@@ -95,12 +95,15 @@ function dragElement(dragEl, settings) {
}).observe(dragEl);
function ensureInBounds() {
- if (dragEl.classList.contains("comfy-menu-manual-pos")) {
+ try {
newPosX = Math.min(document.body.clientWidth - dragEl.clientWidth, Math.max(0, dragEl.offsetLeft));
newPosY = Math.min(document.body.clientHeight - dragEl.clientHeight, Math.max(0, dragEl.offsetTop));
positionElement();
}
+ catch(exception){
+ // robust
+ }
}
function positionElement() {
diff --git a/web/scripts/widgets.js b/web/scripts/widgets.js
index 678b1b8ec..6a6899705 100644
--- a/web/scripts/widgets.js
+++ b/web/scripts/widgets.js
@@ -229,7 +229,11 @@ function createIntWidget(node, inputName, inputData, app, isSeedInput) {
val,
function (v) {
const s = this.options.step / 10;
- this.value = Math.round(v / s) * s;
+ let sh = this.options.min % s;
+ if (isNaN(sh)) {
+ sh = 0;
+ }
+ this.value = Math.round((v - sh) / s) * s + sh;
},
config
),
@@ -307,7 +311,9 @@ export const ComfyWidgets = {
return { widget: node.addWidget(widgetType, inputName, val,
function (v) {
if (config.round) {
- this.value = Math.round(v/config.round)*config.round;
+ this.value = Math.round((v + Number.EPSILON)/config.round)*config.round;
+ if (this.value > config.max) this.value = config.max;
+ if (this.value < config.min) this.value = config.min;
} else {
this.value = v;
}