Update aria2c download

app.py

@@ -11,8 +11,9 @@ import pynvml
 from ctransformers import AutoModelForCausalLM
 from gradio.themes.base import Base
 from gradio.themes.utils import colors, fonts, sizes
-from huggingface_hub import hf_hub_download  # snapshot_download,
+from huggingface_hub import hf_hub_download, hf_hub_url  # snapshot_download,
 from loguru import logger
+from python_run_cmd import run_cmd
 
 os.environ["TZ"] = "Asia/Shanghai"
 try:
@@ -31,7 +32,9 @@ logger.debug("Start dl")
 for idx in range(5):
     logger.debug(f"attempt {idx + 1}")
     try:
-        model_path = hf_hub_download(repo_id=repo_id, filename=filename, revision="main")
+        model_path = hf_hub_download(
+            repo_id=repo_id, filename=filename, revision="main"
+        )
         break
     except Exception as exc:
         logger.error(f"failed to download {filename}: {exc}")
@@ -45,6 +48,25 @@ else:
 
 logger.debug(f"Done dl, {model_ready=}")
 
+if not model_ready:  # try aria2c
+    logger.debug("Try aria2c...")
+    url = hf_hub_url(
+        repo_id,
+        filename,
+        # revision="ggmlv3",
+    )
+    logger.debug(f"{url=}")
+    ret = run_cmd("apt update && apt install aria2 -y", mute_stdout=False)
+    logger.debug(ret)
+
+    ret1 = run_cmd(f"aria2c -c -o {filename} {url}", mute_stdout=False)
+    logger.debug(ret1)
+    model_path = f"./{filename}"
+
+    # both successful
+    if not ret.returncode and not ret1.returncode:
+        model_ready = True
+
 # Set gpu_layers to the number of layers to offload to GPU. Set to 0 if no GPU acceleration is available on your system.
 # model = AutoModelForCausalLM.from_pretrained("TheBloke/openbuddy-mistral-7B-v13-GGUF", model_file="openbuddy-mistral-7b-v13.Q4_K_S.gguf", model_type="mistral", gpu_layers=0)
 

requirements.txt

@@ -2,4 +2,5 @@ ctransformers
 # gradio
 huggingface-hub
 loguru
-pynvml
+pynvml
+python-run-cmd