Added support for wildcards (ported from RuinedFooocus, adjusted to Fooocus V2)

Author: MoonRide303

modules/async_worker.py

@@ -44,7 +44,7 @@ def worker():
     import modules.virtual_memory as virtual_memory
 
     from modules.resolutions import get_resolution_string, resolutions
-    from modules.sdxl_styles import apply_style
+    from modules.sdxl_styles import apply_style, apply_wildcards
     from modules.private_logger import log
     from modules.expansion import safe_str
     from modules.util import join_prompts, remove_empty_str
@@ -154,68 +154,72 @@ def handler(task):
 
 
         progressbar(5, 'Processing prompts ...')
+        tasks = []
+        for i in range(image_number):
+            positive_basic_workloads = []
+            negative_basic_workloads = []
+            task_seed = seed if same_seed_for_all else seed + i
+            task_prompt = apply_wildcards(prompt, task_seed)
+
+            if use_style:
+                for s in style_selections:
+                    p, n = apply_style(s, positive=task_prompt)
+                    positive_basic_workloads.append(p)
+                    negative_basic_workloads.append(n)
+            else:
+                positive_basic_workloads.append(task_prompt)
+    
+            negative_basic_workloads.append(negative_prompt)  # Always use independent workload for negative.
 
-        positive_basic_workloads = []
-        negative_basic_workloads = []
-
-        if use_style:
-            for s in style_selections:
-                p, n = apply_style(s, positive=prompt)
-                positive_basic_workloads.append(p)
-                negative_basic_workloads.append(n)
-        else:
-            positive_basic_workloads.append(prompt)
-
-        negative_basic_workloads.append(negative_prompt)  # Always use independent workload for negative.
-
-        positive_basic_workloads = positive_basic_workloads + extra_positive_prompts
-        negative_basic_workloads = negative_basic_workloads + extra_negative_prompts
+            positive_basic_workloads = positive_basic_workloads + extra_positive_prompts
+            negative_basic_workloads = negative_basic_workloads + extra_negative_prompts
 
-        positive_basic_workloads = remove_empty_str(positive_basic_workloads, default=prompt)
-        negative_basic_workloads = remove_empty_str(negative_basic_workloads, default=negative_prompt)
+            positive_basic_workloads = remove_empty_str(positive_basic_workloads, default=task_prompt)
+            negative_basic_workloads = remove_empty_str(negative_basic_workloads, default=negative_prompt)
 
-        positive_top_k = len(positive_basic_workloads)
-        negative_top_k = len(negative_basic_workloads)
+            tasks.append(dict(
+                task_seed=task_seed,
+                prompt=task_prompt,
+                positive=positive_basic_workloads,
+                negative=negative_basic_workloads,
+                positive_top_k=len(positive_basic_workloads),
+                negative_top_k=len(negative_basic_workloads),
+                expansion='',
+                c=[None, None],
+                uc=[None, None]
+            ))
 
-        tasks = [dict(
-            task_seed=seed if same_seed_for_all else seed + i,
-            positive=positive_basic_workloads,
-            negative=negative_basic_workloads,
-            expansion='',
-            c=[None, None],
-            uc=[None, None],
-        ) for i in range(image_number)]
 
         if use_expansion:
             for i, t in enumerate(tasks):
                 progressbar(5, f'Preparing Fooocus text #{i + 1} ...')
-                expansion = pipeline.expansion(prompt, t['task_seed'])
+                expansion = pipeline.expansion(t['prompt'], t['task_seed'])
                 print(f'[Prompt Expansion] New suffix: {expansion}')
                 t['expansion'] = expansion
-                t['positive'] = copy.deepcopy(t['positive']) + [join_prompts(prompt, expansion)]  # Deep copy.
+                t['positive'] = copy.deepcopy(t['positive']) + [join_prompts(t['prompt'], expansion)]  # Deep copy.
 
         for i, t in enumerate(tasks):
             progressbar(7, f'Encoding base positive #{i + 1} ...')
             t['c'][0] = pipeline.clip_encode(sd=pipeline.xl_base_patched, texts=t['positive'],
-                                             pool_top_k=positive_top_k)
+                                             pool_top_k=t['positive_top_k'])
 
         for i, t in enumerate(tasks):
             progressbar(9, f'Encoding base negative #{i + 1} ...')
             t['uc'][0] = pipeline.clip_encode(sd=pipeline.xl_base_patched, texts=t['negative'],
-                                              pool_top_k=negative_top_k)
+                                              pool_top_k=t['negative_top_k'])
 
         if pipeline.xl_refiner is not None:
             virtual_memory.load_from_virtual_memory(pipeline.xl_refiner.clip.cond_stage_model)
 
             for i, t in enumerate(tasks):
                 progressbar(11, f'Encoding refiner positive #{i + 1} ...')
                 t['c'][1] = pipeline.clip_encode(sd=pipeline.xl_refiner, texts=t['positive'],
-                                                 pool_top_k=positive_top_k)
+                                                 pool_top_k=t['positive_top_k'])
 
             for i, t in enumerate(tasks):
                 progressbar(13, f'Encoding refiner negative #{i + 1} ...')
                 t['uc'][1] = pipeline.clip_encode(sd=pipeline.xl_refiner, texts=t['negative'],
-                                                  pool_top_k=negative_top_k)
+                                                  pool_top_k=t['negative_top_k'])
 
             virtual_memory.try_move_to_virtual_memory(pipeline.xl_refiner.clip.cond_stage_model)
 
@@ -307,6 +311,7 @@ def callback(step, x0, x, total_steps, y):
 
             metadata = {
                 'prompt': raw_prompt, 'negative_prompt': raw_negative_prompt, 'styles': raw_style_selections,
+                'real_prompt': task['positive'], 'real_negative_prompt': task['negative'],
                 'seed': task['task_seed'], 'width': width, 'height': height,
                 'sampler': sampler_name, 'scheduler': scheduler, 'performance': performance,
                 'steps': steps, 'switch': switch, 'sharpness': sharpness, 'cfg': cfg,
@@ -348,6 +353,8 @@ def callback(step, x0, x, total_steps, y):
                     ('Negative Prompt', raw_negative_prompt),
                     ('Fooocus V2 (Prompt Expansion)', task['expansion']),
                     ('Styles', str(raw_style_selections)),
+                    ('Real Prompt', task['positive']),
+                    ('Real Negative Prompt', task['negative']),
                     ('Seed', task['task_seed']),
                     ('Resolution', get_resolution_string(width, height)),
                     ('Performance', (performance, steps, switch)),

modules/path.py

@@ -13,6 +13,7 @@ def load_paths():
     path_vae_approx = '../models/vae_approx/'
     path_fooocus_expansion = '../models/prompt_expansion/fooocus_expansion/'
     path_styles = '../sdxl_styles/'
+    path_wildcards = '../wildcards/'
     path_outputs = '../outputs/'
 
     if exists('paths.json'):
@@ -35,6 +36,8 @@ def load_paths():
                     path_fooocus_expansion = paths_obj['path_fooocus_expansion']
                 if 'path_styles' in paths_obj:
                     path_styles = paths_obj['path_styles']
+                if 'path_wildcards' in paths_obj:
+                    path_wildcards = paths_obj['path_wildcards']
                 if 'path_outputs' in paths_obj:
                     path_outputs = paths_obj['path_outputs']
 
@@ -43,10 +46,10 @@ def load_paths():
             finally:
                 paths_file.close()
 
-    return path_checkpoints, path_loras, path_embeddings, path_clip_vision, path_controlnet, path_vae_approx, path_fooocus_expansion, path_styles, path_outputs
+    return path_checkpoints, path_loras, path_embeddings, path_clip_vision, path_controlnet, path_vae_approx, path_fooocus_expansion, path_styles, path_wildcards, path_outputs
 
 
-path_checkpoints, path_loras, path_embeddings, path_clip_vision, path_controlnet, path_vae_approx, path_fooocus_expansion, path_styles, path_outputs = load_paths()
+path_checkpoints, path_loras, path_embeddings, path_clip_vision, path_controlnet, path_vae_approx, path_fooocus_expansion, path_styles, path_wildcards, path_outputs = load_paths()
 
 modelfile_path = path_checkpoints if os.path.isabs(path_checkpoints) else os.path.abspath(os.path.join(os.path.dirname(__file__), path_checkpoints))
 lorafile_path = path_loras if os.path.isabs(path_loras) else os.path.abspath(os.path.join(os.path.dirname(__file__), path_loras))
@@ -56,6 +59,7 @@ def load_paths():
 vae_approx_path = path_vae_approx if os.path.isabs(path_vae_approx) else os.path.abspath(os.path.join(os.path.dirname(__file__), path_vae_approx))
 fooocus_expansion_path = path_fooocus_expansion if os.path.isabs(path_fooocus_expansion) else os.path.abspath(os.path.join(os.path.dirname(__file__), path_fooocus_expansion))
 styles_path = path_styles if os.path.isabs(path_styles) else os.path.abspath(os.path.join(os.path.dirname(__file__), path_styles))
+wildcards_path = path_wildcards if os.path.isabs(path_wildcards) else os.path.abspath(os.path.join(os.path.dirname(__file__), path_wildcards))
 temp_outputs_path = path_outputs if os.path.isabs(path_outputs) else os.path.abspath(os.path.join(os.path.dirname(__file__), path_outputs))
 
 os.makedirs(temp_outputs_path, exist_ok=True)

modules/sdxl_styles.py

@@ -1,8 +1,10 @@
 import os
 import json
+import re
+import random
 
 from os.path import exists
-from modules.path import styles_path, get_files_from_folder
+from modules.path import styles_path, wildcards_path, get_files_from_folder
 from modules.util import join_prompts
 
 
@@ -84,3 +86,19 @@ def load_styles(filename=None, base_dict=None):
 def apply_style(style, positive):
     p, n = styles[style]
     return p.replace('{prompt}', positive), n
+
+
+
+def apply_wildcards(wildcard_text, seed=None, directory=wildcards_path):
+    placeholders = re.findall(r'__(\w+)__', wildcard_text)
+    for placeholder in placeholders:
+        try:
+            with open(os.path.join(directory, f'{placeholder}.txt')) as f:
+                words = f.read().splitlines()
+                f.close()
+                rng = random.Random(seed)
+                wildcard_text = re.sub(rf'__{placeholder}__', rng.choice(words), wildcard_text)
+        except IOError:
+            print(f'Error: could not open wildcard file {placeholder}.txt, using as normal word.')
+            wildcard_text = wildcard_text.replace(f'__{placeholder}__', placeholder)
+    return wildcard_text

paths-example.json

@@ -7,5 +7,6 @@
     "path_vae_approx": "../models/vae_approx/",
     "path_fooocus_expansion": "../models/prompt_expansion/fooocus_expansion/",
     "path_styles": "../sdxl_styles/",
+    "path_wildcards": "../wildcards/",
     "path_outputs": "../outputs/"
 }

readme.md

@@ -183,6 +183,7 @@ Below things are already inside the software, and **users do not need to do anyt
 25. Starting generation via Ctrl-ENTER hotkey (ported from SD web UI).
 26. Support for loading models from subfolders (ported from RuinedFooocus).
 27. Support for authentication in --share mode (credentials loaded from auth.json - use auth-example.json as a template).
+28. Support for wildcards (ported from RuinedFooocus - put them in wildcards folder, then try prompts like `__color__ sports car` with different seeds).
 
 ## Thanks
 

update_log_mre.md

@@ -1,5 +1,7 @@
 ### 2.0.19 MRE
 
+* Added support for wildcards (ported from RuinedFooocus, adjusted to Fooocus V2).
+* Restored saving information about real prompt in metadata and log file (adjusted to Fooocus V2).
 * Fixed links to log files not working with customized outputs path.
 * Fixed calls to non-existing Comfy functions (vanilla still using old Comfy).
 

wildcards/color.txt

@@ -0,0 +1,17 @@
+aqua
+black
+blue
+fuchsia
+gray
+green
+lime
+maroon
+navy
+olive
+orange
+purple
+red
+silver
+teal
+white
+yellow