make more clean code for img-send

This commit is contained in:
Dr.Lt.Data 2023-03-26 22:05:07 +09:00
parent 18ae253759
commit fce46389fc
3 changed files with 11 additions and 8 deletions

View File

@ -727,10 +727,11 @@ class SaveImage:
return {"required": return {"required":
{"images": ("IMAGE", ), {"images": ("IMAGE", ),
"filename_prefix": ("STRING", {"default": "ComfyUI"}) }, "filename_prefix": ("STRING", {"default": "ComfyUI"}) },
"widget": {"send to img": ("IMAGESEND", )},
"hidden": {"prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"}, "hidden": {"prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"},
} }
WIDGET_TYPES = {"send to img": ("IMAGESEND", )}
RETURN_TYPES = () RETURN_TYPES = ()
FUNCTION = "save_images" FUNCTION = "save_images"
@ -808,9 +809,9 @@ class LoadImage:
def INPUT_TYPES(s): def INPUT_TYPES(s):
if not os.path.exists(s.input_dir): if not os.path.exists(s.input_dir):
os.makedirs(s.input_dir) os.makedirs(s.input_dir)
return {"required": {"image": (sorted(os.listdir(s.input_dir)), ) }, return {"required": {"image": (sorted(os.listdir(s.input_dir)), ) }}
"widget": {"recv img": (["disable", "enable"], ) }
} WIDGET_TYPES = {"recv img": (["disable", "enable"], )}
CATEGORY = "image" CATEGORY = "image"
@ -843,9 +844,9 @@ class LoadImageMask:
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": return {"required":
{"image": (sorted(os.listdir(s.input_dir)), ), {"image": (sorted(os.listdir(s.input_dir)), ),
"channel": (["alpha", "red", "green", "blue"], ),}, "channel": (["alpha", "red", "green", "blue"], ),}}
"widget": {"recv img": (["disable", "enable"], ) }
} WIDGET_TYPES = { "recv img": (["disable", "enable"], ) }
CATEGORY = "image" CATEGORY = "image"

View File

@ -163,6 +163,8 @@ class PromptServer():
info = {} info = {}
info['input'] = obj_class.INPUT_TYPES() info['input'] = obj_class.INPUT_TYPES()
info['output'] = obj_class.RETURN_TYPES info['output'] = obj_class.RETURN_TYPES
if hasattr(obj_class, 'WIDGET_TYPES'):
info['widget'] = obj_class.WIDGET_TYPES
info['name'] = x #TODO info['name'] = x #TODO
info['description'] = '' info['description'] = ''
info['category'] = 'sd' info['category'] = 'sd'

View File

@ -565,7 +565,7 @@ class ComfyApp {
const nodeData = defs[nodeId]; const nodeData = defs[nodeId];
const node = Object.assign( const node = Object.assign(
function ComfyNode() { function ComfyNode() {
const inputs = Object.assign(nodeData["input"]["required"], nodeData["input"]["widget"]); const inputs = Object.assign(nodeData["input"]["required"], nodeData["widget"]);
const config = { minWidth: 1, minHeight: 1 }; const config = { minWidth: 1, minHeight: 1 };
for (const inputName in inputs) { for (const inputName in inputs) {
const inputData = inputs[inputName]; const inputData = inputs[inputName];