Upload 6 files

README.md

@@ -1,5 +1,5 @@
 ---
-title: SuperMerger test
+title: WebUI test
 emoji: 🐶
 colorFrom: yellow
 colorTo: blue

app.py

@@ -8,59 +8,23 @@ else:
             def wrapper(*args, **kwargs):
                 return func(*args, **kwargs)
             return wrapper
-import subprocess
-import gc
 import sys
 from pathlib import Path
-from utils import set_token, get_download_file
+from utils import set_token, git_clone, run, get_file
+HF_TOKEN = os.environ.get("HF_TOKEN")
+set_token(HF_TOKEN)
 
 @spaces.GPU
 def fake_gpu():
   pass
 
-HF_TOKEN = os.environ.get("HF_TOKEN")
-CIVITAI_API_KEY = os.environ.get("CIVITAI_API_KEY")
-set_token(HF_TOKEN)
 BASE_DIR = str(Path(__file__).resolve().parent.resolve())
 WEBUI_DIR = str(Path(BASE_DIR, "stable-diffusion-webui").resolve())
 #os.environ["PYTHONPATH"] = os.environ.get("PYTHONPATH") + f":{WEBUI_DIR}:."
 
-def get_file(url: str, path: str):
-    print(f"Downloading {url} to {path}...")
-    get_download_file(path, url, CIVITAI_API_KEY)
-
-def git_clone(url: str, path: str, pip: bool=False, addcmd: str=""):
-    os.makedirs(str(Path(BASE_DIR, path)), exist_ok=True)
-    os.chdir(Path(BASE_DIR, path))
-    print(f"Cloning {url} to {path}...")
-    cmd = f'git clone {url}'
-    print(f'Running {cmd} at {Path.cwd()}')
-    i = subprocess.run(cmd, shell=True).returncode
-    if i != 0: print(f'Error occured at running {cmd}')
-    p = url.split("/")[-1]
-    if not Path(p).exists: return
-    if pip:
-        os.chdir(Path(BASE_DIR, path, p))
-        cmd = f'pip install -r requirements.txt'
-        print(f'Running {cmd} at {Path.cwd()}')
-        i = subprocess.run(cmd, shell=True).returncode
-        if i != 0: print(f'Error occured at running {cmd}')
-    if addcmd:
-        os.chdir(Path(BASE_DIR, path, p))
-        cmd = addcmd
-        print(f'Running {cmd} at {Path.cwd()}')
-        i = subprocess.run(cmd, shell=True).returncode
-        if i != 0: print(f'Error occured at running {cmd}')
-
-def run(cmd: str):
-    print(f'Running {cmd} at {Path.cwd()}')
-    i = subprocess.run(cmd, shell=True).returncode
-    if i != 0: print(f'Error occured at running {cmd}')
-
 git_clone("https://github.com/AUTOMATIC1111/stable-diffusion-webui.git", BASE_DIR)
 
 os.chdir(WEBUI_DIR)
 #sys.path.insert(0, WEBUI_DIR)
 #run(f"python3 launch.py --precision full --no-half --no-half-vae --enable-insecure-extension-access --medvram --always-cpu --skip-torch-cuda-test --disable-gpu-warning --enable-console-prompts")
 run(f"python3 launch.py --precision full --no-half --no-half-vae --enable-insecure-extension-access --medvram --skip-torch-cuda-test --enable-console-prompts")
-

packages.txt

@@ -1 +1 @@
-git-lfs aria2
+aria2 git libgl1 libglib2.0-0 make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev git git-lfs ffmpeg libsm6 libxext6 cmake libgl1-mesa-glx

utils.py

@@ -6,6 +6,7 @@ import shutil
 import gc
 import re
 import urllib.parse
+import subprocess
 
 
 def get_token():
@@ -227,3 +228,41 @@ def duplicate_hf_repo(src_repo: str, dst_repo: str, src_repo_type: str, dst_repo
         print(f"Error: Failed to duplicate repo {src_repo} to {dst_repo}. {e}")
         return ""
 
+
+BASE_DIR = str(Path(__file__).resolve().parent.resolve())
+CIVITAI_API_KEY = os.environ.get("CIVITAI_API_KEY")
+
+
+def get_file(url: str, path: str): # requires aria2, gdown
+    print(f"Downloading {url} to {path}...")
+    get_download_file(path, url, CIVITAI_API_KEY)
+
+
+def git_clone(url: str, path: str, pip: bool=False, addcmd: str=""): # requires git
+    os.makedirs(str(Path(BASE_DIR, path)), exist_ok=True)
+    os.chdir(Path(BASE_DIR, path))
+    print(f"Cloning {url} to {path}...")
+    cmd = f'git clone {url}'
+    print(f'Running {cmd} at {Path.cwd()}')
+    i = subprocess.run(cmd, shell=True).returncode
+    if i != 0: print(f'Error occured at running {cmd}')
+    p = url.split("/")[-1]
+    if not Path(p).exists: return
+    if pip:
+        os.chdir(Path(BASE_DIR, path, p))
+        cmd = f'pip install -r requirements.txt'
+        print(f'Running {cmd} at {Path.cwd()}')
+        i = subprocess.run(cmd, shell=True).returncode
+        if i != 0: print(f'Error occured at running {cmd}')
+    if addcmd:
+        os.chdir(Path(BASE_DIR, path, p))
+        cmd = addcmd
+        print(f'Running {cmd} at {Path.cwd()}')
+        i = subprocess.run(cmd, shell=True).returncode
+        if i != 0: print(f'Error occured at running {cmd}')
+
+
+def run(cmd: str):
+    print(f'Running {cmd} at {Path.cwd()}')
+    i = subprocess.run(cmd, shell=True).returncode
+    if i != 0: print(f'Error occured at running {cmd}')