Merge branch 'AUTOMATIC1111:master' into master

1 files changed, 54 insertions, 59 deletions

diff --git a/modules/ui.py b/modules/ui.py
index bd67c1bd..af889959 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -175,9 +175,9 @@ def save_pil_to_file(pil_image, dir=None):
 gr.processing_utils.save_pil_to_file = save_pil_to_file

 

 

-def wrap_gradio_call(func, extra_outputs=None):

+def wrap_gradio_call(func, extra_outputs=None, add_stats=False):

     def f(*args, extra_outputs_array=extra_outputs, **kwargs):

-        run_memmon = opts.memmon_poll_rate > 0 and not shared.mem_mon.disabled

+        run_memmon = opts.memmon_poll_rate > 0 and not shared.mem_mon.disabled and add_stats

         if run_memmon:

             shared.mem_mon.monitor()

         t = time.perf_counter()

@@ -204,11 +204,18 @@ def wrap_gradio_call(func, extra_outputs=None):
 

             res = extra_outputs_array + [f"<div class='error'>{plaintext_to_html(type(e).__name__+': '+str(e))}</div>"]

 

+        shared.state.skipped = False

+        shared.state.interrupted = False

+        shared.state.job_count = 0

+

+        if not add_stats:

+            return tuple(res)

+

         elapsed = time.perf_counter() - t

         elapsed_m = int(elapsed // 60)

         elapsed_s = elapsed % 60

         elapsed_text = f"{elapsed_s:.2f}s"

-        if (elapsed_m > 0):

+        if elapsed_m > 0:

             elapsed_text = f"{elapsed_m}m "+elapsed_text

 

         if run_memmon:

@@ -226,10 +233,6 @@ def wrap_gradio_call(func, extra_outputs=None):
         # last item is always HTML

         res[-1] += f"<div class='performance'><p class='time'>Time taken: <wbr>{elapsed_text}</p>{vram_html}</div>"

 

-        shared.state.skipped = False

-        shared.state.interrupted = False

-        shared.state.job_count = 0

-

         return tuple(res)

 

     return f

@@ -277,16 +280,8 @@ def check_progress_call(id_part):
     image = gr_show(False)

     preview_visibility = gr_show(False)

 

-    if opts.show_progress_every_n_steps > 0:

-        if shared.parallel_processing_allowed:

-

-            if shared.state.sampling_step - shared.state.current_image_sampling_step >= opts.show_progress_every_n_steps and shared.state.current_latent is not None:

-                if opts.show_progress_grid:

-                    shared.state.current_image = modules.sd_samplers.samples_to_image_grid(shared.state.current_latent)

-                else:

-                    shared.state.current_image = modules.sd_samplers.sample_to_image(shared.state.current_latent)

-                shared.state.current_image_sampling_step = shared.state.sampling_step

-

+    if opts.show_progress_every_n_steps != 0:

+        shared.state.set_current_image()

         image = shared.state.current_image

 

         if image is None:

@@ -689,6 +684,8 @@ def create_ui(wrap_gradio_gpu_call):
     import modules.img2img

     import modules.txt2img

 

+    reload_javascript()

+

     parameters_copypaste.reset()

 

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

@@ -1083,9 +1080,11 @@ def create_ui(wrap_gradio_gpu_call):
                         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)

 

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

+

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

                     with gr.TabItem('Scale by'):

-                        upscaling_resize = gr.Slider(minimum=1.0, maximum=4.0, step=0.05, label="Resize", value=2)

+                        upscaling_resize = gr.Slider(minimum=1.0, maximum=8.0, step=0.05, label="Resize", value=4)

                     with gr.TabItem('Scale to'):

                         with gr.Group():

                             with gr.Row():

@@ -1110,8 +1109,6 @@ def create_ui(wrap_gradio_gpu_call):
                 with gr.Group():

                     upscale_before_face_fix = gr.Checkbox(label='Upscale Before Restoring Faces', value=False)

 

-                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(

@@ -1169,7 +1166,7 @@ def create_ui(wrap_gradio_gpu_call):
             outputs=[html, generation_info, html2],

         )

 

-    with gr.Blocks() as modelmerger_interface:

+    with gr.Blocks(analytics_enabled=False) as modelmerger_interface:

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

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

                 gr.HTML(value="<p>A merger of the two checkpoints will be generated in your <b>checkpoint</b> directory.</p>")

@@ -1189,7 +1186,7 @@ def create_ui(wrap_gradio_gpu_call):
 

     sd_hijack.model_hijack.embedding_db.load_textual_inversion_embeddings()

 

-    with gr.Blocks() as train_interface:

+    with gr.Blocks(analytics_enabled=False) as train_interface:

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

             gr.HTML(value="<p style='margin-bottom: 0.7em'>See <b><a href=\"https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Textual-Inversion\">wiki</a></b> for detailed explanation.</p>")

 

@@ -1213,8 +1210,8 @@ def create_ui(wrap_gradio_gpu_call):
                     new_hypernetwork_name = gr.Textbox(label="Name")

                     new_hypernetwork_sizes = gr.CheckboxGroup(label="Modules", value=["768", "320", "640", "1280"], choices=["768", "320", "640", "1280"])

                     new_hypernetwork_layer_structure = gr.Textbox("1, 2, 1", label="Enter hypernetwork layer structure", placeholder="1st and last digit must be 1. ex:'1, 2, 1'")

-                    new_hypernetwork_activation_func = gr.Dropdown(value="linear", label="Select activation function of hypernetwork", choices=modules.hypernetworks.ui.keys)

-                    new_hypernetwork_initialization_option = gr.Dropdown(value = "Normal", label="Select Layer weights initialization. relu-like - Kaiming, sigmoid-like - Xavier is recommended", choices=["Normal", "KaimingUniform", "KaimingNormal", "XavierUniform", "XavierNormal"])

+                    new_hypernetwork_activation_func = gr.Dropdown(value="linear", label="Select activation function of hypernetwork. Recommended : Swish / Linear(none)", choices=modules.hypernetworks.ui.keys)

+                    new_hypernetwork_initialization_option = gr.Dropdown(value = "Normal", label="Select Layer weights initialization. Recommended: Kaiming for relu-like, Xavier for sigmoid-like, Normal otherwise", choices=["Normal", "KaimingUniform", "KaimingNormal", "XavierUniform", "XavierNormal"])

                     new_hypernetwork_add_layer_norm = gr.Checkbox(label="Add layer normalization")

                     new_hypernetwork_use_dropout = gr.Checkbox(label="Use dropout")

                     overwrite_old_hypernetwork = gr.Checkbox(value=False, label="Overwrite Old Hypernetwork")

@@ -1448,15 +1445,14 @@ def create_ui(wrap_gradio_gpu_call):
 

         if info.refresh is not None:

             if is_quicksettings:

-                res = comp(label=info.label, value=fun, elem_id=elem_id, **(args or {}))

+                res = comp(label=info.label, value=fun(), elem_id=elem_id, **(args or {}))

                 create_refresh_button(res, info.refresh, info.component_args, "refresh_" + key)

             else:

                 with gr.Row(variant="compact"):

-                    res = comp(label=info.label, value=fun, elem_id=elem_id, **(args or {}))

+                    res = comp(label=info.label, value=fun(), elem_id=elem_id, **(args or {}))

                     create_refresh_button(res, info.refresh, info.component_args, "refresh_" + key)

         else:

-            res = comp(label=info.label, value=fun, elem_id=elem_id, **(args or {}))

-

+            res = comp(label=info.label, value=fun(), elem_id=elem_id, **(args or {}))

 

         return res

 

@@ -1467,50 +1463,41 @@ def create_ui(wrap_gradio_gpu_call):
     opts.reorder()

 

     def run_settings(*args):

-        changed = 0

-

-        assert not shared.cmd_opts.freeze_settings, "changing settings is disabled"

+        changed = []

 

         for key, value, comp in zip(opts.data_labels.keys(), args, components):

-            if comp != dummy_component and not opts.same_type(value, opts.data_labels[key].default):

-                return f"Bad value for setting {key}: {value}; expecting {type(opts.data_labels[key].default).__name__}", opts.dumpjson()

+            assert comp == dummy_component or opts.same_type(value, opts.data_labels[key].default), f"Bad value for setting {key}: {value}; expecting {type(opts.data_labels[key].default).__name__}"

 

         for key, value, comp in zip(opts.data_labels.keys(), args, components):

             if comp == dummy_component:

                 continue

 

-            comp_args = opts.data_labels[key].component_args

-            if comp_args and isinstance(comp_args, dict) and comp_args.get('visible') is False:

-                continue

-

-            if cmd_opts.hide_ui_dir_config and key in restricted_opts:

-                continue

-

             oldval = opts.data.get(key, None)

-            opts.data[key] = value

-

+            try:

+                setattr(opts, key, value)

+            except RuntimeError:

+                continue

             if oldval != value:

                 if opts.data_labels[key].onchange is not None:

                     opts.data_labels[key].onchange()

 

-                changed += 1

-

-        opts.save(shared.config_filename)

-

-        return f'{changed} settings changed.', opts.dumpjson()

+                changed.append(key)

+        try:

+            opts.save(shared.config_filename)

+        except RuntimeError:

+            return opts.dumpjson(), f'{len(changed)} settings changed without save: {", ".join(changed)}.'

+        return opts.dumpjson(), f'{len(changed)} settings changed: {", ".join(changed)}.'

 

     def run_settings_single(value, key):

-        assert not shared.cmd_opts.freeze_settings, "changing settings is disabled"

-

         if not opts.same_type(value, opts.data_labels[key].default):

             return gr.update(visible=True), opts.dumpjson()

 

         oldval = opts.data.get(key, None)

-        if cmd_opts.hide_ui_dir_config and key in restricted_opts:

+        try:

+            setattr(opts, key, value)

+        except Exception:

             return gr.update(value=oldval), opts.dumpjson()

 

-        opts.data[key] = value

-

         if oldval != value:

             if opts.data_labels[key].onchange is not None:

                 opts.data_labels[key].onchange()

@@ -1595,8 +1582,7 @@ def create_ui(wrap_gradio_gpu_call):
         reload_script_bodies.click(

             fn=reload_scripts,

             inputs=[],

-            outputs=[],

-            _js='function(){}'

+            outputs=[]

         )

 

         def request_restart():

@@ -1604,11 +1590,10 @@ def create_ui(wrap_gradio_gpu_call):
             shared.state.need_restart = True

 

         restart_gradio.click(

-

             fn=request_restart,

+            _js='restart_reload',

             inputs=[],

             outputs=[],

-            _js='function(){restart_reload()}'

         )

 

         if column is not None:

@@ -1664,9 +1649,9 @@ def create_ui(wrap_gradio_gpu_call):
 

         text_settings = gr.Textbox(elem_id="settings_json", value=lambda: opts.dumpjson(), visible=False)

         settings_submit.click(

-            fn=run_settings,

+            fn=wrap_gradio_call(run_settings, extra_outputs=[gr.update()]),

             inputs=components,

-            outputs=[result, text_settings],

+            outputs=[text_settings, result],

         )

 

         for i, k, item in quicksettings_list:

@@ -1678,6 +1663,17 @@ def create_ui(wrap_gradio_gpu_call):
                 outputs=[component, text_settings],

             )

 

+        component_keys = [k for k in opts.data_labels.keys() if k in component_dict]

+

+        def get_settings_values():

+            return [getattr(opts, key) for key in component_keys]

+

+        demo.load(

+            fn=get_settings_values,

+            inputs=[],

+            outputs=[component_dict[k] for k in component_keys],

+        )

+

         def modelmerger(*args):

             try:

                 results = modules.extras.run_modelmerger(*args)

@@ -1807,4 +1803,3 @@ def load_javascript(raw_response):
 

 

 reload_javascript = partial(load_javascript, gradio.routes.templates.TemplateResponse)

-reload_javascript()