Merge branch 'AUTOMATIC1111:master' into improved-hr-conflict-test

3 files changed, 65 insertions, 32 deletions

diff --git a/scripts/img2imgalt.py b/scripts/img2imgalt.py
index cbdfc6b3..2572443f 100644
--- a/scripts/img2imgalt.py
+++ b/scripts/img2imgalt.py
@@ -6,7 +6,7 @@ from tqdm import trange
 import modules.scripts as scripts

 import gradio as gr

 

-from modules import processing, shared, sd_samplers, prompt_parser

+from modules import processing, shared, sd_samplers, prompt_parser, sd_samplers_common

 from modules.processing import Processed

 from modules.shared import opts, cmd_opts, state

 

@@ -50,7 +50,7 @@ def find_noise_for_image(p, cond, uncond, cfg_scale, steps):
 

         x = x + d * dt

 

-        sd_samplers.store_latent(x)

+        sd_samplers_common.store_latent(x)

 

         # This shouldn't be necessary, but solved some VRAM issues

         del x_in, sigma_in, cond_in, c_out, c_in, t,

@@ -104,7 +104,7 @@ def find_noise_for_image_sigma_adjustment(p, cond, uncond, cfg_scale, steps):
         dt = sigmas[i] - sigmas[i - 1]

         x = x + d * dt

 

-        sd_samplers.store_latent(x)

+        sd_samplers_common.store_latent(x)

 

         # This shouldn't be necessary, but solved some VRAM issues

         del x_in, sigma_in, cond_in, c_out, c_in, t,

diff --git a/scripts/prompt_matrix.py b/scripts/prompt_matrix.py
index dd95e588..3ee3cbe4 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)", min=0, max=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, p.width, p.height, prompt_matrix_parts)

+        grid = images.draw_prompt_matrix(grid, p.width, p.height, prompt_matrix_parts, margin_size)

         processed.images.insert(0, grid)

         processed.index_of_first_image = 1

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

diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index 3df40483..5982cfba 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -205,7 +205,7 @@ axis_options = [
 ]

 

 

-def draw_xyz_grid(p, xs, ys, zs, x_labels, y_labels, z_labels, cell, draw_legend, include_lone_images, include_sub_grids, first_axes_processed, second_axes_processed):

+def draw_xyz_grid(p, xs, ys, zs, x_labels, y_labels, z_labels, cell, draw_legend, include_lone_images, include_sub_grids, first_axes_processed, second_axes_processed, margin_size):

     hor_texts = [[images.GridAnnotation(x)] for x in x_labels]

     ver_texts = [[images.GridAnnotation(y)] for y in y_labels]

     title_texts = [[images.GridAnnotation(z)] for z in z_labels]

@@ -286,23 +286,24 @@ def draw_xyz_grid(p, xs, ys, zs, x_labels, y_labels, z_labels, cell, draw_legend
         print("Unexpected error: draw_xyz_grid failed to return even a single processed image")

         return Processed(p, [])

 

-    grids = [None] * len(zs)

+    sub_grids = [None] * len(zs)

     for i in range(len(zs)):

         start_index = i * len(xs) * len(ys)

         end_index = start_index + len(xs) * len(ys)

         grid = images.image_grid(image_cache[start_index:end_index], rows=len(ys))

         if draw_legend:

-            grid = images.draw_grid_annotations(grid, cell_size[0], cell_size[1], hor_texts, ver_texts)

-        

-        grids[i] = grid        

+            grid = images.draw_grid_annotations(grid, cell_size[0], cell_size[1], hor_texts, ver_texts, margin_size)

+        sub_grids[i] = grid

         if include_sub_grids and len(zs) > 1:

             processed_result.images.insert(i+1, grid)

 

-    original_grid_size = grids[0].size

-    grids = images.image_grid(grids, rows=1)

-    processed_result.images[0] = images.draw_grid_annotations(grids, original_grid_size[0], original_grid_size[1], title_texts, [[images.GridAnnotation()]])

+    sub_grid_size = sub_grids[0].size

+    z_grid = images.image_grid(sub_grids, rows=1)

+    if draw_legend:

+        z_grid = images.draw_grid_annotations(z_grid, sub_grid_size[0], sub_grid_size[1], title_texts, [[images.GridAnnotation()]])

+    processed_result.images[0] = z_grid

 

-    return processed_result

+    return processed_result, sub_grids

 

 

 class SharedSettingsStackHelper(object):

@@ -350,10 +351,16 @@ class Script(scripts.Script):
                     fill_z_button = ToolButton(value=fill_values_symbol, elem_id="xyz_grid_fill_z_tool_button", visible=False)

 

         with gr.Row(variant="compact", elem_id="axis_options"):

-            draw_legend = gr.Checkbox(label='Draw legend', value=True, elem_id=self.elem_id("draw_legend"))

-            include_lone_images = gr.Checkbox(label='Include Sub Images', value=False, elem_id=self.elem_id("include_lone_images"))

-            include_sub_grids = gr.Checkbox(label='Include Sub Grids', value=False, elem_id=self.elem_id("include_sub_grids"))

-            no_fixed_seeds = gr.Checkbox(label='Keep -1 for seeds', value=False, elem_id=self.elem_id("no_fixed_seeds"))

+            with gr.Column():

+                draw_legend = gr.Checkbox(label='Draw legend', value=True, elem_id=self.elem_id("draw_legend"))

+                no_fixed_seeds = gr.Checkbox(label='Keep -1 for seeds', value=False, elem_id=self.elem_id("no_fixed_seeds"))

+            with gr.Column():

+                include_lone_images = gr.Checkbox(label='Include Sub Images', value=False, elem_id=self.elem_id("include_lone_images"))

+                include_sub_grids = gr.Checkbox(label='Include Sub Grids', value=False, elem_id=self.elem_id("include_sub_grids"))

+            with gr.Column():

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

+        

+        with gr.Row(variant="compact", elem_id="swap_axes"):

             swap_xy_axes_button = gr.Button(value="Swap X/Y axes", elem_id="xy_grid_swap_axes_button")

             swap_yz_axes_button = gr.Button(value="Swap Y/Z axes", elem_id="yz_grid_swap_axes_button")

             swap_xz_axes_button = gr.Button(value="Swap X/Z axes", elem_id="xz_grid_swap_axes_button")

@@ -392,9 +399,9 @@ class Script(scripts.Script):
             (z_values, "Z Values"),

         )

 

-        return [x_type, x_values, y_type, y_values, z_type, z_values, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds]

+        return [x_type, x_values, y_type, y_values, z_type, z_values, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds, margin_size]

 

-    def run(self, p, x_type, x_values, y_type, y_values, z_type, z_values, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds):

+    def run(self, p, x_type, x_values, y_type, y_values, z_type, z_values, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds, margin_size):

         if not no_fixed_seeds:

             modules.processing.fix_seed(p)

 

@@ -576,7 +583,7 @@ class Script(scripts.Script):
             return res

 

         with SharedSettingsStackHelper():

-            processed = draw_xyz_grid(

+            processed, sub_grids = draw_xyz_grid(

                 p,

                 xs=xs,

                 ys=ys,

@@ -589,9 +596,14 @@ class Script(scripts.Script):
                 include_lone_images=include_lone_images,

                 include_sub_grids=include_sub_grids,

                 first_axes_processed=first_axes_processed,

-                second_axes_processed=second_axes_processed

+                second_axes_processed=second_axes_processed,

+                margin_size=margin_size

             )

 

+        if opts.grid_save and len(sub_grids) > 1:

+            for sub_grid in sub_grids:

+                images.save_image(sub_grid, p.outpath_grids, "xyz_grid", info=grid_infotext[0], extension=opts.grid_format, prompt=p.prompt, seed=processed.seed, grid=True, p=p)

+

         if opts.grid_save:

             images.save_image(processed.images[0], p.outpath_grids, "xyz_grid", info=grid_infotext[0], extension=opts.grid_format, prompt=p.prompt, seed=processed.seed, grid=True, p=p)