new model

app.py

@@ -118,9 +118,9 @@ roformer_models = {
     'MelBand Roformer | Aspiration by Sucial' : 'aspiration_mel_band_roformer_sdr_18.9845.ckpt',
     'MelBand Roformer | Aspiration Less Aggressive by Sucial' : 'aspiration_mel_band_roformer_less_aggr_sdr_18.1201.ckpt',
     'MelBand Roformer | Bleed Suppressor V1 by unwa-97chris' : 'mel_band_roformer_bleed_suppressor_v1.ckpt',
-    'BS Roformer | Vocals Revive by Unwa': 'bs_roformer_vocals_revive_unwa.ckpt',
-    'BS Roformer | Vocals Revive V2 by Unwa': 'bs_roformer_vocals_revive_v2_unwa.ckpt',
-    'BS Roformer | Vocals Revive V3e by Unwa': 'bs_roformer_vocals_revive_v3e_unwa.ckpt'
+    'BS Roformer | Revive by pcunwa': 'bs_roformer_revive.ckpt',
+    'BS Roformer | Revive 2 by pcunwa': 'bs_roformer_revive2.ckpt',
+    'BS Roformer | Revive 3e by pcunwa': 'bs_roformer_revive3e.ckpt'
 }
 
 #=========================#
@@ -240,58 +240,6 @@ out_dir = "./outputs"
 models_dir = "./models"
 extensions = (".wav", ".flac", ".mp3", ".ogg", ".opus", ".m4a", ".aiff", ".ac3")
 
-def download_model_files_manual(model_key, model_filename, output_dir="./models"):
-    """
-    Manually download model files from models.json configuration.
-    This is needed for custom models not in audio-separator's built-in list.
-    The YAML config file will be renamed to match the model filename.
-    """
-    import requests
-    
-    os.makedirs(output_dir, exist_ok=True)
-    
-    with open(models_file, 'r', encoding='utf-8') as file:
-        model_data = json.load(file)
-    
-    if model_key not in model_data:
-        return False
-    
-    urls = model_data[model_key]
-    all_downloaded = True
-    
-    # Get the base name of the model file (without extension)
-    model_base_name = os.path.splitext(model_filename)[0]
-    
-    for url in urls:
-        original_filename = os.path.basename(urllib.parse.urlparse(url).path)
-        
-        # If this is a yaml/yml config file, rename it to match the model filename
-        if original_filename.endswith('.yaml') or original_filename.endswith('.yml'):
-            filename = f"{model_base_name}.yaml"
-        else:
-            filename = original_filename
-        
-        full_path = os.path.join(output_dir, filename)
-        
-        if os.path.exists(full_path):
-            print(f"{filename} already exists, skipping download.")
-            continue
-        
-        print(f"Downloading {original_filename} as {filename} from {url}...")
-        try:
-            response = requests.get(url, stream=True, timeout=600)
-            response.raise_for_status()
-            
-            with open(full_path, 'wb') as f:
-                for chunk in response.iter_content(chunk_size=8192):
-                    f.write(chunk)
-            print(f"Successfully downloaded {filename}")
-        except Exception as e:
-            print(f"Error downloading {filename}: {e}")
-            all_downloaded = False
-    
-    return all_downloaded
-
 def load_config_presence():
     with open(config_file, "r", encoding="utf8") as file:
         config = json.load(file)
@@ -578,8 +526,6 @@ def roformer_separator(audio, model_key, out_format, segment_size, override_seg_
     try:
         if not os.path.exists(model_path):
             gr.Info(f"This is the first time the {model_key} model is being used. The separation will take a little longer because the model needs to be downloaded.")
-            # Try to manually download custom models that aren't in audio-separator's built-in list
-            download_model_files_manual(model_key, roformer_model, models_dir)
         
         separator = Separator(
             log_level=logging.WARNING,
@@ -798,8 +744,6 @@ def roformer_batch(path_input, path_output, model_key, out_format, segment_size,
 
     if not os.path.exists(model_path):
         gr.Info(f"This is the first time the {model_key} model is being used. The separation will take a little longer because the model needs to be downloaded.")
-        # Try to manually download custom models that aren't in audio-separator's built-in list
-        download_model_files_manual(model_key, roformer_model, models_dir)
 
     for audio_files in os.listdir(path_input):
         if audio_files.endswith(extensions):

assets/models.json

@@ -1,15 +1,15 @@
 {
     "BS-Roformer-Viperx-1297": [
-        "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/model_bs_roformer_ep_317_sdr_12.9755.ckpt",
-        "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/model_bs_roformer_ep_317_sdr_12.9755.yaml"
+      "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/model_bs_roformer_ep_317_sdr_12.9755.ckpt",
+      "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/model_bs_roformer_ep_317_sdr_12.9755.yaml"
     ],
     "BS-Roformer-Viperx-1296": [
-        "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/model_bs_roformer_ep_368_sdr_12.9628.ckpt",
-        "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/model_bs_roformer_ep_368_sdr_12.9628.yaml"
+      "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/model_bs_roformer_ep_368_sdr_12.9628.ckpt",
+      "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/model_bs_roformer_ep_368_sdr_12.9628.yaml"
     ],
     "BS-Roformer-Viperx-1053": [
-        "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/model_bs_roformer_ep_937_sdr_10.5309.ckpt",
-        "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/model_bs_roformer_ep_937_sdr_10.5309.yaml"
+      "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/model_bs_roformer_ep_937_sdr_10.5309.ckpt",
+      "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/model_bs_roformer_ep_937_sdr_10.5309.yaml"
     ],
     "Mel-Roformer-Viperx-1143": [
         "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/model_mel_band_roformer_ep_3005_sdr_11.4360.ckpt",
@@ -291,17 +291,17 @@
         "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/aspiration_mel_band_roformer_less_aggr_sdr_18.1201.ckpt",
         "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/config_aspiration_mel_band_roformer.yaml"
     ],
-    "BS Roformer | Vocals Revive by Unwa": [
-        "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/bs_roformer_vocals_revive_unwa.ckpt",
-        "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/config_bs_roformer_vocals_revive_unwa.yaml"
+    "BS Roformer | Revive by pcunwa": [
+        "https://huggingface.co/pcunwa/BS-Roformer-Revive/resolve/main/bs_roformer_revive.ckpt",
+        "https://huggingface.co/pcunwa/BS-Roformer-Revive/resolve/main/config.yaml"
     ],
-    "BS Roformer | Vocals Revive V2 by Unwa": [
-        "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/bs_roformer_vocals_revive_v2_unwa.ckpt",
-        "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/config_bs_roformer_vocals_revive_unwa.yaml"
+    "BS Roformer | Revive 2 by pcunwa": [
+        "https://huggingface.co/pcunwa/BS-Roformer-Revive/resolve/main/bs_roformer_revive2.ckpt",
+        "https://huggingface.co/pcunwa/BS-Roformer-Revive/resolve/main/config.yaml"
     ],
-    "BS Roformer | Vocals Revive V3e by Unwa": [
-        "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/bs_roformer_vocals_revive_v3e_unwa.ckpt",
-        "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/config_bs_roformer_vocals_revive_unwa.yaml"
+    "BS Roformer | Revive 3e by pcunwa": [
+        "https://huggingface.co/pcunwa/BS-Roformer-Revive/resolve/main/bs_roformer_revive3e.ckpt",
+        "https://huggingface.co/pcunwa/BS-Roformer-Revive/resolve/main/config.yaml"
     ],
     "MDX23C_D1581.ckpt": [
         "https://github.com/nomadkaraoke/python-audio-separator/releases/download/model-configs/MDX23C_D1581.ckpt",

requirements.txt

@@ -1,4 +1,3 @@
-audio-separator[gpu]>=0.41.1
+audio-separator[gpu]==0.35.2
 yt_dlp
-pypresence
-requests
+pypresence