Update scripts/mainrunpodA1111.py

scripts/mainrunpodA1111.py

@@ -26,9 +26,11 @@ def Deps(force_reinstall):
     from subprocess import call
     import venv
     
+    venv_dir = '/workspace/venv'
+    activate_script = os.path.join(venv_dir, 'bin', 'activate')
+
     if not force_reinstall and os.path.exists('/usr/local/lib/python3.10/dist-packages/safetensors'):
         # Активация виртуального окружения и обновление pip
-        activate_script = os.path.join(venv_dir, 'bin', 'activate')
         call(f'/bin/bash -c "source {activate_script} && pip install --upgrade pip"', shell=True)
         
         ntbks()
@@ -36,8 +38,10 @@ def Deps(force_reinstall):
         os.environ['TORCH_HOME'] = '/workspace/cache/torch'
         os.environ['PYTHONWARNINGS'] = 'ignore'
     else:
+        # Создание виртуального окружения
+        venv.create(venv_dir, with_pip=True)
 
-        # Активация виртуального окружения и установка зависимостей из файла requirements.txt
+        # Запись требований в файл requirements.txt
         requirements = """
         fastapi==0.87.0
         onnxruntime==1.13.1
@@ -64,14 +68,14 @@ def Deps(force_reinstall):
         pyre-extensions==0.0.29
         """
         
-        # Запись требований в файл requirements.txt
         with open("/workspace/requirements.txt", "w") as req_file:
             req_file.write(requirements)
             
-        # Установка зависимостей из requirements.txt
+        # Активация виртуального окружения и установка зависимостей из файла requirements.txt
         call(f'/bin/bash -c "source {activate_script} && pip install -r /workspace/requirements.txt"', shell=True)
         
         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'):
@@ -81,14 +85,6 @@ def Deps(force_reinstall):
             call('mkdir cache', shell=True)
         os.chdir('deps')
         
-        # Создание виртуального окружения
-        venv_dir = '/workspace/venv'
-        venv.create(venv_dir, with_pip=True)
-        
-        # Активация виртуального окружения и обновление pip
-        activate_script = os.path.join(venv_dir, 'bin', 'activate')
-        call(f'/bin/bash -c "source {activate_script} && pip install --upgrade pip"', shell=True)
-        
         # Загрузка файла
         dwn("https://huggingface.co/flix-k/sd_dependencies/resolve/80e5df1ca2fea4b1273a0162f3ad63c4a139193f/rnpddeps-t2.tar.zst", "/workspace/deps/rnpddeps-t2.tar.zst", "Installing dependencies")
         
@@ -110,7 +106,6 @@ def Deps(force_reinstall):
         os.chdir('/workspace')
         call("git clone --depth 1 -q --branch main https://github.com/TheLastBen/diffusers", shell=True, stdout=open('/dev/null', 'w'))
         
-        # Активация виртуального окружения и установка зависимостей
         call(f'/bin/bash -c "source {activate_script} && pip install --root-user-action=ignore --disable-pip-version-check -qq gradio==3.41.2"', shell=True)
         call(f'/bin/bash -c "source {activate_script} && pip install fastapi==0.87.0 onnxruntime==1.13.1 scipy==1.9.3 uvicorn==0.20.0"', shell=True)
         call(f'/bin/bash -c "source {activate_script} && pip install rembg==2.0.30"', shell=True)
@@ -119,39 +114,12 @@ def Deps(force_reinstall):
         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)
-###
-    # if not force_reinstall and os.path.exists('/usr/local/lib/python3.10/dist-packages/safetensors'):
-    #     ntbks()
-    #     print('Modules and notebooks updated, dependencies already installed')
-    #     os.environ['TORCH_HOME'] = '/workspace/cache/torch'
-    #     os.environ['PYTHONWARNINGS'] = 'ignore'
-    # 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)
-    #     call('mkdir deps', shell=True)
-    #     if not os.path.exists('cache'):
-    #         call('mkdir cache', shell=True)
-    #     os.chdir('deps')
-    #     dwn("https://huggingface.co/flix-k/sd_dependencies/resolve/80e5df1ca2fea4b1273a0162f3ad63c4a139193f/rnpddeps-t2.tar.zst", "/workspace/deps/rnpd-310.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("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)
         clear_output()
 
         done()
 
 
+
 def dwn(url, dst, msg):
     file_size = None
     req = Request(url, headers={"User-Agent": "torch.hub"})