Update App.py

publish routes without having to replicate add_routes

README.md

@@ -1,5 +1,7 @@
 > 适配了最新版comfyui的py3.11 ，torch 2.1.2+cu121
 
+> [discord](https://discord.gg/cXs9vZSqeK)
+
 ## 🚀🚗🚚🏃 Workflow-to-APP 
 - 新增AppInfo节点，可以通过简单的配置，把workflow转变为一个Web APP。
 - 支持多个web app 切换
@@ -31,7 +33,9 @@ APP-JSON:
 
 > 暂时支持8种节点作为界面上的输入节点：Load Image、CLIPTextEncode、PromptSlide、TextInput_、Color、FloatSlider、IntNumber、CheckpointLoaderSimple、LoraLoader
 
-> 输出节点：PreviewImage 、SaveImage、ShowTextForGPT、VHS_VideoCombine
+> 输出节点：PreviewImage 、SaveImage、ShowTextForGPT、VHS_VideoCombine、PromptImage
+
+> seed统一输入控件，支持：SamplerCustom、KSampler
 
 
 ## 🏃🚗🚚🚀  Real-time Design
@@ -65,7 +69,7 @@ https://github.com/shadowcz007/comfyui-mixlab-nodes/assets/12645064/e7e77f90-e43
 > PromptSlide
 ![](./assets/prompt_weight.png)
 
-![](./workflow/promptslide-appinfo-workflow.svg)
+<!-- ![](./workflow/promptslide-appinfo-workflow.svg) -->
 
 > randomPrompt
 
@@ -75,6 +79,13 @@ https://github.com/shadowcz007/comfyui-mixlab-nodes/assets/12645064/e7e77f90-e43
 
 [add clip-interrogator](https://github.com/pharmapsychotic/clip-interrogator)
 
+> PromptImage & PromptSimplification,Assist in simplifying prompt words, comparing images and prompt word nodes.
+
+> ChinesePrompt && PromptGenerate，中文prompt节点，直接用中文书写你的prompt
+
+![](./assets/ChinesePrompt_workflow.svg)
+
+
 ### 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.
 
@@ -106,6 +117,11 @@ https://github.com/shadowcz007/comfyui-mixlab-nodes/assets/12645064/e7e77f90-e43
 
 - [Added DynamicDelayByText, enabling delayed execution based on input text length.](./workflow/audio-chatgpt-workflow.json)
 
+- [使用CkptNames 对比不同的模型效果](./workflow/ckpts-image-workflow.json)
+
+- [CkptNames compare the effects of different models.](./workflow/ckpts-image-workflow.json)
+
+
 
 ## Other Nodes
 
@@ -154,23 +170,19 @@ An improvement has been made to directly redirect to GitHub to search for missin
 ![node-not-found](./assets/node-not-found.png)
 
 
-### Update 
-v0.8.0 🚀🚗🚚🏃‍ LaMaInpainting
-- 新增 LaMaInpainting
-- 优化color节点的输出
-- 修复高清显示屏上定位节点不准的情况
-
-- Add LaMaInpainting
-- Optimize the output of the color node
-- Fix the issue of inaccurate positioning node on high-definition display screens
-
-
 ### Models
+
+[Download rembg Models](https://github.com/danielgatis/rembg/tree/main#Models),move to:models/rembg
+
 [Download CLIPSeg](https://huggingface.co/CIDAS/clipseg-rd64-refined/tree/main), move to : models/clipseg
 
 [Download lama](https://github.com/enesmsahin/simple-lama-inpainting/releases/download/v0.1.0/big-lama.pt), move to : models/lama
 
-[Download Salesforce\blip-image-captioning-base](https://huggingface.co/Salesforce/blip-image-captioning-base), move to : models/clip_interrogator/Salesforce/blip-image-captioning-base
+[Download Salesforce/blip-image-captioning-base](https://huggingface.co/Salesforce/blip-image-captioning-base), move to : models/clip_interrogator/Salesforce/blip-image-captioning-base
+
+[Download succinctly/text2image-prompt-generator](https://huggingface.co/succinctly/text2image-prompt-generator/tree/main),move to:prompt_generator/text2image-prompt-generator
+
+[Download Helsinki-NLP/opus-mt-zh-en](https://huggingface.co/Helsinki-NLP/opus-mt-zh-en/tree/main),move to:prompt_generator/opus-mt-zh-en
 
 ## Installation
 
@@ -211,9 +223,6 @@ pip3 install -r requirements.txt
 #### discussions:
 [discussions](https://github.com/shadowcz007/comfyui-mixlab-nodes/discussions)
 
-### TODO:
-- 音频播放节点：带可视化、支持多音轨、可配置音轨音量
-- vector https://github.com/GeorgLegato/stable-diffusion-webui-vectorstudio
 
 
 <picture>

__init__.py

@@ -192,7 +192,7 @@ def read_workflow_json_files(folder_path ):
 def get_workflows():
     # print("#####path::", current_path)
     workflow_path=os.path.join(current_path, "workflow")
-    print('workflow_path: ',workflow_path)
+    # print('##workflow_path: ',workflow_path)
     if not os.path.exists(workflow_path):
         # 使用mkdir()方法创建新目录
         os.mkdir(workflow_path)
@@ -231,8 +231,14 @@ def get_my_workflow_for_app(filename="my_workflow_app.json",category="",is_all=F
                     })
                 else:
                     category=''
+                    input=None
+                    output=None
                     if 'category' in x['app']:
                         category=x['app']['category']
+                    if 'input' in x['app']:
+                        input=x['app']['input']
+                    if 'output' in x['app']:
+                        output=x['app']['output']
                     apps.append({
                         "filename":item["filename"],
                         "category":category,
@@ -244,6 +250,8 @@ def get_my_workflow_for_app(filename="my_workflow_app.json",category="",is_all=F
                                 "icon":(x['app']['icon'] if 'icon' in x['app'] else None),
                                 "name":x['app']['name'],
                                 "version":x['app']['version'],
+                                "input":input,
+                                "output":output
                             }
                         },
                         "date":item["date"]
@@ -271,8 +279,14 @@ def get_my_workflow_for_app(filename="my_workflow_app.json",category="",is_all=F
                 # print(apps[0]['filename'] ,item["filename"])
                 if apps[0]['filename']!=item["filename"]:
                     category=''
+                    input=None
+                    output=None
                     if 'category' in x['app']:
                         category=x['app']['category']
+                    if 'input' in x['app']:
+                        input=x['app']['input']
+                    if 'output' in x['app']:
+                        output=x['app']['output']
                     apps.append({
                         "filename":item["filename"],
                         # "category":category,
@@ -284,6 +298,8 @@ def get_my_workflow_for_app(filename="my_workflow_app.json",category="",is_all=F
                                 "icon":(x['app']['icon'] if 'icon' in x['app'] else None),
                                 "name":x['app']['name'],
                                 "version":x['app']['version'],
+                                "input":input,
+                                "output":output
                             }
                         },
                         "date":item["date"]
@@ -351,33 +367,62 @@ 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()
 
+        PromptServer.instance.port=port
+
+
         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'
@@ -388,7 +433,7 @@ async def new_start(self, address, port, verbose=True, call_on_start=None):
 PromptServer.start=new_start
 
 # 创建路由表
-routes = web.RouteTableDef()
+routes = PromptServer.instance.routes
 
 @routes.post('/mixlab')
 async def mixlab_hander(request):
@@ -451,6 +496,7 @@ async def mixlab_workflow_hander(request):
                     'status':'success',
                 }
             elif data['task']=='list':
+                # 暂时没有用到
                 result={
                     'data':get_workflows(),
                     'status':'success',
@@ -474,22 +520,6 @@ async def nodes_map_hander(request):
 
     return web.json_response(result)
 
-# 把插件自定义的路由添加到comfyui server里
-def new_add_routes(self):
-        import nodes
-        self.app.add_routes(routes)
-        self.app.add_routes(self.routes)
-        for name, dir in nodes.EXTENSION_WEB_DIRS.items():
-            self.app.add_routes([
-                web.static('/extensions/' + urllib.parse.quote(name), dir, follow_symlinks=True),
-            ])
-        self.app.add_routes([
-            web.static('/', self.web_root, follow_symlinks=True),
-        ])
-
-PromptServer.add_routes=new_add_routes
-
-
 
 # 扩展api接口
 # from server import PromptServer
@@ -503,24 +533,29 @@ PromptServer.add_routes=new_add_routes
 
 
 # 导入节点
-from .nodes.PromptNode import RandomPrompt,PromptSlide
-from .nodes.ImageNode import NoiseImage,TransparentImage,GradientImage,LoadImagesFromPath,LoadImagesFromURL,ResizeImage,TextImage,SvgImage,Image3D,ShowLayer,NewLayer,MergeLayers,AreaToMask,SmoothMask,FeatheredMask,SplitLongMask,ImageCropByAlpha,EnhanceImage,FaceToMask
+from .nodes.PromptNode import EmbeddingPrompt,RandomPrompt,PromptSlide,PromptSimplification,PromptImage,JoinWithDelimiter
+from .nodes.ImageNode import SaveImageToLocal,SplitImage,GridOutput,GetImageSize_,MirroredImage,ImageColorTransfer,NoiseImage,TransparentImage,GradientImage,LoadImagesFromPath,LoadImagesFromURL,ResizeImage,TextImage,SvgImage,Image3D,ShowLayer,NewLayer,MergeLayers,CenterImage,AreaToMask,SmoothMask,SplitLongMask,ImageCropByAlpha,EnhanceImage,FaceToMask
 from .nodes.Vae import VAELoader,VAEDecode
 from .nodes.ScreenShareNode import ScreenShareNode,FloatingVideo
 from .nodes.Clipseg import CLIPSeg,CombineMasks
 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
+from .nodes.Utils import CreateLoraNames,CreateSampler_names,CreateCkptNames,CreateSeedNode,TESTNODE_,IntNumber,FloatSlider,TextInput,ColorInput,FontInput,TextToNumber,DynamicDelayProcessor,LimitNumber,SwitchByIndex,MultiplicationNode
+from .nodes.Mask import OutlineMask,FeatheredMask
+from .nodes.App import AppInfo,AppNode
 
 # 要导出的所有节点及其名称的字典
 # 注意：名称应全局唯一
 NODE_CLASS_MAPPINGS = {
     "AppInfo":AppInfo,
+    "AppNode":AppNode,
+    "TESTNODE_":TESTNODE_,
     "RandomPrompt":RandomPrompt,
+    "EmbeddingPrompt":EmbeddingPrompt,
     "PromptSlide":PromptSlide,
-    "ClipInterrogator":ClipInterrogator,
+    "PromptSimplification":PromptSimplification,
+    "PromptImage":PromptImage,
+    "MirroredImage":MirroredImage,
     "NoiseImage":NoiseImage,
     "GradientImage":GradientImage,
     "TransparentImage":TransparentImage,
@@ -531,8 +566,12 @@ NODE_CLASS_MAPPINGS = {
     "EnhanceImage":EnhanceImage,
     "SvgImage":SvgImage,
     "3DImage":Image3D, 
+    "ImageColorTransfer":ImageColorTransfer,
     "ShowLayer":ShowLayer,
     "NewLayer":NewLayer,
+    "SplitImage":SplitImage,
+    "CenterImage":CenterImage,
+    "GridOutput":GridOutput,
     "MergeLayers":MergeLayers,
     "SplitLongMask":SplitLongMask,
     "FeatheredMask":FeatheredMask,
@@ -541,6 +580,7 @@ NODE_CLASS_MAPPINGS = {
     "AreaToMask":AreaToMask,
     "ImageCropByAlpha":ImageCropByAlpha,
     "VAELoaderConsistencyDecoder":VAELoader,
+    "SaveImageToLocal":SaveImageToLocal,
     "VAEDecodeConsistencyDecoder":VAEDecode,
     "ScreenShare":ScreenShareNode,
     "FloatingVideo":FloatingVideo,
@@ -562,7 +602,13 @@ NODE_CLASS_MAPPINGS = {
     "GetImageSize_":GetImageSize_,
     "SwitchByIndex":SwitchByIndex,
     "LimitNumber":LimitNumber, 
-    "LaMaInpainting":LaMaInpainting
+    "OutlineMask":OutlineMask,
+    "JoinWithDelimiter":JoinWithDelimiter,
+    "Seed_":CreateSeedNode,
+    "CkptNames_":CreateCkptNames,
+    "SamplerNames_":CreateSampler_names,
+    "LoraNames_":CreateLoraNames
+    # "LaMaInpainting":LaMaInpainting
     # "GamePal":GamePal
 }
 
@@ -584,14 +630,53 @@ NODE_DISPLAY_NAME_MAPPINGS = {
     "3DImage":"3DImage ♾️Mixlab",
     "DynamicDelayProcessor":"DynamicDelayByText ♾️Mixlab",
     "LaMaInpainting":"LaMaInpainting ♾️Mixlab",
-    "PromptSlide":"PromptSlide ♾️Mixlab"
-
-    # "GamePal":"GamePal ♾️Mixlab"
+    "PromptSlide":"PromptSlide ♾️Mixlab",
+    "PromptGenerate_Mix":"PromptGenerate ♾️Mixlab",
+    "ChinesePrompt_Mix":"ChinesePrompt ♾️Mixlab",
+    "GamePal":"GamePal ♾️Mixlab",
+    "RembgNode_Mix":"Removebg",
+    "LoraNames_":"LoraName_TriggerWords.safetensors"
 }
 
 # web ui的节点功能
 WEB_DIRECTORY = "./web"
 
 print('--------------')
-print('\033[91m ### Mixlab Nodes: \033[93mLoaded\033[0m')
-print('--------------')
+print('\033[91m ### Mixlab Nodes: \033[93mLoaded')
+
+try:
+    from .nodes.Lama import LaMaInpainting
+    print('LaMaInpainting.available',LaMaInpainting.available)
+    if LaMaInpainting.available:
+        NODE_CLASS_MAPPINGS['LaMaInpainting']=LaMaInpainting
+except Exception as e:
+    print('LaMaInpainting.available',False,e)
+
+try:
+    from .nodes.ClipInterrogator import ClipInterrogator
+    print('ClipInterrogator.available',ClipInterrogator.available)
+    if ClipInterrogator.available:
+        NODE_CLASS_MAPPINGS['ClipInterrogator']=ClipInterrogator
+except Exception as e:
+    print('ClipInterrogator.available',False,e)
+
+try:
+    from .nodes.TextGenerateNode import PromptGenerate,ChinesePrompt
+    print('PromptGenerate.available',PromptGenerate.available)
+    if PromptGenerate.available:
+        NODE_CLASS_MAPPINGS['PromptGenerate_Mix']=PromptGenerate
+    print('ChinesePrompt.available',ChinesePrompt.available)
+    if ChinesePrompt.available:
+        NODE_CLASS_MAPPINGS['ChinesePrompt_Mix']=ChinesePrompt
+except Exception as e:
+    print('TextGenerateNode.available',False,e)
+
+try:
+    from .nodes.RembgNode import RembgNode_
+    print('RembgNode_.available',RembgNode_.available)
+    if RembgNode_.available:
+        NODE_CLASS_MAPPINGS['RembgNode_Mix']=RembgNode_
+except Exception as e:
+    print('RembgNode_.available',False,e)
+
+print('\033[93m -------------- \033[0m')

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/clothes.txt

@@ -0,0 +1,30 @@
+Elegant evening gown
+Casual jeans and t-shirt
+Formal black suit
+Stylish leather jacket
+Flowy bohemian dress
+Sporty tracksuit
+Chic little black dress
+Trendy ripped jeans
+Classic white button-down shirt
+Cozy oversized sweater
+Sophisticated tailored blazer
+Quirky patterned leggings
+Striped sailor top
+Polished knee-length skirt
+Vintage-inspired floral dress
+Edgy motorcycle jacket
+Preppy polo shirt
+Boho maxi skirt
+Professional pinstripe suit
+Relaxed denim shorts
+Glamorous sequined dress
+Athletic running shoes
+Formal bow tie
+Casual baseball cap
+Stylish fedora hat
+Warm woolen scarf
+Comfortable cotton socks
+Trendy ankle boots
+Cute summer sandals
+Cozy pajama set

data/expressions.txt

@@ -0,0 +1,30 @@
+Happy
+Sad
+Angry
+Surprised
+Excited
+Worried
+Confused
+Disgusted
+Amused
+Bored
+Curious
+Embarrassed
+Frustrated
+Nervous
+Pleased
+Relieved
+Shy
+Tired
+Serious
+Silly
+Proud
+Grumpy
+Smug
+Sarcastic
+Flirty
+Skeptical
+Shocked
+Blissful
+Envious
+Mischievous

data/extension-node-map.json

@@ -4761,17 +4761,29 @@
     ],
     "https://github.com/shadowcz007/comfyui-mixlab-nodes": [
         [
+            "GridOutput",
+            "SplitImage",
+            "PromptGenerate_Mix",
+            "JoinWithDelimiter",
+            "ChinesePrompt_Mix",
             "3DImage",
             "AppInfo",
+            "AppNode",
             "IntNumber",
             "FloatSlider",
             "ResizeImage",
             "NoiseImage",
+            "PromptImage",
+            "SaveImageToLocal",
             "AreaToMask",
             "CLIPSeg_",
             "CharacterInText",
             "ChatGPTOpenAI",
             "Color",
+            "Seed_",
+            "CkptNames_",
+            "SamplerNames_",
+            "LoraNames_",
             "CombineMasks_",
             "EnhanceImage",
             "GradientImage",
@@ -4784,8 +4796,10 @@
             "LoadImagesFromURL",
             "MergeLayers",
             "NewLayer",
+            "CenterImage",
             "RandomPrompt",
             "PromptSlide",
+            "PromptSimplification",
             "ClipInterrogator",
             "ScreenShare",
             "ShowLayer",
@@ -4803,7 +4817,8 @@
             "TextToNumber",
             "TextInput_",
             "DynamicDelayProcessor",
-            "LaMaInpainting"
+            "LaMaInpainting",
+            "Moondream"
         ],
         {
             "title_aux": "comfyui-mixlab-nodes"

data/profession.txt

@@ -0,0 +1,101 @@
+Doctor
+Teacher
+Engineer
+Lawyer
+Accountant
+Nurse
+Architect
+Chef
+Pilot
+Scientist
+Artist
+Writer
+Musician
+Actor
+Photographer
+Police officer
+Firefighter
+Dentist
+Pharmacist
+Veterinarian
+Electrician
+Plumber
+Carpenter
+Mechanic
+Farmer
+Astronaut
+Athlete
+Journalist
+Politician
+Economist
+Psychologist
+Social worker
+Librarian
+Translator
+Salesperson
+Entrepreneur
+Financial advisor
+Graphic designer
+Web developer
+Marketing manager
+Human resources manager
+Project manager
+Event planner
+Fashion designer
+Interior decorator
+Real estate agent
+Archaeologist
+Biologist
+Chemist
+Geologist
+Physicist
+Mathematician
+Historian
+Geographer
+Economist
+Sociologist
+Anthropologist
+Archaeologist
+Linguist
+Philosopher
+Economist
+Sociologist
+Anthropologist
+Archaeologist
+Linguist
+Philosopher
+Geographer
+Historian
+Economist
+Sociologist
+Anthropologist
+Archaeologist
+Linguist
+Philosopher
+Geographer
+Historian
+Economist
+Sociologist
+Anthropologist
+Archaeologist
+Linguist
+Philosopher
+Geographer
+Historian
+Economist
+Sociologist
+Anthropologist
+Archaeologist
+Linguist
+Philosopher
+Geographer
+Historian
+Economist
+Sociologist
+Anthropologist
+Archaeologist
+Linguist
+Philosopher
+Geographer
+Historian
+                     #MixCopilot

data/space.txt

@@ -0,0 +1,58 @@
+Residential space
+Apartment building
+Villa
+Bungalow
+Condominium
+Commercial space
+Shopping mall
+Supermarket
+Restaurant
+Store
+Market
+Office space
+Office building
+Office
+Meeting room
+Co-working space
+Educational space
+School
+University
+Training institution
+Library
+Laboratory
+Medical space
+Hospital
+Clinic
+Pharmacy
+Nursing home
+Rehabilitation center
+Cultural space
+Museum
+Library
+Theater
+Concert hall
+Gallery
+Sports space
+Sports stadium
+Gym
+Swimming pool
+Basketball court
+Football field
+Transportation space
+Airport
+Train station
+Subway station
+Bus stop
+Parking lot
+Public space
+Park
+Square
+Street
+Pedestrian street
+Community center
+Industrial space
+Factory
+Warehouse
+Production workshop
+Mine
+Power plant

nodes/App.py

@@ -0,0 +1,397 @@
+import os,sys
+# import re,random,json
+from PIL import Image
+import numpy as np
+# FONT_PATH= os.path.abspath(os.path.join(os.path.dirname(__file__),'../assets/王汉宗颜楷体繁.ttf'))
+import folder_paths
+#
+import os
+import json
+import datetime
+
+import folder_paths
+from server import PromptServer
+import importlib.util
+
+
+def is_installed(package):
+    try:
+        spec = importlib.util.find_spec(package)
+    except ModuleNotFoundError:
+        return False
+    return spec is not None
+
+
+class AnyType(str):
+  """A special class that is always equal in not equal comparisons. Credit to pythongosssss"""
+
+  def __ne__(self, __value: object) -> bool:
+    return False
+
+any_type = AnyType("*")
+
+app_path = os.path.abspath(os.path.join(os.path.dirname(__file__),'../app'))
+
+# 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()
+
+                option=os.path.basename(os.path.dirname(file_path))+'/'+os.path.basename(file_path)
+                if os.path.dirname(file_path) == folder_path:
+                    option=os.path.basename(file_path)
+
+                file_info = {
+                    'filename': os.path.basename(file_path),
+                    'category': os.path.dirname(file_path),
+                    'data': json_data,
+                    'date': numeric_timestamp,
+                    "option":option
+                }
+                data.append(file_info)
+        except Exception as e:
+            print(e)
+    
+    sorted_data = sorted(data, key=lambda x: x['date'], reverse=True)
+    return sorted_data
+
+def tensor2pil(image):
+    return Image.fromarray(np.clip(255. * image.cpu().numpy().squeeze(), 0, 255).astype(np.uint8))
+
+
+def create_temp_file(image):
+    output_dir = folder_paths.get_temp_directory()
+
+    (
+            full_output_folder,
+            filename,
+            counter,
+            subfolder,
+            _,
+        ) = folder_paths.get_save_image_path('tmp', output_dir)
+
+    
+    im=tensor2pil(image)
+ 
+    image_file = f"{filename}_{counter:05}.png"
+     
+    image_path=os.path.join(full_output_folder, image_file)
+
+    im.save(image_path,compress_level=4)
+
+    return [{
+                "filename": image_file,
+                "subfolder": subfolder,
+                "type": "temp"
+                }]
+
+
+
+try:
+    if is_installed('websocket')==False:
+        import subprocess
+
+        # 安装
+        print('#pip install websocket-client')
+
+        result = subprocess.run([sys.executable, '-s', '-m', 'pip', 'install', 'websocket-client'], capture_output=True, text=True)
+
+        #检查命令执行结果
+        if result.returncode == 0:
+            print("#install success")
+            import websocket 
+        else:
+            print("#install error")
+        
+    else:
+        import websocket 
+        # NOTE: websocket-client (https://github.com/websocket-client/websocket-client)
+
+except:
+    print("#websocket-client error")
+#This is an example that uses the websockets api to know when a prompt execution is done
+#Once the prompt execution is done it downloads the images using the /history endpoint
+
+import uuid
+import json
+import urllib.request
+import urllib.parse
+
+server_address = "127.0.0.1:8188"
+client_id = str(uuid.uuid4())
+
+def queue_prompt(prompt):
+    p = {"prompt": prompt, "client_id": client_id}
+    data = json.dumps(p).encode('utf-8')
+    req =  urllib.request.Request("http://{}/prompt".format(server_address), data=data)
+    return json.loads(urllib.request.urlopen(req).read())
+
+def get_image(filename, subfolder, folder_type):
+    data = {"filename": filename, "subfolder": subfolder, "type": folder_type}
+    url_values = urllib.parse.urlencode(data)
+    with urllib.request.urlopen("http://{}/view?{}".format(server_address, url_values)) as response:
+        return response.read()
+
+def get_history(prompt_id):
+    with urllib.request.urlopen("http://{}/history/{}".format(server_address, prompt_id)) as response:
+        return json.loads(response.read())
+
+def get_images(ws, prompt):
+    prompt_id = queue_prompt(prompt)['prompt_id']
+    output_images = {}
+    while True:
+        out = ws.recv()
+        if isinstance(out, str):
+            message = json.loads(out)
+            if message['type'] == 'executing':
+                data = message['data']
+                if data['node'] is None and data['prompt_id'] == prompt_id:
+                    break #Execution is done
+        else:
+            continue #previews are binary data
+
+    history = get_history(prompt_id)[prompt_id]
+    for o in history['outputs']:
+        for node_id in history['outputs']:
+            node_output = history['outputs'][node_id]
+            if 'images' in node_output:
+                images_output = []
+                for image in node_output['images']:
+                    image_data = get_image(image['filename'], image['subfolder'], image['type'])
+                    images_output.append(image_data)
+            output_images[node_id] = images_output
+
+    return output_images
+
+prompt_text = """
+{
+    "3": {
+        "class_type": "KSampler",
+        "inputs": {
+            "cfg": 8,
+            "denoise": 1,
+            "latent_image": [
+                "5",
+                0
+            ],
+            "model": [
+                "4",
+                0
+            ],
+            "negative": [
+                "7",
+                0
+            ],
+            "positive": [
+                "6",
+                0
+            ],
+            "sampler_name": "euler",
+            "scheduler": "normal",
+            "seed": 8566257,
+            "steps": 20
+        }
+    },
+    "4": {
+        "class_type": "CheckpointLoaderSimple",
+        "inputs": {
+            "ckpt_name": "v1-5-pruned-emaonly.ckpt"
+        }
+    },
+    "5": {
+        "class_type": "EmptyLatentImage",
+        "inputs": {
+            "batch_size": 1,
+            "height": 512,
+            "width": 512
+        }
+    },
+    "6": {
+        "class_type": "CLIPTextEncode",
+        "inputs": {
+            "clip": [
+                "4",
+                1
+            ],
+            "text": "masterpiece best quality girl"
+        }
+    },
+    "7": {
+        "class_type": "CLIPTextEncode",
+        "inputs": {
+            "clip": [
+                "4",
+                1
+            ],
+            "text": "bad hands"
+        }
+    },
+    "8": {
+        "class_type": "VAEDecode",
+        "inputs": {
+            "samples": [
+                "3",
+                0
+            ],
+            "vae": [
+                "4",
+                2
+            ]
+        }
+    },
+    "9": {
+        "class_type": "SaveImage",
+        "inputs": {
+            "filename_prefix": "ComfyUI",
+            "images": [
+                "8",
+                0
+            ]
+        }
+    }
+}
+"""
+
+# prompt = json.loads(prompt_text)
+# #set the text prompt for our positive CLIPTextEncode
+# prompt["6"]["inputs"]["text"] = "masterpiece best quality man"
+
+# #set the seed for our KSampler node
+# prompt["3"]["inputs"]["seed"] = 5
+
+# ws = websocket.WebSocket()
+# ws.connect("ws://{}/ws?clientId={}".format(server_address, client_id))
+# images = get_images(ws, prompt)
+
+# #Commented out code to display the output images:
+
+# # for node_id in images:
+# #     for image_data in images[node_id]:
+# #         from PIL import Image
+# #         import io
+# #         image = Image.open(io.BytesIO(image_data))
+# #         image.show()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# app 配置节点
+class AppInfo:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": { 
+                    "name": ("STRING",{"multiline": False,"default": "Mixlab-App","dynamicPrompts": False}),
+                    "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":{
+                    "IMAGE": ("IMAGE",),
+                    "description":("STRING",{"multiline": True,"default": "","dynamicPrompts": False}),
+                    "version":("INT", {
+                        "default": 1, 
+                        "min": 1, 
+                        "max": 10000, 
+                        "step": 1, 
+                        "display": "number"  
+                    }),
+                    "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 = ()
+    # RETURN_NAMES = ("IMAGE",)
+
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab"
+
+    OUTPUT_NODE = True
+    INPUT_IS_LIST = True
+    # OUTPUT_IS_LIST = (True,)
+
+    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，
+
+        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,category]}, "result": ()}
+    
+
+
+#  app可以当成节点运行
+class AppNode:
+   
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": { 
+                    "name": ([x['option'] for x in read_workflow_json_files_all(app_path)],),
+                    "image":("IMAGE",),
+                             }
+                }
+    
+    RETURN_TYPES = (any_type,)
+    RETURN_NAMES = ("output",)
+
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab"
+
+    OUTPUT_NODE = True
+    INPUT_IS_LIST = False
+    OUTPUT_IS_LIST = (False,)
+    
+
+    def run(self,name,input):
+        print('#app_path',input)
+        print(PromptServer.instance.port)
+
+        return (name,)
+    
+

nodes/Audio.py

@@ -24,7 +24,7 @@ class SpeechRecognition:
 
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/audio"
+    CATEGORY = "♾️Mixlab/Audio"
 
     INPUT_IS_LIST = False
     OUTPUT_IS_LIST = (False,)
@@ -48,7 +48,7 @@ class SpeechSynthesis:
     OUTPUT_NODE = True
     OUTPUT_IS_LIST = (True,)
 
-    CATEGORY = "♾️Mixlab/audio"
+    CATEGORY = "♾️Mixlab/Audio"
 
     def run(self, text):
         # print(session_history)
@@ -82,7 +82,7 @@ class GamePal:
     OUTPUT_NODE = True
     OUTPUT_IS_LIST = (False,)
 
-    CATEGORY = "♾️Mixlab/audio"
+    CATEGORY = "♾️Mixlab/Audio"
 
     def run(self, input_text,input_num,python_code):
         exec(python_code)

nodes/ChatGPT.py

@@ -1,7 +1,15 @@
 import openai 
 import time
 import urllib.error
-import re,json
+import re,json,os,string,random
+import folder_paths
+
+
+def generate_random_string(length):
+    letters = string.ascii_letters + string.digits
+    return ''.join(random.choice(letters) for _ in range(length))
+
+
 
 #  判断是否是azure服务
 def is_azure_url(url):
@@ -73,8 +81,8 @@ class ChatGPTNode:
     def INPUT_TYPES(cls):
         return {
             "required": {
-                "api_key":("KEY", {"default": "", "multiline": True}),
-                "api_url":("URL", {"default": "", "multiline": True}),
+                "api_key":("KEY", {"default": "", "multiline": True,"dynamicPrompts": False}),
+                "api_url":("URL", {"default": "", "multiline": True,"dynamicPrompts": False}),
                 "prompt": ("STRING", {"multiline": True,"dynamicPrompts": False}),
                 "system_content": ("STRING", 
                                    {
@@ -168,7 +176,10 @@ class ShowTextForGPT:
         return {
             "required": {
                 "text": ("STRING", {"forceInput": True,"dynamicPrompts": False}),
-            }
+            },
+            "optional":{ 
+                    "output_dir": ("STRING",{"default": "","multiline": True,"dynamicPrompts": False}), 
+                }
         }
 
     INPUT_IS_LIST = True
@@ -179,9 +190,19 @@ class ShowTextForGPT:
 
     CATEGORY = "♾️Mixlab/GPT"
 
-    def run(self, text):
-        # print(session_history)
+    def run(self, text,output_dir):
+        output_dir=output_dir[0]
+        filename=generate_random_string(4)+'.txt'
+
+        if output_dir=='':
+            output_dir = folder_paths.get_temp_directory()
+        
+        save_to_dirpath=os.path.join(output_dir,filename)
+        with open(save_to_dirpath, 'w') as file:
+            file.write("\n".join(text))
+        # print(text)
         return {"ui": {"text": text}, "result": (text,)}
+        
 
 
 class CharacterInText:

nodes/ClipInterrogator.py

@@ -1,15 +1,61 @@
-import os
+import os,sys
 import folder_paths
 
 from PIL import Image
+import importlib.util
+
 import comfy.utils
 import numpy as np
 import json
 import torch
+import random
+
+
+# from clip_interrogator import Config, Interrogator
+
+
+global _available
+_available=False
+
+def is_installed(package):
+    try:
+        spec = importlib.util.find_spec(package)
+    except ModuleNotFoundError:
+        return False
+    return spec is not None
+
+
+try:
+    if is_installed('clip_interrogator')==False:
+        import subprocess
+
+        # 安装
+        print('#pip install clip-interrogator==0.6.0')
+
+        result = subprocess.run([sys.executable, '-s', '-m', 'pip', 'install', 'clip-interrogator==0.6.0'], capture_output=True, text=True)
+
+        #检查命令执行结果
+        if result.returncode == 0:
+            print("#install success")
+            from clip_interrogator import Config, Interrogator
+            _available=True
+        else:
+            print("#install error")
+        
+    else:
+        from clip_interrogator import Config, Interrogator
+        _available=True
+
+except:
+    _available=False
+
+try:
+    from transformers import AutoProcessor, BlipForConditionalGeneration
+except:
+    _available=False
+    print('pls check  transformers.__version__>=4.36.0:: AutoProcessor, BlipForConditionalGeneration')
 
-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
@@ -28,10 +74,11 @@ def load_caption_model(model_path,config,t='blip-base'):
 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")
+    caption_model_path='Salesforce/blip-image-captioning-base'
 
 cache_path=os.path.join(folder_paths.models_dir, "clip_interrogator")
-
-
+if not os.path.exists(cache_path):
+    os.mkdir(cache_path)
 
 # Tensor to PIL
 def tensor2pil(image):
@@ -42,7 +89,7 @@ def pil2tensor(image):
     return torch.from_numpy(np.array(image).astype(np.float32) / 255.0).unsqueeze(0)
 
 
-def image_analysis(ci,image):
+def image_analysis_fn(ci,image):
     image = image.convert('RGB')
     image_features = ci.image_to_features(image)
 
@@ -58,7 +105,53 @@ def image_analysis(ci,image):
     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, artist_ranks, movement_ranks, trending_ranks, flavor_ranks
+    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
@@ -79,6 +172,10 @@ def image_to_prompt(ci,image, mode):
 
 
 class ClipInterrogator:
+
+    global _available
+    available=_available
+    
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
@@ -86,17 +183,22 @@ class ClipInterrogator:
             "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","analysis",)
+    RETURN_NAMES = ("prompt","random_samples",)
 
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/prompt"
-
+    CATEGORY = "♾️Mixlab/Prompt"
+    OUTPUT_NODE = True
     INPUT_IS_LIST = True
-    OUTPUT_IS_LIST = (True,)
+    OUTPUT_IS_LIST = (True,True,)
     global ci
     ci = None
     def run(self,image,prompt_mode,image_analysis):
@@ -137,8 +239,8 @@ class ClipInterrogator:
             im=im.convert('RGB')
 
             if analysis=='on':
-                analysis_res=image_analysis(ci,im)
-                analysis_result.append(json.dumps(analysis_res))
+                analysis_res=image_analysis_fn(ci,im)
+                analysis_result.append( analysis_res )
                 pbar.update(1)
 
             prompt=image_to_prompt(ci,im,prompt_mode)
@@ -155,4 +257,22 @@ class ClipInterrogator:
             ci.caption_model = ci.caption_model.to('cpu')
             ci.caption_offloaded = True
 
-        return {"ui":{"prompt": prompt_result,"analysis":analysis_result},"result": (prompt_result,analysis_result,)}
+        # 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/Clipseg.py

@@ -106,13 +106,13 @@ class CLIPSeg:
                      },
                 "optional":
                     {
-                        "blur": ("FLOAT", {"min": 0, "max": 15, "step": 0.1, "default": 7}),
-                        "threshold": ("FLOAT", {"min": 0, "max": 1, "step": 0.05, "default": 0.4}),
+                        "blur": ("FLOAT", {"min": 0, "max": 15, "step": 0.1, "default": 3}),
+                        "threshold": ("FLOAT", {"min": 0, "max": 1, "step": 0.05, "default": 0.3}),
                         "dilation_factor": ("INT", {"min": 0, "max": 10, "step": 1, "default": 4}),
                     }
                 }
 
-    CATEGORY = "♾️Mixlab/mask"
+    CATEGORY = "♾️Mixlab/Mask"
     RETURN_TYPES = ("MASK", "IMAGE", "IMAGE",)
     RETURN_NAMES = ("Mask","Heatmap Mask", "BW Mask")
 
@@ -218,7 +218,7 @@ class CombineMasks:
                     },
                 }
         
-    CATEGORY = "♾️Mixlab/mask"
+    CATEGORY = "♾️Mixlab/Mask"
     RETURN_TYPES = ("MASK", "IMAGE", "IMAGE",)
     RETURN_NAMES = ("Combined Mask","Heatmap Mask", "BW Mask")
 

nodes/Lama.py

@@ -1,13 +1,50 @@
-import os
+import os,sys
 import folder_paths
-from simple_lama_inpainting import SimpleLama
-from PIL import Image
 
+from PIL import Image
+import importlib.util
 import numpy as np
 
 import torch
 
+global _available
+_available=False
 
+def is_installed(package):
+    try:
+        spec = importlib.util.find_spec(package)
+    except ModuleNotFoundError:
+        return False
+    return spec is not None
+
+if is_installed('simple_lama_inpainting')==False:
+    import subprocess
+    from packaging import version
+    
+    if version.parse(torch.__version__)>=version.parse('2.1'):
+        # 安装
+        print('#pip install simple_lama_inpainting')
+
+        result = subprocess.run([sys.executable, '-s', '-m', 'pip', 'install', 'simple_lama_inpainting'], capture_output=True, text=True)
+
+        #检查命令执行结果
+        if result.returncode == 0:
+            print("#install success")
+            from simple_lama_inpainting import SimpleLama
+            _available=True
+        else:
+            print("#install error")
+    else:
+        print('#pls check your torch version >= 2.1')
+
+else:
+    from simple_lama_inpainting import SimpleLama
+    _available=True
+
+
+lama_path=os.path.join(folder_paths.models_dir, "lama")
+if not os.path.exists(lama_path):
+    os.mkdir(lama_path)
  
 llma_model_path=os.path.join(folder_paths.models_dir, "lama/big-lama.pt")
 if not os.path.exists(llma_model_path):
@@ -38,6 +75,8 @@ def pil2tensor(image):
 
 
 class LaMaInpainting:
+    global _available
+    available=_available
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
@@ -52,7 +91,7 @@ class LaMaInpainting:
 
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/image"
+    CATEGORY = "♾️Mixlab/Image"
 
     INPUT_IS_LIST = True
     OUTPUT_IS_LIST = (True,)

nodes/Mask.py

@@ -0,0 +1,171 @@
+ 
+import scipy.ndimage
+import torch
+
+from nodes import MAX_RESOLUTION
+
+import numpy as np 
+# from PIL import Image, ImageDraw
+from PIL import Image, ImageOps 
+
+from comfy.cli_args import args
+import cv2
+
+
+
+# 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 grow(mask, expand, tapered_corners):
+    c = 0 if tapered_corners else 1
+    kernel = np.array([[c, 1, c],
+                            [1, 1, 1],
+                            [c, 1, c]])
+    mask = mask.reshape((-1, mask.shape[-2], mask.shape[-1]))
+    out = []
+    for m in mask:
+        output = m.numpy()
+        for _ in range(abs(expand)):
+            if expand < 0:
+                output = scipy.ndimage.grey_erosion(output, footprint=kernel)
+            else:
+                output = scipy.ndimage.grey_dilation(output, footprint=kernel)
+        output = torch.from_numpy(output)
+        out.append(output)
+    return torch.stack(out, dim=0)
+
+def combine(destination, source, x, y):
+    output = destination.reshape((-1, destination.shape[-2], destination.shape[-1])).clone()
+    source = source.reshape((-1, source.shape[-2], source.shape[-1]))
+
+    left, top = (x, y,)
+    right, bottom = (min(left + source.shape[-1], destination.shape[-1]), min(top + source.shape[-2], destination.shape[-2]))
+    visible_width, visible_height = (right - left, bottom - top,)
+
+    source_portion = source[:, :visible_height, :visible_width]
+    destination_portion = destination[:, top:bottom, left:right]
+ 
+    #operation == "subtract":
+    output[:, top:bottom, left:right] = destination_portion - source_portion
+        
+    output = torch.clamp(output, 0.0, 1.0)
+
+    return output
+
+class OutlineMask:
+
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+                "required": {
+                                "mask": ("MASK",),
+                                "outline_width":("INT", {"default": 10,"min": 1, "max": MAX_RESOLUTION, "step": 1}),
+                                "tapered_corners": ("BOOLEAN", {"default": True}),
+                            }
+            }
+    
+    RETURN_TYPES = ('MASK',)
+
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/Mask"
+
+    # 运行的函数
+    def run(self, mask, outline_width, tapered_corners):
+
+        m1=grow(mask,outline_width,tapered_corners)
+        m2=grow(mask,-outline_width,tapered_corners)
+
+        m3=combine(m1,m2,0,0)
+
+        return (m3,)
+    
+
+
+
+class FeatheredMask:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+                "required": {
+                                "mask": ("MASK",),
+                                "start_offset":("INT", {"default": 1, 
+                                                        "min": -150, 
+                                                        "max": 150, 
+                                                        "step": 1,
+                                                        "display": "slider"}),
+                                "feathering_weight":("FLOAT", {"default": 0.1,
+                                                                "min": 0.0,
+                                                                "max": 1,
+                                                                "step": 0.1,
+                                                                "display": "slider"})
+                            }
+            }
+    
+    RETURN_TYPES = ('MASK',)
+
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/Mask"
+
+    OUTPUT_IS_LIST = (True,)
+  
+    # 运行的函数
+    def run(self,mask,start_offset, feathering_weight):
+        # print(mask.shape,mask.size())
+        
+        num,_,_=mask.size()
+
+        masks=[]
+
+        for i in range(num):
+            mm=mask[i]
+            image=tensor2pil(mm)
+
+            # Open the image using PIL
+            image = image.convert("L")
+            if start_offset>0:
+                image=ImageOps.invert(image)
+
+            # Convert the image to a numpy array
+            image_np = np.array(image)
+
+            # Use Canny edge detection to get black contours
+            edges = cv2.Canny(image_np, 30, 150)
+
+            for i in range(0,abs(start_offset)):
+                # int(100*feathering_weight)
+                a=int(abs(start_offset)*0.1*i)
+                # Dilate the black contours to make them wider
+                kernel = np.ones((a, a), np.uint8)
+
+                dilated_edges = cv2.dilate(edges, kernel, iterations=1)
+                # dilated_edges = cv2.erode(edges, kernel, iterations=1)
+                # Smooth the dilated edges using Gaussian blur
+                smoothed_edges = cv2.GaussianBlur(dilated_edges, (5, 5), 0)
+
+                # Adjust the feathering weight
+                feathering_weight = max(0, min(feathering_weight, 1))
+
+                # Blend the smoothed edges with the original image to achieve feathering effect
+                image_np = cv2.addWeighted(image_np, 1, smoothed_edges, feathering_weight, feathering_weight)
+
+            # Convert the result back to PIL image
+            result_image = Image.fromarray(np.uint8(image_np))
+            result_image=result_image.convert("L")
+
+            if start_offset>0:
+                result_image=ImageOps.invert(result_image)
+            
+            result_image=result_image.convert("L")
+            mt=pil2tensor(result_image)
+            masks.append(mt)
+         
+            # print( mt.size())
+        return (masks,)

nodes/PromptNode.py

@@ -1,15 +1,41 @@
 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')
 #     req =  request.Request("http://127.0.0.1:8188/prompt", data=data)
 #     request.urlopen(req)    
 
+embeddings_path=os.path.join(folder_paths.models_dir, "embeddings")
+
+def get_files_with_extension(directory, extension):
+    file_list = []
+    for root, dirs, files in os.walk(directory):
+        for file in files:
+            if file.endswith(extension):
+                file_name = os.path.splitext(file)[0]
+                file_list.append(file_name)
+    return file_list
+
+def join_with_(text_list,delimiter):
+    joined_text = delimiter.join(text_list)
+    return joined_text
+
+
+class AnyType(str):
+  """A special class that is always equal in not equal comparisons. Credit to pythongosssss"""
+
+  def __ne__(self, __value: object) -> bool:
+    return False
+
+any_type = AnyType("*")
+
 
 default_prompt1='''Swing
                                                 Slide
@@ -45,11 +71,170 @@ 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)})"
+        return f"({text}:{round(weight,3)})"
+
+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,)}
 
 
 
@@ -93,7 +278,7 @@ class PromptSlide:
 
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/prompt"
+    CATEGORY = "♾️Mixlab/Prompt"
 
     INPUT_IS_LIST = False
     OUTPUT_IS_LIST = (False,)
@@ -136,6 +321,10 @@ class RandomPrompt:
                             "default": 'sticker, Cartoon, ``'
                           }),
                 "random_sample": (["enable", "disable"],),
+                # "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff, "step": 1}),
+                },
+            "optional":{
+                    "seed": (any_type,  {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
                 }
             }
     
@@ -145,14 +334,14 @@ class RandomPrompt:
 
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/prompt"
+    CATEGORY = "♾️Mixlab/Prompt"
 
     OUTPUT_IS_LIST = (True,)
     OUTPUT_NODE = True
 
 
     # 运行的函数
-    def run(self,max_count,mutable_prompt,immutable_prompt,random_sample):
+    def run(self,max_count,mutable_prompt,immutable_prompt,random_sample,seed=0):
         # print('#运行的函数',mutable_prompt,immutable_prompt,max_count,random_sample)
         
         # Split the text into an array of words
@@ -173,7 +362,10 @@ class RandomPrompt:
             for w2 in words2:
                 w2=w2.strip()
                 if '``' not in w2:
-                    w2=w2+',``'
+                    if w2=="":
+                        w2='``'
+                    else:
+                        w2=w2+',``'
                 if w1!='' and w2!='':
                     prompts.append(w2.replace('``', w1))
                 pbar.update(1)
@@ -187,6 +379,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,)}
 
@@ -194,62 +388,64 @@ class RandomPrompt:
 
 
 
-# class RunWorkflow:
-#     @classmethod
-#     def INPUT_TYPES(s):
-#         return {
-#             "required": {
-#                 "workflow": ("STRING", {
-#                             "multiline": False, 
-#                             "default": ''
-#                           }),
-#                 "prompt": ("STRING", {
-#                             "multiline": False, 
-#                             "default": ''
-#                           }),
-#                  "image": ("IMAGE",),
-#                  "input_node": ("STRING", {
-#                             "multiline": False, 
-#                             "default": ''
-#                           }),
-#                  "output_node": ("STRING", {
-#                             "multiline": False, 
-#                             "default": ''
-#                           }),
-#                 },
+
+class EmbeddingPrompt:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                "embedding":(get_files_with_extension(embeddings_path,'.pt'),),
+                "weight": ("FLOAT", {"default": 1, "min": -2, "max": 2,"step":0.01 ,"display": "slider"}),
+                },
                 
-#             }
+            }
     
+    RETURN_TYPES = ("STRING",)
+
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/Prompt"
+
+    OUTPUT_IS_LIST = (False,)
+    # OUTPUT_NODE = True
+
+    # 运行的函数
+    def run(self,embedding,weight):
+        weight = round(weight, 3)
+        prompt='embedding:'+embedding
+        if weight!=1:
+            prompt='('+prompt+':'+str(weight)+')'
+        prompt=" "+prompt+' ' 
+        # return (new_prompt)
+        return (prompt,)
+
+RETURN_TYPES = (any_type,)
+
+class JoinWithDelimiter:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": {
+                    "text_list": (any_type,),
+                    "delimiter":(["newline","comma"],),
+                             },
+                }
     
+    RETURN_TYPES = ("STRING",) 
 
-#     RETURN_TYPES = ("IMAGE","STRING",)
+    FUNCTION = "run"
 
-#     FUNCTION = "run"
+    CATEGORY = "♾️Mixlab/Prompt"
 
-#     CATEGORY = "♾️Mixlab/workflow"
-
-#     OUTPUT_IS_LIST = (True,)
-#     OUTPUT_NODE = True
-
-
-#     # 运行的函数
-#     def run(self,workflow,prompt,image,input_node,output_node):
-#         print('#运行的函数',prompt,image,input_node,output_node)
-#         workflow=json.loads(workflow)
-#         input_node=input_node.split(".")
-#         workflow[input_node[0]][input_node[1]][input_node[2]]=prompt
-
-#         workflow_new={}
-#         # 遍历，seed设为随机
-#         for key, value in workflow.items():
-#             if 'inputs' in value:
-#                 if 'seed' in value['inputs']:
-#                     value['inputs']['seed']= random.randint(1, 18446744073709551614)
-#             workflow_new[key]=value
-
-#         queue_prompt(workflow_new)
-#         print('#运行的函数',workflow_new[input_node[0]])
-
-#         # return (new_prompt)
-#         return  {"ui":{"images": []},"result": ([image],['text'],)}
+    INPUT_IS_LIST = True # 当true的时候，输入时list，当false的时候，如果输入是list，则会自动包一层for循环调用
+    OUTPUT_IS_LIST = (False,)
 
+    def run(self,text_list,delimiter):
+        delimiter=delimiter[0]
+        if delimiter =='newline':
+            delimiter='\n'
+        elif delimiter=='comma':
+            delimiter=','
+        t=''
+        if isinstance(text_list, list):
+            t=join_with_(text_list,delimiter)
+        return (t,)

nodes/RembgNode.py

@@ -0,0 +1,164 @@
+import os,sys
+import folder_paths
+
+from PIL import Image
+import importlib.util
+
+import comfy.utils
+import numpy as np
+import torch
+
+
+U2NET_HOME=os.path.join(folder_paths.models_dir, "rembg")
+os.environ["U2NET_HOME"] = U2NET_HOME
+
+global _available
+_available=False
+
+def is_installed(package):
+    try:
+        spec = importlib.util.find_spec(package)
+    except ModuleNotFoundError:
+        return False
+    return spec is not None
+
+
+try:
+    if is_installed('rembg')==False:
+        import subprocess
+
+        # 安装
+        print('#pip install rembg[gpu]')
+
+        result = subprocess.run([sys.executable, '-s', '-m', 'pip', 'install', 'rembg[gpu]'], capture_output=True, text=True)
+
+        #检查命令执行结果
+        if result.returncode == 0:
+            print("#install success")
+            from rembg import new_session, remove
+            _available=True
+        else:
+            print("#install error")
+        
+    else:
+        from rembg import new_session, remove
+        _available=True
+
+except:
+    _available=False
+
+
+def run_bg(model_name= "unet",images=[]):
+    # model_name = "unet" # "isnet-general-use"
+    rembg_session = new_session(model_name)
+    masks=[]
+    rgba_images=[]
+    rgb_images=[]
+    # 进度条
+    pbar = comfy.utils.ProgressBar(len(images) )
+    for img in images:
+        # use the post_process_mask argument to post process the mask to get better results.
+        mask = remove(img, session=rembg_session,only_mask=True,post_process_mask=True)
+        # mask=mask.convert('L')
+        # masks.append(mask)
+        if model_name=="u2net_cloth_seg":
+            width, original_height = mask.size
+            num_slices = original_height // img.height
+            for i in range(num_slices):
+                top = i * img.height
+                bottom = (i + 1) * img.height
+                slice_image = mask.crop((0, top, width, bottom))
+                slice_mask=slice_image.convert('L')
+                masks.append(slice_mask)
+
+                # rgba图
+                image_rgba = img.convert("RGBA")
+                image_rgba.putalpha(slice_mask)
+                rgba_images.append(image_rgba)
+
+                #rgb
+                rgb_image = Image.new("RGB", image_rgba.size, (0, 0, 0))
+                rgb_image.paste(image_rgba, mask=image_rgba.split()[3])
+                rgb_images.append(rgb_image)
+
+        else:
+            mask=mask.convert('L')    
+            # mask.save(output_path)
+            masks.append(mask)
+
+            # rgba图
+            image_rgba = img.convert("RGBA")
+            image_rgba.putalpha(mask)
+            rgba_images.append(image_rgba)
+
+            #rgb
+            rgb_image = Image.new("RGB", image_rgba.size, (0, 0, 0))
+            rgb_image.paste(image_rgba, mask=image_rgba.split()[3])
+            rgb_images.append(rgb_image)
+            
+        pbar.update(1)
+    return (masks,rgba_images,rgb_images)
+
+
+# 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)
+
+
+class RembgNode_:
+
+    global _available
+    available=_available
+    
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": {
+            "image": ("IMAGE",),
+            "model_name": (["u2net",
+                            "u2netp",
+                            "u2net_human_seg",
+                            "u2net_cloth_seg",
+                            "silueta",
+                            "isnet-general-use",
+                            "isnet-anime",
+                            # "sam"
+                            ],),
+            
+                             },
+                }
+    
+    RETURN_TYPES = ("MASK","IMAGE","RGBA",)
+    RETURN_NAMES = ("masks","images","RGBAs")
+
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/Mask"
+    OUTPUT_NODE = True
+    INPUT_IS_LIST = True
+    OUTPUT_IS_LIST = (True,True,True,)
+  
+    def run(self,image,model_name):
+        # 兼容list输入和batch输入
+
+        model_name=model_name[0]
+
+        images=[]
+        
+        for ims in image:
+            for im in ims:
+                im=tensor2pil(im)
+                images.append(im)
+
+        masks,rgba_images,rgb_images=run_bg(model_name,images)
+
+        masks=[pil2tensor(m) for m in masks]
+
+        rgba_images=[pil2tensor(m) for m in rgba_images]
+
+        rgb_images=[pil2tensor(m) for m in rgb_images]
+
+        return (masks,rgb_images,rgba_images,)

nodes/ScreenShareNode.py

@@ -93,7 +93,7 @@ class ScreenShareNode:
     RETURN_NAMES = ("IMAGE","PROMPT","FLOAT","INT")
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/image"
+    CATEGORY = "♾️Mixlab/Image"
 
     # INPUT_IS_LIST = True
     OUTPUT_IS_LIST = (False,False,False,False)
@@ -118,7 +118,7 @@ class FloatingVideo:
     OUTPUT_NODE = True
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/image"
+    CATEGORY = "♾️Mixlab/Image"
 
     # INPUT_IS_LIST = True
     # OUTPUT_IS_LIST = (False,False,)

nodes/TextGenerateNode.py

@@ -0,0 +1,307 @@
+from transformers import pipeline, set_seed,AutoTokenizer, AutoModelForSeq2SeqLM
+import random
+import re
+
+import os,sys
+import folder_paths
+
+# from PIL import Image
+import importlib.util
+
+import comfy.utils
+# import numpy as np
+import torch
+import random
+
+global _available
+_available=True
+
+
+text_generator_model_path=os.path.join(folder_paths.models_dir, "prompt_generator/text2image-prompt-generator")
+if not os.path.exists(text_generator_model_path):
+    print(f"## text_generator_model not found: {text_generator_model_path}, pls download from https://huggingface.co/succinctly/text2image-prompt-generator/tree/main")
+    text_generator_model_path='succinctly/text2image-prompt-generator'
+
+zh_en_model_path=os.path.join(folder_paths.models_dir, "prompt_generator/opus-mt-zh-en")
+if not os.path.exists(zh_en_model_path):
+    print(f"## zh_en_model not found: {zh_en_model_path}, pls download from https://huggingface.co/Helsinki-NLP/opus-mt-zh-en/tree/main")
+    zh_en_model_path='Helsinki-NLP/opus-mt-zh-en'
+
+
+
+def is_installed(package):
+    try:
+        spec = importlib.util.find_spec(package)
+    except ModuleNotFoundError:
+        return False
+    return spec is not None
+
+
+try:
+    if is_installed('sentencepiece')==False:
+        import subprocess
+
+        # 安装
+        print('#pip install sentencepiece')
+
+        result = subprocess.run([sys.executable, '-s', '-m', 'pip', 'install', 'sentencepiece'], capture_output=True, text=True)
+
+        #检查命令执行结果
+        if result.returncode == 0 and is_installed('sentencepiece'):
+            print("#install success")
+            _available=True
+        else:
+            print("#install error")
+            _available=False
+        
+    else:
+        _available=True
+
+except:
+    _available=False
+
+
+
+def translate(zh_en_tokenizer,zh_en_model,text):
+    with torch.no_grad():
+        encoded = zh_en_tokenizer([text], return_tensors="pt")
+        encoded.to(zh_en_model.device)
+        sequences = zh_en_model.generate(**encoded)
+        return zh_en_tokenizer.batch_decode(sequences, skip_special_tokens=True)[0]
+
+# input = "青春不能回头，所以青春没有终点。 ——《火影忍者》"
+# print(input, translate(input))
+
+
+def text_generate(text_pipe,input,seed=None):
+    
+    if seed==None:
+        seed = random.randint(100, 1000000)
+    
+    set_seed(seed)
+
+    for count in range(6):    
+        sequences = text_pipe(input, max_length=random.randint(60, 90), num_return_sequences=8)
+        list = []
+        for sequence in sequences:
+            line = sequence['generated_text'].strip()
+            if line != input and len(line) > (len(input) + 4) and line.endswith((":", "-", "—")) is False:
+                list.append(line)
+
+        result = "\n".join(list)
+        result = re.sub('[^ ]+\.[^ ]+','', result)
+        result = result.replace("<", "").replace(">", "")
+        if result != "":
+            return result
+        if count == 5:
+            return result
+
+# input = "Youth can't turn back, so there's no end to youth."
+# print(input, text_generate(input))
+
+    
+import re
+
+def correct_prompt_syntax(prompt):
+
+    print("input prompt",prompt)
+    corrected_elements = []
+    # 处理成统一的英文标点
+    prompt = prompt.replace('（', '(').replace('）', ')').replace('，', ',').replace(';', ',').replace('。', '.').replace('：',':')
+    # 删除多余的空格
+    prompt = re.sub(r'\s+', ' ', prompt).strip()
+
+    # 分词
+    prompt_elements = prompt.split(',')
+
+    for element in prompt_elements:
+        element = element.strip()
+
+        # 处理空元素
+        if not element:
+            continue
+
+        # 检查并处理圆括号、方括号、尖括号
+        if element[0] in '([':
+            corrected_element = balance_brackets(element, '(', ')') if element[0] == '(' else balance_brackets(element, '[', ']')
+        elif element[0] == '<':
+            corrected_element = balance_brackets(element, '<', '>')
+        else:
+            # 删除开头的右括号或右方括号
+            corrected_element = element.lstrip(')]')
+
+        corrected_elements.append(corrected_element)
+
+    # 重组修正后的prompt
+    corrected_prompt = ', '.join(corrected_elements)
+    print("output prompt",corrected_prompt)
+    return corrected_prompt
+
+def balance_brackets(element, open_bracket, close_bracket):
+    open_brackets_count = element.count(open_bracket)
+    close_brackets_count = element.count(close_bracket)
+    return element + close_bracket * (open_brackets_count - close_brackets_count)
+
+# # 示例使用
+# test_prompt = "((middle-century castles)), [forsaken: 0.8], (mystery dragons: 1.3, mist forests, sunsets, quiet; (((dummy)), [fisting city: 0.5] background, radiant, soft and flavoured,] promising mountains, ((starry: 1.6), [[crowds], [middle-century castle: urban landscapes of the future: 0.5], [yellow: bright sun: 0.7], overlooking"
+# corrected_prompt = correct_prompt_syntax(test_prompt)
+# print(corrected_prompt)
+
+        
+        
+class ChinesePrompt:
+
+    global _available
+    available=_available
+    
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": {
+               "text": ("STRING",{"multiline": True,"default": "", "dynamicPrompts": False}),
+               "generation": (["on","off"],{"default": "off"}), 
+                             },
+               
+                "optional":{
+                    "seed":("INT", {"default": 100, "min": 100, "max": 1000000}), 
+                    
+                },
+
+                }
+    
+    RETURN_TYPES = ("STRING",)
+    RETURN_NAMES = ("prompt",)
+
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/Prompt"
+    OUTPUT_NODE = True
+    INPUT_IS_LIST = True
+    OUTPUT_IS_LIST = (True,)
+
+    global text_pipe,zh_en_model,zh_en_tokenizer
+
+    text_pipe= None
+    zh_en_model=None
+    zh_en_tokenizer=None 
+
+    def run(self,text,seed,generation):
+        global text_pipe,zh_en_model,zh_en_tokenizer
+
+        seed=seed[0]
+        generation=generation[0]
+
+        # 进度条
+        pbar = comfy.utils.ProgressBar(len(text)+1)
+        
+        texts = [correct_prompt_syntax(t) for t in text]
+        print('correct_prompt_syntax::',texts)
+        if zh_en_model==None:
+            zh_en_model = AutoModelForSeq2SeqLM.from_pretrained(zh_en_model_path).eval()
+            zh_en_tokenizer = AutoTokenizer.from_pretrained(zh_en_model_path,padding=True, truncation=True)
+        
+        zh_en_model.to("cuda" if torch.cuda.is_available() else "cpu")
+            # zh_en_tokenizer.to("cuda" if torch.cuda.is_available() else "cpu")
+        
+        text_pipe=pipeline('text-generation', model=text_generator_model_path,device="cuda" if torch.cuda.is_available() else "cpu")
+        
+        # text_pipe.model.to("cuda" if torch.cuda.is_available() else "cpu")
+
+        prompt_result=[]
+
+        # print('zh_en_model device',zh_en_model.device,text_pipe.model.device,torch.cuda.current_device() )
+        en_texts=[]
+        for t in texts:
+            en_text=translate(zh_en_tokenizer,zh_en_model,t)
+            en_texts.append(en_text)
+
+        zh_en_model.to('cpu')
+        print("test en_text",en_texts)
+        # en_text.to("cuda" if torch.cuda.is_available() else "cpu")
+
+        pbar.update(1)
+        for t in en_texts:
+            if generation=='on':
+                prompt =text_generate(text_pipe,t,seed)
+                # 多条，还是单条
+                lines = prompt.split("\n")
+                longest_line = max(lines, key=len)
+                # print(longest_line)
+                prompt_result.append(longest_line)
+            else:
+                prompt_result.append(t)
+            pbar.update(1)
+
+        text_pipe.model.to('cpu')
+        prompt_result = [correct_prompt_syntax(p) for p in prompt_result]
+        
+        return {
+            "ui":{
+                    "prompt": prompt_result
+                },
+            "result": (prompt_result,)}
+
+
+class PromptGenerate:
+
+    global _available
+    available=_available
+    
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": {
+            "text": ("STRING",{"multiline": True,"default": "", "dynamicPrompts": False}),
+                             },
+
+                "optional":{
+                    "multiple": (["off","on"],), 
+                    "seed":("INT", {"default": 100, "min": 100, "max": 1000000}), 
+                },
+
+                }
+    
+    RETURN_TYPES = ("STRING",)
+    RETURN_NAMES = ("prompt",)
+
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/Prompt"
+    OUTPUT_NODE = True
+    INPUT_IS_LIST = True
+    OUTPUT_IS_LIST = (True,)
+
+    global text_pipe
+
+    text_pipe= None
+    # 
+
+    def run(self,text,multiple,seed):
+        global text_pipe
+
+        seed=seed[0]
+
+        multiple=multiple[0]
+
+        # 进度条
+        pbar = comfy.utils.ProgressBar(len(text))
+        
+        text_pipe=pipeline('text-generation', model=text_generator_model_path,device="cuda" if torch.cuda.is_available() else "cpu")
+        
+        prompt_result=[]
+
+        for t in text:
+            prompt =text_generate(text_pipe,t,seed)
+            prompt = prompt.split("\n")
+            if multiple=='off':
+                prompt = [max(prompt, key=len)]
+            
+            for p in prompt:
+                prompt_result.append(p)
+            pbar.update(1)
+
+        text_pipe.model.to('cpu')
+
+        return {
+            "ui":{
+                    "prompt": prompt_result
+                },
+            "result": (prompt_result,)}

nodes/Utils.py

@@ -1,10 +1,57 @@
-import os
-import re,random
-from PIL import Image
-import numpy as np
+import os,platform
+import re,random,json
+
 # FONT_PATH= os.path.abspath(os.path.join(os.path.dirname(__file__),'../assets/王汉宗颜楷体繁.ttf'))
 import folder_paths
-import matplotlib.font_manager as fm
+# import matplotlib.font_manager as fm
+import torch
+
+
+
+def recursive_search(directory, excluded_dir_names=None):
+    if not os.path.isdir(directory):
+        return [], {}
+
+    if excluded_dir_names is None:
+        excluded_dir_names = []
+
+    result = []
+    dirs = {directory: os.path.getmtime(directory)}
+    for dirpath, subdirs, filenames in os.walk(directory, followlinks=True, topdown=True):
+        subdirs[:] = [d for d in subdirs if d not in excluded_dir_names]
+        for file_name in filenames:
+            relative_path = os.path.relpath(os.path.join(dirpath, file_name), directory)
+            result.append(relative_path)
+        for d in subdirs:
+            path = os.path.join(dirpath, d)
+            dirs[path] = os.path.getmtime(path)
+    return result, dirs
+
+def filter_files_extensions(files, extensions):
+    return sorted(list(filter(lambda a: os.path.splitext(a)[-1].lower() in extensions or len(extensions) == 0, files)))
+
+
+def get_system_font_path():
+    ps=[]
+    system = platform.system()
+    if system == "Windows":
+        ps.append(os.path.join(os.environ["WINDIR"], "Fonts"))
+    elif system == "Darwin":
+        ps.append(os.path.join("/Library", "Fonts"))
+    elif system == "Linux":
+        ps.append(os.path.join("/usr", "share", "fonts"))
+        ps.append(os.path.join("/usr", "local", "share", "fonts"))
+    ps=[p for p in ps if os.path.exists(p)]
+    file_paths=[]
+    for f in ps:
+        result, dirs=recursive_search(f)
+        for r in result:
+            file_paths.append(r)
+    file_paths=filter_files_extensions(file_paths,[".otf", ".ttf"])
+
+    return file_paths
+
+
 
 # import json
 # import hashlib
@@ -17,37 +64,7 @@ import matplotlib.font_manager as fm
 #     return hash_value
     
 
-
-def tensor2pil(image):
-    return Image.fromarray(np.clip(255. * image.cpu().numpy().squeeze(), 0, 255).astype(np.uint8))
-
-
-def create_temp_file(image):
-    output_dir = folder_paths.get_temp_directory()
-
-    (
-            full_output_folder,
-            filename,
-            counter,
-            subfolder,
-            _,
-        ) = folder_paths.get_save_image_path('tmp', output_dir)
-
-    
-    im=tensor2pil(image)
  
-    image_file = f"{filename}_{counter:05}.png"
-     
-    image_path=os.path.join(full_output_folder, image_file)
-
-    im.save(image_path,compress_level=4)
-
-    return [{
-                "filename": image_file,
-                "subfolder": subfolder,
-                "type": "temp"
-                }]
-
 def get_font_files(directory):
     font_files = {}
 
@@ -60,14 +77,14 @@ def get_font_files(directory):
 
     # 尝试获取系统字体
     try:
-        font_paths = fm.findSystemFonts()
-        for path in font_paths:
+        font_paths = get_system_font_path()
+        for file in font_paths:
             try:
-                font_prop = fm.FontProperties(fname=path)
-                font_name = font_prop.get_name()
-                font_files[font_name] = path
+                font_name = os.path.splitext(file)[0]
+                font_path = file
+                font_files[font_name] = os.path.abspath(font_path)
             except Exception as e:
-                print(f"Error processing font {path}: {e}")
+                print(f"Error processing font {file}: {e}")
     except Exception as e:
         print(f"Error finding system fonts: {e}")
 
@@ -85,7 +102,12 @@ def flatten_list(nested_list):
         if isinstance(item, list):
             flat_list.extend(flatten_list(item))
         else:
-            flat_list.append(item)
+            if torch.is_tensor(item):
+                print('item.shape',item.shape)
+                for i in range(item.shape[0]):
+                    flat_list.append(item[i:i + 1, ...])
+            else:
+                flat_list.append(item)
     return flat_list
 
 
@@ -103,7 +125,7 @@ class ColorInput:
 
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/utils"
+    CATEGORY = "♾️Mixlab/Utils"
 
     INPUT_IS_LIST = False
     OUTPUT_IS_LIST = (False,False,False,False,False,)
@@ -132,7 +154,7 @@ class FontInput:
 
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/utils"
+    CATEGORY = "♾️Mixlab/Utils"
 
     INPUT_IS_LIST = False
     OUTPUT_IS_LIST = (False,)
@@ -147,14 +169,17 @@ class TextToNumber:
         return {"required": { 
                     "text": ("STRING",{"multiline": False,"default": "1"}),
                     "random_number": (["enable", "disable"],),
-                    "number":("INT", {
-                        "default": 0, 
-                        "min": 0, #Minimum value
+                    "max_num":("INT", {
+                        "default": 10, 
+                        "min":2, #Minimum value
                         "max": 10000000000, #Maximum value
                         "step": 1, #Slider's step
                         "display": "number" # Cosmetic only: display as "number" or "slider"
                     }),
                              },
+                 "optional":{
+                    "seed": (any_type,  {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
+                }
                 }
     
     RETURN_TYPES = ("INT",)
@@ -162,12 +187,12 @@ class TextToNumber:
 
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/utils"
+    CATEGORY = "♾️Mixlab/Utils"
 
     INPUT_IS_LIST = False
     OUTPUT_IS_LIST = (False,)
 
-    def run(self,text,random_number,number):
+    def run(self,text,random_number,max_num,seed=0):
         
         numbers = re.findall(r'\d+', text)
         result=0
@@ -176,7 +201,7 @@ class TextToNumber:
             # print(result)
         
         if random_number=='enable' and result>0:
-            result= random.randint(1, 10000000000)
+            result= random.randint(1, max_num)
         return {"ui": {"text": [text],"num":[result]}, "result": (result,)}
     
 
@@ -188,7 +213,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"
                     }),
@@ -220,17 +245,18 @@ class FloatSlider:
 
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/utils"
+    CATEGORY = "♾️Mixlab/Utils"
 
     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:
@@ -262,7 +288,7 @@ class IntNumber:
                             "default": 1, 
                             "min": -0xffffffffffffffff,
                             "max": 0xffffffffffffffff,
-                            "step":1, 
+                            "step":1,
                             "display": "number"  
                         }),
                              },
@@ -272,7 +298,7 @@ class IntNumber:
 
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/utils"
+    CATEGORY = "♾️Mixlab/Utils"
 
     INPUT_IS_LIST = False
     OUTPUT_IS_LIST = (False,)
@@ -289,11 +315,18 @@ class MultiplicationNode:
     def INPUT_TYPES(s):
         return {"required": {
                     "numberA":(any_type,),
-                    "numberB":("FLOAT", {
+                    "multiply_by":("FLOAT", {
                         "default": 0, 
-                        "min": -1, #Minimum value
+                        "min": -2, #Minimum value
                         "max": 0xffffffffffffffff,
-                        "step": 0.1, #Slider's step
+                        "step": 0.01, #Slider's step
+                        "display": "number" # Cosmetic only: display as "number" or "slider"
+                    }),
+                     "add_by":("FLOAT", {
+                        "default": 0, 
+                        "min": -2000, #Minimum value
+                        "max": 0xffffffffffffffff,
+                        "step": 0.01, #Slider's step
                         "display": "number" # Cosmetic only: display as "number" or "slider"
                     })
                              },
@@ -303,14 +336,14 @@ class MultiplicationNode:
 
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/utils"
+    CATEGORY = "♾️Mixlab/Utils"
 
     INPUT_IS_LIST = False
     OUTPUT_IS_LIST = (False,False,)
 
-    def run(self,numberA,numberB):
-        b=int(numberA*numberB)
-        a=float(numberA*numberB)
+    def run(self,numberA,multiply_by,add_by):
+        b=int(numberA*multiply_by+add_by)
+        a=float(numberA*multiply_by+add_by)
         return (a,b,) 
 
 class TextInput:
@@ -325,7 +358,7 @@ class TextInput:
 
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/utils"
+    CATEGORY = "♾️Mixlab/Utils"
 
     INPUT_IS_LIST = False
     OUTPUT_IS_LIST = (False,)
@@ -349,6 +382,7 @@ class AnyType(str):
     return False
 
 any_type = AnyType("*")
+
 import time
 
 class DynamicDelayProcessor:
@@ -366,7 +400,7 @@ class DynamicDelayProcessor:
             },
             "optional":{
                 "any_input":(any_type,),
-                "delay_by_text":("STRING",{"multiline":True,}),
+                "delay_by_text":("STRING",{"multiline":True,"dynamicPrompts": False,}),
                 "words_per_seconds":("FLOAT",{ "default":1.50,"min": 0.0,"max": 1000.00,"display":"Chars per second?"}),
                 "replace_output": (["disable","enable"],),
                 "replace_value":("INT",{ "default":-1,"min": 0,"max": 1000000,"display":"Replacement value"})
@@ -399,7 +433,7 @@ class DynamicDelayProcessor:
     RETURN_TYPES = (any_type,)
     RETURN_NAMES = ('output',)
 
-    CATEGORY = "♾️Mixlab/utils"
+    CATEGORY = "♾️Mixlab/Utils"
     def run(self,any_input,delay_seconds,delay_by_text,words_per_seconds,replace_output,replace_value):
         # print(f"Delay text:",delay_by_text )
         # 获取开始时间戳
@@ -426,87 +460,7 @@ class DynamicDelayProcessor:
         
 
 
-
-# app 配置节点
-class AppInfo:
-    @classmethod
-    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":{
-                    "description":("STRING",{"multiline": True,"default": "","dynamicPrompts": False}),
-                    "version":("INT", {
-                        "default": 1, 
-                        "min": 1, 
-                        "max": 10000, 
-                        "step": 1, 
-                        "display": "number"  
-                    }),
-                    "share_prefix":("STRING",{"multiline": False,"default": "","dynamicPrompts": False}),
-                    "link":("STRING",{"multiline": False,"default": "https://","dynamicPrompts": False}),
-                    "category":("STRING",{"multiline": False,"default": "","dynamicPrompts": False}),
-                }
-
-                }
     
-    RETURN_TYPES = ("IMAGE",)
-    RETURN_NAMES = ("IMAGE",)
-
-    FUNCTION = "run"
-
-    CATEGORY = "♾️Mixlab"
-
-    INPUT_IS_LIST = True
-    OUTPUT_IS_LIST = (True,)
-
-    def run(self,name,image,input_ids,output_ids,description,version,share_prefix,link,category):
-        name=name[0]
-        im=image[0][0]
-        # image [img,] img[batch,w,h,a] 列表里面是batch，
-
-        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]
-
-        #TODO batch 的方式需要处理
-        im=create_temp_file(im)
-        
-        # 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,category]}, "result": (image,)}
-    
-
-    
-
-class GetImageSize_:
-    @classmethod
-    def INPUT_TYPES(cls):
-        return {
-            "required": {
-                "image": ("IMAGE",),
-            }
-        }
-
-    RETURN_TYPES = ("INT", "INT")
-    RETURN_NAMES = ("width", "height")
-
-    FUNCTION = "get_size"
-
-    CATEGORY = "♾️Mixlab/utils"
-
-    def get_size(self, image):
-        _, height, width, _ = image.shape
-        return (width, height)
-
 
 
 class SwitchByIndex:
@@ -532,7 +486,7 @@ class SwitchByIndex:
 
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/utils"
+    CATEGORY = "♾️Mixlab/Utils"
 
     INPUT_IS_LIST = True
     OUTPUT_IS_LIST = (True,)
@@ -543,7 +497,8 @@ class SwitchByIndex:
 
         C=[]
         index=index[0]
-        for a in A:
+
+        for a in A:    
             C.append(a)
         for b in B:
             C.append(b)
@@ -556,6 +511,7 @@ class SwitchByIndex:
                 C=[C[index]]
             except Exception as e:
                 C=[]
+        
         return (C,)
 
 
@@ -588,7 +544,7 @@ class LimitNumber:
 
     FUNCTION = "run"
 
-    CATEGORY = "♾️Mixlab/utils"
+    CATEGORY = "♾️Mixlab/Utils"
 
     INPUT_IS_LIST = False
     OUTPUT_IS_LIST = (False,)
@@ -610,3 +566,175 @@ class LimitNumber:
         
         return (nn,)
 
+
+
+class ListStatistics:
+    @staticmethod
+    def count_types(lst):
+        type_count = {}
+
+        for item in lst:
+            item_type = type(item).__name__
+            if item_type not in type_count:
+                type_count[item_type] = []
+
+            if item_type in ['dict', 'str', 'int', 'float']:
+                type_count[item_type].append(item)
+
+        return type_count
+
+# # 示例列表
+# my_list = [1, 'hello', {'name': 'John'}, 3.14, {'age': 25}, 'world', 10]
+
+# # 创建ListStatistics对象
+# list_stats = ListStatistics()
+
+# # 调用count_types方法进行统计
+# result = list_stats.count_types(my_list)
+
+# # 输出结果
+# for item_type, values in result.items():
+#     print(item_type + ':')
+#     for value in values:
+#         print(value)
+#     print('---')
+
+class TESTNODE_:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": { "ANY":(any_type,), },
+                }
+    
+    RETURN_TYPES = (any_type,)
+
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/__TEST"
+
+    OUTPUT_NODE = True
+    INPUT_IS_LIST = True
+    OUTPUT_IS_LIST = (True,)
+
+    def run(self,ANY):
+        print(ANY)
+        # data=ANY
+        list_stats = ListStatistics()
+
+        # 调用count_types方法进行统计
+        result = list_stats.count_types(ANY)
+            
+        return {"ui": {"data": result,"type":[str(type(ANY[0]))]}, "result": (ANY,)}
+
+
+
+class CreateSeedNode:
+    def __init__(self):
+        pass
+
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
+            }
+        }
+
+    RETURN_TYPES = ("INT",)
+    RETURN_NAMES = ("seed",)
+  
+    OUTPUT_NODE = True
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/Utils"
+
+    def run(self, seed):
+        return (seed,)
+    
+
+class CreateCkptNames:
+    def __init__(self):
+        pass
+
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "ckpt_names": ("STRING",{"multiline": True,"default": "\n".join(folder_paths.get_filename_list("checkpoints")),"dynamicPrompts": False}),
+            }
+        }
+
+    RETURN_TYPES = (any_type,)
+    RETURN_NAMES = ("ckpt_names",)
+    
+    INPUT_IS_LIST = False
+    OUTPUT_IS_LIST = (True,)
+
+    # OUTPUT_NODE = True
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/Utils"
+
+    def run(self, ckpt_names):
+        ckpt_names=ckpt_names.split('\n')
+        ckpt_names = [name for name in ckpt_names if name.strip()]
+        return (ckpt_names,)
+
+
+class CreateLoraNames:
+    def __init__(self):
+        pass
+
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "lora_names": ("STRING",{"multiline": True,"default": "\n".join(folder_paths.get_filename_list("loras")),"dynamicPrompts": False}),
+            }
+        }
+
+    RETURN_TYPES = (any_type,"STRING",)
+    RETURN_NAMES = ("lora_names","prompt",)
+    
+    INPUT_IS_LIST = False
+    OUTPUT_IS_LIST = (True,True,)
+
+    # OUTPUT_NODE = True
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/Utils"
+
+    def run(self, lora_names):
+        lora_names=lora_names.split('\n')
+        lora_names = [name for name in lora_names if name.strip()]
+        prompts=[os.path.splitext(n)[0] for n in lora_names]
+        return (lora_names,prompts,)
+   
+
+
+class CreateSampler_names:
+    def __init__(self):
+        pass
+
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "sampler_names": ("STRING",{"multiline": True,"default": "\n".join(comfy.samplers.KSampler.SAMPLERS),"dynamicPrompts": False}),
+            }
+        }
+
+    RETURN_TYPES = (any_type,)
+    RETURN_NAMES = ("sampler_names",)
+    
+    INPUT_IS_LIST = False
+    OUTPUT_IS_LIST = (True,)
+
+    # OUTPUT_NODE = True
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/Utils"
+
+    def run(self, sampler_names):
+        sampler_names=sampler_names.split('\n')
+        sampler_names = [name for name in sampler_names if name.strip()]
+        return (sampler_names,)

nodes/Vae.py

@@ -145,7 +145,7 @@ class VAELoader:
     RETURN_TYPES = ("VAE",)
     FUNCTION = "load_vae"
 
-    CATEGORY = "♾️Mixlab/_test"
+    CATEGORY = "♾️Mixlab/__TEST"
 
     #TODO: scale factor?
     def load_vae(self, vae_name):
@@ -165,7 +165,7 @@ class VAEDecode:
     RETURN_TYPES = ("IMAGE",)
     FUNCTION = "decode"
 
-    CATEGORY = "♾️Mixlab/_test"
+    CATEGORY = "♾️Mixlab/__TEST"
 
     def decode(self, vae, samples):
         image = vae.decode(samples["samples"].to("cuda:0"))

web/index.html

@@ -303,10 +303,9 @@
         }
 
 
-
-        select,
-        button,
-        input {
+        .card select,
+        .card button,
+        .card input {
             height: 32px;
             cursor: pointer;
             background: #000000bf;
@@ -323,14 +322,62 @@
             height: 56px !important;
             outline: 1px solid white;
         }
+
+
+        /* 给prompt image 节点使用 */
+        .prompt_image {
+            color: #2f2f2f;
+            padding: 0 10px;
+            font-size: 12px;
+            width: 200px;
+        }
+
+
+        /* 图像编辑器 */
+        #editor_container {
+            position: fixed;
+            top: 0;
+            z-index: 9;
+            background: #eee;
+            height: 100vh;
+            width: 100%;
+            display: none;
+        }
+
+
+        /* 图片的字幕 */
+        .pswp__custom-caption {
+            background: rgb(20 27 70);
+            font-size: 16px;
+            color: #fff;
+            width: calc(100% - 32px);
+            max-width: 400px;
+            padding: 2px 8px;
+            border-radius: 4px;
+            position: absolute;
+            left: 50%;
+            bottom: 16px;
+            transform: translateX(-50%);
+        }
+
+        .pswp__custom-caption a {
+            color: #fff;
+            text-decoration: underline;
+        }
+
+        .hidden-caption-content {
+            display: none;
+        }
     </style>
     <!-- <script src="../../../scripts/api.js" type="module"></script> -->
     <link href="/extensions/comfyui-mixlab-nodes/lib/photoswipe.min.css" rel="stylesheet">
     <link href="/extensions/comfyui-mixlab-nodes/lib/classic.min.css" rel="stylesheet">
     <script src="/extensions/comfyui-mixlab-nodes/lib/pickr.min.js"></script>
+    <script src="/extensions/comfyui-mixlab-nodes/lib/filerobot-image-editor.min.js"></script>
 </head>
 
 <body>
+    <div id="editor_container"></div>
     <div style="display: flex;
     align-items: center;
     justify-content: space-around;">
@@ -344,18 +391,18 @@
             <a class="link" href="https://www.mixcomfy.com" target="_blank">ComfyUI中文爱好者社区推荐</a>
         </div>
 
-        <a target="_blank" href="https://github.com/shadowcz007/comfyui-mixlab-nodes" style="text-decoration: none;
+        <a target="_blank" href="https://www.mixcomfy.com/blog/" style="text-decoration: none;
         color: black;font-size:12px">
             <svg height="32" aria-hidden="true" viewBox="0 0 16 16" version="1.1" width="32" data-view-component="true"
                 class="octicon octicon-mark-github v-align-middle color-fg-default">
                 <path
                     d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z">
                 </path>
-            </svg> Code
+            </svg> Community
 
         </a>
-
     </div>
+
     <!-- <script type="module" src="https://cdn.bootcdn.net/ajax/libs/photoswipe/5.4.0/photoswipe-lightbox.esm.min.js"></script> -->
     <script type="module">
         import PhotoSwipeLightbox from '/extensions/comfyui-mixlab-nodes/lib/photoswipe-lightbox.esm.min.js'
@@ -397,8 +444,164 @@
 
             return { url: src, name }
 
+        };
+
+
+        function base64ToBlob(base64) {
+            // 去除base64编码中的前缀
+            const base64WithoutPrefix = base64.replace(/^data:image\/\w+;base64,/, '');
+
+            // 将base64编码转换为字节数组
+            const byteCharacters = atob(base64WithoutPrefix);
+
+            // 创建一个存储字节数组的数组
+            const byteArrays = [];
+
+            // 将字节数组放入数组中
+            for (let offset = 0; offset < byteCharacters.length; offset += 1024) {
+                const slice = byteCharacters.slice(offset, offset + 1024);
+
+                const byteNumbers = new Array(slice.length);
+                for (let i = 0; i < slice.length; i++) {
+                    byteNumbers[i] = slice.charCodeAt(i);
+                }
+
+                const byteArray = new Uint8Array(byteNumbers);
+                byteArrays.push(byteArray);
+            }
+
+            // 创建blob对象
+            const blob = new Blob(byteArrays, { type: 'image/png' }); // 根据实际情况设置MIME类型
+
+            return blob;
         }
 
+
+        function editImage(img, data) {
+
+
+            const update = async () => {
+                const { imageData } = filerobotImageEditor.getCurrentImgData()
+                let base64 = imageData.imageBase64;
+
+                let fileBlob = base64ToBlob(base64)
+                // // 获取读取的文件内容，即 Blob 对象
+                let hashId = await calculateImageHash(fileBlob)
+
+                if (hashId == window._appData.data[data.id].hashId) return
+
+                let { url, name } = await uploadImage(fileBlob);
+                // 在这里可以对 Blob 对象进行进一步处理
+                // imageElement.src = url;
+                window._appData.data[data.id].inputs.image = name;
+                window._appData.data[data.id].hashId = hashId;
+
+                console.log("上传的文件：", url, data.id, name);
+
+                img.src = base64;
+            }
+
+            const { TABS, TOOLS } = FilerobotImageEditor;
+            const config = {
+                source: img.src,
+                // loadableDesignState:{ //默认值
+                //     annotations:{
+                //         watermark:{
+                //             image:'https://127.0.0.1:8189/view?filename=1703554480406.png&type=input&subfolder=&rand=0.044164708320141965',
+                //             width:100,
+                //             height:200,
+                //             x:10,
+                //             y:50,
+                //             name: "Image",
+                //             id:'watermark'
+                //         }
+                //     }
+                // },
+                // annotationsCommon: {
+                //     fill: '#ff0000',
+                // },
+                // Text: { text: 'Filerobot...' },
+                Rotate: { angle: 90, componentType: 'slider' },
+
+                Crop: {
+                    presetsItems: [
+                        {
+                            titleKey: 'classicTv',
+                            descriptionKey: '4:3',
+                            ratio: 4 / 3,
+                            // icon: CropClassicTv,  
+                        },
+                        {
+                            titleKey: 'cinemascope',
+                            descriptionKey: '21:9',
+                            ratio: 21 / 9,
+                            // icon: CropCinemaScope, 
+                        },
+                    ],
+                    presetsFolders: [
+                        {
+                            titleKey: 'socialMedia', // will be translated into Social Media as backend contains this translation key
+                            // icon: Social, // optional,  
+                            groups: [
+                                {
+                                    titleKey: 'facebook',
+                                    items: [
+                                        {
+                                            titleKey: 'profile',
+                                            width: 180,
+                                            height: 180,
+                                            descriptionKey: 'fbProfileSize',
+                                        },
+                                        {
+                                            titleKey: 'coverPhoto',
+                                            width: 820,
+                                            height: 312,
+                                            descriptionKey: 'fbCoverPhotoSize',
+                                        },
+                                    ],
+                                },
+                            ],
+                        },
+                    ],
+                },
+                tabsIds: [...Object.values(TABS)], // or ['Adjust', 'Annotate', 'Watermark']
+                defaultTabId: TABS.WATERMARK, // or 'Annotate'
+                defaultToolId: TOOLS.WATERMARK, // or 'Text'
+                closeAfterSave: true
+            };
+
+            let editor = document.querySelector('#editor_container')
+            // Assuming we have a div with id="editor_container"
+            editor.style.display = 'block';
+            // console.log(img,editor,data)
+            document.body.style.overflow = 'hidden'
+
+            const filerobotImageEditor = new FilerobotImageEditor(
+                editor,
+                config,
+            );
+
+            filerobotImageEditor.render({
+                onSave: (editedImageObject, designState) => {
+                    console.log('saved', designState)
+                    //adjustments
+                    update()
+                },
+                onClose: (closingReason) => {
+                    console.log('Closing reason', closingReason);
+
+                    filerobotImageEditor.terminate();
+                    editor.style.display = 'none'
+                    document.body.style.overflow = 'auto'
+
+                },
+            });
+
+        }
+
+
+
+
         async function getQueue(clientId) {
             try {
 
@@ -443,20 +646,27 @@
 
         function randomSeed(seed, data) {
             for (const id in data) {
-
                 if (data[id].inputs.seed != undefined
                     && !Array.isArray(data[id].inputs.seed) //如果是数组，则由其他节点控制
                     && ['increment', 'decrement', 'randomize'].includes(seed[id])) {
                     data[id].inputs.seed = Math.round(Math.random() * 1849378600828930)
                     // console.log('new Seed', data[id])
                 }
+                if (data[id].inputs.noise_seed != undefined
+                    && !Array.isArray(data[id].inputs.noise_seed) //如果是数组，则由其他节点控制
+                    && ['increment', 'decrement', 'randomize'].includes(seed[id])) {
+                    data[id].inputs.noise_seed = Math.round(Math.random() * 1849378600828930)
+
+                }
+                console.log('new Seed', data[id])
             }
             return data
         }
 
         function updateSeed(id, val) {
-            console.log(val)
-            if (!Array.isArray(window._appData.data[id].inputs.seed)) window._appData.data[id].inputs.seed = Math.round(val);
+            // console.log(val)
+            if (window._appData.data[id].inputs.seed && !Array.isArray(window._appData.data[id].inputs.seed)) window._appData.data[id].inputs.seed = Math.round(val);
+            if (window._appData.data[id].inputs.noise_seed && !Array.isArray(window._appData.data[id].inputs.noise_seed)) window._appData.data[id].inputs.noise_seed = Math.round(val);
         }
 
 
@@ -551,19 +761,44 @@
             } catch (error) {
                 isURL = false;
             }
+
+            let isAElement = undefined;
+            try {
+                let div = document.createElement('div');
+                div.innerHTML = link;
+                let a = div.querySelector('a');
+                if (a.href) {
+                    new URL(a.href);
+                    isAElement = div.innerHTML;
+                }
+            } catch (error) {
+
+            }
             // new URL(link)
-            if (isURL) {
+            if (isURL || isAElement) {
                 const linkBtn = document.createElement('button');
-                // linkBtn.href = link;
-                linkBtn.innerText = 'go to'
+
+                if (isURL) {
+                    // linkBtn.href = link;
+                    linkBtn.innerText = 'go to'
+                } else if (isAElement) {
+                    linkBtn.innerHTML = isAElement
+                }
+
                 action.appendChild(linkBtn)
                 linkBtn.style.marginLeft = '18px';
                 linkBtn.addEventListener('click', e => {
-                    e.preventDefault();
-                    window.open(link);
+
+                    if (isURL) {
+                        e.preventDefault();
+                        window.open(link);
+                    }
+                    //   if(isURL)  window.open(link);
                 })
+
             }
 
+
             const output_card = document.createElement("div");
             output_card.className = 'output_card'
             container.appendChild(output_card)
@@ -596,7 +831,16 @@
                     div.innerText = Array.isArray(node.inputs.text) ? node.inputs.text[0] : node.inputs.text
                     output_card.appendChild(div);
                 };
-                if (["SaveImage", "PreviewImage"].includes(node.class_type)) {
+
+                if (node.class_type == "ClipInterrogator") {
+                    let div = document.createElement('div');
+                    div.className = "show_text";
+                    div.id = `output_${node.id}`;
+                    div.innerText = '#ClipInterrogator: …… '
+                    output_card.appendChild(div);
+                };
+
+                if (["SaveImage", "PreviewImage", "PromptImage"].includes(node.class_type)) {
 
                     let a = document.createElement('a');
                     a.id = `output_${node.id}`
@@ -867,6 +1111,12 @@
                     btnFromClipboard.innerText = 'paste from clipboard'
                     actionDiv.appendChild(btnFromClipboard);
 
+                    const btnForImageEdit = document.createElement("button");
+                    btnForImageEdit.style = ` width: 32px; background: none;margin-left: 18px;`
+                    btnForImageEdit.innerHTML = '<?xml version="1.0" ?><svg version="1.1" style="width: 24px;" viewBox="0 0 50 50" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="Layer_1_1_"><path d="M18.293,31.707h6.414l24-24l-6.414-6.414l-24,24V31.707z M45.879,7.707l-3.586,3.586l-3.586-3.586l3.586-3.586   L45.879,7.707z M20.293,26.121l17-17l3.586,3.586l-17,17h-3.586V26.121z"/><polygon points="43.293,19.707 41.293,19.707 41.293,46.707 3.293,46.707 3.293,8.707 31.293,8.707 31.293,6.707 1.293,6.707    1.293,48.707 43.293,48.707  "/></g></svg>'
+                    actionDiv.appendChild(btnForImageEdit);
+
+
                     uploadContainer.appendChild(actionDiv)
 
                     // Create an image element to display the uploaded image
@@ -877,6 +1127,8 @@
 
                     btnFromClipboard.addEventListener('click', (event) => handleClipboardImage(imageElement, data));
 
+                    btnForImageEdit.addEventListener('click', e => editImage(imageElement, data))
+
 
                     uploadImageInput.addEventListener('click', (event) => {
                         uploadImageInputHide.click()
@@ -929,7 +1181,7 @@
 
                     const label = data.title;
 
-                    if (!options.keywords.includes(data.inputs.prompt_keyword)) {
+                    if (options.keywords && !options.keywords?.includes(data.inputs.prompt_keyword)) {
                         options.keywords = [data.inputs.prompt_keyword, ...options.keywords]
                     };
 
@@ -959,16 +1211,20 @@
                     let silde = createNumSlide(data.title,
                         data.inputs.number,
                         (v) => {
-                            window._appData.data[data.id].inputs.number = v;
+                            // console.log(data.id,window._appData.data[data.id])
+                            window._appData.data[data.id].inputs.number = data.class_type === 'IntNumber' ? parseInt(v) : parseFloat(v);
                         },
                         options.min,
                         options.max,
-                        data.class_type === 'IntNumber' ? 'int' : 'float')
+                        data.class_type === 'IntNumber' ? 'int' : 'float',
+                        null,
+                        data.id
+                    )
                     container.appendChild(silde);
                 }
 
                 // Check if the class_type is "CLIPTextEncode"
-                if (["TextInput_", "CLIPTextEncode"].includes(data.class_type)) {
+                if (["TextInput_", "CLIPTextEncode", "PromptSimplification"].includes(data.class_type)) {
                     // Create a container for the upload control
                     const uploadContainer = document.createElement("div");
                     uploadContainer.className = 'card';
@@ -981,13 +1237,27 @@
                     // Create an input field for the image name
                     const textInput = document.createElement("textarea");
                     // textInput.className=;
-                    textInput.value = data.inputs.text;
+                    if (data.class_type == "PromptSimplification") {
+                        textInput.value = data.inputs.prompt;
+                    } else {
+                        textInput.value = data.inputs.text;
+                    }
+
                     // uploadImageInput.type = "text";
                     let json = localStorage.getItem(`t_${data.id}`)
                     try {
+                        // 缓存
                         const { value, height } = JSON.parse(json);
                         textInput.value = value;
                         textInput.style.height = height;
+
+                        if (data.class_type == "PromptSimplification") {
+                            window._appData.data[data.id].inputs.prompt = textInput.value;
+                        } else {
+                            window._appData.data[data.id].inputs.text = textInput.value;
+                        }
+
+
                     } catch (error) {
 
                     }
@@ -1003,8 +1273,12 @@
                     textInput.addEventListener('input', (event) => {
                         // console.log(textInput.value)
                         autoResize(textInput);
-                        window._appData.data[data.id].inputs.text = textInput.value;
 
+                        if (data.class_type == "PromptSimplification") {
+                            window._appData.data[data.id].inputs.prompt = textInput.value;
+                        } else {
+                            window._appData.data[data.id].inputs.text = textInput.value;
+                        }
                         localStorage.setItem(`t_${data.id}`, JSON.stringify({
                             value: textInput.value,
                             height: textInput.style.height
@@ -1019,6 +1293,22 @@
                 if (["CheckpointLoaderSimple", "LoraLoader"].includes(data.class_type)) {
                     let value = data.inputs.ckpt_name || data.inputs.lora_name;
 
+                    try {
+                        let v = localStorage.getItem(`_model_${data.id}_${data.class_type}`)
+                        if (v) {
+                            value = v;
+                            if (data.class_type === 'CheckpointLoaderSimple') {
+                                window._appData.data[data.id].inputs.ckpt_name = value;
+                            }
+                            if (data.class_type === 'LoraLoader') {
+                                window._appData.data[data.id].inputs.lora_name = value;
+                            }
+                        }
+                    } catch (error) {
+
+                    }
+
+
                     let [div, selectDom] = createSelectWithOptions(data.title, Array.from(data.options, o => {
                         return {
                             value: o,
@@ -1035,6 +1325,8 @@
                         if (data.class_type === 'LoraLoader') {
                             window._appData.data[data.id].inputs.lora_name = selectDom.value;
                         }
+
+                        localStorage.setItem(`_model_${data.id}_${data.class_type}`, selectDom.value)
                     })
 
                     container.appendChild(div);
@@ -1162,8 +1454,11 @@
 
             value = 'float' ? parseFloat(value.toFixed(3)) : parseInt(value)
             try {
-                let i=parseFloat(localStorage.getItem(`_slider_${targetId}`))
-                if(!!i) value = i
+                let i = parseFloat(localStorage.getItem(`_slider_${targetId}`))
+                if (!!i) {
+                    value = i;
+                    callback && callback(value)
+                }
             } catch (error) {
 
             }
@@ -1192,6 +1487,8 @@
 
                 let defaultValue = (targetId ? localStorage.getItem(`_slide_${targetId}`) : '') || keywords[0];
 
+                window._appData.data[targetId].inputs.prompt_keyword = defaultValue;
+
                 let selectTag = createSelect(Array.from(keywords, (k, i) => {
                     return {
                         value: k,
@@ -1515,7 +1812,7 @@
 
                         }
 
-                        if (val && type == "images" && output.querySelector(`#output_${id} img`)) {
+                        if (val && (type == "images" || type == 'images_prompts') && output.querySelector(`#output_${id} img`)) {
                             let imgDiv = output.querySelector(`#output_${id}`)
                             imgDiv.style.display = 'none';
 
@@ -1523,7 +1820,16 @@
                             // Array.from(imgDiv.parentElement.querySelectorAll('.output_images'), im => im.remove());
 
                             for (const v of val) {
-                                let im = await createImage(v);
+
+                                let url = v, prompt = ''
+
+                                if (type == 'images_prompts') {
+                                    // 是个数组，多了对应的prompt
+                                    url = v[0];
+                                    prompt = v[1];
+                                }
+
+                                let im = await createImage(url);
 
                                 // 构建新的
                                 let a = document.createElement('a');
@@ -1531,12 +1837,23 @@
                                 a.setAttribute('data-pswp-width', im.naturalWidth);
                                 a.setAttribute('data-pswp-height', im.naturalHeight);
                                 a.setAttribute('target', "_blank");
-                                a.setAttribute('href', v);
+                                a.setAttribute('href', url);
+
 
                                 let img = new Image();
                                 // img;
-                                img.src = v;
-                                a.appendChild(img)
+                                img.src = url;
+                                a.appendChild(img);
+
+                                if (prompt) {
+                                    a.style.textDecoration = 'none';
+                                    let p = document.createElement('p')
+                                    p.className = 'prompt_image'
+                                    p.innerText = prompt;
+                                    a.appendChild(p)
+                                    img.alt = prompt
+                                }
+
                                 // imgDiv.parentElement.appendChild(a);
                                 imgDiv.parentElement.insertBefore(a, imgDiv.parentElement.firstChild);
                             }
@@ -1695,19 +2012,25 @@
             };
 
             api.addEventListener("status", ({ detail }) => {
-                console.log("status", detail);
+                console.log("status", detail, detail.exec_info?.queue_remaining);
                 try {
-                    ui.status.update(`queue#${detail.exec_info.queue_remaining}`);
+                    ui.status.update(`queue#${detail.exec_info?.queue_remaining}`);
+                    if (detail.exec_info?.queue_remaining === 0) {
+                        // 运行按钮重设
+                        ui.submitButton.reset()
+                        console.log('运行按钮重设')
+                    }
                 } catch (error) {
-
+                    console.log(error)
                 }
 
             });
 
             api.addEventListener("progress", ({ detail }) => {
                 console.log("progress", detail);
+                const class_type = window._appData.data[detail?.node]?.class_type || ''
                 try {
-                    ui.status.update(`${detail.value}/${detail.max}`);
+                    ui.status.update(`${parseFloat(100 * detail.value / detail.max).toFixed(1)}% ${class_type}`);
                     ui.submitButton.running()
                 } catch (error) {
 
@@ -1721,6 +2044,12 @@
                 const text = detail?.output?.text;
                 const gifs = detail?.output?.gifs;
 
+                const prompt = detail?.output?.prompt;
+                const analysis = detail?.output?.analysis;
+
+                const _images = detail?.output?._images;
+                const prompts = detail?.output?.prompts;
+
                 if (images) {
                     // if (!images) return;
 
@@ -1730,17 +2059,38 @@
                         return `${url}/view?filename=${encodeURIComponent(img.filename)}&type=${img.type}&subfolder=${encodeURIComponent(img.subfolder)}&t=${+new Date()}`;
                     }), detail.node, 'images');
 
+                } else if (_images && prompts) {
+                    let url = get_url();
+
+                    let items = [];
+                    // 支持图片的batch
+                    Array.from(_images, (imgs, i) => {
+
+                        for (const img of imgs) {
+                            items.push([`${url}/view?filename=${encodeURIComponent(img.filename)
+                                }&type=${img.type}&subfolder=${encodeURIComponent(img.subfolder)
+                                }&t=${+new Date()}`, prompts[i]])
+                        }
+
+                    })
+
+                    show(items, detail.node, 'images_prompts');
+
                 } else if (text) {
-                    ui.output.update("text", Array.isArray(text) ? text[0] : text, detail.node)
+                    ui.output.update("text", Array.isArray(text) ? text.join('\n\n') : text, detail.node)
                 } else if (gifs && gifs[0]) {
                     // if (!images) return; 
                     const src = `${get_url()}/view?filename=${encodeURIComponent(gifs[0].filename)}&type=${gifs[0].type}&subfolder=${encodeURIComponent(gifs[0].subfolder)
                         }&&format=${gifs[0].format}&t=${+new Date()}`;
 
                     show(src, detail.node, gifs[0].format.match('video') ? 'video' : 'image');
+                } else if (prompt && analysis) {
+                    // #ClipInterrogator: …… 
+                    ui.output.update("text", `${prompt.join('\n\n')}\n${JSON.stringify(analysis, null, 2)}`, detail.node)
                 }
 
 
+
                 try {
                     ui.status.update(`executed_#${window._appData.data[detail.node]?.class_type}`);
                     ui.submitButton.reset()
@@ -1768,6 +2118,11 @@
             //     console.log("b_preview", detail)
             //     show(URL.createObjectURL(detail));
             // });
+            api.addEventListener("execution_error", ({ detail }) => {
+
+                console.log("execution_error", detail)
+                // show(URL.createObjectURL(detail));
+            });
 
 
             api.addEventListener('execution_start', async ({ detail }) => {
@@ -1804,6 +2159,36 @@
                 children: 'a',
                 pswpModule: () => import('/extensions/comfyui-mixlab-nodes/lib/photoswipe.esm.min.js')
             });
+            lightbox.on('uiRegister', function () {
+                lightbox.pswp.ui.registerElement({
+                    name: 'custom-caption',
+                    order: 9,
+                    isButton: false,
+                    appendTo: 'root',
+                    html: 'Caption text',
+                    onInit: (el, pswp) => {
+                        lightbox.pswp.on('change', () => {
+                            const currSlideElement = lightbox.pswp.currSlide.data.element
+                            let captionHTML = ''
+                            if (currSlideElement) {
+                                const hiddenCaption = currSlideElement.querySelector(
+                                    '.hidden-caption-content'
+                                )
+                                if (hiddenCaption) {
+                                    // get caption from element with class hidden-caption-content
+                                    captionHTML = hiddenCaption.innerHTML
+                                } else {
+                                    // get caption from alt attribute
+                                    captionHTML = currSlideElement
+                                        .querySelector('img')
+                                        .getAttribute('alt')
+                                }
+                            }
+                            el.innerHTML = captionHTML || ''
+                        })
+                    }
+                })
+            })
             lightbox.init();
             // window._lightbox = lightbox
 
@@ -1879,13 +2264,14 @@
 
             createApp(window._appData);
 
-
         };
 
-        init_app()
-    </script>
+        init_app();
 
 
+
+    </script>
+
 </body>
 
 </html>

web/javascript/app_mixlab.js

@@ -100,16 +100,17 @@ function extractInputAndOutputData (jsonData, inputIds = [], outputIds = []) {
           // min max step
           options = node.widgets.filter(w => w.type === 'slider')[0].options
           // 备选的keywords清单
-          let ks = getLocalData(`_mixlab_PromptSlide`)
-          let keywords = ks[id]
-          // console.log('keywords',keywords)
-          if (keywords && keywords[0]) {
+          try {
+            let keywords = node.widgets.filter(w => w.name === 'upload')[0]
+              .value
+            keywords = JSON.parse(keywords)
             options.keywords = keywords
+          } catch (error) {
+            console.log(error)
           }
         }
 
-        if(node.type=='Color'){
-          
+        if (node.type == 'Color') {
         }
 
         input[inputIds.indexOf(id)] = {
@@ -126,11 +127,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) {}
       }
@@ -188,7 +189,8 @@ function downloadJsonFile (jsonData, fileName = 'mix_app.json') {
   }, 0)
 }
 
-async function save (json, download = false) {
+async function save (json, download = false, showInfo = true) {
+  console.log('####SAVE', json[0])
   const name = json[0],
     version = json[5],
     share_prefix = json[6], //用于分享的功能扩展
@@ -237,30 +239,70 @@ async function save (json, download = false) {
     if (download) {
       await downloadJsonFile(data, data.app.filename)
     }
-    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(
+
+    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)}`
+        )
+    }
   } catch (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
+  }
+}
+
 app.registerExtension({
-  name: 'Mixlab.utils.AppInfo',
+  name: 'Mixlab.app.AppInfo',
   async beforeRegisterNodeDef (nodeType, nodeData, app) {
     if (nodeType.comfyClass == 'AppInfo') {
       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',
@@ -331,6 +373,8 @@ app.registerExtension({
         }
 
         this.serialize_widgets = true //需要保存参数
+
+        window._mixlab_app_json = null
       }
 
       const onExecuted = nodeType.prototype.onExecuted
@@ -339,6 +383,12 @@ app.registerExtension({
         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 +397,106 @@ app.registerExtension({
         } catch (error) {}
       }
     }
+  },
+  async loadedGraphNode (node, app) {
+    // console.log('#loadedGraphNode1111')
+    window._mixlab_app_json = null //切换workflow需要清空
+    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'
+        }
+      }
+
+      // app.canvas.centerOnNode(node)
+      // app.canvas.setZoom(0.45)
+    }
   }
 })
+
+api.addEventListener('execution_start', async ({ detail }) => {
+  console.log('#execution_start', detail)
+  window._mixlab_app_json = null
+})
+
+api.addEventListener('executed', async ({ detail }) => {
+  console.log('#executed', detail)
+  // window._mixlab_app_json=null;
+  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)
+      }
+    }
+  }
+})
+
+app.registerExtension({
+  name: 'Mixlab.app.AppNode',
+  async beforeRegisterNodeDef (nodeType, nodeData, app) {
+    if (nodeType.comfyClass == 'AppNode') {
+      const orig_nodeCreated = nodeType.prototype.onNodeCreated
+      nodeType.prototype.onNodeCreated = function () {
+        orig_nodeCreated?.apply(this, arguments)
+        console.log('#orig_nodeCreated', this)
+        let node=this;
+
+        const name = this.widgets.filter(w => w.name === 'name')[0]
+
+        name.callback = async e => {
+          let es = e.split('/')
+          let filename = '',
+            category = ''
+          if (es.length == 2) {
+            category = es[0]
+            filename = es[1]
+          } else if (es.length === 1) {
+            filename = e
+          }
+          const res = await api.fetchApi('/mixlab/workflow', {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+              task: 'my_app',
+              filename,
+              category
+            })
+          })
+
+          if (res.status !== 200) {
+            throw {
+              response: await res.json()
+            }
+          }
+          let result=await res.json()
+          const {app,output:workflow,}=result.data[0].data;
+          let input=app.input
+          console.log(input)
+
+          if(input.length==1){
+            let widget = node.inputs.filter(w => w.name === 'input')[0];
+            let sc=input[0];
+            LGraphCanvas.prototype._createNodeForInput(
+              node, //当前node
+              widget, //当前node里需要自动连线的widget
+              sc.class_type, //作为input的node type
+              'IMAGE' // 作为input的node的outputs的name. the input slot type of the target node
+            )
+          }
+
+        }
+
+        this.serialize_widgets = true //需要保存参数
+      }
+    }
+  },
+  async loadedGraphNode (node, app) {}
+})

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.10.0'
+const version = 'v0.15.0'
 
 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/layer_mixlab.js

@@ -156,6 +156,32 @@ const parseSvg = async svgContent => {
   return { data, image: base64, svgElement }
 }
 
+
+function findImages(nodeId) {
+  // 检查当前节点是否有 imgs 字段
+  const n = app.graph.getNodeById(nodeId)
+  if (n.imgs) {
+    return n.imgs;
+  }
+
+  // 检查当前节点的 inputs 是否有 image 字段
+  if (n.inputs) {
+    for (let i = 0; i < n.inputs.length; i++) {
+      if (n.inputs[i].name==='image'||n.inputs[i].name==='images') {
+        // 获取新的 nodeId，并递归调用 findImages 函数
+        var linkId = n.inputs[i]?.link;
+        var origin_id = app.graph.links[linkId].origin_id
+        return findImages(origin_id);
+      }
+    }
+  }
+
+  // 如果没有找到 imgs 字段或者 image 字段，则返回 null
+  return null;
+}
+
+ 
+
 async function setArea (cw, ch, topBase64, base64, data, fn) {
   let displayHeight = Math.round(window.screen.availHeight * 0.8)
   let div = document.createElement('div')
@@ -571,15 +597,19 @@ app.registerExtension({
               }
             }
             try {
-              console.log('this.inputs', this.inputs)
-              let topLinkId = this.inputs[0].link
-              let topNodeId = app.graph.links[topLinkId].origin_id
-              let topIm = app.graph.getNodeById(topNodeId).imgs[0]
+              console.log('this.inputs', this.id)
+              let imgs=findImages(this.id)
+              
+              // let topLinkId = this.inputs[0].link
+              // let topNodeId = app.graph.links[topLinkId].origin_id
+              let topIm = imgs[0]
 
               let linkId = this.inputs[3].link
               let nodeId = app.graph.links[linkId].origin_id
               // console.log(linkId,this.inputs)
-              let im = app.graph.getNodeById(nodeId).imgs[0]
+              let imgs2=findImages(nodeId)
+              let im = imgs2[0]
+              console.log(topIm,im)
               // let src = im.src
               setArea(
                 im.naturalWidth,
@@ -589,7 +619,9 @@ app.registerExtension({
                 data,
                 updateValue
               )
-            } catch (error) {}
+            } catch (error) {
+              console.log(error)
+            }
           })
         }
       }

web/javascript/main_mixlab.js

@@ -1331,7 +1331,13 @@ app.registerExtension({
           let w = 360,
             s = widget.preview.videoWidth / widget.preview.videoHeight,
             h = w / s || w
-          console.log(h)
+          // console.log(h)
+
+          if (!window.documentPictureInPicture) {
+            window.alert(
+              'This feature is available only in secure contexts (HTTPS), in some or all supporting browsers. https://developer.mozilla.org/en-US/docs/Web/API/Document_Picture-in-Picture_API'
+            )
+          }
 
           const pipWindow = await documentPictureInPicture.requestWindow({
             width: w,
@@ -2137,8 +2143,8 @@ const node = {
   loadedGraphNode (node, app) {
     if (node.type === 'RandomPrompt') {
       try {
-        let max_count = node.widgets.filter(w => w.name === "max_count")[0];
-        max_count.value= node.widgets_values[0]
+        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)

web/javascript/prompt_mixlab.js

@@ -3,6 +3,87 @@ import { api } from '../../../scripts/api.js'
 import { ComfyWidgets } from '../../../scripts/widgets.js'
 import { $el } from '../../../scripts/ui.js'
 
+import PhotoSwipeLightbox from '/extensions/comfyui-mixlab-nodes/lib/photoswipe-lightbox.esm.min.js'
+function loadCSS (url) {
+  var link = document.createElement('link')
+  link.rel = 'stylesheet'
+  link.type = 'text/css'
+  link.href = url
+  document.getElementsByTagName('head')[0].appendChild(link)
+
+  // Create a style element
+  const style = document.createElement('style')
+  // Define the CSS rule for scrollbar width
+  const cssRule = `.pswp__custom-caption {
+    background: rgb(20 27 70);
+    font-size: 16px;
+    color: #fff;
+    width: calc(100% - 32px);
+    max-width: 980px;
+    padding: 2px 8px;
+    border-radius: 4px;
+    position: absolute;
+    left: 50%;
+    bottom: 16px;
+    transform: translateX(-50%);
+  }
+  .pswp__custom-caption a {
+    color: #fff;
+    text-decoration: underline;
+  }
+  .hidden-caption-content {
+    display: none;
+  }`
+  // Add the CSS rule to the style element
+  style.appendChild(document.createTextNode(cssRule))
+
+  // Append the style element to the document head
+  document.head.appendChild(style)
+}
+loadCSS('/extensions/comfyui-mixlab-nodes/lib/photoswipe.min.css')
+
+function initLightBox () {
+  const lightbox = new PhotoSwipeLightbox({
+    gallery: '.prompt_image_output',
+    children: 'a',
+    pswpModule: () =>
+      import('/extensions/comfyui-mixlab-nodes/lib/photoswipe.esm.min.js')
+  })
+
+  lightbox.on('uiRegister', function () {
+    lightbox.pswp.ui.registerElement({
+      name: 'custom-caption',
+      order: 9,
+      isButton: false,
+      appendTo: 'root',
+      html: 'Caption text',
+      onInit: (el, pswp) => {
+        lightbox.pswp.on('change', () => {
+          const currSlideElement = lightbox.pswp.currSlide.data.element
+          let captionHTML = ''
+          if (currSlideElement) {
+            const hiddenCaption = currSlideElement.querySelector(
+              '.hidden-caption-content'
+            )
+            if (hiddenCaption) {
+              // get caption from element with class hidden-caption-content
+              captionHTML = hiddenCaption.innerHTML
+            } else {
+              // get caption from alt attribute
+              captionHTML = currSlideElement
+                .querySelector('img')
+                .getAttribute('alt')
+            }
+          }
+          el.innerHTML = captionHTML || ''
+        })
+      }
+    })
+  })
+
+  lightbox.init()
+}
+
 function get_position_style (ctx, widget_width, y, node_height) {
   const MARGIN = 4 // the margin around the html element
 
@@ -35,6 +116,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 +171,106 @@ 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)
+         
+        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') {
+     
+    }
+  }
+})
+
 app.registerExtension({
   name: 'Mixlab.prompt.PromptSlide',
   async beforeRegisterNodeDef (nodeType, nodeData, app) {
@@ -132,8 +331,8 @@ app.registerExtension({
           inp.click()
           inp.addEventListener('change', event => {
             // 获取选择的文件
-            const file = event.target.files[0];
-            this.title=file.name.split('.')[0];
+            const file = event.target.files[0]
+            this.title = file.name.split('.')[0]
 
             // console.log(file.name.split('.')[0])
             // 创建文件读取器
@@ -149,10 +348,11 @@ app.registerExtension({
               // 打印文件内容
               //   console.log(keywords)
 
-              // widget.value = keywords
-              let ks = getLocalData(`_mixlab_PromptSlide`)
-              ks[this.id] = keywords
-              setLocalDataOfWin(`_mixlab_PromptSlide`, ks)
+              widget.value = JSON.stringify(keywords)
+
+              // let ks = getLocalData(`_mixlab_PromptSlide`)
+              // ks[this.id] = keywords
+              // setLocalDataOfWin(`_mixlab_PromptSlide`, ks)
 
               createSelect(select, keywords, prompt_keyword)
 
@@ -187,14 +387,13 @@ app.registerExtension({
     if (node.type === 'PromptSlide') {
       try {
         let prompt = node.widgets.filter(w => w.name === 'prompt_keyword')[0]
-        let ks = getLocalData(`_mixlab_PromptSlide`)
-
-        let keywords = ks[node.id]
+        // 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)
         }
@@ -202,3 +401,166 @@ 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 = `<a href="${url}" 
+      data-pswp-width="${image.naturalWidth}" 
+      data-pswp-height="${image.naturalHeight}" 
+      target="_blank">
+      <img src="${url}" style='width: 100%' alt="${message.prompts[index]}"/>
+    </a>
+    <p style="position: absolute;
+            bottom: 0;
+            left: 0;
+            opacity: 0.6;
+            background-color: var(--comfy-input-bg); 
+            color: var(--descrip-text);
+            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', {})
+        widget.div.className = 'prompt_image_output'
+
+        document.body.appendChild(widget.div)
+
+        this.addCustomWidget(widget)
+
+        initLightBox()
+
+        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)
+
+      initLightBox()
+
+      let cards = widget.div.querySelectorAll('.card')
+      if (cards.length == 0) node.size = [280, 120]
+
+      _createResult(node, widget, widget.value)
+    }
+  }
+})

web/javascript/smart_connect.js

@@ -0,0 +1,302 @@
+const smart_connect_config_input = [
+  {
+    node_type: 'CLIPTextEncode',
+    node_widget_name: 'text',
+    inputNodeName: 'RandomPrompt',
+    inputNode_output_name: 'STRING'
+  },
+  {
+    node_type: 'CLIPTextEncode',
+    node_widget_name: 'text',
+    inputNodeName: 'EmbeddingPrompt',
+    inputNode_output_name: 'STRING'
+  },
+  {
+    node_type: 'CLIPTextEncode',
+    node_widget_name: 'text',
+    inputNodeName: 'ChinesePrompt_Mix',
+    inputNode_output_name: 'prompt'
+  },
+  {
+    node_type: 'CheckpointLoaderSimple',
+    node_widget_name: 'ckpt_name',
+    inputNodeName: 'CkptNames_',
+    inputNode_output_name: 'ckpt_names'
+  },
+  {
+    node_type: 'KSampler',
+    node_widget_name: 'sampler_name',
+    inputNodeName: 'SamplerNames_',
+    inputNode_output_name: 'sampler_names'
+  },
+  {
+    node_type: 'LoraLoaderModelOnly',
+    node_widget_name: 'lora_name',
+    inputNodeName: 'LoraNames_',
+    inputNode_output_name: 'lora_names'
+  },
+  {
+    node_type: 'LoadLoRA',
+    node_widget_name: 'lora_name',
+    inputNodeName: 'LoraNames_',
+    inputNode_output_name: 'lora_names'
+  },
+  {
+    node_type: 'Moondream',
+    node_widget_name: 'image',
+    inputNodeName: 'LoadImage',
+    inputNode_output_name: 'IMAGE'
+  }
+]
+
+const smart_connect_config_output = [
+  {
+    node_type: 'LoadImage',
+    node_output_name: 'IMAGE',
+    outputNodeName: 'ClipInterrogator',
+    outputNode_input_name: 'image'
+  },
+  {
+    node_type: 'VAEDecode',
+    node_output_name: 'IMAGE',
+    outputNodeName: 'PromptImage',
+    outputNode_input_name: 'images'
+  },
+  {
+    node_type: 'VAEDecode',
+    node_output_name: 'IMAGE',
+    outputNodeName: 'PreviewImage',
+    outputNode_input_name: 'images'
+  },
+  {
+    node_type: 'VAEDecode',
+    node_output_name: 'IMAGE',
+    outputNodeName: 'SaveImage',
+    outputNode_input_name: 'images'
+  },
+  {
+    node_type: 'Moondream',
+    node_output_name: 'STRING',
+    outputNodeName: 'ShowTextForGPT',
+    outputNode_input_name: 'text'
+  }
+]
+
+// import {
+//   convertToInput,
+//   getConfig,
+//   isConvertableWidget
+// } from '../../../extensions/core/widgetInputs.js'
+
+const CONVERTED_TYPE = 'converted-widget'
+const GET_CONFIG = Symbol()
+
+function getConfig (widgetName) {
+  const { nodeData } = this.constructor
+  return (
+    nodeData?.input?.required[widgetName] ??
+    nodeData?.input?.optional?.[widgetName]
+  )
+}
+
+function hideWidget (node, widget, suffix = '') {
+  widget.origType = widget.type
+  widget.origComputeSize = widget.computeSize
+  widget.origSerializeValue = widget.serializeValue
+  widget.computeSize = () => [0, -4] // -4 is due to the gap litegraph adds between widgets automatically
+  widget.type = CONVERTED_TYPE + suffix
+  widget.serializeValue = () => {
+    // Prevent serializing the widget if we have no input linked
+    if (!node.inputs) {
+      return undefined
+    }
+    let node_input = node.inputs.find(i => i.widget?.name === widget.name)
+
+    if (!node_input || !node_input.link) {
+      return undefined
+    }
+    return widget.origSerializeValue
+      ? widget.origSerializeValue()
+      : widget.value
+  }
+
+  // Hide any linked widgets, e.g. seed+seedControl
+  if (widget.linkedWidgets) {
+    for (const w of widget.linkedWidgets) {
+      hideWidget(node, w, ':' + widget.name)
+    }
+  }
+}
+
+function convertToInput (node, widget, config) {
+  hideWidget(node, widget)
+
+  const type = config[0]
+
+  // Add input and store widget config for creating on primitive node
+  const sz = node.size
+  node.addInput(widget.name, type, {
+    widget: { name: widget.name, [GET_CONFIG]: () => config }
+  })
+
+  for (const widget of node.widgets) {
+    widget.last_y += LiteGraph.NODE_SLOT_HEIGHT
+  }
+
+  // Restore original size but grow if needed
+  node.setSize([Math.max(sz[0], node.size[0]), Math.max(sz[1], node.size[1])])
+}
+
+export function smart_init () {
+  LGraphCanvas.prototype._createNodeForInput = function (
+    node,
+    widget,
+    inputNodeName,
+    inputNode_slot
+  ) {
+    // console.log(node.pos)
+
+    // var widget = node.widgets.filter(w => w.name === node_widget_name)[0]
+    if (widget) {
+      // 如果有存在的，没有连线输出的，自动连，不新建
+      let input_node = null
+
+      Array.from(app.graph.findNodesByType(inputNodeName), n => {
+        var links = n.outputs.filter(o => o.name === inputNode_slot)[0].links
+        //  console.log(links)
+        if (!links || links?.length === 0) input_node = n
+      })
+      // 新建
+      if (!input_node) {
+        input_node = LiteGraph.createNode(inputNodeName)
+        input_node.pos = [node.pos[0] - node.size[0] - 24, node.pos[1] - 48]
+        app.canvas.graph.add(input_node, false)
+      } else {
+        input_node.pos = [node.pos[0] - node.size[0] - 24, node.pos[1] - 48]
+      }
+
+      const config = getConfig.call(node, widget.name) ?? [
+        widget.type,
+        widget.options || {}
+      ]
+      let node_slotType = config[0]
+      // 如果input没有，则创建
+      if (!node.inputs?.filter(inp => inp.name === widget.name)[0]||!node.inputs)
+        convertToInput(node, widget, config)
+      input_node.connectByType(inputNode_slot, node, node_slotType)
+    }
+  }
+
+  LGraphCanvas.prototype._createNodeForOutput = function (
+    node,
+    widget,
+    outputNodeName,
+    outputNode_slot
+  ) {
+    if (widget) {
+      let output_node
+      Array.from(app.graph.findNodesByType(outputNodeName), n => {
+        var links = n.inputs.filter(o => o.name === outputNode_slot)[0].links
+        //  console.log(links)
+        if (!links || links?.length === 0) output_node = n
+      })
+      console.log('output_node', output_node, widget.name)
+
+      if (!output_node) {
+        // 新建
+        output_node = LiteGraph.createNode(outputNodeName)
+        output_node.pos = [node.pos[0] + node.size[0] + 24, node.pos[1] - 48]
+        app.canvas.graph.add(output_node, false)
+      } else {
+        output_node.pos = [node.pos[0] + node.size[0] + 24, node.pos[1] - 48]
+      }
+
+      const config = getConfig.call(node, widget.name) ?? [
+        widget.type,
+        widget.options || {}
+      ]
+      let node_slotType = config[0]
+      console.log(node_slotType, output_node, outputNode_slot)
+      let type = output_node.inputs.filter(
+        inp => inp.name == outputNode_slot
+      )[0].type
+      node.connectByType(node_slotType, output_node, type)
+    }
+  }
+}
+
+export function addSmartMenu (options, node) {
+  let sopts = []
+
+  for (const sc of smart_connect_config_input) {
+    // 有智能推荐，则出现
+    if (node.type === sc.node_type) {
+      // console.log('smart',node)
+      // 则出现 randomPrompt
+      // CLIPTextEncode 的widget ，name== 'text'
+      let node_widget_name = sc.node_widget_name
+      let widget = node.widgets.filter(w => w.name === node_widget_name)[0]
+      if (!widget) {
+        // 控件没有，则查找inputs
+        widget = node.inputs.filter(w => w.name === node_widget_name)[0]
+      }
+
+      let isLinkNull = true
+      // 如果input里已经有，但是link为空
+      if (node.inputs?.filter(inp => inp.name === node_widget_name)[0]) {
+        isLinkNull =
+          node.inputs.filter(inp => inp.name === node_widget_name)[0].link ===
+          null
+      }
+
+      if (widget && isLinkNull) {
+        sopts.push({
+          content: sc.inputNodeName.split('_')[0] + '➡️',
+          callback: () => {
+            LGraphCanvas.prototype._createNodeForInput(
+              node, //当前node
+              widget, //当前node里需要自动连线的widget
+              sc.inputNodeName, //作为input的node type
+              sc.inputNode_output_name // 作为input的node的outputs的name. the input slot type of the target node
+            )
+          }
+        })
+      }
+    }
+  }
+
+  for (const sc of smart_connect_config_output) {
+    if (node.type === sc.node_type) {
+      let node_output_name = sc.node_output_name
+      const widget = node.outputs.filter(w => w.name === node_output_name)[0]
+
+      let isLinkNull = true
+      // 如果output里 link为空
+      if (node.outputs?.filter(inp => inp.name === node_output_name)[0]) {
+        isLinkNull =
+          node.outputs.filter(inp => inp.name === node_output_name)[0].links
+            ?.length === 0
+        if (!node.outputs.filter(inp => inp.name === node_output_name)[0].links)
+          isLinkNull = true
+      }
+
+      if (widget && isLinkNull) {
+        sopts.push({
+          content: '➡️' + sc.outputNodeName.split('_')[0],
+          callback: () => {
+            LGraphCanvas.prototype._createNodeForOutput(
+              node, //当前node
+              widget, //当前node里需要自动连线的widget
+              sc.outputNodeName, //作为input的node type
+              sc.outputNode_input_name // 作为input的node的outputs的name. the input slot type of the target node
+            )
+          }
+        })
+      }
+    }
+  }
+
+  if (sopts.length > 0) options = [...sopts, null, ...options]
+
+  return options
+}

web/javascript/ui_mixlab.js

@@ -1,7 +1,4 @@
 import { app } from '../../../scripts/app.js'
-import { api } from '../../../scripts/api.js'
-import { ComfyWidgets } from '../../../scripts/widgets.js'
-import { $el } from '../../../scripts/ui.js'
 import { closeIcon } from './svg_icons.js'
 
 import {
@@ -9,6 +6,67 @@ import {
   GroupNodeHandler
 } from '../../../extensions/core/groupNode.js'
 
+import { smart_init, addSmartMenu } from './smart_connect.js'
+
+function copyNodeValues (src, dest) {
+  // title
+  dest.title = src.title
+
+  // copy input connections
+
+  for (let i in src.inputs) {
+    let input = src.inputs[i]
+    if (input.link) {
+      let link = app.graph.links[input.link]
+      let src_node = app.graph.getNodeById(link.origin_id)
+      if (dest.inputs.filter(inp => inp.name === input.name).length === 0) {
+        // 没有，name换了
+        let dInp = dest.inputs.filter(inp => inp.type === input.type)
+        if (dInp.length === 1) {
+          src_node.connect(link.origin_slot, dest.id, dInp[0].name)
+        }
+      } else {
+        src_node.connect(link.origin_slot, dest.id, input.name)
+      }
+    }
+  }
+
+  // copy output connections
+  let output_links = {}
+  for (let i in src.outputs) {
+    let output = src.outputs[i]
+    if (output.links) {
+      let links = []
+      for (let j in output.links) {
+        links.push(app.graph.links[output.links[j]])
+      }
+      output_links[output.name] = links
+    }
+  }
+
+  for (let i in dest.outputs) {
+    let links = output_links[dest.outputs[i].name]
+    if (links) {
+      for (let j in links) {
+        let link = links[j]
+        let target_node = app.graph.getNodeById(link.target_id)
+        dest.connect(parseInt(i), target_node, link.target_slot)
+      }
+    }
+  }
+
+  // copy  widgets
+  for (const w of src.widgets) {
+    for (const d of dest.widgets) {
+      if (w.name === d.name) {
+        d.value = w.value
+      }
+    }
+  }
+
+  app.graph.afterChange()
+}
+
 function deepEqual (obj1, obj2) {
   if (typeof obj1 !== typeof obj2) {
     return false
@@ -575,22 +633,71 @@ app.registerExtension({
       }
     }
 
+    LGraphCanvas.prototype.fixTheNode = function (node) {
+      let new_node = LiteGraph.createNode(node.comfyClass)
+      new_node.pos = [node.pos[0], node.pos[1]]
+      app.canvas.graph.add(new_node, false)
+      copyNodeValues(node, new_node)
+      app.canvas.graph.remove(node)
+    }
+
+    smart_init()
+
     const getNodeMenuOptions = LGraphCanvas.prototype.getNodeMenuOptions // store the existing method
     LGraphCanvas.prototype.getNodeMenuOptions = function (node) {
       // replace it
       const options = getNodeMenuOptions.apply(this, arguments) // start by calling the stored one
       node.setDirtyCanvas(true, true) // force a redraw of (foreground, background)
+      console.log('getNodeMenuOptions', node.type == 'CLIPTextEncode')
 
-      return [
+      let opts = [
         {
           content: 'Help ♾️Mixlab', // with a name
           callback: () => {
             LGraphCanvas.prototype.helpAboutNode(node)
           } // and the callback
         },
-        null,
-        ...options
-      ] // and return the options
+        {
+          content: 'Fix node v2', // with a name
+          callback: () => {
+            LGraphCanvas.prototype.fixTheNode(node)
+          }
+        }
+      ]
+
+      opts = addSmartMenu(opts,node)
+
+      // if (node.type == 'CLIPTextEncode') {
+      //   // 则出现 randomPrompt
+      //   // CLIPTextEncode 的widget ，name== 'text'
+      //   let node_widget_name = 'text'
+      //   const widget = node.widgets.filter(w => w.name === node_widget_name)[0]
+
+      //  let mixlab_nodes_smart_connect= [{node_type:'CLIPTextEncode',
+      //   node_widget_name:'text',
+      //   inputNodeName:'RandomPrompt',
+      //   inputNode_output_type:'STRING'}]
+
+      //   if (widget) {
+      //     opts = [
+      //       {
+      //         content: 'RandomPrompt',
+      //         callback: () => {
+      //           LGraphCanvas.prototype._createNodeForInput(
+      //             node, //当前node
+      //             widget,//当前node里需要自动连线的widget
+      //             'RandomPrompt',//作为input的node type
+      //             'STRING'// 作为input的node的outputs的type. the input slot type of the target node
+      //           )
+      //         }
+      //       },
+      //       null,
+      //       ...opts
+      //     ]
+      //   }
+      // }
+
+      return [...opts, null, ...options] // and return the options
     }
 
     const getGroupMenuOptions = LGraphCanvas.prototype.getGroupMenuOptions // store the existing method
@@ -697,6 +804,17 @@ app.registerExtension({
             })
           } // and the callback
         },
+        {
+          content: `Remove Group&Nodes ♾️Mixlab`, // with a name
+          callback: async (value, opts, e, menu, group) => {
+            // console.log(group)
+            let nodes = group._nodes
+            for (const node of nodes) {
+              app.graph.remove(node)
+            }
+            app.graph.remove(group)
+          } // and the callback
+        },
         null,
         ...options
       ] // and return the options
@@ -722,7 +840,7 @@ app.registerExtension({
 
       const apps = await get_my_app()
 
-      let apps_map = { '0': [] }
+      let apps_map = { 0: [] }
 
       for (const app of apps) {
         if (app.category) {
@@ -735,12 +853,13 @@ app.registerExtension({
 
       let apps_opts = []
       for (const category in apps_map) {
-        console.log('category',typeof(category))
+        console.log('category', typeof category)
         if (category === '0') {
           apps_opts.push(
             ...Array.from(apps_map[category], a => {
+              // console.log('#1级',a)
               return {
-                content: a.name,
+                content: `${a.name}_${a.version}`,
                 has_submenu: false,
                 callback: async () => {
                   try {
@@ -763,13 +882,14 @@ app.registerExtension({
         } else {
           // 二级
           apps_opts.push({
-            content:  '🚀 '+category,
+            content: '🚀 ' + category,
             has_submenu: true,
             disabled: false,
             submenu: {
               options: Array.from(apps_map[category], a => {
+                // console.log('#二级',a)
                 return {
-                  content: a.name,
+                  content: `${a.name}_${a.version}`,
                   callback: async () => {
                     try {
                       let item = (await get_my_app(a.filename, a.category))[0]
@@ -1045,7 +1165,7 @@ app.registerExtension({
             has_submenu: true,
             disabled: false,
             submenu: {
-              options:apps_opts
+              options: apps_opts
             }
           }
         )
@@ -1053,5 +1173,19 @@ app.registerExtension({
         return options
       }
     }, 1000)
+  },
+  async loadedGraphNode (node, app) {
+    // console.log(
+    //   '#ui init',
+    //   app.graph._nodes[app.graph._nodes.length - 1].id,
+    //   node.id
+    // )
+    try {
+      // 用来居中显示节点
+      if ((app.graph._nodes[app.graph._nodes.length - 1].id, node.id)) {
+        app.canvas.centerOnNode(node)
+        app.canvas.setZoom(0.45)
+      }
+    } catch (error) {}
   }
 })

web/javascript/utils_mixlab.js

@@ -159,7 +159,7 @@ app.registerExtension({
           el: `#${inputColor.id}`,
           theme: 'classic', // or 'monolith', or 'nano'
           // closeOnScroll: true,
-          default:'#000000',
+          default: '#000000',
           swatches: [
             'rgba(244, 67, 54, 1)',
             'rgba(233, 30, 99, 0.95)',
@@ -257,7 +257,6 @@ app.registerExtension({
 
 app.registerExtension({
   name: 'Mixlab.utils.TextToNumber',
-
   async beforeRegisterNodeDef (nodeType, nodeData, app) {
     if (nodeType.comfyClass == 'TextToNumber') {
       const onExecuted = nodeType.prototype.onExecuted
@@ -270,9 +269,96 @@ 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)
+    }
+  }
+})
+
+
+app.registerExtension({
+  name: 'Mixlab.utils.TESTNODE_',
+  async beforeRegisterNodeDef (nodeType, nodeData, app) {
+    
+    if (nodeType.comfyClass == 'TESTNODE_') {
+    
+      const onExecuted = nodeType.prototype.onExecuted;
+			nodeType.prototype.onExecuted = function (message) {
+				onExecuted?.apply(this, arguments);
+        console.log('##',message)
+				 
+			};
+
+
+    }
+   
+  }, 
+})

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) {}
     }
   }
 })

workflow/2-screeshare.json

@@ -0,0 +1,736 @@
+{
+  "last_node_id": 29,
+  "last_link_id": 32,
+  "nodes": [
+    {
+      "id": 7,
+      "type": "CLIPTextEncode",
+      "pos": [
+        108,
+        316
+      ],
+      "size": {
+        "0": 425.27801513671875,
+        "1": 180.6060791015625
+      },
+      "flags": {},
+      "order": 8,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "clip",
+          "type": "CLIP",
+          "link": 16
+        }
+      ],
+      "outputs": [
+        {
+          "name": "CONDITIONING",
+          "type": "CONDITIONING",
+          "links": [
+            6
+          ],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "CLIPTextEncode"
+      },
+      "widgets_values": [
+        "text, watermark"
+      ]
+    },
+    {
+      "id": 18,
+      "type": "ControlNetApply",
+      "pos": [
+        485,
+        792
+      ],
+      "size": {
+        "0": 317.4000244140625,
+        "1": 98
+      },
+      "flags": {},
+      "order": 10,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "conditioning",
+          "type": "CONDITIONING",
+          "link": 22,
+          "slot_index": 0
+        },
+        {
+          "name": "control_net",
+          "type": "CONTROL_NET",
+          "link": 18,
+          "slot_index": 1
+        },
+        {
+          "name": "image",
+          "type": "IMAGE",
+          "link": 26
+        }
+      ],
+      "outputs": [
+        {
+          "name": "CONDITIONING",
+          "type": "CONDITIONING",
+          "links": [
+            21
+          ],
+          "shape": 3,
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "ControlNetApply"
+      },
+      "widgets_values": [
+        1
+      ]
+    },
+    {
+      "id": 6,
+      "type": "CLIPTextEncode",
+      "pos": [
+        117,
+        95
+      ],
+      "size": {
+        "0": 422.84503173828125,
+        "1": 164.31304931640625
+      },
+      "flags": {},
+      "order": 7,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "clip",
+          "type": "CLIP",
+          "link": 15
+        }
+      ],
+      "outputs": [
+        {
+          "name": "CONDITIONING",
+          "type": "CONDITIONING",
+          "links": [
+            22
+          ],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "CLIPTextEncode"
+      },
+      "widgets_values": [
+        "a future city,buiding,future,magic,under water"
+      ]
+    },
+    {
+      "id": 15,
+      "type": "LoraLoader",
+      "pos": [
+        116,
+        -113
+      ],
+      "size": {
+        "0": 315,
+        "1": 126
+      },
+      "flags": {},
+      "order": 3,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "model",
+          "type": "MODEL",
+          "link": 13
+        },
+        {
+          "name": "clip",
+          "type": "CLIP",
+          "link": 14
+        }
+      ],
+      "outputs": [
+        {
+          "name": "MODEL",
+          "type": "MODEL",
+          "links": [
+            12,
+            23
+          ],
+          "shape": 3,
+          "slot_index": 0
+        },
+        {
+          "name": "CLIP",
+          "type": "CLIP",
+          "links": [
+            15,
+            16
+          ],
+          "shape": 3,
+          "slot_index": 1
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "LoraLoader"
+      },
+      "widgets_values": [
+        "lcm-lora-sdv1-5.safetensors",
+        1,
+        1
+      ]
+    },
+    {
+      "id": 4,
+      "type": "CheckpointLoaderSimple",
+      "pos": [
+        -380,
+        185
+      ],
+      "size": {
+        "0": 315,
+        "1": 98
+      },
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "outputs": [
+        {
+          "name": "MODEL",
+          "type": "MODEL",
+          "links": [
+            13
+          ],
+          "slot_index": 0
+        },
+        {
+          "name": "CLIP",
+          "type": "CLIP",
+          "links": [
+            14
+          ],
+          "slot_index": 1
+        },
+        {
+          "name": "VAE",
+          "type": "VAE",
+          "links": [
+            8
+          ],
+          "slot_index": 2
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "CheckpointLoaderSimple"
+      },
+      "widgets_values": [
+        "deliberate_v2.safetensors"
+      ]
+    },
+    {
+      "id": 19,
+      "type": "DiffControlNetLoader",
+      "pos": [
+        40,
+        792
+      ],
+      "size": {
+        "0": 367.8165283203125,
+        "1": 58.083831787109375
+      },
+      "flags": {},
+      "order": 6,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "model",
+          "type": "MODEL",
+          "link": 23,
+          "slot_index": 0
+        }
+      ],
+      "outputs": [
+        {
+          "name": "CONTROL_NET",
+          "type": "CONTROL_NET",
+          "links": [
+            18
+          ],
+          "shape": 3
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "DiffControlNetLoader"
+      },
+      "widgets_values": [
+        "control_v11f1p_sd15_depth.pth"
+      ]
+    },
+    {
+      "id": 5,
+      "type": "EmptyLatentImage",
+      "pos": [
+        65,
+        573
+      ],
+      "size": {
+        "0": 315,
+        "1": 106
+      },
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "outputs": [
+        {
+          "name": "LATENT",
+          "type": "LATENT",
+          "links": [
+            2
+          ],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "EmptyLatentImage"
+      },
+      "widgets_values": [
+        512,
+        512,
+        1
+      ]
+    },
+    {
+      "id": 25,
+      "type": "LeReS-DepthMapPreprocessor",
+      "pos": [
+        47,
+        904
+      ],
+      "size": {
+        "0": 369.6000061035156,
+        "1": 130
+      },
+      "flags": {},
+      "order": 4,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "image",
+          "type": "IMAGE",
+          "link": 31
+        }
+      ],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [
+            26,
+            27
+          ],
+          "shape": 3,
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "LeReS-DepthMapPreprocessor"
+      },
+      "widgets_values": [
+        0.1,
+        0,
+        "disable",
+        512
+      ]
+    },
+    {
+      "id": 3,
+      "type": "KSampler",
+      "pos": [
+        1100,
+        -97
+      ],
+      "size": {
+        "0": 315,
+        "1": 262
+      },
+      "flags": {},
+      "order": 11,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "model",
+          "type": "MODEL",
+          "link": 12,
+          "slot_index": 0
+        },
+        {
+          "name": "positive",
+          "type": "CONDITIONING",
+          "link": 21
+        },
+        {
+          "name": "negative",
+          "type": "CONDITIONING",
+          "link": 6
+        },
+        {
+          "name": "latent_image",
+          "type": "LATENT",
+          "link": 2
+        }
+      ],
+      "outputs": [
+        {
+          "name": "LATENT",
+          "type": "LATENT",
+          "links": [
+            7
+          ],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "KSampler"
+      },
+      "widgets_values": [
+        170633013599955,
+        "fixed",
+        4,
+        1.6,
+        "lcm",
+        "simple",
+        1
+      ]
+    },
+    {
+      "id": 8,
+      "type": "VAEDecode",
+      "pos": [
+        1100,
+        -241
+      ],
+      "size": {
+        "0": 210,
+        "1": 46
+      },
+      "flags": {},
+      "order": 12,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "samples",
+          "type": "LATENT",
+          "link": 7
+        },
+        {
+          "name": "vae",
+          "type": "VAE",
+          "link": 8
+        }
+      ],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [
+            28
+          ],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "VAEDecode"
+      }
+    },
+    {
+      "id": 20,
+      "type": "PreviewImage",
+      "pos": [
+        492,
+        955
+      ],
+      "size": {
+        "0": 526.9624633789062,
+        "1": 367.3833923339844
+      },
+      "flags": {},
+      "order": 9,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "images",
+          "type": "IMAGE",
+          "link": 27
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "PreviewImage"
+      }
+    },
+    {
+      "id": 26,
+      "type": "FloatingVideo",
+      "pos": [
+        1565,
+        -181
+      ],
+      "size": [
+        315,
+        58
+      ],
+      "flags": {},
+      "order": 13,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "images",
+          "type": "IMAGE",
+          "link": 28
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "FloatingVideo"
+      },
+      "widgets_values": [
+        null
+      ]
+    },
+    {
+      "id": 28,
+      "type": "PreviewImage",
+      "pos": [
+        -241,
+        953
+      ],
+      "size": {
+        "0": 210,
+        "1": 246
+      },
+      "flags": {},
+      "order": 5,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "images",
+          "type": "IMAGE",
+          "link": 32
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "PreviewImage"
+      }
+    },
+    {
+      "id": 29,
+      "type": "ScreenShare",
+      "pos": [
+        -639,
+        366
+      ],
+      "size": [
+        315,
+        644
+      ],
+      "flags": {},
+      "order": 2,
+      "mode": 0,
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [
+            31,
+            32
+          ],
+          "shape": 3,
+          "slot_index": 0
+        },
+        {
+          "name": "PROMPT",
+          "type": "STRING",
+          "links": null,
+          "shape": 3
+        },
+        {
+          "name": "FLOAT",
+          "type": "FLOAT",
+          "links": null,
+          "shape": 3
+        },
+        {
+          "name": "INT",
+          "type": "INT",
+          "links": null,
+          "shape": 3
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "ScreenShare"
+      },
+      "widgets_values": [
+        null,
+        500,
+        null,
+        null,
+        null,
+        null
+      ]
+    }
+  ],
+  "links": [
+    [
+      2,
+      5,
+      0,
+      3,
+      3,
+      "LATENT"
+    ],
+    [
+      6,
+      7,
+      0,
+      3,
+      2,
+      "CONDITIONING"
+    ],
+    [
+      7,
+      3,
+      0,
+      8,
+      0,
+      "LATENT"
+    ],
+    [
+      8,
+      4,
+      2,
+      8,
+      1,
+      "VAE"
+    ],
+    [
+      12,
+      15,
+      0,
+      3,
+      0,
+      "MODEL"
+    ],
+    [
+      13,
+      4,
+      0,
+      15,
+      0,
+      "MODEL"
+    ],
+    [
+      14,
+      4,
+      1,
+      15,
+      1,
+      "CLIP"
+    ],
+    [
+      15,
+      15,
+      1,
+      6,
+      0,
+      "CLIP"
+    ],
+    [
+      16,
+      15,
+      1,
+      7,
+      0,
+      "CLIP"
+    ],
+    [
+      18,
+      19,
+      0,
+      18,
+      1,
+      "CONTROL_NET"
+    ],
+    [
+      21,
+      18,
+      0,
+      3,
+      1,
+      "CONDITIONING"
+    ],
+    [
+      22,
+      6,
+      0,
+      18,
+      0,
+      "CONDITIONING"
+    ],
+    [
+      23,
+      15,
+      0,
+      19,
+      0,
+      "MODEL"
+    ],
+    [
+      26,
+      25,
+      0,
+      18,
+      2,
+      "IMAGE"
+    ],
+    [
+      27,
+      25,
+      0,
+      20,
+      0,
+      "IMAGE"
+    ],
+    [
+      28,
+      8,
+      0,
+      26,
+      0,
+      "IMAGE"
+    ],
+    [
+      31,
+      29,
+      0,
+      25,
+      0,
+      "IMAGE"
+    ],
+    [
+      32,
+      29,
+      0,
+      28,
+      0,
+      "IMAGE"
+    ]
+  ],
+  "groups": [],
+  "config": {},
+  "extra": {},
+  "version": 0.4
+}

workflow/3-FloatVideo-workflow.json

@@ -1,6 +1,6 @@
 {
-  "last_node_id": 23,
-  "last_link_id": 51,
+  "last_node_id": 22,
+  "last_link_id": 48,
   "nodes": [
     {
       "id": 7,
@@ -105,7 +105,7 @@
         {
           "name": "text",
           "type": "STRING",
-          "link": 51,
+          "link": 48,
           "widget": {
             "name": "text"
           }
@@ -295,7 +295,7 @@
         "Node name for S&R": "KSampler"
       },
       "widgets_values": [
-        482859286431021,
+        644769503212755,
         "randomize",
         4,
         1.6,
@@ -316,19 +316,47 @@
         "1": 246
       },
       "flags": {},
-      "order": 7,
+      "order": 6,
       "mode": 0,
       "inputs": [
         {
           "name": "images",
           "type": "IMAGE",
-          "link": 50
+          "link": 46
         }
       ],
       "properties": {
         "Node name for S&R": "PreviewImage"
       }
     },
+    {
+      "id": 20,
+      "type": "FloatingVideo",
+      "pos": [
+        2041,
+        277
+      ],
+      "size": [
+        315,
+        58
+      ],
+      "flags": {},
+      "order": 12,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "images",
+          "type": "IMAGE",
+          "link": 41
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "FloatingVideo"
+      },
+      "widgets_values": [
+        null
+      ]
+    },
     {
       "id": 6,
       "type": "LoraLoader",
@@ -445,13 +473,13 @@
         "1": 58
       },
       "flags": {},
-      "order": 6,
+      "order": 7,
       "mode": 0,
       "inputs": [
         {
           "name": "image",
           "type": "IMAGE",
-          "link": 49
+          "link": 47
         }
       ],
       "outputs": [
@@ -473,43 +501,15 @@
       ]
     },
     {
-      "id": 20,
-      "type": "FloatingVideo",
+      "id": 22,
+      "type": "ScreenShare",
       "pos": [
-        1928,
-        295
+        -111,
+        427
       ],
       "size": [
         315,
-        58
-      ],
-      "flags": {},
-      "order": 12,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "images",
-          "type": "IMAGE",
-          "link": 41
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "FloatingVideo"
-      },
-      "widgets_values": [
-        null
-      ]
-    },
-    {
-      "id": 23,
-      "type": "ScreenShare",
-      "pos": [
-        -65,
-        446
-      ],
-      "size": [
-        312.78457519531213,
-        606.2132135620109
+        644
       ],
       "flags": {},
       "order": 3,
@@ -519,8 +519,8 @@
           "name": "IMAGE",
           "type": "IMAGE",
           "links": [
-            49,
-            50
+            46,
+            47
           ],
           "shape": 3,
           "slot_index": 0
@@ -529,7 +529,7 @@
           "name": "PROMPT",
           "type": "STRING",
           "links": [
-            51
+            48
           ],
           "shape": 3,
           "slot_index": 1
@@ -552,7 +552,7 @@
       },
       "widgets_values": [
         null,
-        2018,
+        500,
         null,
         null,
         null,
@@ -810,24 +810,24 @@
       "CLIP"
     ],
     [
-      49,
-      23,
-      0,
-      18,
-      0,
-      "IMAGE"
-    ],
-    [
-      50,
-      23,
+      46,
+      22,
       0,
       2,
       0,
       "IMAGE"
     ],
     [
-      51,
-      23,
+      47,
+      22,
+      0,
+      18,
+      0,
+      "IMAGE"
+    ],
+    [
+      48,
+      22,
       1,
       8,
       1,

workflow/AIPC大赛模板-图片参赛模板-workflow.json

@@ -1,6 +1,6 @@
 {
-  "last_node_id": 128,
-  "last_link_id": 207,
+  "last_node_id": 129,
+  "last_link_id": 208,
   "nodes": [
     {
       "id": 8,
@@ -466,7 +466,7 @@
         "1": 262
       },
       "flags": {},
-      "order": 28,
+      "order": 27,
       "mode": 0,
       "inputs": [
         {
@@ -526,7 +526,7 @@
         "1": 262
       },
       "flags": {},
-      "order": 30,
+      "order": 29,
       "mode": 0,
       "inputs": [
         {
@@ -574,31 +574,6 @@
         ""
       ]
     },
-    {
-      "id": 101,
-      "type": "PreviewImage",
-      "pos": [
-        5328.397364750004,
-        -1726.0537115390628
-      ],
-      "size": {
-        "0": 210,
-        "1": 246
-      },
-      "flags": {},
-      "order": 27,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "images",
-          "type": "IMAGE",
-          "link": 161
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "PreviewImage"
-      }
-    },
     {
       "id": 21,
       "type": "Note",
@@ -670,7 +645,7 @@
         "1": 262
       },
       "flags": {},
-      "order": 32,
+      "order": 31,
       "mode": 0,
       "inputs": [
         {
@@ -1148,7 +1123,7 @@
         "1": 46
       },
       "flags": {},
-      "order": 34,
+      "order": 33,
       "mode": 0,
       "inputs": [
         {
@@ -1171,6 +1146,12 @@
           ],
           "shape": 3,
           "slot_index": 0
+        },
+        {
+          "name": "MASK",
+          "type": "MASK",
+          "links": null,
+          "shape": 3
         }
       ],
       "properties": {
@@ -1189,7 +1170,7 @@
         "1": 46
       },
       "flags": {},
-      "order": 35,
+      "order": 34,
       "mode": 0,
       "inputs": [
         {
@@ -1212,6 +1193,12 @@
           ],
           "shape": 3,
           "slot_index": 0
+        },
+        {
+          "name": "MASK",
+          "type": "MASK",
+          "links": null,
+          "shape": 3
         }
       ],
       "properties": {
@@ -1230,7 +1217,7 @@
         "1": 46
       },
       "flags": {},
-      "order": 36,
+      "order": 35,
       "mode": 0,
       "inputs": [
         {
@@ -1253,6 +1240,12 @@
           ],
           "shape": 3,
           "slot_index": 0
+        },
+        {
+          "name": "MASK",
+          "type": "MASK",
+          "links": null,
+          "shape": 3
         }
       ],
       "properties": {
@@ -1304,7 +1297,7 @@
         "1": 532.8897705078125
       },
       "flags": {},
-      "order": 37,
+      "order": 36,
       "mode": 0,
       "inputs": [
         {
@@ -1329,7 +1322,7 @@
         "1": 553.1112670898438
       },
       "flags": {},
-      "order": 38,
+      "order": 37,
       "mode": 0,
       "inputs": [
         {
@@ -1354,7 +1347,7 @@
         "1": 150
       },
       "flags": {},
-      "order": 31,
+      "order": 30,
       "mode": 0,
       "inputs": [
         {
@@ -1464,7 +1457,7 @@
         "1": 499.6607971191406
       },
       "flags": {},
-      "order": 39,
+      "order": 38,
       "mode": 0,
       "inputs": [
         {
@@ -1489,7 +1482,7 @@
         "1": 150
       },
       "flags": {},
-      "order": 33,
+      "order": 32,
       "mode": 0,
       "inputs": [
         {
@@ -1554,7 +1547,7 @@
         "1": 150
       },
       "flags": {},
-      "order": 29,
+      "order": 28,
       "mode": 0,
       "inputs": [
         {
@@ -1705,56 +1698,10 @@
         101,
         0,
         "#000000",
+        false,
         false
       ]
     },
-    {
-      "id": 98,
-      "type": "AppInfo",
-      "pos": [
-        4922.397364750004,
-        -1807.0537115390628
-      ],
-      "size": {
-        "0": 362.42608642578125,
-        "1": 431.3537902832031
-      },
-      "flags": {},
-      "order": 16,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "image",
-          "type": "IMAGE",
-          "link": 162
-        }
-      ],
-      "outputs": [
-        {
-          "name": "IMAGE",
-          "type": "IMAGE",
-          "links": [
-            161
-          ],
-          "shape": 3,
-          "slot_index": 0
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "AppInfo"
-      },
-      "widgets_values": [
-        "AIPC大赛模板",
-        "\n75\n118",
-        "57\n126\n127\n",
-        "投稿模板#发挥你的想象力",
-        4,
-        "#AIPC# 参赛作品",
-        "https://www.weibo.com",
-        "",
-        null
-      ]
-    },
     {
       "id": 106,
       "type": "LoadImage",
@@ -1762,10 +1709,10 @@
         4535,
         -1843
       ],
-      "size": [
-        210,
-        314
-      ],
+      "size": {
+        "0": 210,
+        "1": 314
+      },
       "flags": {},
       "order": 7,
       "mode": 0,
@@ -1774,7 +1721,7 @@
           "name": "IMAGE",
           "type": "IMAGE",
           "links": [
-            162
+            208
           ],
           "shape": 3,
           "slot_index": 0
@@ -1835,6 +1782,43 @@
         "1703665898041.png",
         "image"
       ]
+    },
+    {
+      "id": 129,
+      "type": "AppInfo",
+      "pos": [
+        4893,
+        -1778
+      ],
+      "size": {
+        "0": 400,
+        "1": 344.0000305175781
+      },
+      "flags": {},
+      "order": 16,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "LOGO",
+          "type": "IMAGE",
+          "link": 208
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "AppInfo"
+      },
+      "widgets_values": [
+        "AIPC大赛模板",
+        "\n75\n118",
+        "57\n126\n127\n",
+        "投稿模板#发挥你的想象力",
+        4,
+        "#AIPC# 参赛作品",
+        "https://www.weibo.com",
+        "",
+        "enable",
+        1
+      ]
     }
   ],
   "links": [
@@ -2174,22 +2158,6 @@
       0,
       "IMAGE"
     ],
-    [
-      161,
-      98,
-      0,
-      101,
-      0,
-      "IMAGE"
-    ],
-    [
-      162,
-      106,
-      0,
-      98,
-      0,
-      "IMAGE"
-    ],
     [
       185,
       118,
@@ -2333,6 +2301,14 @@
       127,
       0,
       "IMAGE"
+    ],
+    [
+      208,
+      106,
+      0,
+      129,
+      0,
+      "IMAGE"
     ]
   ],
   "groups": [
@@ -2351,10 +2327,10 @@
     {
       "title": "Group",
       "bounding": [
-        4912,
+        4883,
         -2035,
-        637,
-        669
+        666,
+        611
       ],
       "color": "#444",
       "font_size": 24,

workflow/Prompt-weight-workflow.json

@@ -1,6 +1,6 @@
 {
-  "last_node_id": 22,
-  "last_link_id": 23,
+  "last_node_id": 23,
+  "last_link_id": 25,
   "nodes": [
     {
       "id": 9,
@@ -167,48 +167,6 @@
         "beautiful scenery nature glass bottle landscape, , purple galaxy bottle,"
       ]
     },
-    {
-      "id": 10,
-      "type": "VAEDecode",
-      "pos": [
-        2870,
-        630
-      ],
-      "size": {
-        "0": 210,
-        "1": 46
-      },
-      "flags": {
-        "collapsed": false
-      },
-      "order": 11,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "samples",
-          "type": "LATENT",
-          "link": 8
-        },
-        {
-          "name": "vae",
-          "type": "VAE",
-          "link": 9
-        }
-      ],
-      "outputs": [
-        {
-          "name": "IMAGE",
-          "type": "IMAGE",
-          "links": [
-            12
-          ],
-          "slot_index": 0
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "VAEDecode"
-      }
-    },
     {
       "id": 16,
       "type": "ShowTextForGPT",
@@ -248,31 +206,6 @@
         "a girl face,super,(Pop Art:1.26),(Black and White:1.26)"
       ]
     },
-    {
-      "id": 11,
-      "type": "PreviewImage",
-      "pos": [
-        3319,
-        -161
-      ],
-      "size": {
-        "0": 435.8727111816406,
-        "1": 511.8609619140625
-      },
-      "flags": {},
-      "order": 13,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "images",
-          "type": "IMAGE",
-          "link": 13
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "PreviewImage"
-      }
-    },
     {
       "id": 5,
       "type": "KSampler",
@@ -349,7 +282,7 @@
       ],
       "size": {
         "0": 315,
-        "1": 58
+        "1": 130
       },
       "flags": {},
       "order": 2,
@@ -370,7 +303,10 @@
         "Node name for S&R": "IntNumber"
       },
       "widgets_values": [
-        -1
+        0,
+        0,
+        1,
+        1
       ]
     },
     {
@@ -382,7 +318,7 @@
       ],
       "size": {
         "0": 315,
-        "1": 82
+        "1": 106
       },
       "flags": {},
       "order": 3,
@@ -403,51 +339,7 @@
       },
       "widgets_values": [
         "Pop Art",
-        1.26
-      ]
-    },
-    {
-      "id": 12,
-      "type": "AppInfo",
-      "pos": [
-        2924,
-        846
-      ],
-      "size": {
-        "0": 400,
-        "1": 272
-      },
-      "flags": {},
-      "order": 12,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "image",
-          "type": "IMAGE",
-          "link": 12
-        }
-      ],
-      "outputs": [
-        {
-          "name": "IMAGE",
-          "type": "IMAGE",
-          "links": [
-            13
-          ],
-          "shape": 3,
-          "slot_index": 0
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "AppInfo"
-      },
-      "widgets_values": [
-        "Prompt-weight-test",
-        "21\n22\n18",
-        "11\n16",
-        "",
-        1,
-        "",
+        1.26,
         null
       ]
     },
@@ -460,7 +352,7 @@
       ],
       "size": {
         "0": 315,
-        "1": 82
+        "1": 106
       },
       "flags": {},
       "order": 4,
@@ -481,7 +373,8 @@
       },
       "widgets_values": [
         "Black and White",
-        1.26
+        1.26,
+        null
       ]
     },
     {
@@ -584,6 +477,111 @@
         "disable",
         ""
       ]
+    },
+    {
+      "id": 11,
+      "type": "PreviewImage",
+      "pos": [
+        3449,
+        -102
+      ],
+      "size": {
+        "0": 435.8727111816406,
+        "1": 511.8609619140625
+      },
+      "flags": {},
+      "order": 12,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "images",
+          "type": "IMAGE",
+          "link": 24
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "PreviewImage"
+      }
+    },
+    {
+      "id": 10,
+      "type": "VAEDecode",
+      "pos": [
+        2870,
+        630
+      ],
+      "size": {
+        "0": 210,
+        "1": 46
+      },
+      "flags": {
+        "collapsed": false
+      },
+      "order": 11,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "samples",
+          "type": "LATENT",
+          "link": 8
+        },
+        {
+          "name": "vae",
+          "type": "VAE",
+          "link": 9
+        }
+      ],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [
+            24,
+            25
+          ],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "VAEDecode"
+      }
+    },
+    {
+      "id": 23,
+      "type": "AppInfo",
+      "pos": [
+        3363.0014990624995,
+        551.2261418945309
+      ],
+      "size": {
+        "0": 400,
+        "1": 344
+      },
+      "flags": {},
+      "order": 13,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "LOGO",
+          "type": "IMAGE",
+          "link": 25
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "AppInfo"
+      },
+      "widgets_values": [
+        "Prompt-weight-test",
+        "21\n22\n18",
+        "11\n16",
+        "",
+        1,
+        "",
+        "https://",
+        "",
+        "enable",
+        1
+      ]
     }
   ],
   "links": [
@@ -651,22 +649,6 @@
       1,
       "VAE"
     ],
-    [
-      12,
-      10,
-      0,
-      12,
-      0,
-      "IMAGE"
-    ],
-    [
-      13,
-      12,
-      0,
-      11,
-      0,
-      "IMAGE"
-    ],
     [
       16,
       15,
@@ -714,6 +696,22 @@
       13,
       1,
       "STRING"
+    ],
+    [
+      24,
+      10,
+      0,
+      11,
+      0,
+      "IMAGE"
+    ],
+    [
+      25,
+      10,
+      0,
+      23,
+      0,
+      "IMAGE"
     ]
   ],
   "groups": [],

workflow/Text-to-Image-app.json

@@ -1,6 +1,6 @@
 {
-  "last_node_id": 25,
-  "last_link_id": 32,
+  "last_node_id": 26,
+  "last_link_id": 34,
   "nodes": [
     {
       "id": 5,
@@ -41,48 +41,6 @@
         "text, watermark"
       ]
     },
-    {
-      "id": 6,
-      "type": "VAEDecode",
-      "pos": [
-        1867,
-        -2378
-      ],
-      "size": {
-        "0": 210,
-        "1": 46
-      },
-      "flags": {
-        "collapsed": false
-      },
-      "order": 10,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "samples",
-          "type": "LATENT",
-          "link": 7
-        },
-        {
-          "name": "vae",
-          "type": "VAE",
-          "link": 8
-        }
-      ],
-      "outputs": [
-        {
-          "name": "IMAGE",
-          "type": "IMAGE",
-          "links": [
-            9
-          ],
-          "slot_index": 0
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "VAEDecode"
-      }
-    },
     {
       "id": 15,
       "type": "EnhanceImage",
@@ -101,7 +59,7 @@
         {
           "name": "image",
           "type": "IMAGE",
-          "link": 25
+          "link": 34
         }
       ],
       "outputs": [
@@ -122,57 +80,6 @@
         1.1
       ]
     },
-    {
-      "id": 21,
-      "type": "EmptyLatentImage",
-      "pos": [
-        998,
-        -2674
-      ],
-      "size": [
-        315,
-        106
-      ],
-      "flags": {},
-      "order": 8,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "width",
-          "type": "INT",
-          "link": 30,
-          "widget": {
-            "name": "width"
-          }
-        },
-        {
-          "name": "height",
-          "type": "INT",
-          "link": 32,
-          "widget": {
-            "name": "height"
-          }
-        }
-      ],
-      "outputs": [
-        {
-          "name": "LATENT",
-          "type": "LATENT",
-          "links": [
-            26
-          ],
-          "shape": 3
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "EmptyLatentImage"
-      },
-      "widgets_values": [
-        512,
-        512,
-        1
-      ]
-    },
     {
       "id": 24,
       "type": "LimitNumber",
@@ -262,7 +169,7 @@
       ],
       "size": {
         "0": 315,
-        "1": 58
+        "1": 130
       },
       "flags": {},
       "order": 0,
@@ -283,7 +190,10 @@
         "Node name for S&R": "IntNumber"
       },
       "widgets_values": [
-        512
+        1,
+        0,
+        1,
+        1
       ]
     },
     {
@@ -295,7 +205,7 @@
       ],
       "size": {
         "0": 315,
-        "1": 58
+        "1": 130
       },
       "flags": {},
       "order": 1,
@@ -316,7 +226,10 @@
         "Node name for S&R": "IntNumber"
       },
       "widgets_values": [
-        512
+        1,
+        0,
+        1,
+        1
       ]
     },
     {
@@ -428,7 +341,7 @@
         "Node name for S&R": "KSampler"
       },
       "widgets_values": [
-        730250870715434,
+        52336089190516,
         "randomize",
         15,
         6.9,
@@ -437,39 +350,6 @@
         0.59
       ]
     },
-    {
-      "id": 14,
-      "type": "FloatSlider",
-      "pos": [
-        1007,
-        -2819
-      ],
-      "size": {
-        "0": 315,
-        "1": 58
-      },
-      "flags": {},
-      "order": 3,
-      "mode": 0,
-      "outputs": [
-        {
-          "name": "FLOAT",
-          "type": "FLOAT",
-          "links": [
-            16
-          ],
-          "shape": 3,
-          "slot_index": 0
-        }
-      ],
-      "title": "denoise",
-      "properties": {
-        "Node name for S&R": "FloatSlider"
-      },
-      "widgets_values": [
-        1
-      ]
-    },
     {
       "id": 16,
       "type": "PreviewImage",
@@ -535,24 +415,31 @@
       ]
     },
     {
-      "id": 7,
-      "type": "AppInfo",
+      "id": 6,
+      "type": "VAEDecode",
       "pos": [
-        2134,
-        -2528
+        1867,
+        -2378
       ],
       "size": {
-        "0": 408.4201965332031,
-        "1": 406.9195861816406
+        "0": 210,
+        "1": 46
       },
-      "flags": {},
-      "order": 11,
+      "flags": {
+        "collapsed": false
+      },
+      "order": 10,
       "mode": 0,
       "inputs": [
         {
-          "name": "image",
-          "type": "IMAGE",
-          "link": 9
+          "name": "samples",
+          "type": "LATENT",
+          "link": 7
+        },
+        {
+          "name": "vae",
+          "type": "VAE",
+          "link": 8
         }
       ],
       "outputs": [
@@ -560,12 +447,37 @@
           "name": "IMAGE",
           "type": "IMAGE",
           "links": [
-            25
+            33,
+            34
           ],
-          "shape": 3,
           "slot_index": 0
         }
       ],
+      "properties": {
+        "Node name for S&R": "VAEDecode"
+      }
+    },
+    {
+      "id": 26,
+      "type": "AppInfo",
+      "pos": [
+        2134,
+        -2264
+      ],
+      "size": {
+        "0": 400,
+        "1": 344.00006103515625
+      },
+      "flags": {},
+      "order": 11,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "LOGO",
+          "type": "IMAGE",
+          "link": 33
+        }
+      ],
       "properties": {
         "Node name for S&R": "AppInfo"
       },
@@ -576,7 +488,97 @@
         "演示基本的文生图流程",
         1,
         "#comfyui-mixlab-nodes# ",
-        null
+        "https://",
+        "",
+        "enable",
+        1
+      ]
+    },
+    {
+      "id": 14,
+      "type": "FloatSlider",
+      "pos": [
+        1007,
+        -2860
+      ],
+      "size": {
+        "0": 315,
+        "1": 130
+      },
+      "flags": {},
+      "order": 3,
+      "mode": 0,
+      "outputs": [
+        {
+          "name": "FLOAT",
+          "type": "FLOAT",
+          "links": [
+            16
+          ],
+          "shape": 3,
+          "slot_index": 0
+        }
+      ],
+      "title": "denoise",
+      "properties": {
+        "Node name for S&R": "FloatSlider"
+      },
+      "widgets_values": [
+        1,
+        0,
+        1,
+        0.001
+      ]
+    },
+    {
+      "id": 21,
+      "type": "EmptyLatentImage",
+      "pos": [
+        1004,
+        -2633
+      ],
+      "size": {
+        "0": 315,
+        "1": 106
+      },
+      "flags": {},
+      "order": 8,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "width",
+          "type": "INT",
+          "link": 30,
+          "widget": {
+            "name": "width"
+          }
+        },
+        {
+          "name": "height",
+          "type": "INT",
+          "link": 32,
+          "widget": {
+            "name": "height"
+          }
+        }
+      ],
+      "outputs": [
+        {
+          "name": "LATENT",
+          "type": "LATENT",
+          "links": [
+            26
+          ],
+          "shape": 3
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "EmptyLatentImage"
+      },
+      "widgets_values": [
+        512,
+        512,
+        1
       ]
     }
   ],
@@ -637,14 +639,6 @@
       1,
       "VAE"
     ],
-    [
-      9,
-      6,
-      0,
-      7,
-      0,
-      "IMAGE"
-    ],
     [
       16,
       14,
@@ -661,14 +655,6 @@
       0,
       "IMAGE"
     ],
-    [
-      25,
-      7,
-      0,
-      15,
-      0,
-      "IMAGE"
-    ],
     [
       26,
       21,
@@ -708,6 +694,22 @@
       21,
       1,
       "INT"
+    ],
+    [
+      33,
+      6,
+      0,
+      26,
+      0,
+      "IMAGE"
+    ],
+    [
+      34,
+      6,
+      0,
+      15,
+      0,
+      "IMAGE"
     ]
   ],
   "groups": [],

workflow/ckpts-image-workflow.json

@@ -0,0 +1,558 @@
+{
+  "last_node_id": 69,
+  "last_link_id": 72,
+  "nodes": [
+    {
+      "id": 37,
+      "type": "CLIPTextEncode",
+      "pos": [
+        6705,
+        -216
+      ],
+      "size": {
+        "0": 400,
+        "1": 200
+      },
+      "flags": {},
+      "order": 5,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "clip",
+          "type": "CLIP",
+          "link": 33
+        }
+      ],
+      "outputs": [
+        {
+          "name": "CONDITIONING",
+          "type": "CONDITIONING",
+          "links": [
+            34
+          ],
+          "shape": 3
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "CLIPTextEncode"
+      },
+      "widgets_values": [
+        "beautiful scenery nature glass bottle landscape, , purple galaxy bottle,"
+      ]
+    },
+    {
+      "id": 5,
+      "type": "CLIPTextEncode",
+      "pos": [
+        6693,
+        61
+      ],
+      "size": {
+        "0": 425.27801513671875,
+        "1": 180.6060791015625
+      },
+      "flags": {},
+      "order": 4,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "clip",
+          "type": "CLIP",
+          "link": 6
+        },
+        {
+          "name": "text",
+          "type": "STRING",
+          "link": 25,
+          "widget": {
+            "name": "text"
+          }
+        }
+      ],
+      "outputs": [
+        {
+          "name": "CONDITIONING",
+          "type": "CONDITIONING",
+          "links": [
+            3
+          ],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "CLIPTextEncode"
+      },
+      "widgets_values": [
+        "text, watermark"
+      ]
+    },
+    {
+      "id": 3,
+      "type": "EmptyLatentImage",
+      "pos": [
+        6689,
+        306
+      ],
+      "size": {
+        "0": 315,
+        "1": 106
+      },
+      "flags": {},
+      "order": 0,
+      "mode": 0,
+      "outputs": [
+        {
+          "name": "LATENT",
+          "type": "LATENT",
+          "links": [
+            4
+          ],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "EmptyLatentImage"
+      },
+      "widgets_values": [
+        512,
+        512,
+        1
+      ]
+    },
+    {
+      "id": 27,
+      "type": "EmbeddingPrompt",
+      "pos": [
+        6104,
+        23
+      ],
+      "size": {
+        "0": 399.6408996582031,
+        "1": 82
+      },
+      "flags": {},
+      "order": 1,
+      "mode": 0,
+      "outputs": [
+        {
+          "name": "STRING",
+          "type": "STRING",
+          "links": [
+            25
+          ],
+          "shape": 3
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "EmbeddingPrompt"
+      },
+      "widgets_values": [
+        "negative-embed-verybadimagenegative_v1.3",
+        1
+      ]
+    },
+    {
+      "id": 67,
+      "type": "VAEDecode",
+      "pos": [
+        7551,
+        -184
+      ],
+      "size": {
+        "0": 210,
+        "1": 46
+      },
+      "flags": {},
+      "order": 7,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "samples",
+          "type": "LATENT",
+          "link": 70
+        },
+        {
+          "name": "vae",
+          "type": "VAE",
+          "link": 69
+        }
+      ],
+      "outputs": [
+        {
+          "name": "IMAGE",
+          "type": "IMAGE",
+          "links": [
+            71
+          ],
+          "shape": 3
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "VAEDecode"
+      }
+    },
+    {
+      "id": 1,
+      "type": "KSampler",
+      "pos": [
+        7187,
+        -145
+      ],
+      "size": {
+        "0": 315,
+        "1": 262
+      },
+      "flags": {},
+      "order": 6,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "model",
+          "type": "MODEL",
+          "link": 1
+        },
+        {
+          "name": "positive",
+          "type": "CONDITIONING",
+          "link": 34
+        },
+        {
+          "name": "negative",
+          "type": "CONDITIONING",
+          "link": 3
+        },
+        {
+          "name": "latent_image",
+          "type": "LATENT",
+          "link": 4
+        }
+      ],
+      "outputs": [
+        {
+          "name": "LATENT",
+          "type": "LATENT",
+          "links": [
+            70
+          ],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "KSampler"
+      },
+      "widgets_values": [
+        408562451564429,
+        "fixed",
+        20,
+        8,
+        "euler",
+        "normal",
+        1
+      ]
+    },
+    {
+      "id": 61,
+      "type": "PromptImage",
+      "pos": [
+        7853,
+        -238
+      ],
+      "size": [
+        465.6378949342379,
+        760.4568424013569
+      ],
+      "flags": {},
+      "order": 8,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "images",
+          "type": "IMAGE",
+          "link": 71
+        },
+        {
+          "name": "prompts",
+          "type": "STRING",
+          "link": 72,
+          "widget": {
+            "name": "prompts"
+          }
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "PromptImage"
+      },
+      "widgets_values": [
+        "",
+        "disable",
+        {
+          "_images": [
+            [
+              {
+                "filename": "mixlab_PromptImage_0_00027_.png",
+                "subfolder": "",
+                "type": "output"
+              }
+            ],
+            [
+              {
+                "filename": "mixlab_PromptImage_1_00028_.png",
+                "subfolder": "",
+                "type": "output"
+              }
+            ],
+            [
+              {
+                "filename": "mixlab_PromptImage_2_00029_.png",
+                "subfolder": "",
+                "type": "output"
+              }
+            ],
+            [
+              {
+                "filename": "mixlab_PromptImage_3_00030_.png",
+                "subfolder": "",
+                "type": "output"
+              }
+            ],
+            [
+              {
+                "filename": "mixlab_PromptImage_4_00031_.png",
+                "subfolder": "",
+                "type": "output"
+              }
+            ],
+            [
+              {
+                "filename": "mixlab_PromptImage_5_00032_.png",
+                "subfolder": "",
+                "type": "output"
+              }
+            ]
+          ],
+          "prompts": [
+            "512-inpainting-ema.safetensors",
+            "SSD-1B.safetensors",
+            "awportrait_v12.safetensors",
+            "cardosAnime_v20.safetensors",
+            "deliberate_v2.safetensors",
+            "gameIconInstitute_v40.safetensors"
+          ]
+        }
+      ]
+    },
+    {
+      "id": 2,
+      "type": "CheckpointLoaderSimple",
+      "pos": [
+        6105,
+        -139
+      ],
+      "size": {
+        "0": 315,
+        "1": 98
+      },
+      "flags": {},
+      "order": 3,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "ckpt_name",
+          "type": [
+            "512-inpainting-ema.safetensors",
+            "SSD-1B.safetensors",
+            "awportrait_v12.safetensors",
+            "cardosAnime_v20.safetensors",
+            "deliberate_v2.safetensors",
+            "gameIconInstitute_v40.safetensors",
+            "illuminatiDiffusionV1_v11-unclip-h-fp16.safetensors",
+            "sd_xl_turbo_1.0_fp16.safetensors",
+            "svd.safetensors"
+          ],
+          "link": 64,
+          "widget": {
+            "name": "ckpt_name"
+          }
+        }
+      ],
+      "outputs": [
+        {
+          "name": "MODEL",
+          "type": "MODEL",
+          "links": [
+            1
+          ],
+          "slot_index": 0
+        },
+        {
+          "name": "CLIP",
+          "type": "CLIP",
+          "links": [
+            6,
+            33
+          ],
+          "slot_index": 1
+        },
+        {
+          "name": "VAE",
+          "type": "VAE",
+          "links": [
+            69
+          ],
+          "slot_index": 2
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "CheckpointLoaderSimple"
+      },
+      "widgets_values": [
+        "deliberate_v2.safetensors"
+      ]
+    },
+    {
+      "id": 56,
+      "type": "CkptNames_",
+      "pos": [
+        7860,
+        -494
+      ],
+      "size": {
+        "0": 400,
+        "1": 200
+      },
+      "flags": {},
+      "order": 2,
+      "mode": 0,
+      "outputs": [
+        {
+          "name": "ckpt_names",
+          "type": "*",
+          "links": [
+            64,
+            72
+          ],
+          "shape": 6,
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "CkptNames_"
+      },
+      "widgets_values": [
+        "512-inpainting-ema.safetensors\nSSD-1B.safetensors\nawportrait_v12.safetensors\ncardosAnime_v20.safetensors\ndeliberate_v2.safetensors\ngameIconInstitute_v40.safetensors"
+      ]
+    }
+  ],
+  "links": [
+    [
+      1,
+      2,
+      0,
+      1,
+      0,
+      "MODEL"
+    ],
+    [
+      3,
+      5,
+      0,
+      1,
+      2,
+      "CONDITIONING"
+    ],
+    [
+      4,
+      3,
+      0,
+      1,
+      3,
+      "LATENT"
+    ],
+    [
+      6,
+      2,
+      1,
+      5,
+      0,
+      "CLIP"
+    ],
+    [
+      25,
+      27,
+      0,
+      5,
+      1,
+      "STRING"
+    ],
+    [
+      33,
+      2,
+      1,
+      37,
+      0,
+      "CLIP"
+    ],
+    [
+      34,
+      37,
+      0,
+      1,
+      1,
+      "CONDITIONING"
+    ],
+    [
+      64,
+      56,
+      0,
+      2,
+      0,
+      [
+        "512-inpainting-ema.safetensors",
+        "SSD-1B.safetensors",
+        "awportrait_v12.safetensors",
+        "cardosAnime_v20.safetensors",
+        "deliberate_v2.safetensors",
+        "gameIconInstitute_v40.safetensors",
+        "illuminatiDiffusionV1_v11-unclip-h-fp16.safetensors",
+        "sd_xl_turbo_1.0_fp16.safetensors",
+        "svd.safetensors"
+      ]
+    ],
+    [
+      69,
+      2,
+      2,
+      67,
+      1,
+      "VAE"
+    ],
+    [
+      70,
+      1,
+      0,
+      67,
+      0,
+      "LATENT"
+    ],
+    [
+      71,
+      67,
+      0,
+      61,
+      0,
+      "IMAGE"
+    ],
+    [
+      72,
+      56,
+      0,
+      61,
+      1,
+      "STRING"
+    ]
+  ],
+  "groups": [],
+  "config": {},
+  "extra": {},
+  "version": 0.4
+}

workflow/poster-layers-workflow.json

@@ -1,6 +1,6 @@
 {
-  "last_node_id": 133,
-  "last_link_id": 289,
+  "last_node_id": 134,
+  "last_link_id": 296,
   "nodes": [
     {
       "id": 42,
@@ -178,7 +178,7 @@
         "Node name for S&R": "KSampler"
       },
       "widgets_values": [
-        487152733962296,
+        981322491518329,
         "randomize",
         13,
         8,
@@ -284,7 +284,7 @@
         {
           "name": "width",
           "type": "INT",
-          "link": 91,
+          "link": 291,
           "widget": {
             "name": "width"
           }
@@ -292,7 +292,7 @@
         {
           "name": "height",
           "type": "INT",
-          "link": 92,
+          "link": 292,
           "widget": {
             "name": "height"
           }
@@ -554,7 +554,7 @@
         "Node name for S&R": "KSampler"
       },
       "widgets_values": [
-        1031291986804327,
+        836429510062488,
         "randomize",
         13,
         8,
@@ -824,7 +824,7 @@
         "Node name for S&R": "KSampler"
       },
       "widgets_values": [
-        715240655341851,
+        24900528323969,
         "randomize",
         12,
         8,
@@ -875,67 +875,6 @@
         "Node name for S&R": "VAEDecode"
       }
     },
-    {
-      "id": 46,
-      "type": "NewLayer",
-      "pos": [
-        1012.7987748686522,
-        1330
-      ],
-      "size": {
-        "0": 315,
-        "1": 262
-      },
-      "flags": {},
-      "order": 32,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "image",
-          "type": "IMAGE",
-          "link": 78
-        },
-        {
-          "name": "mask",
-          "type": "MASK",
-          "link": 79
-        },
-        {
-          "name": "layers",
-          "type": "LAYER",
-          "link": 227,
-          "slot_index": 2
-        },
-        {
-          "name": "canvas",
-          "type": "IMAGE",
-          "link": null
-        }
-      ],
-      "outputs": [
-        {
-          "name": "layers",
-          "type": "LAYER",
-          "links": [
-            228
-          ],
-          "shape": 6,
-          "slot_index": 0
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "NewLayer"
-      },
-      "widgets_values": [
-        179,
-        134,
-        156,
-        146,
-        4,
-        "width",
-        ""
-      ]
-    },
     {
       "id": 65,
       "type": "NewLayer",
@@ -1221,42 +1160,6 @@
         ""
       ]
     },
-    {
-      "id": 28,
-      "type": "Reroute",
-      "pos": [
-        616,
-        1515
-      ],
-      "size": [
-        75,
-        26
-      ],
-      "flags": {},
-      "order": 13,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "",
-          "type": "*",
-          "link": 48
-        }
-      ],
-      "outputs": [
-        {
-          "name": "",
-          "type": "IMAGE",
-          "links": [
-            90
-          ],
-          "slot_index": 0
-        }
-      ],
-      "properties": {
-        "showOutputText": false,
-        "horizontal": false
-      }
-    },
     {
       "id": 96,
       "type": "Reroute",
@@ -1294,55 +1197,6 @@
         "horizontal": false
       }
     },
-    {
-      "id": 49,
-      "type": "GetImageSize",
-      "pos": [
-        999,
-        1189
-      ],
-      "size": {
-        "0": 210,
-        "1": 46
-      },
-      "flags": {},
-      "order": 24,
-      "mode": 0,
-      "inputs": [
-        {
-          "name": "image",
-          "type": "IMAGE",
-          "link": 90
-        }
-      ],
-      "outputs": [
-        {
-          "name": "width",
-          "type": "INT",
-          "links": [
-            91,
-            238,
-            248
-          ],
-          "shape": 3,
-          "slot_index": 0
-        },
-        {
-          "name": "height",
-          "type": "INT",
-          "links": [
-            92,
-            239,
-            249
-          ],
-          "shape": 3,
-          "slot_index": 1
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "GetImageSize"
-      }
-    },
     {
       "id": 118,
       "type": "NewLayer",
@@ -1376,7 +1230,7 @@
         {
           "name": "width",
           "type": "INT",
-          "link": 248,
+          "link": 295,
           "widget": {
             "name": "width"
           }
@@ -1384,7 +1238,7 @@
         {
           "name": "height",
           "type": "INT",
-          "link": 249,
+          "link": 296,
           "widget": {
             "name": "height"
           }
@@ -1572,7 +1426,7 @@
         {
           "name": "width",
           "type": "INT",
-          "link": 238,
+          "link": 293,
           "widget": {
             "name": "width"
           }
@@ -1580,7 +1434,7 @@
         {
           "name": "height",
           "type": "INT",
-          "link": 239,
+          "link": 294,
           "widget": {
             "name": "height"
           }
@@ -1955,7 +1809,7 @@
         "Node name for S&R": "KSampler"
       },
       "widgets_values": [
-        397643785545040,
+        371831550273153,
         "randomize",
         13,
         8,
@@ -2164,7 +2018,7 @@
         "Node name for S&R": "KSampler"
       },
       "widgets_values": [
-        590319162197911,
+        996820396025175,
         "randomize",
         13,
         8,
@@ -2310,7 +2164,7 @@
         "Node name for S&R": "KSampler"
       },
       "widgets_values": [
-        457217754867837,
+        763274893004397,
         "randomize",
         13,
         8,
@@ -2780,7 +2634,7 @@
       ],
       "size": {
         "0": 315,
-        "1": 234
+        "1": 240
       },
       "flags": {},
       "order": 3,
@@ -2814,7 +2668,8 @@
         100,
         13,
         null,
-        true
+        true,
+        false
       ]
     },
     {
@@ -2986,10 +2841,10 @@
         100,
         706
       ],
-      "size": [
-        315,
-        234
-      ],
+      "size": {
+        "0": 315,
+        "1": 234
+      },
       "flags": {},
       "order": 15,
       "mode": 0,
@@ -3034,7 +2889,8 @@
         100,
         13,
         null,
-        true
+        true,
+        false
       ]
     },
     {
@@ -3044,10 +2900,10 @@
         100,
         1330
       ],
-      "size": [
-        315,
-        234
-      ],
+      "size": {
+        "0": 315,
+        "1": 234
+      },
       "flags": {},
       "order": 16,
       "mode": 0,
@@ -3091,7 +2947,8 @@
         100,
         13,
         null,
-        true
+        true,
+        false
       ]
     },
     {
@@ -3101,10 +2958,10 @@
         100,
         1922
       ],
-      "size": [
-        315,
-        234
-      ],
+      "size": {
+        "0": 315,
+        "1": 234
+      },
       "flags": {},
       "order": 17,
       "mode": 0,
@@ -3147,7 +3004,8 @@
         100,
         13,
         null,
-        true
+        true,
+        false
       ]
     },
     {
@@ -3159,7 +3017,7 @@
       ],
       "size": {
         "0": 315,
-        "1": 70
+        "1": 174
       },
       "flags": {},
       "order": 6,
@@ -3175,13 +3033,37 @@
           ],
           "shape": 3,
           "slot_index": 0
+        },
+        {
+          "name": "r",
+          "type": "INT",
+          "links": null,
+          "shape": 3
+        },
+        {
+          "name": "g",
+          "type": "INT",
+          "links": null,
+          "shape": 3
+        },
+        {
+          "name": "b",
+          "type": "INT",
+          "links": null,
+          "shape": 3
+        },
+        {
+          "name": "a",
+          "type": "FLOAT",
+          "links": null,
+          "shape": 3
         }
       ],
       "properties": {
         "Node name for S&R": "Color"
       },
       "widgets_values": [
-        null,
+        "#000000",
         null
       ]
     },
@@ -3221,6 +3103,12 @@
           ],
           "shape": 3,
           "slot_index": 0
+        },
+        {
+          "name": "MASK",
+          "type": "MASK",
+          "links": null,
+          "shape": 3
         }
       ],
       "properties": {
@@ -3263,6 +3151,12 @@
           ],
           "shape": 3,
           "slot_index": 0
+        },
+        {
+          "name": "MASK",
+          "type": "MASK",
+          "links": null,
+          "shape": 3
         }
       ],
       "properties": {
@@ -3306,6 +3200,12 @@
           ],
           "shape": 3,
           "slot_index": 0
+        },
+        {
+          "name": "MASK",
+          "type": "MASK",
+          "links": null,
+          "shape": 3
         }
       ],
       "properties": {
@@ -3334,6 +3234,152 @@
       ],
       "color": "#432",
       "bgcolor": "#653"
+    },
+    {
+      "id": 134,
+      "type": "GetImageSize_",
+      "pos": [
+        734,
+        1628
+      ],
+      "size": {
+        "0": 210,
+        "1": 46
+      },
+      "flags": {},
+      "order": 24,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "image",
+          "type": "IMAGE",
+          "link": 290
+        }
+      ],
+      "outputs": [
+        {
+          "name": "width",
+          "type": "INT",
+          "links": [
+            291,
+            293,
+            295
+          ],
+          "shape": 3,
+          "slot_index": 0
+        },
+        {
+          "name": "height",
+          "type": "INT",
+          "links": [
+            292,
+            294,
+            296
+          ],
+          "shape": 3,
+          "slot_index": 1
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "GetImageSize_"
+      }
+    },
+    {
+      "id": 28,
+      "type": "Reroute",
+      "pos": [
+        597,
+        1627
+      ],
+      "size": [
+        75,
+        26
+      ],
+      "flags": {},
+      "order": 13,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "",
+          "type": "*",
+          "link": 48
+        }
+      ],
+      "outputs": [
+        {
+          "name": "",
+          "type": "IMAGE",
+          "links": [
+            290
+          ],
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "showOutputText": false,
+        "horizontal": false
+      }
+    },
+    {
+      "id": 46,
+      "type": "NewLayer",
+      "pos": [
+        1056,
+        1247
+      ],
+      "size": {
+        "0": 315,
+        "1": 262
+      },
+      "flags": {},
+      "order": 32,
+      "mode": 0,
+      "inputs": [
+        {
+          "name": "image",
+          "type": "IMAGE",
+          "link": 78
+        },
+        {
+          "name": "mask",
+          "type": "MASK",
+          "link": 79
+        },
+        {
+          "name": "layers",
+          "type": "LAYER",
+          "link": 227,
+          "slot_index": 2
+        },
+        {
+          "name": "canvas",
+          "type": "IMAGE",
+          "link": null
+        }
+      ],
+      "outputs": [
+        {
+          "name": "layers",
+          "type": "LAYER",
+          "links": [
+            228
+          ],
+          "shape": 6,
+          "slot_index": 0
+        }
+      ],
+      "properties": {
+        "Node name for S&R": "NewLayer"
+      },
+      "widgets_values": [
+        179,
+        134,
+        156,
+        146,
+        4,
+        "width",
+        ""
+      ]
     }
   ],
   "links": [
@@ -3433,30 +3479,6 @@
       1,
       "MASK"
     ],
-    [
-      90,
-      28,
-      0,
-      49,
-      0,
-      "IMAGE"
-    ],
-    [
-      91,
-      49,
-      0,
-      50,
-      0,
-      "INT"
-    ],
-    [
-      92,
-      49,
-      1,
-      50,
-      1,
-      "INT"
-    ],
     [
       111,
       63,
@@ -4001,22 +4023,6 @@
       0,
       "IMAGE"
     ],
-    [
-      238,
-      49,
-      0,
-      116,
-      3,
-      "INT"
-    ],
-    [
-      239,
-      49,
-      1,
-      116,
-      4,
-      "INT"
-    ],
     [
       247,
       116,
@@ -4025,22 +4031,6 @@
       2,
       "LAYER"
     ],
-    [
-      248,
-      49,
-      0,
-      118,
-      3,
-      "INT"
-    ],
-    [
-      249,
-      49,
-      1,
-      118,
-      4,
-      "INT"
-    ],
     [
       251,
       119,
@@ -4312,6 +4302,62 @@
       119,
       0,
       "IMAGE"
+    ],
+    [
+      290,
+      28,
+      0,
+      134,
+      0,
+      "IMAGE"
+    ],
+    [
+      291,
+      134,
+      0,
+      50,
+      0,
+      "INT"
+    ],
+    [
+      292,
+      134,
+      1,
+      50,
+      1,
+      "INT"
+    ],
+    [
+      293,
+      134,
+      0,
+      116,
+      3,
+      "INT"
+    ],
+    [
+      294,
+      134,
+      1,
+      116,
+      4,
+      "INT"
+    ],
+    [
+      295,
+      134,
+      0,
+      118,
+      3,
+      "INT"
+    ],
+    [
+      296,
+      134,
+      1,
+      118,
+      4,
+      "INT"
     ]
   ],
   "groups": [],