Merge branch 'release_candidate'

4 files changed, 13 insertions, 14 deletions

diff --git a/scripts/custom_code.py b/scripts/custom_code.py
index 4071d86d..f36a3675 100644
--- a/scripts/custom_code.py
+++ b/scripts/custom_code.py
@@ -77,7 +77,7 @@ return process_images(p)
         module.display = display

 

         indent = " " * indent_level

-        indented = code.replace('\n', '\n' + indent)

+        indented = code.replace('\n', f"\n{indent}")

         body = f"""def __webuitemp__():

 {indent}{indented}

 __webuitemp__()"""

diff --git a/scripts/loopback.py b/scripts/loopback.py
index d3065fe6..ad6609be 100644
--- a/scripts/loopback.py
+++ b/scripts/loopback.py
@@ -84,7 +84,7 @@ class Script(scripts.Script):
                     p.color_corrections = initial_color_corrections

 

                 if append_interrogation != "None":

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

+                    p.prompt = f"{original_prompt}, " if original_prompt else ""

                     if append_interrogation == "CLIP":

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

                     elif append_interrogation == "DeepBooru":

diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py
index 76dc5778..f168389c 100644
--- a/scripts/prompts_from_file.py
+++ b/scripts/prompts_from_file.py
@@ -100,30 +100,29 @@ def cmdargs(line):
 

 def load_prompt_file(file):

     if file is None:

-        lines = []

+        return None, gr.update(), gr.update(lines=7)

     else:

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

-

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

+        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):       

+    def ui(self, is_img2img):

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

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

 

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

         file = gr.File(label="Upload prompt inputs", type='binary', elem_id=self.elem_id("file"))

 

-        file.change(fn=load_prompt_file, inputs=[file], outputs=[file, prompt_txt, prompt_txt])

+        file.change(fn=load_prompt_file, inputs=[file], outputs=[file, prompt_txt, prompt_txt], show_progress=False)

 

         # We start at one line. When the text changes, we jump to seven lines, or two lines if no \n.

         # 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])

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

         return [checkbox_iterate, checkbox_iterate_batch, prompt_txt]

 

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

diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index cfc7737b..a725d74a 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -222,7 +222,7 @@ axis_options = [
     AxisOption("Denoising", float, apply_field("denoising_strength")),

     AxisOptionTxt2Img("Hires upscaler", str, apply_field("hr_upscaler"), choices=lambda: [*shared.latent_upscale_modes, *[x.name for x in shared.sd_upscalers]]),

     AxisOptionImg2Img("Cond. Image Mask Weight", float, apply_field("inpainting_mask_weight")),

-    AxisOption("VAE", str, apply_vae, cost=0.7, choices=lambda: list(sd_vae.vae_dict)),

+    AxisOption("VAE", str, apply_vae, cost=0.7, choices=lambda: ['None'] + list(sd_vae.vae_dict)),

     AxisOption("Styles", str, apply_styles, choices=lambda: list(shared.prompt_styles.styles)),

     AxisOption("UniPC Order", int, apply_uni_pc_order, cost=0.5),

     AxisOption("Face restore", str, apply_face_restore, format_value=format_value),

@@ -346,7 +346,7 @@ class SharedSettingsStackHelper(object):
         self.CLIP_stop_at_last_layers = opts.CLIP_stop_at_last_layers

         self.vae = opts.sd_vae

         self.uni_pc_order = opts.uni_pc_order

-  

+

     def __exit__(self, exc_type, exc_value, tb):

         opts.data["sd_vae"] = self.vae

         opts.data["uni_pc_order"] = self.uni_pc_order

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

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

@@ -439,7 +439,7 @@ class Script(scripts.Script):
         z_type.change(fn=select_axis, inputs=[z_type,z_values_dropdown], outputs=[fill_z_button,z_values,z_values_dropdown])

 

         def get_dropdown_update_from_params(axis,params):

-            val_key = axis + " Values"

+            val_key = f"{axis} Values"

             vals = params.get(val_key,"")

             valslist = [x.strip() for x in chain.from_iterable(csv.reader(StringIO(vals))) if x]

             return gr.update(value = valslist)

@@ -490,7 +490,7 @@ class Script(scripts.Script):
                         start = int(mc.group(1))

                         end   = int(mc.group(2))

                         num   = int(mc.group(3)) if mc.group(3) is not None else 1

-                        

+

                         valslist_ext += [int(x) for x in np.linspace(start=start, stop=end, num=num).tolist()]

                     else:

                         valslist_ext.append(val)

@@ -512,7 +512,7 @@ class Script(scripts.Script):
                         start = float(mc.group(1))

                         end   = float(mc.group(2))

                         num   = int(mc.group(3)) if mc.group(3) is not None else 1

-                        

+

                         valslist_ext += np.linspace(start=start, stop=end, num=num).tolist()

                     else:

                         valslist_ext.append(val)