From 220914bfb34605bf7bed99e8ce78f5f5ebb66bca Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Sun, 26 Mar 2023 21:41:29 +0900 Subject: [PATCH] make more clean code for refresh feature --- comfy_extras/nodes_upscale_model.py | 2 +- nodes.py | 20 ++++++++++---------- web/scripts/app.js | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/comfy_extras/nodes_upscale_model.py b/comfy_extras/nodes_upscale_model.py index 8d6980c0e..0f0f933a5 100644 --- a/comfy_extras/nodes_upscale_model.py +++ b/comfy_extras/nodes_upscale_model.py @@ -16,7 +16,7 @@ class UpscaleModelLoader: CATEGORY = "loaders" - REFRESH_LIST = [("model_name", "upscale_models")] + REFRESH_LIST = ["model_name"] def load_model(self, model_name): model_path = folder_paths.get_full_path("upscale_models", model_name) diff --git a/nodes.py b/nodes.py index 104fa9387..b1f988c49 100644 --- a/nodes.py +++ b/nodes.py @@ -199,7 +199,7 @@ class CheckpointLoader: CATEGORY = "loaders" - REFRESH_LIST = [("config_name", "configs"), ("ckpt_name", "checkpoints")] + REFRESH_LIST = ["config_name", "ckpt_name"] def load_checkpoint(self, config_name, ckpt_name, output_vae=True, output_clip=True): config_path = folder_paths.get_full_path("configs", config_name) @@ -216,7 +216,7 @@ class CheckpointLoaderSimple: CATEGORY = "loaders" - REFRESH_LIST = [("ckpt_name", "checkpoints")] + REFRESH_LIST = ["ckpt_name"] def load_checkpoint(self, ckpt_name, output_vae=True, output_clip=True): ckpt_path = folder_paths.get_full_path("checkpoints", ckpt_name) @@ -253,7 +253,7 @@ class LoraLoader: CATEGORY = "loaders" - REFRESH_LIST = [("lora_name", "loras")] + REFRESH_LIST = ["lora_name"] def load_lora(self, model, clip, lora_name, strength_model, strength_clip): lora_path = folder_paths.get_full_path("loras", lora_name) @@ -269,7 +269,7 @@ class VAELoader: CATEGORY = "loaders" - REFRESH_LIST = [("vae_name", "vae")] + REFRESH_LIST = ["vae_name"] #TODO: scale factor? def load_vae(self, vae_name): @@ -287,7 +287,7 @@ class ControlNetLoader: CATEGORY = "loaders" - REFRESH_LIST = [("control_net_name", "controlnet")] + REFRESH_LIST = ["control_net_name"] def load_controlnet(self, control_net_name): controlnet_path = folder_paths.get_full_path("controlnet", control_net_name) @@ -305,7 +305,7 @@ class DiffControlNetLoader: CATEGORY = "loaders" - REFRESH_LIST = [("control_net_name", "controlnet")] + REFRESH_LIST = ["control_net_name"] def load_controlnet(self, model, control_net_name): controlnet_path = folder_paths.get_full_path("controlnet", control_net_name) @@ -349,7 +349,7 @@ class CLIPLoader: CATEGORY = "loaders" - REFRESH_LIST = [("clip_name", "clip")] + REFRESH_LIST = ["clip_name"] def load_clip(self, clip_name): clip_path = folder_paths.get_full_path("clip", clip_name) @@ -366,7 +366,7 @@ class CLIPVisionLoader: CATEGORY = "loaders" - REFRESH_LIST = [("clip_name", "clip_vision")] + REFRESH_LIST = ["clip_name"] def load_clip(self, clip_name): clip_path = folder_paths.get_full_path("clip_vision", clip_name) @@ -398,7 +398,7 @@ class StyleModelLoader: CATEGORY = "loaders" - REFRESH_LIST = [("style_model_name", "style_models")] + REFRESH_LIST = ["style_model_name"] def load_style_model(self, style_model_name): style_model_path = folder_paths.get_full_path("style_models", style_model_name) @@ -834,7 +834,7 @@ class LoadImage: RETURN_TYPES = ("IMAGE", "MASK") FUNCTION = "load_image" - REFRESH_LIST = [("image", "input")] + REFRESH_LIST = ["image"] def load_image(self, image): image_path = os.path.join(self.input_dir, image) diff --git a/web/scripts/app.js b/web/scripts/app.js index d42079096..6b40a4ef6 100644 --- a/web/scripts/app.js +++ b/web/scripts/app.js @@ -816,8 +816,8 @@ class ComfyApp { const def = defs[node.type]; for(const i in def.refresh_list) { const item = def.refresh_list[i]; - const filelist = def.input["required"][item[0]]; - const w = node.widgets.find((w) => w.name === item[0]); + const filelist = def.input["required"][item]; + const w = node.widgets.find((w) => w.name === item); w.options.values = filelist[0]; w.value = w.options.values[0]; }