Update setup.py

setup.py

@@ -1,4 +1,4 @@
-from IPython.display import display, HTML, clear_output
+from IPython.display import display, HTML, clear_output, Image
 from ipywidgets import widgets, Layout
 from IPython import get_ipython
 from pathlib import Path
@@ -6,13 +6,18 @@ import subprocess, time, os, shlex
 from nenen88 import pull, say, download, clone, tempe
 
 version = "v1.9.4"
-xxx = "/home/studio-lab-user"
-zzz = Path(xxx) / "asd"
+repo = f"git clone -q -b {version} https://github.com/gutris1/asd"
 
-if zzz.exists():
-    git_dir = zzz / '.git'
+home = Path.home()
+webui = home / "asd"
+img = home / ".conda/loading.png"
+
+os.chdir(home)
+
+if webui.exists():
+    git_dir = webui / '.git'
     if git_dir.exists():
-        os.chdir(zzz)
+        os.chdir(webui)
         commit_hash = os.popen('git rev-parse HEAD').read().strip()
 
         if commit_hash != version:
@@ -20,140 +25,132 @@ if zzz.exists():
             get_ipython().system("git fetch --tags")
 
 else:
-    mama = f"{xxx}/.conda/setup.css"
-    fff = {"stdout": subprocess.DEVNULL, "stderr": subprocess.DEVNULL}
+    css = home / ".conda/setup.css"
+    devnull = {"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")
+    get_ipython().system(f"curl -sLo {css} https://github.com/gutris1/segsmaker/raw/main/ui/sd/asd/setup.css")
 
-    gariz = """<div class="gradient-text">asd</div>"""
-    garis = widgets.Output()
-    b1 = widgets.Button(description='SD 1.5')
-    ikuuuhhh = widgets.Button(description='Install')
+    loading = widgets.Output()
+    button1 = widgets.Button(description='SD 1.5')
+    install_button = widgets.Button(description='Install')
 
-    b1b2 = widgets.HBox([b1], layout=Layout(justify_content='space-between'))
+    button_button = widgets.HBox([button1], layout=Layout(justify_content='space-between'))
     sd_setup = widgets.Output()
-    boxxx = widgets.VBox([b1b2, ikuuuhhh], layout=Layout(
-        width='400px',
-        height='150px',
-        display='flex',
-        flex_flow='column',
-        align_items='center',
-        justify_content='space-between',
-        padding='20px'))
-
-    b1.add_class("b1")
-    ikuuuhhh.add_class("out")
-    boxxx.add_class("boxxx")
+    panel = widgets.VBox([button_button, install_button],
+                         layout=Layout(
+                             width='400px',
+                             height='150px',
+                             display='flex',
+                             flex_flow='column',
+                             align_items='center',
+                             justify_content='space-between',
+                             padding='20px'))
+    button1.add_class("b1")
+    install_button.add_class("out")
+    panel.add_class("boxxx")
     selected = [None]
 
-    def ccss(mama):
-        with open(mama, "r") as gantung:
-            susu = gantung.read()
+    def load_css(css):
+        with css.open("r") as file:
+            ccs = file.read()
 
-        display(HTML(f"<style>{susu}</style>"))
+        display(HTML(f"<style>{ccs}</style>"))
 
-    def req_list(xxx, zzz):
+    def req_list(home, webui):
         return [
-            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/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"
-        ]
-
-    def sd_clone(xxx, zzz, fff):
+            f"rm -rf {home}/tmp/* {home}/tmp {webui}/models/Stable-diffusion/tmp_ckpt {webui}/models/Lora/tmp_lora {webui}/models/ControlNet",
+            f"mkdir -p {webui}/models/Lora",
+            f"mkdir -p {webui}/models/ESRGAN",
+            f"ln -vs /tmp {home}/tmp",
+            f"ln -vs /tmp/ckpt {webui}/models/Stable-diffusion/tmp_ckpt",
+            f"ln -vs /tmp/lora {webui}/models/Lora/tmp_lora",
+            f"ln -vs /tmp/controlnet {webui}/models/ControlNet"]
+
+    def sd_clone(home, webui, devnull):
         time.sleep(1)
-        pull(f"https://github.com/gutris1/segsmaker sd {zzz}")
+        pull(f"https://github.com/gutris1/segsmaker sd {webui}")
+
+        os.chdir(webui)
+        req = req_list(home, webui)
 
-        os.chdir(zzz)
-        req = req_list(xxx, zzz)
         for lines in req:
-            subprocess.run(shlex.split(lines), **fff)
+            subprocess.run(shlex.split(lines), **devnull)
+            
+        scripts = [
+            f"https://github.com/gutris1/segsmaker/raw/main/script/zrok_reg.py {webui}/asd",
+            f"https://github.com/gutris1/segsmaker/raw/main/script/zrok.py {webui}",
+            f"https://github.com/gutris1/segsmaker/raw/main/script/pinggy.py {webui}",
+            f"https://github.com/gutris1/segsmaker/raw/main/script/ngrok.py {webui}",
+            f"https://github.com/gutris1/segsmaker/raw/main/script/venv.py {webui}"]
+            
+        upscalers = [
+            f"https://huggingface.co/pantat88/ui/resolve/main/4x-UltraSharp.pth {webui}/models/ESRGAN",
+            f"https://huggingface.co/pantat88/ui/resolve/main/4x-AnimeSharp.pth {webui}/models/ESRGAN",
+            f"https://huggingface.co/pantat88/ui/resolve/main/4x_NMKD-Superscale-SP_178000_G.pth {webui}/models/ESRGAN",
+            f"https://huggingface.co/pantat88/ui/resolve/main/4x_RealisticRescaler_100000_G.pth {webui}/models/ESRGAN",
+            f"https://huggingface.co/pantat88/ui/resolve/main/8x_RealESRGAN.pth {webui}/models/ESRGAN",
+            f"https://huggingface.co/pantat88/ui/resolve/main/4x_foolhardy_Remacri.pth {webui}/models/ESRGAN"]
+        
+        line = scripts + upscalers
+        for item in line:
+            download(item)
 
-    def sd_1_5(xxx, zzz, fff):
-        sd_clone(xxx, zzz, fff)
+    def sd_1_5(home, webui, devnull):
+        sd_clone(home, webui, devnull)
 
         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",
-            f"https://huggingface.co/pantat88/ui/resolve/main/4x_NMKD-Superscale-SP_178000_G.pth {zzz}/models/ESRGAN",
-            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",
-            f"https://github.com/gutris1/segsmaker/raw/main/script/zrok_reg.py {zzz}/asd",
-            f"https://huggingface.co/Carlos2312/asd/resolve/main/modelos.py {zzz}/asd",
-            f"https://huggingface.co/Carlos2312/asd/resolve/main/ext-1_5.txt {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}"
-        ]
-        
+            f"https://github.com/gutris1/segsmaker/raw/main/script/controlnet/cn-1_5.css {webui}/asd",
+            f"https://github.com/gutris1/segsmaker/raw/main/script/controlnet/cn-1_5.py {webui}/asd",
+            f"https://huggingface.co/Carlos2312/asd/resolve/main/modelos.py {webui}/asd",
+            f"https://huggingface.co/Carlos2312/asd/resolve/main/ext-1_5.txt {webui}/asd",
+            f"https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.safetensors {webui}/models/VAE"]
+
         for items in extras:
             download(items)
-            
-        #add
 
-        # extension
-        os.chdir(f"{zzz}/extensions")
-        clone(f"{zzz}/asd/ext-1_5.txt")
-
-        weww = f"{zzz}/asd/cn-1_5.py"
-        woww = f"{zzz}/asd/controlnet.py"
-        os.rename(weww, woww)
-
-        get_ipython().system(f"rm -rf {zzz}/embeddings")
-        get_ipython().system(f"git clone https://huggingface.co/Carlos2312/emb {zzz}/embeddings")
+        say("<br><b>【{red} Installing Extensions{d} 】{red}</b>")
+        os.chdir(webui / "extensions")
+        clone(str(webui / "asd/ext-1_5.txt"))
+        os.rename(str(webui / "asd/cn-1_5.py"), str(webui / "asd/controlnet.py"))
+        
+        get_ipython().system(f"rm -rf {webui}/embeddings")
+        get_ipython().system(f"git clone https://huggingface.co/Carlos2312/emb {webui}/embeddings")
 
-        get_ipython().system(f"rm -rf {zzz}/models/Lora")
+        get_ipython().system(f"rm -rf {webui}/models/Lora")
         get_ipython().system(f"git clone https://huggingface.co/Carlos2312/lrs {zzz}/models/Lora")
 
-        get_ipython().system(f"rm -rf {zzz}/models/adetailer")
-        get_ipython().system(f"git clone https://huggingface.co/Carlos2312/md {zzz}/models/adetailer")
-
-        get_ipython().system(f"rm -rf {zzz}/extensions/sd-dynamic-prompts/wildcards")
-        get_ipython().system(f"git clone https://huggingface.co/Carlos2312/Wilcards {zzz}/extensions/sd-dynamic-prompts/wildcards")
+        get_ipython().system(f"rm -rf {webui}/models/adetailer")
+        get_ipython().system(f"git clone https://huggingface.co/Carlos2312/md {webui}/models/adetailer")
 
-
-    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
-
-        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 sd_install(selection):  
-        with garis:
-            display(HTML(gariz))
+        get_ipython().system(f"rm -rf {webui}/extensions/sd-dynamic-prompts/wildcards")
+        get_ipython().system(f"git clone https://huggingface.co/Carlos2312/Wilcards {webui}/extensions/sd-dynamic-prompts/wildcards")
+        
+    def sd_install(selection):
+        with loading:
+            clear_output()
+            display(Image(filename=str(img)))
 
         with sd_setup:
             sd_setup.clear_output()
-            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")
+            get_ipython().system(f"{repo}")
 
-            sd_1_5(xxx, zzz, fff)
+            if selection == 'SD 1.5':
+                sd_1_5(home, webui, devnull)
                 
-            with garis:
-                garis.clear_output()
+            with loading:
+                loading.clear_output()
                 
             say("<br><b>【{red} Done{d} 】{red}</b>")
 
-    def cb(button):
+    def button_panel(button):
         selected[0] = button.description
 
-    def uuwaaahhh(button):
+    def installing(button):
         selection = selected[0]
 
         if selection:
-            widgets.Widget.close(boxxx)
+            widgets.Widget.close(panel)
             sd_setup.clear_output()
             sd_install(selection)
 
@@ -163,10 +160,9 @@ else:
                 print("少なくとも選択してよ。")
             return
 
-    b1.on_click(cb)
-    ikuuuhhh.on_click(uuwaaahhh)
+    button1.on_click(button_panel)
+    install_button.on_click(installing)
 
-    ccss(mama)
-    display(boxxx, sd_setup, garis)
-    zrok_install()
-    tempe()
+    load_css(css)
+    display(panel, sd_setup, loading)
+    tempe()