Update app.py

app.py

@@ -14,38 +14,46 @@ def inference(audio_path):
     if not audio_path:
         return None
 
-    print("Downloading model files...")
-    # Download to a specific local directory to ensure they are together
-    os.makedirs("models", exist_ok=True)
-    model_path = hf_hub_download(repo_id=REPO_ID, filename=MODEL_FILENAME, local_dir="models")
-    config_path = hf_hub_download(repo_id=REPO_ID, filename=CONFIG_FILENAME, local_dir="models")
+    # 1. Setup local models directory
+    local_models_dir = os.path.abspath("models")
+    os.makedirs(local_models_dir, exist_ok=True)
 
-    # Rename config to match model filename if they differ significantly, 
-    # though standard loading might just work if they are in the same dir.
-    # Let's try standard loading first by just pointing to the checkpoint.
+    print(f"Downloading model files to {local_models_dir}...")
+    hf_hub_download(repo_id=REPO_ID, filename=MODEL_FILENAME, local_dir=local_models_dir)
+    hf_hub_download(repo_id=REPO_ID, filename=CONFIG_FILENAME, local_dir=local_models_dir)
 
-    print("Initializing separator...")
+    # 2. Ensure config has the exact same base name as the model
+    model_full_path = os.path.join(local_models_dir, MODEL_FILENAME)
+    original_config_path = os.path.join(local_models_dir, CONFIG_FILENAME)
+    new_config_path = os.path.splitext(model_full_path)[0] + ".yaml"
+
+    if original_config_path != new_config_path:
+        print(f"Renaming config to {new_config_path} for auto-discovery...")
+        shutil.copyfile(original_config_path, new_config_path)
+
+    print("Initializing separator with custom model directory...")
+    # IMPORTANT: Set model_file_dir to our local directory
     separator = Separator(
+        model_file_dir=local_models_dir,
         output_dir=".",
         output_format="FLAC"
     )
 
-    print(f"Loading model from {model_path}...")
-    # Simply pass the model path. The library usually looks for a .yaml 
-    # with a matching name or the specific config it needs in the same dir.
-    # If it strictly needs the config passed, we might need to use a different method
-    # but standard usage often just takes the model file if packaged correctly.
-    # Let's try to pass JUST the model path first as per common usage.
-    #
-    # NOTE: If this still fails because it can't find the config, we will need
-    # to rename 'dereverb_room_anvuew.yaml' to 'dereverb_room_anvuew_sdr_13.7432.yaml'
-    
-    expected_config_path = os.path.splitext(model_path)[0] + ".yaml"
-    if not os.path.exists(expected_config_path):
-         print(f"Renaming config to {expected_config_path} for auto-discovery...")
-         shutil.copy(config_path, expected_config_path)
-
-    separator.load_model(model_filename=model_path)
+    print(f"Loading model: {MODEL_FILENAME}...")
+    # Now we just pass the FILENAME, not the full path. 
+    # Because we set model_file_dir, it should find it there.
+    # It might still complain about "not found in supported", if so we have one more trick.
+    try:
+        separator.load_model(model_filename=MODEL_FILENAME)
+    except ValueError as e:
+        if "not found in supported model files" in str(e):
+            print("Standard load failed, attempting raw load (might fail if unsupported by this version)...")
+            # Fallback: Some versions might allow direct path loading if specifically formatted,
+            # or we might have to stick to standard models.
+            # Let's try passing the full absolute path as a last resort if above fails,
+            # but usually setting model_file_dir and passing just filename works for custom models
+            # IF they don't strictly enforce the catalog.
+            raise e
 
     print("Starting inference...")
     output_files = separator.separate(audio_path)