Fix 429 rate-limit: use hf_hub_download instead of raw requests

app.py

@@ -8,7 +8,6 @@ import sys
 import json
 import time
 import base64
-import subprocess
 from dataclasses import dataclass
 from typing import Any, List, Optional, Tuple, Dict
 from unicodedata import normalize as uni_normalize
@@ -17,11 +16,13 @@ import numpy as np
 from num2words import num2words
 import gradio as gr
 import onnxruntime as ort
+from download_models import download_blue_models, download_renikud
 
 # Download models if missing
 if not os.path.exists("onnx_models/text_encoder.onnx") or os.path.getsize("onnx_models/text_encoder.onnx") < 1000:
-    print("Models missing or invalid, running download_models.py...")
-    subprocess.run([sys.executable, "download_models.py"], check=True)
+    print("Models missing or invalid, downloading via huggingface_hub...")
+    download_blue_models()
+    download_renikud()
 
 # ============================================================
 # Vocabulary & Normalization

download_models.py

@@ -1,60 +1,62 @@
 import os
-import requests
-from tqdm import tqdm
-
-def download_file(url, path, token=None):
-    print(f"Downloading {url} to {path}...")
-    parent = os.path.dirname(path)
-    if parent:
-        os.makedirs(parent, exist_ok=True)
-
-    if os.path.exists(path) and os.path.getsize(path) < 100_000:
-        print(f"Removing small/invalid file: {path} ({os.path.getsize(path)} bytes)")
-        os.remove(path)
+import shutil
+from huggingface_hub import hf_hub_download
+
+BLUE_REPO = "notmax123/blue-onnx"
+RENIKUD_REPO = "thewh1teagle/renikud"
+
+BLUE_FILES = [
+    "text_encoder.onnx",
+    "reference_encoder.onnx",
+    "vector_estimator.onnx",
+    "vocoder.onnx",
+    "duration_predictor.onnx",
+    "length_pred_style.onnx",
+    "stats.npz",
+    "uncond.npz",
+]
+
+def _is_valid(path, min_bytes=100_000):
+    return os.path.exists(path) and os.path.getsize(path) >= min_bytes
+
+def download_blue_models(dest_dir="onnx_models"):
+    os.makedirs(dest_dir, exist_ok=True)
+    token = os.environ.get("HF_TOKEN") or None
+
+    for filename in BLUE_FILES:
+        dest = os.path.join(dest_dir, filename)
+        if _is_valid(dest):
+            print(f"Already present: {dest} ({os.path.getsize(dest):,} bytes)")
+            continue
+        print(f"Downloading {BLUE_REPO}/{filename} …")
+        try:
+            cached = hf_hub_download(
+                repo_id=BLUE_REPO,
+                filename=filename,
+                repo_type="model",
+                token=token,
+            )
+            shutil.copy2(cached, dest)
+            print(f"  → {dest} ({os.path.getsize(dest):,} bytes)")
+        except Exception as e:
+            print(f"  FAILED {filename}: {e}")
+            raise
 
-    if os.path.exists(path):
-        print(f"File already exists: {path} ({os.path.getsize(path)} bytes)")
+def download_renikud(dest="renikud.onnx"):
+    if _is_valid(dest, min_bytes=1_000_000):
+        print(f"Already present: {dest} ({os.path.getsize(dest):,} bytes)")
         return
-
-    headers = {
-        "User-Agent": "Mozilla/5.0"
-    }
-    if token:
-        headers["Authorization"] = f"Bearer {token}"
-
-    response = requests.get(url, stream=True, headers=headers, allow_redirects=True)
-    response.raise_for_status()
-
-    total_size = int(response.headers.get('content-length', 0))
-    with open(path, 'wb') as f, tqdm(
-        desc=path, total=total_size, unit='iB', unit_scale=True, unit_divisor=1024,
-    ) as bar:
-        for data in response.iter_content(chunk_size=8192):
-            size = f.write(data)
-            bar.update(size)
-
-    print(f"Downloaded {path}: {os.path.getsize(path)} bytes")
-
-
-# Public model repo: notmax123/blue-onnx
-BASE = "https://huggingface.co/notmax123/blue-onnx/resolve/main"
-
-MODELS = {
-    "onnx_models/text_encoder.onnx":        f"{BASE}/text_encoder.onnx?download=true",
-    "onnx_models/reference_encoder.onnx":   f"{BASE}/reference_encoder.onnx?download=true",
-    "onnx_models/vector_estimator.onnx":    f"{BASE}/vector_estimator.onnx?download=true",
-    "onnx_models/vocoder.onnx":             f"{BASE}/vocoder.onnx?download=true",
-    "onnx_models/duration_predictor.onnx":  f"{BASE}/duration_predictor.onnx?download=true",
-    "onnx_models/length_pred_style.onnx":   f"{BASE}/length_pred_style.onnx?download=true",
-    "onnx_models/stats.npz":                f"{BASE}/stats.npz?download=true",
-    "onnx_models/uncond.npz":               f"{BASE}/uncond.npz?download=true",
-    "renikud.onnx": "https://huggingface.co/thewh1teagle/renikud/resolve/main/model.onnx?download=true",
-}
+    token = os.environ.get("HF_TOKEN") or None
+    print(f"Downloading renikud model …")
+    cached = hf_hub_download(
+        repo_id=RENIKUD_REPO,
+        filename="model.onnx",
+        repo_type="model",
+        token=token,
+    )
+    shutil.copy2(cached, dest)
+    print(f"  → {dest} ({os.path.getsize(dest):,} bytes)")
 
 if __name__ == "__main__":
-    token = os.environ.get("HF_TOKEN")
-    for path, url in MODELS.items():
-        try:
-            download_file(url, path, token=token)
-        except Exception as e:
-            print(f"Failed to download {path}: {e}")
+    download_blue_models()
+    download_renikud()