Merge branch 'master' into inpaint_textual_inversion

1 files changed, 86 insertions, 40 deletions

diff --git a/launch.py b/launch.py
index ff2f74ba..af0d418b 100644
--- a/launch.py
+++ b/launch.py
@@ -5,6 +5,8 @@ import sys
 import importlib.util

 import shlex

 import platform

+import argparse

+import json

 

 dir_repos = "repositories"

 dir_extensions = "extensions"

@@ -17,6 +19,19 @@ def extract_arg(args, name):
     return [x for x in args if x != name], name in args

 

 

+def extract_opt(args, name):

+    opt = None

+    is_present = False

+    if name in args:

+        is_present = True

+        idx = args.index(name)

+        del args[idx]

+        if idx < len(args) and args[idx][0] != "-":

+            opt = args[idx]

+            del args[idx]

+    return args, is_present, opt

+

+

 def run(command, desc=None, errdesc=None, custom_env=None):

     if desc is not None:

         print(desc)

@@ -105,56 +120,78 @@ def version_check(commit):
         print("version check failed", e)

 

 

-def run_extensions_installers():

-    if not os.path.isdir(dir_extensions):

+def run_extension_installer(extension_dir):

+    path_installer = os.path.join(extension_dir, "install.py")

+    if not os.path.isfile(path_installer):

         return

 

-    for dirname_extension in os.listdir(dir_extensions):

-        path_installer = os.path.join(dir_extensions, dirname_extension, "install.py")

-        if not os.path.isfile(path_installer):

-            continue

+    try:

+        env = os.environ.copy()

+        env['PYTHONPATH'] = os.path.abspath(".")

+

+        print(run(f'"{python}" "{path_installer}"', errdesc=f"Error running install.py for extension {extension_dir}", custom_env=env))

+    except Exception as e:

+        print(e, file=sys.stderr)

+

+

+def list_extensions(settings_file):

+    settings = {}

+

+    try:

+        if os.path.isfile(settings_file):

+            with open(settings_file, "r", encoding="utf8") as file:

+                settings = json.load(file)

+    except Exception as e:

+        print(e, file=sys.stderr)

+

+    disabled_extensions = set(settings.get('disabled_extensions', []))

+

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

 

-        try:

-            env = os.environ.copy()

-            env['PYTHONPATH'] = os.path.abspath(".")

 

-            print(run(f'"{python}" "{path_installer}"', errdesc=f"Error running install.py for extension {dirname_extension}", custom_env=env))

-        except Exception as e:

-            print(e, file=sys.stderr)

+def run_extensions_installers(settings_file):

+    if not os.path.isdir(dir_extensions):

+        return

+

+    for dirname_extension in list_extensions(settings_file):

+        run_extension_installer(os.path.join(dir_extensions, dirname_extension))

 

 

-def prepare_enviroment():

+def prepare_environment():

     torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==1.12.1+cu113 torchvision==0.13.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113")

     requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")

     commandline_args = os.environ.get('COMMANDLINE_ARGS', "")

 

     gfpgan_package = os.environ.get('GFPGAN_PACKAGE', "git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379")

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

-    deepdanbooru_package = os.environ.get('DEEPDANBOORU_PACKAGE', "git+https://github.com/KichangKim/DeepDanbooru.git@d91a2963bf87c6a770d74894667e9ffa9f6de7ff")

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

 

     xformers_windows_package = os.environ.get('XFORMERS_WINDOWS_PACKAGE', 'https://github.com/C43H66N12O12S2/stable-diffusion-webui/releases/download/f/xformers-0.0.14.dev0-cp310-cp310-win_amd64.whl')

 

-    stable_diffusion_repo = os.environ.get('STABLE_DIFFUSION_REPO', "https://github.com/CompVis/stable-diffusion.git")

-    taming_transformers_repo = os.environ.get('TAMING_REANSFORMERS_REPO', "https://github.com/CompVis/taming-transformers.git")

+    stable_diffusion_repo = os.environ.get('STABLE_DIFFUSION_REPO', "https://github.com/Stability-AI/stablediffusion.git")

+    taming_transformers_repo = os.environ.get('TAMING_TRANSFORMERS_REPO', "https://github.com/CompVis/taming-transformers.git")

     k_diffusion_repo = os.environ.get('K_DIFFUSION_REPO', 'https://github.com/crowsonkb/k-diffusion.git')

-    codeformer_repo = os.environ.get('CODEFORMET_REPO', 'https://github.com/sczhou/CodeFormer.git')

+    codeformer_repo = os.environ.get('CODEFORMER_REPO', 'https://github.com/sczhou/CodeFormer.git')

     blip_repo = os.environ.get('BLIP_REPO', 'https://github.com/salesforce/BLIP.git')

 

-    stable_diffusion_commit_hash = os.environ.get('STABLE_DIFFUSION_COMMIT_HASH', "69ae4b35e0a0f6ee1af8bb9a5d0016ccb27e36dc")

+    stable_diffusion_commit_hash = os.environ.get('STABLE_DIFFUSION_COMMIT_HASH', "47b6b607fdd31875c9279cd2f4f16b92e4ea958e")

     taming_transformers_commit_hash = os.environ.get('TAMING_TRANSFORMERS_COMMIT_HASH', "24268930bf1dce879235a7fddd0b2355b84d7ea6")

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

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

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

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

 

     sys.argv += shlex.split(commandline_args)

-    test_argv = [x for x in sys.argv if x != '--tests']

 

+    parser = argparse.ArgumentParser()

+    parser.add_argument("--ui-settings-file", type=str, help="filename to use for ui settings", default='config.json')

+    args, _ = parser.parse_known_args(sys.argv)

+

+    sys.argv, _ = extract_arg(sys.argv, '-f')

     sys.argv, skip_torch_cuda_test = extract_arg(sys.argv, '--skip-torch-cuda-test')

     sys.argv, reinstall_xformers = extract_arg(sys.argv, '--reinstall-xformers')

     sys.argv, update_check = extract_arg(sys.argv, '--update-check')

-    sys.argv, run_tests = extract_arg(sys.argv, '--tests')

+    sys.argv, run_tests, test_dir = extract_opt(sys.argv, '--tests')

     xformers = '--xformers' in sys.argv

-    deepdanbooru = '--deepdanbooru' in sys.argv

     ngrok = '--ngrok' in sys.argv

 

     try:

@@ -177,6 +214,9 @@ def prepare_enviroment():
     if not is_installed("clip"):

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

 

+    if not is_installed("open_clip"):

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

+

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

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

             if platform.python_version().startswith("3.10"):

@@ -189,15 +229,12 @@ def prepare_enviroment():
         elif platform.system() == "Linux":

             run_pip("install xformers", "xformers")

 

-    if not is_installed("deepdanbooru") and deepdanbooru:

-        run_pip(f"install {deepdanbooru_package}#egg=deepdanbooru[tensorflow] tensorflow==2.10.0 tensorflow-io==0.27.0", "deepdanbooru")

-

     if not is_installed("pyngrok") and ngrok:

         run_pip("install pyngrok", "ngrok")

 

     os.makedirs(dir_repos, exist_ok=True)

 

-    git_clone(stable_diffusion_repo, repo_dir('stable-diffusion'), "Stable Diffusion", stable_diffusion_commit_hash)

+    git_clone(stable_diffusion_repo, repo_dir('stable-diffusion-stability-ai'), "Stable Diffusion", stable_diffusion_commit_hash)

     git_clone(taming_transformers_repo, repo_dir('taming-transformers'), "Taming Transformers", taming_transformers_commit_hash)

     git_clone(k_diffusion_repo, repo_dir('k-diffusion'), "K-diffusion", k_diffusion_commit_hash)

     git_clone(codeformer_repo, repo_dir('CodeFormer'), "CodeFormer", codeformer_commit_hash)

@@ -208,7 +245,7 @@ def prepare_enviroment():
 

     run_pip(f"install -r {requirements_file}", "requirements for Web UI")

 

-    run_extensions_installers()

+    run_extensions_installers(settings_file=args.ui_settings_file)

 

     if update_check:

         version_check(commit)

@@ -218,32 +255,41 @@ def prepare_enviroment():
         exit(0)

 

     if run_tests:

-        tests(test_argv)

-        exit(0)

+        exitcode = tests(test_dir)

+        exit(exitcode)

 

 

-def tests(argv):

-    if "--api" not in argv:

-        argv.append("--api")

+def tests(test_dir):

+    if "--api" not in sys.argv:

+        sys.argv.append("--api")

+    if "--ckpt" not in sys.argv:

+        sys.argv.append("--ckpt")

+        sys.argv.append("./test/test_files/empty.pt")

+    if "--skip-torch-cuda-test" not in sys.argv:

+        sys.argv.append("--skip-torch-cuda-test")

 

-    print(f"Launching Web UI in another process for testing with arguments: {' '.join(argv[1:])}")

+    print(f"Launching Web UI in another process for testing with arguments: {' '.join(sys.argv[1:])}")

 

     with open('test/stdout.txt', "w", encoding="utf8") as stdout, open('test/stderr.txt', "w", encoding="utf8") as stderr:

-        proc = subprocess.Popen([sys.executable, *argv], stdout=stdout, stderr=stderr)

+        proc = subprocess.Popen([sys.executable, *sys.argv], stdout=stdout, stderr=stderr)

 

     import test.server_poll

-    test.server_poll.run_tests()

+    exitcode = test.server_poll.run_tests(proc, test_dir)

 

     print(f"Stopping Web UI process with id {proc.pid}")

     proc.kill()

+    return exitcode

 

 

-def start_webui():

-    print(f"Launching Web UI with arguments: {' '.join(sys.argv[1:])}")

+def start():

+    print(f"Launching {'API server' if '--nowebui' in sys.argv else 'Web UI'} with arguments: {' '.join(sys.argv[1:])}")

     import webui

-    webui.webui()

+    if '--nowebui' in sys.argv:

+        webui.api_only()

+    else:

+        webui.webui()

 

 

 if __name__ == "__main__":

-    prepare_enviroment()

-    start_webui()

+    prepare_environment()

+    start()