Update index.html

v0.10.0 增加 ClipInterrogator、优化APP功能
Update index.html
2024-01-04 14:02:19 +08:00 · 2024-01-04 13:37:07 +08:00 · 2024-01-04 13:24:50 +08:00 · 2024-01-04 13:12:02 +08:00 · 2024-01-04 12:57:55 +08:00 · 2024-01-04 12:45:00 +08:00
32 changed files with 9120 additions and 1135 deletions
@@ -4,10 +4,13 @@
 - 新增AppInfo节点，可以通过简单的配置，把workflow转变为一个Web APP。
 - 支持多个web app 切换
 - 发布为app的workflow，可以在右键里再次编辑了
+- web app可以设置分类，在comfyui右键菜单可以编辑更新web app
+

 - Support multiple web app switching.
 - Add the AppInfo node, which allows you to transform the workflow into a web app by simple configuration.
 - The workflow, which is now released as an app, can also be edited again by right-clicking.
+- The web app can be configured with categories, and the web app can be edited and updated in the right-click menu of ComfyUI.


 ![](./assets/0-m-app.png)
@@ -26,7 +29,7 @@ APP-JSON:
 - [image-to-image](./example/Image-to-Image_2.json)
 - text-to-text

-> 暂时支持6种节点作为界面上的输入节点：Load Image、CLIPTextEncode、TextInput_、FloatSlider、IntNumber、CheckpointLoaderSimple、LoraLoader
+> 暂时支持8种节点作为界面上的输入节点：Load Image、CLIPTextEncode、PromptSlide、TextInput_、Color、FloatSlider、IntNumber、CheckpointLoaderSimple、LoraLoader

 > 输出节点：PreviewImage 、SaveImage、ShowTextForGPT、VHS_VideoCombine

@@ -57,10 +60,20 @@ https://github.com/shadowcz007/comfyui-mixlab-nodes/assets/12645064/e7e77f90-e43

 [workflow-5](./workflow/5-gpt-workflow.json)

-### 3D
-![](./assets/3dimage.png)
-[workflow](./workflow/3D-workflow.json)

+## Prompt
+> PromptSlide
+![](./assets/prompt_weight.png)
+
+![](./workflow/promptslide-appinfo-workflow.svg)
+
+> randomPrompt
+
+![randomPrompt](./assets/randomPrompt.png)
+
+> ClipInterrogator
+
+[add clip-interrogator](https://github.com/pharmapsychotic/clip-interrogator)

 ### 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.
@@ -70,6 +83,11 @@ https://github.com/shadowcz007/comfyui-mixlab-nodes/assets/12645064/e7e77f90-e43
 ![poster](./assets/poster-workflow.svg)


+### 3D
+![](./assets/3dimage.png)
+[workflow](./workflow/3D-workflow.json)
+
+
 ### LoadImagesFromLocal
 > Monitor changes to images in a local folder, and trigger real-time execution of workflows, supporting common image formats, especially PSD format, in conjunction with Photoshop. 

@@ -88,6 +106,7 @@ 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)

+
 ## Other Nodes

 ![main](./assets/all-workflow.svg)
@@ -95,9 +114,7 @@ https://github.com/shadowcz007/comfyui-mixlab-nodes/assets/12645064/e7e77f90-e43

 [workflow-1](./workflow/1-workflow.json)

-> randomPrompt

-![randomPrompt](./assets/randomPrompt.png)

 > TransparentImage

@@ -153,9 +170,7 @@ v0.8.0 🚀🚗🚚🏃‍ LaMaInpainting

 [Download lama](https://github.com/enesmsahin/simple-lama-inpainting/releases/download/v0.1.0/big-lama.pt), move to : models/lama

-<!-- ### Workflow
-[Workflow](./workflow.md) -->
-
+[Download Salesforce\blip-image-captioning-base](https://huggingface.co/Salesforce/blip-image-captioning-base), move to : models/clip_interrogator/Salesforce/blip-image-captioning-base

 ## Installation

@@ -133,8 +133,38 @@ def create_for_https():
    return (crt,key)


+
+# workflow  目录下的所有json
+def read_workflow_json_files_all(folder_path):
+    print('#read_workflow_json_files_all',folder_path)
+    json_files = []
+    for root, dirs, files in os.walk(folder_path):
+        for file in files:
+            if file.endswith('.json'):
+                json_files.append(os.path.join(root, file))
+
+    data = []
+    for file_path in json_files:
+        try:
+            with open(file_path) as json_file:
+                json_data = json.load(json_file)
+                creation_time = datetime.datetime.fromtimestamp(os.path.getctime(file_path))
+                numeric_timestamp = creation_time.timestamp()
+                file_info = {
+                    'filename': os.path.basename(file_path),
+                    'category': os.path.dirname(file_path),
+                    'data': json_data,
+                    'date': numeric_timestamp
+                }
+                data.append(file_info)
+        except Exception as e:
+            print(e)
+    
+    sorted_data = sorted(data, key=lambda x: x['date'], reverse=True)
+    return sorted_data
+
 # workflow  
-def read_workflow_json_files(folder_path):
+def read_workflow_json_files(folder_path ):
    json_files = []
    for filename in os.listdir(folder_path):
        if filename.endswith('.json'):
@@ -169,29 +199,46 @@ def get_workflows():
    workflows=read_workflow_json_files(workflow_path)
    return workflows

-def get_my_workflow_for_app(filename="my_workflow_app.json"):
+def get_my_workflow_for_app(filename="my_workflow_app.json",category="",is_all=False):
    app_path=os.path.join(current_path, "app")
    if not os.path.exists(app_path):
        os.mkdir(app_path)

+    category_path=os.path.join(app_path,category)
+    if not os.path.exists(category_path):
+        os.mkdir(category_path)
+
    apps=[]
    if filename==None:
-        data=read_workflow_json_files(app_path)
+
+        #TODO 支持目录内遍历 
+        if is_all:
+            data=read_workflow_json_files_all(category_path)
+        else:
+            data=read_workflow_json_files(category_path)
+        
        i=0
        for item in data:
+            # print(item)
            try:
                x=item["data"]
                if i==0:
                    apps.append({
                        "filename":item["filename"],
+                        # "category":item['category'],
                        "data":x,
-                        "date":item["date"]
+                        "date":item["date"],
                    })
                else:
+                    category=''
+                    if 'category' in x['app']:
+                        category=x['app']['category']
                    apps.append({
                        "filename":item["filename"],
+                        "category":category,
                        "data":{
                            "app":{
+                                "category":category,
                                "description":x['app']['description'],
                                "filename":(x['app']['filename'] if 'filename' in x['app'] else "") ,
                                "icon":(x['app']['icon'] if 'icon' in x['app'] else None),
@@ -205,7 +252,7 @@ def get_my_workflow_for_app(filename="my_workflow_app.json"):
            except Exception as e:
                print("发生异常：", str(e))
    else:
-        app_workflow_path=os.path.join(app_path, filename)
+        app_workflow_path=os.path.join(category_path, filename)
        # print('app_workflow_path: ',app_workflow_path)
        try:
            with open(app_workflow_path) as json_file:
@@ -216,17 +263,22 @@ def get_my_workflow_for_app(filename="my_workflow_app.json"):
        except Exception as e:
            print("发生异常：", str(e))
        
-        if len(apps)==1:
-            data=read_workflow_json_files(app_path)
+        if len(apps)==1 and category!='' and category!=None:
+            data=read_workflow_json_files(category_path)
            
            for item in data:
                x=item["data"]
                # print(apps[0]['filename'] ,item["filename"])
                if apps[0]['filename']!=item["filename"]:
+                    category=''
+                    if 'category' in x['app']:
+                        category=x['app']['category']
                    apps.append({
                        "filename":item["filename"],
+                        # "category":category,
                        "data":{
                            "app":{
+                                "category":category,
                                "description":x['app']['description'],
                                "filename":(x['app']['filename'] if 'filename' in x['app'] else "") ,
                                "icon":(x['app']['icon'] if 'icon' in x['app'] else None),
@@ -245,11 +297,16 @@ def save_workflow_json(data):
        json.dump(data, file)
    return workflow_path

-def save_workflow_for_app(data,filename="my_workflow_app.json"):
+def save_workflow_for_app(data,filename="my_workflow_app.json",category=""):
    app_path=os.path.join(current_path, "app")
    if not os.path.exists(app_path):
        os.mkdir(app_path)
-    app_workflow_path=os.path.join(app_path, filename)
+
+    category_path=os.path.join(app_path,category)
+    if not os.path.exists(category_path):
+        os.mkdir(category_path)
+    
+    app_workflow_path=os.path.join(category_path, filename)
 
    try:
        output_str = json.dumps(data['output'])
@@ -371,17 +428,26 @@ async def mixlab_workflow_hander(request):
                    'file_path':file_path
                }
            elif data['task']=='save_app':
-                file_path=save_workflow_for_app(data['data'],data['filename'])
+                category=""
+                if "category" in data:
+                    category=data['category']
+                file_path=save_workflow_for_app(data['data'],data['filename'],category)
                result={
                    'status':'success',
                    'file_path':file_path
                }
            elif data['task']=='my_app':
                filename=None
+                category=""
+                admin=False
                if 'filename' in data:
                    filename=data['filename']
+                if 'category' in data:
+                    category=data['category']
+                if 'admin' in data:
+                    admin=data['admin']
                result={
-                    'data':get_my_workflow_for_app(filename),
+                    'data':get_my_workflow_for_app(filename,category,admin),
                    'status':'success',
                }
            elif data['task']=='list':
@@ -438,7 +504,7 @@ PromptServer.add_routes=new_add_routes

 # 导入节点
 from .nodes.PromptNode import RandomPrompt,PromptSlide
-from .nodes.ImageNode import NoiseImage,TransparentImage,LoadImagesFromPath,LoadImagesFromURL,ResizeImage,TextImage,SvgImage,Image3D,ShowLayer,NewLayer,MergeLayers,AreaToMask,SmoothMask,FeatheredMask,SplitLongMask,ImageCropByAlpha,EnhanceImage,FaceToMask
+from .nodes.ImageNode import NoiseImage,TransparentImage,GradientImage,LoadImagesFromPath,LoadImagesFromURL,ResizeImage,TextImage,SvgImage,Image3D,ShowLayer,NewLayer,MergeLayers,AreaToMask,SmoothMask,FeatheredMask,SplitLongMask,ImageCropByAlpha,EnhanceImage,FaceToMask
 from .nodes.Vae import VAELoader,VAEDecode
 from .nodes.ScreenShareNode import ScreenShareNode,FloatingVideo
 from .nodes.Clipseg import CLIPSeg,CombineMasks
@@ -446,6 +512,7 @@ from .nodes.ChatGPT import ChatGPTNode,ShowTextForGPT,CharacterInText
 from .nodes.Audio import GamePal,SpeechRecognition,SpeechSynthesis
 from .nodes.Utils import AppInfo,IntNumber,FloatSlider,TextInput,ColorInput,FontInput,TextToNumber,DynamicDelayProcessor,LimitNumber,SwitchByIndex,GetImageSize_,MultiplicationNode
 from .nodes.Lama import LaMaInpainting
+from .nodes.ClipInterrogator import ClipInterrogator

 # 要导出的所有节点及其名称的字典
 # 注意：名称应全局唯一
@@ -453,7 +520,9 @@ NODE_CLASS_MAPPINGS = {
    "AppInfo":AppInfo,
    "RandomPrompt":RandomPrompt,
    "PromptSlide":PromptSlide,
+    "ClipInterrogator":ClipInterrogator,
    "NoiseImage":NoiseImage,
+    "GradientImage":GradientImage,
    "TransparentImage":TransparentImage,
    "ResizeImageMixlab":ResizeImage,
    "LoadImagesFromPath":LoadImagesFromPath,
@@ -0,0 +1,10 @@
+Chibi Anime Style
+Gakuen Anime Style
+Gekiga Anime Style
+Jidaimono Anime Style
+Kawaii Anime Style
+Mecha Anime Style
+Realistic Anime Style
+Semi-Realistic Anime Style
+Shoji Anime Style
+Kemonomimi Anime Style
@@ -0,0 +1,23 @@
+GoPro
+Drone
+polaroid
+black and white film
+Kodachrome
+shot on 8mm
+shot on 16mm
+shot on 35mm
+Microscopic
+Fisheye Lens
+Wide Angle
+Ultra-Wide Angle
+Panorama
+Short Exposure
+Long Exposure
+Double Exposure
+f2.8
+Depth of Field
+Soft Focus
+Deep Focus
+Shallow Focus
+Vanishing Point
+Vantage Point
@@ -4774,6 +4774,7 @@
            "Color",
            "CombineMasks_",
            "EnhanceImage",
+            "GradientImage",
            "FaceToMask",
            "FeatheredMask",
            "FloatingVideo",
@@ -4785,6 +4786,7 @@
            "NewLayer",
            "RandomPrompt",
            "PromptSlide",
+            "ClipInterrogator",
            "ScreenShare",
            "ShowLayer",
            "ShowTextForGPT",
@@ -0,0 +1,16 @@
+Mood Lighting
+Moody Lighting
+Studio Lighting
+Cove Lighting
+Soft Lighting
+Hard Lighting
+Volumetric Lighting
+Low-Key Lighting
+High-Key Lighting
+Epic Light
+Rembrandt Lighting
+Contre-Jour
+Veiling Flare
+Crepuscular Rays
+Rays of Shimmering Light
+Godrays
@@ -0,0 +1,132 @@
+Aaron Siskind
+Alessio Albi
+Alfred Eisenstaedt
+Alfred Stieglitz
+Alyssa Monks
+André Kertész
+Andreas Gursky
+Andrew Wyeth
+Anne Geddes
+Annie Leibovitz
+Ansel Adams
+Arnold Newman
+August Sander
+Balthus
+Berenice Abbott
+Bill Brandt
+Bill Henson
+Brassaï (Gyula Halász)
+Brooke Shaden
+Bruce Davidson
+Bruce Weber
+Bunny Yeager
+Carleton Watkins
+Carrie Mae Weems
+Chuck Close
+Cindy Sherman
+Clarence H. White
+Claude Cahun
+Danny Lyon
+David LaChapelle
+Dawoud Bey
+Diane Arbus
+Don McCullin
+Dora Maar
+Dorothea Lange
+Duane Michals
+Eadweard Muybridge
+Edward Burtynsky
+Edward Curtis
+Edward Ruscha
+Edward Steichen
+Edward Weston
+Elliott Erwitt
+Ernst Haas
+Eugene Atget
+Fan Ho
+Francesca Woodman
+Frans Lanting
+Garry Winogrand
+Georges Melies
+Gerda Taro
+Gertrude Käsebier
+Gordon Parks
+Graciela Iturbide
+Gregory Crewdson
+Harold Edgerton
+Helen Levitt
+Helmut Newton
+Hendrik Kerstens
+Henri Cartier-Bresson
+Hugh Kretschmer
+Irving Penn
+Jacques Henri Lartigue
+James Nachtwey
+James Van Der Zee
+Jay Maisel
+Jerry Uelsmann
+Joel Peter Witkin
+Joel Sartore
+John Frederick William Herschel
+Josef Sudek
+Julia Margaret Cameron
+Karl Blossfeldt
+Larry Burrows
+László Moholy-Nagy (photography)
+Lee Jeffries
+Lewis Hine
+Lorna Simpson
+Lynsey Addario
+Margaret Bourke-White
+Mario Testino
+Martin Parr
+Martin Schoeller
+Mary Ellen Mark
+Mathew B. Brady
+Méret Oppenheim
+Meryl McMaster
+Mick Rock
+Miles Aldridge
+Minor Martin White
+Nan Goldin
+Nathan Wirth
+Olive Cotton
+Olivier Rousteing
+Patrick Demarchelier
+Paul Nicklen
+Paul Outerbridge
+Paul Strand
+Pete Souza
+Peter Dombrovskis
+Peter Henry Emerson
+Peter Lik
+Peter Lindbergh
+Philip-Lorca diCorcia
+Philippe Halsman
+Ralph Gibson
+Richard Avedon
+Robert Adams
+Robert Bechtle
+Robert Capa
+Robert Frank
+Robert Mapplethorpe
+Roger Fenton
+Ruth Bernhard
+Sally Mann
+Sebastião Salgado
+Shirin Neshat
+Stefan Gesell
+Steven Meisel
+Susan Meiselas
+Vivian Maier
+Vivian Maier
+Viviane Sassen
+Walker Evans
+Wes Anderson
+William Eggleston
+William Eugene Smith
+William Henry Fox Talbot
+Yinka Shonibare
+Yousuf Karsh
+Man Ray
+Robert Mapplethorpe
@@ -0,0 +1,135 @@
+Vintage
+Grain
+Sepia
+High Key
+Low Key
+High Dynamic Range
+Cross Process
+Radial Blur
+Infrared
+Lomo
+Photocopy
+Pencil Sketch
+Pop Art
+Orton
+Mosaic
+Selective Black and White
+Torn Paper
+Tilt-Shift
+Double Exposure
+Polaroid
+Liquid Ink
+Color Splash
+Sketch
+Water Drops
+Polarizer
+Chinese Painting
+Water Droplets
+Polarization
+Color Inversion
+Fish-eye
+Soft Focus
+Solarization
+Posterize
+Comic Book
+Duotone
+Gradient Map
+Edge Detection
+Oil Painting
+Reflection
+Mirror
+ASCII Art
+Glitch
+Time-Lapse
+Day to Night
+Surreal
+Black and White
+Sepia Tone
+Vintage Film
+Grainy Texture
+High Key Lighting
+Low Key Lighting
+Cross Processed Film
+Infrared Photography
+Photocopy
+Pencil Drawing
+Pop Art Filter
+Mosaic Filter
+Selective Desaturation
+Torn Paper
+Tilt-Shift Photography
+Double Exposure
+Polaroid Style Frame
+Water Drops Texture
+Polarizer
+Chinese Painting
+Water Droplets Texture
+Polarization
+Color Inversion
+Fish-eye Lens
+Soft Focus
+Solarize Filter
+Edge Detection
+Oil Painting
+Reflection
+Mirror Image
+Time-Lapse Photography
+Day to Night Transition
+Surreal Art Style
+Abstract Expressionism
+Acrylic Painting
+Anime
+Art Deco
+Biomorphic Abstraction
+Black and White Photograph
+Cartoon
+Charcoal Sketch
+Chibi Anime
+Chinese Painting
+Classicist Painting
+Collage
+Concept Art
+Cyberpunk
+Dada Art
+Digital Art
+Fantasy Art
+Fashion Art
+Fashion Sketch
+Fish-Eye lens Photograph
+Goth Art
+Graffiti
+Harlem Renaissance
+High Key Photograph
+Hyperrealist Pencil Sketch
+Impressionist Painting
+Josei Anime
+Long Exposure Photograph
+Low Key Photograph
+Macro Photograph
+Manga
+Metal Sculpture
+Mid Century Modern Illustration
+Mixed Media
+Modern Art
+Moe Anime
+Nihonga
+Origami
+Paper Mache
+Pen and Ink
+Pencil Sketch
+Photograph
+Photorealism
+Pinup Art
+Romanticist Painting
+Sci-Fi Art
+Semi Realistic Fantasy Art
+Semi Realistic Cyberpunk Art
+Shallow Depth of Field Photograph
+Steam Punk Art
+Stone Sculpture
+Superhero Comic
+Surrealist Art
+Tempura Painting
+Underground Comic
+Watercolor Painting
+Zulu Urban Art
@@ -0,0 +1,158 @@
+import os
+import folder_paths
+
+from PIL import Image
+import comfy.utils
+import numpy as np
+import json
+import torch
+
+from transformers import AutoProcessor, BlipForConditionalGeneration
+
+from clip_interrogator import Config, Interrogator
+
+def load_caption_model(model_path,config,t='blip-base'):
+    dtype=torch.float16 if config.device == 'cuda' else torch.float32
+    caption_model = BlipForConditionalGeneration.from_pretrained(model_path, torch_dtype=dtype)
+    
+    caption_processor = AutoProcessor.from_pretrained(model_path)
+
+    caption_model.eval()
+    if not config.caption_offload:
+        caption_model = caption_model.to(config.device)
+    
+    return (caption_model,caption_processor)
+    
+
+
+caption_model_path=os.path.join(folder_paths.models_dir, "clip_interrogator/Salesforce/blip-image-captioning-base")
+if not os.path.exists(caption_model_path):
+    print(f"## clip_interrogator_model not found: {caption_model_path}, pls download from https://huggingface.co/Salesforce/blip-image-captioning-base")
+
+cache_path=os.path.join(folder_paths.models_dir, "clip_interrogator")
+
+
+
+# Tensor to PIL
+def tensor2pil(image):
+    return Image.fromarray(np.clip(255. * image.cpu().numpy().squeeze(), 0, 255).astype(np.uint8))
+
+# Convert PIL to Tensor
+def pil2tensor(image):
+    return torch.from_numpy(np.array(image).astype(np.float32) / 255.0).unsqueeze(0)
+
+
+def image_analysis(ci,image):
+    image = image.convert('RGB')
+    image_features = ci.image_to_features(image)
+
+    top_mediums = ci.mediums.rank(image_features, 5)
+    top_artists = ci.artists.rank(image_features, 5)
+    top_movements = ci.movements.rank(image_features, 5)
+    top_trendings = ci.trendings.rank(image_features, 5)
+    top_flavors = ci.flavors.rank(image_features, 5)
+
+    medium_ranks = {medium: sim for medium, sim in zip(top_mediums, ci.similarities(image_features, top_mediums))}
+    artist_ranks = {artist: sim for artist, sim in zip(top_artists, ci.similarities(image_features, top_artists))}
+    movement_ranks = {movement: sim for movement, sim in zip(top_movements, ci.similarities(image_features, top_movements))}
+    trending_ranks = {trending: sim for trending, sim in zip(top_trendings, ci.similarities(image_features, top_trendings))}
+    flavor_ranks = {flavor: sim for flavor, sim in zip(top_flavors, ci.similarities(image_features, top_flavors))}
+    
+    return medium_ranks, artist_ranks, movement_ranks, trending_ranks, flavor_ranks
+
+def image_to_prompt(ci,image, mode):
+    ci.config.chunk_size = 2048 if ci.config.clip_model_name == "ViT-L-14/openai" else 1024
+    ci.config.flavor_intermediate_count = 2048 if ci.config.clip_model_name == "ViT-L-14/openai" else 1024
+    image = image.convert('RGB')
+    if mode == 'best':
+        return ci.interrogate(image)
+    elif mode == 'classic':
+        return ci.interrogate_classic(image)
+    elif mode == 'fast':
+        return ci.interrogate_fast(image)
+    elif mode == 'negative':
+        return ci.interrogate_negative(image)
+
+# image = Image.open(image_path).convert('RGB')
+# ci = Interrogator(Config(clip_model_name="ViT-L-14/openai"))
+# print(ci.interrogate(image))
+
+
+class ClipInterrogator:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": {
+            "image": ("IMAGE",),
+            "prompt_mode": (['fast','classic','best','negative'],),
+            "image_analysis": (["off","on"],), 
+                             },
+                }
+    
+    RETURN_TYPES = ("STRING","STRING",)
+    RETURN_NAMES = ("prompt","analysis",)
+
+    FUNCTION = "run"
+
+    CATEGORY = "♾️Mixlab/prompt"
+
+    INPUT_IS_LIST = True
+    OUTPUT_IS_LIST = (True,)
+    global ci
+    ci = None
+    def run(self,image,prompt_mode,image_analysis):
+        global ci
+
+        prompt_mode=prompt_mode[0]
+        analysis=image_analysis[0]
+
+        prompt_result=[]
+        analysis_result=[]
+
+        # 进度条
+        pbar = comfy.utils.ProgressBar(len(image)*(2 if analysis=='on' else 1))
+        
+        if ci==None:
+            config=Config(
+                clip_model_name="ViT-L-14/openai",
+                device="cuda" if torch.cuda.is_available() else "cpu",
+                download_cache=True,
+                clip_model_path=cache_path,
+                cache_path=cache_path
+                )
+            config.apply_low_vram_defaults()
+
+            caption_model,caption_processor=load_caption_model(caption_model_path,config)
+
+            config.caption_model= caption_model
+            config.caption_processor= caption_processor
+
+            ci = Interrogator(config)
+        # else:
+        #     simple_lama.model.to("cuda" if torch.cuda.is_available() else "cpu")
+
+        for i in range(len(image)):
+            im=image[i]
+
+            im=tensor2pil(im)
+            im=im.convert('RGB')
+
+            if analysis=='on':
+                analysis_res=image_analysis(ci,im)
+                analysis_result.append(json.dumps(analysis_res))
+                pbar.update(1)
+
+            prompt=image_to_prompt(ci,im,prompt_mode)
+            pbar.update(1)
+            prompt_result.append(prompt)
+
+
+        # result.save("inpainted.png")
+        if ci.config.clip_offload and not ci.clip_offloaded:
+            ci.clip_model = ci.clip_model.to('cpu')
+            ci.clip_offloaded = True
+
+        if ci.config.caption_offload and not ci.caption_offloaded:
+            ci.caption_model = ci.caption_model.to('cpu')
+            ci.caption_offloaded = True
+
+        return {"ui":{"prompt": prompt_result,"analysis":analysis_result},"result": (prompt_result,analysis_result,)}
@@ -1,6 +1,7 @@
 import numpy as np
 import requests
 import torch
+# from PIL import Image, ImageDraw
 from PIL import Image, ImageOps,ImageFilter,ImageEnhance,ImageDraw,ImageSequence, ImageFont
 from PIL.PngImagePlugin import PngInfo
 import base64,os,random
@@ -155,6 +156,54 @@ def get_not_transparent_area(image):
    return (x, y, w, h)


+
+
+def generate_gradient_image(width, height, start_color_hex, end_color_hex):
+    image = Image.new('RGBA', (width, height))
+    draw = ImageDraw.Draw(image)
+
+    if len(start_color_hex) == 7:
+        start_color_hex += "FF"
+    if len(end_color_hex) == 7:
+        end_color_hex += "FF"
+
+    start_color_hex = start_color_hex.lstrip("#")
+    end_color_hex = end_color_hex.lstrip("#")
+
+    # 将十六进制颜色代码转换为RGBA元组，包括透明度
+    start_color = tuple(int(start_color_hex[i:i+2], 16) for i in (0, 2, 4, 6))
+    end_color = tuple(int(end_color_hex[i:i+2], 16) for i in (0, 2, 4, 6))
+
+    for y in range(height):
+        # 计算当前行的颜色
+        r = int(start_color[0] + (end_color[0] - start_color[0]) * y / height)
+        g = int(start_color[1] + (end_color[1] - start_color[1]) * y / height)
+        b = int(start_color[2] + (end_color[2] - start_color[2]) * y / height)
+        a = int(start_color[3] + (end_color[3] - start_color[3]) * y / height)
+
+        # 绘制当前行的渐变色
+        draw.line((0, y, width, y), fill=(r, g, b, a))
+
+    # Create a mask from the image's alpha channel
+    mask = image.split()[-1]
+
+    # Convert the mask to a black and white image
+    mask = mask.convert('L')
+
+    image=image.convert('RGB')
+
+    return (image, mask)
+
+# 示例用法
+# width = 500
+# height = 200
+# start_color_hex = 'FF0000FF'  # 红色，完全不透明
+# end_color_hex = '0000FFFF'  # 蓝色，完全不透明
+
+# gradient_image = generate_gradient_image(width, height, start_color_hex, end_color_hex)
+# gradient_image.save('gradient_image.png')
+
+
 # 读取不了分层
 def load_psd(image):
    layers=[]
@@ -254,10 +303,59 @@ def get_images_filepath(f,white_bg=False):

    return images

+
+
+def get_average_color_image(image):
+    # 打开图片
+    # image = Image.open(image_path)
+
+    # 将图片转换为RGB模式
+    image = image.convert("RGB")
+
+    # 获取图片的像素值
+    pixel_data = image.load()
+
+    # 初始化颜色总和和像素数量
+    total_red = 0
+    total_green = 0
+    total_blue = 0
+    pixel_count = 0
+
+    # 遍历图片的每个像素
+    for i in range(image.width):
+        for j in range(image.height):
+            # 获取像素的RGB值
+            r, g, b = pixel_data[i, j]
+
+            # 累加颜色值
+            total_red += r
+            total_green += g
+            total_blue += b
+
+            # 像素数量加1
+            pixel_count += 1
+
+    # 计算平均颜色值
+    average_red = int(total_red // pixel_count)
+    average_green = int(total_green // pixel_count)
+    average_blue = int(total_blue // pixel_count)
+
+    # 返回平均颜色值
+
+    im = Image.new("RGB", (image.width, image.height), (average_red, average_green, average_blue))
+
+    return im
+
+
+
 # 创建噪声图像
-def create_noisy_image(width, height, mode="RGB", noise_level=128):
+def create_noisy_image(width, height, mode="RGB", noise_level=128, background_color="#FFFFFF"):
+    
+    background_rgb = tuple(int(background_color[i:i+2], 16) for i in (1, 3, 5))
+    image = Image.new(mode, (width, height), background_rgb)
+
    # 创建空白图像
-    image = Image.new(mode, (width, height))
+    # image = Image.new(mode, (width, height))

    # 遍历每个像素，并随机设置像素值
    pixels = image.load()
@@ -418,26 +516,42 @@ def merge_images(bg_image, layer_image, mask, x, y, width, height, scale_option)
    return bg_image


-def resize_image(layer_image,scale_option,width,height):
+
+def resize_image(layer_image, scale_option, width, height,color="white"):
    layer_image = layer_image.convert("RGB")
+    original_width, original_height = layer_image.size
+    
    if scale_option == "height":
-        # 按照高度比例缩放
-        original_width, original_height = layer_image.size
+        # Scale image based on height
        scale = height / original_height
        new_width = int(original_width * scale)
        layer_image = layer_image.resize((new_width, height))
+        
    elif scale_option == "width":
-        # 按照宽度比例缩放
-        original_width, original_height = layer_image.size
+        # Scale image based on width
        scale = width / original_width
        new_height = int(original_height * scale)
        layer_image = layer_image.resize((width, new_height))
+        
    elif scale_option == "overall":
-        # 整体缩放
+        # Scale image overall
        layer_image = layer_image.resize((width, height))
+        
+    elif scale_option == "center":
+        # Scale image to minimum of width and height, center it, and fill extra area with black
+        scale = min(width / original_width, height / original_height)
+        new_width = int(original_width * scale)
+        new_height = int(original_height * scale)
+        resized_image = Image.new("RGB", (width, height), color=color)
+        resized_image.paste(layer_image.resize((new_width, new_height)), ((width - new_width) // 2, (height - new_height) // 2))
+        resized_image=resized_image.convert("RGB")
+        return resized_image
+    
    return layer_image


+
+
 # def generate_text_image(text_list, font_path, font_size, text_color, vertical=True, spacing=0):
 #     # Load Chinese font
 #     font = ImageFont.truetype(font_path, font_size)
@@ -814,7 +928,10 @@ class TransparentImage:
        # result 里输出给下个节点的数据 
        # print('TransparentImage',len(images_rgb))
        return {"ui":{"images": ui_images,"image_paths":image_paths},"result": (image_paths,images_rgb,images_rgba)}
-        
+
+
+
+

 class EnhanceImage:
    @classmethod
@@ -836,20 +953,27 @@ class EnhanceImage:

    CATEGORY = "♾️Mixlab/image"

-    INPUT_IS_LIST = False
+    INPUT_IS_LIST = True

-    OUTPUT_IS_LIST = (False,)
+    OUTPUT_IS_LIST = (True,)
  
    # 运行的函数
    def run(self,image,contrast):
-        # print('EnhanceImage',image.shape)
-        image=tensor2pil(image)
-     
-        image=enhance_depth_map(image,contrast)
+        # print('EnhanceImage',len(image),image[0].shape)
+        contrast=contrast[0]
+        res=[]
+        for ims in image:
+            for im in ims:

-        image=pil2tensor(image)
+                image=tensor2pil(im)
+            
+                image=enhance_depth_map(image,contrast)
+
+                image=pil2tensor(image)
+
+                res.append(image)
           
-        return (image,)
+        return (res,)



@@ -870,7 +994,7 @@ class LoadImagesFromPath:
    def INPUT_TYPES(s):
        return {
                "required": {
-                                "file_path": ("STRING",{"multiline": False,"default": ""}),
+                                "file_path": ("STRING",{"multiline": False,"default": "","dynamicPrompts": False}),
                            },
                "optional":{
                    "white_bg": (["disable","enable"],),
@@ -1548,6 +1672,80 @@ class MergeLayers:
    


+class GradientImage:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": {
+                "width": ("INT",{
+                    "default": 512, 
+                    "min": 1, # 最小值
+                    "max": 8192, # 最大值
+                    "step": 1, # 间隔
+                    "display": "number" # 控件类型： 输入框 number、滑块 slider
+                }),
+                "height": ("INT",{
+                    "default": 512, 
+                    "min": 1,
+                    "max": 8192,
+                    "step": 1,
+                    "display": "number"
+                }),
+                "start_color_hex": ("STRING",{"multiline": False,"default": "#FFFFFF","dynamicPrompts": False}),
+                "end_color_hex": ("STRING",{"multiline": False,"default": "#000000","dynamicPrompts": False}),
+                },
+                }
+    
+    # 输出的数据类型
+    RETURN_TYPES = ("IMAGE","MASK",)
+
+    # 运行时方法名称
+    FUNCTION = "run"
+
+    # 右键菜单目录
+    CATEGORY = "♾️Mixlab/image"
+
+    # 输入是否为列表
+    INPUT_IS_LIST = False
+
+    # 输出是否为列表
+    OUTPUT_IS_LIST = (False,False,)
+
+    def run(self,width,height,start_color_hex, end_color_hex):
+
+        im,mask=generate_gradient_image(width, height, start_color_hex, end_color_hex)
+
+        #获取临时目录：temp
+        output_dir = folder_paths.get_temp_directory()
+
+        (
+            full_output_folder,
+            filename,
+            counter,
+            subfolder,
+            _,
+        ) = folder_paths.get_save_image_path('tmp_', output_dir)
+        
+        image_file = f"{filename}_{counter:05}.png"
+
+        image_path=os.path.join(full_output_folder, image_file)
+        # 保存图片
+        im.save(image_path,compress_level=6)
+
+        # 把PIL数据类型转为tensor
+        im=pil2tensor(im)
+
+        mask=pil2tensor(mask)
+
+        # 定义ui字段，数据将回传到web前端的 nodeType.prototype.onExecuted
+        # result是节点的输出
+        return {"ui":{"images": [{
+                "filename": image_file,
+                "subfolder": subfolder,
+                "type":"temp"
+            }]},"result": (im,mask,)}
+
+
+
 class NoiseImage:
    @classmethod
    def INPUT_TYPES(s):
@@ -1573,7 +1771,7 @@ class NoiseImage:
                    "step": 1,
                    "display": "slider"
                }),
-
+                "color_hex": ("STRING",{"multiline": False,"default": "#FFFFFF","dynamicPrompts": False}),
                },
                }
    
@@ -1592,9 +1790,9 @@ class NoiseImage:
    # 输出是否为列表
    OUTPUT_IS_LIST = (False,)

-    def run(self,width,height,noise_level):
+    def run(self,width,height,noise_level,color_hex):
        # 创建噪声图像
-        im=create_noisy_image(width,height,"RGB",noise_level)
+        im=create_noisy_image(width,height,"RGB",noise_level,color_hex)
        
        #获取临时目录：temp
        output_dir = folder_paths.get_temp_directory()
@@ -1643,38 +1841,59 @@ class ResizeImage:
                    "step": 1, #Slider's step
                    "display": "number" # Cosmetic only: display as "number" or "slider"
                }),
-                "scale_option": (["width","height",'overall'],),
+                "scale_option": (["width","height",'overall','center'],),

                             },

            "optional":{
                    "image": ("IMAGE",),
+                    "average_color": (["on",'off'],),
+                    "fill_color":("STRING",{"multiline": False,"default": "#FFFFFF","dynamicPrompts": False}),
            }
                }
    
-    RETURN_TYPES = ("IMAGE",)
+    RETURN_TYPES = ("IMAGE","IMAGE")
+    RETURN_NAMES = ("image","average_image",)

    FUNCTION = "run"

    CATEGORY = "♾️Mixlab/image"

    INPUT_IS_LIST = True
-    OUTPUT_IS_LIST = (False,)
+    OUTPUT_IS_LIST = (True,True,)

-    def run(self,width,height,scale_option,image=None):
+    def run(self,width,height,scale_option,image=None,average_color=['on'],fill_color=["#FFFFFF"]):
        
        w=width[0]
        h=height[0]
        scale_option=scale_option[0]
+        average_color=average_color[0]
+        fill_color=fill_color[0]
+
+        imgs=[]
+        average_images=[]

        if image==None:
            im=create_noisy_image(w,h,"RGB")
-        else:
-            im=image[0]
-            im=tensor2pil(im)
-            im=resize_image(im,scale_option,w,h)
-            im=im.convert('RGB')
+            a_im=get_average_color_image(im)
+            
+            im=pil2tensor(im)
+            imgs.append(im)

-        im=pil2tensor(im)
+            a_im=pil2tensor(a_im)
+            average_images.append(a_im)
+        else:
+            for im in image:
+                im=tensor2pil(im)
+                im=resize_image(im,scale_option,w,h,fill_color)
+                im=im.convert('RGB')
+
+                a_im=get_average_color_image(im)
+
+                im=pil2tensor(im)
+                imgs.append(im)
+
+                a_im=pil2tensor(a_im)
+                average_images.append(a_im)
        
-        return (im,)
+        return (imgs,average_images,)
@@ -62,7 +62,8 @@ class PromptSlide:
                "prompt_keyword": ("STRING", 
                         {
                            "multiline": False, 
-                            "default": ''
+                            "default": '',
+                            "dynamicPrompts": False
                          }),

                "weight":("FLOAT", {"default": 1, "min": -3,"max": 3,
@@ -34,13 +34,13 @@ def create_temp_file(image):
        ) = folder_paths.get_save_image_path('tmp', output_dir)

    
-    image=tensor2pil(image)
+    im=tensor2pil(image)
 
    image_file = f"{filename}_{counter:05}.png"
     
    image_path=os.path.join(full_output_folder, image_file)

-    image.save(image_path,compress_level=4)
+    im.save(image_path,compress_level=4)

    return [{
                "filename": image_file,
@@ -79,6 +79,16 @@ font_files = get_font_files(r_directory)
 # print(font_files)


+def flatten_list(nested_list):
+    flat_list = []
+    for item in nested_list:
+        if isinstance(item, list):
+            flat_list.extend(flatten_list(item))
+        else:
+            flat_list.append(item)
+    return flat_list
+
+
 class ColorInput:
    @classmethod
    def INPUT_TYPES(s):
@@ -439,6 +449,7 @@ class AppInfo:
                    }),
                    "share_prefix":("STRING",{"multiline": False,"default": "","dynamicPrompts": False}),
                    "link":("STRING",{"multiline": False,"default": "https://","dynamicPrompts": False}),
+                    "category":("STRING",{"multiline": False,"default": "","dynamicPrompts": False}),
                }

                }
@@ -450,16 +461,28 @@ class AppInfo:

    CATEGORY = "♾️Mixlab"

-    INPUT_IS_LIST = False
-    OUTPUT_IS_LIST = (False,)
+    INPUT_IS_LIST = True
+    OUTPUT_IS_LIST = (True,)

-    def run(self,name,image,input_ids,output_ids,description,version,share_prefix,link):
+    def run(self,name,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，

-        im=create_temp_file(image)
+        input_ids=input_ids[0]
+        output_ids=output_ids[0]
+        description=description[0]
+        version=version[0]
+        share_prefix=share_prefix[0]
+        link=link[0]
+        category=category[0]
+
+        #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]}, "result": (image,)}
+        return {"ui": {"json": [name,im,input_ids,output_ids,description,version,share_prefix,link,category]}, "result": (image,)}
    

    
@@ -500,6 +523,7 @@ class SwitchByIndex:
                        "step": 1, 
                        "display": "number"  
                    }),
+                 "flat": (['off',"on"],),
            }
        }

@@ -513,13 +537,20 @@ class SwitchByIndex:
    INPUT_IS_LIST = True
    OUTPUT_IS_LIST = (True,)

-    def run(self, A,B,index):
+    def run(self, A,B,index,flat):
+
+        flat=flat[0]
+
        C=[]
        index=index[0]
        for a in A:
            C.append(a)
        for b in B:
            C.append(b)
+
+        if flat=='on':
+            C=flatten_list(C)
+
        if index>-1:
            try:
                C=[C[index]]
@@ -4,4 +4,5 @@ watchdog
 opencv-python-headless
 matplotlib
 openai
-simple-lama-inpainting
+simple-lama-inpainting
+clip-interrogator==0.6.0
@@ -196,6 +196,9 @@ app.registerExtension({
              }
              if (bg) {
                data.bg_image = await parseImage(bg)
+                if (!data.bg_image.match('data:image/')) {
+                  delete data.bg_image
+                }
              }

              if (material) {
@@ -99,6 +99,17 @@ function extractInputAndOutputData (jsonData, inputIds = [], outputIds = []) {
        if (node.type == 'PromptSlide') {
          // 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]) {
+            options.keywords = keywords
+          }
+        }
+
+        if(node.type=='Color'){
+          
        }

        input[inputIds.indexOf(id)] = {
@@ -136,6 +147,16 @@ function getUrl () {
  return url
 }

+const getLocalData = key => {
+  let data = {}
+  try {
+    data = JSON.parse(localStorage.getItem(key)) || {}
+  } catch (error) {
+    return {}
+  }
+  return data
+}
+
 async function save_app (json) {
  let url = getUrl()

@@ -144,7 +165,8 @@ async function save_app (json) {
    body: JSON.stringify({
      data: json,
      task: 'save_app',
-      filename: json.app.filename
+      filename: json.app.filename,
+      category: json.app.category
    })
  })
  return await res.json()
@@ -170,7 +192,8 @@ async function save (json, download = false) {
  const name = json[0],
    version = json[5],
    share_prefix = json[6], //用于分享的功能扩展
-    link=json[7],//用于创建界面上的跳转链接
+    link = json[7], //用于创建界面上的跳转链接
+    category = json[8] || '', //用于分类
    description = json[4],
    inputIds = json[2].split('\n').filter(f => f),
    outputIds = json[3].split('\n').filter(f => f)
@@ -201,6 +224,7 @@ async function save (json, download = false) {
      seed, //控制是fixed 还是random
      share_prefix,
      link,
+      category,
      filename: `${name}_${version}.json`
    }

@@ -209,31 +233,23 @@ async function save (json, download = false) {
    } catch (error) {}
    // console.log(data.app)
    // let http_workflow = app.graph.serialize()
-
+    await save_app(data)
    if (download) {
-      await save_app(data)
      await downloadJsonFile(data, data.app.filename)
-      let open = window.confirm(
-        `You can now access the standalone application on a new page!\n${getUrl()}/mixlab/app?filename=${encodeURIComponent(
-          data.app.filename
-        )}`
-      )
-      if (open)
-        window.open(
-          `${getUrl()}/mixlab/app?filename=${encodeURIComponent(
-            data.app.filename
-          )}`
-        )
-    } else {
-      await save_app(data)
-
-      let open = window.confirm(
-        `You can now access the standalone application on a new page!\n${getUrl()}/mixlab/app`
-      )
-      if (open) window.open(`${getUrl()}/mixlab/app`)
    }
+    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('###SpeechRecognition', error)
+    console.log('###error', error)
  }
 }

@@ -318,7 +334,7 @@ app.registerExtension({
      }

      const onExecuted = nodeType.prototype.onExecuted
-      nodeType.prototype.onExecuted = async function (message) {
+      nodeType.prototype.onExecuted = function (message) {
        onExecuted?.apply(this, arguments)
        console.log(message.json)
        window._mixlab_app_json = message.json
@@ -3,7 +3,7 @@ import { app } from '../../../scripts/app.js'
 const repoOwner = 'shadowcz007' // 替换为仓库的所有者
 const repoName = 'comfyui-mixlab-nodes' // 替换为仓库的名称

-const version = 'v0.8.0'
+const version = 'v0.10.0'

 fetch(`https://api.github.com/repos/${repoOwner}/${repoName}/releases/latest`)
  .then(response => response.json())
@@ -1800,15 +1800,19 @@ const updateUI = node => {
    pw.inputEl.title = `Total of ${prompts.length} prompts`
  } else {
    // 动态添加
-    console.log('ComfyWidgets',ComfyWidgets.STRING(
-      node,
-      'prompts',
-      ['STRING', { multiline: true }]
-    ))
+    // console.log('ComfyWidgets',ComfyWidgets.STRING(
+    //   node,
+    //   'prompts',
+    //   ['STRING', { multiline: true }]
+    // ))
+
+    // ComfyWidgets.STRING(this, "", ["", {default:this.properties.text, multiline: true}], app)
+
    const w = ComfyWidgets.STRING(
      node,
      'prompts',
-      ['STRING', { multiline: true }]
+      ['STRING', { multiline: true }],
+      app
    ).widget
    w.inputEl.readOnly = true
    w.inputEl.style.opacity = 0.6
@@ -2089,13 +2093,13 @@ const node = {
  name: 'RandomPrompt',
  async init (app) {
    // Any initial setup to run as soon as the page loads
-    console.log('[logging]', 'extension init')
+    // console.log('[logging]', 'extension init')

    if (window.location.href.match('/?')) {
      const { workflow } = getURLParameters(window.location.href)
      if (workflow)
        get_my_workflow().then(data => {
-          console.log('#get_my_workflow', data)
+          // console.log('#get_my_workflow', data)
          let my_workflow = data.filter(
            d => d.filename == 'my_workflow.json'
          )[0]
@@ -2131,10 +2135,15 @@ const node = {
    // }
  },
  loadedGraphNode (node, app) {
-    // Fires for each node when loading/dragging/etc a workflow json or png
-    // If you break something in the backend and want to patch workflows in the frontend
-    // This is the place to do this
-    // console.log("[logging]", "loaded graph node: ", exportGraph(node.graph));
+    if (node.type === 'RandomPrompt') {
+      try {
+        let max_count = node.widgets.filter(w => w.name === "max_count")[0];
+        max_count.value= node.widgets_values[0]
+        // console.log('RandomPrompt',max_count,node.widgets_values[0])
+      } catch (error) {
+        console.log(error)
+      }
+    }
  },
  async nodeCreated (node) {
    if (node.type === 'RandomPrompt') {
@@ -2227,7 +2236,7 @@ const node = {
        const r = onExecuted?.apply?.(this, arguments)

        let prompts = message.prompts
-        console.log('executed', message)
+        // console.log('executed', message)
        // console.log('#RandomPrompt', this.widgets)
        const pw = this.widgets.filter(w => w.name === 'prompts')[0]

@@ -2238,7 +2247,7 @@ const node = {
        } else {
          // 动态添加
          const w = ComfyWidgets.STRING(
-            node,
+            this,
            'prompts',
            ['STRING', { multiline: true }],
            app
@@ -0,0 +1,204 @@
+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 get_position_style (ctx, widget_width, y, node_height) {
+  const MARGIN = 4 // the margin around the html element
+
+  /* Create a transform that deals with all the scrolling and zooming */
+  const elRect = ctx.canvas.getBoundingClientRect()
+  const transform = new DOMMatrix()
+    .scaleSelf(
+      elRect.width / ctx.canvas.width,
+      elRect.height / ctx.canvas.height
+    )
+    .multiplySelf(ctx.getTransform())
+    .translateSelf(MARGIN, MARGIN + y)
+
+  return {
+    transformOrigin: '0 0',
+    transform: transform,
+    left: `0`,
+    top: `0`,
+    cursor: 'pointer',
+    position: 'absolute',
+    maxWidth: `${widget_width - MARGIN * 2}px`,
+    // maxHeight: `${node_height - MARGIN * 2}px`, // we're assuming we have the whole height of the node
+    width: `${widget_width - MARGIN * 2 - 24}px`,
+    // height: `${node_height * 0.3 - MARGIN * 2}px`,
+    // background: '#EEEEEE',
+    paddingLeft: '12px',
+    display: 'flex',
+    flexDirection: 'row',
+    // alignItems: 'center',
+    justifyContent: 'space-between'
+  }
+}
+
+const getLocalData = key => {
+  let data = {}
+  try {
+    data = JSON.parse(localStorage.getItem(key)) || {}
+  } catch (error) {
+    return {}
+  }
+  return data
+}
+
+const setLocalDataOfWin = (key, value) => {
+  localStorage.setItem(key, JSON.stringify(value))
+  // window[key] = value
+}
+
+const createSelect = (select, opts, targetWidget) => {
+  select.style.display = 'block'
+  let html = ''
+  let isMatch = false
+  for (const opt of opts) {
+    html += `<option value='${opt}' ${
+      targetWidget.value === opt ? 'selected' : ''
+    }>${opt}</option>`
+    if (targetWidget.value === opt) isMatch = true
+  }
+  select.innerHTML = html
+  if (!isMatch) targetWidget.value = opts[0]
+  // 添加change事件监听器
+  select.addEventListener('change', function () {
+    // 获取选中的选项的值
+    var selectedOption = select.options[select.selectedIndex].value
+    targetWidget.value = selectedOption
+    // console.log(widget,selectedOption)
+  })
+}
+
+app.registerExtension({
+  name: 'Mixlab.prompt.PromptSlide',
+  async beforeRegisterNodeDef (nodeType, nodeData, app) {
+    if (nodeType.comfyClass == 'PromptSlide') {
+      const orig_nodeCreated = nodeType.prototype.onNodeCreated
+      nodeType.prototype.onNodeCreated = async function () {
+        orig_nodeCreated?.apply(this, arguments)
+
+        const prompt_keyword = this.widgets.filter(
+          w => w.name == 'prompt_keyword'
+        )[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 select = document.createElement('select')
+        select.style = `display:none;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: 100px;
+       `
+        widget.select = select
+
+        // 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)
+
+              // widget.value = keywords
+              let ks = getLocalData(`_mixlab_PromptSlide`)
+              ks[this.id] = keywords
+              setLocalDataOfWin(`_mixlab_PromptSlide`, ks)
+
+              createSelect(select, keywords, prompt_keyword)
+
+              inp.remove()
+            }
+
+            // 以文本方式读取文件
+            reader.readAsText(file)
+          })
+        })
+
+        widget.div.appendChild(btn)
+        widget.div.appendChild(select)
+        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 === 'PromptSlide') {
+      try {
+        let prompt = node.widgets.filter(w => w.name === 'prompt_keyword')[0]
+        let ks = getLocalData(`_mixlab_PromptSlide`)
+
+        let keywords = ks[node.id]
+        // 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)
+        }
+      } catch (error) {}
+    }
+  }
+})
@@ -55,13 +55,15 @@ function get_url () {
  return url
 }

-async function get_my_app (filename = null) {
+async function get_my_app (filename = null, category = '') {
  let url = get_url()
  const res = await fetch(`${url}/mixlab/workflow`, {
    method: 'POST',
    body: JSON.stringify({
      task: 'my_app',
-      filename
+      filename,
+      category,
+      admin: true
    })
  })
  let result = await res.json()
@@ -713,208 +715,343 @@ app.registerExtension({
      this.setDirty(true, true)
    }
  },
-  async setup () {
-    // Add canvas menu options
-    const orig = LGraphCanvas.prototype.getCanvasMenuOptions
+  setup () {
+    setTimeout(async () => {
+      // Add canvas menu options
+      const orig = LGraphCanvas.prototype.getCanvasMenuOptions

-    const apps = await get_my_app()
-    // console.log('apps',apps)
-    LGraphCanvas.prototype.getCanvasMenuOptions = function () {
-      const options = orig.apply(this, arguments)
+      const apps = await get_my_app()

-      options.push(null, {
-        content: `Nodes Map ♾️Mixlab`,
-        disabled: false,
-        callback: async () => {
-          nodesMap =
-            nodesMap && Object.keys(nodesMap).length > 0
-              ? nodesMap
-              : await getCustomnodeMappings('url')
+      let apps_map = { '0': [] }

-          const nodesDiv = document.createDocumentFragment()
-          const nodes = (await app.graphToPrompt()).output
+      for (const app of apps) {
+        if (app.category) {
+          if (!apps_map[app.category]) apps_map[app.category] = []
+          apps_map[app.category].push(app)
+        } else {
+          apps_map['0'].push(app)
+        }
+      }

-          // console.log('[Mixlab]', 'loaded graph node: ', app)
-          let div =
-            document.querySelector('#mixlab_find_the_node') ||
-            document.createElement('div')
-          div.id = 'mixlab_find_the_node'
-          div.style = `
-              flex-direction: column;
-              align-items: end;
-              display:flex;position: absolute; 
-              top: 50px; left: 50px; width: 200px; 
-              color: var(--descrip-text);
-              background-color: var(--comfy-menu-bg);
-              padding: 10px; 
-              border: 1px solid black;z-index: 999999999;padding-top: 0;`
-
-          div.innerHTML = ''
-
-          let btn = document.createElement('div')
-          btn.style = `display: flex;
-            width: calc(100% - 24px);
-            justify-content: space-between;
-            align-items: center;
-            padding: 0 12px;
-            height: 44px;`
-          let btnB = document.createElement('button')
-          let textB = document.createElement('p')
-          btn.appendChild(textB)
-          btn.appendChild(btnB)
-          textB.style.fontSize = '12px'
-          textB.innerText = `Locate and navigate nodes ♾️Mixlab`
-
-          btnB.style = `float: right; border: none; color: var(--input-text);
-            background-color: var(--comfy-input-bg); border-color: var(--border-color);cursor: pointer;`
-          btnB.addEventListener('click', () => {
-            div.style.display = 'none'
-          })
-          btnB.innerText = 'X'
-
-          // 悬浮框拖动事件
-          div.addEventListener('mousedown', function (e) {
-            var startX = e.clientX
-            var startY = e.clientY
-            var offsetX = div.offsetLeft
-            var offsetY = div.offsetTop
-
-            function moveBox (e) {
-              var newX = e.clientX
-              var newY = e.clientY
-              var deltaX = newX - startX
-              var deltaY = newY - startY
-              div.style.left = offsetX + deltaX + 'px'
-              div.style.top = offsetY + deltaY + 'px'
-            }
-
-            function stopMoving () {
-              document.removeEventListener('mousemove', moveBox)
-              document.removeEventListener('mouseup', stopMoving)
-            }
-
-            document.addEventListener('mousemove', moveBox)
-            document.addEventListener('mouseup', stopMoving)
-          })
-
-          div.appendChild(btn)
-
-          const updateNodes = (ns, nd) => {
-            for (let nodeId in ns) {
-              let n = ns[nodeId].class_type
-              if (nodesMap[n]) {
-                const { url, title } = nodesMap[n]
-                let d = document.createElement('button')
-                d.style = `text-align: left;margin:6px;color: var(--input-text);
-                  background-color: var(--comfy-input-bg); border-color: var(--border-color);cursor: pointer;`
-                d.addEventListener('click', () => {
-                  const node = app.graph.getNodeById(nodeId)
-                  if (!node) return
-                  app.canvas.centerOnNode(node)
-                  app.canvas.setZoom(1)
-                })
-                d.addEventListener('mouseover', async () => {
-                  // console.log('mouseover')
-                  let n = (await app.graphToPrompt()).output
-                  if (!deepEqual(n, ns)) {
-                    nd.innerHTML = ''
-                    updateNodes(n, nd)
-                  }
-                })
-
-                d.innerHTML = `
-                  <span>${'#' + nodeId} ${n}</span>
-                  <a href="${url}" target="_blank" style="text-decoration: none;">🔗</a>
-                  `
-                d.title = title
-
-                nd.appendChild(d)
+      let apps_opts = []
+      for (const category in apps_map) {
+        console.log('category',typeof(category))
+        if (category === '0') {
+          apps_opts.push(
+            ...Array.from(apps_map[category], a => {
+              return {
+                content: a.name,
+                has_submenu: false,
+                callback: async () => {
+                  try {
+                    let item = (await get_my_app(a.filename))[0]
+                    if (item) {
+                      // console.log(item.data)
+                      app.loadGraphData(item.data)
+                      setTimeout(() => {
+                        const node = app.graph._nodes_in_order[0]
+                        if (!node) return
+                        app.canvas.centerOnNode(node)
+                        app.canvas.setZoom(0.5)
+                      }, 1000)
+                    }
+                  } catch (error) {}
+                }
              }
-            }
-          }
-
-          let nodesDivv = document.createElement('div')
-
-          for (let nodeId in nodes) {
-            let n = nodes[nodeId].class_type
-            if (nodesMap[n]) {
-              const { url, title: _title } = nodesMap[n]
-              let title = app.graph.getNodeById(nodeId).title || _title
-              let d = document.createElement('button')
-              d.style = `text-align: left;margin:6px;color: var(--input-text);
-                background-color: var(--comfy-input-bg); border-color: var(--border-color);cursor: pointer;`
-              d.addEventListener('click', () => {
-                const node = app.graph.getNodeById(nodeId)
-                if (!node) return
-                app.canvas.centerOnNode(node)
-                app.canvas.setZoom(1)
-              })
-              d.addEventListener('mouseover', async () => {
-                console.log('mouseover')
-                let n = (await app.graphToPrompt()).output
-                if (!deepEqual(n, nodes)) {
-                  nodesDivv.innerHTML = ''
-                  updateNodes(n, nodesDivv)
+            })
+          )
+        } else {
+          // 二级
+          apps_opts.push({
+            content:  '🚀 '+category,
+            has_submenu: true,
+            disabled: false,
+            submenu: {
+              options: Array.from(apps_map[category], a => {
+                return {
+                  content: a.name,
+                  callback: async () => {
+                    try {
+                      let item = (await get_my_app(a.filename, a.category))[0]
+                      if (item) {
+                        // console.log(item.data)
+                        app.loadGraphData(item.data)
+                        setTimeout(() => {
+                          const node = app.graph._nodes_in_order[0]
+                          if (!node) return
+                          app.canvas.centerOnNode(node)
+                          app.canvas.setZoom(0.5)
+                        }, 1000)
+                      }
+                    } catch (error) {}
+                  }
                }
              })
-
-              d.innerHTML = `
-                <span>${'#' + nodeId} ${title}</span>
-                <a href="${url}" target="_blank" style="text-decoration: none;">🔗</a>
-                `
-              d.title = n
-
-              nodesDiv.appendChild(d)
-            }
-          }
-
-          nodesDivv.appendChild(nodesDiv)
-          nodesDivv.style = `overflow: scroll;
-            height: 70vh;width: 100%;`
-
-          div.appendChild(nodesDivv)
-
-          if (!document.querySelector('#mixlab_find_the_node'))
-            document.body.appendChild(div)
-        }
-      },{
-        content: 'Workflow App ♾️Mixlab',
-        has_submenu: true,
-        disabled: false,
-        submenu: {
-          options: Array.from(apps, a => {
-            return {
-              content: a.name,
-              callback: async () => {
-                try {
-                  let item = (await get_my_app(a.filename))[0]
-                  if (item) {
-                    // console.log(item.data)
-                    app.loadGraphData(item.data)
-                    setTimeout(() => {
-                      const node = app.graph._nodes_in_order[0]
-                      if (!node) return
-                      app.canvas.centerOnNode(node)
-                      app.canvas.setZoom(0.5)
-                    }, 1000)
-                  }
-                } catch (error) {}
-              }
            }
          })
        }
-      })
+      }

-    
+      // console.log('apps',apps_map, apps_opts,apps)
+      LGraphCanvas.prototype.getCanvasMenuOptions = function () {
+        const options = orig.apply(this, arguments)

-      // options.push({
-      //   content: `Save For App ♾️Mixlab`,
-      //   disabled: false, // or a function determining whether to disable
-      //   callback: async () => {
+        options.push(
+          null,
+          {
+            content: `Nodes Map ♾️Mixlab`,
+            disabled: false,
+            callback: async () => {
+              nodesMap =
+                nodesMap && Object.keys(nodesMap).length > 0
+                  ? nodesMap
+                  : await getCustomnodeMappings('url')

-      //   }
-      // })
-      return options
-    }
+              const nodesDiv = document.createDocumentFragment()
+              const nodes = (await app.graphToPrompt()).output
+
+              // console.log('[Mixlab]', 'loaded graph node: ', app)
+              let div =
+                document.querySelector('#mixlab_find_the_node') ||
+                document.createElement('div')
+              div.id = 'mixlab_find_the_node'
+              div.style = `
+               flex-direction: column;
+               align-items: end;
+               display:flex;position: absolute; 
+               top: 50px; left: 50px; width: 200px; 
+               color: var(--descrip-text);
+               background-color: var(--comfy-menu-bg);
+               padding: 10px; 
+               border: 1px solid black;z-index: 999999999;padding-top: 0;`
+
+              div.innerHTML = ''
+
+              let btn = document.createElement('div')
+              btn.style = `display: flex;
+             width: calc(100% - 24px);
+             justify-content: space-between;
+             align-items: center;
+             padding: 0 12px;
+             height: 44px;`
+              let btnB = document.createElement('button')
+              let textB = document.createElement('p')
+              btn.appendChild(textB)
+              btn.appendChild(btnB)
+              textB.style.fontSize = '12px'
+              textB.innerText = `Locate and navigate nodes ♾️Mixlab`
+
+              btnB.style = `float: right; border: none; color: var(--input-text);
+             background-color: var(--comfy-input-bg); border-color: var(--border-color);cursor: pointer;`
+              btnB.addEventListener('click', () => {
+                div.style.display = 'none'
+              })
+              btnB.innerText = 'X'
+
+              // 悬浮框拖动事件
+              div.addEventListener('mousedown', function (e) {
+                var startX = e.clientX
+                var startY = e.clientY
+                var offsetX = div.offsetLeft
+                var offsetY = div.offsetTop
+
+                function moveBox (e) {
+                  var newX = e.clientX
+                  var newY = e.clientY
+                  var deltaX = newX - startX
+                  var deltaY = newY - startY
+                  div.style.left = offsetX + deltaX + 'px'
+                  div.style.top = offsetY + deltaY + 'px'
+                }
+
+                function stopMoving () {
+                  document.removeEventListener('mousemove', moveBox)
+                  document.removeEventListener('mouseup', stopMoving)
+                }
+
+                document.addEventListener('mousemove', moveBox)
+                document.addEventListener('mouseup', stopMoving)
+              })
+
+              div.appendChild(btn)
+
+              const updateNodes = (ns, nd) => {
+                let appInfoNodes = {}
+                try {
+                  let appInfo = app.graph._nodes.filter(
+                    n => n.type === 'AppInfo'
+                  )[0]
+                  if (appInfo) {
+                    appInfoNodes[appInfo.id] = 2
+                    for (const id of appInfo.widgets[1].value.split('\n')) {
+                      if (id && id.trim() && parseInt(id)) {
+                        appInfoNodes[id] = 0
+                      }
+                    }
+                    for (const id of app.graph._nodes
+                      .filter(n => n.type === 'AppInfo')[0]
+                      .widgets[2].value.split('\n')) {
+                      if (id && id.trim() && parseInt(id)) {
+                        appInfoNodes[id] = 1
+                      }
+                    }
+                  }
+                } catch (error) {
+                  console.log(error)
+                }
+
+                for (let nodeId in ns) {
+                  let n = ns[nodeId].title || ns[nodeId].class_type
+                  if (nodesMap[n]) {
+                    const { url, title } = nodesMap[n]
+                    let d = document.createElement('button')
+                    d.style = `text-align: left;
+                    margin:6px;
+                    color: var(--input-text);
+                   background-color: var(--comfy-input-bg); 
+                   border-color: ${
+                     appInfoNodes[nodeId] >= 0
+                       ? appInfoNodes[nodeId] === 1
+                         ? 'blue'
+                         : 'red'
+                       : 'var(--border-color)'
+                   };
+                   cursor: pointer;`
+
+                    if (appInfoNodes[nodeId] === 2) {
+                      // appinfo
+                      d.style.backgroundColor = '#326328'
+                      d.style.color = '#ffffff'
+                      d.style.borderColor = 'transparent'
+                    }
+
+                    d.addEventListener('click', () => {
+                      // console.log('node')
+                      const node = app.graph.getNodeById(nodeId)
+
+                      if (!node) return
+                      app.canvas.centerOnNode(node)
+                      app.canvas.setZoom(1)
+                    })
+                    d.addEventListener('mouseover', async () => {
+                      // console.log('mouseover')
+                      let n = (await app.graphToPrompt()).output
+                      if (!deepEqual(n, ns)) {
+                        nd.innerHTML = ''
+                        updateNodes(n, nd)
+                      }
+                    })
+
+                    d.innerHTML = `
+                   <span>${'#' + nodeId} ${n}</span>
+                   <a href="${url}" target="_blank" style="text-decoration: none;">🔗</a>
+                   `
+                    d.title = title
+
+                    nd.appendChild(d)
+                  }
+                }
+              }
+
+              let nodesDivv = document.createElement('div')
+              let appInfoNodes = {}
+              try {
+                let appInfo = app.graph._nodes.filter(
+                  n => n.type === 'AppInfo'
+                )[0]
+                if (appInfo) {
+                  appInfoNodes[appInfo.id] = 2
+                  for (const id of appInfo.widgets[1].value.split('\n')) {
+                    if (id && id.trim() && parseInt(id)) {
+                      appInfoNodes[id] = 0
+                    }
+                  }
+                  for (const id of app.graph._nodes
+                    .filter(n => n.type === 'AppInfo')[0]
+                    .widgets[2].value.split('\n')) {
+                    if (id && id.trim() && parseInt(id)) {
+                      appInfoNodes[id] = 1
+                    }
+                  }
+                }
+              } catch (error) {
+                console.log(error)
+              }
+
+              for (let nodeId in nodes) {
+                let n = nodes[nodeId].class_type
+                if (nodesMap[n]) {
+                  const { url, title: _title } = nodesMap[n]
+                  let title = app.graph.getNodeById(nodeId).title || _title
+                  let d = document.createElement('button')
+                  d.style = `text-align: left;
+                  margin:6px;
+                  color: var(--input-text);
+                 background-color: var(--comfy-input-bg); 
+                 border-color: ${
+                   appInfoNodes[nodeId] >= 0
+                     ? appInfoNodes[nodeId] === 1
+                       ? 'blue'
+                       : 'red'
+                     : 'var(--border-color)'
+                 };
+                 cursor: pointer;`
+
+                  if (appInfoNodes[nodeId] === 2) {
+                    // appinfo
+                    d.style.backgroundColor = '#326328'
+                    d.style.color = '#ffffff'
+                    d.style.borderColor = 'transparent'
+                  }
+
+                  d.addEventListener('click', () => {
+                    console.log('click')
+                    const node = app.graph.getNodeById(nodeId)
+                    if (!node) return
+                    app.canvas.centerOnNode(node)
+                    app.canvas.setZoom(1)
+                  })
+                  d.addEventListener('mouseover', async () => {
+                    // console.log('mouseover')
+                    let n = (await app.graphToPrompt()).output
+                    if (!deepEqual(n, nodes)) {
+                      nodesDivv.innerHTML = ''
+                      updateNodes(n, nodesDivv)
+                    }
+                  })
+
+                  d.innerHTML = `
+                 <span>${'#' + nodeId} ${title}</span>
+                 <a href="${url}" target="_blank" style="text-decoration: none;">🔗</a>
+                 `
+                  d.title = n
+
+                  nodesDiv.appendChild(d)
+                }
+              }
+
+              nodesDivv.appendChild(nodesDiv)
+              nodesDivv.style = `overflow: scroll;
+             height: 70vh;width: 100%;`
+
+              div.appendChild(nodesDivv)
+
+              if (!document.querySelector('#mixlab_find_the_node'))
+                document.body.appendChild(div)
+            }
+          },
+          {
+            content: 'Workflow App ♾️Mixlab',
+            has_submenu: true,
+            disabled: false,
+            submenu: {
+              options:apps_opts
+            }
+          }
+        )
+
+        return options
+      }
+    }, 1000)
  }
 })
@@ -57,11 +57,35 @@ function hexToRGBA (hexColor) {
  // 将透明度的十六进制值转换为十进制值
  var alpha = parseInt(alphaHex, 16) / 255

-  return [r,g,b,alpha]
+  return [r, g, b, alpha]
 }

 app.registerExtension({
  name: 'Mixlab.utils.Color',
+  init () {
+    $el('link', {
+      rel: 'stylesheet',
+      href: '/extensions/comfyui-mixlab-nodes/lib/classic.min.css',
+      parent: document.head
+    })
+
+    $el('style', {
+      textContent: `
+      .pickr{
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+				.pickr .pcr-button {
+					width: 56px;
+          height: 56px;
+          outline: 1px solid white;
+				}
+				 
+			`,
+      parent: document.body
+    })
+  },
  async getCustomWidgets (app) {
    return {
      TCOLOR (node, inputName, inputData, app) {
@@ -75,9 +99,10 @@ app.registerExtension({
            return [128, 32] // a method to compute the current size of the widget
          },
          async serializeValue (nodeId, widgetIndex) {
-            let data = getLocalData('_mixlab_utils_color');
-            let hex=data[node.id] || '#000000'
-            let [r,g,b,a]=hexToRGBA(hex)
+            // let data = getLocalData('_mixlab_utils_color')
+            // let hex = data[node.id] || '#000000'
+            let hex = widget.value || '#000000'
+            let [r, g, b, a] = hexToRGBA(hex)
            return {
              hex,
              r,
@@ -100,7 +125,7 @@ app.registerExtension({
      nodeType.prototype.onNodeCreated = function () {
        orig_nodeCreated?.apply(this, arguments)

-        console.log('Color nodeData', this.widgets)
+        // console.log('Color nodeData', this.widgets)

        const widget = {
          type: 'div',
@@ -110,6 +135,7 @@ app.registerExtension({
              this.div.style,
              get_position_style(ctx, widget_width, 44, node.size[1])
            )
+            // console.log('draw',y,node.widgets[0].last_y)
          }
        }

@@ -117,35 +143,9 @@ app.registerExtension({

        document.body.appendChild(widget.div)

-        const inputDiv = (key, placeholder, value) => {
+        const inputDiv = () => {
          let div = document.createElement('div')
-          const ip = document.createElement('input')
-          ip.type = 'color'
-          ip.className = `${'comfy-multiline-input'} ${placeholder}`
-          div.style = `display: flex;
-            align-items: center; 
-            margin: 6px 8px;
-            margin-top: 0;`
-          ip.placeholder = placeholder
-          ip.value = value
-
-          ip.style = `outline: none;
-            border: none;
-            padding: 4px;
-            width: 70%;cursor: pointer;
-            height: 32px;`
-          const label = document.createElement('label')
-          label.style = 'font-size: 10px;min-width:32px'
-          label.innerText = placeholder
-          div.appendChild(label)
-          div.appendChild(ip)
-
-          ip.addEventListener('change', () => {
-            let data = getLocalData(key)
-            data[this.id] = ip.value.trim()
-            localStorage.setItem(key, JSON.stringify(data))
-            // console.log(this.id, ip.value.trim())
-          })
+          div.id = `color_picker_${this.id}`
          return div
        }

@@ -155,10 +155,85 @@ app.registerExtension({

        this.addCustomWidget(widget)

+        const pickr = Pickr.create({
+          el: `#${inputColor.id}`,
+          theme: 'classic', // or 'monolith', or 'nano'
+          // closeOnScroll: true,
+          default:'#000000',
+          swatches: [
+            'rgba(244, 67, 54, 1)',
+            'rgba(233, 30, 99, 0.95)',
+            'rgba(156, 39, 176, 0.9)',
+            'rgba(103, 58, 183, 0.85)',
+            'rgba(63, 81, 181, 0.8)',
+            'rgba(33, 150, 243, 0.75)',
+            'rgba(3, 169, 244, 0.7)',
+            'rgba(0, 188, 212, 0.7)',
+            'rgba(0, 150, 136, 0.75)',
+            'rgba(76, 175, 80, 0.8)',
+            'rgba(139, 195, 74, 0.85)',
+            'rgba(205, 220, 57, 0.9)',
+            'rgba(255, 235, 59, 0.95)',
+            'rgba(255, 193, 7, 1)'
+          ],
+
+          components: {
+            // Main components
+            preview: true,
+            opacity: true,
+            hue: true,
+            // Input / output Options
+            interaction: {
+              hex: true,
+              rgba: true,
+              hsla: true,
+              hsva: true,
+              cmyk: true,
+              input: true,
+              // clear: true,
+              save: true,
+              cancel: true
+            }
+          }
+        })
+
+        pickr
+          .on('save', (color, instance) => {
+            // console.log('Event: "save"', color.toHEXA().toString())
+            // let data = getLocalData('_mixlab_utils_color')
+            // data[this.id] = color.toHEXA().toString()
+            // localStorage.setItem('_mixlab_utils_color', JSON.stringify(data))
+
+            try {
+              let tc = this.widgets.filter(w => w.type == 'TCOLOR')[0]
+              tc.value = color.toHEXA().toString()
+            } catch (error) {}
+          })
+          .on('cancel', instance => {
+            pickr && pickr.hide()
+          })
+        this.pickr = pickr
+        const handleMouseWheel = () => {
+          try {
+            this.pickr && this.pickr.hide()
+          } catch (error) {}
+        }
+
+        document.addEventListener('wheel', handleMouseWheel)
+
        const onRemoved = this.onRemoved
        this.onRemoved = () => {
          inputColor.remove()
          widget.div.remove()
+
+          try {
+            this.pickr.destroyAndRemove()
+            this.pickr = null
+            document.removeEventListener('wheel', handleMouseWheel)
+          } catch (error) {
+            console.log(error)
+          }
+
          return onRemoved?.()
        }

@@ -171,13 +246,11 @@ app.registerExtension({
    // You can modify widgets/add handlers/etc here

    if (node.type === 'Color') {
-      let widget = node.widgets.filter(w => w.div)[0]
+      try {
+        let TCOLOR = node.widgets.filter(w => w.type == 'TCOLOR')[0]

-      let data = getLocalData('_mixlab_utils_color')
-
-      let id = node.id
-
-      widget.div.querySelector('.Color').value = data[id] || '#000000'
+        setTimeout(() => node.pickr.setColor(TCOLOR.value || '#000000'), 1000)
+      } catch (error) {}
    }
  }
 })
@@ -0,0 +1 @@
+/*! PhotoSwipe main CSS by Dmytro Semenov | photoswipe.com */.pswp{--pswp-bg:#000;--pswp-placeholder-bg:#222;--pswp-root-z-index:100000;--pswp-preloader-color:rgba(79, 79, 79, 0.4);--pswp-preloader-color-secondary:rgba(255, 255, 255, 0.9);--pswp-icon-color:#fff;--pswp-icon-color-secondary:#4f4f4f;--pswp-icon-stroke-color:#4f4f4f;--pswp-icon-stroke-width:2px;--pswp-error-text-color:var(--pswp-icon-color)}.pswp{position:fixed;top:0;left:0;width:100%;height:100%;z-index:var(--pswp-root-z-index);display:none;touch-action:none;outline:0;opacity:.003;contain:layout style size;-webkit-tap-highlight-color:transparent}.pswp:focus{outline:0}.pswp *{box-sizing:border-box}.pswp img{max-width:none}.pswp--open{display:block}.pswp,.pswp__bg{transform:translateZ(0);will-change:opacity}.pswp__bg{opacity:.005;background:var(--pswp-bg)}.pswp,.pswp__scroll-wrap{overflow:hidden}.pswp__bg,.pswp__container,.pswp__content,.pswp__img,.pswp__item,.pswp__scroll-wrap,.pswp__zoom-wrap{position:absolute;top:0;left:0;width:100%;height:100%}.pswp__img,.pswp__zoom-wrap{width:auto;height:auto}.pswp--click-to-zoom.pswp--zoom-allowed .pswp__img{cursor:-webkit-zoom-in;cursor:-moz-zoom-in;cursor:zoom-in}.pswp--click-to-zoom.pswp--zoomed-in .pswp__img{cursor:move;cursor:-webkit-grab;cursor:-moz-grab;cursor:grab}.pswp--click-to-zoom.pswp--zoomed-in .pswp__img:active{cursor:-webkit-grabbing;cursor:-moz-grabbing;cursor:grabbing}.pswp--no-mouse-drag.pswp--zoomed-in .pswp__img,.pswp--no-mouse-drag.pswp--zoomed-in .pswp__img:active,.pswp__img{cursor:-webkit-zoom-out;cursor:-moz-zoom-out;cursor:zoom-out}.pswp__button,.pswp__container,.pswp__counter,.pswp__img{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.pswp__item{z-index:1;overflow:hidden}.pswp__hidden{display:none!important}.pswp__content{pointer-events:none}.pswp__content>*{pointer-events:auto}.pswp__error-msg-container{display:grid}.pswp__error-msg{margin:auto;font-size:1em;line-height:1;color:var(--pswp-error-text-color)}.pswp .pswp__hide-on-close{opacity:.005;will-change:opacity;transition:opacity var(--pswp-transition-duration) cubic-bezier(.4,0,.22,1);z-index:10;pointer-events:none}.pswp--ui-visible .pswp__hide-on-close{opacity:1;pointer-events:auto}.pswp__button{position:relative;display:block;width:50px;height:60px;padding:0;margin:0;overflow:hidden;cursor:pointer;background:0 0;border:0;box-shadow:none;opacity:.85;-webkit-appearance:none;-webkit-touch-callout:none}.pswp__button:active,.pswp__button:focus,.pswp__button:hover{transition:none;padding:0;background:0 0;border:0;box-shadow:none;opacity:1}.pswp__button:disabled{opacity:.3;cursor:auto}.pswp__icn{fill:var(--pswp-icon-color);color:var(--pswp-icon-color-secondary)}.pswp__icn{position:absolute;top:14px;left:9px;width:32px;height:32px;overflow:hidden;pointer-events:none}.pswp__icn-shadow{stroke:var(--pswp-icon-stroke-color);stroke-width:var(--pswp-icon-stroke-width);fill:none}.pswp__icn:focus{outline:0}.pswp__img--with-bg,div.pswp__img--placeholder{background:var(--pswp-placeholder-bg)}.pswp__top-bar{position:absolute;left:0;top:0;width:100%;height:60px;display:flex;flex-direction:row;justify-content:flex-end;z-index:10;pointer-events:none!important}.pswp__top-bar>*{pointer-events:auto;will-change:opacity}.pswp__button--close{margin-right:6px}.pswp__button--arrow{position:absolute;top:0;width:75px;height:100px;top:50%;margin-top:-50px}.pswp__button--arrow:disabled{display:none;cursor:default}.pswp__button--arrow .pswp__icn{top:50%;margin-top:-30px;width:60px;height:60px;background:0 0;border-radius:0}.pswp--one-slide .pswp__button--arrow{display:none}.pswp--touch .pswp__button--arrow{visibility:hidden}.pswp--has_mouse .pswp__button--arrow{visibility:visible}.pswp__button--arrow--prev{right:auto;left:0}.pswp__button--arrow--next{right:0}.pswp__button--arrow--next .pswp__icn{left:auto;right:14px;transform:scale(-1,1)}.pswp__button--zoom{display:none}.pswp--zoom-allowed .pswp__button--zoom{display:block}.pswp--zoomed-in .pswp__zoom-icn-bar-v{display:none}.pswp__preloader{position:relative;overflow:hidden;width:50px;height:60px;margin-right:auto}.pswp__preloader .pswp__icn{opacity:0;transition:opacity .2s linear;animation:pswp-clockwise .6s linear infinite}.pswp__preloader--active .pswp__icn{opacity:.85}@keyframes pswp-clockwise{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}.pswp__counter{height:30px;margin-top:15px;margin-inline-start:20px;font-size:14px;line-height:30px;color:var(--pswp-icon-color);text-shadow:1px 1px 3px var(--pswp-icon-color-secondary);opacity:.85}.pswp--one-slide .pswp__counter{display:none}
Author	SHA1	Message	Date
shadowcz007	8a46647d8c	Update index.html	2024-01-04 14:02:19 +08:00
shadowcz007	406a255db0	v0.10.0 增加 ClipInterrogator、优化APP功能	2024-01-04 13:37:07 +08:00
shadowcz007	574557810e	Update index.html	2024-01-04 13:24:50 +08:00
shadowcz007	998a02c3a4	上一次输入记录	2024-01-04 13:12:02 +08:00
shadowcz007	c6f964c921	textarea输入，增加上一次输入记录	2024-01-04 12:57:55 +08:00
shadowcz007	efb0e147c5	Update index.html	2024-01-04 12:45:00 +08:00
shadowcz007	9cf7356f98	Update index.html	2024-01-04 12:33:59 +08:00
shadowcz007	af05c43174	支持image的batch输出	2024-01-04 12:31:45 +08:00
shadowcz007	380c68ff2b	EnhanceImage节点支持batch多张输入和输出	2024-01-04 12:03:27 +08:00
shadowcz007	068b00b99f	update	2024-01-04 11:24:00 +08:00
shadowcz007	cd6a42ab64	clip-interrogator	2024-01-04 11:03:25 +08:00
shadowcz007	f115abec92	add clip interrogator	2024-01-04 11:01:08 +08:00
shadowcz007	f0e23cf878	AIPC大赛模板	2024-01-03 22:28:38 +08:00
shadowcz007	a94f11d809	Update index.html	2024-01-03 20:22:24 +08:00
shadowcz007	38972bea5f	更新AIPC大赛模板-直接合成，免去ps	2024-01-03 18:03:33 +08:00
shadowcz007	a761ff552a	Merge branch 'main' of https://github.com/shadowcz007/comfyui-mixlab-nodes	2024-01-03 17:54:25 +08:00
shadowcz007	dbeb84ea9a	resizeImage 缩放图像新增center模式，多余的背景可以设定填充颜色	2024-01-03 17:54:23 +08:00
shadow	0a4938f39a	Merge pull request #105 from shadowcz007/v0.9.2-中断生成修复3d image的bug，未上传bg图也可以运行了	2024-01-03 14:21:26 +08:00
shadowcz007	b2182c716d	修复3d image的bug，未上传bg图也可以运行了	2024-01-03 14:20:48 +08:00
shadow	8253be73f6	Merge pull request #104 from shadowcz007/v0.9.2-中断生成添加中断生成的功能	2024-01-03 09:35:12 +08:00
shadowcz007	20318e296e	添加中断生成的功能	2024-01-03 09:32:29 +08:00
shadow	cea1b69286	Merge pull request #103 from shadowcz007/v0.9.1-优化app模式 V0.9.1 优化app模式	2024-01-02 23:56:18 +08:00
shadowcz007	ab8aa69389	v0.9.1 web app可以设置分类，在comfyui右键菜单可以编辑更新web app The web app can be configured with categories, and the web app can be edited and updated in the right-click menu of ComfyUI. 暂时支持8种节点作为界面上的输入节点：Load Image、CLIPTextEncode、PromptSlide、TextInput_、Color、FloatSlider、IntNumber、CheckpointLoaderSimple、LoraLoader	2024-01-02 23:54:24 +08:00
shadowcz007	681491f1d0	v0.9.1	2024-01-02 23:51:19 +08:00
shadowcz007	c2fb815074	更新示例：TwinShot	2024-01-02 23:50:39 +08:00
shadowcz007	fffa14dc44	修复了randomprompt里的一个小bug	2024-01-02 17:48:41 +08:00
shadowcz007	df37166d42	Switch节点增加flat功能，可以把list里的某个元素取出来单独处理	2024-01-02 17:44:17 +08:00
shadowcz007	25fa3a8f6a	支持按照分类隔离应用	2024-01-02 16:19:01 +08:00
shadowcz007	b11507c5e6	样式	2024-01-02 15:11:29 +08:00
shadowcz007	f06d02489f	app支持color组件	2024-01-02 14:59:59 +08:00
shadowcz007	c203af2f71	优化	2024-01-02 13:42:39 +08:00
shadowcz007	c715155a70	渐变节点	2024-01-02 13:25:48 +08:00
shadowcz007	8163133294	优化颜色选择器	2024-01-02 12:17:41 +08:00
shadowcz007	765be5dab4	1	2024-01-02 11:03:22 +08:00
shadowcz007	7c1523389d	Update index.html	2024-01-02 09:53:25 +08:00
shadowcz007	7a2b1ba166	支持category	2024-01-02 09:32:46 +08:00
shadowcz007	45b4dcfcd0	Update index.html	2024-01-01 22:46:10 +08:00
shadowcz007	3b2e535566	add photoswipe	2024-01-01 22:34:58 +08:00
shadowcz007	db556d13a3	1	2024-01-01 21:33:54 +08:00
shadowcz007	a987063c68	nodes map - appinfo	2024-01-01 21:08:38 +08:00
shadowcz007	4ce30ef899	Update ui_mixlab.js	2024-01-01 20:33:00 +08:00
shadowcz007	d988282d98	增加种子生成模式切换	2024-01-01 20:24:12 +08:00
shadowcz007	695fdf7ceb	update	2024-01-01 20:08:39 +08:00
shadowcz007	0befe164cc	v0.9.0	2024-01-01 16:12:58 +08:00
shadowcz007	d506c68a80	promptslide-appinfo-workflow.svg	2024-01-01 16:10:46 +08:00
shadowcz007	c59c429b75	update	2024-01-01 16:05:19 +08:00
shadowcz007	c726b6e4a2	prompt weight 提供选项	2024-01-01 15:56:07 +08:00
shadowcz007	96075ad4e1	Update ImageNode.py	2024-01-01 14:17:58 +08:00
shadowcz007	7a8dc07a8a	Update ui_mixlab.js	2024-01-01 11:46:21 +08:00
shadowcz007	1fdac0bc09	Update index.html	2024-01-01 11:32:06 +08:00
shadowcz007	804b942a36	Update index.html	2024-01-01 11:16:56 +08:00
shadowcz007	6335d4378b	优化	2024-01-01 10:55:09 +08:00
shadowcz007	cfc2189616	v0.8.1	2023-12-31 23:58:16 +08:00
				`@@ -0,0 +1 @@`
				/! PhotoSwipe main CSS by Dmytro Semenov \| photoswipe.com /.pswp{--pswp-bg:#000;--pswp-placeholder-bg:#222;--pswp-root-z-index:100000;--pswp-preloader-color:rgba(79, 79, 79, 0.4);--pswp-preloader-color-secondary:rgba(255, 255, 255, 0.9);--pswp-icon-color:#fff;--pswp-icon-color-secondary:#4f4f4f;--pswp-icon-stroke-color:#4f4f4f;--pswp-icon-stroke-width:2px;--pswp-error-text-color:var(--pswp-icon-color)}.pswp{position:fixed;top:0;left:0;width:100%;height:100%;z-index:var(--pswp-root-z-index);display:none;touch-action:none;outline:0;opacity:.003;contain:layout style size;-webkit-tap-highlight-color:transparent}.pswp:focus{outline:0}.pswp {box-sizing:border-box}.pswp img{max-width:none}.pswp--open{display:block}.pswp,.pswp__bg{transform:translateZ(0);will-change:opacity}.pswp__bg{opacity:.005;background:var(--pswp-bg)}.pswp,.pswp__scroll-wrap{overflow:hidden}.pswp__bg,.pswp__container,.pswp__content,.pswp__img,.pswp__item,.pswp__scroll-wrap,.pswp__zoom-wrap{position:absolute;top:0;left:0;width:100%;height:100%}.pswp__img,.pswp__zoom-wrap{width:auto;height:auto}.pswp--click-to-zoom.pswp--zoom-allowed .pswp__img{cursor:-webkit-zoom-in;cursor:-moz-zoom-in;cursor:zoom-in}.pswp--click-to-zoom.pswp--zoomed-in .pswp__img{cursor:move;cursor:-webkit-grab;cursor:-moz-grab;cursor:grab}.pswp--click-to-zoom.pswp--zoomed-in .pswp__img:active{cursor:-webkit-grabbing;cursor:-moz-grabbing;cursor:grabbing}.pswp--no-mouse-drag.pswp--zoomed-in .pswp__img,.pswp--no-mouse-drag.pswp--zoomed-in .pswp__img:active,.pswp__img{cursor:-webkit-zoom-out;cursor:-moz-zoom-out;cursor:zoom-out}.pswp__button,.pswp__container,.pswp__counter,.pswp__img{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.pswp__item{z-index:1;overflow:hidden}.pswp__hidden{display:none!important}.pswp__content{pointer-events:none}.pswp__content>{pointer-events:auto}.pswp__error-msg-container{display:grid}.pswp__error-msg{margin:auto;font-size:1em;line-height:1;color:var(--pswp-error-text-color)}.pswp .pswp__hide-on-close{opacity:.005;will-change:opacity;transition:opacity var(--pswp-transition-duration) cubic-bezier(.4,0,.22,1);z-index:10;pointer-events:none}.pswp--ui-visible .pswp__hide-on-close{opacity:1;pointer-events:auto}.pswp__button{position:relative;display:block;width:50px;height:60px;padding:0;margin:0;overflow:hidden;cursor:pointer;background:0 0;border:0;box-shadow:none;opacity:.85;-webkit-appearance:none;-webkit-touch-callout:none}.pswp__button:active,.pswp__button:focus,.pswp__button:hover{transition:none;padding:0;background:0 0;border:0;box-shadow:none;opacity:1}.pswp__button:disabled{opacity:.3;cursor:auto}.pswp__icn{fill:var(--pswp-icon-color);color:var(--pswp-icon-color-secondary)}.pswp__icn{position:absolute;top:14px;left:9px;width:32px;height:32px;overflow:hidden;pointer-events:none}.pswp__icn-shadow{stroke:var(--pswp-icon-stroke-color);stroke-width:var(--pswp-icon-stroke-width);fill:none}.pswp__icn:focus{outline:0}.pswp__img--with-bg,div.pswp__img--placeholder{background:var(--pswp-placeholder-bg)}.pswp__top-bar{position:absolute;left:0;top:0;width:100%;height:60px;display:flex;flex-direction:row;justify-content:flex-end;z-index:10;pointer-events:none!important}.pswp__top-bar>*{pointer-events:auto;will-change:opacity}.pswp__button--close{margin-right:6px}.pswp__button--arrow{position:absolute;top:0;width:75px;height:100px;top:50%;margin-top:-50px}.pswp__button--arrow:disabled{display:none;cursor:default}.pswp__button--arrow .pswp__icn{top:50%;margin-top:-30px;width:60px;height:60px;background:0 0;border-radius:0}.pswp--one-slide .pswp__button--arrow{display:none}.pswp--touch .pswp__button--arrow{visibility:hidden}.pswp--has_mouse .pswp__button--arrow{visibility:visible}.pswp__button--arrow--prev{right:auto;left:0}.pswp__button--arrow--next{right:0}.pswp__button--arrow--next .pswp__icn{left:auto;right:14px;transform:scale(-1,1)}.pswp__button--zoom{display:none}.pswp--zoom-allowed .pswp__button--zoom{display:block}.pswp--zoomed-in .pswp__zoom-icn-bar-v{display:none}.pswp__preloader{position:relative;overflow:hidden;width:50px;height:60px;margin-right:auto}.pswp__preloader .pswp__icn{opacity:0;transition:opacity .2s linear;animation:pswp-clockwise .6s linear infinite}.pswp__preloader--active .pswp__icn{opacity:.85}@keyframes pswp-clockwise{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}.pswp__counter{height:30px;margin-top:15px;margin-inline-start:20px;font-size:14px;line-height:30px;color:var(--pswp-icon-color);text-shadow:1px 1px 3px var(--pswp-icon-color-secondary);opacity:.85}.pswp--one-slide .pswp__counter{display:none}