make it so that setting options in pasted infotext (like Clip Skip and ENSD) do not get applied directly and instead are added as temporary overrides

5 files changed, 210 insertions, 80 deletions

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index 3c098e0d..1292fead 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -1,4 +1,5 @@
 import base64

+import html

 import io

 import math

 import os

@@ -16,13 +17,23 @@ re_param = re.compile(re_param_code)
 re_imagesize = re.compile(r"^(\d+)x(\d+)$")

 re_hypernet_hash = re.compile("\(([0-9a-f]+)\)$")

 type_of_gr_update = type(gr.update())

+

 paste_fields = {}

-bind_list = []

+registered_param_bindings = []

+

+

+class ParamBinding:

+    def __init__(self, paste_button, tabname, source_text_component=None, source_image_component=None, source_tabname=None, override_settings_component=None):

+        self.paste_button = paste_button

+        self.tabname = tabname

+        self.source_text_component = source_text_component

+        self.source_image_component = source_image_component

+        self.source_tabname = source_tabname

+        self.override_settings_component = override_settings_component

 

 

 def reset():

     paste_fields.clear()

-    bind_list.clear()

 

 

 def quote(text):

@@ -74,26 +85,6 @@ def add_paste_fields(tabname, init_img, fields):
         modules.ui.img2img_paste_fields = fields

 

 

-def integrate_settings_paste_fields(component_dict):

-    from modules import ui

-

-    settings_map = {

-        'CLIP_stop_at_last_layers': 'Clip skip',

-        'inpainting_mask_weight': 'Conditional mask weight',

-        'sd_model_checkpoint': 'Model hash',

-        'eta_noise_seed_delta': 'ENSD',

-        'initial_noise_multiplier': 'Noise multiplier',

-    }

-    settings_paste_fields = [

-        (component_dict[k], lambda d, k=k, v=v: ui.apply_setting(k, d.get(v, None)))

-        for k, v in settings_map.items()

-    ]

-

-    for tabname, info in paste_fields.items():

-        if info["fields"] is not None:

-            info["fields"] += settings_paste_fields

-

-

 def create_buttons(tabs_list):

     buttons = {}

     for tab in tabs_list:

@@ -101,9 +92,60 @@ def create_buttons(tabs_list):
     return buttons

 

 

-#if send_generate_info is a tab name, mean generate_info comes from the params fields of the tab

 def bind_buttons(buttons, send_image, send_generate_info):

-    bind_list.append([buttons, send_image, send_generate_info])

+    """old function for backwards compatibility; do not use this, use register_paste_params_button"""

+    for tabname, button in buttons.items():

+        source_text_component = send_generate_info if isinstance(send_generate_info, gr.components.Component) else None

+        source_tabname = send_generate_info if isinstance(send_generate_info, str) else None

+

+        register_paste_params_button(ParamBinding(paste_button=button, tabname=tabname, source_text_component=source_text_component, source_image_component=send_image, source_tabname=source_tabname))

+

+

+def register_paste_params_button(binding: ParamBinding):

+    registered_param_bindings.append(binding)

+

+

+def connect_paste_params_buttons():

+    binding: ParamBinding

+    for binding in registered_param_bindings:

+        destination_image_component = paste_fields[binding.tabname]["init_img"]

+        fields = paste_fields[binding.tabname]["fields"]

+

+        destination_width_component = next(iter([field for field, name in fields if name == "Size-1"] if fields else []), None)

+        destination_height_component = next(iter([field for field, name in fields if name == "Size-2"] if fields else []), None)

+

+        if binding.source_image_component and destination_image_component:

+            if isinstance(binding.source_image_component, gr.Gallery):

+                func = send_image_and_dimensions if destination_width_component else image_from_url_text

+                jsfunc = "extract_image_from_gallery"

+            else:

+                func = send_image_and_dimensions if destination_width_component else lambda x: x

+                jsfunc = None

+

+            binding.paste_button.click(

+                fn=func,

+                _js=jsfunc,

+                inputs=[binding.source_image_component],

+                outputs=[destination_image_component, destination_width_component, destination_height_component] if destination_width_component else [destination_image_component],

+            )

+

+        if binding.source_text_component is not None and fields is not None:

+            connect_paste(binding.paste_button, fields, binding.source_text_component, binding.override_settings_component)

+

+        if binding.source_tabname is not None and fields is not None:

+            paste_field_names = ['Prompt', 'Negative prompt', 'Steps', 'Face restoration'] + (["Seed"] if shared.opts.send_seed else [])

+            binding.paste_button.click(

+                fn=lambda *x: x,

+                inputs=[field for field, name in paste_fields[binding.source_tabname]["fields"] if name in paste_field_names],

+                outputs=[field for field, name in fields if name in paste_field_names],

+            )

+

+        binding.paste_button.click(

+            fn=None,

+            _js=f"switch_to_{binding.tabname}",

+            inputs=None,

+            outputs=None,

+        )

 

 

 def send_image_and_dimensions(x):

@@ -122,49 +164,6 @@ def send_image_and_dimensions(x):
     return img, w, h

 

 

-def run_bind():

-    for buttons, source_image_component, send_generate_info in bind_list:

-        for tab in buttons:

-            button = buttons[tab]

-            destination_image_component = paste_fields[tab]["init_img"]

-            fields = paste_fields[tab]["fields"]

-

-            destination_width_component = next(iter([field for field, name in fields if name == "Size-1"] if fields else []), None)

-            destination_height_component = next(iter([field for field, name in fields if name == "Size-2"] if fields else []), None)

-

-            if source_image_component and destination_image_component:

-                if isinstance(source_image_component, gr.Gallery):

-                    func = send_image_and_dimensions if destination_width_component else image_from_url_text

-                    jsfunc = "extract_image_from_gallery"

-                else:

-                    func = send_image_and_dimensions if destination_width_component else lambda x: x

-                    jsfunc = None

-

-                button.click(

-                    fn=func,

-                    _js=jsfunc,

-                    inputs=[source_image_component],

-                    outputs=[destination_image_component, destination_width_component, destination_height_component] if destination_width_component else [destination_image_component],

-                )

-

-            if send_generate_info and fields is not None:

-                if send_generate_info in paste_fields:

-                    paste_field_names = ['Prompt', 'Negative prompt', 'Steps', 'Face restoration'] + (["Seed"] if shared.opts.send_seed else [])

-                    button.click(

-                        fn=lambda *x: x,

-                        inputs=[field for field, name in paste_fields[send_generate_info]["fields"] if name in paste_field_names],

-                        outputs=[field for field, name in fields if name in paste_field_names],

-                    )

-                else:

-                    connect_paste(button, fields, send_generate_info)

-

-            button.click(

-                fn=None,

-                _js=f"switch_to_{tab}",

-                inputs=None,

-                outputs=None,

-            )

-

 

 def find_hypernetwork_key(hypernet_name, hypernet_hash=None):

     """Determines the config parameter name to use for the hypernet based on the parameters in the infotext.

@@ -286,7 +285,47 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
     return res

 

 

-def connect_paste(button, paste_fields, input_comp, jsfunc=None):

+settings_map = {}

+

+infotext_to_setting_name_mapping = [

+    ('Clip skip', 'CLIP_stop_at_last_layers', ),

+    ('Conditional mask weight', 'inpainting_mask_weight'),

+    ('Model hash', 'sd_model_checkpoint'),

+    ('ENSD', 'eta_noise_seed_delta'),

+    ('Noise multiplier', 'initial_noise_multiplier'),

+]

+

+

+def create_override_settings_dict(text_pairs):

+    """creates processing's override_settings parameters from gradio's multiselect

+

+    Example input:

+        ['Clip skip: 2', 'Model hash: e6e99610c4', 'ENSD: 31337']

+

+    Example output:

+        {'CLIP_stop_at_last_layers': 2, 'sd_model_checkpoint': 'e6e99610c4', 'eta_noise_seed_delta': 31337}

+    """

+

+    res = {}

+

+    params = {}

+    for pair in text_pairs:

+        k, v = pair.split(":", maxsplit=1)

+

+        params[k] = v.strip()

+

+    for param_name, setting_name in infotext_to_setting_name_mapping:

+        value = params.get(param_name, None)

+

+        if value is None:

+            continue

+

+        res[setting_name] = shared.opts.cast_value(setting_name, value)

+

+    return res

+

+

+def connect_paste(button, paste_fields, input_comp, override_settings_component, jsfunc=None):

     def paste_func(prompt):

         if not prompt and not shared.cmd_opts.hide_ui_dir_config:

             filename = os.path.join(data_path, "params.txt")

@@ -323,6 +362,32 @@ def connect_paste(button, paste_fields, input_comp, jsfunc=None):
 

         return res

 

+    if override_settings_component is not None:

+        def paste_settings(params):

+            vals = {}

+

+            for param_name, setting_name in infotext_to_setting_name_mapping:

+                v = params.get(param_name, None)

+                if v is None:

+                    continue

+

+                if setting_name == "sd_model_checkpoint" and shared.opts.disable_weights_auto_swap:

+                    continue

+

+                v = shared.opts.cast_value(setting_name, v)

+                current_value = getattr(shared.opts, setting_name, None)

+

+                if v == current_value:

+                    continue

+

+                vals[param_name] = v

+

+            vals_pairs = [f"{k}: {v}" for k, v in vals.items()]

+

+            return gr.Dropdown.update(value=vals_pairs, choices=vals_pairs, visible=len(vals_pairs) > 0)

+

+        paste_fields = paste_fields + [(override_settings_component, paste_settings)]

+

     button.click(

         fn=paste_func,

         _js=jsfunc,

diff --git a/modules/shared.py b/modules/shared.py
index eb04e811..b5370265 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -127,12 +127,13 @@ restricted_opts = {
 ui_reorder_categories = [

     "inpaint",

     "sampler",

+    "checkboxes",

+    "hires_fix",

     "dimensions",

     "cfg",

     "seed",

-    "checkboxes",

-    "hires_fix",

     "batch",

+    "override_settings",

     "scripts",

 ]

 

@@ -346,10 +347,10 @@ options_templates.update(options_section(('saving-paths', "Paths for saving"), {
 }))

 

 options_templates.update(options_section(('saving-to-dirs', "Saving to a directory"), {

-    "save_to_dirs": OptionInfo(False, "Save images to a subdirectory"),

-    "grid_save_to_dirs": OptionInfo(False, "Save grids to a subdirectory"),

+    "save_to_dirs": OptionInfo(True, "Save images to a subdirectory"),

+    "grid_save_to_dirs": OptionInfo(True, "Save grids to a subdirectory"),

     "use_save_to_dirs_for_ui": OptionInfo(False, "When using \"Save\" button, save images to a subdirectory"),

-    "directories_filename_pattern": OptionInfo("", "Directory name pattern", component_args=hide_dirs),

+    "directories_filename_pattern": OptionInfo("[date]", "Directory name pattern", component_args=hide_dirs),

     "directories_max_prompt_words": OptionInfo(8, "Max prompt words for [prompt_words] pattern", gr.Slider, {"minimum": 1, "maximum": 20, "step": 1, **hide_dirs}),

 }))

 

@@ -605,11 +606,37 @@ class Options:
 

         self.data_labels = {k: v for k, v in sorted(settings_items, key=lambda x: section_ids[x[1].section])}

 

+    def cast_value(self, key, value):

+        """casts an arbitrary to the same type as this setting's value with key

+        Example: cast_value("eta_noise_seed_delta", "12") -> returns 12 (an int rather than str)

+        """

+

+        if value is None:

+            return None

+

+        default_value = self.data_labels[key].default

+        if default_value is None:

+            default_value = getattr(self, key, None)

+        if default_value is None:

+            return None

+

+        expected_type = type(default_value)

+        if expected_type == bool and value == "False":

+            value = False

+        else:

+            value = expected_type(value)

+

+        return value

+

+

 

 opts = Options()

 if os.path.exists(config_filename):

     opts.load(config_filename)

 

+settings_components = None

+"""assinged from ui.py, a mapping on setting anmes to gradio components repsponsible for those settings"""

+

 latent_upscale_default_mode = "Latent"

 latent_upscale_modes = {

     "Latent": {"mode": "bilinear", "antialias": False},

diff --git a/modules/txt2img.py b/modules/txt2img.py
index e945fd69..16841d0f 100644
--- a/modules/txt2img.py
+++ b/modules/txt2img.py
@@ -1,5 +1,6 @@
 import modules.scripts

 from modules import sd_samplers

+from modules.generation_parameters_copypaste import create_override_settings_dict

 from modules.processing import StableDiffusionProcessing, Processed, StableDiffusionProcessingTxt2Img, \

     StableDiffusionProcessingImg2Img, process_images

 from modules.shared import opts, cmd_opts

@@ -8,7 +9,9 @@ import modules.processing as processing
 from modules.ui import plaintext_to_html

 

 

-def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, steps: int, sampler_index: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, cfg_scale: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, height: int, width: int, enable_hr: bool, denoising_strength: float, hr_scale: float, hr_upscaler: str, hr_second_pass_steps: int, hr_resize_x: int, hr_resize_y: int, *args):

+def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, steps: int, sampler_index: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, cfg_scale: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, height: int, width: int, enable_hr: bool, denoising_strength: float, hr_scale: float, hr_upscaler: str, hr_second_pass_steps: int, hr_resize_x: int, hr_resize_y: int, override_settings_texts, *args):

+    override_settings = create_override_settings_dict(override_settings_texts)

+

     p = StableDiffusionProcessingTxt2Img(

         sd_model=shared.sd_model,

         outpath_samples=opts.outdir_samples or opts.outdir_txt2img_samples,

@@ -38,6 +41,7 @@ def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, step
         hr_second_pass_steps=hr_second_pass_steps,

         hr_resize_x=hr_resize_x,

         hr_resize_y=hr_resize_y,

+        override_settings=override_settings,

     )

 

     p.scripts = modules.scripts.scripts_txt2img

diff --git a/modules/ui.py b/modules/ui.py
index f1195692..a7fcdd83 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -380,6 +380,7 @@ def apply_setting(key, value):
     opts.save(shared.config_filename)

     return getattr(opts, key)

 

+

 def create_refresh_button(refresh_component, refresh_method, refreshed_args, elem_id):

     def refresh():

         refresh_method()

@@ -433,6 +434,18 @@ def get_value_for_setting(key):
     return gr.update(value=value, **args)

 

 

+def create_override_settings_dropdown(tabname, row):

+    dropdown = gr.Dropdown([], label="Override settings", visible=False, elem_id=f"{tabname}_override_settings", multiselect=True)

+

+    dropdown.change(

+        fn=lambda x: gr.Dropdown.update(visible=len(x) > 0),

+        inputs=[dropdown],

+        outputs=[dropdown],

+    )

+

+    return dropdown

+

+

 def create_ui():

     import modules.img2img

     import modules.txt2img

@@ -503,6 +516,10 @@ def create_ui():
                                 batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="txt2img_batch_count")

                                 batch_size = gr.Slider(minimum=1, maximum=8, step=1, label='Batch size', value=1, elem_id="txt2img_batch_size")

 

+                    elif category == "override_settings":

+                        with FormRow(elem_id="txt2img_override_settings_row") as row:

+                            override_settings = create_override_settings_dropdown('txt2img', row)

+

                     elif category == "scripts":

                         with FormGroup(elem_id="txt2img_script_container"):

                             custom_inputs = modules.scripts.scripts_txt2img.setup_ui()

@@ -524,7 +541,6 @@ def create_ui():
                 )

 

             txt2img_gallery, generation_info, html_info, html_log = create_output_panel("txt2img", opts.outdir_txt2img_samples)

-            parameters_copypaste.bind_buttons({"txt2img": txt2img_paste}, None, txt2img_prompt)

 

             connect_reuse_seed(seed, reuse_seed, generation_info, dummy_component, is_subseed=False)

             connect_reuse_seed(subseed, reuse_subseed, generation_info, dummy_component, is_subseed=True)

@@ -555,6 +571,7 @@ def create_ui():
                     hr_second_pass_steps,

                     hr_resize_x,

                     hr_resize_y,

+                    override_settings,

                 ] + custom_inputs,

 

                 outputs=[

@@ -615,6 +632,9 @@ def create_ui():
                 *modules.scripts.scripts_txt2img.infotext_fields

             ]

             parameters_copypaste.add_paste_fields("txt2img", None, txt2img_paste_fields)

+            parameters_copypaste.register_paste_params_button(parameters_copypaste.ParamBinding(

+                paste_button=txt2img_paste, tabname="txt2img", source_text_component=txt2img_prompt, source_image_component=None, override_settings_component=override_settings,

+            ))

 

             txt2img_preview_params = [

                 txt2img_prompt,

@@ -762,6 +782,10 @@ def create_ui():
                                 batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="img2img_batch_count")

                                 batch_size = gr.Slider(minimum=1, maximum=8, step=1, label='Batch size', value=1, elem_id="img2img_batch_size")

 

+                    elif category == "override_settings":

+                        with FormRow(elem_id="img2img_override_settings_row") as row:

+                            override_settings = create_override_settings_dropdown('img2img', row)

+

                     elif category == "scripts":

                         with FormGroup(elem_id="img2img_script_container"):

                             custom_inputs = modules.scripts.scripts_img2img.setup_ui()

@@ -796,7 +820,6 @@ def create_ui():
                                 )

 

             img2img_gallery, generation_info, html_info, html_log = create_output_panel("img2img", opts.outdir_img2img_samples)

-            parameters_copypaste.bind_buttons({"img2img": img2img_paste}, None, img2img_prompt)

 

             connect_reuse_seed(seed, reuse_seed, generation_info, dummy_component, is_subseed=False)

             connect_reuse_seed(subseed, reuse_subseed, generation_info, dummy_component, is_subseed=True)

@@ -937,6 +960,9 @@ def create_ui():
             ]

             parameters_copypaste.add_paste_fields("img2img", init_img, img2img_paste_fields)

             parameters_copypaste.add_paste_fields("inpaint", init_img_with_mask, img2img_paste_fields)

+            parameters_copypaste.register_paste_params_button(parameters_copypaste.ParamBinding(

+                paste_button=img2img_paste, tabname="img2img", source_text_component=img2img_prompt, source_image_component=None,

+            ))

 

     modules.scripts.scripts_current = None

 

@@ -954,7 +980,11 @@ def create_ui():
                 html2 = gr.HTML()

                 with gr.Row():

                     buttons = parameters_copypaste.create_buttons(["txt2img", "img2img", "inpaint", "extras"])

-                parameters_copypaste.bind_buttons(buttons, image, generation_info)

+

+                for tabname, button in buttons.items():

+                    parameters_copypaste.register_paste_params_button(parameters_copypaste.ParamBinding(

+                        paste_button=button, tabname=tabname, source_text_component=generation_info, source_image_component=image,

+                    ))

 

         image.change(

             fn=wrap_gradio_call(modules.extras.run_pnginfo),

@@ -1363,6 +1393,7 @@ def create_ui():
 

     components = []

     component_dict = {}

+    shared.settings_components = component_dict

 

     script_callbacks.ui_settings_callback()

     opts.reorder()

@@ -1529,8 +1560,7 @@ def create_ui():
                 component = create_setting_component(k, is_quicksettings=True)

                 component_dict[k] = component

 

-        parameters_copypaste.integrate_settings_paste_fields(component_dict)

-        parameters_copypaste.run_bind()

+        parameters_copypaste.connect_paste_params_buttons()

 

         with gr.Tabs(elem_id="tabs") as tabs:

             for interface, label, ifid in interfaces:

diff --git a/modules/ui_common.py b/modules/ui_common.py
index 9405ac1f..fd047f31 100644
--- a/modules/ui_common.py
+++ b/modules/ui_common.py
@@ -198,5 +198,9 @@ Requested path was: {f}
                 html_info = gr.HTML(elem_id=f'html_info_{tabname}')

                 html_log = gr.HTML(elem_id=f'html_log_{tabname}')

 

-            parameters_copypaste.bind_buttons(buttons, result_gallery, "txt2img" if tabname == "txt2img" else None)

+            for paste_tabname, paste_button in buttons.items():

+                parameters_copypaste.register_paste_params_button(parameters_copypaste.ParamBinding(

+                    paste_button=paste_button, tabname=paste_tabname, source_tabname="txt2img" if tabname == "txt2img" else None, source_image_component=result_gallery

+                ))

+

             return result_gallery, generation_info if tabname != "extras" else html_info_x, html_info, html_log