Update app.py

app.py

@@ -62,12 +62,13 @@ for f in all_files:
         hf_models[model_name].append(filename)
 
 # ---- Merge / display ----
-available_models = sorted(set(local_models) | set(hf_models.keys()))
+av_models = sorted(set(local_models) | set(hf_models.keys()))
 
 print("Local models:", local_models)
 print("HF models:", list(hf_models.keys()))
-print("Available models (combined):", available_models)
+print("Available models (combined):", av_models)
 
+models = local_models
 
 
 # Example: load a specific model (like your hubert loader)
@@ -88,34 +89,49 @@ def load_model(model_name):
 
 
 
-def model_data(model_name, use_hf=False, repo_id="simpsonsaiorg/stream-models"):
+def model_data(model_name, model_root="weights", repo_id="simpsonsaiorg/stream-models", use_hf=False):
     """
-    Load model data either from local weights folder or from HuggingFace Hub.
-    
-    Args:
-        model_name (str): name of the model (e.g. "homer", "bart")
-        use_hf (bool): whether to load from HuggingFace instead of local
-        repo_id (str): HuggingFace repo id
-    
-    Returns:
-        tgt_sr, net_g, vc, version, index_file, if_f0
+    Load a model either from local disk or HuggingFace repo.
     """
-    # -----------------------
-    # 1. Locate .pth file
-    # -----------------------
+
     if not use_hf:
-        # Local
-        model_path = os.path.join(model_root, model_name)
-        pth_files = [os.path.join(model_path, f) for f in os.listdir(model_path) if f.endswith(".pth")]
-        index_files = [os.path.join(model_path, f) for f in os.listdir(model_path) if f.endswith(".index")]
+        # --- Local load ---
+        pth_files = [
+            os.path.join(model_root, model_name, f)
+            for f in os.listdir(os.path.join(model_root, model_name))
+            if f.endswith(".pth")
+        ]
+        if len(pth_files) == 0:
+            raise ValueError(f"No .pth file found in {model_root}/{model_name}")
+        pth_path = pth_files[0]
+
+        index_files = [
+            os.path.join(model_root, model_name, f)
+            for f in os.listdir(os.path.join(model_root, model_name))
+            if f.endswith(".index")
+        ]
     else:
-        # HuggingFace
-        pth_files = [hf_hub_download(repo_id=repo_id, filename=f"{model_name}/model.pth")]
-        try:
-            index_files = [hf_hub_download(repo_id=repo_id, filename=f"{model_name}/model.index")]
-        except Exception:
-            index_files = []
+        # --- HuggingFace load ---
+        # List all files in the repo first
+        all_files = api.list_repo_files(repo_id)
+        model_files = [f for f in all_files if f.startswith(f"weights/{model_name}/")]
+        
+        # Find .pth file (pick the first one)
+        pth_files = [f for f in model_files if f.endswith(".pth")]
+        if not pth_files:
+            raise ValueError(f"No .pth file found for model {model_name} in repo")
+        pth_path = hf_hub_download(repo_id=repo_id, filename=pth_files[0])
+        
+        # Find optional index files (match any pattern like added_IVF*_v2.index)
+        index_files = [
+            hf_hub_download(repo_id=repo_id, filename=f)
+            for f in model_files
+            if f.endswith(".index") and "added_IVF" in f
+        ]
+
 
+    print(f"Loading {pth_path}")
+    
     if len(pth_files) == 0:
         raise ValueError(f"No .pth file found for model {model_name}")
     pth_path = pth_files[0]