Update app.py

app.py

@@ -11,7 +11,6 @@ from concurrent.futures import Future
 import torch
 import gradio as gr
 import pydub
-from scipy.io.wavfile import write
 
 from audiocraft.data.audio_utils import convert_audio
 from audiocraft.data.audio import audio_write
@@ -25,12 +24,7 @@ BATCHED_DURATION = 15
 INTERRUPTING = False
 # We have to wrap subprocess call to clean a bit the log when using gr.make_waveform
 _old_call = sp.call
-files = ["./out/mdx_extra_q/test/full.wav",
-    "./out/mdx_extra_q/test/vocals.wav",
-    "./out/mdx_extra_q/test/bass.wav",
-    "./out/mdx_extra_q/test/drums.wav",
-    "./out/mdx_extra_q/test/other.wav"
-]
+
 
 def _call_nostderr(*args, **kwargs):
     # Avoid ffmpeg vomitting on the logs.
@@ -167,43 +161,7 @@ def predict_full(model, text, melody, duration, topk, topp, temperature, cfg_coe
     outs = _do_predictions(
         [text], [melody], duration, progress=True,
         top_k=topk, top_p=topp, temperature=temperature, cfg_coef=cfg_coef)
-    
-    return inference(outs[0])
-
-def inference(audio):
-    print (audio)
-    os.makedirs("out", exist_ok=True)
-    command = "python3 -m demucs.separate -n mdx_extra_q -d cpu test.wav -o out"
-
-
-# Find the index of "test.wav" in the command
-    index = command.find("test.wav")
-
-# Replace "test.wav" with the file path
-    new_command = command[:index] + audio + command[index + len("test.wav"):]
-
-    process = sp.run(new_command, shell=True, stdout=sp.PIPE, stderr=sp.PIPE)
-    print("Demucs script output:", process.stdout.decode())
-  
-    os.makedirs("out", exist_ok=True)
-    result = os.system(new_command)
-    print(f"Demucs script result: {result}")
-    directory_name = os.path.splitext(os.path.basename(audio))[0]
-
-    files = [audio,
-        f"./out/mdx_extra_q/{directory_name}/vocals.wav",
-        f"./out/mdx_extra_q/{directory_name}/bass.wav",
-        f"./out/mdx_extra_q/{directory_name}/drums.wav",
-        f"./out/mdx_extra_q/{directory_name}/other.wav"
-    ]
-
-    for file in files:
-        if not os.path.isfile(file):
-            print(f"File not found: {file}")
-        else:
-            print(f"File exists: {file}")
-
-    return files
+    return outs[0]
 
 
 def toggle_audio_src(choice):
@@ -246,13 +204,10 @@ def ui_full(launch_kwargs):
                     temperature = gr.Number(label="Temperature", value=1.0, interactive=True)
                     cfg_coef = gr.Number(label="Classifier Free Guidance", value=3.0, interactive=True)
             with gr.Column():
-                submit.click(predict_full,
-                    inputs=[model, text, melody, duration, topk, topp, temperature, cfg_coef],
-                    outputs=[gr.Audio(type='filepath',label="Generated Music"), 
-                   gr.Audio(type='filepath',label="Vocal Music"),
-                   gr.Audio(type='filepath',label="base Music"), 
-                   gr.Audio(type='filepath',label="drum Music"),
-                   gr.Audio(type='filepath',label="other Music")])
+                output = gr.Audio(label="Generated Music")
+        submit.click(predict_full,
+                     inputs=[model, text, melody, duration, topk, topp, temperature, cfg_coef],
+                     outputs=[output])
         radio.change(toggle_audio_src, radio, [melody], queue=False, show_progress=False)
         gr.Examples(
             fn=predict_full,
@@ -284,11 +239,7 @@ def ui_full(launch_kwargs):
                 ],
             ],
             inputs=[text, melody, model],
-            outputs=[gr.Audio(type='filepath',label="Generated Music"), 
-           gr.Audio(type='filepath',label="Vocal Music"),
-           gr.Audio(type='filepath',label="base Music"), 
-           gr.Audio(type='filepath',label="drum Music"),
-           gr.Audio(type='filepath',label="other Music")]
+            outputs=[output]
         )
         gr.Markdown(
             """
@@ -347,14 +298,7 @@ def ui_batched(launch_kwargs):
                 with gr.Row():
                     submit = gr.Button("Generate")
             with gr.Column():
-                 output=[
-           gr.Audio(type='filepath',label="Generated Music"), 
-           gr.Audio(type='filepath',label="Vocal Music"),
-           gr.Audio(type='filepath',label="base Music"), 
-           gr.Audio(type='filepath',label="drum Music"),
-           gr.Audio(type='filepath',label="other Music")
-            #gr.outputs.Audio(type='filepath')
-                ],
+                output = gr.Audio(label="Generated Music")
         submit.click(predict_batched, inputs=[text, melody],
                      outputs=[output], batch=True, max_batch_size=MAX_BATCH_SIZE)
         radio.change(toggle_audio_src, radio, [melody], queue=False, show_progress=False)
@@ -440,5 +384,8 @@ if __name__ == "__main__":
     if args.share:
         launch_kwargs['share'] = args.share
 
-  
+    # Show the interface
+    if IS_BATCHED:
+        ui_batched(launch_kwargs)
+    else:
         ui_full(launch_kwargs)