Update setup.py

setup.py

@@ -1,29 +1,33 @@
 from IPython.display import display, HTML, clear_output
 from ipywidgets import widgets, Layout
 from IPython import get_ipython
-import subprocess
-import time
-import os
+from pathlib import Path
+import subprocess, time, os, shlex
 from nenen88 import pull, say, download, clone, tempe
 
+version = "v1.9.3"
 xxx = "/home/studio-lab-user"
-zzz = f"{xxx}/asd"
+zzz = Path(xxx) / "asd"
+
+if zzz.exists():
+    git_dir = zzz / '.git'
+    if git_dir.exists():
+        os.chdir(zzz)
+        commit_hash = os.popen('git rev-parse HEAD').read().strip()
+
+        if commit_hash != version:
+            get_ipython().system(f"git pull origin {version}")
+            get_ipython().system("git fetch --tags")
 
-if os.path.exists(zzz):
-    say("/home/studio-lab-user/asd{cyan} already exists. Delete it first.")
-    say("/home/studio-lab-user/asd{cyan} のおっぱいはすでに存在します。先に消してね。")
-    
 else:
     mama = f"{xxx}/.conda/setup.css"
-    fff = {"shell": True, "stdout": subprocess.DEVNULL, "stderr": subprocess.DEVNULL}
-    gariz = """
-    <div class="gradient-text">asd</div>
-    """
-    subprocess.run(f"rm -rf {xxx}/.zrok", **fff)
-    subprocess.run(f"curl -sLo {mama} https://github.com/gutris1/segsmaker/raw/main/ui/sd/asd/setup.css", **fff)
-    
+    fff = {"stdout": subprocess.DEVNULL, "stderr": subprocess.DEVNULL}
+
+    get_ipython().system(f"rm -rf {xxx}/.zrok")
+    get_ipython().system(f"curl -sLo {mama} https://github.com/gutris1/segsmaker/raw/main/ui/sd/asd/setup.css")
+
+    gariz = """<div class="gradient-text">asd</div>"""
     garis = widgets.Output()
-    selected = [None]
     b1 = widgets.Button(description='SD 1.5')
     b2 = widgets.Button(description='SDXL')
     ikuuuhhh = widgets.Button(description='Install')
@@ -43,6 +47,7 @@ else:
     b2.add_class("b2")
     ikuuuhhh.add_class("out")
     boxxx.add_class("boxxx")
+    selected = [None]
 
     def ccss(mama):
         with open(mama, "r") as gantung:
@@ -50,32 +55,31 @@ else:
 
         display(HTML(f"<style>{susu}</style>"))
 
-    def gorengan(xxx, zzz):
+    def req_list(xxx, zzz):
         return [
-            f"pip install -q -r requirements.txt basicsr",
-            f"rm -rf {xxx}/tmp/* {xxx}/tmp {zzz}/models/Stable-diffusion/tmp_models {zzz}/models/Lora/tmp_Lora {zzz}/models/ControlNet",
+            f"pip install -q -r requirements.txt basicsr insightface onnxruntime-gpu",
+            f"rm -rf {xxx}/tmp/* {xxx}/tmp {zzz}/models/Stable-diffusion/tmp_ckpt {zzz}/models/Lora/tmp_lora {zzz}/models/ControlNet",
             f"mkdir -p {zzz}/models/Lora",
             f"mkdir -p {zzz}/models/ESRGAN",
             f"ln -vs /tmp {xxx}/tmp",
-            f"ln -vs /tmp/models {zzz}/models/Stable-diffusion/tmp_models",
-            f"ln -vs /tmp/Lora {zzz}/models/Lora/tmp_Lora",
-            f"ln -vs /tmp/ControlNet {zzz}/models/ControlNet",]
-
-    def sd_1_5(xxx, zzz, fff):
-        asu = f"git clone -q -b v1.9.0 https://github.com/gutris1/asd"
-        subprocess.run(asu, **fff)
+            f"ln -vs /tmp/ckpt {zzz}/models/Stable-diffusion/tmp_ckpt",
+            f"ln -vs /tmp/lora {zzz}/models/Lora/tmp_lora",
+            f"ln -vs /tmp/controlnet {zzz}/models/ControlNet"
+        ]
 
-        time.sleep(2)
+    def sd_clone(xxx, zzz, fff):
+        time.sleep(1)
         pull(f"https://github.com/gutris1/segsmaker sd {zzz}")
 
-        # requirements , tmp symlink
         os.chdir(zzz)
-        minyak = gorengan(xxx, zzz)
-        for tepung in minyak:
-            subprocess.run(tepung, **fff)
+        req = req_list(xxx, zzz)
+        for lines in req:
+            subprocess.run(shlex.split(lines), **fff)
+
+    def sd_1_5(xxx, zzz, fff):
+        sd_clone(xxx, zzz, fff)
 
-        # embedding upscaler vae
-        jalanan = [
+        extras = [
             f"https://civitai.com/api/download/models/150491 {zzz}/embeddings edgQuality.pt",
             f"https://huggingface.co/pantat88/ui/resolve/main/4x-UltraSharp.pth {zzz}/models/ESRGAN",
             f"https://huggingface.co/pantat88/ui/resolve/main/4x-AnimeSharp.pth {zzz}/models/ESRGAN",
@@ -83,11 +87,15 @@ else:
             f"https://huggingface.co/pantat88/ui/resolve/main/4x_RealisticRescaler_100000_G.pth {zzz}/models/ESRGAN",
             f"https://huggingface.co/pantat88/ui/resolve/main/8x_RealESRGAN.pth {zzz}/models/ESRGAN",
             f"https://huggingface.co/pantat88/ui/resolve/main/4x_foolhardy_Remacri.pth {zzz}/models/ESRGAN",
-            f"https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.safetensors {zzz}/models/VAE"]
-
-        for janda in jalanan:
-            download(janda)
-
+            f"https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.safetensors {zzz}/models/VAE",
+            f"https://github.com/gutris1/segsmaker/raw/main/script/zrok_reg.py {zzz}/asd",
+            f"https://github.com/gutris1/segsmaker/raw/main/script/zrok.py {zzz}",
+            f"https://github.com/gutris1/segsmaker/raw/main/script/pinggy.py {zzz}"
+        ]
+        
+        for items in extras:
+            download(items)
+            
         #add
         subprocess.run(f"rm -rf {zzz}/asd/ext-1_5.txt",
                **fff)
@@ -126,22 +134,10 @@ else:
                **fff)
 
     def sd_xl(xxx, zzz, fff):
-        asu = f"git clone -q -b v1.8.0 https://github.com/gutris1/asd"
-        subprocess.run(asu, **fff)
-
-        time.sleep(2)
-        pull(f"https://github.com/gutris1/segsmaker sd {zzz}")
-
-        # requirements , tmp symlink
-        os.chdir(zzz)
-        minyak = gorengan(xxx, zzz)
-        for tepung in minyak:
-            subprocess.run(tepung, **fff)
+        sd_clone(xxx, zzz, fff)
 
-        # embedding upscaler vae
-        jalanan = [
+        extras = [
             f"https://civitai.com/api/download/models/182974 {zzz}/embeddings",
-            f"https://civitai.com/api/download/models/356370 {zzz}/embeddings",
             f"https://civitai.com/api/download/models/159385 {zzz}/embeddings",
             f"https://civitai.com/api/download/models/159184 {zzz}/embeddings",
             f"https://huggingface.co/pantat88/ui/resolve/main/4x-UltraSharp.pth {zzz}/models/ESRGAN",
@@ -150,36 +146,40 @@ else:
             f"https://huggingface.co/pantat88/ui/resolve/main/4x_RealisticRescaler_100000_G.pth {zzz}/models/ESRGAN",
             f"https://huggingface.co/pantat88/ui/resolve/main/8x_RealESRGAN.pth {zzz}/models/ESRGAN",
             f"https://huggingface.co/pantat88/ui/resolve/main/4x_foolhardy_Remacri.pth {zzz}/models/ESRGAN",
-            f"https://civitai.com/api/download/models/264491 {zzz}/models/VAE XL_VAE_F1.safetensors"]
+            f"https://civitai.com/api/download/models/264491 {zzz}/models/VAE XL_VAE_F1.safetensors",
+            f"https://github.com/gutris1/segsmaker/raw/main/script/zrok_reg.py {zzz}/asd",
+            f"https://github.com/gutris1/segsmaker/raw/main/script/zrok.py {zzz}",
+            f"https://github.com/gutris1/segsmaker/raw/main/script/pinggy.py {zzz}"
+        ]
 
-        for janda in jalanan:
-            download(janda)
+        for items in extras:
+            download(items)
 
-        # extension
+        say("<br><b>【{red} Installing Extensions{d} 】{red}</b>")
         os.chdir(f"{zzz}/extensions")
         clone(f"{zzz}/asd/ext-xl.txt")
 
-        weww = f"{zzz}/asd/cn-xl.py"
-        woww = f"{zzz}/asd/controlnet.py"
-        os.rename(weww, woww)
+        os.rename(f"{zzz}/asd/cn-xl.py", f"{zzz}/asd/controlnet.py")
+
+    def zrok_install():
+        zrok = Path(f"{xxx}/.zrok/bin")
+        zrok.mkdir(parents=True, exist_ok=True)
+        url = "https://github.com/openziti/zrok/releases/download/v0.4.25/zrok_0.4.25_linux_amd64.tar.gz"
+        z = zrok / Path(url).name
 
-    def zrok_in():
-        zorok = f"{xxx}/.zrok/bin"
-        os.makedirs(zorok, exist_ok=True)
-        tarok = f"{zorok}/zrok_0.4.25_linux_amd64.tar.gz"
-        subprocess.run(f"curl -sLo {tarok} https://github.com/openziti/zrok/releases/download/v0.4.25/zrok_0.4.25_linux_amd64.tar.gz", **fff)
-        subprocess.run(f"tar -xzf {tarok} -C {zorok} --wildcards *zrok", **fff)
-        subprocess.run(f"rm -rf {xxx}/.cache/*", **fff)
-        os.remove(tarok)
+        get_ipython().system(f"curl -sLo {z} {url}")
+        get_ipython().system(f"tar -xzf {z} -C {zrok} --wildcards *zrok")
+        get_ipython().system(f"rm -rf {xxx}/.cache/* {z}")
 
-    def install(selection):  
+    def sd_install(selection):  
         with garis:
             display(HTML(gariz))
 
         with sd_setup:
             sd_setup.clear_output()
-            say("【{red} Installing Stable Diffusion{d} 】{red}")
             os.chdir(xxx)
+            say("<b>【{red} Installing Stable Diffusion{d} 】{red}</b>")
+            get_ipython().system(f"git clone -q -b {version} https://github.com/gutris1/asd")
 
             if selection == 'SD 1.5':
                 sd_1_5(xxx, zzz, fff)
@@ -189,7 +189,7 @@ else:
             with garis:
                 garis.clear_output()
                 
-            say("【{red} Done{d} 】{red}")
+            say("<br><b>【{red} Done{d} 】{red}</b>")
 
     def cb(button):
         selected[0] = button.description
@@ -200,7 +200,7 @@ else:
         if selection:
             widgets.Widget.close(boxxx)
             sd_setup.clear_output()
-            install(selection)
+            sd_install(selection)
 
         else:
             with sd_setup:
@@ -214,5 +214,5 @@ else:
 
     ccss(mama)
     display(boxxx, sd_setup, garis)
-    zrok_in()
+    zrok_install()
     tempe()