Merge branch 'dev' into patch-1

1 files changed, 66 insertions, 17 deletions

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index e1c9cfbe..7e4d5a61 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -1,7 +1,9 @@
 # this scripts installs necessary requirements and launches main program in webui.py

+import logging

 import re

 import subprocess

 import os

+import shutil

 import sys

 import importlib.util

 import platform

@@ -10,11 +12,11 @@ from functools import lru_cache
 

 from modules import cmd_args, errors

 from modules.paths_internal import script_path, extensions_dir

-from modules import timer

-

-timer.startup_timer.record("start")

+from modules.timer import startup_timer

+from modules import logging_config

 

 args, _ = cmd_args.parser.parse_known_args()

+logging_config.setup_logging(args.loglevel)

 

 python = sys.executable

 git = os.environ.get('GIT', "git")

@@ -141,6 +143,25 @@ def check_run_python(code: str) -> bool:
     return result.returncode == 0

 

 

+def git_fix_workspace(dir, name):

+    run(f'"{git}" -C "{dir}" fetch --refetch --no-auto-gc', f"Fetching all contents for {name}", f"Couldn't fetch {name}", live=True)

+    run(f'"{git}" -C "{dir}" gc --aggressive --prune=now', f"Pruning {name}", f"Couldn't prune {name}", live=True)

+    return

+

+

+def run_git(dir, name, command, desc=None, errdesc=None, custom_env=None, live: bool = default_command_live, autofix=True):

+    try:

+        return run(f'"{git}" -C "{dir}" {command}', desc=desc, errdesc=errdesc, custom_env=custom_env, live=live)

+    except RuntimeError:

+        if not autofix:

+            raise

+

+    print(f"{errdesc}, attempting autofix...")

+    git_fix_workspace(dir, name)

+

+    return run(f'"{git}" -C "{dir}" {command}', desc=desc, errdesc=errdesc, custom_env=custom_env, live=live)

+

+

 def git_clone(url, dir, name, commithash=None):

     # TODO clone into temporary dir and move if successful

 

@@ -148,15 +169,24 @@ def git_clone(url, dir, name, commithash=None):
         if commithash is None:

             return

 

-        current_hash = run(f'"{git}" -C "{dir}" rev-parse HEAD', None, f"Couldn't determine {name}'s hash: {commithash}", live=False).strip()

+        current_hash = run_git(dir, name, 'rev-parse HEAD', None, f"Couldn't determine {name}'s hash: {commithash}", live=False).strip()

         if current_hash == commithash:

             return

 

-        run(f'"{git}" -C "{dir}" fetch', f"Fetching updates for {name}...", f"Couldn't fetch {name}")

-        run(f'"{git}" -C "{dir}" checkout {commithash}', f"Checking out commit for {name} with hash: {commithash}...", f"Couldn't checkout commit {commithash} for {name}", live=True)

+        if run_git(dir, name, 'config --get remote.origin.url', None, f"Couldn't determine {name}'s origin URL", live=False).strip() != url:

+            run_git(dir, name, f'remote set-url origin "{url}"', None, f"Failed to set {name}'s origin URL", live=False)

+

+        run_git(dir, name, 'fetch', f"Fetching updates for {name}...", f"Couldn't fetch {name}", autofix=False)

+

+        run_git(dir, name, f'checkout {commithash}', f"Checking out commit for {name} with hash: {commithash}...", f"Couldn't checkout commit {commithash} for {name}", live=True)

+

         return

 

-    run(f'"{git}" clone "{url}" "{dir}"', f"Cloning {name} into {dir}...", f"Couldn't clone {name}", live=True)

+    try:

+        run(f'"{git}" clone "{url}" "{dir}"', f"Cloning {name} into {dir}...", f"Couldn't clone {name}", live=True)

+    except RuntimeError:

+        shutil.rmtree(dir, ignore_errors=True)

+        raise

 

     if commithash is not None:

         run(f'"{git}" -C "{dir}" checkout {commithash}', None, "Couldn't checkout {name}'s hash: {commithash}")

@@ -216,7 +246,7 @@ def list_extensions(settings_file):
     disabled_extensions = set(settings.get('disabled_extensions', []))

     disable_all_extensions = settings.get('disable_all_extensions', 'none')

 

-    if 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):

         return []

 

     return [x for x in os.listdir(extensions_dir) if x not in disabled_extensions]

@@ -226,8 +256,15 @@ def run_extensions_installers(settings_file):
     if not os.path.isdir(extensions_dir):

         return

 

-    for dirname_extension in list_extensions(settings_file):

-        run_extension_installer(os.path.join(extensions_dir, dirname_extension))

+    with startup_timer.subcategory("run extensions installers"):

+        for dirname_extension in list_extensions(settings_file):

+            logging.debug(f"Installing {dirname_extension}")

+

+            path = os.path.join(extensions_dir, dirname_extension)

+

+            if os.path.isdir(path):

+                run_extension_installer(path)

+                startup_timer.record(dirname_extension)

 

 

 re_requirement = re.compile(r"\s*([-_a-zA-Z0-9]+)\s*(?:==\s*([-+_.a-zA-Z0-9]+))?\s*")

@@ -274,7 +311,6 @@ def prepare_environment():
     requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")

 

     xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.20')

-    gfpgan_package = os.environ.get('GFPGAN_PACKAGE', "https://github.com/TencentARC/GFPGAN/archive/8d2447a2d918f8eba5a4a01463fd48e45126a379.zip")

     clip_package = os.environ.get('CLIP_PACKAGE', "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip")

     openclip_package = os.environ.get('OPENCLIP_PACKAGE', "https://github.com/mlfoundations/open_clip/archive/bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b.zip")

 

@@ -285,13 +321,13 @@ def prepare_environment():
     blip_repo = os.environ.get('BLIP_REPO', 'https://github.com/salesforce/BLIP.git')

 

     stable_diffusion_commit_hash = os.environ.get('STABLE_DIFFUSION_COMMIT_HASH', "cf1d67a6fd5ea1aa600c4df58e5b47da45f6bdbf")

-    stable_diffusion_xl_commit_hash = os.environ.get('STABLE_DIFFUSION_XL_COMMIT_HASH', "5c10deee76adad0032b412294130090932317a87")

-    k_diffusion_commit_hash = os.environ.get('K_DIFFUSION_COMMIT_HASH', "c9fe758757e022f05ca5a53fa8fac28889e4f1cf")

+    stable_diffusion_xl_commit_hash = os.environ.get('STABLE_DIFFUSION_XL_COMMIT_HASH', "45c443b316737a4ab6e40413d7794a7f5657c19f")

+    k_diffusion_commit_hash = os.environ.get('K_DIFFUSION_COMMIT_HASH', "ab527a9a6d347f364e3d185ba6d714e22d80cb3c")

     codeformer_commit_hash = os.environ.get('CODEFORMER_COMMIT_HASH', "c5b4593074ba6214284d6acd5f1719b6c5d739af")

     blip_commit_hash = os.environ.get('BLIP_COMMIT_HASH', "48211a1594f1321b00f14c9f7a5b4813144b2fb9")

 

     try:

-        # the existance of this file is a signal to webui.sh/bat that webui needs to be restarted when it stops execution

+        # the existence of this file is a signal to webui.sh/bat that webui needs to be restarted when it stops execution

         os.remove(os.path.join(script_path, "tmp", "restart"))

         os.environ.setdefault('SD_WEBUI_RESTARTING', '1')

     except OSError:

@@ -300,8 +336,11 @@ def prepare_environment():
     if not args.skip_python_version_check:

         check_python_version()

 

+    startup_timer.record("checks")

+

     commit = commit_hash()

     tag = git_tag()

+    startup_timer.record("git version info")

 

     print(f"Python {sys.version}")

     print(f"Version: {tag}")

@@ -309,21 +348,22 @@ def prepare_environment():
 

     if args.reinstall_torch or not is_installed("torch") or not is_installed("torchvision"):

         run(f'"{python}" -m {torch_command}', "Installing torch and torchvision", "Couldn't install torch", live=True)

+        startup_timer.record("install torch")

 

     if not args.skip_torch_cuda_test and not check_run_python("import torch; assert torch.cuda.is_available()"):

         raise RuntimeError(

             'Torch is not able to use GPU; '

             'add --skip-torch-cuda-test to COMMANDLINE_ARGS variable to disable this check'

         )

-

-    if not is_installed("gfpgan"):

-        run_pip(f"install {gfpgan_package}", "gfpgan")

+    startup_timer.record("torch GPU test")

 

     if not is_installed("clip"):

         run_pip(f"install {clip_package}", "clip")

+        startup_timer.record("install clip")

 

     if not is_installed("open_clip"):

         run_pip(f"install {openclip_package}", "open_clip")

+        startup_timer.record("install open_clip")

 

     if (not is_installed("xformers") or args.reinstall_xformers) and args.xformers:

         if platform.system() == "Windows":

@@ -337,8 +377,11 @@ def prepare_environment():
         elif platform.system() == "Linux":

             run_pip(f"install -U -I --no-deps {xformers_package}", "xformers")

 

+        startup_timer.record("install xformers")

+

     if not is_installed("ngrok") and args.ngrok:

         run_pip("install ngrok", "ngrok")

+        startup_timer.record("install ngrok")

 

     os.makedirs(os.path.join(script_path, dir_repos), exist_ok=True)

 

@@ -348,22 +391,28 @@ def prepare_environment():
     git_clone(codeformer_repo, repo_dir('CodeFormer'), "CodeFormer", codeformer_commit_hash)

     git_clone(blip_repo, repo_dir('BLIP'), "BLIP", blip_commit_hash)

 

+    startup_timer.record("clone repositores")

+

     if not is_installed("lpips"):

         run_pip(f"install -r \"{os.path.join(repo_dir('CodeFormer'), 'requirements.txt')}\"", "requirements for CodeFormer")

+        startup_timer.record("install CodeFormer requirements")

 

     if not os.path.isfile(requirements_file):

         requirements_file = os.path.join(script_path, requirements_file)

 

     if not requirements_met(requirements_file):

         run_pip(f"install -r \"{requirements_file}\"", "requirements")

+        startup_timer.record("install requirements")

 

     run_extensions_installers(settings_file=args.ui_settings_file)

 

     if args.update_check:

         version_check(commit)

+        startup_timer.record("check version")

 

     if args.update_all_extensions:

         git_pull_recursive(extensions_dir)

+        startup_timer.record("update extensions")

 

     if "--exit" in sys.argv:

         print("Exiting because of --exit argument")