From 2040649f2aa4d60ae7908e5f96f61d2a9600902f Mon Sep 17 00:00:00 2001 From: lllyasviel Date: Wed, 31 Jan 2024 14:53:53 -0800 Subject: [PATCH] disable extension --- modules/extensions.py | 12 +++++++++++- modules/launch_utils.py | 4 ++-- modules/shared.py | 2 ++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/modules/extensions.py b/modules/extensions.py index 04bda297..d64d2445 100644 --- a/modules/extensions.py +++ b/modules/extensions.py @@ -218,7 +218,17 @@ def list_extensions(): continue is_builtin = dirname == extensions_builtin_dir - extension = Extension(name=extension_dirname, path=path, enabled=extension_dirname not in shared.opts.disabled_extensions, is_builtin=is_builtin, metadata=metadata) + + disabled_extensions = shared.opts.disabled_extensions + shared.always_disabled_extensions + + extension = Extension( + name=extension_dirname, + path=path, + enabled=extension_dirname not in disabled_extensions, + is_builtin=is_builtin, + metadata=metadata + ) + extensions.append(extension) loaded_extensions[canonical_name] = extension diff --git a/modules/launch_utils.py b/modules/launch_utils.py index c1f35647..98620177 100644 --- a/modules/launch_utils.py +++ b/modules/launch_utils.py @@ -14,7 +14,7 @@ from functools import lru_cache from modules import cmd_args, errors from modules.paths_internal import script_path, extensions_dir, extensions_builtin_dir from modules.timer import startup_timer -from modules import logging_config +from modules import logging_config, shared from modules_forge import forge_version args, _ = cmd_args.parser.parse_known_args() @@ -257,7 +257,7 @@ def list_extensions(settings_file): errors.report(f'\nCould not load settings\nThe config file "{settings_file}" is likely corrupted\nIt has been moved to the "tmp/config.json"\nReverting config to default\n\n''', exc_info=True) os.replace(settings_file, os.path.join(script_path, "tmp", "config.json")) - disabled_extensions = set(settings.get('disabled_extensions', [])) + disabled_extensions = set(settings.get('disabled_extensions', []) + shared.always_disabled_extensions) disable_all_extensions = settings.get('disable_all_extensions', 'none') if disable_all_extensions != 'none' or args.disable_extra_extensions or args.disable_all_extensions or not os.path.isdir(extensions_dir): diff --git a/modules/shared.py b/modules/shared.py index ccdca4e7..b6027c2d 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -86,3 +86,5 @@ list_checkpoint_tiles = shared_items.list_checkpoint_tiles refresh_checkpoints = shared_items.refresh_checkpoints list_samplers = shared_items.list_samplers reload_hypernetworks = shared_items.reload_hypernetworks + +always_disabled_extensions = ['sd-webui-controlnet']