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

3 files changed, 26 insertions, 6 deletions

diff --git a/scripts/loopback.py b/scripts/loopback.py
index 1dab9476..ec1f85e5 100644
--- a/scripts/loopback.py
+++ b/scripts/loopback.py
@@ -8,6 +8,7 @@ from modules import processing, shared, sd_samplers, images
 from modules.processing import Processed

 from modules.sd_samplers import samplers

 from modules.shared import opts, cmd_opts, state

+from modules import deepbooru

 

 

 class Script(scripts.Script):

@@ -20,10 +21,11 @@ class Script(scripts.Script):
     def ui(self, is_img2img):        

         loops = gr.Slider(minimum=1, maximum=32, step=1, label='Loops', value=4, elem_id=self.elem_id("loops"))

         denoising_strength_change_factor = gr.Slider(minimum=0.9, maximum=1.1, step=0.01, label='Denoising strength change factor', value=1, elem_id=self.elem_id("denoising_strength_change_factor"))

+        append_interrogation = gr.Dropdown(label="Append interrogated prompt at each iteration", choices=["None", "CLIP", "DeepBooru"], value="None")

 

-        return [loops, denoising_strength_change_factor]

+        return [loops, denoising_strength_change_factor, append_interrogation]

 

-    def run(self, p, loops, denoising_strength_change_factor):

+    def run(self, p, loops, denoising_strength_change_factor, append_interrogation):

         processing.fix_seed(p)

         batch_count = p.n_iter

         p.extra_generation_params = {

@@ -40,6 +42,7 @@ class Script(scripts.Script):
         grids = []

         all_images = []

         original_init_image = p.init_images

+        original_prompt = p.prompt

         state.job_count = loops * batch_count

 

         initial_color_corrections = [processing.setup_color_correction(p.init_images[0])]

@@ -58,6 +61,13 @@ class Script(scripts.Script):
                 if opts.img2img_color_correction:

                     p.color_corrections = initial_color_corrections

 

+                if append_interrogation != "None":

+                    p.prompt = original_prompt + ", " if original_prompt != "" else ""

+                    if append_interrogation == "CLIP":

+                        p.prompt += shared.interrogator.interrogate(p.init_images[0])

+                    elif append_interrogation == "DeepBooru":

+                        p.prompt += deepbooru.model.tag(p.init_images[0])

+

                 state.job = f"Iteration {i + 1}/{loops}, batch {n + 1}/{batch_count}"

 

                 processed = processing.process_images(p)

diff --git a/scripts/prompt_matrix.py b/scripts/prompt_matrix.py
index 3ee3cbe4..b1c486d4 100644
--- a/scripts/prompt_matrix.py
+++ b/scripts/prompt_matrix.py
@@ -54,7 +54,7 @@ class Script(scripts.Script):
                 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"))

+                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]

 

@@ -99,8 +99,8 @@ class Script(scripts.Script):
         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, margin_size)

+        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, 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 5982cfba..53511b12 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -25,6 +25,8 @@ from modules.ui_components import ToolButton
 

 fill_values_symbol = "\U0001f4d2"  # 📒

 

+AxisInfo = namedtuple('AxisInfo', ['axis', 'values'])

+

 

 def apply_field(field):

     def fun(p, x, xs):

@@ -186,6 +188,7 @@ axis_options = [
     AxisOption("Steps", int, apply_field("steps")),

     AxisOptionTxt2Img("Hires steps", int, apply_field("hr_second_pass_steps")),

     AxisOption("CFG Scale", float, apply_field("cfg_scale")),

+    AxisOptionImg2Img("Image CFG Scale", float, apply_field("image_cfg_scale")),

     AxisOption("Prompt S/R", str, apply_prompt, format_value=format_value),

     AxisOption("Prompt order", str_permutations, apply_order, format_value=format_value_join_list),

     AxisOptionTxt2Img("Sampler", str, apply_sampler, format_value=format_value, confirm=confirm_samplers, choices=lambda: [x.name for x in sd_samplers.samplers]),

@@ -241,6 +244,9 @@ def draw_xyz_grid(p, xs, ys, zs, x_labels, y_labels, z_labels, cell, draw_legend
                 cell_mode = processed_image.mode

                 cell_size = processed_image.size

                 processed_result.images = [Image.new(cell_mode, cell_size)]

+                processed_result.all_prompts = [processed.prompt]

+                processed_result.all_seeds = [processed.seed]

+                processed_result.infotexts = [processed.infotexts[0]]

 

             image_cache[index(ix, iy, iz)] = processed_image

             if include_lone_images:

@@ -358,7 +364,7 @@ class Script(scripts.Script):
                 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"))

+                margin_size = gr.Slider(label="Grid margins (px)", minimum=0, maximum=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")

@@ -520,6 +526,10 @@ class Script(scripts.Script):
 

         grid_infotext = [None]

 

+        state.xyz_plot_x = AxisInfo(x_opt, xs)

+        state.xyz_plot_y = AxisInfo(y_opt, ys)

+        state.xyz_plot_z = AxisInfo(z_opt, zs)

+

         # If one of the axes is very slow to change between (like SD model

         # checkpoint), then make sure it is in the outer iteration of the nested

         # `for` loop.