Pull out some of URL to Env Variable (#2578)

* moved repository url to changeable environment variable

* move stable diffusion repo itself to env

* added missing env

* Remove default URL

Co-authored-by: AUTOMATIC1111 <16777216c@gmail.com>

3 files changed, 41 insertions, 9 deletions

diff --git a/launch.py b/launch.py
index 2e6b3369..7520cfee 100644
--- a/launch.py
+++ b/launch.py
@@ -94,6 +94,15 @@ def prepare_enviroment():
 

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

+

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

+    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')

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

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

@@ -131,23 +140,23 @@ def prepare_enviroment():
 

     if (not is_installed("xformers") or reinstall_xformers) and xformers and platform.python_version().startswith("3.10"):

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

-            run_pip("install -U -I --no-deps https://github.com/C43H66N12O12S2/stable-diffusion-webui/releases/download/f/xformers-0.0.14.dev0-cp310-cp310-win_amd64.whl", "xformers")

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

         elif platform.system() == "Linux":

             run_pip("install xformers", "xformers")

 

     if not is_installed("deepdanbooru") and deepdanbooru:

-        run_pip("install git+https://github.com/KichangKim/DeepDanbooru.git@edf73df4cdaeea2cf00e9ac08bd8a9026b7a7b26#egg=deepdanbooru[tensorflow] tensorflow==2.10.0 tensorflow-io==0.27.0", "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("https://github.com/CompVis/stable-diffusion.git", repo_dir('stable-diffusion'), "Stable Diffusion", stable_diffusion_commit_hash)

-    git_clone("https://github.com/CompVis/taming-transformers.git", repo_dir('taming-transformers'), "Taming Transformers", taming_transformers_commit_hash)

-    git_clone("https://github.com/crowsonkb/k-diffusion.git", repo_dir('k-diffusion'), "K-diffusion", k_diffusion_commit_hash)

-    git_clone("https://github.com/sczhou/CodeFormer.git", repo_dir('CodeFormer'), "CodeFormer", codeformer_commit_hash)

-    git_clone("https://github.com/salesforce/BLIP.git", repo_dir('BLIP'), "BLIP", blip_commit_hash)

+    git_clone(stable_diffusion_repo, repo_dir('stable-diffusion'), "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)

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

 

     if not is_installed("lpips"):

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

diff --git a/webui-user.sh b/webui-user.sh
index 30646f5c..96293d43 100644
--- a/webui-user.sh
+++ b/webui-user.sh
@@ -12,6 +12,8 @@
 # Commandline arguments for webui.py, for example: export COMMANDLINE_ARGS="--medvram --opt-split-attention"
 export COMMANDLINE_ARGS=""
 
+#export STABLE_DIFFUSION_WEBUI_REPO="https://github.com/AUTOMATIC1111/stable-diffusion-webui.git"
+
 # python3 executable
 #python_cmd="python3"
 
@@ -30,13 +32,29 @@ export COMMANDLINE_ARGS=""
 # Requirements file to use for stable-diffusion-webui
 #export REQS_FILE="requirements_versions.txt"
 
-# Fixed git repos
+# Fixed git-based pip packages
+# Example: "git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379"
 #export K_DIFFUSION_PACKAGE=""
+
 #export GFPGAN_PACKAGE=""
+#export DEEPDANBOORU_PACKAGE=""
+#export CLIP_PACKAGE=""
+
+#export XFORMERS_WINDOWS_PACKAGE=""
+
+# Fixed git repos
+# Example: "https://github.com/C43H66N12O12S2/stable-diffusion-webui/releases/download/c/xformers-0.0.14.dev0-cp310-cp310-win_amd64.whl"
+#export STABLE_DIFFUSION_REPO=""
+#export TAMING_REANSFORMERS_REPO=""
+#export K_DIFFUSION_REPO=""
+#export CODEFORMET_REPO=""
+#export BLIP_REPO=""
 
 # Fixed git commits
+# Example: "69ae4b35e0a0f6ee1af8bb9a5d0016ccb27e36dc"
 #export STABLE_DIFFUSION_COMMIT_HASH=""
 #export TAMING_TRANSFORMERS_COMMIT_HASH=""
+#export K_DIFFUSION_COMMIT_HASH=""
 #export CODEFORMER_COMMIT_HASH=""
 #export BLIP_COMMIT_HASH=""
 
diff --git a/webui.sh b/webui.sh
index 980c0aaf..88a78459 100755
--- a/webui.sh
+++ b/webui.sh
@@ -41,6 +41,11 @@ then
     venv_dir="venv"
 fi
 
+if [[ -z "${STABLE_DIFFUSION_WEBUI_REPO}" ]]
+then
+    STABLE_DIFFUSION_WEBUI_REPO="https://github.com/AUTOMATIC1111/stable-diffusion-webui.git"
+fi
+
 if [[ -z "${LAUNCH_SCRIPT}" ]]
 then
     LAUNCH_SCRIPT="launch.py"
@@ -111,7 +116,7 @@ then
     cd "${clone_dir}"/ || { printf "\e[1m\e[31mERROR: Can't cd to %s/%s/, aborting...\e[0m" "${install_dir}" "${clone_dir}"; exit 1; }
     "${GIT}" pull
 else
-    "${GIT}" clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git "${clone_dir}"
+    "${GIT}" clone "${STABLE_DIFFUSION_WEBUI_REPO}" "${clone_dir}"
     cd "${clone_dir}"/ || { printf "\e[1m\e[31mERROR: Can't cd to %s/%s/, aborting...\e[0m" "${install_dir}" "${clone_dir}"; exit 1; }
 fi