added a second style field

added the ability to use {prompt} in styles
added a button to apply style to textbox
rearranged top row for UI

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/processing.py b/modules/processing.py
index ca32c610..38e74fe2 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -46,14 +46,14 @@ def apply_color_correction(correction, image):
 

 

 class StableDiffusionProcessing:

-    def __init__(self, sd_model=None, outpath_samples=None, outpath_grids=None, prompt="", prompt_style="None", seed=-1, subseed=-1, subseed_strength=0, seed_resize_from_h=-1, seed_resize_from_w=-1, sampler_index=0, batch_size=1, n_iter=1, steps=50, cfg_scale=7.0, width=512, height=512, restore_faces=False, tiling=False, do_not_save_samples=False, do_not_save_grid=False, extra_generation_params=None, overlay_images=None, negative_prompt=None):

+    def __init__(self, sd_model=None, outpath_samples=None, outpath_grids=None, prompt="", styles=None, seed=-1, subseed=-1, subseed_strength=0, seed_resize_from_h=-1, seed_resize_from_w=-1, sampler_index=0, batch_size=1, n_iter=1, steps=50, cfg_scale=7.0, width=512, height=512, restore_faces=False, tiling=False, do_not_save_samples=False, do_not_save_grid=False, extra_generation_params=None, overlay_images=None, negative_prompt=None):

         self.sd_model = sd_model

         self.outpath_samples: str = outpath_samples

         self.outpath_grids: str = outpath_grids

         self.prompt: str = prompt

         self.prompt_for_display: str = None

         self.negative_prompt: str = (negative_prompt or "")

-        self.prompt_style: str = prompt_style

+        self.styles: str = styles

         self.seed: int = seed

         self.subseed: int = subseed

         self.subseed_strength: float = subseed_strength

@@ -182,7 +182,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
 

     comments = []

 

-    modules.styles.apply_style(p, shared.prompt_styles[p.prompt_style])

+    shared.prompt_styles.apply_styles(p)

 

     if type(p.prompt) == list:

         all_prompts = p.prompt