load all settings in one call instead of one by one when the page loads

1 files changed, 16 insertions, 6 deletions

diff --git a/modules/ui.py b/modules/ui.py
index c946ad59..34c31ef1 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -1141,7 +1141,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>")

@@ -1161,7 +1161,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>")

 

@@ -1420,15 +1420,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

 

@@ -1639,6 +1638,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)