From 93bcd7ce12b71eac165d734df0ba876c83114955 Mon Sep 17 00:00:00 2001 From: "Lt.Dr.Data" Date: Tue, 21 Mar 2023 09:46:13 +0900 Subject: [PATCH] Modify feature name 'reload' to 'refresh' and fixed ignoring button name. --- comfy_extras/nodes_upscale_model.py | 2 +- nodes.py | 20 ++++++++++---------- web/scripts/widgets.js | 12 +++++++----- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/comfy_extras/nodes_upscale_model.py b/comfy_extras/nodes_upscale_model.py index f2d3cc8b6..5d7b7e4bc 100644 --- a/comfy_extras/nodes_upscale_model.py +++ b/comfy_extras/nodes_upscale_model.py @@ -10,7 +10,7 @@ class UpscaleModelLoader: @classmethod def INPUT_TYPES(s): return {"required": { "model_name": (folder_paths.get_filename_list("upscale_models"), ), - "RELOAD": ("RELOAD", [("model_name", "upscale_models")]), + "Refresh": ("REFRESH", [("model_name", "upscale_models")]), }} RETURN_TYPES = ("UPSCALE_MODEL",) FUNCTION = "load_model" diff --git a/nodes.py b/nodes.py index cd7384f76..804b025b9 100644 --- a/nodes.py +++ b/nodes.py @@ -192,7 +192,7 @@ class CheckpointLoader: def INPUT_TYPES(s): return {"required": { "config_name": (folder_paths.get_filename_list("configs"), ), "ckpt_name": (folder_paths.get_filename_list("checkpoints"), ), - "RELOAD": ("RELOAD", [("config_name", "configs"), ("ckpt_name", "checkpoints")]) }} + "Refresh": ("REFRESH", [("config_name", "configs"), ("ckpt_name", "checkpoints")]) }} RETURN_TYPES = ("MODEL", "CLIP", "VAE") FUNCTION = "load_checkpoint" @@ -207,7 +207,7 @@ class CheckpointLoaderSimple: @classmethod def INPUT_TYPES(s): return {"required": { "ckpt_name": (folder_paths.get_filename_list("checkpoints"), ), - "RELOAD": ("RELOAD", [("ckpt_name", "checkpoints")]) }} + "Refresh": ("REFRESH", [("ckpt_name", "checkpoints")]) }} RETURN_TYPES = ("MODEL", "CLIP", "VAE") FUNCTION = "load_checkpoint" @@ -242,7 +242,7 @@ class LoraLoader: "lora_name": (folder_paths.get_filename_list("loras"), ), "strength_model": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}), "strength_clip": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}), - "RELOAD": ("RELOAD", [("lora_name", "loras")]) + "Refresh": ("REFRESH", [("lora_name", "loras")]) }} RETURN_TYPES = ("MODEL", "CLIP") FUNCTION = "load_lora" @@ -258,7 +258,7 @@ class VAELoader: @classmethod def INPUT_TYPES(s): return {"required": { "vae_name": (folder_paths.get_filename_list("vae"), ), - "RELOAD": ("RELOAD", [("vae_name", "vae")]) + "Refresh": ("REFRESH", [("vae_name", "vae")]) }} RETURN_TYPES = ("VAE",) FUNCTION = "load_vae" @@ -275,7 +275,7 @@ class ControlNetLoader: @classmethod def INPUT_TYPES(s): return {"required": { "control_net_name": (folder_paths.get_filename_list("controlnet"), ), - "RELOAD": ("RELOAD", [("control_net_name", "controlnet")]) + "Refresh": ("REFRESH", [("control_net_name", "controlnet")]) }} RETURN_TYPES = ("CONTROL_NET",) @@ -293,7 +293,7 @@ class DiffControlNetLoader: def INPUT_TYPES(s): return {"required": { "model": ("MODEL",), "control_net_name": (folder_paths.get_filename_list("controlnet"), ), - "RELOAD": ("RELOAD", [("control_net_name", "controlnet")]) + "Refresh": ("REFRESH", [("control_net_name", "controlnet")]) }} RETURN_TYPES = ("CONTROL_NET",) @@ -337,7 +337,7 @@ class CLIPLoader: @classmethod def INPUT_TYPES(s): return {"required": { "clip_name": (folder_paths.get_filename_list("clip"), ), - "RELOAD": ("RELOAD", [("clip_name", "clip")]) + "Refresh": ("REFRESH", [("clip_name", "clip")]) }} RETURN_TYPES = ("CLIP",) FUNCTION = "load_clip" @@ -353,7 +353,7 @@ class CLIPVisionLoader: @classmethod def INPUT_TYPES(s): return {"required": { "clip_name": (folder_paths.get_filename_list("clip_vision"), ), - "RELOAD": ("RELOAD", [("clip_name", "clip_vision")]) + "Refresh": ("REFRESH", [("clip_name", "clip_vision")]) }} RETURN_TYPES = ("CLIP_VISION",) FUNCTION = "load_clip" @@ -384,7 +384,7 @@ class StyleModelLoader: @classmethod def INPUT_TYPES(s): return {"required": { "style_model_name": (folder_paths.get_filename_list("style_models"), ), - "RELOAD": ("RELOAD", [("style_model_name", "style_models")]) + "Refresh": ("REFRESH", [("style_model_name", "style_models")]) }} RETURN_TYPES = ("STYLE_MODEL",) @@ -819,7 +819,7 @@ class LoadImage: os.makedirs(s.input_dir) return {"required": {"image": (sorted(os.listdir(s.input_dir)), ), - "RELOAD": ("RELOAD", [("image", "input")]) + "Refresh": ("REFRESH", [("image", "input")]) }, } diff --git a/web/scripts/widgets.js b/web/scripts/widgets.js index 81f3807c0..69072c154 100644 --- a/web/scripts/widgets.js +++ b/web/scripts/widgets.js @@ -29,8 +29,8 @@ function seedWidget(node, inputName, inputData) { return { widget: seed, randomize }; } -function reloadWidget(node, name, data) { - async function reload_callback() { +function refreshWidget(node, name, data) { + async function refresh_callback() { const items = data[1]; for (let i in items) { const w = node.widgets.find((w) => w.name === items[i][0]); @@ -40,8 +40,10 @@ function reloadWidget(node, name, data) { } } - const reload = node.addWidget("button", "RELOAD", true, function(v) { reload_callback(); }, {}); - return { reload }; + console.log(name); + + const refresh = node.addWidget("button", name, true, function(v) { refresh_callback(); }, {}); + return { refresh }; } function addMultilineWidget(node, name, defaultVal, app) { @@ -133,7 +135,7 @@ export const ComfyWidgets = { ), }; }, - RELOAD:reloadWidget, + REFRESH:refreshWidget, STRING(node, inputName, inputData, app) { const defaultVal = inputData[1].default || ""; const multiline = !!inputData[1].multiline;