Revert "Merge pull request AUTOMATIC1111#9052 from space-nuko/temp-disable-extensions"

This reverts commit daa5a83, reversing
changes made to cb3e1ba.

Author: Rewinged

javascript/extensions.js

@@ -1,5 +1,5 @@
 
-function extensions_apply(_, _, disable_all){
+function extensions_apply(_, _){
     var disable = []
     var update = []
 
@@ -13,10 +13,10 @@ function extensions_apply(_, _, disable_all){
 
     restart_reload()
 
-    return [JSON.stringify(disable), JSON.stringify(update), disable_all]
+    return [JSON.stringify(disable), JSON.stringify(update)]
 }
 
-function extensions_check(_, _){
+function extensions_check(){
     var disable = []
 
     gradioApp().querySelectorAll('#extensions input[type="checkbox"]').forEach(function(x){

launch.py

@@ -206,10 +206,6 @@ def list_extensions(settings_file):
         print(e, file=sys.stderr)
 
     disabled_extensions = set(settings.get('disabled_extensions', []))
-    disable_all_extensions = settings.get('disable_all_extensions', 'none')
-
-    if disable_all_extensions != 'none':
-        return []
 
     return [x for x in os.listdir(extensions_dir) if x not in disabled_extensions]
 

modules/extensions.py

@@ -15,12 +15,7 @@
 
 
 def active():
-    if shared.opts.disable_all_extensions == "all":
-        return []
-    elif shared.opts.disable_all_extensions == "extra":
-        return [x for x in extensions if x.enabled and x.is_builtin]
-    else:
-        return [x for x in extensions if x.enabled]
+    return [x for x in extensions if x.enabled]
 
 
 class Extension:
@@ -102,11 +97,6 @@ def list_extensions():
     if not os.path.isdir(extensions_dir):
         return
 
-    if shared.opts.disable_all_extensions == "all":
-        print("*** \"Disable all extensions\" option was set, will not load any extensions ***")
-    elif shared.opts.disable_all_extensions == "extra":
-        print("*** \"Disable all extensions\" option was set, will only load built-in extensions ***")
-
     extension_paths = []
     for dirname in [extensions_dir, extensions_builtin_dir]:
         if not os.path.isdir(dirname):
@@ -122,3 +112,4 @@ def list_extensions():
     for dirname, path, is_builtin in extension_paths:
         extension = Extension(name=dirname, path=path, enabled=dirname not in shared.opts.disabled_extensions, is_builtin=is_builtin)
         extensions.append(extension)
+

modules/shared.py

@@ -422,8 +422,7 @@ def list_samplers():
 }))
 
 options_templates.update(options_section((None, "Hidden options"), {
-    "disabled_extensions": OptionInfo([], "Disable these extensions"),
-    "disable_all_extensions": OptionInfo("none", "Disable all extensions (preserves the list of disabled extensions)", gr.Radio, {"choices": ["none", "extra", "all"]}),
+    "disabled_extensions": OptionInfo([], "Disable those extensions"),
     "sd_checkpoint_hash": OptionInfo("", "SHA256 hash of the current checkpoint"),
 }))
 

modules/ui_extensions.py

@@ -21,7 +21,7 @@ def check_access():
     assert not shared.cmd_opts.disable_extension_access, "extension access disabled because of command line flags"
 
 
-def apply_and_restart(disable_list, update_list, disable_all):
+def apply_and_restart(disable_list, update_list):
     check_access()
 
     disabled = json.loads(disable_list)
@@ -43,7 +43,6 @@ def apply_and_restart(disable_list, update_list, disable_all):
             print(traceback.format_exc(), file=sys.stderr)
 
     shared.opts.disabled_extensions = disabled
-    shared.opts.disable_all_extensions = disable_all
     shared.opts.save(shared.config_filename)
 
     shared.state.interrupt()
@@ -100,13 +99,9 @@ def extension_table():
         else:
             ext_status = ext.status
 
-        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)"'
-
         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><label><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{' class="extension_status"' if ext.remote is not None else ''}>{ext_status}</td>
@@ -299,24 +294,16 @@ def create_ui():
                 with gr.Row(elem_id="extensions_installed_top"):
                     apply = gr.Button(value="Apply and restart UI", variant="primary")
                     check = gr.Button(value="Check for updates")
-                    extensions_disable_all = gr.Radio(label="Disable all extensions", choices=["none", "extra", "all"], value=shared.opts.disable_all_extensions, elem_id="extensions_disable_all")
                     extensions_disabled_list = gr.Text(elem_id="extensions_disabled_list", visible=False).style(container=False)
                     extensions_update_list = gr.Text(elem_id="extensions_update_list", visible=False).style(container=False)
 
-                html = ""
-                if shared.opts.disable_all_extensions != "none":
-                    html = """
-<span style="color: var(--primary-400);">
-    "Disable all extensions" was set, change it to "none" to load all extensions again
-</span>
-                    """
-                info = gr.HTML(html)
+                info = gr.HTML()
                 extensions_table = gr.HTML(lambda: extension_table())
 
                 apply.click(
                     fn=apply_and_restart,
                     _js="extensions_apply",
-                    inputs=[extensions_disabled_list, extensions_update_list, extensions_disable_all],
+                    inputs=[extensions_disabled_list, extensions_update_list],
                     outputs=[],
                 )