Merge pull request #10067 from dongweiming/x-y-z-plot

Add extra `None` option for VAE

1 files changed, 5 insertions, 5 deletions

diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index cfc7737b..01d97791 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")

@@ -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)