1.13

Author: phamhungd

.gitignore

@@ -9,3 +9,4 @@ API_key.json
 installed.txt
 my_styles.csv
 *.pem
+wildcards/WC

README.md

@@ -55,7 +55,7 @@ ___
 
 - **For all nodes with download:** Supports direct download from **civitai** and **huggingface** with model address link and model download link
 - **For all dodes load photos with the URL:** Automatically download photos to the url of the image. Can automatically search for the highest quality image with the [Pinterest link](https://www.pinterest.com/) . See also the [support list](https://github.com/mikf/gallery-dl/blob/master/docs/supportedsites.md)
-- **For all nodes capable of entering the text:** Support **Google Translate** and [**Dynamic Prompt function**](https://github.com/adieyal/sd-dynamic-prompts/blob/main/docs/SYNTAX.md) (Request installed node [Dynamicprompts](https://github.com/adieyal/comfyui-dynamicprompts))
+- **For all nodes capable of entering the text:** Support **Google Translate** and [**Dynamic Prompt function**](https://github.com/adieyal/sd-dynamic-prompts/blob/main/docs/SYNTAX.md) ((Wildcards folder: /ComfyUI/wildcards))
 ___
 ### BaseNode
 *A collection of smart nodes that replace basic tasks, helping users build processes smarter and faster*

README_vi.md

@@ -53,7 +53,7 @@ ___
 
 - **Đối với tất cả các node có chức năng tải về:** Hỗ trợ tải trực tiếp từ **civitai** và **huggingface** bằng liên kết địa chỉ model hoặc liên kết tải model.
 - **Đối với tất cả các node tải ảnh bằng URL:** Tự động tải ảnh về từ đường dẫn hình ảnh. Có thể tự động tìm ảnh chất lượng cao nhất với link [Pinterest](https://www.pinterest.com/). Xem thêm [danh sách hỗ trợ](https://github.com/mikf/gallery-dl/blob/master/docs/supportedsites.md)
-- **Đối với tất cả các node nhập văn bản:** Hỗ trợ **Google Dịch** và [**chức năng Dynamic Prompt**](https://github.com/adieyal/sd-dynamic-prompts/blob/main/docs/SYNTAX.md) (Yêu cầu cài đặt node [Dynamicprompts](https://github.com/adieyal/comfyui-dynamicprompts))
+- **Đối với tất cả các node nhập văn bản:** Hỗ trợ **Google Dịch** và [**chức năng Dynamic Prompt**](https://github.com/adieyal/sd-dynamic-prompts/blob/main/docs/SYNTAX.md) (Wildcards folder: /ComfyUI/wildcards)
 ___
 ### BaseNode
 *Bộ node thông minh thay thế các tác vụ cơ bản, giúp người dùng xây dựng quy trình thông minh và nhanh hơn*

node/api.py

@@ -221,10 +221,8 @@ def api_chatbot(self, chatbot, preset, APIkey, seed, main_prompt, sub_prompt, tr
                 if "Deepseek" in chatbot:
                     APIkey =  api_list["Deepseek"]
 
-        if "DPRandomGenerator" in ALL_NODE:
-            cls = ALL_NODE["DPRandomGenerator"]
-            main_prompt = cls().get_prompt(main_prompt, seed, 'No')[0]
-            sub_prompt = cls().get_prompt(sub_prompt, seed, 'No')[0]
+        main_prompt = ALL_NODE["SDVN Random Prompt"]().get_prompt(main_prompt, 1, seed)[0][0]
+        sub_prompt = ALL_NODE["SDVN Random Prompt"]().get_prompt(sub_prompt, 1, seed)[0][0]
         main_prompt = ALL_NODE["SDVN Translate"]().ggtranslate(main_prompt,translate)[0]
         sub_prompt = ALL_NODE["SDVN Translate"]().ggtranslate(sub_prompt,translate)[0]
         prompt = f"{main_prompt}.{sub_prompt}"
@@ -315,9 +313,7 @@ def api_dalle(self, OpenAI_API, size, seed, prompt, quality, translate):
         if OpenAI_API == "":
             api_list = api_check()
             OpenAI_API =  api_list["OpenAI"]
-        if "DPRandomGenerator" in ALL_NODE:
-            cls = ALL_NODE["DPRandomGenerator"]
-            prompt = cls().get_prompt(prompt, seed, 'No')[0]
+        prompt =ALL_NODE["SDVN Random Prompt"]().get_prompt(prompt, 1, seed)[0][0]
         prompt = ALL_NODE["SDVN Translate"]().ggtranslate(prompt,translate)[0]
 
         client = OpenAI(
@@ -363,9 +359,8 @@ def api_dalle(self, OpenAI_API, size, seed, prompt, n, translate, image = None,
         if OpenAI_API == "":
             api_list = api_check()
             OpenAI_API =  api_list["OpenAI"]
-        if "DPRandomGenerator" in ALL_NODE:
-            cls = ALL_NODE["DPRandomGenerator"]
-            prompt = cls().get_prompt(prompt, seed, 'No')[0]
+            
+        ALL_NODE["SDVN Random Prompt"]().get_prompt(prompt, 1, seed)[0][0]
         prompt = ALL_NODE["SDVN Translate"]().ggtranslate(prompt,translate)[0]
 
         client = OpenAI(
@@ -434,8 +429,8 @@ def API_GPT_image(self, OpenAI_API, size, seed, prompt, quality, background, n,
         if OpenAI_API == "":
             api_list = api_check()
             OpenAI_API =  api_list["OpenAI"]
-        if "DPRandomGenerator" in ALL_NODE:
-            prompt = ALL_NODE["DPRandomGenerator"]().get_prompt(prompt, seed, 'No')[0]
+
+        prompt = ALL_NODE["SDVN Random Prompt"]().get_prompt(prompt, 1, seed)[0][0]
         prompt = ALL_NODE["SDVN Translate"]().ggtranslate(prompt,translate)[0]
 
         client = OpenAI(
@@ -506,9 +501,8 @@ def api_imagen(self, Gemini_API, max_size_input, seed, prompt, translate, image
         if Gemini_API == "":
             api_list = api_check()
             Gemini_API =  api_list["Gemini"]
-        if "DPRandomGenerator" in ALL_NODE:
-            cls = ALL_NODE["DPRandomGenerator"]
-            prompt = cls().get_prompt(prompt, seed, 'No')[0]
+
+        prompt = ALL_NODE["SDVN Random Prompt"]().get_prompt(prompt, 1, seed)[0][0]
         prompt = ALL_NODE["SDVN Translate"]().ggtranslate(prompt,translate)[0]
         client = genai.Client(api_key=Gemini_API)
         if image != None:
@@ -553,10 +547,10 @@ def api_imagen(self, Gemini_API, aspect_ratio, person_gen, seed, prompt, transla
         if Gemini_API == "":
             api_list = api_check()
             Gemini_API =  api_list["Gemini"]
-        if "DPRandomGenerator" in ALL_NODE:
-            cls = ALL_NODE["DPRandomGenerator"]
-            prompt = cls().get_prompt(prompt, seed, 'No')[0]
+
+        prompt = ALL_NODE["SDVN Random Prompt"]().get_prompt(prompt, 1, seed)[0][0]
         prompt = ALL_NODE["SDVN Translate"]().ggtranslate(prompt,translate)[0]
+
         client = genai.Client(api_key=Gemini_API)
         response = client.models.generate_images(
             model='imagen-3.0-generate-002',
@@ -598,10 +592,9 @@ def INPUT_TYPES(s):
 
     def ic_light_v2(s, image, mode, bg_source, prompt, translate, n_prompt, hf_token, image_size, steps, seed):
 
-        if "DPRandomGenerator" in ALL_NODE:
-            cls = ALL_NODE["DPRandomGenerator"]
-            prompt = cls().get_prompt(prompt, seed, 'No')[0]
-            n_prompt = cls().get_prompt(n_prompt, seed, 'No')[0]
+        prompt = ALL_NODE["SDVN Random Prompt"]().get_prompt(prompt, 1, seed)[0][0]
+        n_prompt = ALL_NODE["SDVN Random Prompt"]().get_prompt(n_prompt, 1, seed)[0][0]
+
         prompt = ALL_NODE["SDVN Translate"]().ggtranslate(prompt,translate)[0]
         n_prompt = ALL_NODE["SDVN Translate"]().ggtranslate(n_prompt,translate)[0]
         if hf_token == "":

node/creative.py

@@ -6,6 +6,15 @@
 import pandas as pd
 import random as rd
 
+from pathlib import Path
+from dynamicprompts.wildcards.wildcard_manager import WildcardManager
+from dynamicprompts.generators import CombinatorialPromptGenerator
+
+wildcards_folder = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))),"wildcards")
+if not os.path.exists(wildcards_folder):
+    os.makedirs(wildcards_folder)
+wm = WildcardManager(Path(wildcards_folder))
+
 def check_mask(mask_tensor):
     if not isinstance(mask_tensor, torch.Tensor):
         return False
@@ -37,7 +46,43 @@ def __ne__(self, __value: object) -> bool:
 
 any = AnyType("*")
 
+class Random_Prompt:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": {
+            "prompt": ("STRING", {"default": "Syntax - https://github.com/adieyal/sd-dynamic-prompts/blob/main/docs/SYNTAX.md", "multiline": True, }),
+            "max_prompts": ("INT", {"default": 1, "min": 0, "max": 1000, "tooltip": "Sô lượng prompt tối đa tạo ra, 0 sẽ tạo tối đa"}),
+            "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff, "tooltip": "Giá trị seed ban đầu."}),
+        }
+        }
+
+    CATEGORY = "📂 SDVN/💡 Creative"
 
+    RETURN_TYPES = ("STRING",)
+    FUNCTION = "get_prompt"
+    OUTPUT_IS_LIST = (True,)
+
+    def get_prompt(self, prompt, max_prompts, seed):
+        generator = CombinatorialPromptGenerator(wildcard_manager=wm)
+        list_prompt = generator.generate(prompt, max_prompts=1000)
+        print(f"Max prompt: {len(list_prompt)}")
+        if max_prompts == 0:    
+            return (list_prompt,)
+        elif max_prompts == 1:
+            index = seed % len(list_prompt) if seed > 0 else 0
+            return ([list_prompt[index]],)
+        else:
+            index = seed % len(list_prompt) if seed > 0 else 0
+            max_index = index + max_prompts
+            if max_prompts >= len(list_prompt):
+                return (list_prompt,)
+            elif max_index >= len(list_prompt):
+                list_1 = list_prompt[index:]
+                list2 = list_prompt[:max_prompts - (len(list_prompt) - index)]
+                return (list_1 + list2,)
+            else:
+                return (list_prompt[index:max_index],)
+            
 class Easy_IPA_weight:
     @classmethod
     def INPUT_TYPES(s):
@@ -126,9 +171,7 @@ def any_return(self, input, output_list, translate, seed, in1 = None, in2 = None
         for i in in_list:
             if in_list[i] !=None and i in input:
                 input = input.replace(i,str(in_list[i]))
-        if "DPRandomGenerator" in ALL_NODE:
-            cls = ALL_NODE["DPRandomGenerator"]
-            input = cls().get_prompt(input, seed, 'No')[0]
+        input = Random_Prompt().get_prompt(input, 1, seed)[0][0]
         input = GGTranslate().ggtranslate(input,translate)[0]
         true_values = ["true",  "1", "yes", "y", "on"]
         if output_list == "None":
@@ -932,6 +975,7 @@ def slider100(self, num):
         return (num,)
 
 NODE_CLASS_MAPPINGS = {
+    "SDVN Random Prompt": Random_Prompt,
     "SDVN Easy IPAdapter weight": Easy_IPA_weight,
     "SDVN Any Input Type": AnyInput,
     "SDVN Simple Any Input": SimpleAnyInput,
@@ -961,6 +1005,7 @@ def slider100(self, num):
 }
 
 NODE_DISPLAY_NAME_MAPPINGS = {
+    "SDVN Random Prompt": "🎲 Random Prompt",
     "SDVN Easy IPAdapter weight": "📊 IPAdapter weight",
     "SDVN Any Input Type": "🔡 Any Input Type",
     "SDVN Image Size": "📐 Image Size",

node/load.py

@@ -594,10 +594,9 @@ def encode(self, clip, positive, negative, style, translate, seed, image = None)
         if style != "None":
             positive = f"{positive}, {style_list()[1][style_list()[0].index(style)][1]}"
             negative = f"{negative}, {style_list()[1][style_list()[0].index(style)][2]}" if len(style_list()[1][style_list()[0].index(style)]) > 2 else ""
-        if "DPRandomGenerator" in ALL_NODE:
-            cls = ALL_NODE["DPRandomGenerator"]
-            positive = cls().get_prompt(positive, seed, 'No')[0]
-            negative = cls().get_prompt(negative, seed, 'No')[0]
+
+        positive = ALL_NODE["SDVN Random Prompt"]().get_prompt(positive, 1, seed)[0][0]
+        negative = ALL_NODE["SDVN Random Prompt"]().get_prompt(negative, 1, seed)[0][0]
         positive = ALL_NODE["SDVN Translate"]().ggtranslate(positive,translate)[0]
         negative = ALL_NODE["SDVN Translate"]().ggtranslate(negative,translate)[0]
         prompt =f"""
@@ -639,10 +638,9 @@ def loadstyle(self, positive, negative, translate, seed, **kargs):
             if kargs[i] != "None":
                 positive = f"{positive}, {style_list()[1][style_list()[0].index(kargs[i])][1]}"
                 negative = f"{negative}, {style_list()[1][style_list()[0].index(kargs[i])][2]}" if len(style_list()[1][style_list()[0].index(kargs[i])]) > 2 else ""
-        if "DPRandomGenerator" in ALL_NODE:
-            cls = ALL_NODE["DPRandomGenerator"]
-            positive = cls().get_prompt(positive, seed, 'No')[0]
-            negative = cls().get_prompt(negative, seed, 'No')[0]
+
+        positive = ALL_NODE["SDVN Random Prompt"]().get_prompt(positive, 1, seed)[0][0]
+        negative = ALL_NODE["SDVN Random Prompt"]().get_prompt(negative, 1, seed)[0][0]
         positive = ALL_NODE["SDVN Translate"]().ggtranslate(positive,translate)[0]
         negative = ALL_NODE["SDVN Translate"]().ggtranslate(negative,translate)[0]
         return (positive,negative,)
@@ -1238,9 +1236,7 @@ def qwen_size(self, image):
         return (image, width, height)
 
     def append(s, prompt, img_size, translate, seed, clip, image=None, vae=None, mask=None):
-        if "DPRandomGenerator" in ALL_NODE:
-            cls = ALL_NODE["DPRandomGenerator"]
-            prompt = cls().get_prompt(prompt, seed, 'No')[0]
+        prompt = ALL_NODE["SDVN Random Prompt"]().get_prompt(prompt, 1, seed)[0][0]
         prompt = ALL_NODE["SDVN Translate"]().ggtranslate(prompt,translate)[0]
         if mask is not None:
             if ALL_NODE["SDVN Get Mask Size"]().get_size(mask)[0] == 0:

node/preset.py

@@ -227,10 +227,8 @@ def auto_generate(s, model, clip, vae, Prompt, Negative, Active_prompt, Image_si
         n_h = int(round(n_h))
         n_w = int(round(n_w))
         rand_seed = random.randint(0, 0xffffffffffffffff)
-        if "DPRandomGenerator" in ALL_NODE:
-            cls = ALL_NODE["DPRandomGenerator"]
-            Prompt = cls().get_prompt(Prompt, seed, 'No')[0]
-            Negative = cls().get_prompt(Negative, seed, 'No')[0]
+        Prompt = ALL_NODE["SDVN Random Prompt"]().get_prompt(Prompt, 1, seed)[0][0]
+        Negative = ALL_NODE["SDVN Random Prompt"]().get_prompt(Negative, 1, seed)[0][0]
         Prompt = ALL_NODE["SDVN Translate"]().ggtranslate(Prompt,"en")[0]
         Prompt = f"{Active_prompt}, {Prompt}"
         Negative = ALL_NODE["SDVN Translate"]().ggtranslate(Negative,"en")[0]

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "sdvn_comfy_node"
-description = "Update Support Qwen Models for ComfyUI - SDVN Qwen Reference"
-version = "1.12.3"   
+description = "Update Support Dynamic Prompts"
+version = "1.13.0"   
 license = {file = "LICENSE"}
 dependencies = ["#If MacOs - Please install aria2 manually via brew", "aria2;sys_platform != 'darwin'", "openai", "gallery-dl", "google-generativeai", "googletrans-py"]
 

requirements.txt

@@ -9,4 +9,5 @@ opencv-python
 google-genai
 PyYAML
 pandas
-ultralytics>=8.3.107
+ultralytics>=8.3.107
+dynamicprompts

wildcards/Copy wildcards file to folder.txt

@@ -0,0 +1 @@
+Copy wildcards file to folder