Update scripts/mainrunpodA1111.py

scripts/mainrunpodA1111.py

@@ -22,60 +22,15 @@ import zipfile
 
 
 def Deps(force_reinstall):
-    import os
-    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
-        #call(f'/bin/bash -c "source {activate_script} && pip install --upgrade pip"', shell=True)
-        
         ntbks()
         print('Modules and notebooks updated, dependencies already installed')
         os.environ['TORCH_HOME'] = '/workspace/cache/torch'
         os.environ['PYTHONWARNINGS'] = 'ignore'
     else:
-        # Создание виртуального окружения
-        venv.create(venv_dir, with_pip=True)
-
-        # Запись требований в файл requirements.txt
-        requirements = """
-        fastapi==0.87.0
-        onnxruntime==1.13.1
-        scipy==1.9.3
-        uvicorn==0.20.0
-        rembg==2.0.30
-        future
-        lmdb
-        google-auth<3,>=1.6.3
-        google-auth-oauthlib<0.5,>=0.4.1
-        grpcio>=1.24.3
-        markdown>=2.6.8
-        tensorboard-data-server<0.7.0,>=0.6.0
-        tensorboard-plugin-wit>=1.6.0
-        werkzeug>=1.0.1
-        requests==2.28.1
-        protobuf<4,>=3.20.2
-        gradio==3.41.2
-        gradio-client==0.5.0
-        huggingface-hub>=0.14.0
-        diskcache
-        pillow-avif-plugin
-        tomesd
-        pyre-extensions==0.0.29
-        """
-        
-        #with open("/workspace/requirements.txt", "w") as req_file:
-       #     req_file.write(requirements)
-            
-        # Активация виртуального окружения и установка зависимостей из файла 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'))
-        
+        ntbks()
         if os.path.exists('deps'):
             call("rm -r deps", shell=True)
         if os.path.exists('diffusers'):
@@ -84,43 +39,22 @@ def Deps(force_reinstall):
         if not os.path.exists('cache'):
             call('mkdir cache', shell=True)
         os.chdir('deps')
-        
-        # Загрузка файла
-        dwn("https://huggingface.co/spaces/stlaurentjr/RNPD/resolve/main/deps/dependencies.tar.zst", "/workspace/deps/dependencies.tar.zst", "Installing dependencies")
-        
-        # Проверка, что файл существует
-        if not os.path.exists("/workspace/deps/dependencies.tar.zst"):
-            raise FileNotFoundError("The file /workspace/deps/dependencies.tar.zst does not exist")
-        
-        # Распаковка файла
-        call('tar -C / --zstd -xf /workspace/deps/dependencies.tar.zst', shell=True, stdout=open('/dev/null', 'w'))
-        
-        # Проверка наличия файла перед использованием sed
-        hub_py_path = "/usr/local/lib/python3.10/dist-packages/transformers/utils/hub.py"
-        if os.path.exists(hub_py_path):
-            call("sed -i 's@~/.cache@/workspace/cache@' {}".format(hub_py_path), shell=True)
-        else:
-            print(f"Warning: {hub_py_path} does not exist")
-        
-        # Остальная часть кода
+        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 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(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)
-        
-        call(f'pip install --root-user-action=ignore --disable-pip-version-check -qq gradio==3.41.2"', shell=True)
-        call(f'pip install fastapi==0.87.0 onnxruntime==1.13.1 scipy==1.9.3 uvicorn==0.20.0"', shell=True)
-        call(f'pip install rembg==2.0.30"', shell=True)
-        #call("rm -r deps", shell=True)
-        
+        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()
+        clear_output()
 
-        #done()
+        done()