wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-01-24 21:30:15 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Modify feature name 'reload' to 'refresh' and fixed ignoring button name.

Browse Source
This commit is contained in:
Lt.Dr.Data 2023-03-21 09:46:13 +09:00
parent ea9114626e
commit 93bcd7ce12
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
comfy_extras/nodes_upscale_model.py
View File

@ -10,7 +10,7 @@ class UpscaleModelLoader:
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": { "model_name": (folder_paths.get_filename_list("upscale_models"), ), 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",) RETURN_TYPES = ("UPSCALE_MODEL",)
FUNCTION = "load_model" FUNCTION = "load_model"

20
nodes.py
View File

@ -192,7 +192,7 @@ class CheckpointLoader:
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": { "config_name": (folder_paths.get_filename_list("configs"), ), return {"required": { "config_name": (folder_paths.get_filename_list("configs"), ),
"ckpt_name": (folder_paths.get_filename_list("checkpoints"), ), "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") RETURN_TYPES = ("MODEL", "CLIP", "VAE")
FUNCTION = "load_checkpoint" FUNCTION = "load_checkpoint"
@ -207,7 +207,7 @@ class CheckpointLoaderSimple:
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": { "ckpt_name": (folder_paths.get_filename_list("checkpoints"), ), 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") RETURN_TYPES = ("MODEL", "CLIP", "VAE")
FUNCTION = "load_checkpoint" FUNCTION = "load_checkpoint"
@ -242,7 +242,7 @@ class LoraLoader:
"lora_name": (folder_paths.get_filename_list("loras"), ), "lora_name": (folder_paths.get_filename_list("loras"), ),
"strength_model": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}), "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}), "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") RETURN_TYPES = ("MODEL", "CLIP")
FUNCTION = "load_lora" FUNCTION = "load_lora"
@ -258,7 +258,7 @@ class VAELoader:
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": { "vae_name": (folder_paths.get_filename_list("vae"), ), return {"required": { "vae_name": (folder_paths.get_filename_list("vae"), ),
"RELOAD": ("RELOAD", [("vae_name", "vae")]) "Refresh": ("REFRESH", [("vae_name", "vae")])
}} }}
RETURN_TYPES = ("VAE",) RETURN_TYPES = ("VAE",)
FUNCTION = "load_vae" FUNCTION = "load_vae"
@ -275,7 +275,7 @@ class ControlNetLoader:
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": { "control_net_name": (folder_paths.get_filename_list("controlnet"), ), 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",) RETURN_TYPES = ("CONTROL_NET",)
@ -293,7 +293,7 @@ class DiffControlNetLoader:
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": { "model": ("MODEL",), return {"required": { "model": ("MODEL",),
"control_net_name": (folder_paths.get_filename_list("controlnet"), ), "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",) RETURN_TYPES = ("CONTROL_NET",)
@ -337,7 +337,7 @@ class CLIPLoader:
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": { "clip_name": (folder_paths.get_filename_list("clip"), ), return {"required": { "clip_name": (folder_paths.get_filename_list("clip"), ),
"RELOAD": ("RELOAD", [("clip_name", "clip")]) "Refresh": ("REFRESH", [("clip_name", "clip")])
}} }}
RETURN_TYPES = ("CLIP",) RETURN_TYPES = ("CLIP",)
FUNCTION = "load_clip" FUNCTION = "load_clip"
@ -353,7 +353,7 @@ class CLIPVisionLoader:
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": { "clip_name": (folder_paths.get_filename_list("clip_vision"), ), 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",) RETURN_TYPES = ("CLIP_VISION",)
FUNCTION = "load_clip" FUNCTION = "load_clip"
@ -384,7 +384,7 @@ class StyleModelLoader:
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": { "style_model_name": (folder_paths.get_filename_list("style_models"), ), 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",) RETURN_TYPES = ("STYLE_MODEL",)
@ -819,7 +819,7 @@ class LoadImage:
os.makedirs(s.input_dir) os.makedirs(s.input_dir)
return {"required": return {"required":
{"image": (sorted(os.listdir(s.input_dir)), ), {"image": (sorted(os.listdir(s.input_dir)), ),
"RELOAD": ("RELOAD", [("image", "input")]) "Refresh": ("REFRESH", [("image", "input")])
}, },
} }

12
web/scripts/widgets.js
View File

@ -29,8 +29,8 @@ function seedWidget(node, inputName, inputData) {
return { widget: seed, randomize }; return { widget: seed, randomize };
} }
function reloadWidget(node, name, data) { function refreshWidget(node, name, data) {
async function reload_callback() { async function refresh_callback() {
const items = data[1]; const items = data[1];
for (let i in items) { for (let i in items) {
const w = node.widgets.find((w) => w.name === items[i][0]); 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(); }, {}); console.log(name);
return { reload };
const refresh = node.addWidget("button", name, true, function(v) { refresh_callback(); }, {});
return { refresh };
} }
function addMultilineWidget(node, name, defaultVal, app) { function addMultilineWidget(node, name, defaultVal, app) {
@ -133,7 +135,7 @@ export const ComfyWidgets = {
), ),
}; };
}, },
RELOAD:reloadWidget, REFRESH:refreshWidget,
STRING(node, inputName, inputData, app) { STRING(node, inputName, inputData, app) {
const defaultVal = inputData[1].default || ""; const defaultVal = inputData[1].default || "";
const multiline = !!inputData[1].multiline; const multiline = !!inputData[1].multiline;