Update scripts/mainrunpodA1111.py

scripts/mainrunpodA1111.py

@@ -23,51 +23,53 @@ import zipfile
 
 def Deps(force_reinstall):
     # Определяем путь к файлу-маркеру
-    marker_file = '/workspace/setup_complete'
-    if not force_reinstall and os.path.exists(marker_file):
-        ntbks()
-        print('Modules and notebooks updated, dependencies already installed')
-        os.environ['TORCH_HOME'] = '/workspace/cache/torch'
-        os.environ['PYTHONWARNINGS'] = 'ignore'
-        call("pip install controlnet_aux --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
-        call("pip install diskcache --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
-        call("pip install pillow-avif-plugin --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
-        call('pip install --root-user-action=ignore --disable-pip-version-check -qq gradio==3.41.2', shell=True, stdout=open('/dev/null', 'w'))
-        call("pip install pyre-extensions==0.0.29 --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
-        clear_output()
-        done()
-    else:
-        call('pip install --root-user-action=ignore --disable-pip-version-check --no-deps -qq gdown PyWavelets numpy==1.23.5 accelerate==0.12.0 --force-reinstall', shell=True, stdout=open('/dev/null', 'w'))
-        ntbks()
-        if os.path.exists('deps'):
-            call("rm -r deps", shell=True)
-        if os.path.exists('diffusers'):
-            call("rm -r diffusers", shell=True)
+    #marker_file = '/workspace/setup_complete'
+    # if not force_reinstall and os.path.exists(marker_file):
+    #     ntbks()
+    #     print('Modules and notebooks updated, dependencies already installed')
+    #     os.environ['TORCH_HOME'] = '/workspace/cache/torch'
+    #     os.environ['PYTHONWARNINGS'] = 'ignore'
+    #     call("pip install controlnet_aux --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
+    #     call("pip install diskcache --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
+    #     call("pip install pillow-avif-plugin --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
+    #     call('pip install --root-user-action=ignore --disable-pip-version-check -qq gradio==3.41.2', shell=True, stdout=open('/dev/null', 'w'))
+    #     call("pip install pyre-extensions==0.0.29 --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
+    #     clear_output()
+    #     done()
+    # else:
+    call('pip install --root-user-action=ignore --disable-pip-version-check --no-deps -qq gdown PyWavelets numpy==1.23.5 accelerate==0.12.0 --force-reinstall', shell=True, stdout=open('/dev/null', 'w'))
+    if os.path.exists('deps'):
+        call("rm -r deps", shell=True)
+    if os.path.exists('diffusers'):
+        call("rm -r diffusers", shell=True)
+    if not os.path.exists('deps'):
         call('mkdir deps', shell=True)
-        if not os.path.exists('cache'):
-            call('mkdir cache', shell=True)
         os.chdir('deps')
         dwn("https://huggingface.co/spaces/stlaurentjr/RNPD/resolve/main/deps/rnpddeps-t2.tar.zst", "/workspace/deps/rnpddeps-t2.tar.zst", "Installing dependencies")
-        call('tar -C / --zstd -xf rnpddeps-t2.tar.zst', shell=True, stdout=open('/dev/null', 'w'))
-        call("sed -i 's@~/.cache@/workspace/cache@' /usr/local/lib/python3.10/dist-packages/transformers/utils/hub.py", shell=True)
-        os.chdir('/workspace')
-        call("pip install pyre-extensions==0.0.29 --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
-        call("pip install controlnet_aux --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
-        call("pip install diskcache --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
-        call("pip install pillow-avif-plugin --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
-        call("git clone --depth 1 -q --branch main https://github.com/TheLastBen/diffusers", shell=True, stdout=open('/dev/null', 'w'))
-        call('pip install --root-user-action=ignore --disable-pip-version-check -qq gradio==3.41.2', shell=True, stdout=open('/dev/null', 'w'))
-        call("rm -r deps", shell=True)
-        os.chdir('/workspace')
-        os.environ['TORCH_HOME'] = '/workspace/cache/torch'
-        os.environ['PYTHONWARNINGS'] = 'ignore'
-        call("sed -i 's@text = _formatwarnmsg(msg)@text =\"\"@g' /usr/lib/python3.10/warnings.py", shell=True)
-        # Создаём файл-маркер после успешного выполнения установок
-        with open(marker_file, 'w') as f:
-            f.write('Setup complete')
-            
-        clear_output()
-        done()
+    if not os.path.exists('cache'):
+        call('mkdir cache', shell=True)
+    os.chdir('deps')
+    
+    call('tar -C / --zstd -xf rnpddeps-t2.tar.zst', shell=True, stdout=open('/dev/null', 'w'))
+    call("sed -i 's@~/.cache@/workspace/cache@' /usr/local/lib/python3.10/dist-packages/transformers/utils/hub.py", shell=True)
+    os.chdir('/workspace')
+    call("pip install pyre-extensions==0.0.29 --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
+    call("pip install controlnet_aux --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
+    call("pip install diskcache --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
+    call("pip install pillow-avif-plugin --root-user-action=ignore --disable-pip-version-check", shell=True, stdout=open('/dev/null', 'w'))
+    call("git clone --depth 1 -q --branch main https://github.com/TheLastBen/diffusers", shell=True, stdout=open('/dev/null', 'w'))
+    call('pip install --root-user-action=ignore --disable-pip-version-check -qq gradio==3.41.2', shell=True, stdout=open('/dev/null', 'w'))
+    call("rm -r deps", shell=True)
+    os.chdir('/workspace')
+    os.environ['TORCH_HOME'] = '/workspace/cache/torch'
+    os.environ['PYTHONWARNINGS'] = 'ignore'
+    call("sed -i 's@text = _formatwarnmsg(msg)@text =\"\"@g' /usr/lib/python3.10/warnings.py", shell=True)
+    # Создаём файл-маркер после успешного выполнения установок
+    #with open(marker_file, 'w') as f:
+    #    f.write('Setup complete')
+        
+    clear_output()
+    done()