Merge branch 'dev' into tooltip

1 files changed, 233 insertions, 12 deletions

diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index efd6cda2..99ac8756 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -2,6 +2,7 @@ import json
 import os.path

 import sys

 import time

+from datetime import datetime

 import traceback

 

 import git

@@ -11,10 +12,12 @@ import html
 import shutil

 import errno

 

-from modules import extensions, shared, paths

+from modules import extensions, shared, paths, config_states

+from modules.paths_internal import config_states_dir

 from modules.call_queue import wrap_gradio_gpu_call

 

 available_extensions = {"extensions": []}

+STYLE_PRIMARY = ' style="color: var(--primary-400)"'

 

 

 def check_access():

@@ -30,6 +33,9 @@ def apply_and_restart(disable_list, update_list, disable_all):
     update = json.loads(update_list)

     assert type(update) == list, f"wrong update_list data for apply_and_restart: {update_list}"

 

+    if update:

+        save_config_state("Backup (pre-update)")

+

     update = set(update)

 

     for ext in extensions.extensions:

@@ -50,6 +56,46 @@ def apply_and_restart(disable_list, update_list, disable_all):
     shared.state.need_restart = True

 

 

+def save_config_state(name):

+    current_config_state = config_states.get_config()

+    if not name:

+        name = "Config"

+    current_config_state["name"] = name

+    filename = os.path.join(config_states_dir, datetime.now().strftime("%Y_%m_%d-%H_%M_%S") + "_" + name + ".json")

+    print(f"Saving backup of webui/extension state to {filename}.")

+    with open(filename, "w", encoding="utf-8") as f:

+        json.dump(current_config_state, f)

+    config_states.list_config_states()

+    new_value = next(iter(config_states.all_config_states.keys()), "Current")

+    new_choices = ["Current"] + list(config_states.all_config_states.keys())

+    return gr.Dropdown.update(value=new_value, choices=new_choices), f"<span>Saved current webui/extension state to \"{filename}\"</span>"

+

+

+def restore_config_state(confirmed, config_state_name, restore_type):

+    if config_state_name == "Current":

+        return "<span>Select a config to restore from.</span>"

+    if not confirmed:

+        return "<span>Cancelled.</span>"

+

+    check_access()

+

+    config_state = config_states.all_config_states[config_state_name]

+

+    print(f"*** Restoring webui state from backup: {restore_type} ***")

+

+    if restore_type == "extensions" or restore_type == "both":

+        shared.opts.restore_config_state_file = config_state["filepath"]

+        shared.opts.save(shared.config_filename)

+

+    if restore_type == "webui" or restore_type == "both":

+        config_states.restore_webui_config(config_state)

+

+    shared.state.interrupt()

+    shared.state.need_restart = True

+

+    return ""

+

+

 def check_updates(id_task, disable_list):

     check_access()

 

@@ -76,6 +122,16 @@ def check_updates(id_task, disable_list):
     return extension_table(), ""

 

 

+def make_commit_link(commit_hash, remote, text=None):

+    if text is None:

+        text = commit_hash[:8]

+    if remote.startswith("https://github.com/"):

+        href = os.path.join(remote, "commit", commit_hash)

+        return f'<a href="{href}" target="_blank">{text}</a>'

+    else:

+        return text

+

+

 def extension_table():

     code = f"""<!-- {time.time()} -->

     <table id="extensions">

@@ -102,13 +158,17 @@ def extension_table():
 

         style = ""

         if shared.opts.disable_all_extensions == "extra" and not ext.is_builtin or shared.opts.disable_all_extensions == "all":

-            style = ' style="color: var(--primary-400)"'

+            style = STYLE_PRIMARY

+

+        version_link = ext.version

+        if ext.commit_hash and ext.remote:

+            version_link = make_commit_link(ext.commit_hash, ext.remote, ext.version)

 

         code += f"""

             <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.version}</td>

+                <td>{version_link}</td>

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

             </tr>

     """

@@ -121,6 +181,133 @@ def extension_table():
     return code

 

 

+def update_config_states_table(state_name):

+    if state_name == "Current":

+        config_state = config_states.get_config()

+    else:

+        config_state = config_states.all_config_states[state_name]

+

+    config_name = config_state.get("name", "Config")

+    created_date = time.asctime(time.gmtime(config_state["created_at"]))

+    filepath = config_state.get("filepath", "<unknown>")

+

+    code = f"""<!-- {time.time()} -->"""

+

+    webui_remote = config_state["webui"]["remote"] or ""

+    webui_branch = config_state["webui"]["branch"]

+    webui_commit_hash = config_state["webui"]["commit_hash"] or "<unknown>"

+    webui_commit_date = config_state["webui"]["commit_date"]

+    if webui_commit_date:

+        webui_commit_date = time.asctime(time.gmtime(webui_commit_date))

+    else:

+        webui_commit_date = "<unknown>"

+

+    remote = f"""<a href="{html.escape(webui_remote)}" target="_blank">{html.escape(webui_remote or '')}</a>"""

+    commit_link = make_commit_link(webui_commit_hash, webui_remote)

+    date_link = make_commit_link(webui_commit_hash, webui_remote, webui_commit_date)

+

+    current_webui = config_states.get_webui_config()

+

+    style_remote = ""

+    style_branch = ""

+    style_commit = ""

+    if current_webui["remote"] != webui_remote:

+        style_remote = STYLE_PRIMARY

+    if current_webui["branch"] != webui_branch:

+        style_branch = STYLE_PRIMARY

+    if current_webui["commit_hash"] != webui_commit_hash:

+        style_commit = STYLE_PRIMARY

+

+    code += f"""<h2>Config Backup: {config_name}</h2>

+      <div><b>Filepath:</b> {filepath}</div>

+      <div><b>Created at:</b> {created_date}</div>"""

+

+    code += f"""<h2>WebUI State</h2>

+      <table id="config_state_webui">

+        <thead>

+            <tr>

+                <th>URL</th>

+                <th>Branch</th>

+                <th>Commit</th>

+                <th>Date</th>

+            </tr>

+        </thead>

+        <tbody>

+            <tr>

+                <td><label{style_remote}>{remote}</label></td>

+                <td><label{style_branch}>{webui_branch}</label></td>

+                <td><label{style_commit}>{commit_link}</label></td>

+                <td><label{style_commit}>{date_link}</label></td>

+            </tr>

+        </tbody>

+      </table>

+    """

+

+    code += """<h2>Extension State</h2>

+      <table id="config_state_extensions">

+        <thead>

+            <tr>

+                <th>Extension</th>

+                <th>URL</th>

+                <th>Branch</th>

+                <th>Commit</th>

+                <th>Date</th>

+            </tr>

+        </thead>

+        <tbody>

+    """

+

+    ext_map = {ext.name: ext for ext in extensions.extensions}

+

+    for ext_name, ext_conf in config_state["extensions"].items():

+        ext_remote = ext_conf["remote"] or ""

+        ext_branch = ext_conf["branch"] or "<unknown>"

+        ext_enabled = ext_conf["enabled"]

+        ext_commit_hash = ext_conf["commit_hash"] or "<unknown>"

+        ext_commit_date = ext_conf["commit_date"]

+        if ext_commit_date:

+            ext_commit_date = time.asctime(time.gmtime(ext_commit_date))

+        else:

+            ext_commit_date = "<unknown>"

+

+        remote = f"""<a href="{html.escape(ext_remote)}" target="_blank">{html.escape(ext_remote or '')}</a>"""

+        commit_link = make_commit_link(ext_commit_hash, ext_remote)

+        date_link = make_commit_link(ext_commit_hash, ext_remote, ext_commit_date)

+

+        style_enabled = ""

+        style_remote = ""

+        style_branch = ""

+        style_commit = ""

+        if ext_name in ext_map:

+            current_ext = ext_map[ext_name]

+            current_ext.read_info_from_repo()

+            if current_ext.enabled != ext_enabled:

+                style_enabled = STYLE_PRIMARY

+            if current_ext.remote != ext_remote:

+                style_remote = STYLE_PRIMARY

+            if current_ext.branch != ext_branch:

+                style_branch = STYLE_PRIMARY

+            if current_ext.commit_hash != ext_commit_hash:

+                style_commit = STYLE_PRIMARY

+

+        code += f"""

+            <tr>

+                <td><label{style_enabled}><input class="gr-check-radio gr-checkbox" type="checkbox" disabled="true" {'checked="checked"' if ext_enabled else ''}>{html.escape(ext_name)}</label></td>

+                <td><label{style_remote}>{remote}</label></td>

+                <td><label{style_branch}>{ext_branch}</label></td>

+                <td><label{style_commit}>{commit_link}</label></td>

+                <td><label{style_commit}>{date_link}</label></td>

+            </tr>

+    """

+

+    code += """

+        </tbody>

+    </table>

+    """

+

+    return code

+

+

 def normalize_git_url(url):

     if url is None:

         return ""

@@ -129,7 +316,7 @@ def normalize_git_url(url):
     return url

 

 

-def install_extension_from_url(dirname, url):

+def install_extension_from_url(dirname, url, branch_name=None):

     check_access()

 

     assert url, 'No URL specified'

@@ -150,10 +337,17 @@ def install_extension_from_url(dirname, url):
 

     try:

         shutil.rmtree(tmpdir, True)

-        with git.Repo.clone_from(url, tmpdir) as repo:

-            repo.remote().fetch()

-            for submodule in repo.submodules:

-                submodule.update()

+        if not branch_name:

+            # if no branch is specified, use the default branch

+            with git.Repo.clone_from(url, tmpdir) as repo:

+                repo.remote().fetch()

+                for submodule in repo.submodules:

+                    submodule.update()

+        else:

+            with git.Repo.clone_from(url, tmpdir, branch=branch_name) as repo:

+                repo.remote().fetch()

+                for submodule in repo.submodules:

+                    submodule.update()

         try:

             os.rename(tmpdir, target_dir)

         except OSError as err:

@@ -292,9 +486,11 @@ def refresh_available_extensions_from_data(hide_tags, sort_column, filter_text="
 def create_ui():

     import modules.ui

 

+    config_states.list_config_states()

+

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

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

-            with gr.TabItem("Installed"):

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

 

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

                     apply = gr.Button(value="Apply and restart UI", variant="primary")

@@ -327,7 +523,7 @@ def create_ui():
                     outputs=[extensions_table, info],

                 )

 

-            with gr.TabItem("Available"):

+            with gr.TabItem("Available", id="available"):

                 with gr.Row():

                     refresh_available_extensions_button = gr.Button(value="Load from:", variant="primary")

                     available_extensions_index = gr.Text(value="https://raw.githubusercontent.com/AUTOMATIC1111/stable-diffusion-webui-extensions/master/index.json", label="Extension index URL").style(container=False)

@@ -374,16 +570,41 @@ def create_ui():
                     outputs=[available_extensions_table, install_result]

                 )

 

-            with gr.TabItem("Install from URL"):

+            with gr.TabItem("Install from URL", id="install_from_url"):

                 install_url = gr.Text(label="URL for extension's git repository")

+                install_branch = gr.Text(label="Specific branch name", placeholder="Leave empty for default main branch")

                 install_dirname = gr.Text(label="Local directory name", placeholder="Leave empty for auto")

                 install_button = gr.Button(value="Install", variant="primary")

                 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()]),

-                    inputs=[install_dirname, install_url],

+                    inputs=[install_dirname, install_url, install_branch],

                     outputs=[extensions_table, install_result],

                 )

 

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

+                with gr.Row(elem_id="extensions_backup_top_row"):

+                    config_states_list = gr.Dropdown(label="Saved Configs", elem_id="extension_backup_saved_configs", value="Current", choices=["Current"] + list(config_states.all_config_states.keys()))

+                    modules.ui.create_refresh_button(config_states_list, config_states.list_config_states, lambda: {"choices": ["Current"] + list(config_states.all_config_states.keys())}, "refresh_config_states")

+                    config_restore_type = gr.Radio(label="State to restore", choices=["extensions", "webui", "both"], value="extensions", elem_id="extension_backup_restore_type")

+                    config_restore_button = gr.Button(value="Restore Selected Config", variant="primary", elem_id="extension_backup_restore")

+                with gr.Row(elem_id="extensions_backup_top_row2"):

+                    config_save_name = gr.Textbox("", placeholder="Config Name", show_label=False)

+                    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_save_button.click(fn=save_config_state, inputs=[config_save_name], outputs=[config_states_list, config_states_info])

+

+                dummy_component = gr.Label(visible=False)

+                config_restore_button.click(fn=restore_config_state, _js="config_state_confirm_restore", inputs=[dummy_component, config_states_list, config_restore_type], outputs=[config_states_info])

+

+                config_states_list.change(

+                    fn=update_config_states_table,

+                    inputs=[config_states_list],

+                    outputs=[config_states_table],

+                )

+

     return ui