v0.11.2

- 优化appinfo - 自动保存
- 优化mergeLayer，可以输出合成的mask
- 添加一个实验性的节点 ImageColorTransfer
- random prompt ,增加上传关键词功能
- 修复LoadImageFromPath的bug

README.md

@@ -4,10 +4,13 @@
 - 新增AppInfo节点，可以通过简单的配置，把workflow转变为一个Web APP。
 - 支持多个web app 切换
 - 发布为app的workflow，可以在右键里再次编辑了
+- web app可以设置分类，在comfyui右键菜单可以编辑更新web app
+
 
 - Support multiple web app switching.
 - Add the AppInfo node, which allows you to transform the workflow into a web app by simple configuration.
 - The workflow, which is now released as an app, can also be edited again by right-clicking.
+- The web app can be configured with categories, and the web app can be edited and updated in the right-click menu of ComfyUI.
 
 
 ![](./assets/0-m-app.png)
@@ -26,10 +29,12 @@ APP-JSON:
 - [image-to-image](./example/Image-to-Image_2.json)
 - text-to-text
 
-> 暂时支持6种节点作为界面上的输入节点：Load Image、CLIPTextEncode、TextInput_、FloatSlider、IntNumber、CheckpointLoaderSimple、LoraLoader
+> 暂时支持8种节点作为界面上的输入节点：Load Image、CLIPTextEncode、PromptSlide、TextInput_、Color、FloatSlider、IntNumber、CheckpointLoaderSimple、LoraLoader
 
 > 输出节点：PreviewImage 、SaveImage、ShowTextForGPT、VHS_VideoCombine
 
+> seed统一输入控件，支持：SamplerCustom、KSampler
+
 
 ## 🏃🚗🚚🚀  Real-time Design
 > ScreenShareNode & FloatingVideoNode. Now comfyui supports capturing screen pixel streams from any software and can be used for LCM-Lora integration. Let's get started with implementation and design! 💻🌐
@@ -68,6 +73,12 @@ https://github.com/shadowcz007/comfyui-mixlab-nodes/assets/12645064/e7e77f90-e43
 
 ![randomPrompt](./assets/randomPrompt.png)
 
+> ClipInterrogator
+
+[add clip-interrogator](https://github.com/pharmapsychotic/clip-interrogator)
+
+> PromptImage & PromptSimplification,Assist in simplifying prompt words, comparing images and prompt word nodes.
+
 
 ### Layers
 > A new layer class node has been added, allowing you to separate the image into layers. After merging the images, you can input the controlnet for further processing.
@@ -164,9 +175,7 @@ v0.8.0 🚀🚗🚚🏃‍ LaMaInpainting
 
 [Download lama](https://github.com/enesmsahin/simple-lama-inpainting/releases/download/v0.1.0/big-lama.pt), move to : models/lama
 
-<!-- ### Workflow
-[Workflow](./workflow.md) -->
-
+[Download Salesforce\blip-image-captioning-base](https://huggingface.co/Salesforce/blip-image-captioning-base), move to : models/clip_interrogator/Salesforce/blip-image-captioning-base
 
 ## Installation
 

__init__.py

@@ -133,8 +133,38 @@ def create_for_https():
     return (crt,key)
 
 
+
+# workflow  目录下的所有json
+def read_workflow_json_files_all(folder_path):
+    print('#read_workflow_json_files_all',folder_path)
+    json_files = []
+    for root, dirs, files in os.walk(folder_path):
+        for file in files:
+            if file.endswith('.json'):
+                json_files.append(os.path.join(root, file))
+
+    data = []
+    for file_path in json_files:
+        try:
+            with open(file_path) as json_file:
+                json_data = json.load(json_file)
+                creation_time = datetime.datetime.fromtimestamp(os.path.getctime(file_path))
+                numeric_timestamp = creation_time.timestamp()
+                file_info = {
+                    'filename': os.path.basename(file_path),
+                    'category': os.path.dirname(file_path),
+                    'data': json_data,
+                    'date': numeric_timestamp
+                }
+                data.append(file_info)
+        except Exception as e:
+            print(e)
+    
+    sorted_data = sorted(data, key=lambda x: x['date'], reverse=True)
+    return sorted_data
+
 # workflow  
-def read_workflow_json_files(folder_path):
+def read_workflow_json_files(folder_path ):
     json_files = []
     for filename in os.listdir(folder_path):
         if filename.endswith('.json'):
@@ -169,29 +199,46 @@ def get_workflows():
     workflows=read_workflow_json_files(workflow_path)
     return workflows
 
-def get_my_workflow_for_app(filename="my_workflow_app.json"):
+def get_my_workflow_for_app(filename="my_workflow_app.json",category="",is_all=False):
     app_path=os.path.join(current_path, "app")
     if not os.path.exists(app_path):
         os.mkdir(app_path)
 
+    category_path=os.path.join(app_path,category)
+    if not os.path.exists(category_path):
+        os.mkdir(category_path)
+
     apps=[]
     if filename==None:
-        data=read_workflow_json_files(app_path)
+
+        #TODO 支持目录内遍历 
+        if is_all:
+            data=read_workflow_json_files_all(category_path)
+        else:
+            data=read_workflow_json_files(category_path)
+        
         i=0
         for item in data:
+            # print(item)
             try:
                 x=item["data"]
                 if i==0:
                     apps.append({
                         "filename":item["filename"],
+                        # "category":item['category'],
                         "data":x,
-                        "date":item["date"]
+                        "date":item["date"],
                     })
                 else:
+                    category=''
+                    if 'category' in x['app']:
+                        category=x['app']['category']
                     apps.append({
                         "filename":item["filename"],
+                        "category":category,
                         "data":{
                             "app":{
+                                "category":category,
                                 "description":x['app']['description'],
                                 "filename":(x['app']['filename'] if 'filename' in x['app'] else "") ,
                                 "icon":(x['app']['icon'] if 'icon' in x['app'] else None),
@@ -205,7 +252,7 @@ def get_my_workflow_for_app(filename="my_workflow_app.json"):
             except Exception as e:
                 print("发生异常：", str(e))
     else:
-        app_workflow_path=os.path.join(app_path, filename)
+        app_workflow_path=os.path.join(category_path, filename)
         # print('app_workflow_path: ',app_workflow_path)
         try:
             with open(app_workflow_path) as json_file:
@@ -216,17 +263,22 @@ def get_my_workflow_for_app(filename="my_workflow_app.json"):
         except Exception as e:
             print("发生异常：", str(e))
         
-        if len(apps)==1:
-            data=read_workflow_json_files(app_path)
+        if len(apps)==1 and category!='' and category!=None:
+            data=read_workflow_json_files(category_path)
             
             for item in data:
                 x=item["data"]
                 # print(apps[0]['filename'] ,item["filename"])
                 if apps[0]['filename']!=item["filename"]:
+                    category=''
+                    if 'category' in x['app']:
+                        category=x['app']['category']
                     apps.append({
                         "filename":item["filename"],
+                        # "category":category,
                         "data":{
                             "app":{
+                                "category":category,
                                 "description":x['app']['description'],
                                 "filename":(x['app']['filename'] if 'filename' in x['app'] else "") ,
                                 "icon":(x['app']['icon'] if 'icon' in x['app'] else None),
@@ -245,11 +297,16 @@ def save_workflow_json(data):
         json.dump(data, file)
     return workflow_path
 
-def save_workflow_for_app(data,filename="my_workflow_app.json"):
+def save_workflow_for_app(data,filename="my_workflow_app.json",category=""):
     app_path=os.path.join(current_path, "app")
     if not os.path.exists(app_path):
         os.mkdir(app_path)
-    app_workflow_path=os.path.join(app_path, filename)
+
+    category_path=os.path.join(app_path,category)
+    if not os.path.exists(category_path):
+        os.mkdir(category_path)
+    
+    app_workflow_path=os.path.join(category_path, filename)
  
     try:
         output_str = json.dumps(data['output'])
@@ -294,33 +351,59 @@ async def new_request(self, method, url, *args, **kwargs):
 
 # 应用 Monkey Patch
 aiohttp.ClientSession._request = new_request
+import socket
+
+async def check_port_available(address, port):
+    #检查端口是否可用
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        try:
+            sock.bind((address, port))
+            return True
+        except socket.error:
+            return False
 
 # https
 async def new_start(self, address, port, verbose=True, call_on_start=None):
-        
-
+    try:
         runner = web.AppRunner(self.app, access_log=None)
         await runner.setup()
+
+        if not await check_port_available(address, port):
+            raise RuntimeError(f"Port {port} is already in use.")
+
         site = web.TCPSite(runner, address, port)
         await site.start()
 
         import ssl
-        crt,key=create_for_https()
+        crt, key = create_for_https()
         ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
-        ssl_context.load_cert_chain(crt,key)
-        site2 = web.TCPSite(runner, address, port+1,ssl_context=ssl_context)
-        await site2.start()
+        ssl_context.load_cert_chain(crt, key)
+
+        success = False
+        for i in range(10):  # 尝试最多10次
+            if await check_port_available(address, port + 1 + i):
+                https_port = port + 1 + i
+                site2 = web.TCPSite(runner, address, https_port, ssl_context=ssl_context)
+                await site2.start()
+                success = True
+                break
+
+        if not success:
+            raise RuntimeError(f"Ports {port + 1} to {port + 10} are all in use.")
 
         if address == '':
             address = '0.0.0.0'
         if verbose:
-            # print('\033[91mMixlab Nodes: \033[93mLoaded\033[0m')
             print("\033[93mStarting server\n")
             print("\033[93mTo see the GUI go to: http://{}:{}".format(address, port))
-            print("\033[93mTo see the GUI go to: https://{}:{}\033[0m".format(address, port+1))
+            print("\033[93mTo see the GUI go to: https://{}:{}\033[0m".format(address, https_port))
         if call_on_start is not None:
             call_on_start(address, port)
 
+    except Exception as e:
+        print(f"Error starting the server: {e}")
+
         # import webbrowser
         # if os.name == 'nt' and address == '0.0.0.0':
         #     address = '127.0.0.1'
@@ -371,17 +454,26 @@ async def mixlab_workflow_hander(request):
                     'file_path':file_path
                 }
             elif data['task']=='save_app':
-                file_path=save_workflow_for_app(data['data'],data['filename'])
+                category=""
+                if "category" in data:
+                    category=data['category']
+                file_path=save_workflow_for_app(data['data'],data['filename'],category)
                 result={
                     'status':'success',
                     'file_path':file_path
                 }
             elif data['task']=='my_app':
                 filename=None
+                category=""
+                admin=False
                 if 'filename' in data:
                     filename=data['filename']
+                if 'category' in data:
+                    category=data['category']
+                if 'admin' in data:
+                    admin=data['admin']
                 result={
-                    'data':get_my_workflow_for_app(filename),
+                    'data':get_my_workflow_for_app(filename,category,admin),
                     'status':'success',
                 }
             elif data['task']=='list':
@@ -437,8 +529,8 @@ PromptServer.add_routes=new_add_routes
 
 
 # 导入节点
-from .nodes.PromptNode import RandomPrompt,PromptSlide
-from .nodes.ImageNode import NoiseImage,TransparentImage,LoadImagesFromPath,LoadImagesFromURL,ResizeImage,TextImage,SvgImage,Image3D,ShowLayer,NewLayer,MergeLayers,AreaToMask,SmoothMask,FeatheredMask,SplitLongMask,ImageCropByAlpha,EnhanceImage,FaceToMask
+from .nodes.PromptNode import RandomPrompt,PromptSlide,PromptSimplification,PromptImage
+from .nodes.ImageNode import ImageColorTransfer,NoiseImage,TransparentImage,GradientImage,LoadImagesFromPath,LoadImagesFromURL,ResizeImage,TextImage,SvgImage,Image3D,ShowLayer,NewLayer,MergeLayers,AreaToMask,SmoothMask,FeatheredMask,SplitLongMask,ImageCropByAlpha,EnhanceImage,FaceToMask
 from .nodes.Vae import VAELoader,VAEDecode
 from .nodes.ScreenShareNode import ScreenShareNode,FloatingVideo
 from .nodes.Clipseg import CLIPSeg,CombineMasks
@@ -446,6 +538,7 @@ from .nodes.ChatGPT import ChatGPTNode,ShowTextForGPT,CharacterInText
 from .nodes.Audio import GamePal,SpeechRecognition,SpeechSynthesis
 from .nodes.Utils import AppInfo,IntNumber,FloatSlider,TextInput,ColorInput,FontInput,TextToNumber,DynamicDelayProcessor,LimitNumber,SwitchByIndex,GetImageSize_,MultiplicationNode
 from .nodes.Lama import LaMaInpainting
+from .nodes.ClipInterrogator import ClipInterrogator
 
 # 要导出的所有节点及其名称的字典
 # 注意：名称应全局唯一
@@ -453,7 +546,11 @@ NODE_CLASS_MAPPINGS = {
     "AppInfo":AppInfo,
     "RandomPrompt":RandomPrompt,
     "PromptSlide":PromptSlide,
+    "PromptSimplification":PromptSimplification,
+    "PromptImage":PromptImage,
+    "ClipInterrogator":ClipInterrogator,
     "NoiseImage":NoiseImage,
+    "GradientImage":GradientImage,
     "TransparentImage":TransparentImage,
     "ResizeImageMixlab":ResizeImage,
     "LoadImagesFromPath":LoadImagesFromPath,
@@ -462,6 +559,7 @@ NODE_CLASS_MAPPINGS = {
     "EnhanceImage":EnhanceImage,
     "SvgImage":SvgImage,
     "3DImage":Image3D, 
+    "ImageColorTransfer":ImageColorTransfer,
     "ShowLayer":ShowLayer,
     "NewLayer":NewLayer,
     "MergeLayers":MergeLayers,

data/Product-designer.txt

@@ -0,0 +1,30 @@
+Jony Ive
+Dieter Rams
+Philippe Starck
+Karim Rashid
+Yves Béhar
+Marc Newson
+Naoto Fukasawa
+Jonathan Adler
+Patricia Urquiola
+Ross Lovegrove
+Tom Dixon
+Jasper Morrison
+Charles Eames
+Ray Eames
+Achille Castiglioni
+Ron Arad
+Konstantin Grcic
+Marcel Wanders
+Maarten Baas
+Stefan Sagmeister
+Ingo Maurer
+Hella Jongerius
+Sam Hecht
+Kim Colin
+Jaime Hayon
+Michael Anastassiades
+Nendo
+Oki Sato
+Matali Crasset
+Tokujin Yoshioka

data/extension-node-map.json

@@ -4774,6 +4774,7 @@
             "Color",
             "CombineMasks_",
             "EnhanceImage",
+            "GradientImage",
             "FaceToMask",
             "FeatheredMask",
             "FloatingVideo",
@@ -4785,6 +4786,8 @@
             "NewLayer",
             "RandomPrompt",
             "PromptSlide",
+            "PromptSimplification",
+            "ClipInterrogator",
             "ScreenShare",
             "ShowLayer",
             "ShowTextForGPT",

nodes/ChatGPT.py

@@ -180,8 +180,9 @@ class ShowTextForGPT:
     CATEGORY = "♾️Mixlab/GPT"
 
     def run(self, text):
-        # print(session_history)
+        # print(text)
         return {"ui": {"text": text}, "result": (text,)}
+        
 
 
 class CharacterInText:

nodes/ClipInterrogator.py

@@ -0,0 +1,228 @@
+import os
+import folder_paths
+
+from PIL import Image
+import comfy.utils
+import numpy as np
+import json
+import torch
+import random
+
+from transformers import AutoProcessor, BlipForConditionalGeneration
+
+from clip_interrogator import Config, Interrogator
+
+def load_caption_model(model_path,config,t='blip-base'):
+    dtype=torch.float16 if config.device == 'cuda' else torch.float32
+    caption_model = BlipForConditionalGeneration.from_pretrained(model_path, torch_dtype=dtype)
+    
+    caption_processor = AutoProcessor.from_pretrained(model_path)
+
+    caption_model.eval()
+    if not config.caption_offload:
+        caption_model = caption_model.to(config.device)
+    
+    return (caption_model,caption_processor)
+    
+
+
+caption_model_path=os.path.join(folder_paths.models_dir, "clip_interrogator/Salesforce/blip-image-captioning-base")
+if not os.path.exists(caption_model_path):
+    print(f"## clip_interrogator_model not found: {caption_model_path}, pls download from https://huggingface.co/Salesforce/blip-image-captioning-base")
+
+cache_path=os.path.join(folder_paths.models_dir, "clip_interrogator")
+
+
+
+# Tensor to PIL
+def tensor2pil(image):
+    return Image.fromarray(np.clip(255. * image.cpu().numpy().squeeze(), 0, 255).astype(np.uint8))
+
+# Convert PIL to Tensor
+def pil2tensor(image):
+    return torch.from_numpy(np.array(image).astype(np.float32) / 255.0).unsqueeze(0)
+
+
+def image_analysis_fn(ci,image):
+    image = image.convert('RGB')
+    image_features = ci.image_to_features(image)
+
+    top_mediums = ci.mediums.rank(image_features, 5)
+    top_artists = ci.artists.rank(image_features, 5)
+    top_movements = ci.movements.rank(image_features, 5)
+    top_trendings = ci.trendings.rank(image_features, 5)
+    top_flavors = ci.flavors.rank(image_features, 5)
+
+    medium_ranks = {medium: sim for medium, sim in zip(top_mediums, ci.similarities(image_features, top_mediums))}
+    artist_ranks = {artist: sim for artist, sim in zip(top_artists, ci.similarities(image_features, top_artists))}
+    movement_ranks = {movement: sim for movement, sim in zip(top_movements, ci.similarities(image_features, top_movements))}
+    trending_ranks = {trending: sim for trending, sim in zip(top_trendings, ci.similarities(image_features, top_trendings))}
+    flavor_ranks = {flavor: sim for flavor, sim in zip(top_flavors, ci.similarities(image_features, top_flavors))}
+    
+    return {
+        "medium_ranks":medium_ranks, 
+        "artist_ranks":artist_ranks, 
+        "movement_ranks":movement_ranks, 
+        "trending_ranks":trending_ranks, 
+        "flavor_ranks":flavor_ranks
+        }
+
+
+def generate_sentences(data):
+    sentences = []
+
+    # Get the length of data
+    data_length = len(data)
+
+    # Use a recursive function to handle variable-length data
+    def generate_recursive(index, current_sentence, current_score):
+        # Check if recursion is complete
+        if index == data_length:
+            sentences.append({"sentence": current_sentence, "score": current_score})
+            return
+
+        # Get the current level data
+        current_data = data[index]
+
+        # Iterate through the current level data
+        for phrase in current_data:
+            sentence = current_sentence + ("," if current_sentence.strip() else "") + phrase
+            score = current_score + current_data[phrase]
+            generate_recursive(index + 1, sentence, score)
+
+    # Start recursive generation of sentences
+    generate_recursive(0, "", 0)
+
+    # Sort the generated sentences by score in descending order
+    sentences.sort(key=lambda x: x["score"], reverse=True)
+
+    def get_random_elements(elements, num):
+        return random.sample(elements, num)
+
+    ps = get_random_elements(sentences, 5)
+    ps = [s["sentence"] for s in sorted(ps, key=lambda x: x["score"], reverse=True)]
+
+    return ps
+
+
+
+
+def image_to_prompt(ci,image, mode):
+    ci.config.chunk_size = 2048 if ci.config.clip_model_name == "ViT-L-14/openai" else 1024
+    ci.config.flavor_intermediate_count = 2048 if ci.config.clip_model_name == "ViT-L-14/openai" else 1024
+    image = image.convert('RGB')
+    if mode == 'best':
+        return ci.interrogate(image)
+    elif mode == 'classic':
+        return ci.interrogate_classic(image)
+    elif mode == 'fast':
+        return ci.interrogate_fast(image)
+    elif mode == 'negative':
+        return ci.interrogate_negative(image)
+
+# image = Image.open(image_path).convert('RGB')
+# ci = Interrogator(Config(clip_model_name="ViT-L-14/openai"))
+# print(ci.interrogate(image))
+
+
+class ClipInterrogator:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": {
+            "image": ("IMAGE",),
+            "prompt_mode": (['fast','classic','best','negative'],),
+            "image_analysis": (["off","on"],), 
+                             },
+
+                # "optional":{
+                #     "output":("CLIPINTERROGATOR", {"multiline": True,"default": "", "dynamicPrompts": False})
+                # },
+
+                }
+    
+    RETURN_TYPES = ("STRING","STRING",)
+    RETURN_NAMES = ("prompt","random_samples",)
+
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/prompt"
+    OUTPUT_NODE = True
+    INPUT_IS_LIST = True
+    OUTPUT_IS_LIST = (True,True,)
+    global ci
+    ci = None
+    def run(self,image,prompt_mode,image_analysis):
+        global ci
+
+        prompt_mode=prompt_mode[0]
+        analysis=image_analysis[0]
+
+        prompt_result=[]
+        analysis_result=[]
+
+        # 进度条
+        pbar = comfy.utils.ProgressBar(len(image)*(2 if analysis=='on' else 1))
+        
+        if ci==None:
+            config=Config(
+                clip_model_name="ViT-L-14/openai",
+                device="cuda" if torch.cuda.is_available() else "cpu",
+                download_cache=True,
+                clip_model_path=cache_path,
+                cache_path=cache_path
+                )
+            config.apply_low_vram_defaults()
+
+            caption_model,caption_processor=load_caption_model(caption_model_path,config)
+
+            config.caption_model= caption_model
+            config.caption_processor= caption_processor
+
+            ci = Interrogator(config)
+        # else:
+        #     simple_lama.model.to("cuda" if torch.cuda.is_available() else "cpu")
+
+        for i in range(len(image)):
+            im=image[i]
+
+            im=tensor2pil(im)
+            im=im.convert('RGB')
+
+            if analysis=='on':
+                analysis_res=image_analysis_fn(ci,im)
+                analysis_result.append( analysis_res )
+                pbar.update(1)
+
+            prompt=image_to_prompt(ci,im,prompt_mode)
+            pbar.update(1)
+            prompt_result.append(prompt)
+
+
+        # result.save("inpainted.png")
+        if ci.config.clip_offload and not ci.clip_offloaded:
+            ci.clip_model = ci.clip_model.to('cpu')
+            ci.clip_offloaded = True
+
+        if ci.config.caption_offload and not ci.caption_offloaded:
+            ci.caption_model = ci.caption_model.to('cpu')
+            ci.caption_offloaded = True
+
+        # analysis_result=[]
+        # items = app.graph.getNodeById(31).widgets[2].value["items"]
+        
+        random_samples=[]
+
+        for r in analysis_result:
+            random_sample = generate_sentences([r['medium_ranks'], r['artist_ranks'],r['movement_ranks'],r['trending_ranks'],r['flavor_ranks']])
+            for s in random_sample:
+                random_samples.append(s)
+        # print(len(random_samples))
+        # print('-----')
+        # print( random_samples)
+        return {
+            "ui":{
+                    "prompt": prompt_result,
+                    "analysis":analysis_result,
+                    "random_samples":random_samples
+                },
+            "result": (prompt_result,random_samples,)}

nodes/ImageNode.py

@@ -1,6 +1,7 @@
 import numpy as np
 import requests
 import torch
+# from PIL import Image, ImageDraw
 from PIL import Image, ImageOps,ImageFilter,ImageEnhance,ImageDraw,ImageSequence, ImageFont
 from PIL.PngImagePlugin import PngInfo
 import base64,os,random
@@ -9,7 +10,7 @@ import folder_paths
 import json,io
 from comfy.cli_args import args
 import cv2 
-
+import math
 from .Watcher import FolderWatcher
 
 
@@ -26,6 +27,52 @@ def pil2tensor(image):
     return torch.from_numpy(np.array(image).astype(np.float32) / 255.0).unsqueeze(0)
 
 
+# 颜色迁移
+# Color-Transfer-between-Images https://github.com/chia56028/Color-Transfer-between-Images/blob/master/color_transfer.py
+
+def get_mean_and_std(x):
+	x_mean, x_std = cv2.meanStdDev(x)
+	x_mean = np.hstack(np.around(x_mean,2))
+	x_std = np.hstack(np.around(x_std,2))
+	return x_mean, x_std
+
+def color_transfer(source,target):
+	# sources = ['s1','s2','s3','s4','s5','s6']
+	# targets = ['t1','t2','t3','t4','t5','t6']
+
+     # 将PIL的Image类型转换为OpenCV的numpy数组
+    source = cv2.cvtColor(np.array(source), cv2.COLOR_RGB2LAB)
+    target = cv2.cvtColor(np.array(target), cv2.COLOR_RGB2LAB)
+
+    s_mean, s_std = get_mean_and_std(source)
+    t_mean, t_std = get_mean_and_std(target)
+
+    height, width, channel = source.shape
+	
+    for i in range(0,height):
+        for j in range(0,width):
+            for k in range(0,channel):
+                x = source[i,j,k]
+                x = ((x-s_mean[k])*(t_std[k]/s_std[k]))+t_mean[k]
+				# round or +0.5
+                x = round(x)
+				# boundary check
+                x = 0 if x<0 else x
+                x = 255 if x>255 else x
+                source[i,j,k] = x
+    
+    source = cv2.cvtColor(source,cv2.COLOR_LAB2RGB)
+ 
+    # 创建PIL图像对象
+    image_pil = Image.fromarray(source)
+    
+    return image_pil
+
+
+
+
+
+
 def naive_cutout(img, mask,invert=True):
     """
     Perform a simple cutout operation on an image using a mask.
@@ -155,6 +202,54 @@ def get_not_transparent_area(image):
     return (x, y, w, h)
 
 
+
+
+def generate_gradient_image(width, height, start_color_hex, end_color_hex):
+    image = Image.new('RGBA', (width, height))
+    draw = ImageDraw.Draw(image)
+
+    if len(start_color_hex) == 7:
+        start_color_hex += "FF"
+    if len(end_color_hex) == 7:
+        end_color_hex += "FF"
+
+    start_color_hex = start_color_hex.lstrip("#")
+    end_color_hex = end_color_hex.lstrip("#")
+
+    # 将十六进制颜色代码转换为RGBA元组，包括透明度
+    start_color = tuple(int(start_color_hex[i:i+2], 16) for i in (0, 2, 4, 6))
+    end_color = tuple(int(end_color_hex[i:i+2], 16) for i in (0, 2, 4, 6))
+
+    for y in range(height):
+        # 计算当前行的颜色
+        r = int(start_color[0] + (end_color[0] - start_color[0]) * y / height)
+        g = int(start_color[1] + (end_color[1] - start_color[1]) * y / height)
+        b = int(start_color[2] + (end_color[2] - start_color[2]) * y / height)
+        a = int(start_color[3] + (end_color[3] - start_color[3]) * y / height)
+
+        # 绘制当前行的渐变色
+        draw.line((0, y, width, y), fill=(r, g, b, a))
+
+    # Create a mask from the image's alpha channel
+    mask = image.split()[-1]
+
+    # Convert the mask to a black and white image
+    mask = mask.convert('L')
+
+    image=image.convert('RGB')
+
+    return (image, mask)
+
+# 示例用法
+# width = 500
+# height = 200
+# start_color_hex = 'FF0000FF'  # 红色，完全不透明
+# end_color_hex = '0000FFFF'  # 蓝色，完全不透明
+
+# gradient_image = generate_gradient_image(width, height, start_color_hex, end_color_hex)
+# gradient_image.save('gradient_image.png')
+
+
 # 读取不了分层
 def load_psd(image):
     layers=[]
@@ -467,26 +562,44 @@ def merge_images(bg_image, layer_image, mask, x, y, width, height, scale_option)
     return bg_image
 
 
-def resize_image(layer_image,scale_option,width,height):
+# TODO 几个像素点的底
+def resize_image(layer_image, scale_option, width, height,color="white"):
     layer_image = layer_image.convert("RGB")
+    original_width, original_height = layer_image.size
+    
     if scale_option == "height":
-        # 按照高度比例缩放
-        original_width, original_height = layer_image.size
+        # Scale image based on height
         scale = height / original_height
         new_width = int(original_width * scale)
         layer_image = layer_image.resize((new_width, height))
+        
     elif scale_option == "width":
-        # 按照宽度比例缩放
-        original_width, original_height = layer_image.size
+        # Scale image based on width
         scale = width / original_width
         new_height = int(original_height * scale)
         layer_image = layer_image.resize((width, new_height))
+        
     elif scale_option == "overall":
-        # 整体缩放
+        # Scale image overall
         layer_image = layer_image.resize((width, height))
+        
+    elif scale_option == "center":
+        # Scale image to minimum of width and height, center it, and fill extra area with black
+        scale = min(width / original_width, height / original_height)
+        new_width = math.ceil(original_width * scale)
+        new_height = math.ceil(original_height * scale)
+        resized_image = Image.new("RGB", (width, height), color=color)
+        resized_image.paste(layer_image.resize((new_width, new_height)), ((width - new_width) // 2, (height - new_height) // 2))
+        resized_image = resized_image.convert("RGB")
+        return resized_image
+    
     return layer_image
 
 
+
+
+
+
 # def generate_text_image(text_list, font_path, font_size, text_color, vertical=True, spacing=0):
 #     # Load Chinese font
 #     font = ImageFont.truetype(font_path, font_size)
@@ -526,8 +639,7 @@ def resize_image(layer_image,scale_option,width,height):
 #     image=image.convert('RGB')
 
 #     return (image,alpha_image)
-
-def generate_text_image(text, font_path, font_size, text_color, vertical=True, spacing=0):
+def generate_text_image(text, font_path, font_size, text_color, vertical=True, stroke=False, stroke_color=(0, 0, 0), stroke_width=1, spacing=0):
     # Split text into lines based on line breaks
     lines = text.split("\n")
 
@@ -543,19 +655,17 @@ def generate_text_image(text, font_path, font_size, text_color, vertical=True, s
         x = 0
         y = 0
         for i in range(len(lines)):
-            line=lines[i]
+            line = lines[i]
             for char in line:
                 char_coordinates.append((x, y))
                 y += font_size + spacing
             x += font_size + spacing
             y = 0
-        # print(char_coordinates)
     else:
         x = 0
         y = 0
         for line in lines:
             for char in line:
-                #print('char',char)
                 char_coordinates.append((x, y))
                 x += font_size + spacing
             y += font_size + spacing
@@ -564,35 +674,42 @@ def generate_text_image(text, font_path, font_size, text_color, vertical=True, s
     # 3. Calculate image width and height
     if layout == "vertical":
         width = (len(lines) * (font_size + spacing)) - spacing
-        height = ((len(max(lines, key=len))+1) * (font_size + spacing)) + spacing
+        height = ((len(max(lines, key=len)) + 1) * (font_size + spacing)) + spacing
     else:
         width = (len(max(lines, key=len)) * (font_size + spacing)) - spacing
-        height = ((len(lines)-1) * (font_size + spacing)) + font_size
+        height = ((len(lines) - 1) * (font_size + spacing)) + font_size
 
     # 4. Draw each character on the image
-    image = Image.new('RGBA', (width, height), (255, 255, 255,0))
+    image = Image.new('RGBA', (width, height), (255, 255, 255, 0))
     draw = ImageDraw.Draw(image)
     font = ImageFont.truetype(font_path, font_size)
-    
-    index=0
+
+    index = 0
     for i, line in enumerate(lines):
         for j, char in enumerate(line):
             x, y = char_coordinates[index]
+            
+            if stroke:
+                draw.text((x-stroke_width, y), char, font=font, fill=stroke_color)
+                draw.text((x+stroke_width, y), char, font=font, fill=stroke_color)
+                draw.text((x, y-stroke_width), char, font=font, fill=stroke_color)
+                draw.text((x, y+stroke_width), char, font=font, fill=stroke_color)
+            
             draw.text((x, y), char, font=font, fill=text_color)
-            index+=1
+            index += 1
 
-    # image.save(output_image_path)
-
-    # 分离alpha通道
+    # Separate alpha channel
     alpha_channel = image.split()[3]
 
-    # 创建一个只有alpha通道的新图像
+    # Create a new image with only the alpha channel
     alpha_image = Image.new('L', image.size)
     alpha_image.putdata(alpha_channel.getdata())
 
-    image=image.convert('RGB')
+    image = image.convert('RGB')
+
+    return (image, alpha_image)
+
 
-    return (image,alpha_image)
 
 def base64_to_image(base64_string):
     # 去除前缀
@@ -863,7 +980,10 @@ class TransparentImage:
         # result 里输出给下个节点的数据 
         # print('TransparentImage',len(images_rgb))
         return {"ui":{"images": ui_images,"image_paths":image_paths},"result": (image_paths,images_rgb,images_rgba)}
-        
+
+
+
+
 
 class EnhanceImage:
     @classmethod
@@ -885,20 +1005,27 @@ class EnhanceImage:
 
     CATEGORY = "♾️Mixlab/image"
 
-    INPUT_IS_LIST = False
+    INPUT_IS_LIST = True
 
-    OUTPUT_IS_LIST = (False,)
+    OUTPUT_IS_LIST = (True,)
   
     # 运行的函数
     def run(self,image,contrast):
-        # print('EnhanceImage',image.shape)
-        image=tensor2pil(image)
-     
-        image=enhance_depth_map(image,contrast)
+        # print('EnhanceImage',len(image),image[0].shape)
+        contrast=contrast[0]
+        res=[]
+        for ims in image:
+            for im in ims:
 
-        image=pil2tensor(image)
+                image=tensor2pil(im)
+            
+                image=enhance_depth_map(image,contrast)
+
+                image=pil2tensor(image)
+
+                res.append(image)
            
-        return (image,)
+        return (res,)
 
 
 
@@ -996,7 +1123,7 @@ class LoadImagesFromPath:
             print("发生了一个未知的错误：", str(e))
 
         # print('#prompt::::',prompt)
-        return (imgs,masks,prompt,)
+        return  {"ui": {"seed": [1]}, "result":(imgs,masks,prompt,)}
 
 
 # TODO 扩大选区的功能,重新输出mask
@@ -1058,6 +1185,7 @@ class TextImage:
                                 }), 
                     "text_color":("STRING",{"multiline": False,"default": "#000000","dynamicPrompts": False}),
                     "vertical":("BOOLEAN", {"default": True},),
+                    "stroke":("BOOLEAN", {"default": False},),
                              },
                 }
     
@@ -1071,11 +1199,11 @@ class TextImage:
     INPUT_IS_LIST = False
     OUTPUT_IS_LIST = (False,False,)
 
-    def run(self,text,font_path,font_size,spacing,text_color,vertical):
+    def run(self,text,font_path,font_size,spacing,text_color,vertical,stroke):
         
         # text_list=list(text)
-
-        img,mask=generate_text_image(text,font_path,font_size,text_color,vertical,spacing)
+        # stroke=False, stroke_color=(0, 0, 0), stroke_width=1, spacing=0
+        img,mask=generate_text_image(text,font_path,font_size,text_color,vertical,stroke,(0, 0, 0),1,spacing)
         
         img=pil2tensor(img)
         mask=pil2tensor(mask)
@@ -1526,7 +1654,7 @@ class MergeLayers:
 
                 }
     
-    RETURN_TYPES = ("IMAGE",)
+    RETURN_TYPES = ("IMAGE","MASK",)
     # RETURN_NAMES = ("WIDTH","HEIGHT","X","Y",)
 
     FUNCTION = "run"
@@ -1552,7 +1680,10 @@ class MergeLayers:
                 bg_image=tensor2pil(bg_image)
                 # 按z-index排序
                 layers_new = sorted(layers, key=lambda x: x["z_index"])
-            
+                
+                width, height = bg_image.size
+                final_mask= Image.new('L', (width, height), 0)
+
                 for layer in layers_new:
                     image=layer['image']
                     mask=layer['mask']
@@ -1578,24 +1709,105 @@ class MergeLayers:
                                         layer['scale_option']
                                         )
                     
-                mask=bg_image.convert('RGBA')
-                mask=pil2tensor(mask)
+                    final_mask=merge_images(final_mask,
+                                        layer_mask.convert('RGB'),
+                                        layer_mask,
+                                        layer['x'],
+                                        layer['y'],
+                                        layer['width'],
+                                        layer['height'],
+                                        layer['scale_option']
+                                        )
+                    
+                    final_mask=final_mask.convert('L')
+                    
+                # mask=bg_image.convert('RGBA')
+                final_mask=pil2tensor(final_mask)
                 
                 bg_image=bg_image.convert('RGB')
                 bg_image=pil2tensor(bg_image)
 
-                channels = ["red", "green", "blue", "alpha"]
-                # print(mask,mask.shape)
-                mask = mask[:, :, :, channels.index("green")]
-
                 bg_images.append(bg_image)
-                masks.append(mask)
+                masks.append(final_mask)
         
         bg_images=torch.cat(bg_images, dim=0)
         masks=torch.cat(masks, dim=0)
         return (bg_images,masks,)
     
 
+class GradientImage:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": {
+                "width": ("INT",{
+                    "default": 512, 
+                    "min": 1, # 最小值
+                    "max": 8192, # 最大值
+                    "step": 1, # 间隔
+                    "display": "number" # 控件类型： 输入框 number、滑块 slider
+                }),
+                "height": ("INT",{
+                    "default": 512, 
+                    "min": 1,
+                    "max": 8192,
+                    "step": 1,
+                    "display": "number"
+                }),
+                "start_color_hex": ("STRING",{"multiline": False,"default": "#FFFFFF","dynamicPrompts": False}),
+                "end_color_hex": ("STRING",{"multiline": False,"default": "#000000","dynamicPrompts": False}),
+                },
+                }
+    
+    # 输出的数据类型
+    RETURN_TYPES = ("IMAGE","MASK",)
+
+    # 运行时方法名称
+    FUNCTION = "run"
+
+    # 右键菜单目录
+    CATEGORY = "♾️Mixlab/image"
+
+    # 输入是否为列表
+    INPUT_IS_LIST = False
+
+    # 输出是否为列表
+    OUTPUT_IS_LIST = (False,False,)
+
+    def run(self,width,height,start_color_hex, end_color_hex):
+
+        im,mask=generate_gradient_image(width, height, start_color_hex, end_color_hex)
+
+        #获取临时目录：temp
+        output_dir = folder_paths.get_temp_directory()
+
+        (
+            full_output_folder,
+            filename,
+            counter,
+            subfolder,
+            _,
+        ) = folder_paths.get_save_image_path('tmp_', output_dir)
+        
+        image_file = f"{filename}_{counter:05}.png"
+
+        image_path=os.path.join(full_output_folder, image_file)
+        # 保存图片
+        im.save(image_path,compress_level=6)
+
+        # 把PIL数据类型转为tensor
+        im=pil2tensor(im)
+
+        mask=pil2tensor(mask)
+
+        # 定义ui字段，数据将回传到web前端的 nodeType.prototype.onExecuted
+        # result是节点的输出
+        return {"ui":{"images": [{
+                "filename": image_file,
+                "subfolder": subfolder,
+                "type":"temp"
+            }]},"result": (im,mask,)}
+
+
 
 class NoiseImage:
     @classmethod
@@ -1692,13 +1904,14 @@ class ResizeImage:
                     "step": 1, #Slider's step
                     "display": "number" # Cosmetic only: display as "number" or "slider"
                 }),
-                "scale_option": (["width","height",'overall'],),
+                "scale_option": (["width","height",'overall','center'],),
 
                              },
 
             "optional":{
                     "image": ("IMAGE",),
                     "average_color": (["on",'off'],),
+                    "fill_color":("STRING",{"multiline": False,"default": "#FFFFFF","dynamicPrompts": False}),
             }
                 }
     
@@ -1712,12 +1925,13 @@ class ResizeImage:
     INPUT_IS_LIST = True
     OUTPUT_IS_LIST = (True,True,)
 
-    def run(self,width,height,scale_option,image=None,average_color=['on']):
+    def run(self,width,height,scale_option,image=None,average_color=['on'],fill_color=["#FFFFFF"]):
         
         w=width[0]
         h=height[0]
         scale_option=scale_option[0]
         average_color=average_color[0]
+        fill_color=fill_color[0]
 
         imgs=[]
         average_images=[]
@@ -1734,7 +1948,7 @@ class ResizeImage:
         else:
             for im in image:
                 im=tensor2pil(im)
-                im=resize_image(im,scale_option,w,h)
+                im=resize_image(im,scale_option,w,h,fill_color)
                 im=im.convert('RGB')
 
                 a_im=get_average_color_image(im)
@@ -1745,4 +1959,50 @@ class ResizeImage:
                 a_im=pil2tensor(a_im)
                 average_images.append(a_im)
         
-        return (imgs,average_images,)
+        return (imgs,average_images,)
+    
+
+
+
+class ImageColorTransfer:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": {
+                "source": ("IMAGE",),
+                "target": ("IMAGE",),
+                },
+                }
+    
+    # 输出的数据类型
+    RETURN_TYPES = ("IMAGE",)
+
+    # 运行时方法名称
+    FUNCTION = "run"
+
+    # 右键菜单目录
+    CATEGORY = "♾️Mixlab/_test"
+
+    # 输入是否为列表
+    INPUT_IS_LIST = True
+
+    # 输出是否为列表
+    OUTPUT_IS_LIST = (True,)
+
+    def run(self,source,target):
+
+        res=[]
+
+        target=target[0][0]
+        print(target.shape)
+        target=tensor2pil(target)
+
+        for ims in source:
+            for im in ims:
+                image=tensor2pil(im)
+                image=color_transfer(image,target)
+                image=pil2tensor(image)
+                res.append(image)
+
+        return (res,)
+
+

nodes/PromptNode.py

@@ -1,9 +1,11 @@
 import random
 import comfy.utils
-import json
+import os
+import numpy as np
 from urllib import request, parse
-
-
+import folder_paths
+from PIL import Image, ImageOps,ImageFilter,ImageEnhance,ImageDraw,ImageSequence, ImageFont
+from PIL.PngImagePlugin import PngInfo
 # def queue_prompt(prompt_workflow):
 #     p = {"prompt": prompt_workflow}
 #     data = json.dumps(p).encode('utf-8')
@@ -45,12 +47,171 @@ default_prompt1='''Swing
 default_prompt1="\n".join([p.strip() for p in default_prompt1.split('\n') if p.strip()!=''])
 
 
+def tensor2pil(image):
+    return Image.fromarray(np.clip(255. * image.cpu().numpy().squeeze(), 0, 255).astype(np.uint8))
+
 def addWeight(text, weight=1):
     if weight == 1:
         return text
     else:
         return f"({text}:{round(weight,2)})"
 
+def prompt_delete_words(sentence, new_words_length):
+    # 使用逗号分割句子，并去除空格
+    words = [word.strip() for word in sentence.split(",")]
+    
+    # 计算需要删除的单词数量
+    num_to_delete = len(words) - new_words_length
+    
+    words_to=[w for w in words]
+
+    # 逐个删除单词并存储在新列表中
+    new_words = []
+    for i in range(len(words)):
+        if num_to_delete > 0:
+            num_to_delete -= 1
+        else:
+            words_to.pop()
+            if len(words_to)>0:
+                new_words.append(", ".join(words_to))
+         
+    return new_words
+
+# # 测试方法
+# sentence = "a computer, a glass tablet with a keyboard on a dark background, 3d illustration, reflection, cgi 8k, clear glass, archaic, cut-away, white outline"
+# new_words_length = 5
+# result = prompt_delete_words(sentence, new_words_length)
+# print(result)
+
+class PromptImage:
+    def __init__(self):
+        self.output_dir = folder_paths.get_output_directory()
+        self.type = "output"
+        self.prefix_append = "PromptImage"
+        self.compress_level = 4
+
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                "prompts": ("STRING", 
+                         {
+                            "multiline": True, 
+                            "default": '',
+                            "dynamicPrompts": False
+                          }),
+
+                "images": ("IMAGE",{"default": None}), 
+                 "save_to_image": (["enable", "disable"],),
+                }
+            }
+    
+    RETURN_TYPES = ()
+   
+    OUTPUT_NODE = True
+
+    INPUT_IS_LIST = True
+
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/prompt"
+
+    # 运行的函数
+    def run(self,prompts,images,save_to_image):
+        filename_prefix="mixlab_"
+        filename_prefix += self.prefix_append
+        full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(
+            filename_prefix, self.output_dir, images[0].shape[1], images[0].shape[0])
+        
+        results = list()
+
+        save_to_image=save_to_image[0]=='enable'
+
+        for index in range(len(images)):
+            res=[]
+            imgs=images[index]
+
+            for image in imgs:
+                img=tensor2pil(image)
+
+                metadata = None
+                if save_to_image:
+                    metadata = PngInfo()
+                    prompt_text=prompts[index]
+                    if prompt_text is not None:
+                        metadata.add_text("prompt_text", prompt_text)
+                    
+                file = f"{filename}_{index}_{counter:05}_.png"
+                img.save(os.path.join(full_output_folder, file), pnginfo=metadata, compress_level=self.compress_level)
+                res.append({
+                    "filename": file,
+                    "subfolder": subfolder,
+                    "type": self.type
+                })
+                counter += 1
+            results.append(res)
+        
+        return { "ui": { "_images": results,"prompts":prompts } }
+
+
+
+
+class PromptSimplification:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                "prompt": ("STRING", 
+                         {
+                            "multiline": True, 
+                            "default": '',
+                            "dynamicPrompts": False
+                          }),
+
+                "length":("INT", {"default": 5, "min": 1,"max":100, "step": 1, "display": "number"}),
+
+                # "min_value":("FLOAT", {
+                #         "default": -2, 
+                #         "min": -10, 
+                #         "max": 0xffffffffffffffff,
+                #         "step": 0.01, 
+                #         "display": "number"  
+                #     }),
+                # "max_value":("FLOAT", {
+                #         "default": 2, 
+                #         "min": -10, 
+                #         "max": 0xffffffffffffffff,
+                #         "step": 0.01, 
+                #         "display": "number"  
+                #     }),
+              
+                }
+            }
+    
+    RETURN_TYPES = ("STRING",)
+    RETURN_NAMES = ("prompts",)
+
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/prompt"
+
+    INPUT_IS_LIST = True
+    OUTPUT_IS_LIST = (True,)
+    OUTPUT_NODE = True
+
+    # 运行的函数
+    def run(self,prompt,length):
+        length=length[0]
+        result=[]
+        for p in prompt:
+            nps=prompt_delete_words(p,length)
+            for n in nps:
+                result.append(n)
+
+        result= [elem.strip() for elem in result if elem.strip()]
+
+        return {"ui": {"prompts": result}, "result": (result,)}
+
 
 
 class PromptSlide:
@@ -187,6 +348,8 @@ class RandomPrompt:
         else:
             prompts = prompts[:min(max_count,len(prompts))]
 
+        prompts= [elem.strip() for elem in prompts if elem.strip()]
+
         # return (new_prompt)
         return {"ui": {"prompts": prompts}, "result": (prompts,)}
 

nodes/Utils.py

@@ -34,13 +34,13 @@ def create_temp_file(image):
         ) = folder_paths.get_save_image_path('tmp', output_dir)
 
     
-    image=tensor2pil(image)
+    im=tensor2pil(image)
  
     image_file = f"{filename}_{counter:05}.png"
      
     image_path=os.path.join(full_output_folder, image_file)
 
-    image.save(image_path,compress_level=4)
+    im.save(image_path,compress_level=4)
 
     return [{
                 "filename": image_file,
@@ -79,6 +79,16 @@ font_files = get_font_files(r_directory)
 # print(font_files)
 
 
+def flatten_list(nested_list):
+    flat_list = []
+    for item in nested_list:
+        if isinstance(item, list):
+            flat_list.extend(flatten_list(item))
+        else:
+            flat_list.append(item)
+    return flat_list
+
+
 class ColorInput:
     @classmethod
     def INPUT_TYPES(s):
@@ -178,7 +188,7 @@ class FloatSlider:
                     "number":("FLOAT", {
                         "default": 0, 
                         "min": 0, #Minimum value
-                        "max": 1, #Maximum value
+                        "max": 0xffffffffffffffff, #Maximum value
                         "step": 0.001, #Slider's step
                         "display": "slider" # Cosmetic only: display as "number" or "slider"
                     }),
@@ -215,12 +225,13 @@ class FloatSlider:
     INPUT_IS_LIST = False
     OUTPUT_IS_LIST = (False,)
 
-    def run(self,number,min_value,max_value,step):
+    def run(self, number, min_value, max_value, step):
         if number < min_value:
-            number= min_value
+            number = min_value
         elif number > max_value:
-            number= max_value
-        return (number,)
+            number = max_value
+        scaled_number = (number - min_value) / (max_value - min_value)
+        return (scaled_number,)
     
   
 class IntNumber:
@@ -252,7 +263,7 @@ class IntNumber:
                             "default": 1, 
                             "min": -0xffffffffffffffff,
                             "max": 0xffffffffffffffff,
-                            "step":1, 
+                            "step":1,
                             "display": "number"  
                         }),
                              },
@@ -423,12 +434,12 @@ class AppInfo:
     def INPUT_TYPES(s):
         return {"required": { 
                     "name": ("STRING",{"multiline": False,"default": "Mixlab-App","dynamicPrompts": False}),
-                    "image": ("IMAGE",),
                     "input_ids":("STRING",{"multiline": True,"default": "\n".join(["1","2","3"]),"dynamicPrompts": False}),
                     "output_ids":("STRING",{"multiline": True,"default": "\n".join(["5","9"]),"dynamicPrompts": False}),
                              },
 
                 "optional":{
+                    "LOGO": ("IMAGE",),
                     "description":("STRING",{"multiline": True,"default": "","dynamicPrompts": False}),
                     "version":("INT", {
                         "default": 1, 
@@ -439,27 +450,44 @@ class AppInfo:
                     }),
                     "share_prefix":("STRING",{"multiline": False,"default": "","dynamicPrompts": False}),
                     "link":("STRING",{"multiline": False,"default": "https://","dynamicPrompts": False}),
+                    "category":("STRING",{"multiline": False,"default": "","dynamicPrompts": False}),
+                    "auto_save": (["enable","disable"],),
                 }
 
                 }
     
-    RETURN_TYPES = ("IMAGE",)
-    RETURN_NAMES = ("IMAGE",)
+    RETURN_TYPES = ()
+    # RETURN_NAMES = ("IMAGE",)
 
     FUNCTION = "run"
 
     CATEGORY = "♾️Mixlab"
 
-    INPUT_IS_LIST = False
-    OUTPUT_IS_LIST = (False,)
+    OUTPUT_NODE = True
+    INPUT_IS_LIST = True
+    # OUTPUT_IS_LIST = (True,)
 
-    def run(self,name,image,input_ids,output_ids,description,version,share_prefix,link):
+    def run(self,name,input_ids,output_ids,image,description,version,share_prefix,link,category,auto_save):
+        name=name[0]
+        
+        im=None
+        if image:
+            im=image[0][0]
+            #TODO batch 的方式需要处理
+            im=create_temp_file(im)
+        # image [img,] img[batch,w,h,a] 列表里面是batch，
 
-        im=create_temp_file(image)
+        input_ids=input_ids[0]
+        output_ids=output_ids[0]
+        description=description[0]
+        version=version[0]
+        share_prefix=share_prefix[0]
+        link=link[0]
+        category=category[0]
         
         # id=get_json_hash([name,im,input_ids,output_ids,description,version])
 
-        return {"ui": {"json": [name,im,input_ids,output_ids,description,version,share_prefix,link]}, "result": (image,)}
+        return {"ui": {"json": [name,im,input_ids,output_ids,description,version,share_prefix,link,category]}, "result": ()}
     
 
     
@@ -500,6 +528,7 @@ class SwitchByIndex:
                         "step": 1, 
                         "display": "number"  
                     }),
+                 "flat": (['off',"on"],),
             }
         }
 
@@ -513,13 +542,20 @@ class SwitchByIndex:
     INPUT_IS_LIST = True
     OUTPUT_IS_LIST = (True,)
 
-    def run(self, A,B,index):
+    def run(self, A,B,index,flat):
+
+        flat=flat[0]
+
         C=[]
         index=index[0]
         for a in A:
             C.append(a)
         for b in B:
             C.append(b)
+
+        if flat=='on':
+            C=flatten_list(C)
+
         if index>-1:
             try:
                 C=[C[index]]

requirements.txt

@@ -4,4 +4,5 @@ watchdog
 opencv-python-headless
 matplotlib
 openai
-simple-lama-inpainting
+simple-lama-inpainting
+clip-interrogator==0.6.0

web/javascript/3d_mixlab.js

@@ -196,6 +196,9 @@ app.registerExtension({
               }
               if (bg) {
                 data.bg_image = await parseImage(bg)
+                if (!data.bg_image.match('data:image/')) {
+                  delete data.bg_image
+                }
               }
 
               if (material) {

web/javascript/app_mixlab.js

@@ -100,13 +100,17 @@ function extractInputAndOutputData (jsonData, inputIds = [], outputIds = []) {
           // min max step
           options = node.widgets.filter(w => w.type === 'slider')[0].options
           // 备选的keywords清单
-          let keywords=getLocalData(`${id}_PromptSlide`);
+          let ks = getLocalData(`_mixlab_PromptSlide`)
+          let keywords = ks[id]
           // console.log('keywords',keywords)
-          if(keywords&&keywords[0]){
-            options.keywords=keywords;
+          if (keywords && keywords[0]) {
+            options.keywords = keywords
           }
         }
 
+        if (node.type == 'Color') {
+        }
+
         input[inputIds.indexOf(id)] = {
           ...data[id],
           title: node.title,
@@ -121,11 +125,11 @@ function extractInputAndOutputData (jsonData, inputIds = [], outputIds = []) {
         output[outputIds.indexOf(id)] = { ...data[id], title: node.title, id }
       }
 
-      if (node.type === 'KSampler') {
+      if (node.type === 'KSampler' || node.type == 'SamplerCustom') {
         // seed 的类型收集
         try {
           seed[id] = node.widgets.filter(
-            w => w.name === 'seed'
+            w => w.name === 'seed' || w.name == 'noise_seed'
           )[0].linkedWidgets[0].value
         } catch (error) {}
       }
@@ -160,7 +164,8 @@ async function save_app (json) {
     body: JSON.stringify({
       data: json,
       task: 'save_app',
-      filename: json.app.filename
+      filename: json.app.filename,
+      category: json.app.category
     })
   })
   return await res.json()
@@ -182,11 +187,12 @@ function downloadJsonFile (jsonData, fileName = 'mix_app.json') {
   }, 0)
 }
 
-async function save (json, download = false) {
+async function save (json, download = false, showInfo = true) {
   const name = json[0],
     version = json[5],
     share_prefix = json[6], //用于分享的功能扩展
-    link=json[7],//用于创建界面上的跳转链接
+    link = json[7], //用于创建界面上的跳转链接
+    category = json[8] || '', //用于分类
     description = json[4],
     inputIds = json[2].split('\n').filter(f => f),
     outputIds = json[3].split('\n').filter(f => f)
@@ -217,6 +223,7 @@ async function save (json, download = false) {
       seed, //控制是fixed 还是random
       share_prefix,
       link,
+      category,
       filename: `${name}_${version}.json`
     }
 
@@ -225,31 +232,54 @@ async function save (json, download = false) {
     } catch (error) {}
     // console.log(data.app)
     // let http_workflow = app.graph.serialize()
-
+    await save_app(data)
     if (download) {
-      await save_app(data)
       await downloadJsonFile(data, data.app.filename)
+    }
+
+    if (showInfo) {
       let open = window.confirm(
         `You can now access the standalone application on a new page!\n${getUrl()}/mixlab/app?filename=${encodeURIComponent(
           data.app.filename
-        )}`
+        )}&category=${encodeURIComponent(data.app.category)}`
       )
       if (open)
         window.open(
           `${getUrl()}/mixlab/app?filename=${encodeURIComponent(
             data.app.filename
-          )}`
+          )}&category=${encodeURIComponent(data.app.category)}`
         )
-    } else {
-      await save_app(data)
-
-      let open = window.confirm(
-        `You can now access the standalone application on a new page!\n${getUrl()}/mixlab/app`
-      )
-      if (open) window.open(`${getUrl()}/mixlab/app`)
     }
   } catch (error) {
-    console.log('###SpeechRecognition', error)
+    console.log('###error', error)
+  }
+}
+
+function getInputsAndOutputs () {
+  const inputs =
+      `LoadImage CLIPTextEncode PromptSlide TextInput_ Color FloatSlider IntNumber CheckpointLoaderSimple LoraLoader`.split(
+        ' '
+      ),
+    outputs = `PreviewImage SaveImage ShowTextForGPT VHS_VideoCombine`.split(
+      ' '
+    )
+
+  let inputsId = [],
+    outputsId = []
+
+  for (let node of app.graph._nodes) {
+    if (inputs.includes(node.type)) {
+      inputsId.push(node.id)
+    }
+
+    if (outputs.includes(node.type)) {
+      outputsId.push(node.id)
+    }
+  }
+
+  return {
+    input: inputsId,
+    output: outputsId
   }
 }
 
@@ -260,7 +290,16 @@ app.registerExtension({
       const orig_nodeCreated = nodeType.prototype.onNodeCreated
       nodeType.prototype.onNodeCreated = function () {
         orig_nodeCreated?.apply(this, arguments)
-        console.log('#orig_nodeCreated', this)
+        // console.log('#orig_nodeCreated', this)
+
+        // 自动计算workflow里哪些节点支持
+        let input_ids = this.widgets.filter(w => w.name == 'input_ids')[0],
+          output_ids = this.widgets.filter(w => w.name == 'output_ids')[0]
+
+        const { input, output } = getInputsAndOutputs()
+        input_ids.value = input.join('\n')
+        output_ids.value = output.join('\n')
+
         const widget = {
           type: 'div',
           name: 'AppInfoRun',
@@ -334,11 +373,17 @@ app.registerExtension({
       }
 
       const onExecuted = nodeType.prototype.onExecuted
-      nodeType.prototype.onExecuted = async function (message) {
+      nodeType.prototype.onExecuted = function (message) {
         onExecuted?.apply(this, arguments)
         console.log(message.json)
         window._mixlab_app_json = message.json
         try {
+          let a = this.widgets.filter(w => w.name === 'AppInfoRun')[0]
+          if (a) {
+            if (!a.value) a.value = 0
+            a.value += 1
+          }
+
           const div = this.widgets.filter(w => w.div)[0].div
           Array.from(
             div.querySelectorAll('button'),
@@ -347,5 +392,31 @@ app.registerExtension({
         } catch (error) {}
       }
     }
+  },
+  async loadedGraphNode (node, app) {
+    if (node.type === 'AppInfo') {
+      let auto_save = node.widgets.filter(w => w.name == 'auto_save')[0]
+      if (auto_save) {
+        if (!['enable', 'disable'].includes(auto_save.value)) {
+          auto_save.value = 'enable'
+        }
+      }
+    }
+  }
+})
+
+api.addEventListener('executed', async ({ detail }) => {
+  console.log('#executed', detail)
+  const { output } = getInputsAndOutputs()
+  if (output.includes(parseInt(detail.node))) {
+    let appinfo = app.graph.findNodesByType('AppInfo')[0]
+    if (appinfo) {
+      let auto_save = appinfo.widgets.filter(w => w.name == 'auto_save')[0]
+      if (auto_save?.value === 'enable') {
+        // 自动保存
+        console.log('auto_save')
+        if (window._mixlab_app_json) save(window._mixlab_app_json,false,false)
+      }
+    }
   }
 })

web/javascript/checkVersion_mixlab.js

@@ -3,7 +3,7 @@ import { app } from '../../../scripts/app.js'
 const repoOwner = 'shadowcz007' // 替换为仓库的所有者
 const repoName = 'comfyui-mixlab-nodes' // 替换为仓库的名称
 
-const version = 'v0.9.0'
+const version = 'v0.11.2'
 
 fetch(`https://api.github.com/repos/${repoOwner}/${repoName}/releases/latest`)
   .then(response => response.json())

web/javascript/clipInterrogator_mixlab.js

@@ -0,0 +1,119 @@
+import { app } from '../../../scripts/app.js'
+// import { api } from '../../../scripts/api.js'
+import { ComfyWidgets } from '../../../scripts/widgets.js'
+import { $el } from '../../../scripts/ui.js'
+
+function getRandomElements (arr, num) {
+  var result = []
+  var len = arr.length
+
+  for (var i = 0; i < num; i++) {
+    var randomIndex = Math.floor(Math.random() * len)
+    result.push(arr[randomIndex])
+  }
+
+  return result
+}
+
+const createPrompt = (node, prompts, items, sample) => {
+  const w = ComfyWidgets['STRING'](
+    node,
+    'text',
+    ['STRING', { multiline: true }],
+    app
+  ).widget
+  w.inputEl.readOnly = true
+  w.inputEl.style.opacity = 0.6
+
+  w.value = typeof prompts === 'string' ? prompts : prompts.join('\n\n')
+
+  const w2 = ComfyWidgets['STRING'](
+    node,
+    'text',
+    ['STRING', { multiline: true }],
+    app
+  ).widget
+  w2.inputEl.readOnly = true
+  w2.inputEl.style.opacity = 0.6
+
+  w2.value = typeof items === 'string' ? items : JSON.stringify(items, null, 2)
+
+  const w3 = ComfyWidgets['STRING'](
+    node,
+    'text',
+    ['STRING', { multiline: true }],
+    app
+  ).widget
+  w3.inputEl.readOnly = true
+  w3.inputEl.style.opacity = 0.6
+  w3.value = typeof sample === 'string' ? sample : sample.join('\n\n')
+}
+
+app.registerExtension({
+  name: 'Mixlab.prompt.ClipInterrogator',
+  async beforeRegisterNodeDef (nodeType, nodeData, app) {
+    if (nodeData.name === 'ClipInterrogator') {
+      function populate (prompts, items, random_samples) {
+        if (this.widgets) {
+          for (let i = 0; i < this.widgets.length; i++) {
+            if (this.widgets[i].type !== 'combo') this.widgets[i].onRemove?.()
+          }
+          this.widgets.length = 2
+        }
+
+        createPrompt(this, prompts, items, random_samples)
+
+        // console.log('ClipInterrogator', w, w2)
+        requestAnimationFrame(() => {
+          const sz = this.computeSize()
+          if (sz[0] < this.size[0]) {
+            sz[0] = this.size[0]
+          }
+          if (sz[1] < this.size[1]) {
+            sz[1] = this.size[1]
+          }
+          this.onResize?.(sz)
+          app.graph.setDirtyCanvas(true, false)
+        })
+      }
+
+      // When the node is executed we will be sent the input text, display this in the widget
+      const onExecuted = nodeType.prototype.onExecuted
+      nodeType.prototype.onExecuted = function (message) {
+        onExecuted?.apply(this, arguments)
+        // console.log('##', message)
+        populate.call(
+          this,
+          message.prompt,
+          message.analysis,
+          message.random_samples
+        )
+      }
+
+      this.serialize_widgets = true //需要保存参数
+    }
+  },
+  async loadedGraphNode (node, app) {
+    // Fires every time a node is constructed
+    // You can modify widgets/add handlers/etc here
+
+    if (node.type === 'ClipInterrogator') {
+      try {
+        
+        let widgets_values = node.widgets_values
+        console.log(widgets_values )
+        try {
+          if (widgets_values[2] && widgets_values[3] && widgets_values[4])
+            createPrompt(
+              node,
+              widgets_values[2],
+              widgets_values[3],
+              widgets_values[4]
+            )
+        } catch (error) {
+          console.log(error)
+        }
+      } catch (error) {}
+    }
+  }
+})

web/javascript/gpt_mixlab.js

@@ -256,6 +256,7 @@ app.registerExtension({
 			const onExecuted = nodeType.prototype.onExecuted;
 			nodeType.prototype.onExecuted = function (message) {
 				onExecuted?.apply(this, arguments);
+        console.log('##',message.text)
 				populate.call(this, message.text);
 			};
 

web/javascript/main_mixlab.js

@@ -1800,15 +1800,19 @@ const updateUI = node => {
     pw.inputEl.title = `Total of ${prompts.length} prompts`
   } else {
     // 动态添加
-    console.log('ComfyWidgets',ComfyWidgets.STRING(
-      node,
-      'prompts',
-      ['STRING', { multiline: true }]
-    ))
+    // console.log('ComfyWidgets',ComfyWidgets.STRING(
+    //   node,
+    //   'prompts',
+    //   ['STRING', { multiline: true }]
+    // ))
+
+    // ComfyWidgets.STRING(this, "", ["", {default:this.properties.text, multiline: true}], app)
+
     const w = ComfyWidgets.STRING(
       node,
       'prompts',
-      ['STRING', { multiline: true }]
+      ['STRING', { multiline: true }],
+      app
     ).widget
     w.inputEl.readOnly = true
     w.inputEl.style.opacity = 0.6
@@ -2089,13 +2093,13 @@ const node = {
   name: 'RandomPrompt',
   async init (app) {
     // Any initial setup to run as soon as the page loads
-    console.log('[logging]', 'extension init')
+    // console.log('[logging]', 'extension init')
 
     if (window.location.href.match('/?')) {
       const { workflow } = getURLParameters(window.location.href)
       if (workflow)
         get_my_workflow().then(data => {
-          console.log('#get_my_workflow', data)
+          // console.log('#get_my_workflow', data)
           let my_workflow = data.filter(
             d => d.filename == 'my_workflow.json'
           )[0]
@@ -2131,10 +2135,15 @@ const node = {
     // }
   },
   loadedGraphNode (node, app) {
-    // Fires for each node when loading/dragging/etc a workflow json or png
-    // If you break something in the backend and want to patch workflows in the frontend
-    // This is the place to do this
-    // console.log("[logging]", "loaded graph node: ", exportGraph(node.graph));
+    if (node.type === 'RandomPrompt') {
+      try {
+        let max_count = node.widgets.filter(w => w.name === "max_count")[0];
+        max_count.value= node.widgets_values[0]
+        // console.log('RandomPrompt',max_count,node.widgets_values[0])
+      } catch (error) {
+        console.log(error)
+      }
+    }
   },
   async nodeCreated (node) {
     if (node.type === 'RandomPrompt') {
@@ -2227,7 +2236,7 @@ const node = {
         const r = onExecuted?.apply?.(this, arguments)
 
         let prompts = message.prompts
-        console.log('executed', message)
+        // console.log('executed', message)
         // console.log('#RandomPrompt', this.widgets)
         const pw = this.widgets.filter(w => w.name === 'prompts')[0]
 
@@ -2238,7 +2247,7 @@ const node = {
         } else {
           // 动态添加
           const w = ComfyWidgets.STRING(
-            node,
+            this,
             'prompts',
             ['STRING', { multiline: true }],
             app

web/javascript/prompt_mixlab.js

@@ -35,6 +35,24 @@ function get_position_style (ctx, widget_width, y, node_height) {
     justifyContent: 'space-between'
   }
 }
+function createImage (url) {
+  let im = new Image()
+  return new Promise((res, rej) => {
+    im.onload = () => res(im)
+    im.src = url
+  })
+}
+
+async function fetchImage (url) {
+  try {
+    const response = await fetch(url)
+    const blob = await response.blob()
+
+    return blob
+  } catch (error) {
+    console.error('出现错误:', error)
+  }
+}
 
 const getLocalData = key => {
   let data = {}
@@ -72,6 +90,116 @@ const createSelect = (select, opts, targetWidget) => {
   })
 }
 
+app.registerExtension({
+  name: 'Mixlab.prompt.RandomPrompt',
+  async beforeRegisterNodeDef (nodeType, nodeData, app) {
+    if (nodeType.comfyClass == 'RandomPrompt') {
+      const orig_nodeCreated = nodeType.prototype.onNodeCreated
+      nodeType.prototype.onNodeCreated = async function () {
+        orig_nodeCreated?.apply(this, arguments)
+        name
+
+        const mutable_prompt = this.widgets.filter(
+          w => w.name == 'mutable_prompt'
+        )[0]
+        // console.log('PromptSlide nodeData', prompt_keyword)
+
+        const widget = {
+          type: 'div',
+          name: 'upload',
+          draw (ctx, node, widget_width, y, widget_height) {
+            Object.assign(
+              this.div.style,
+              get_position_style(ctx, widget_width, y, node.size[1])
+            )
+          }
+        }
+
+        widget.div = $el('div', {})
+
+        const btn = document.createElement('button')
+        btn.innerText = 'Upload Keywords'
+
+        btn.style = `cursor: pointer;
+        font-weight: 300;
+        margin: 2px; 
+        color: var(--descrip-text);
+        background-color: var(--comfy-input-bg);
+        border-radius: 8px;
+        border-color: var(--border-color);
+        border-style: solid;    height: 30px;min-width: 122px;
+       `
+
+        // const btn=document.createElement('button');
+        // btn.innerText='Upload'
+        btn.addEventListener('click', () => {
+          let inp = document.createElement('input')
+          inp.type = 'file'
+          inp.accept = '.txt'
+          inp.click()
+          inp.addEventListener('change', event => {
+            // 获取选择的文件
+            const file = event.target.files[0]
+            this.title = file.name.split('.')[0]
+
+            // console.log(file.name.split('.')[0])
+            // 创建文件读取器
+            const reader = new FileReader()
+
+            // 定义读取完成事件的回调函数
+            reader.onload = event => {
+              // 读取完成后的文本内容
+              const fileContent = event.target.result.split('\n')
+              const keywords = Array.from(fileContent, f => f.trim()).filter(
+                f => f
+              )
+              // 打印文件内容
+              //   console.log(keywords)
+
+              mutable_prompt.value = keywords.join('\n')
+
+              inp.remove()
+            }
+
+            // 以文本方式读取文件
+            reader.readAsText(file)
+          })
+        })
+
+        widget.div.appendChild(btn)
+        document.body.appendChild(widget.div)
+        this.addCustomWidget(widget)
+
+        const onRemoved = this.onRemoved
+        this.onRemoved = () => {
+          widget.div.remove()
+          return onRemoved?.()
+        }
+
+        if (this.onResize) {
+          this.onResize(this.size)
+        }
+
+        this.serialize_widgets = true //需要保存参数
+      }
+    }
+  },
+  async loadedGraphNode (node, app) {
+    if (node.type === 'RandomPrompt') {
+      // try {
+      //   let mutable_prompt = node.widgets.filter(w => w.name === 'mutable_prompt')[0]
+      //   // let ks = getLocalData(`_mixlab_PromptSlide`)
+      //   let uploadWidget = node.widgets.filter(w => w.name == 'upload')[0]
+      //   // console.log('##widget', uploadWidget.value)
+      //   let keywords = JSON.parse(uploadWidget.value)
+      //   if (keywords && keywords[0]) {
+      //     mutable_prompt.value=keywords.join('\n')
+      //   }
+      // } catch (error) {}
+    }
+  }
+})
+
 app.registerExtension({
   name: 'Mixlab.prompt.PromptSlide',
   async beforeRegisterNodeDef (nodeType, nodeData, app) {
@@ -133,12 +261,14 @@ app.registerExtension({
           inp.addEventListener('change', event => {
             // 获取选择的文件
             const file = event.target.files[0]
+            this.title = file.name.split('.')[0]
 
+            // console.log(file.name.split('.')[0])
             // 创建文件读取器
             const reader = new FileReader()
 
             // 定义读取完成事件的回调函数
-            reader.onload =  (event)=> {
+            reader.onload = event => {
               // 读取完成后的文本内容
               const fileContent = event.target.result.split('\n')
               const keywords = Array.from(fileContent, f => f.trim()).filter(
@@ -147,8 +277,11 @@ app.registerExtension({
               // 打印文件内容
               //   console.log(keywords)
 
-              // widget.value = keywords
-              setLocalDataOfWin(`${this.id}_PromptSlide`,keywords)
+              widget.value = JSON.stringify(keywords)
+
+              // let ks = getLocalData(`_mixlab_PromptSlide`)
+              // ks[this.id] = keywords
+              // setLocalDataOfWin(`_mixlab_PromptSlide`, ks)
 
               createSelect(select, keywords, prompt_keyword)
 
@@ -183,13 +316,13 @@ app.registerExtension({
     if (node.type === 'PromptSlide') {
       try {
         let prompt = node.widgets.filter(w => w.name === 'prompt_keyword')[0]
-       
-       let keywords= getLocalData( `${node.id}_PromptSlide`)
+        // let ks = getLocalData(`_mixlab_PromptSlide`)
+        let uploadWidget = node.widgets.filter(w => w.name == 'upload')[0]
+        // console.log('##widget', uploadWidget.value)
+        let keywords = JSON.parse(uploadWidget.value)
         // console.log('keywords',keywords)
         let widget = node.widgets.filter(w => w.select)[0]
         if (keywords && keywords[0]) {
-          // let widget = node.widgets.filter(w => w.select)[0]
-          // console.log('select',widget,widget.value)
           widget.select.style.display = 'block'
           createSelect(widget.select, keywords, prompt)
         }
@@ -197,3 +330,152 @@ app.registerExtension({
     }
   }
 })
+
+const _createResult = async (node, widget, message) => {
+  widget.div.innerHTML = ``
+
+  const width = node.size[0] * 0.5 - 12
+
+  let height_add = 0
+
+  for (let index = 0; index < message._images.length; index++) {
+    const imgs = message._images[index]
+
+    for (const img of imgs) {
+      let url = api.apiURL(
+        `/view?filename=${encodeURIComponent(img.filename)}&type=${
+          img.type
+        }&subfolder=${
+          img.subfolder
+        }${app.getPreviewFormatParam()}${app.getRandParam()}`
+      )
+
+      let image = await createImage(url)
+
+      // 创建card
+      let div = document.createElement('div')
+      div.className = 'card'
+      div.draggable = true
+
+      div.ondragend = async event => {
+        console.log('拖动停止')
+        let url = div.querySelector('img').src
+
+        let blob = await fetchImage(url)
+
+        let imageNode = null
+        // No image node selected: add a new one
+        if (!imageNode) {
+          const newNode = LiteGraph.createNode('LoadImage')
+          newNode.pos = [...app.canvas.graph_mouse]
+          imageNode = app.graph.add(newNode)
+          app.graph.change()
+        }
+
+        // const blob = item.getAsFile();
+        imageNode.pasteFile(blob)
+      }
+
+      div.setAttribute('data-scale', image.naturalHeight / image.naturalWidth)
+
+      let h = (image.naturalHeight * width) / image.naturalWidth
+      if (index % 2 === 0) height_add += h
+      div.style = `width: ${width}px;height:${h}px;position: relative;margin: 4px;`
+      div.innerHTML = `<img src="${url}" style='width: 100%'/>
+            <p style="position: absolute;
+            bottom: 0;
+            left: 0; 
+            background:#444444c2;
+            margin: 0;
+            font-size: 12px;
+            padding: 5px;
+            text-align: left;">${message.prompts[index]}</p>`
+      widget.div.appendChild(div)
+    }
+  }
+
+  node.size[1] = 98 + height_add
+}
+
+app.registerExtension({
+  name: 'Mixlab.prompt.PromptImage',
+
+  async beforeRegisterNodeDef (nodeType, nodeData, app) {
+    if (nodeType.comfyClass == 'PromptImage') {
+      const orig_nodeCreated = nodeType.prototype.onNodeCreated
+      nodeType.prototype.onNodeCreated = function () {
+        orig_nodeCreated?.apply(this, arguments)
+        console.log('#orig_nodeCreated', this)
+        const widget = {
+          type: 'div',
+          name: 'result',
+          draw (ctx, node, widget_width, y, widget_height) {
+            Object.assign(this.div.style, {
+              ...get_position_style(ctx, widget_width, y, node.size[1]),
+              flexWrap: 'wrap',
+              justifyContent: 'space-between',
+              // outline: '1px solid red',
+              paddingLeft: '0px',
+              width: widget_width + 'px'
+            })
+          }
+        }
+
+        widget.div = $el('div', {})
+
+        document.body.appendChild(widget.div)
+
+        this.addCustomWidget(widget)
+
+        const onRemoved = this.onRemoved
+        this.onRemoved = () => {
+          widget.div.remove()
+          return onRemoved?.()
+        }
+
+        const onResize = this.onResize
+        this.onResize = function () {
+          // 缩放发生
+          // console.log('##缩放发生', this.size)
+          let w = this.size[0] * 0.5 - 12
+          Array.from(widget.div.querySelectorAll('.card'), card => {
+            card.style.width = `${w}px`
+            card.style.height = `${
+              w * parseFloat(card.getAttribute('data-scale'))
+            }px`
+          })
+          return onResize?.apply(this, arguments)
+        }
+
+        // this.serialize_widgets = true //需要保存参数
+      }
+
+      const onExecuted = nodeType.prototype.onExecuted
+      nodeType.prototype.onExecuted = async function (message) {
+        onExecuted?.apply(this, arguments)
+        console.log('#PromptImage', message.prompts, message._images)
+        // window._mixlab_app_json = message.json
+        try {
+          let widget = this.widgets.filter(w => w.name === 'result')[0]
+          widget.value = message
+          _createResult(this, widget, { ...message })
+        } catch (error) {
+          console.log(error)
+        }
+      }
+
+      this.serialize_widgets = true //需要保存参数
+    }
+  },
+  async loadedGraphNode (node, app) {
+    if (node.type === 'PromptImage') {
+      // await sleep(0)
+      let widget = node.widgets.filter(w => w.name === 'result')[0]
+      console.log('widget.value', widget.value)
+      let cards = widget.div.querySelectorAll('.card')
+      if (cards.length == 0) node.size = [280, 120]
+
+      _createResult(node, widget, widget.value)
+    }
+  }
+})

web/javascript/ui_mixlab.js

@@ -55,13 +55,15 @@ function get_url () {
   return url
 }
 
-async function get_my_app (filename = null) {
+async function get_my_app (filename = null, category = '') {
   let url = get_url()
   const res = await fetch(`${url}/mixlab/workflow`, {
     method: 'POST',
     body: JSON.stringify({
       task: 'my_app',
-      filename
+      filename,
+      category,
+      admin: true
     })
   })
   let result = await res.json()
@@ -713,202 +715,343 @@ app.registerExtension({
       this.setDirty(true, true)
     }
   },
-  async setup () {
-    // Add canvas menu options
-    const orig = LGraphCanvas.prototype.getCanvasMenuOptions
+  setup () {
+    setTimeout(async () => {
+      // Add canvas menu options
+      const orig = LGraphCanvas.prototype.getCanvasMenuOptions
 
-    const apps = await get_my_app()
-    // console.log('apps',apps)
-    LGraphCanvas.prototype.getCanvasMenuOptions = function () {
-      const options = orig.apply(this, arguments)
+      const apps = await get_my_app()
 
-      options.push(null, {
-        content: `Nodes Map ♾️Mixlab`,
-        disabled: false,
-        callback: async () => {
-          nodesMap =
-            nodesMap && Object.keys(nodesMap).length > 0
-              ? nodesMap
-              : await getCustomnodeMappings('url')
+      let apps_map = { '0': [] }
 
-          const nodesDiv = document.createDocumentFragment()
-          const nodes = (await app.graphToPrompt()).output
+      for (const app of apps) {
+        if (app.category) {
+          if (!apps_map[app.category]) apps_map[app.category] = []
+          apps_map[app.category].push(app)
+        } else {
+          apps_map['0'].push(app)
+        }
+      }
 
-          // console.log('[Mixlab]', 'loaded graph node: ', app)
-          let div =
-            document.querySelector('#mixlab_find_the_node') ||
-            document.createElement('div')
-          div.id = 'mixlab_find_the_node'
-          div.style = `
-              flex-direction: column;
-              align-items: end;
-              display:flex;position: absolute; 
-              top: 50px; left: 50px; width: 200px; 
-              color: var(--descrip-text);
-              background-color: var(--comfy-menu-bg);
-              padding: 10px; 
-              border: 1px solid black;z-index: 999999999;padding-top: 0;`
-
-          div.innerHTML = ''
-
-          let btn = document.createElement('div')
-          btn.style = `display: flex;
-            width: calc(100% - 24px);
-            justify-content: space-between;
-            align-items: center;
-            padding: 0 12px;
-            height: 44px;`
-          let btnB = document.createElement('button')
-          let textB = document.createElement('p')
-          btn.appendChild(textB)
-          btn.appendChild(btnB)
-          textB.style.fontSize = '12px'
-          textB.innerText = `Locate and navigate nodes ♾️Mixlab`
-
-          btnB.style = `float: right; border: none; color: var(--input-text);
-            background-color: var(--comfy-input-bg); border-color: var(--border-color);cursor: pointer;`
-          btnB.addEventListener('click', () => {
-            div.style.display = 'none'
-          })
-          btnB.innerText = 'X'
-
-          // 悬浮框拖动事件
-          div.addEventListener('mousedown', function (e) {
-            var startX = e.clientX
-            var startY = e.clientY
-            var offsetX = div.offsetLeft
-            var offsetY = div.offsetTop
-
-            function moveBox (e) {
-              var newX = e.clientX
-              var newY = e.clientY
-              var deltaX = newX - startX
-              var deltaY = newY - startY
-              div.style.left = offsetX + deltaX + 'px'
-              div.style.top = offsetY + deltaY + 'px'
-            }
-
-            function stopMoving () {
-              document.removeEventListener('mousemove', moveBox)
-              document.removeEventListener('mouseup', stopMoving)
-            }
-
-            document.addEventListener('mousemove', moveBox)
-            document.addEventListener('mouseup', stopMoving)
-          })
-
-          div.appendChild(btn)
-
-          const updateNodes = (ns, nd) => {
-            for (let nodeId in ns) {
-              let n = ns[nodeId].class_type
-              if (nodesMap[n]) {
-                const { url, title } = nodesMap[n]
-                let d = document.createElement('button')
-                d.style = `text-align: left;margin:6px;color: var(--input-text);
-                  background-color: var(--comfy-input-bg); border-color: var(--border-color);cursor: pointer;`
-                d.addEventListener('click', () => {
-                  console.log('node')
-                  const node = app.graph.getNodeById(nodeId)
-                  
-                  if (!node) return
-                  app.canvas.centerOnNode(node)
-                  app.canvas.setZoom(1)
-                })
-                d.addEventListener('mouseover', async () => {
-                  // console.log('mouseover')
-                  let n = (await app.graphToPrompt()).output
-                  if (!deepEqual(n, ns)) {
-                    nd.innerHTML = ''
-                    updateNodes(n, nd)
-                  }
-                })
-
-                d.innerHTML = `
-                  <span>${'#' + nodeId} ${n}</span>
-                  <a href="${url}" target="_blank" style="text-decoration: none;">🔗</a>
-                  `
-                d.title = title
-
-                nd.appendChild(d)
+      let apps_opts = []
+      for (const category in apps_map) {
+        console.log('category',typeof(category))
+        if (category === '0') {
+          apps_opts.push(
+            ...Array.from(apps_map[category], a => {
+              return {
+                content: a.name,
+                has_submenu: false,
+                callback: async () => {
+                  try {
+                    let item = (await get_my_app(a.filename))[0]
+                    if (item) {
+                      // console.log(item.data)
+                      app.loadGraphData(item.data)
+                      setTimeout(() => {
+                        const node = app.graph._nodes_in_order[0]
+                        if (!node) return
+                        app.canvas.centerOnNode(node)
+                        app.canvas.setZoom(0.5)
+                      }, 1000)
+                    }
+                  } catch (error) {}
+                }
               }
-            }
-          }
-
-          let nodesDivv = document.createElement('div')
-
-          for (let nodeId in nodes) {
-            let n = nodes[nodeId].class_type
-            if (nodesMap[n]) {
-              const { url, title: _title } = nodesMap[n]
-              let title = app.graph.getNodeById(nodeId).title || _title
-              let d = document.createElement('button')
-              d.style = `text-align: left;margin:6px;color: var(--input-text);
-                background-color: var(--comfy-input-bg); border-color: var(--border-color);cursor: pointer;`
-              d.addEventListener('click', () => {
-                console.log('click')
-                const node = app.graph.getNodeById(nodeId)
-                if (!node) return
-                app.canvas.centerOnNode(node)
-                app.canvas.setZoom(1)
-              })
-              d.addEventListener('mouseover', async () => {
-                console.log('mouseover')
-                let n = (await app.graphToPrompt()).output
-                if (!deepEqual(n, nodes)) {
-                  nodesDivv.innerHTML = ''
-                  updateNodes(n, nodesDivv)
+            })
+          )
+        } else {
+          // 二级
+          apps_opts.push({
+            content:  '🚀 '+category,
+            has_submenu: true,
+            disabled: false,
+            submenu: {
+              options: Array.from(apps_map[category], a => {
+                return {
+                  content: a.name,
+                  callback: async () => {
+                    try {
+                      let item = (await get_my_app(a.filename, a.category))[0]
+                      if (item) {
+                        // console.log(item.data)
+                        app.loadGraphData(item.data)
+                        setTimeout(() => {
+                          const node = app.graph._nodes_in_order[0]
+                          if (!node) return
+                          app.canvas.centerOnNode(node)
+                          app.canvas.setZoom(0.5)
+                        }, 1000)
+                      }
+                    } catch (error) {}
+                  }
                 }
               })
-
-              d.innerHTML = `
-                <span>${'#' + nodeId} ${title}</span>
-                <a href="${url}" target="_blank" style="text-decoration: none;">🔗</a>
-                `
-              d.title = n
-
-              nodesDiv.appendChild(d)
-            }
-          }
-
-          nodesDivv.appendChild(nodesDiv)
-          nodesDivv.style = `overflow: scroll;
-            height: 70vh;width: 100%;`
-
-          div.appendChild(nodesDivv)
-
-          if (!document.querySelector('#mixlab_find_the_node'))
-            document.body.appendChild(div)
-        }
-      },{
-        content: 'Workflow App ♾️Mixlab',
-        has_submenu: true,
-        disabled: false,
-        submenu: {
-          options: Array.from(apps, a => {
-            return {
-              content: a.name,
-              callback: async () => {
-                try {
-                  let item = (await get_my_app(a.filename))[0]
-                  if (item) {
-                    // console.log(item.data)
-                    app.loadGraphData(item.data)
-                    setTimeout(() => {
-                      const node = app.graph._nodes_in_order[0]
-                      if (!node) return
-                      app.canvas.centerOnNode(node)
-                      app.canvas.setZoom(0.5)
-                    }, 1000)
-                  }
-                } catch (error) {}
-              }
             }
           })
         }
-      })
+      }
 
-      return options
-    }
+      // console.log('apps',apps_map, apps_opts,apps)
+      LGraphCanvas.prototype.getCanvasMenuOptions = function () {
+        const options = orig.apply(this, arguments)
+
+        options.push(
+          null,
+          {
+            content: `Nodes Map ♾️Mixlab`,
+            disabled: false,
+            callback: async () => {
+              nodesMap =
+                nodesMap && Object.keys(nodesMap).length > 0
+                  ? nodesMap
+                  : await getCustomnodeMappings('url')
+
+              const nodesDiv = document.createDocumentFragment()
+              const nodes = (await app.graphToPrompt()).output
+
+              // console.log('[Mixlab]', 'loaded graph node: ', app)
+              let div =
+                document.querySelector('#mixlab_find_the_node') ||
+                document.createElement('div')
+              div.id = 'mixlab_find_the_node'
+              div.style = `
+               flex-direction: column;
+               align-items: end;
+               display:flex;position: absolute; 
+               top: 50px; left: 50px; width: 200px; 
+               color: var(--descrip-text);
+               background-color: var(--comfy-menu-bg);
+               padding: 10px; 
+               border: 1px solid black;z-index: 999999999;padding-top: 0;`
+
+              div.innerHTML = ''
+
+              let btn = document.createElement('div')
+              btn.style = `display: flex;
+             width: calc(100% - 24px);
+             justify-content: space-between;
+             align-items: center;
+             padding: 0 12px;
+             height: 44px;`
+              let btnB = document.createElement('button')
+              let textB = document.createElement('p')
+              btn.appendChild(textB)
+              btn.appendChild(btnB)
+              textB.style.fontSize = '12px'
+              textB.innerText = `Locate and navigate nodes ♾️Mixlab`
+
+              btnB.style = `float: right; border: none; color: var(--input-text);
+             background-color: var(--comfy-input-bg); border-color: var(--border-color);cursor: pointer;`
+              btnB.addEventListener('click', () => {
+                div.style.display = 'none'
+              })
+              btnB.innerText = 'X'
+
+              // 悬浮框拖动事件
+              div.addEventListener('mousedown', function (e) {
+                var startX = e.clientX
+                var startY = e.clientY
+                var offsetX = div.offsetLeft
+                var offsetY = div.offsetTop
+
+                function moveBox (e) {
+                  var newX = e.clientX
+                  var newY = e.clientY
+                  var deltaX = newX - startX
+                  var deltaY = newY - startY
+                  div.style.left = offsetX + deltaX + 'px'
+                  div.style.top = offsetY + deltaY + 'px'
+                }
+
+                function stopMoving () {
+                  document.removeEventListener('mousemove', moveBox)
+                  document.removeEventListener('mouseup', stopMoving)
+                }
+
+                document.addEventListener('mousemove', moveBox)
+                document.addEventListener('mouseup', stopMoving)
+              })
+
+              div.appendChild(btn)
+
+              const updateNodes = (ns, nd) => {
+                let appInfoNodes = {}
+                try {
+                  let appInfo = app.graph._nodes.filter(
+                    n => n.type === 'AppInfo'
+                  )[0]
+                  if (appInfo) {
+                    appInfoNodes[appInfo.id] = 2
+                    for (const id of appInfo.widgets[1].value.split('\n')) {
+                      if (id && id.trim() && parseInt(id)) {
+                        appInfoNodes[id] = 0
+                      }
+                    }
+                    for (const id of app.graph._nodes
+                      .filter(n => n.type === 'AppInfo')[0]
+                      .widgets[2].value.split('\n')) {
+                      if (id && id.trim() && parseInt(id)) {
+                        appInfoNodes[id] = 1
+                      }
+                    }
+                  }
+                } catch (error) {
+                  console.log(error)
+                }
+
+                for (let nodeId in ns) {
+                  let n = ns[nodeId].title || ns[nodeId].class_type
+                  if (nodesMap[n]) {
+                    const { url, title } = nodesMap[n]
+                    let d = document.createElement('button')
+                    d.style = `text-align: left;
+                    margin:6px;
+                    color: var(--input-text);
+                   background-color: var(--comfy-input-bg); 
+                   border-color: ${
+                     appInfoNodes[nodeId] >= 0
+                       ? appInfoNodes[nodeId] === 1
+                         ? 'blue'
+                         : 'red'
+                       : 'var(--border-color)'
+                   };
+                   cursor: pointer;`
+
+                    if (appInfoNodes[nodeId] === 2) {
+                      // appinfo
+                      d.style.backgroundColor = '#326328'
+                      d.style.color = '#ffffff'
+                      d.style.borderColor = 'transparent'
+                    }
+
+                    d.addEventListener('click', () => {
+                      // console.log('node')
+                      const node = app.graph.getNodeById(nodeId)
+
+                      if (!node) return
+                      app.canvas.centerOnNode(node)
+                      app.canvas.setZoom(1)
+                    })
+                    d.addEventListener('mouseover', async () => {
+                      // console.log('mouseover')
+                      let n = (await app.graphToPrompt()).output
+                      if (!deepEqual(n, ns)) {
+                        nd.innerHTML = ''
+                        updateNodes(n, nd)
+                      }
+                    })
+
+                    d.innerHTML = `
+                   <span>${'#' + nodeId} ${n}</span>
+                   <a href="${url}" target="_blank" style="text-decoration: none;">🔗</a>
+                   `
+                    d.title = title
+
+                    nd.appendChild(d)
+                  }
+                }
+              }
+
+              let nodesDivv = document.createElement('div')
+              let appInfoNodes = {}
+              try {
+                let appInfo = app.graph._nodes.filter(
+                  n => n.type === 'AppInfo'
+                )[0]
+                if (appInfo) {
+                  appInfoNodes[appInfo.id] = 2
+                  for (const id of appInfo.widgets[1].value.split('\n')) {
+                    if (id && id.trim() && parseInt(id)) {
+                      appInfoNodes[id] = 0
+                    }
+                  }
+                  for (const id of app.graph._nodes
+                    .filter(n => n.type === 'AppInfo')[0]
+                    .widgets[2].value.split('\n')) {
+                    if (id && id.trim() && parseInt(id)) {
+                      appInfoNodes[id] = 1
+                    }
+                  }
+                }
+              } catch (error) {
+                console.log(error)
+              }
+
+              for (let nodeId in nodes) {
+                let n = nodes[nodeId].class_type
+                if (nodesMap[n]) {
+                  const { url, title: _title } = nodesMap[n]
+                  let title = app.graph.getNodeById(nodeId).title || _title
+                  let d = document.createElement('button')
+                  d.style = `text-align: left;
+                  margin:6px;
+                  color: var(--input-text);
+                 background-color: var(--comfy-input-bg); 
+                 border-color: ${
+                   appInfoNodes[nodeId] >= 0
+                     ? appInfoNodes[nodeId] === 1
+                       ? 'blue'
+                       : 'red'
+                     : 'var(--border-color)'
+                 };
+                 cursor: pointer;`
+
+                  if (appInfoNodes[nodeId] === 2) {
+                    // appinfo
+                    d.style.backgroundColor = '#326328'
+                    d.style.color = '#ffffff'
+                    d.style.borderColor = 'transparent'
+                  }
+
+                  d.addEventListener('click', () => {
+                    console.log('click')
+                    const node = app.graph.getNodeById(nodeId)
+                    if (!node) return
+                    app.canvas.centerOnNode(node)
+                    app.canvas.setZoom(1)
+                  })
+                  d.addEventListener('mouseover', async () => {
+                    // console.log('mouseover')
+                    let n = (await app.graphToPrompt()).output
+                    if (!deepEqual(n, nodes)) {
+                      nodesDivv.innerHTML = ''
+                      updateNodes(n, nodesDivv)
+                    }
+                  })
+
+                  d.innerHTML = `
+                 <span>${'#' + nodeId} ${title}</span>
+                 <a href="${url}" target="_blank" style="text-decoration: none;">🔗</a>
+                 `
+                  d.title = n
+
+                  nodesDiv.appendChild(d)
+                }
+              }
+
+              nodesDivv.appendChild(nodesDiv)
+              nodesDivv.style = `overflow: scroll;
+             height: 70vh;width: 100%;`
+
+              div.appendChild(nodesDivv)
+
+              if (!document.querySelector('#mixlab_find_the_node'))
+                document.body.appendChild(div)
+            }
+          },
+          {
+            content: 'Workflow App ♾️Mixlab',
+            has_submenu: true,
+            disabled: false,
+            submenu: {
+              options:apps_opts
+            }
+          }
+        )
+
+        return options
+      }
+    }, 1000)
   }
 })

web/javascript/utils_mixlab.js

@@ -57,11 +57,35 @@ function hexToRGBA (hexColor) {
   // 将透明度的十六进制值转换为十进制值
   var alpha = parseInt(alphaHex, 16) / 255
 
-  return [r,g,b,alpha]
+  return [r, g, b, alpha]
 }
 
 app.registerExtension({
   name: 'Mixlab.utils.Color',
+  init () {
+    $el('link', {
+      rel: 'stylesheet',
+      href: '/extensions/comfyui-mixlab-nodes/lib/classic.min.css',
+      parent: document.head
+    })
+
+    $el('style', {
+      textContent: `
+      .pickr{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+				.pickr .pcr-button {
+					width: 56px;
+          height: 56px;
+          outline: 1px solid white;
+				}
+				 
+			`,
+      parent: document.body
+    })
+  },
   async getCustomWidgets (app) {
     return {
       TCOLOR (node, inputName, inputData, app) {
@@ -75,9 +99,10 @@ app.registerExtension({
             return [128, 32] // a method to compute the current size of the widget
           },
           async serializeValue (nodeId, widgetIndex) {
-            let data = getLocalData('_mixlab_utils_color');
-            let hex=data[node.id] || '#000000'
-            let [r,g,b,a]=hexToRGBA(hex)
+            // let data = getLocalData('_mixlab_utils_color')
+            // let hex = data[node.id] || '#000000'
+            let hex = widget.value || '#000000'
+            let [r, g, b, a] = hexToRGBA(hex)
             return {
               hex,
               r,
@@ -100,7 +125,7 @@ app.registerExtension({
       nodeType.prototype.onNodeCreated = function () {
         orig_nodeCreated?.apply(this, arguments)
 
-        console.log('Color nodeData', this.widgets)
+        // console.log('Color nodeData', this.widgets)
 
         const widget = {
           type: 'div',
@@ -110,6 +135,7 @@ app.registerExtension({
               this.div.style,
               get_position_style(ctx, widget_width, 44, node.size[1])
             )
+            // console.log('draw',y,node.widgets[0].last_y)
           }
         }
 
@@ -117,35 +143,9 @@ app.registerExtension({
 
         document.body.appendChild(widget.div)
 
-        const inputDiv = (key, placeholder, value) => {
+        const inputDiv = () => {
           let div = document.createElement('div')
-          const ip = document.createElement('input')
-          ip.type = 'color'
-          ip.className = `${'comfy-multiline-input'} ${placeholder}`
-          div.style = `display: flex;
-            align-items: center; 
-            margin: 6px 8px;
-            margin-top: 0;`
-          ip.placeholder = placeholder
-          ip.value = value
-
-          ip.style = `outline: none;
-            border: none;
-            padding: 4px;
-            width: 70%;cursor: pointer;
-            height: 32px;`
-          const label = document.createElement('label')
-          label.style = 'font-size: 10px;min-width:32px'
-          label.innerText = placeholder
-          div.appendChild(label)
-          div.appendChild(ip)
-
-          ip.addEventListener('change', () => {
-            let data = getLocalData(key)
-            data[this.id] = ip.value.trim()
-            localStorage.setItem(key, JSON.stringify(data))
-            // console.log(this.id, ip.value.trim())
-          })
+          div.id = `color_picker_${this.id}`
           return div
         }
 
@@ -155,10 +155,85 @@ app.registerExtension({
 
         this.addCustomWidget(widget)
 
+        const pickr = Pickr.create({
+          el: `#${inputColor.id}`,
+          theme: 'classic', // or 'monolith', or 'nano'
+          // closeOnScroll: true,
+          default: '#000000',
+          swatches: [
+            'rgba(244, 67, 54, 1)',
+            'rgba(233, 30, 99, 0.95)',
+            'rgba(156, 39, 176, 0.9)',
+            'rgba(103, 58, 183, 0.85)',
+            'rgba(63, 81, 181, 0.8)',
+            'rgba(33, 150, 243, 0.75)',
+            'rgba(3, 169, 244, 0.7)',
+            'rgba(0, 188, 212, 0.7)',
+            'rgba(0, 150, 136, 0.75)',
+            'rgba(76, 175, 80, 0.8)',
+            'rgba(139, 195, 74, 0.85)',
+            'rgba(205, 220, 57, 0.9)',
+            'rgba(255, 235, 59, 0.95)',
+            'rgba(255, 193, 7, 1)'
+          ],
+
+          components: {
+            // Main components
+            preview: true,
+            opacity: true,
+            hue: true,
+            // Input / output Options
+            interaction: {
+              hex: true,
+              rgba: true,
+              hsla: true,
+              hsva: true,
+              cmyk: true,
+              input: true,
+              // clear: true,
+              save: true,
+              cancel: true
+            }
+          }
+        })
+
+        pickr
+          .on('save', (color, instance) => {
+            // console.log('Event: "save"', color.toHEXA().toString())
+            // let data = getLocalData('_mixlab_utils_color')
+            // data[this.id] = color.toHEXA().toString()
+            // localStorage.setItem('_mixlab_utils_color', JSON.stringify(data))
+
+            try {
+              let tc = this.widgets.filter(w => w.type == 'TCOLOR')[0]
+              tc.value = color.toHEXA().toString()
+            } catch (error) {}
+          })
+          .on('cancel', instance => {
+            pickr && pickr.hide()
+          })
+        this.pickr = pickr
+        const handleMouseWheel = () => {
+          try {
+            this.pickr && this.pickr.hide()
+          } catch (error) {}
+        }
+
+        document.addEventListener('wheel', handleMouseWheel)
+
         const onRemoved = this.onRemoved
         this.onRemoved = () => {
           inputColor.remove()
           widget.div.remove()
+
+          try {
+            this.pickr.destroyAndRemove()
+            this.pickr = null
+            document.removeEventListener('wheel', handleMouseWheel)
+          } catch (error) {
+            console.log(error)
+          }
+
           return onRemoved?.()
         }
 
@@ -171,20 +246,17 @@ app.registerExtension({
     // You can modify widgets/add handlers/etc here
 
     if (node.type === 'Color') {
-      let widget = node.widgets.filter(w => w.div)[0]
+      try {
+        let TCOLOR = node.widgets.filter(w => w.type == 'TCOLOR')[0]
 
-      let data = getLocalData('_mixlab_utils_color')
-
-      let id = node.id
-
-      widget.div.querySelector('.Color').value = data[id] || '#000000'
+        setTimeout(() => node.pickr.setColor(TCOLOR.value || '#000000'), 1000)
+      } catch (error) {}
     }
   }
 })
 
 app.registerExtension({
   name: 'Mixlab.utils.TextToNumber',
-
   async beforeRegisterNodeDef (nodeType, nodeData, app) {
     if (nodeType.comfyClass == 'TextToNumber') {
       const onExecuted = nodeType.prototype.onExecuted
@@ -197,9 +269,76 @@ app.registerExtension({
           const n = this.widgets.filter(w => w.name === 'number')[0]
           n.value = message.num[0]
         }
-
         console.log('TextToNumber', random_number.value)
       }
     }
   }
 })
+
+const min_max = node => {
+  if(node.widgets){
+    const min_value = node.widgets.filter(w => w.name === 'min_value')[0]
+    const max_value = node.widgets.filter(w => w.name === 'max_value')[0]
+  
+    const number = node.widgets.filter(w => w.name === 'number')[0]
+    if (number) {
+      number.options.min = min_value.value
+      number.options.max = max_value.value
+  
+      number.value = Math.min(number.options.max, number.value)
+      number.value = Math.max(number.options.min, number.value)
+    }
+  
+    if (min_value)
+      min_value.callback = e => {
+        number.options.min = e
+        number.value = e
+      }
+    if (max_value)
+      max_value.callback = e => {
+        number.options.max = e
+        number.value = e
+      }
+  }
+  
+}
+
+app.registerExtension({
+  name: 'Mixlab.utils.FloatSlider',
+  async beforeRegisterNodeDef (nodeType, nodeData, app) {
+
+    if (nodeType.comfyClass == 'FloatSlider') {
+      const orig_nodeCreated = nodeType.prototype.onNodeCreated;
+      nodeType.prototype.onNodeCreated = function () {
+        orig_nodeCreated?.apply(this, arguments)
+        min_max(this)
+      }
+    }
+
+   
+  },
+  async loadedGraphNode (node, app) {
+    if (node.type === 'FloatSlider') {
+      min_max(node)
+    }
+  }
+})
+app.registerExtension({
+  name: 'Mixlab.utils.IntNumber',
+  async beforeRegisterNodeDef (nodeType, nodeData, app) {
+    
+    if (nodeType.comfyClass == 'IntNumber') {
+      const orig_nodeCreated = nodeType.prototype.onNodeCreated
+      nodeType.prototype.onNodeCreated = function () {
+        orig_nodeCreated?.apply(this, arguments)
+        min_max(this)
+      }
+    }
+   
+  },
+  async loadedGraphNode (node, app) {
+    if (node.type === 'IntNumber') {
+      min_max(node)
+    }
+  }
+})

web/javascript/watcher_mixlab.js

@@ -60,30 +60,7 @@ app.registerExtension({
           type: inputData[0], // the type, CHEESE
           name: inputName, // the name, slice
           size: [128, 24], // a default size
-          draw (ctx, node, width, y) {
-            // // 绘制文件图标的函数
-            // function drawFileIcon () {
-            //   // 清空画布
-            //   // ctx.clearRect(0, 0, canvas.width, canvas.height)
-
-            //   // 绘制文件外框
-            //   ctx.fillStyle = '#000'
-            //   ctx.fillRect(5, 5, 40, 40)
-
-            //   // 绘制文件夹图标
-            //   ctx.fillStyle = '#f00'
-            //   ctx.fillRect(10, 15, 30, 20)
-
-            //   // 绘制监听符号
-            //   ctx.beginPath()
-            //   ctx.arc(30, 35, 5, 0, 2 * Math.PI)
-            //   ctx.fillStyle = '#00f'
-            //   ctx.fill()
-            // }
-
-            // // 调用绘制函数
-            // drawFileIcon()
-          },
+          draw (ctx, node, width, y) {},
           computeSize (...args) {
             return [128, 24] // a method to compute the current size of the widget
           },
@@ -124,11 +101,19 @@ app.registerExtension({
       nodeType.prototype.onNodeCreated = function () {
         orig_nodeCreated?.apply(this, arguments)
 
-        console.log('watch widtget', this.widgets)
+        // 虚拟的widget，用于更新节点，让其每次都运行
+        const widget = {
+          type: 'div',
+          name: 'seed',
+          draw (ctx, node, widget_width, y, widget_height) {}
+        }
+
+        this.addCustomWidget(widget)
 
         const watcher = this.widgets.filter(w => w.name == 'watcher')[0]
 
         watcher.callback = () => {
+          console.log('watcher', watcher.value)
           if (watcher.value === 'enable') {
             if (window._mixlab_watcher_t)
               clearInterval(window._mixlab_watcher_t)
@@ -140,7 +125,7 @@ app.registerExtension({
                   window._mixlab_file_path_watcher = json.event_type
                   // widget.card.innerText = window._mixlab_file_path_watcher || ''
                   //运行
-                  document.querySelector('#queue-button').click()
+                  // document.querySelector('#queue-button').click()
                 }
               })
             }, 1000)
@@ -162,15 +147,59 @@ app.registerExtension({
           window._mixlab_file_path_watcher = json.event_type
         })
 
-        /*
-                Add the widget, make sure we clean up nicely, and we do not want to be serialized!
-                */
-        // this.addCustomWidget(widget)
         this.onRemoved = function () {
           // widget.card.remove()
         }
         this.serialize_widgets = true
       }
+
+      const onExecuted = nodeType.prototype.onExecuted
+      nodeType.prototype.onExecuted = function (message) {
+        onExecuted?.apply(this, arguments)
+        console.log(message)
+        try {
+          let seed = this.widgets.filter(w => w.name === 'seed')[0]
+          if (seed) {
+            if (!seed.value) seed.value = 0
+            seed.value += 1
+          }
+        } catch (error) {}
+      }
+    }
+  },
+  async loadedGraphNode (node, app) {
+    if (node.type === 'LoadImagesFromPath') {
+      const watcher = node.widgets.filter(w => w.name == 'watcher')[0]
+      if (watcher) {
+        if (watcher.value === 'enable') {
+          if (window._mixlab_watcher_t) clearInterval(window._mixlab_watcher_t)
+          window._mixlab_watcher_t = setInterval(() => {
+            // 上次路径填充
+            getConfig().then(json => {
+              console.log(json.event_type)
+              if (json.event_type != window._mixlab_file_path_watcher) {
+                window._mixlab_file_path_watcher = json.event_type
+                // widget.card.innerText = window._mixlab_file_path_watcher || ''
+                //运行
+                // document.querySelector('#queue-button').click()
+              }
+            })
+          }, 1000)
+        } else {
+          if (window._mixlab_watcher_t) {
+            clearInterval(window._mixlab_watcher_t)
+          }
+          window._mixlab_watcher_t = null
+        }
+      }
+
+      try {
+        let seed = node.widgets.filter(w => w.name === 'seed')[0]
+        if (seed) {
+          if (!seed.value) seed.value = 0
+          seed.value += 1
+        }
+      } catch (error) {}
     }
   }
 })

web/lib/photoswipe.min.css

@@ -0,0 +1 @@
+/*! PhotoSwipe main CSS by Dmytro Semenov | photoswipe.com */.pswp{--pswp-bg:#000;--pswp-placeholder-bg:#222;--pswp-root-z-index:100000;--pswp-preloader-color:rgba(79, 79, 79, 0.4);--pswp-preloader-color-secondary:rgba(255, 255, 255, 0.9);--pswp-icon-color:#fff;--pswp-icon-color-secondary:#4f4f4f;--pswp-icon-stroke-color:#4f4f4f;--pswp-icon-stroke-width:2px;--pswp-error-text-color:var(--pswp-icon-color)}.pswp{position:fixed;top:0;left:0;width:100%;height:100%;z-index:var(--pswp-root-z-index);display:none;touch-action:none;outline:0;opacity:.003;contain:layout style size;-webkit-tap-highlight-color:transparent}.pswp:focus{outline:0}.pswp *{box-sizing:border-box}.pswp img{max-width:none}.pswp--open{display:block}.pswp,.pswp__bg{transform:translateZ(0);will-change:opacity}.pswp__bg{opacity:.005;background:var(--pswp-bg)}.pswp,.pswp__scroll-wrap{overflow:hidden}.pswp__bg,.pswp__container,.pswp__content,.pswp__img,.pswp__item,.pswp__scroll-wrap,.pswp__zoom-wrap{position:absolute;top:0;left:0;width:100%;height:100%}.pswp__img,.pswp__zoom-wrap{width:auto;height:auto}.pswp--click-to-zoom.pswp--zoom-allowed .pswp__img{cursor:-webkit-zoom-in;cursor:-moz-zoom-in;cursor:zoom-in}.pswp--click-to-zoom.pswp--zoomed-in .pswp__img{cursor:move;cursor:-webkit-grab;cursor:-moz-grab;cursor:grab}.pswp--click-to-zoom.pswp--zoomed-in .pswp__img:active{cursor:-webkit-grabbing;cursor:-moz-grabbing;cursor:grabbing}.pswp--no-mouse-drag.pswp--zoomed-in .pswp__img,.pswp--no-mouse-drag.pswp--zoomed-in .pswp__img:active,.pswp__img{cursor:-webkit-zoom-out;cursor:-moz-zoom-out;cursor:zoom-out}.pswp__button,.pswp__container,.pswp__counter,.pswp__img{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.pswp__item{z-index:1;overflow:hidden}.pswp__hidden{display:none!important}.pswp__content{pointer-events:none}.pswp__content>*{pointer-events:auto}.pswp__error-msg-container{display:grid}.pswp__error-msg{margin:auto;font-size:1em;line-height:1;color:var(--pswp-error-text-color)}.pswp .pswp__hide-on-close{opacity:.005;will-change:opacity;transition:opacity var(--pswp-transition-duration) cubic-bezier(.4,0,.22,1);z-index:10;pointer-events:none}.pswp--ui-visible .pswp__hide-on-close{opacity:1;pointer-events:auto}.pswp__button{position:relative;display:block;width:50px;height:60px;padding:0;margin:0;overflow:hidden;cursor:pointer;background:0 0;border:0;box-shadow:none;opacity:.85;-webkit-appearance:none;-webkit-touch-callout:none}.pswp__button:active,.pswp__button:focus,.pswp__button:hover{transition:none;padding:0;background:0 0;border:0;box-shadow:none;opacity:1}.pswp__button:disabled{opacity:.3;cursor:auto}.pswp__icn{fill:var(--pswp-icon-color);color:var(--pswp-icon-color-secondary)}.pswp__icn{position:absolute;top:14px;left:9px;width:32px;height:32px;overflow:hidden;pointer-events:none}.pswp__icn-shadow{stroke:var(--pswp-icon-stroke-color);stroke-width:var(--pswp-icon-stroke-width);fill:none}.pswp__icn:focus{outline:0}.pswp__img--with-bg,div.pswp__img--placeholder{background:var(--pswp-placeholder-bg)}.pswp__top-bar{position:absolute;left:0;top:0;width:100%;height:60px;display:flex;flex-direction:row;justify-content:flex-end;z-index:10;pointer-events:none!important}.pswp__top-bar>*{pointer-events:auto;will-change:opacity}.pswp__button--close{margin-right:6px}.pswp__button--arrow{position:absolute;top:0;width:75px;height:100px;top:50%;margin-top:-50px}.pswp__button--arrow:disabled{display:none;cursor:default}.pswp__button--arrow .pswp__icn{top:50%;margin-top:-30px;width:60px;height:60px;background:0 0;border-radius:0}.pswp--one-slide .pswp__button--arrow{display:none}.pswp--touch .pswp__button--arrow{visibility:hidden}.pswp--has_mouse .pswp__button--arrow{visibility:visible}.pswp__button--arrow--prev{right:auto;left:0}.pswp__button--arrow--next{right:0}.pswp__button--arrow--next .pswp__icn{left:auto;right:14px;transform:scale(-1,1)}.pswp__button--zoom{display:none}.pswp--zoom-allowed .pswp__button--zoom{display:block}.pswp--zoomed-in .pswp__zoom-icn-bar-v{display:none}.pswp__preloader{position:relative;overflow:hidden;width:50px;height:60px;margin-right:auto}.pswp__preloader .pswp__icn{opacity:0;transition:opacity .2s linear;animation:pswp-clockwise .6s linear infinite}.pswp__preloader--active .pswp__icn{opacity:.85}@keyframes pswp-clockwise{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}.pswp__counter{height:30px;margin-top:15px;margin-inline-start:20px;font-size:14px;line-height:30px;color:var(--pswp-icon-color);text-shadow:1px 1px 3px var(--pswp-icon-color-secondary);opacity:.85}.pswp--one-slide .pswp__counter{display:none}