Update visomaster/visomaster_install.py

visomaster/visomaster_install.py

@@ -1,108 +1,109 @@
-import os
-import subprocess
-import urllib.request
-
-aria2c_url = "https://huggingface.co/datasets/NeuroDonu/PortableSource/resolve/main/aria2c.exe"
-cuda_url = "https://huggingface.co/datasets/NeuroDonu/PortableSource/resolve/main/CUDA_124.7z"
-updater_url = "https://huggingface.co/datasets/NeuroDonu/PortableVersions/resolve/main/visomaster/updater.bat"
-start_url = "https://huggingface.co/datasets/NeuroDonu/PortableVersions/resolve/main/visomaster/start_nvidia.bat"
-git_repo_url = "https://github.com/visomaster/VisoMaster"
-models_url = "https://huggingface.co/datasets/NeuroDonu/PortableVersions/resolve/main/visomaster_models.7z"
-ffmpeg_url = "https://github.com/visomaster/visomaster-assets/releases/download/v0.1.0_dp/ffmpeg.exe"
-
-base_dir = os.path.dirname(os.path.abspath(__file__))
-visomaster_dir = os.path.join(base_dir, "Visomaster")
-aria2c_exe_path = os.path.join(base_dir, "aria2c.exe")
-cuda_archive_path = os.path.join(base_dir, "CUDA_124.7z")
-cuda_extract_dir = os.path.join(base_dir, "CUDA")
-seven_zip_path = os.path.join(base_dir, "7z.exe")
-git = os.path.join(base_dir, "git", "cmd", "git.exe")
-python = os.path.join(base_dir, "python", "python.exe")
-requirements = os.path.join(visomaster_dir, "requirements_cu124.txt")
-updater_bat = os.path.join(base_dir, "updater.bat")
-start_bat = os.path.join(base_dir, "start_nvidia.bat")
-ffmpeg_path = os.path.join(visomaster_dir, "dependencies",   "ffmpeg.exe")
-pip_cmd = [python, "-m", "pip", "install", "uv"]
-uv_cmd = [python, "-m", "uv", "pip", "install", "-r"]
-models_path= os.path.join(visomaster_dir, "model_assets") 
-models_name= os.path.join(models_path, "visomaster_models.7z")
-
-cuda_bin_path = os.path.join(base_dir, "CUDA", "bin")
-cuda_lib_path = os.path.join(base_dir, "CUDA", "lib")
-
-
-def download_with_urllib(url, destination):
-    with urllib.request.urlopen(url) as response, open(destination, 'wb') as out_file:
-        shutil.copyfileobj(response, out_file)
-
-def download_with_aria2c(url, destination,):
-    subprocess.run(
-        [
-            aria2c_exe_path,
-            "-d", os.path.dirname(destination),
-            "-o", os.path.basename(destination),
-            "-j", "16",
-            "-x", "16",
-            url
-        ],check=True)
-
-def extract_archive(archive_path, extract_dir):
-    subprocess.run([seven_zip_path, "x", archive_path], check=True)
-
-def clone_git_repo(repo_url, clone_dir):
-    if os.path.exists(clone_dir):
-        return
-    try:
-        subprocess.run([git, "clone", repo_url, clone_dir], check=True)
-    except subprocess.CalledProcessError as e:
-        exit(1)
-
-def modify_requirements_file(file_path):
-    with open(file_path, 'r', encoding='utf-8') as file:
-        content = file.read()
-    modified_content = content.replace("--extra-index-url", "--index-url")
-    with open(file_path, 'w', encoding='utf-8') as file:
-        file.write(modified_content)
-
-def setup_cuda_paths():
-    if os.path.exists(CUDA_BIN_PATH) and os.path.exists(CUDA_LIB_PATH):
-        current_path = os.environ.get("PATH", "")
-        os.environ["PATH"] = f"{CUDA_BIN_PATH};{CUDA_LIB_PATH};{current_path}"
-
-def install_requirements():
-    subprocess.run([pip_cmd])
-    subprocess.run([uv_cmd, requirements])
-
-def download_bat():
-    download_with_urllib(updater_url, updater_bat)
-    download_with_urllib(start_url, start_bat)
-
-def ffmpeg():
-    download_with_urllib(ffmpeg_url, ffmpeg_path)
-
-def download_models():
-    download_with_aria2c(models_url, models_name)
-    extract_archive(models_name, models_path)
-
-if __name__ == "__main__":
-    if not os.path.exists(aria2c_exe_path):
-        download_with_urllib(aria2c_url, aria2c_exe_path)
-    if not os.path.exists(cuda_archive_path):
-        download_with_aria2c(cuda_url, cuda_archive_path, aria2c_exe_path)
-    if not os.path.exists(cuda_extract_dir):
-        extract_archive(cuda_archive_path, seven_zip_path)
-    if os.path.exists(cuda_extract_dir):
-        os.remove(cuda_archive_path)
-
-    clone_git_repo(git_repo_url, visomaster_dir)
-    setup_cuda_paths()
-    modify_requirements_file(requirements)
-    install_requirements()
-    if not os.path.exists(start_bat):
-        download_bat()
-    if not os.path.exists(ffmpeg_path):
-        ffmpeg()
-    if not os.path.exists(models_path):
-        download_models()
-
+import os
+import subprocess
+import urllib.request
+import shutil
+
+aria2c_url = "https://huggingface.co/datasets/NeuroDonu/PortableSource/resolve/main/aria2c.exe"
+cuda_url = "https://huggingface.co/datasets/NeuroDonu/PortableSource/resolve/main/CUDA_124.7z"
+updater_url = "https://huggingface.co/datasets/NeuroDonu/PortableVersions/resolve/main/visomaster/updater.bat"
+start_url = "https://huggingface.co/datasets/NeuroDonu/PortableVersions/resolve/main/visomaster/start_nvidia.bat"
+git_repo_url = "https://github.com/visomaster/VisoMaster"
+models_url = "https://huggingface.co/datasets/NeuroDonu/PortableVersions/resolve/main/visomaster_models.7z"
+ffmpeg_url = "https://github.com/visomaster/visomaster-assets/releases/download/v0.1.0_dp/ffmpeg.exe"
+
+base_dir = os.path.dirname(os.path.abspath(__file__))
+visomaster_dir = os.path.join(base_dir, "Visomaster")
+aria2c_exe_path = os.path.join(base_dir, "aria2c.exe")
+cuda_archive_path = os.path.join(base_dir, "CUDA_124.7z")
+cuda_extract_dir = os.path.join(base_dir, "CUDA")
+seven_zip_path = os.path.join(base_dir, "7z.exe")
+git = os.path.join(base_dir, "git", "cmd", "git.exe")
+python = os.path.join(base_dir, "python", "python.exe")
+requirements = os.path.join(visomaster_dir, "requirements_cu124.txt")
+updater_bat = os.path.join(base_dir, "updater.bat")
+start_bat = os.path.join(base_dir, "start_nvidia.bat")
+ffmpeg_path = os.path.join(visomaster_dir, "dependencies",   "ffmpeg.exe")
+pip_cmd = [python, "-m", "pip", "install", "uv"]
+uv_cmd = [python, "-m", "uv", "pip", "install", "-r"]
+models_path= os.path.join(visomaster_dir, "model_assets") 
+models_name= os.path.join(models_path, "visomaster_models.7z")
+
+cuda_bin_path = os.path.join(base_dir, "CUDA", "bin")
+cuda_lib_path = os.path.join(base_dir, "CUDA", "lib")
+
+
+def download_with_urllib(url, destination):
+    with urllib.request.urlopen(url) as response, open(destination, 'wb') as out_file:
+        shutil.copyfileobj(response, out_file)
+
+def download_with_aria2c(url, destination,):
+    subprocess.run(
+        [
+            aria2c_exe_path,
+            "-d", os.path.dirname(destination),
+            "-o", os.path.basename(destination),
+            "-j", "16",
+            "-x", "16",
+            url
+        ],check=True)
+
+def extract_archive(archive_path, extract_dir):
+    subprocess.run([seven_zip_path, "x", archive_path], check=True)
+
+def clone_git_repo(repo_url, clone_dir):
+    if os.path.exists(clone_dir):
+        return
+    try:
+        subprocess.run([git, "clone", repo_url, clone_dir], check=True)
+    except subprocess.CalledProcessError as e:
+        exit(1)
+
+def modify_requirements_file(file_path):
+    with open(file_path, 'r', encoding='utf-8') as file:
+        content = file.read()
+    modified_content = content.replace("--extra-index-url", "--index-url")
+    with open(file_path, 'w', encoding='utf-8') as file:
+        file.write(modified_content)
+
+def setup_cuda_paths():
+    if os.path.exists(CUDA_BIN_PATH) and os.path.exists(CUDA_LIB_PATH):
+        current_path = os.environ.get("PATH", "")
+        os.environ["PATH"] = f"{CUDA_BIN_PATH};{CUDA_LIB_PATH};{current_path}"
+
+def install_requirements():
+    subprocess.run([pip_cmd])
+    subprocess.run([uv_cmd, requirements])
+
+def download_bat():
+    download_with_urllib(updater_url, updater_bat)
+    download_with_urllib(start_url, start_bat)
+
+def ffmpeg():
+    download_with_urllib(ffmpeg_url, ffmpeg_path)
+
+def download_models():
+    download_with_aria2c(models_url, models_name)
+    extract_archive(models_name, models_path)
+
+if __name__ == "__main__":
+    if not os.path.exists(aria2c_exe_path):
+        download_with_urllib(aria2c_url, aria2c_exe_path)
+    if not os.path.exists(cuda_archive_path):
+        download_with_aria2c(cuda_url, cuda_archive_path, aria2c_exe_path)
+    if not os.path.exists(cuda_extract_dir):
+        extract_archive(cuda_archive_path, seven_zip_path)
+    if os.path.exists(cuda_extract_dir):
+        os.remove(cuda_archive_path)
+
+    clone_git_repo(git_repo_url, visomaster_dir)
+    setup_cuda_paths()
+    modify_requirements_file(requirements)
+    install_requirements()
+    if not os.path.exists(start_bat):
+        download_bat()
+    if not os.path.exists(ffmpeg_path):
+        ffmpeg()
+    if not os.path.exists(models_path):
+        download_models()
+
     print("Установка завершена!")