diff --git a/modules/extensions.py b/modules/extensions.py index d64d2445..68ec897d 100644 --- a/modules/extensions.py +++ b/modules/extensions.py @@ -8,6 +8,7 @@ import re from modules import shared, errors, cache, scripts from modules.gitpython_hack import Repo from modules.paths_internal import extensions_dir, extensions_builtin_dir, script_path # noqa: F401 +from modules_forge.shared import always_disabled_extensions os.makedirs(extensions_dir, exist_ok=True) @@ -219,7 +220,7 @@ def list_extensions(): is_builtin = dirname == extensions_builtin_dir - disabled_extensions = shared.opts.disabled_extensions + shared.always_disabled_extensions + disabled_extensions = shared.opts.disabled_extensions + always_disabled_extensions extension = Extension( name=extension_dirname, diff --git a/modules/launch_utils.py b/modules/launch_utils.py index 98620177..26b8ca3a 100644 --- a/modules/launch_utils.py +++ b/modules/launch_utils.py @@ -14,8 +14,10 @@ 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, shared +from modules import logging_config from modules_forge import forge_version +from modules_forge.shared import always_disabled_extensions + args, _ = cmd_args.parser.parse_known_args() logging_config.setup_logging(args.loglevel) @@ -257,7 +259,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', []) + shared.always_disabled_extensions) + disabled_extensions = set(settings.get('disabled_extensions', []) + 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 b6027c2d..ccdca4e7 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -86,5 +86,3 @@ 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'] diff --git a/modules_forge/shared.py b/modules_forge/shared.py index 793a469a..7d7075d5 100644 --- a/modules_forge/shared.py +++ b/modules_forge/shared.py @@ -4,6 +4,9 @@ import ldm_patched.modules.utils from modules.paths import models_path +always_disabled_extensions = ['sd-webui-controlnet'] + + controlnet_dir = os.path.join(models_path, 'ControlNet') os.makedirs(controlnet_dir, exist_ok=True)