Upload main.py

src/main.py

@@ -285,17 +285,16 @@ def vocal_only_pipeline(song_input, voice_model, pitch_change, is_webui=0,index_
         #orig_song_path, vocals_path = preprocess_vocals_only(song_input, mdx_model_params, song_id, is_webui, input_type, progress)
         
         pitch_change = pitch_change * 12 + pitch_change_all
-        ai_vocals_path = os.path.join(song_dir, f'{os.path.splitext(os.path.basename(orig_song_path))[0]}_{voice_model}_p{pitch_change}_i{index_rate}_fr{filter_radius}_rms{rms_mix_rate}_pro{protect}_{f0_method}{"" if f0_method != "mangio-crepe" else f"_{crepe_hop_length}"}_covervocals.wav')
+        ai_vocals_path = os.path.join(song_dir, f'{os.path.splitext(os.path.basename(orig_song_path))[0]}_{voice_model}_p{pitch_change}_i{index_rate}_fr{filter_radius}_rms{rms_mix_rate}_pro{protect}_{f0_method}{"" if f0_method != "mangio-crepe" else f"_{crepe_hop_length}"}.wav')
         display_progress(f'[~] Post reverb {ai_vocals_path}', 0.5, is_webui, progress)
+        time.sleep(10)
+        
+        display_progress('[~] Converting voice using RVC...', 0.5, is_webui, progress)
+        voice_change(voice_model, vocals_path, ai_vocals_path, pitch_change, f0_method, index_rate, filter_radius, rms_mix_rate, protect, crepe_hop_length, is_webui)
+        display_progress('[~] Applying audio effects to Vocals...', 0.8, is_webui, progress)
+        ai_vocals_mixed_path = add_audio_effects(ai_vocals_path, reverb_rm_size, reverb_wet, reverb_dry, reverb_damping)
 
-        # TODO: Add a bool parameter to condition this execution...
-        if(False):
-            display_progress('[~] Converting voice using RVC...', 0.5, is_webui, progress)
-            voice_change(voice_model, vocals_path, ai_vocals_path, pitch_change, f0_method, index_rate, filter_radius, rms_mix_rate, protect, crepe_hop_length, is_webui)
-            display_progress('[~] Applying audio effects to Vocals...', 0.8, is_webui, progress)
-            ai_vocals_mixed_path = add_audio_effects(ai_vocals_path, reverb_rm_size, reverb_wet, reverb_dry, reverb_damping)
-
-        return ai_vocals_path
+        return ai_vocals_mixed_path
     except Exception as e:
         raise_exception(str(e), is_webui)
 
@@ -352,7 +351,7 @@ def song_cover_pipeline(song_input, voice_model, pitch_change, keep_files,
                     orig_song_path, instrumentals_path, main_vocals_dereverb_path, backup_vocals_path = paths
 
             pitch_change = pitch_change * 12 + pitch_change_all
-            ai_vocals_path = os.path.join(song_dir, f'{os.path.splitext(os.path.basename(orig_song_path))[0]}_{voice_model}_p{pitch_change}_i{index_rate}_fr{filter_radius}_rms{rms_mix_rate}_pro{protect}_{f0_method}{"" if f0_method != "mangio-crepe" else f"_{crepe_hop_length}"}_covervocals.wav')
+            ai_vocals_path = os.path.join(song_dir, f'{os.path.splitext(os.path.basename(orig_song_path))[0]}_{voice_model}_p{pitch_change}_i{index_rate}_fr{filter_radius}_rms{rms_mix_rate}_pro{protect}_{f0_method}{"" if f0_method != "mangio-crepe" else f"_{crepe_hop_length}"}.wav')
             # Added _cover at the end of filename
             ai_cover_path = os.path.join(song_dir, f'{os.path.splitext(os.path.basename(orig_song_path))[0]} ({voice_model} Ver)_cover.{output_format}')
 
@@ -383,7 +382,7 @@ def song_cover_pipeline(song_input, voice_model, pitch_change, keep_files,
 
             # Returning the stems: AI cover, original vocal, original instrumental, AI generated vocal
 
-            return ai_cover_path, vocals_path, instrumentals_path, ai_vocals_path
+            return ai_cover_path, vocals_path, instrumentals_path, ai_vocals_mixed_path
                 
         except Exception as e:
             raise_exception(str(e), is_webui)