Merge branch 'experimental' into subpath-support

1 files changed, 56 insertions, 26 deletions

diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index 3895a795..cfc7737b 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -86,7 +86,7 @@ def apply_checkpoint(p, x, xs):
     info = modules.sd_models.get_closet_checkpoint_match(x)

     if info is None:

         raise RuntimeError(f"Unknown checkpoint: {x}")

-    modules.sd_models.reload_model_weights(shared.sd_model, info)

+    p.override_settings['sd_model_checkpoint'] = info.hash

 

 

 def confirm_checkpoints(p, xs):

@@ -211,7 +211,8 @@ axis_options = [
     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]),

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

-    AxisOption("Checkpoint name", str, apply_checkpoint, format_value=format_value, confirm=confirm_checkpoints, cost=1.0, choices=lambda: list(sd_models.checkpoints_list)),

+    AxisOption("Checkpoint name", str, apply_checkpoint, format_value=format_value, confirm=confirm_checkpoints, cost=1.0, choices=lambda: sorted(sd_models.checkpoints_list, key=str.casefold)),

+    AxisOption("Negative Guidance minimum sigma", float, apply_field("s_min_uncond")),

     AxisOption("Sigma Churn", float, apply_field("s_churn")),

     AxisOption("Sigma min", float, apply_field("s_tmin")),

     AxisOption("Sigma max", float, apply_field("s_tmax")),

@@ -374,16 +375,19 @@ class Script(scripts.Script):
                 with gr.Row():

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

                     x_values = gr.Textbox(label="X values", lines=1, elem_id=self.elem_id("x_values"))

+                    x_values_dropdown = gr.Dropdown(label="X values",visible=False,multiselect=True,interactive=True)

                     fill_x_button = ToolButton(value=fill_values_symbol, elem_id="xyz_grid_fill_x_tool_button", visible=False)

 

                 with gr.Row():

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

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

+                    y_values_dropdown = gr.Dropdown(label="Y values",visible=False,multiselect=True,interactive=True)

                     fill_y_button = ToolButton(value=fill_values_symbol, elem_id="xyz_grid_fill_y_tool_button", visible=False)

 

                 with gr.Row():

                     z_type = gr.Dropdown(label="Z type", choices=[x.label for x in self.current_axis_options], value=self.current_axis_options[0].label, type="index", elem_id=self.elem_id("z_type"))

                     z_values = gr.Textbox(label="Z values", lines=1, elem_id=self.elem_id("z_values"))

+                    z_values_dropdown = gr.Dropdown(label="Z values",visible=False,multiselect=True,interactive=True)

                     fill_z_button = ToolButton(value=fill_values_symbol, elem_id="xyz_grid_fill_z_tool_button", visible=False)

 

         with gr.Row(variant="compact", elem_id="axis_options"):

@@ -401,54 +405,74 @@ class Script(scripts.Script):
             swap_yz_axes_button = gr.Button(value="Swap Y/Z axes", elem_id="yz_grid_swap_axes_button")

             swap_xz_axes_button = gr.Button(value="Swap X/Z axes", elem_id="xz_grid_swap_axes_button")

 

-        def swap_axes(axis1_type, axis1_values, axis2_type, axis2_values):

-            return self.current_axis_options[axis2_type].label, axis2_values, self.current_axis_options[axis1_type].label, axis1_values

+        def swap_axes(axis1_type, axis1_values, axis1_values_dropdown, axis2_type, axis2_values, axis2_values_dropdown):

+            return self.current_axis_options[axis2_type].label, axis2_values, axis2_values_dropdown, self.current_axis_options[axis1_type].label, axis1_values, axis1_values_dropdown

 

-        xy_swap_args = [x_type, x_values, y_type, y_values]

+        xy_swap_args = [x_type, x_values, x_values_dropdown, y_type, y_values, y_values_dropdown]

         swap_xy_axes_button.click(swap_axes, inputs=xy_swap_args, outputs=xy_swap_args)

-        yz_swap_args = [y_type, y_values, z_type, z_values]

+        yz_swap_args = [y_type, y_values, y_values_dropdown, z_type, z_values, z_values_dropdown]

         swap_yz_axes_button.click(swap_axes, inputs=yz_swap_args, outputs=yz_swap_args)

-        xz_swap_args = [x_type, x_values, z_type, z_values]

+        xz_swap_args = [x_type, x_values, x_values_dropdown, z_type, z_values, z_values_dropdown]

         swap_xz_axes_button.click(swap_axes, inputs=xz_swap_args, outputs=xz_swap_args)

 

         def fill(x_type):

             axis = self.current_axis_options[x_type]

-            return ", ".join(axis.choices()) if axis.choices else gr.update()

-

-        fill_x_button.click(fn=fill, inputs=[x_type], outputs=[x_values])

-        fill_y_button.click(fn=fill, inputs=[y_type], outputs=[y_values])

-        fill_z_button.click(fn=fill, inputs=[z_type], outputs=[z_values])

-

-        def select_axis(x_type):

-            return gr.Button.update(visible=self.current_axis_options[x_type].choices is not None)

-

-        x_type.change(fn=select_axis, inputs=[x_type], outputs=[fill_x_button])

-        y_type.change(fn=select_axis, inputs=[y_type], outputs=[fill_y_button])

-        z_type.change(fn=select_axis, inputs=[z_type], outputs=[fill_z_button])

+            return axis.choices() if axis.choices else gr.update()

+

+        fill_x_button.click(fn=fill, inputs=[x_type], outputs=[x_values_dropdown])

+        fill_y_button.click(fn=fill, inputs=[y_type], outputs=[y_values_dropdown])

+        fill_z_button.click(fn=fill, inputs=[z_type], outputs=[z_values_dropdown])

+

+        def select_axis(axis_type,axis_values_dropdown):

+            choices = self.current_axis_options[axis_type].choices

+            has_choices = choices is not None

+            current_values = axis_values_dropdown

+            if has_choices:

+                choices = choices()

+                if isinstance(current_values,str):

+                    current_values = current_values.split(",")

+                current_values = list(filter(lambda x: x in choices, current_values))

+            return gr.Button.update(visible=has_choices),gr.Textbox.update(visible=not has_choices),gr.update(choices=choices if has_choices else None,visible=has_choices,value=current_values)

+

+        x_type.change(fn=select_axis, inputs=[x_type,x_values_dropdown], outputs=[fill_x_button,x_values,x_values_dropdown])

+        y_type.change(fn=select_axis, inputs=[y_type,y_values_dropdown], outputs=[fill_y_button,y_values,y_values_dropdown])

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

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

 

         self.infotext_fields = (

             (x_type, "X Type"),

             (x_values, "X Values"),

+            (x_values_dropdown, lambda params:get_dropdown_update_from_params("X",params)),

             (y_type, "Y Type"),

             (y_values, "Y Values"),

+            (y_values_dropdown, lambda params:get_dropdown_update_from_params("Y",params)),

             (z_type, "Z Type"),

             (z_values, "Z Values"),

+            (z_values_dropdown, lambda params:get_dropdown_update_from_params("Z",params)),

         )

 

-        return [x_type, x_values, y_type, y_values, z_type, z_values, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds, margin_size]

+        return [x_type, x_values, x_values_dropdown, y_type, y_values, y_values_dropdown, z_type, z_values, z_values_dropdown, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds, margin_size]

 

-    def run(self, p, x_type, x_values, y_type, y_values, z_type, z_values, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds, margin_size):

+    def run(self, p, x_type, x_values, x_values_dropdown, y_type, y_values, y_values_dropdown, z_type, z_values, z_values_dropdown, draw_legend, include_lone_images, include_sub_grids, no_fixed_seeds, margin_size):

         if not no_fixed_seeds:

             modules.processing.fix_seed(p)

 

         if not opts.return_grid:

             p.batch_size = 1

 

-        def process_axis(opt, vals):

+        def process_axis(opt, vals, vals_dropdown):

             if opt.label == 'Nothing':

                 return [0]

 

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

+            if opt.choices is not None:

+                valslist = vals_dropdown

+            else:

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

 

             if opt.type == int:

                 valslist_ext = []

@@ -506,13 +530,19 @@ class Script(scripts.Script):
             return valslist

 

         x_opt = self.current_axis_options[x_type]

-        xs = process_axis(x_opt, x_values)

+        if x_opt.choices is not None:

+            x_values = ",".join(x_values_dropdown)

+        xs = process_axis(x_opt, x_values, x_values_dropdown)

 

         y_opt = self.current_axis_options[y_type]

-        ys = process_axis(y_opt, y_values)

+        if y_opt.choices is not None:

+            y_values = ",".join(y_values_dropdown)

+        ys = process_axis(y_opt, y_values, y_values_dropdown)

 

         z_opt = self.current_axis_options[z_type]

-        zs = process_axis(z_opt, z_values)

+        if z_opt.choices is not None:

+            z_values = ",".join(z_values_dropdown)

+        zs = process_axis(z_opt, z_values, z_values_dropdown)

 

         # this could be moved to common code, but unlikely to be ever triggered anywhere else

         Image.MAX_IMAGE_PIXELS = None # disable check in Pillow and rely on check below to allow large custom image sizes