Update app.py

app.py

@@ -3,50 +3,11 @@ from sys import executable as pyexecutable
 import subprocess
 import pathlib
 import gc
-from huggingface_hub import hf_hub_download
-import re
-import urllib.parse
 
-@spaces.GPU
-def fake_gpu():
-  pass
-
-def split_hf_url(url: str):
-    try:
-        s = list(re.findall(r'^(?:https?://huggingface.co/)(?:(datasets)/)?(.+?/.+?)/\w+?/.+?/(?:(.+)/)?(.+?.\w+)(?:\?download=true)?$', url)[0])
-        if len(s) < 4: return "", "", "", ""
-        repo_id = s[1]
-        repo_type = "dataset" if s[0] == "datasets" else "model"
-        subfolder = urllib.parse.unquote(s[2]) if s[2] else None
-        filename = urllib.parse.unquote(s[3])
-        return repo_id, filename, subfolder, repo_type
-    except Exception as e:
-        print(e)
-
-def download_hf_file(directory, url):
-    repo_id, filename, subfolder, repo_type = split_hf_url(url)
-    try:
-        if subfolder is not None: hf_hub_download(repo_id=repo_id, filename=filename, subfolder=subfolder, repo_type=repo_type, local_dir=directory)
-        else: hf_hub_download(repo_id=repo_id, filename=filename, repo_type=repo_type, local_dir=directory)
-        print(f"Downloading: {url}")
-        return True
-    except Exception as e:
-        print(f"Failed to download: {e}")
-        return False
-
-def Gitclone(URI:str,ClonePath:str = "",HASH:str = "") -> int :
+def Gitclone(URI:str,ClonePath:str = "") -> int :
   if(ClonePath == "") :
     while True:
-      try:
-        user_home =pathlib.Path.home().resolve()
-        os.chdir(str(user_home))
-      except Exception:
-        pass
       i=subprocess.run([r"git",r"clone",URI])
-      try:
-        if HASH: os.system(f"git reset --hard {HASH}")
-      except Exception:
-        pass
       if(i.returncode == 0 ): 
        del i
        gc.collect()
@@ -55,14 +16,7 @@ def Gitclone(URI:str,ClonePath:str = "",HASH:str = "") -> int :
        del i
   else: 
     while True:
-      i=subprocess.run([r"git",r"clone",URI,ClonePath], timeout=60)
-      try:
-        os.chdir(ClonePath)
-        if HASH: os.system(f"git reset --hard {HASH}")
-        user_home =pathlib.Path.home().resolve()
-        os.chdir(str(user_home))
-      except Exception:
-        pass
+      i=subprocess.run([r"git",r"clone",URI,ClonePath])
       if(i.returncode == 0 ): 
        del i
        gc.collect()
@@ -71,24 +25,20 @@ def Gitclone(URI:str,ClonePath:str = "",HASH:str = "") -> int :
        del i
 def DownLoad(URI:str,DownloadPath:str,DownLoadFileName:str ) -> int:
   while (True):
-    if "huggingface.co" in URI:
-      success=download_hf_file(DownloadPath, URI)
-      if success: return 0
-    else:
-      i=subprocess.run([r"aria2c",r"-c",r"-x" ,r"16", r"-s",r"16", r"-k" ,r"1M" ,r"-m",r"0",r"--enable-mmap=false",r"--console-log-level=error",r"-d",DownloadPath,r"-o",DownLoadFileName,URI], timeout=60);
-      if(i.returncode == 0 ): 
-        del i
-        gc.collect()
-        return 0
-      else :
-        del i
+    i=subprocess.run([r"aria2c",r"-c",r"-x" ,r"16", r"-s",r"16", r"-k" ,r"1M" ,r"-m",r"0",r"--enable-mmap=false",r"--console-log-level=error",r"-d",DownloadPath,r"-o",DownLoadFileName,URI]);
+    if(i.returncode == 0 ): 
+      del i
+      gc.collect()
+      return 0
+    else :
+      del i
 user_home =pathlib.Path.home().resolve()
 os.chdir(str(user_home))
 #clone stable-diffusion-webui repo
 print("cloning stable-diffusion-webui repo")
 Gitclone(r"https://github.com/AUTOMATIC1111/stable-diffusion-webui.git",str(user_home / r"stable-diffusion-webui"))
-#os.chdir(str(user_home / r"stable-diffusion-webui"))
-#os.system("git reset --hard 89f9faa63388756314e8a1d96cf86bf5e0663045")
+os.chdir(str(user_home / r"stable-diffusion-webui"))
+os.system("git reset --hard 89f9faa63388756314e8a1d96cf86bf5e0663045")
 #
 
 #install extensions
@@ -99,18 +49,31 @@ DownLoad(r"https://huggingface.co/embed/upscale/resolve/main/4x-UltraSharp.pth",
 while True: 
   if(subprocess.run([r"wget",r"https://raw.githubusercontent.com/camenduru/stable-diffusion-webui-scripts/main/run_n_times.py",r"-O",str(user_home / r"stable-diffusion-webui" / r"scripts" / r"run_n_times.py")]).returncode == 0):
     break
-#Gitclone(r"https://github.com/camenduru/stable-diffusion-webui-huggingface",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"stable-diffusion-webui-huggingface"))
-#Gitclone(r"https://github.com/etherealxx/batchlinks-webui",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"batchlinks-webui"))
-#Gitclone(r"https://github.com/kohya-ss/sd-webui-additional-networks",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"sd-webui-additional-networks"))
-#Gitclone(r"https://github.com/Akegarasu/sd-webui-model-converter",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"sd-webui-model-converter"))
-##Gitclone(r"https://github.com/hako-mikan/sd-webui-supermerger",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"sd-webui-supermerger"))
-#Gitclone(r"https://github.com/tmzint/sd-webui-supermerger",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"sd-webui-supermerger"))
-#Gitclone(r"https://github.com/bbc-mc/sdweb-merge-block-weighted-gui",str(user_home / r"stable-diffusion-webui" / r"extensions"/ r"sdweb-merge-block-weighted-gui"))
+#Gitclone(r"https://github.com/deforum-art/deforum-for-automatic1111-webui",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"deforum-for-automatic1111-webui" ))
+#Gitclone(r"https://github.com/BlafKing/sd-civitai-browser-plus",str(user_home / r"stable-diffusion-webui" / r"extensions"/ r"sd-civitai-browser-plus"))
+Gitclone(r"https://github.com/camenduru/stable-diffusion-webui-huggingface",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"stable-diffusion-webui-huggingface"))
+#Gitclone(r"https://github.com/bbc-mc/sdweb-merge-board",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"sdweb-merge-board"))
+Gitclone(r"https://github.com/etherealxx/batchlinks-webui",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"batchlinks-webui"))
+Gitclone(r"https://github.com/kohya-ss/sd-webui-additional-networks",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"sd-webui-additional-networks"))
+Gitclone(r"https://github.com/Akegarasu/sd-webui-model-converter",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"sd-webui-model-converter"))
+Gitclone(r"https://github.com/hako-mikan/sd-webui-supermerger",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"sd-webui-supermerger"))
+Gitclone(r"https://github.com/bbc-mc/sdweb-merge-block-weighted-gui",str(user_home / r"stable-diffusion-webui" / r"extensions"/ r"sdweb-merge-block-weighted-gui"))
 
-#Gitclone(r"https://github.com/camenduru/sd-webui-tunnels",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"sd-webui-tunnels"))
+#Gitclone(r"https://github.com/Mikubill/sd-webui-controlnet",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"sd-webui-controlnet"))
+#Gitclone(r"https://github.com/fkunn1326/openpose-editor",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"openpose-editor"))
+Gitclone(r"https://github.com/jexom/sd-webui-depth-lib",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"sd-webui-depth-lib"))
+Gitclone(r"https://github.com/hnmr293/posex",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"posex"))
+#Gitclone(r"https://github.com/nonnonstop/sd-webui-3d-open-pose-editor",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"sd-webui-3d-open-pose-editor"))
+#中文本地化的请解除下一行的注释
+#Gitclone(r"https://github.com/dtlnor/stable-diffusion-webui-localization-zh_CN.git",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"stable-diffusion-webui-localization-zh_CN"))
+#Gitclone(r"https://github.com/DominikDoom/a1111-sd-webui-tagcomplete.git" , str(user_home / r"stable-diffusion-webui" / r"extensions" / r"a1111-sd-webui-tagcomplete"))
+Gitclone(r"https://github.com/camenduru/sd-webui-tunnels",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"sd-webui-tunnels"))
 #Gitclone(r"https://github.com/etherealxx/batchlinks-webui",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"batchlinks-webui"))
-#Gitclone(r"https://github.com/catppuccin/stable-diffusion-webui",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"stable-diffusion-webui-catppuccin"))
+Gitclone(r"https://github.com/catppuccin/stable-diffusion-webui",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"stable-diffusion-webui-catppuccin"))
+
 #Gitclone(r"https://github.com/KohakuBueleaf/a1111-sd-webui-locon",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"a1111-sd-webui-locon" ))
+#Gitclone(r"https://github.com/AUTOMATIC1111/stable-diffusion-webui-rembg",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"stable-diffusion-webui-rembg"))
+#Gitclone(r"https://github.com/ashen-sensored/stable-diffusion-webui-two-shot",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"stable-diffusion-webui-two-shot"))
 #Gitclone(r"https://github.com/camenduru/sd_webui_stealth_pnginfo",str(user_home / r"stable-diffusion-webui" / r"extensions" / r"sd_webui_stealth_pnginfo"))
 
 os.chdir(user_home / r"stable-diffusion-webui")