soaska/my-sd
soaska/my-sd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Activity

fix

Browse Source
This commit is contained in:
lllyasviel 2024-01-31 14:57:17 -08:00
parent 2040649f2a
commit cf47ec85f0
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/extensions.py
View File

@ -8,6 +8,7 @@ import re
from modules import shared, errors, cache, scripts from modules import shared, errors, cache, scripts
from modules.gitpython_hack import Repo from modules.gitpython_hack import Repo
from modules.paths_internal import extensions_dir, extensions_builtin_dir, script_path # noqa: F401 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) os.makedirs(extensions_dir, exist_ok=True)
@ -219,7 +220,7 @@ def list_extensions():
is_builtin = dirname == extensions_builtin_dir 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( extension = Extension(
name=extension_dirname, name=extension_dirname,

6
modules/launch_utils.py
View File

@ -14,8 +14,10 @@ from functools import lru_cache
from modules import cmd_args, errors from modules import cmd_args, errors
from modules.paths_internal import script_path, extensions_dir, extensions_builtin_dir from modules.paths_internal import script_path, extensions_dir, extensions_builtin_dir
from modules.timer import startup_timer 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 import forge_version
from modules_forge.shared import always_disabled_extensions
args, _ = cmd_args.parser.parse_known_args() args, _ = cmd_args.parser.parse_known_args()
logging_config.setup_logging(args.loglevel) 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) 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")) 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') 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): if disable_all_extensions != 'none' or args.disable_extra_extensions or args.disable_all_extensions or not os.path.isdir(extensions_dir):

2
modules/shared.py
View File

@ -86,5 +86,3 @@ list_checkpoint_tiles = shared_items.list_checkpoint_tiles
refresh_checkpoints = shared_items.refresh_checkpoints refresh_checkpoints = shared_items.refresh_checkpoints
list_samplers = shared_items.list_samplers list_samplers = shared_items.list_samplers
reload_hypernetworks = shared_items.reload_hypernetworks reload_hypernetworks = shared_items.reload_hypernetworks
always_disabled_extensions = ['sd-webui-controlnet']

3
modules_forge/shared.py
View File

@ -4,6 +4,9 @@ import ldm_patched.modules.utils
from modules.paths import models_path from modules.paths import models_path
always_disabled_extensions = ['sd-webui-controlnet']
controlnet_dir = os.path.join(models_path, 'ControlNet') controlnet_dir = os.path.join(models_path, 'ControlNet')
os.makedirs(controlnet_dir, exist_ok=True) os.makedirs(controlnet_dir, exist_ok=True)