Update app.py

app.py

@@ -141,22 +141,23 @@ def prepare_output_dir(input_file, output_dir):
         raise RuntimeError(f"Failed to prepare output directory {out_dir}: {e}")
     return out_dir
 
-def rename_stems(audio, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem):
+def rename_stems(audio, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem, model):
     base_name = os.path.splitext(os.path.basename(audio))[0]
     stems = {
-        "Vocals": vocals_stem.replace("{base_name}", base_name),
-        "Instrumental": instrumental_stem.replace("{base_name}", base_name),
-        "Drums": drums_stem.replace("{base_name}", base_name),
-        "Bass": bass_stem.replace("{base_name}", base_name),
-        "Other": other_stem.replace("{base_name}", base_name),
-        "Guitar": guitar_stem.replace("{base_name}", base_name),
-        "Piano": piano_stem.replace("{base_name}", base_name),
+        "Vocals": vocals_stem.replace("<IN>", base_name).replace("<SN>", "Vocals").replace("<MN>", model),
+        "Instrumental": instrumental_stem.replace("<IN>", base_name).replace("<SN>", "Instrumental").replace("<MN>", model),
+        "Drums": drums_stem.replace("<IN>", base_name).replace("<SN>", "Drums").replace("<MN>", model),
+        "Bass": bass_stem.replace("<IN>", base_name).replace("<SN>", "Bass").replace("<MN>", model),
+        "Other": other_stem.replace("<IN>", base_name).replace("<SN>", "Other").replace("<MN>", model),
+        "Guitar": guitar_stem.replace("<IN>", base_name).replace("<SN>", "Guitar").replace("<MN>", model),
+        "Piano": piano_stem.replace("<IN>", base_name).replace("<SN>", "Piano").replace("<MN>", model),
     }
     return stems
 
+# Обновленные функции для сепарации
 def roformer_separator(audio, model_key, seg_size, override_seg_size, overlap, pitch_shift, model_dir, out_dir, out_format, norm_thresh, amp_thresh, batch_size, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem, progress=gr.Progress(track_tqdm=True)):
     """Separate audio using Roformer model."""
-    stemname = rename_stems(audio, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem)
+    stemname = rename_stems(audio, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem, model_key)
     print_message(audio, model_key)
     model = ROFORMER_MODELS[model_key]
     try:
@@ -192,7 +193,7 @@ def roformer_separator(audio, model_key, seg_size, override_seg_size, overlap, p
 
 def mdx23c_separator(audio, model, seg_size, override_seg_size, overlap, pitch_shift, model_dir, out_dir, out_format, norm_thresh, amp_thresh, batch_size, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem, progress=gr.Progress(track_tqdm=True)):
     """Separate audio using MDX23C model."""
-    stemname = rename_stems(audio, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem)
+    stemname = rename_stems(audio, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem, model)
     print_message(audio, model)
     try:
         out_dir = prepare_output_dir(audio, out_dir)
@@ -227,7 +228,7 @@ def mdx23c_separator(audio, model, seg_size, override_seg_size, overlap, pitch_s
 
 def mdx_separator(audio, model, hop_length, seg_size, overlap, denoise, model_dir, out_dir, out_format, norm_thresh, amp_thresh, batch_size, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem, progress=gr.Progress(track_tqdm=True)):
     """Separate audio using MDX-NET model."""
-    stemname = rename_stems(audio, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem)
+    stemname = rename_stems(audio, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem, model)
     print_message(audio, model)
     try:
         out_dir = prepare_output_dir(audio, out_dir)
@@ -262,7 +263,7 @@ def mdx_separator(audio, model, hop_length, seg_size, overlap, denoise, model_di
 
 def vr_separator(audio, model, window_size, aggression, tta, post_process, post_process_threshold, high_end_process, model_dir, out_dir, out_format, norm_thresh, amp_thresh, batch_size, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem, progress=gr.Progress(track_tqdm=True)):
     """Separate audio using VR ARCH model."""
-    stemname = rename_stems(audio, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem)
+    stemname = rename_stems(audio, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem, model)
     print_message(audio, model)
     try:
         out_dir = prepare_output_dir(audio, out_dir)
@@ -299,7 +300,7 @@ def vr_separator(audio, model, window_size, aggression, tta, post_process, post_
 
 def demucs_separator(audio, model, seg_size, shifts, overlap, segments_enabled, model_dir, out_dir, out_format, norm_thresh, amp_thresh, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem, progress=gr.Progress(track_tqdm=True)):
     """Separate audio using Demucs model."""
-    stemname = rename_stems(audio, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem)
+    stemname = rename_stems(audio, vocals_stem, instrumental_stem, other_stem, drums_stem, bass_stem, guitar_stem, piano_stem, model)
     print_message(audio, model)
     try:
         out_dir = prepare_output_dir(audio, out_dir)
@@ -327,7 +328,7 @@ def demucs_separator(audio, model, seg_size, shifts, overlap, segments_enabled,
         print(f"Separation complete!\nResults: {', '.join(separation)}")
 
         stems = [os.path.join(out_dir, file_name) for file_name in separation]
-        
+
         if model == "htdemucs_6s.yaml":
             return stems[0], stems[1], stems[2], stems[3], stems[4], stems[5]
         else:
@@ -335,12 +336,7 @@ def demucs_separator(audio, model, seg_size, shifts, overlap, segments_enabled,
     except Exception as e:
         raise RuntimeError(f"Demucs separation failed: {e}") from e
 
-def update_stems(model):
-    if model == "htdemucs_6s.yaml":
-        return gr.update(visible=True)
-    else:
-        return gr.update(visible=False)
-
+# Обновленный интерфейс
 with gr.Blocks(
     title="🎵 PolUVR 🎵",
     css="footer{display:none !important}",
@@ -437,7 +433,6 @@ with gr.Blocks(
         with gr.Row():
             demucs_stem1 = gr.Audio(label="Stem 1", type="filepath", interactive=False)
             demucs_stem2 = gr.Audio(label="Stem 2", type="filepath", interactive=False)
-        with gr.Row():
             demucs_stem3 = gr.Audio(label="Stem 3", type="filepath", interactive=False)
             demucs_stem4 = gr.Audio(label="Stem 4", type="filepath", interactive=False)
         with gr.Row(visible=False) as stem6:
@@ -453,22 +448,26 @@ with gr.Blocks(
                   output_format = gr.Dropdown(value="wav", choices=["wav", "flac", "mp3"], label="Output Format", info="The format of the output audio file.")
               with gr.Row():
                   norm_threshold = gr.Slider(minimum=0.1, maximum=1, step=0.1, value=0.9, label="Normalization threshold", info="The threshold for audio normalization.")
-                  amp_threshold = gr.Slider(minimum=0.0, maximum=1, step=0.1, value=0.0, label="Amplification threshold", info="The threshold for audio amplification.")
+                  amp_threshold = gr.Slider(minimum=0.1, maximum=1, step=0.1, value=0.0, label="Amplification threshold", info="The threshold for audio amplification.")
               with gr.Row():
                   batch_size = gr.Slider(minimum=1, maximum=16, step=1, value=1, label="Batch Size", info="Larger consumes more RAM but may process slightly faster.")
 
         with gr.Accordion("Rename Stems", open=False):
-            gr.HTML("<h3> `{base_name}` - input file name </h3>")
+            gr.HTML("<h3>Input File Name: <code><IN></code> - Automatic detection</h3>")
+            gr.HTML("<h3>Stem Name: <code><SN></code> - Automatic detection (e.g., Vocals, Instrumental)</h3>")
+            gr.HTML("<h3>Model Name: <code><MN></code> - Automatic detection (e.g., BS-Roformer-Viperx-1297)</h3>")
+            gr.HTML("<h3>Usage Example: <code><IN>_<SN>_<MN></code></h3>")
+            gr.HTML("<h3>Output File Name: <code>Music_(Vocals)_BS-Roformer-Viperx-1297</code></h3>")
             with gr.Row():
-                vocals_stem = gr.Textbox(value="{base_name}_(Vocals)", label="Vocals Stem", placeholder="{base_name}_(Vocals)")
-                instrumental_stem = gr.Textbox(value="{base_name}_(Instrumental)", label="Instrumental Stem", placeholder="{base_name}_(Instrumental)")
-                other_stem = gr.Textbox(value="{base_name}_(Other)", label="Other Stem", placeholder="{base_name}_(Other)")
+                vocals_stem = gr.Textbox(value="<IN>_(<SN>)_<MN>", label="Vocals Stem", info="Пример вывода: Music_(Vocals)_BS-Roformer-Viperx-1297", placeholder="<IN>_(<SN>)_<MN>")
+                instrumental_stem = gr.Textbox(value="<IN>_(<SN>)_<MN>", label="Instrumental Stem", info="Пример вывода: Music_(Instrumental)_BS-Roformer-Viperx-1297", placeholder="<IN>_(<SN>)_<MN>")
+                other_stem = gr.Textbox(value="<IN>_(<SN>)_<MN>", label="Other Stem", info="Пример вывода: Music_(Other)_BS-Roformer-Viperx-1297", placeholder="<IN>_(<SN>)_<MN>")
             with gr.Row():
-                drums_stem = gr.Textbox(value="{base_name}_(Drums)", label="Drums Stem", placeholder="{base_name}_(Drums)")
-                bass_stem = gr.Textbox(value="{base_name}_(Bass)", label="Bass Stem", placeholder="{base_name}_(Bass)")
+                drums_stem = gr.Textbox(value="<IN>_(<SN>)_<MN>", label="Drums Stem", info="Пример вывода: Music_(Drums)_BS-Roformer-Viperx-1297", placeholder="<IN>_(<SN>)_<MN>")
+                bass_stem = gr.Textbox(value="<IN>_(<SN>)_<MN>", label="Bass Stem", info="Пример вывода: Music_(Bass)_BS-Roformer-Viperx-1297", placeholder="<IN>_(<SN>)_<MN>")
             with gr.Row():
-                guitar_stem = gr.Textbox(value="{base_name}_(Guitar)", label="Guitar Stem", placeholder="{base_name}_(Guitar)")
-                piano_stem = gr.Textbox(value="{base_name}_(Piano)", label="Piano Stem", placeholder="{base_name}_(Piano)")
+                guitar_stem = gr.Textbox(value="<IN>_(<SN>)_<MN>", label="Guitar Stem", info="Пример вывода: Music_(Guitar)_BS-Roformer-Viperx-1297", placeholder="<IN>_(<SN>)_<MN>")
+                piano_stem = gr.Textbox(value="<IN>_(<SN>)_<MN>", label="Piano Stem", info="Пример вывода: Music_(Piano)_BS-Roformer-Viperx-1297", placeholder="<IN>_(<SN>)_<MN>")
 
     demucs_model.change(update_stems, inputs=[demucs_model], outputs=stem6)
 
@@ -600,7 +599,7 @@ with gr.Blocks(
     )
 
 def main():
-    app.launch(share=True, debug=True)
+    app.launch(share=True)
 
 if __name__ == "__main__":
     main()