Автоматическая установка файлов при каждом запуске интерфейса

Author: Bebra777228

.github/workflows/test_cli.yml

@@ -32,7 +32,6 @@ jobs:
 
     - name: Install necessary models
       run: |
-        python download_models.py
         python3 -m rvc.modules.model_manager "https://huggingface.co/Politrees/Victor_Tsoi/resolve/main/Victor_Tsoi.zip?download=true" "Tsoi"
 
     - name: Set up test audio
@@ -67,7 +66,6 @@ jobs:
 
     - name: Install necessary models
       run: |
-        python download_models.py
         python3 -m rvc.modules.model_manager "https://huggingface.co/Politrees/Victor_Tsoi/resolve/main/Victor_Tsoi.zip?download=true" "Tsoi"
 
     - name: Run tts script

app.py

@@ -1,6 +1,8 @@
 from assets.logging_config import configure_logging
+from assets.model_installer import check_and_install_models
 
 configure_logging(True, False, "WARNING")
+check_and_install_models()
 
 import sys
 from typing import Any

download_models.py assets/model_installer.pydownload_models.py renamed to assets/model_installer.py

@@ -2,6 +2,8 @@
 
 import requests
 
+from tqdm import tqdm
+
 PREDICTORS = "https://huggingface.co/Politrees/RVC_resources/resolve/main/predictors/"
 EMBEDDERS = "https://huggingface.co/Politrees/RVC_resources/resolve/main/embedders/pytorch/"
 
@@ -14,30 +16,42 @@
 
 
 def dl_model(link, model_name, dir_name):
-    if os.path.exists(os.path.join(dir_name, model_name)):
+    file_path = os.path.join(dir_name, model_name)
+    if os.path.exists(file_path):
         print(f"{model_name} уже существует. Пропускаем установку.")
         return
 
     r = requests.get(f"{link}{model_name}", stream=True)
     r.raise_for_status()
-    with open(os.path.join(dir_name, model_name), "wb") as f:
+
+    # Получаем общий размер файла
+    total_size = int(r.headers.get('content-length', 0))
+    # Используем tqdm для отображения прогресса
+    with open(file_path, "wb") as f, tqdm(
+        desc=f"Установка {model_name}...",
+        total=total_size,
+        unit='iB',
+        unit_scale=True,
+        unit_divisor=1024,
+    ) as bar:
         for chunk in r.iter_content(chunk_size=8192):
             f.write(chunk)
+            bar.update(len(chunk))
 
 
-if __name__ == "__main__":
+def check_and_install_models():
     try:
         predictors_names = ["rmvpe.pt", "fcpe.pt"]
         for model in predictors_names:
-            print(f"Установка {model}...")
+            print(f"Проверка {model}...")
             dl_model(PREDICTORS, model, PREDICTORS_DIR)
 
         embedder_names = ["hubert_base.pt"]
         for model in embedder_names:
-            print(f"Установка {model}...")
+            print(f"Проверка {model}...")
             dl_model(EMBEDDERS, model, EMBEDDERS_DIR)
 
-        print("Все модели успешно установлены!")
+        print("Все модели успешно установлены или уже существуют!")
     except requests.exceptions.RequestException as e:
         print(f"Произошла ошибка при загрузке модели: {e}")
     except Exception as e:

requirements-311.txt

@@ -6,6 +6,7 @@ einops
 mega-x
 gdown
 wget
+tqdm
 
 # Библиотеки для работы с аудио и видео
 ffmpeg-python>=0.2.0

run-PolGen-installer.bat

@@ -16,7 +16,6 @@ call :install_miniconda
 call :create_conda_env
 call :install_dependencies
 call :download_ffmpeg
-call :installing_necessary_models
 
 cls
 echo PolGen has been installed successfully!
@@ -94,28 +93,6 @@ echo ffmpeg and ffprobe downloaded successfully.
 echo.
 exit /b 0
 
-:installing_necessary_models
-cls
-echo Checking for required models...
-set "hubert_base=%PRINCIPAL%\rvc\models\embedders\hubert_base.pt"
-set "fcpe=%PRINCIPAL%\rvc\models\predictors\fcpe.pt"
-set "rmvpe=%PRINCIPAL%\rvc\models\predictors\rmvpe.pt"
-
-if exist "%hubert_base%" (
-    if exist "%fcpe%" (
-        if exist "%rmvpe%" (
-            echo All required models are installed.
-        )
-    )
-) else (
-    echo Required models were not found. Installing models...
-    echo.
-    env\python download_models.py
-    if errorlevel 1 goto :download_error
-)
-echo.
-exit /b 0
-
 :download_error
 echo.
 echo Download failed. Please check your internet connection and try again.

run-PolGen-installer.sh

@@ -108,30 +108,10 @@ install_ffmpeg_flatpak() {
     fi
 }
 
-installing_necessary_models() {
-    echo "Checking for required models..."
-    HUBERT_BASE="$PRINCIPAL/rvc/models/embedders/hubert_base.pt"
-    FCPE="$PRINCIPAL/rvc/models/predictors/fcpe.pt"
-    RMVPE="$PRINCIPAL/rvc/models/predictors/rmvpe.pt"
-
-    if [ -f "$HUBERT_BASE" ] && [ -f "$FCPE" ] && [ -f "$RMVPE" ]; then
-        echo "All required models are installed."
-    else
-        echo "Required models were not found. Installing models..."
-        "$ENV_DIR/bin/python" download_models.py
-        if [ $? -ne 0 ]; then
-            echo "Model installation failed."
-            exit 1
-        fi
-    fi
-    echo
-}
-
 install_miniconda
 create_conda_env
 install_dependencies
 install_ffmpeg
-installing_necessary_models
 
 echo "PolGen has been installed successfully!"
 echo "To start PolGen, please run './PolGen.sh'."