Merge branch 'dev' into master

1 files changed, 27 insertions, 14 deletions

diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index d9faf85a..4ba3bdd7 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -1,6 +1,7 @@
 import json

 import os.path

 import sys

+import threading

 import time

 from datetime import datetime

 import traceback

@@ -51,9 +52,7 @@ def apply_and_restart(disable_list, update_list, disable_all):
     shared.opts.disabled_extensions = disabled

     shared.opts.disable_all_extensions = disable_all

     shared.opts.save(shared.config_filename)

-

-    shared.state.interrupt()

-    shared.state.need_restart = True

+    shared.state.request_restart()

 

 

 def save_config_state(name):

@@ -91,8 +90,7 @@ def restore_config_state(confirmed, config_state_name, restore_type):
     if restore_type == "webui" or restore_type == "both":

         config_states.restore_webui_config(config_state)

 

-    shared.state.interrupt()

-    shared.state.need_restart = True

+    shared.state.request_restart()

 

     return ""

 

@@ -140,7 +138,9 @@ def extension_table():
             <tr>

                 <th><abbr title="Use checkbox to enable the extension; it will be enabled or disabled when you click apply button">Extension</abbr></th>

                 <th>URL</th>

-                <th><abbr title="Extension version">Version</abbr></th>

+                <th>Branch</th>

+                <th>Version</th>

+                <th>Date</th>

                 <th><abbr title="Use checkbox to mark the extension for update; it will be updated when you click apply button">Update</abbr></th>

             </tr>

         </thead>

@@ -148,6 +148,7 @@ def extension_table():
     """

 

     for ext in extensions.extensions:

+        ext: extensions.Extension

         ext.read_info_from_repo()

 

         remote = f"""<a href="{html.escape(ext.remote or '')}" target="_blank">{html.escape("built-in" if ext.is_builtin else ext.remote or '')}</a>"""

@@ -169,7 +170,9 @@ def extension_table():
             <tr>

                 <td><label{style}><input class="gr-check-radio gr-checkbox" name="enable_{html.escape(ext.name)}" type="checkbox" {'checked="checked"' if ext.enabled else ''}>{html.escape(ext.name)}</label></td>

                 <td>{remote}</td>

+                <td>{ext.branch}</td>

                 <td>{version_link}</td>

+                <td>{time.asctime(time.gmtime(ext.commit_date))}</td>

                 <td{' class="extension_status"' if ext.remote is not None else ''}>{ext_status}</td>

             </tr>

     """

@@ -467,7 +470,7 @@ def refresh_available_extensions_from_data(hide_tags, sort_column, filter_text="
                 <td>{html.escape(description)}<p class="info"><span class="date_added">Added: {html.escape(added)}</span></p></td>

                 <td>{install_code}</td>

             </tr>

-        

+

         """

 

         for tag in [x for x in extension_tags if x not in tags]:

@@ -484,13 +487,20 @@ def refresh_available_extensions_from_data(hide_tags, sort_column, filter_text="
     return code, list(tags)

 

 

+def preload_extensions_git_metadata():

+    for extension in extensions.extensions:

+        extension.read_info_from_repo()

+

+

 def create_ui():

     import modules.ui

 

     config_states.list_config_states()

 

+    threading.Thread(target=preload_extensions_git_metadata).start()

+

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

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

+        with gr.Tabs(elem_id="tabs_extensions"):

             with gr.TabItem("Installed", id="installed"):

 

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

@@ -508,7 +518,8 @@ def create_ui():
 </span>

                     """

                 info = gr.HTML(html)

-                extensions_table = gr.HTML(lambda: extension_table())

+                extensions_table = gr.HTML('Loading...')

+                ui.load(fn=extension_table, inputs=[], outputs=[extensions_table])

 

                 apply.click(

                     fn=apply_and_restart,

@@ -535,9 +546,9 @@ def create_ui():
                     hide_tags = gr.CheckboxGroup(value=["ads", "localization", "installed"], label="Hide extensions with tags", choices=["script", "ads", "localization", "installed"])

                     sort_column = gr.Radio(value="newest first", label="Order", choices=["newest first", "oldest first", "a-z", "z-a", "internal order", ], type="index")

 

-                with gr.Row(): 

+                with gr.Row():

                     search_extensions_text = gr.Text(label="Search").style(container=False)

-                   

+

                 install_result = gr.HTML()

                 available_extensions_table = gr.HTML()

 

@@ -579,9 +590,9 @@ def create_ui():
                 install_result = gr.HTML(elem_id="extension_install_result")

 

                 install_button.click(

-                    fn=modules.ui.wrap_gradio_call(install_extension_from_url, extra_outputs=[gr.update()]),

+                    fn=modules.ui.wrap_gradio_call(lambda *args: [gr.update(), *install_extension_from_url(*args)], extra_outputs=[gr.update(), gr.update()]),

                     inputs=[install_dirname, install_url, install_branch],

-                    outputs=[extensions_table, install_result],

+                    outputs=[install_url, extensions_table, install_result],

                 )

 

             with gr.TabItem("Backup/Restore"):

@@ -595,7 +606,8 @@ def create_ui():
                     config_save_button = gr.Button(value="Save Current Config")

 

                 config_states_info = gr.HTML("")

-                config_states_table = gr.HTML(lambda: update_config_states_table("Current"))

+                config_states_table = gr.HTML("Loading...")

+                ui.load(fn=update_config_states_table, inputs=[config_states_list], outputs=[config_states_table])

 

                 config_save_button.click(fn=save_config_state, inputs=[config_save_name], outputs=[config_states_list, config_states_info])

 

@@ -608,4 +620,5 @@ def create_ui():
                     outputs=[config_states_table],

                 )

 

+

     return ui