Update app.py

app.py

@@ -19,7 +19,7 @@ def run(cmd, cwd=None):
     subprocess.check_call(cmd, cwd=cwd)
 
 def download_with_retry(repo_id, filename, local_dir, max_retries=3):
-    """Download with retry logic"""
+    """Download a single file with retry logic."""
     from huggingface_hub import hf_hub_download
     for attempt in range(max_retries):
         try:
@@ -28,7 +28,6 @@ def download_with_retry(repo_id, filename, local_dir, max_retries=3):
                 repo_id=repo_id,
                 filename=filename,
                 local_dir=local_dir,
-                local_dir_use_symlinks=False,
             )
             target = Path(local_dir) / filename
             if target.exists() and target.stat().st_size > 1000:
@@ -42,12 +41,36 @@ def download_with_retry(repo_id, filename, local_dir, max_retries=3):
             time.sleep(5)
     return False
 
+def snapshot_with_retry(repo_id, allow_patterns, local_dir, max_retries=3):
+    """Download a folder/pattern set from the HF repo with retry logic."""
+    from huggingface_hub import snapshot_download
+    for attempt in range(max_retries):
+        try:
+            print(f"Downloading {allow_patterns} from {repo_id} (attempt {attempt+1}/{max_retries})...", flush=True)
+            snapshot_download(
+                repo_id=repo_id,
+                allow_patterns=allow_patterns,
+                local_dir=local_dir,
+            )
+            print(f"✓ {allow_patterns} downloaded", flush=True)
+            return True
+        except Exception as e:
+            print(f"✗ Attempt {attempt+1} failed: {e}", flush=True)
+        if attempt < max_retries - 1:
+            time.sleep(5)
+    return False
+
 # 1. Guarantee RVC existence regardless of build SDK
+# NOTE: the Dockerfile now pins RVC to a specific commit at build time via
+# RVC_COMMIT. This fallback clone (used if the build step didn't run, e.g.
+# local testing) intentionally does NOT pin a commit, so if you hit weird
+# errors when running app.py standalone, check you're on the same commit
+# as the Docker image.
 if not (RVC_DIR / "webui.py").exists():
     print("RVC missing or incomplete. Performing clean clone...", flush=True)
     if RVC_DIR.exists():
         shutil.rmtree(RVC_DIR, ignore_errors=True)
-    
+
     run([
         "git", "clone", "--depth", "1",
         "https://github.com/RVC-Project/Retrieval-based-Voice-Conversion-WebUI.git",
@@ -58,19 +81,62 @@ if not (RVC_DIR / "webui.py").exists():
 sys.path.insert(0, str(RVC_DIR))
 os.chdir(RVC_DIR)
 
-# 3. Ensure asset directories exist
+# 3. Ensure asset directories exist (current layout, per upstream README)
 for asset_dir in [
     RVC_DIR / "assets" / "hubert_base",
     RVC_DIR / "assets" / "rmvpe",
     RVC_DIR / "assets" / "weights",
     RVC_DIR / "assets" / "indices",
-    RVC_DIR / "assets" / "pretrained",
-    RVC_DIR / "assets" / "pretrained_v2",
+    RVC_DIR / "assets" / "pymss_weights",
     RVC_DIR / "logs",
 ]:
     asset_dir.mkdir(parents=True, exist_ok=True)
 
-# 4. Download OldChineseMan RVC model from model repo
+BASE_MODEL_REPO = "lj1995/VoiceConversionWebUI"
+
+# 4. Download base inference assets (this is what the previous app.py was
+#    missing entirely — it only ever downloaded the custom voice model).
+print("=== Downloading base RVC inference assets ===", flush=True)
+base_ok = True
+
+# HuBERT is now a Transformers-format folder (config.json,
+# preprocessor_config.json, pytorch_model.bin) — NOT the old single
+# fairseq hubert_base.pt file.
+hubert_dir = RVC_DIR / "assets" / "hubert_base"
+if not (hubert_dir / "pytorch_model.bin").exists():
+    base_ok &= snapshot_with_retry(
+        BASE_MODEL_REPO,
+        allow_patterns=["hubert_base/*"],
+        local_dir=RVC_DIR / "assets",
+    )
+else:
+    print("✓ hubert_base already present", flush=True)
+
+# RMVPE pitch extraction model
+rmvpe_path = RVC_DIR / "assets" / "rmvpe" / "rmvpe.pt"
+if not (rmvpe_path.exists() and rmvpe_path.stat().st_size > 1000):
+    base_ok &= download_with_retry(BASE_MODEL_REPO, "rmvpe.pt", RVC_DIR / "assets" / "rmvpe")
+else:
+    print("✓ rmvpe.pt already present", flush=True)
+
+# pymss weights — only needed if you use the built-in vocal separation tab.
+# Comment this block out if you don't use that feature, to save build time.
+pymss_dir = RVC_DIR / "assets" / "pymss_weights"
+if not any(pymss_dir.iterdir()) if pymss_dir.exists() else True:
+    base_ok &= snapshot_with_retry(
+        BASE_MODEL_REPO,
+        allow_patterns=["pymss_weights/*"],
+        local_dir=RVC_DIR / "assets",
+    )
+else:
+    print("✓ pymss_weights already present", flush=True)
+
+if not base_ok:
+    print("⚠ Some base assets failed to download. Inference will likely fail.", flush=True)
+else:
+    print("=== Base assets ready ===", flush=True)
+
+# 5. Download OldChineseMan RVC model from your model repo
 model_repo = "jacky3102/OldChineseMan_RVC"
 weights_dir = RVC_DIR / "assets" / "weights"
 indices_dir = RVC_DIR / "assets" / "indices"
@@ -98,7 +164,7 @@ if all_ok:
         import torch
         pth_path = weights_dir / "OldChineseMan.pth"
         print(f"Loading {pth_path}...", flush=True)
-        state = torch.load(pth_path, map_location="cpu")
+        state = torch.load(pth_path, map_location="cpu", weights_only=False)
         print(f"✓ Model loaded. Keys: {list(state.keys())[:10]}...", flush=True)
         if "config" in state:
             print(f"  Config: {state['config']}", flush=True)
@@ -106,15 +172,21 @@ if all_ok:
         print(f"✗ Model verification failed: {e}", flush=True)
         all_ok = False
 
-if not all_ok:
-    print("⚠ Some model files failed verification. Inference may fail.", flush=True)
+if not (all_ok and base_ok):
+    print("⚠ Some model/asset files failed verification. Inference may fail.", flush=True)
 else:
     print("=== All model files ready and verified ===", flush=True)
 
-# 5. Launch RVC WebUI (webui.py is the new entry point)
+# 6. Launch RVC WebUI
+# The current webui.py reads host/port from GRADIO_SERVER_NAME /
+# GRADIO_SERVER_PORT (already set above) rather than a --port flag in the
+# rewritten branch. Run `python webui.py --help` in the build logs once to
+# confirm which flags your pinned commit actually supports, then adjust
+# the args below accordingly. --noautoopen avoids it trying to open a
+# local browser on a headless server.
 print("=== Starting RVC WebUI ===", flush=True)
 run([
     sys.executable,
     "webui.py",
-    "--port", "7860",
+    "--noautoopen",
 ], cwd=RVC_DIR)