fix broken ↙ button, fix field paste ignoring most of useful fields for for #3768

2 files changed, 41 insertions, 38 deletions

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index d590e9ee..bbaad42e 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -6,7 +6,7 @@ import gradio as gr
 from modules.shared import script_path

 from modules import shared

 import tempfile

-from PIL import Image, PngImagePlugin

+from PIL import Image

 

 re_param_code = r'\s*([\w ]+):\s*("(?:\\|\"|[^\"])+"|[^,]*)(?:,|$)'

 re_param = re.compile(re_param_code)

@@ -61,6 +61,24 @@ 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 = {

+        'sd_hypernetwork': 'Hypernet',

+        'CLIP_stop_at_last_layers': 'Clip skip',

+        'sd_model_checkpoint': 'Model hash',

+    }

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

@@ -87,24 +105,22 @@ def run_bind():
                     )

                 else:

                     button.click(

-                        fn=lambda x:x,

+                        fn=lambda x: x,

                         inputs=[send_image],

                         outputs=[paste_fields[tab]["init_img"]],

                     )

 

             if send_generate_info and paste_fields[tab]["fields"] is not None:

-                paste_field_names = ['Prompt', 'Negative prompt', 'Steps', 'Face restoration', 'Size-1', 'Size-2']

-                if shared.opts.send_seed:

-                    paste_field_names += ["Seed"]

                 if send_generate_info in paste_fields:

+                    paste_field_names = ['Prompt', 'Negative prompt', 'Steps', 'Face restoration', 'Size-1', 'Size-2'] + (["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 paste_fields[tab]["fields"] if name in paste_field_names],

+                        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 paste_fields[tab]["fields"] if name in paste_field_names],

                     )

-

                 else:

-                    connect_paste(button, [(field, name) for field, name in paste_fields[tab]["fields"]  if name in paste_field_names], send_generate_info)

+                    connect_paste(button, paste_fields[tab]["fields"], send_generate_info)

 

             button.click(

                 fn=None,

diff --git a/modules/ui.py b/modules/ui.py
index 3c34eca0..5055ca64 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -589,6 +589,7 @@ def create_refresh_button(refresh_component, refresh_method, refreshed_args, ele
     )

     return refresh_button

 

+

 def create_output_panel(tabname, outdir):

     def open_folder(f):

         if not os.path.exists(f):

@@ -716,6 +717,7 @@ def create_ui(wrap_gradio_gpu_call):
                     custom_inputs = modules.scripts.scripts_txt2img.setup_ui(is_img2img=False)

 

             txt2img_gallery, generation_info, html_info = 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)

@@ -784,7 +786,7 @@ def create_ui(wrap_gradio_gpu_call):
                 ]

             )

 

-            parameters_copypaste.add_paste_fields("txt2img", None, [

+            txt2img_paste_fields = [

                 (txt2img_prompt, "Prompt"),

                 (txt2img_negative_prompt, "Negative prompt"),

                 (steps, "Steps"),

@@ -805,7 +807,8 @@ def create_ui(wrap_gradio_gpu_call):
                 (firstphase_width, "First pass size-1"),

                 (firstphase_height, "First pass size-2"),

                 *modules.scripts.scripts_txt2img.infotext_fields

-            ])

+            ]

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

 

             txt2img_preview_params = [

                 txt2img_prompt,

@@ -893,6 +896,7 @@ def create_ui(wrap_gradio_gpu_call):
                     custom_inputs = modules.scripts.scripts_img2img.setup_ui(is_img2img=True)

 

             img2img_gallery, generation_info, html_info = 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)

@@ -1038,7 +1042,6 @@ def create_ui(wrap_gradio_gpu_call):
             parameters_copypaste.add_paste_fields("img2img", init_img, img2img_paste_fields)

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

 

-

     with gr.Blocks(analytics_enabled=False) as extras_interface:

         with gr.Row().style(equal_height=False):

             with gr.Column(variant='panel'):

@@ -1050,12 +1053,8 @@ def create_ui(wrap_gradio_gpu_call):
                         image_batch = gr.File(label="Batch Process", file_count="multiple", interactive=True, type="file")

 

                     with gr.TabItem('Batch from Directory'):

-                        extras_batch_input_dir = gr.Textbox(label="Input directory", **shared.hide_dirs,

-                            placeholder="A directory on the same machine where the server is running."

-                        )

-                        extras_batch_output_dir = gr.Textbox(label="Output directory", **shared.hide_dirs,

-                            placeholder="Leave blank to save images to the default path."

-                        )

+                        extras_batch_input_dir = gr.Textbox(label="Input directory", **shared.hide_dirs, placeholder="A directory on the same machine where the server is running.")

+                        extras_batch_output_dir = gr.Textbox(label="Output directory", **shared.hide_dirs, placeholder="Leave blank to save images to the default path.")

                         show_extras_results = gr.Checkbox(label='Show result images', value=True)

 

                 with gr.Tabs(elem_id="extras_resize_mode"):

@@ -1087,7 +1086,6 @@ def create_ui(wrap_gradio_gpu_call):
 

                 submit = gr.Button('Generate', elem_id="extras_generate", variant='primary')

 

-

             result_images, html_info_x, html_info = create_output_panel("extras", opts.outdir_extras_samples)

 

         submit.click(

@@ -1121,7 +1119,6 @@ def create_ui(wrap_gradio_gpu_call):
         )

         parameters_copypaste.add_paste_fields("extras", extras_image, None)

 

-

         extras_image.change(

             fn=modules.extras.clear_cache,

             inputs=[], outputs=[]

@@ -1587,9 +1584,6 @@ def create_ui(wrap_gradio_gpu_call):
         if column is not None:

             column.__exit__()

 

-

-

-

     interfaces = [

         (txt2img_interface, "txt2img", "txt2img"),

         (img2img_interface, "img2img", "img2img"),

@@ -1599,10 +1593,6 @@ def create_ui(wrap_gradio_gpu_call):
         (train_interface, "Train", "ti"),

     ]

 

-    interfaces += script_callbacks.ui_tabs_callback()

-

-    interfaces += [(settings_interface, "Settings", "settings")]

-

     css = ""

 

     for cssfile in modules.scripts.list_files_with_name("style.css"):

@@ -1619,6 +1609,9 @@ def create_ui(wrap_gradio_gpu_call):
     if not cmd_opts.no_progressbar_hiding:

         css += css_hide_progressbar

 

+    interfaces += script_callbacks.ui_tabs_callback()

+    interfaces += [(settings_interface, "Settings", "settings")]

+

     with gr.Blocks(css=css, analytics_enabled=False, title="Stable Diffusion") as demo:

         with gr.Row(elem_id="quicksettings"):

             for i, k, item in quicksettings_list:

@@ -1627,6 +1620,9 @@ def create_ui(wrap_gradio_gpu_call):
 

         settings_interface.gradio_ref = demo

 

+        parameters_copypaste.integrate_settings_paste_fields(component_dict)

+        parameters_copypaste.run_bind()

+

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

             for interface, label, ifid in interfaces:

                 with gr.TabItem(label, id=ifid, elem_id='tab_' + ifid):

@@ -1681,15 +1677,6 @@ def create_ui(wrap_gradio_gpu_call):
             ]

         )

 

-

-        settings_map = {

-            'sd_hypernetwork': 'Hypernet',

-            'CLIP_stop_at_last_layers': 'Clip skip',

-            'sd_model_checkpoint': 'Model hash',

-        }

-

-        parameters_copypaste.run_bind()

-

     ui_config_file = cmd_opts.ui_config_file

     ui_settings = {}

     settings_count = len(ui_settings)

@@ -1708,7 +1695,7 @@ def create_ui(wrap_gradio_gpu_call):
         def apply_field(obj, field, condition=None, init_field=None):

             key = path + "/" + field

 

-            if getattr(obj,'custom_script_source',None) is not None:

+            if getattr(obj, 'custom_script_source', None) is not None:

               key = 'customscript/' + obj.custom_script_source + '/' + key

 

             if getattr(obj, 'do_not_save_to_config', False):