Merge branch 'master' into 6866-fix-hires-prompt-matrix

1 files changed, 33 insertions, 12 deletions

diff --git a/scripts/prompt_matrix.py b/scripts/prompt_matrix.py
index 50c7f3cb..b1c486d4 100644
--- a/scripts/prompt_matrix.py
+++ b/scripts/prompt_matrix.py
@@ -44,16 +44,34 @@ class Script(scripts.Script):
     def title(self):

         return "Prompt matrix"

 

-    def ui(self, is_img2img):        

-        put_at_start = gr.Checkbox(label='Put variable parts at start of prompt', value=False, elem_id=self.elem_id("put_at_start"))

-        different_seeds = gr.Checkbox(label='Use different seed for each picture', value=False, elem_id=self.elem_id("different_seeds"))

-

-        return [put_at_start, different_seeds]

-

-    def run(self, p, put_at_start, different_seeds):

+    def ui(self, is_img2img):

+        gr.HTML('<br />')

+        with gr.Row():

+            with gr.Column():

+                put_at_start = gr.Checkbox(label='Put variable parts at start of prompt', value=False, elem_id=self.elem_id("put_at_start"))

+                different_seeds = gr.Checkbox(label='Use different seed for each picture', value=False, elem_id=self.elem_id("different_seeds"))

+            with gr.Column():

+                prompt_type = gr.Radio(["positive", "negative"], label="Select prompt", elem_id=self.elem_id("prompt_type"), value="positive")

+                variations_delimiter = gr.Radio(["comma", "space"], label="Select joining char", elem_id=self.elem_id("variations_delimiter"), value="comma")

+            with gr.Column():

+                margin_size = gr.Slider(label="Grid margins (px)", minimum=0, maximum=500, value=0, step=2, elem_id=self.elem_id("margin_size"))

+

+        return [put_at_start, different_seeds, prompt_type, variations_delimiter, margin_size]

+

+    def run(self, p, put_at_start, different_seeds, prompt_type, variations_delimiter, margin_size):

         modules.processing.fix_seed(p)

+        # Raise error if promp type is not positive or negative

+        if prompt_type not in ["positive", "negative"]:

+            raise ValueError(f"Unknown prompt type {prompt_type}")

+        # Raise error if variations delimiter is not comma or space

+        if variations_delimiter not in ["comma", "space"]:

+            raise ValueError(f"Unknown variations delimiter {variations_delimiter}")

+

+        prompt = p.prompt if prompt_type == "positive" else p.negative_prompt

+        original_prompt = prompt[0] if type(prompt) == list else prompt

+        positive_prompt = p.prompt[0] if type(p.prompt) == list else p.prompt

 

-        original_prompt = p.prompt[0] if type(p.prompt) == list else p.prompt

+        delimiter = ", " if variations_delimiter == "comma" else " "

 

         all_prompts = []

         prompt_matrix_parts = original_prompt.split("|")

@@ -66,20 +84,23 @@ class Script(scripts.Script):
             else:

                 selected_prompts = [prompt_matrix_parts[0]] + selected_prompts

 

-            all_prompts.append(", ".join(selected_prompts))

+            all_prompts.append(delimiter.join(selected_prompts))

 

         p.n_iter = math.ceil(len(all_prompts) / p.batch_size)

         p.do_not_save_grid = True

 

         print(f"Prompt matrix will create {len(all_prompts)} images using a total of {p.n_iter} batches.")

 

-        p.prompt = all_prompts

+        if prompt_type == "positive":

+            p.prompt = all_prompts

+        else:

+            p.negative_prompt = all_prompts

         p.seed = [p.seed + (i if different_seeds else 0) for i in range(len(all_prompts))]

-        p.prompt_for_display = original_prompt

+        p.prompt_for_display = positive_prompt

         processed = process_images(p)

 

         grid = images.image_grid(processed.images, p.batch_size, rows=1 << ((len(prompt_matrix_parts) - 1) // 2)) 

-        grid = images.draw_prompt_matrix(grid, processed.images[0].width, processed.images[1].height, prompt_matrix_parts)

+        grid = images.draw_prompt_matrix(grid, processed.images[0].width, processed.images[1].height, prompt_matrix_parts, margin_size)

         processed.images.insert(0, grid)

         processed.index_of_first_image = 1

         processed.infotexts.insert(0, processed.infotexts[0])