Merge branch 'AUTOMATIC1111:master' into deepdanbooru_pre_process

2 files changed, 10 insertions, 2 deletions

diff --git a/scripts/loopback.py b/scripts/loopback.py
index e90b58d4..d8c68af8 100644
--- a/scripts/loopback.py
+++ b/scripts/loopback.py
@@ -38,6 +38,7 @@ class Script(scripts.Script):
 

         grids = []

         all_images = []

+        original_init_image = p.init_images

         state.job_count = loops * batch_count

 

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

@@ -45,6 +46,9 @@ class Script(scripts.Script):
         for n in range(batch_count):

             history = []

 

+            # Reset to original init image at the start of each batch

+            p.init_images = original_init_image

+

             for i in range(loops):

                 p.n_iter = 1

                 p.batch_size = 1

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index 42e1489c..ef431105 100644
--- a/scripts/xy_grid.py
+++ b/scripts/xy_grid.py
@@ -10,7 +10,8 @@ import numpy as np
 import modules.scripts as scripts

 import gradio as gr

 

-from modules import images, hypernetwork

+from modules import images

+from modules.hypernetworks import hypernetwork

 from modules.processing import process_images, Processed, get_correct_sampler

 from modules.shared import opts, cmd_opts, state

 import modules.shared as shared

@@ -27,6 +28,9 @@ def apply_field(field):
 

 

 def apply_prompt(p, x, xs):

+    if xs[0] not in p.prompt and xs[0] not in p.negative_prompt:

+        raise RuntimeError(f"Prompt S/R did not find {xs[0]} in prompt or negative prompt.")

+

     p.prompt = p.prompt.replace(xs[0], x)

     p.negative_prompt = p.negative_prompt.replace(xs[0], x)

 

@@ -193,7 +197,7 @@ class Script(scripts.Script):
             x_values = gr.Textbox(label="X values", visible=False, lines=1)

 

         with gr.Row():

-            y_type = gr.Dropdown(label="Y type", choices=[x.label for x in current_axis_options], value=current_axis_options[4].label, visible=False, type="index", elem_id="y_type")

+            y_type = gr.Dropdown(label="Y type", choices=[x.label for x in current_axis_options], value=current_axis_options[0].label, visible=False, type="index", elem_id="y_type")

             y_values = gr.Textbox(label="Y values", visible=False, lines=1)

         

         draw_legend = gr.Checkbox(label='Draw legend', value=True)