~

app.py

@@ -14,28 +14,42 @@ from pydantic import BaseModel
 from ultimate_rvc.common import AUDIO_DIR, MODELS_DIR, TEMP_DIR
 from ultimate_rvc.core.generate.song_cover import get_named_song_dirs
 from ultimate_rvc.core.generate.speech import get_edge_tts_voice_names
-from ultimate_rvc.core.manage.audio import (get_audio_datasets,
-                                            get_named_audio_datasets,
-                                            get_saved_output_audio,
-                                            get_saved_speech_audio)
+from ultimate_rvc.core.manage.audio import (
+    get_audio_datasets,
+    get_named_audio_datasets,
+    get_saved_output_audio,
+    get_saved_speech_audio,
+)
 from ultimate_rvc.core.manage.config import get_config_names, load_config
-from ultimate_rvc.core.manage.models import (get_custom_embedder_model_names,
-                                             get_custom_pretrained_model_names,
-                                             get_training_model_names,
-                                             get_voice_model_names)
+from ultimate_rvc.core.manage.models import (
+    get_custom_embedder_model_names,
+    get_custom_pretrained_model_names,
+    get_training_model_names,
+    get_voice_model_names,
+)
 from ultimate_rvc.web.common import initialize_dropdowns
-from ultimate_rvc.web.config.component import (AnyComponentConfig, AudioConfig,
-                                               CheckboxConfig, ComponentConfig,
-                                               DropdownConfig, NumberConfig,
-                                               RadioConfig, SliderConfig,
-                                               TextboxConfig)
-from ultimate_rvc.web.config.tab import (SongGenerationConfig,
-                                         SpeechGenerationConfig,
-                                         TrainingConfig)
-from ultimate_rvc.web.tabs.generate.speech.multi_step_generation import \
-    render as render_speech_multi_step_tab
-from ultimate_rvc.web.tabs.generate.speech.one_click_generation import \
-    render as render_speech_one_click_tab
+from ultimate_rvc.web.config.component import (
+    AnyComponentConfig,
+    AudioConfig,
+    CheckboxConfig,
+    ComponentConfig,
+    DropdownConfig,
+    NumberConfig,
+    RadioConfig,
+    SliderConfig,
+    TextboxConfig,
+)
+from ultimate_rvc.web.config.tab import (
+    SongGenerationConfig,
+    SpeechGenerationConfig,
+    TrainingConfig,
+)
+from ultimate_rvc.web.tabs.generate.speech.multi_step_generation import (
+    render as render_speech_multi_step_tab,
+)
+from ultimate_rvc.web.tabs.generate.speech.one_click_generation import (
+    render as render_speech_one_click_tab,
+)
 from ultimate_rvc.web.tabs.manage.audio import render as render_audio_tab
 from ultimate_rvc.web.tabs.manage.models import render as render_models_tab
 from ultimate_rvc.web.tabs.manage.settings import render as render_settings_tab
@@ -47,38 +61,60 @@ if TYPE_CHECKING:
 from functools import partial
 
 import gradio as gr
-from ultimate_rvc.core.common import (INTERMEDIATE_AUDIO_BASE_DIR,
-                                      OUTPUT_AUDIO_DIR, copy_file_safe,
-                                      display_progress, get_file_hash,
-                                      json_dump, json_load, validate_model,
-                                      validate_url)
-from ultimate_rvc.core.exceptions import (Entity, InvalidLocationError,
-                                          Location, NotFoundError,
-                                          NotProvidedError, UIMessage,
-                                          YoutubeUrlError)
-from ultimate_rvc.core.generate.common import (convert, get_unique_base_path,
-                                               mix_audio,
-                                               validate_audio_dir_exists,
-                                               validate_audio_file_exists,
-                                               wavify)
-from ultimate_rvc.core.generate.song_cover import (get_named_song_dirs,
-                                                   get_song_cover_name,
-                                                   run_pipeline)
-from ultimate_rvc.core.generate.typing_extra import (EffectedVocalsMetaData,
-                                                     FileMetaData,
-                                                     MixedAudioType,
-                                                     PitchShiftMetaData,
-                                                     RVCAudioMetaData,
-                                                     SeparatedAudioMetaData,
-                                                     SongSourceType)
+from ultimate_rvc.core.common import (
+    INTERMEDIATE_AUDIO_BASE_DIR,
+    OUTPUT_AUDIO_DIR,
+    copy_file_safe,
+    display_progress,
+    get_file_hash,
+    json_dump,
+    json_load,
+    validate_model,
+    validate_url,
+)
+from ultimate_rvc.core.exceptions import (
+    Entity,
+    InvalidLocationError,
+    Location,
+    NotFoundError,
+    NotProvidedError,
+    UIMessage,
+    YoutubeUrlError,
+)
+from ultimate_rvc.core.generate.common import (
+    convert,
+    get_unique_base_path,
+    mix_audio,
+    validate_audio_dir_exists,
+    validate_audio_file_exists,
+    wavify,
+)
+from ultimate_rvc.core.generate.song_cover import (
+    get_named_song_dirs,
+    get_song_cover_name,
+    run_pipeline,
+)
+from ultimate_rvc.core.generate.typing_extra import (
+    EffectedVocalsMetaData,
+    FileMetaData,
+    MixedAudioType,
+    PitchShiftMetaData,
+    RVCAudioMetaData,
+    SeparatedAudioMetaData,
+    SongSourceType,
+)
 from ultimate_rvc.core.manage.audio import get_saved_output_audio
 from ultimate_rvc.typing_extra import EmbedderModel
-from ultimate_rvc.web.common import (PROGRESS_BAR, exception_harness,
-                                     toggle_intermediate_audio,
-                                     toggle_visibility,
-                                     toggle_visible_component,
-                                     update_dropdowns, update_output_name,
-                                     update_value)
+from ultimate_rvc.web.common import (
+    PROGRESS_BAR,
+    exception_harness,
+    toggle_intermediate_audio,
+    toggle_visibility,
+    toggle_visible_component,
+    update_dropdowns,
+    update_output_name,
+    update_value,
+)
 from ultimate_rvc.web.typing_extra import ConcurrencyId
 
 type StrPath = str | PathLike[str]
@@ -319,8 +355,6 @@ class DatasetType(StrEnum):
     EXISTING_DATASET = "Use existing dataset"
 
 
-
-
 class EmbedderModel(StrEnum):
     """Enumeration of audio embedding models."""
 
@@ -1919,7 +1953,9 @@ class SpeechGenerationConfig(GenerationConfig):
 total_config = load_config(config_name, TotalConfig) if config_name else TotalConfig()
 
 
-def render_song_cover_multi_step_tab(total_config: TotalConfig, cookiefile: str | None = None) -> None:
+def render_song_cover_multi_step_tab(
+    total_config: TotalConfig, cookiefile: str | None = None
+) -> None:
     """
     Render "Generate song cover - multi-step generation" tab.
 
@@ -2727,7 +2763,9 @@ def run_newpipeline(
         validate_model(custom_embedder_model, Entity.CUSTOM_EMBEDDER_MODEL)
     display_progress("[~] Retrieving song...", 0 / 9, progress_bar)
     song, song_dir = retrieve_song(source, cookiefile=cookiefile)
-    display_progress("[~] Separating vocals from instrumentals...", 1 / 9, progress_bar)
+    display_progress(
+        "[~] newpipeline: Separating vocals from instrumentals...", 1 / 9, progress_bar
+    )
     vocals_track, instrumentals_track = separate_audio(
         song,
         song_dir,
@@ -2735,7 +2773,7 @@ def run_newpipeline(
         SegmentSize.SEG_2048,
     )
     display_progress(
-        "[~] Separating main vocals from backup vocals...",
+        "[~] newpipeline: Separating main vocals from backup vocals...",
         2 / 9,
         progress_bar,
     )
@@ -2745,14 +2783,14 @@ def run_newpipeline(
         SeparationModel.UVR_MDX_NET_KARA_2,
         SegmentSize.SEG_2048,
     )
-    display_progress("[~] De-noising vocals...", 3 / 9, progress_bar)
+    display_progress("[~] newpipeline: De-noising vocals...", 3 / 9, progress_bar)
     noise_track, clean_track = separate_audio(
         clean_track,
         song_dir,
         SeparationModel.UVR_DeNoise,
         SegmentSize.SEG_2048,
     )
-    display_progress("[~] De-reverbing vocals...", 4 / 9, progress_bar)
+    display_progress("[~] newpipeline: De-reverbing vocals...", 4 / 9, progress_bar)
     reverb_track, vocals_dereverb_track = separate_audio(
         main_vocals_track,
         song_dir,
@@ -2760,7 +2798,7 @@ def run_newpipeline(
         SegmentSize.SEG_2048,
     )
 
-    display_progress("[~] Converting vocals...", 5 / 9, progress_bar)
+    display_progress("[~] newpipeline: Converting vocals...", 5 / 9, progress_bar)
     converted_vocals_track = convert(
         audio_track=vocals_dereverb_track,
         directory=song_dir,
@@ -2782,7 +2820,7 @@ def run_newpipeline(
         sid=sid,
         content_type=RVCContentType.VOCALS,
     )
-    display_progress("[~] Post-processing vocals...", 6 / 9, progress_bar)
+    display_progress("[~] newpipeline: Post-processing vocals...", 6 / 9, progress_bar)
     effected_vocals_track = postprocess(
         converted_vocals_track,
         song_dir,
@@ -2791,13 +2829,17 @@ def run_newpipeline(
         dry_level,
         damping,
     )
-    display_progress("[~] Pitch-shifting instrumentals...", 7 / 9, progress_bar)
+    display_progress(
+        "[~] newpipeline: Pitch-shifting instrumentals...", 7 / 9, progress_bar
+    )
     shifted_instrumentals_track = pitch_shift(
         instrumentals_track,
         song_dir,
         n_semitones,
     )
-    display_progress("[~] Pitch-shifting backup vocals...", 8 / 9, progress_bar)
+    display_progress(
+        "[~] newpipeline: Pitch-shifting backup vocals...", 8 / 9, progress_bar
+    )
     shifted_backup_vocals_track = pitch_shift(
         backup_vocals_track,
         song_dir,
@@ -3053,7 +3095,6 @@ def render_song_cover_one_click_tab(
         generate_btn.click(
             partial(
                 exception_harness(
-                    info_msg="New pipeline engaged expect bugs.",
                     run_newpipeline,
                     info_msg="Song cover generated successfully!",
                 ),

yt-dlp.conf

@@ -1 +0,0 @@
-/data/yt-dlp.conf