Merge branch 'master' into roy.add_simple_interrogate_api

1 files changed, 33 insertions, 9 deletions

diff --git a/launch.py b/launch.py
index 958336f2..5fa11560 100644
--- a/launch.py
+++ b/launch.py
@@ -7,6 +7,7 @@ import shlex
 import platform

 

 dir_repos = "repositories"

+dir_extensions = "extensions"

 python = sys.executable

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

 index_url = os.environ.get('INDEX_URL', "")

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

 

 

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

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

     if desc is not None:

         print(desc)

 

-    result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)

+    result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, env=os.environ if custom_env is None else custom_env)

 

     if result.returncode != 0:

 

@@ -101,9 +102,27 @@ def version_check(commit):
         else:

             print("Not a git clone, can't perform version check.")

     except Exception as e:

-        print("versipm check failed",e)

+        print("version check failed", e)

+

+

+def run_extensions_installers():

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

+        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 {dirname_extension}", custom_env=env))

+        except Exception as e:

+            print(e, file=sys.stderr)

+

 

-        

 def prepare_enviroment():

     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")

@@ -123,7 +142,7 @@ def prepare_enviroment():
 

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

     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', "60e5042ca0da89c14d1dd59d73883280f8fce991")

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

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

 

@@ -189,6 +208,8 @@ def prepare_enviroment():
 

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

 

+    run_extensions_installers()

+

     if update_check:

         version_check(commit)

     

@@ -217,12 +238,15 @@ def tests(argv):
     proc.kill()

 

 

-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()

+    start()