Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui

7 files changed, 19 insertions, 19 deletions

diff --git a/scripts/custom_code.py b/scripts/custom_code.py
index a9b10c09..22e7b77a 100644
--- a/scripts/custom_code.py
+++ b/scripts/custom_code.py
@@ -14,7 +14,7 @@ class Script(scripts.Script):
         return cmd_opts.allow_code

 

     def ui(self, is_img2img):

-        code = gr.Textbox(label="Python code", visible=False, lines=1)

+        code = gr.Textbox(label="Python code", lines=1)

 

         return [code]

 

diff --git a/scripts/img2imgalt.py b/scripts/img2imgalt.py
index 88abc093..964b75c7 100644
--- a/scripts/img2imgalt.py
+++ b/scripts/img2imgalt.py
@@ -166,8 +166,7 @@ class Script(scripts.Script):
         if override_strength:

             p.denoising_strength = 1.0

 

-

-        def sample_extra(conditioning, unconditional_conditioning, seeds, subseeds, subseed_strength):

+        def sample_extra(conditioning, unconditional_conditioning, seeds, subseeds, subseed_strength, prompts):

             lat = (p.init_latent.cpu().numpy() * 10).astype(int)

 

             same_params = self.cache is not None and self.cache.cfg_scale == cfg and self.cache.steps == st \

diff --git a/scripts/outpainting_mk_2.py b/scripts/outpainting_mk_2.py
index 2afd4aa5..cf71cb92 100644
--- a/scripts/outpainting_mk_2.py
+++ b/scripts/outpainting_mk_2.py
@@ -132,7 +132,7 @@ class Script(scripts.Script):
         info = gr.HTML("<p style=\"margin-bottom:0.75em\">Recommended settings: Sampling Steps: 80-100, Sampler: Euler a, Denoising strength: 0.8</p>")

 

         pixels = gr.Slider(label="Pixels to expand", minimum=8, maximum=256, step=8, value=128)

-        mask_blur = gr.Slider(label='Mask blur', minimum=0, maximum=64, step=1, value=8, visible=False)

+        mask_blur = gr.Slider(label='Mask blur', minimum=0, maximum=64, step=1, value=8)

         direction = gr.CheckboxGroup(label="Outpainting direction", choices=['left', 'right', 'up', 'down'], value=['left', 'right', 'up', 'down'])

         noise_q = gr.Slider(label="Fall-off exponent (lower=higher detail)", minimum=0.0, maximum=4.0, step=0.01, value=1.0)

         color_variation = gr.Slider(label="Color variation", minimum=0.0, maximum=1.0, step=0.01, value=0.05)

diff --git a/scripts/poor_mans_outpainting.py b/scripts/poor_mans_outpainting.py
index b0469110..ea45beb0 100644
--- a/scripts/poor_mans_outpainting.py
+++ b/scripts/poor_mans_outpainting.py
@@ -22,8 +22,8 @@ class Script(scripts.Script):
             return None

 

         pixels = gr.Slider(label="Pixels to expand", minimum=8, maximum=256, step=8, value=128)

-        mask_blur = gr.Slider(label='Mask blur', minimum=0, maximum=64, step=1, value=4, visible=False)

-        inpainting_fill = gr.Radio(label='Masked content', choices=['fill', 'original', 'latent noise', 'latent nothing'], value='fill', type="index", visible=False)

+        mask_blur = gr.Slider(label='Mask blur', minimum=0, maximum=64, step=1, value=4)

+        inpainting_fill = gr.Radio(label='Masked content', choices=['fill', 'original', 'latent noise', 'latent nothing'], value='fill', type="index")

         direction = gr.CheckboxGroup(label="Outpainting direction", choices=['left', 'right', 'up', 'down'], value=['left', 'right', 'up', 'down'])

 

         return [pixels, mask_blur, inpainting_fill, direction]

diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py
index 1be22960..3388bc77 100644
--- a/scripts/prompts_from_file.py
+++ b/scripts/prompts_from_file.py
@@ -83,19 +83,21 @@ def cmdargs(line):
 

 

 def load_prompt_file(file):

-    if (file is None):

+    if file is None:

         lines = []

     else:

         lines = [x.strip() for x in file.decode('utf8', errors='ignore').split("\n")]

 

     return None, "\n".join(lines), gr.update(lines=7)

 

+

 class Script(scripts.Script):

     def title(self):

         return "Prompts from file or textbox"

 

     def ui(self, is_img2img):

         checkbox_iterate = gr.Checkbox(label="Iterate seed every line", value=False)

+        checkbox_iterate_batch = gr.Checkbox(label="Use same random seed for all lines", value=False)

 

         prompt_txt = gr.Textbox(label="List of prompt inputs", lines=1)

         file = gr.File(label="Upload prompt inputs", type='bytes')

@@ -106,9 +108,9 @@ class Script(scripts.Script):
         # We don't shrink back to 1, because that causes the control to ignore [enter], and it may

         # be unclear to the user that shift-enter is needed.

         prompt_txt.change(lambda tb: gr.update(lines=7) if ("\n" in tb) else gr.update(lines=2), inputs=[prompt_txt], outputs=[prompt_txt])

-        return [checkbox_iterate, file, prompt_txt]

+        return [checkbox_iterate, checkbox_iterate_batch, prompt_txt]

 

-    def run(self, p, checkbox_iterate, file, prompt_txt: str):

+    def run(self, p, checkbox_iterate, checkbox_iterate_batch, prompt_txt: str):

         lines = [x.strip() for x in prompt_txt.splitlines()]

         lines = [x for x in lines if len(x) > 0]

 

@@ -137,7 +139,7 @@ class Script(scripts.Script):
             jobs.append(args)

 

         print(f"Will process {len(lines)} lines in {job_count} jobs.")

-        if (checkbox_iterate and p.seed == -1):

+        if (checkbox_iterate or checkbox_iterate_batch) and p.seed == -1:

             p.seed = int(random.randrange(4294967294))

 

         state.job_count = job_count

@@ -153,8 +155,7 @@ class Script(scripts.Script):
             proc = process_images(copy_p)

             images += proc.images

             

-            if (checkbox_iterate):

+            if checkbox_iterate:

                 p.seed = p.seed + (p.batch_size * p.n_iter)

 

-

-        return Processed(p, images, p.seed, "")
\ No newline at end of file
+        return Processed(p, images, p.seed, "")

diff --git a/scripts/sd_upscale.py b/scripts/sd_upscale.py
index cb37ff7e..01074291 100644
--- a/scripts/sd_upscale.py
+++ b/scripts/sd_upscale.py
@@ -18,8 +18,8 @@ class Script(scripts.Script):
 

     def ui(self, is_img2img):

         info = gr.HTML("<p style=\"margin-bottom:0.75em\">Will upscale the image to twice the dimensions; use width and height sliders to set tile size</p>")

-        overlap = gr.Slider(minimum=0, maximum=256, step=16, label='Tile overlap', value=64, visible=False)

-        upscaler_index = gr.Radio(label='Upscaler', choices=[x.name for x in shared.sd_upscalers], value=shared.sd_upscalers[0].name, type="index", visible=False)

+        overlap = gr.Slider(minimum=0, maximum=256, step=16, label='Tile overlap', value=64)

+        upscaler_index = gr.Radio(label='Upscaler', choices=[x.name for x in shared.sd_upscalers], value=shared.sd_upscalers[0].name, type="index")

 

         return [info, overlap, upscaler_index]

 

diff --git a/scripts/xy_grid.py b/scripts/xy_grid.py
index f5255786..417ed0d4 100644
--- a/scripts/xy_grid.py
+++ b/scripts/xy_grid.py
@@ -263,12 +263,12 @@ class Script(scripts.Script):
         current_axis_options = [x for x in axis_options if type(x) == AxisOption or type(x) == AxisOptionImg2Img and is_img2img]

 

         with gr.Row():

-            x_type = gr.Dropdown(label="X type", choices=[x.label for x in current_axis_options], value=current_axis_options[1].label, visible=False, type="index", elem_id="x_type")

-            x_values = gr.Textbox(label="X values", visible=False, lines=1)

+            x_type = gr.Dropdown(label="X type", choices=[x.label for x in current_axis_options], value=current_axis_options[1].label, type="index", elem_id="x_type")

+            x_values = gr.Textbox(label="X values", 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[0].label, visible=False, type="index", elem_id="y_type")

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

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

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

         

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

         include_lone_images = gr.Checkbox(label='Include Separate Images', value=False)