Update app.py

app.py

@@ -196,14 +196,20 @@ def remove_audio_file_from_directory():
         os.remove(w)
     return gr.Info("File removed.")
 
-def mvsep_api_request(mvsep_key, audio_file, sep_int):
+def mvsep_api_request(mvsep_key, audio_file, sep_dropdown):
+    if mvsep_key == "":
+        return gr.Warning("You must have an MVSEP API key for this to work!")
+    if audio_file == None:
+        return gr.Warning("Please select an audio file!")
+    if sep_dropdown == "-------------------------------------------------------------------------------------------------":
+        return gr.Warning("This option is not a model!")
     url = "https://mvsep.com/api/separation/create"
     files = {
         "audiofile": open(audio_file, 'rb')
     }
     data = {
         "api_token": mvsep_key,
-        "sep_type": sep_int
+        "sep_type": sep_dropdown
     }
     r = requests.post(url, files=files, data=data)
     json_format = r.json()
@@ -232,60 +238,19 @@ def mvsep_download_separated_audio(hash_textbox):
         }
         r = requests.get(url, params=params)
         rjson = r.json()
+        status = rjson['status']
         files = rjson.get('data', {}).get('files', [])
         urls = [file['url'] for file in files]
+        if status == "waiting" or status == "processing":
+            return gr.Info("Job not finished yet, so nothing to download for now.")
         return json.dumps(urls, indent=4)
     except requests.exceptions.JSONDecodeError:
         return gr.Info("Nothing to download yet. Check back later.")
-    
-def mvsep_list_available_models():
-    return [
-        "0 - spleeter (vocals, music)",
-        "1 - spleeter (vocals, drums, bass, other)",
-        "2 - spleeter (vocals, drums, bass, piano, other)",
-        "3 - unmix XL (vocals, drums, bass, other)",
-        "4 - unmix HQ (vocals, drums, bass, other)",
-        "5 - unmix SD (vocals, drums, bass, other)",
-        "6 - unmix SE (vocals, music)",
-        "7 - MDX A (vocals, drums, bass, other)",
-        "8 - MDX B (vocals, drums, bass, other)",
-        "9 - UVR HQ (vocals, music)",
-        "10 - Demucs3 Model A (vocals, drums, bass, other)",
-        "11 - Demucs3 Model B (vocals, drums, bass, other)",
-        "12 - MDX-B Karaoke (lead/back vocals)",
-        "13 - Demucs2 (vocals, drums, bass, other)",
-        "14 - Zero Shot (Query Based) (LQ)",
-        "15 - Danna sep (vocals, drums, bass, other)",
-        "16 - Byte Dance (vocals, drums, bass, other)",
-        "17 - UVRv5 Demucs (vocals, music)",
-        "18 - MVSep DNR (music, sfx, speech)",
-        "19 - MVSep Vocal Model (vocals, music)",
-        "20 - Demucs4 HT (vocals, drums, bass, other)",
-        "22 - FoxJoy Reverb Removal (other)",
-        "23 - MDX B (vocals, instrumental)",
-        "24 - MVSep Demucs4HT DNR (dialog, sfx, music)",
-        "25 - MDX23C (vocals, instrumental)",
-        "26 - Ensemble (vocals, instrumental) [PREMIUM ONLY]",
-        "27 - Demucs4 Vocals 2023 (vocals, instrumental)",
-        "28 - Ensemble (vocals, instrumental, bass, drums, other) [PREMIUM ONLY]",
-        "29 - MVSep Piano (piano, other)",
-        "30 - Ensemble All-In (vocals, bass, drums, piano, guitar, lead/back vocals, other) [PREMIUM ONLY]",
-        "31 - MVSep Guitar (guitar, other)",
-        "33 - Vit Large 23 (vocals, instrum)",
-        "34 - MVSep Crowd removal (crowd, other)",
-        "35 - MVSep MelBand Roformer (vocals, instrum)",
-        "36 - BandIt Plus (speech, music, effects)",
-        "37 - DrumSep (kick, snare, cymbals, toms)",
-        "38 - LarsNet (kick, snare, cymbals, toms, hihat)",
-        "39 - Whisper (extract text from audio)",
-        "40 - BS Roformer (vocals, instrumental)",
-        "41 - MVSep Bass (bass, other)"
-    ]
 
 
 with gr.Blocks(theme='sudeepshouche/minimalist', title="Global Dataset Maker") as app:
     gr.HTML(
-        "<h1> Welcome to the Cafeteria! (formally GDMGS) </h1>"
+        "<h1> Welcome to the GDMGS! (GlobalDatasetMaker Gradio Space) </h1>"
     )
     gr.Markdown("## Duplicate this space if you want to make your own changes!")
     gr.HTML(
@@ -385,19 +350,61 @@ with gr.Blocks(theme='sudeepshouche/minimalist', title="Global Dataset Maker") a
                             with gr.Row():
                                 mvsep_key = gr.Textbox(placeholder="Enter your MVSEP API key.", label="API key")
                                 audio_file = gr.File(file_count='single', file_types=[".mp3"], label="Audio file")
-                                sep_int = gr.Number(11, label="Separation type (default is 11).", minimum=0, maximum=41, interactive=True)
+                                sep_dropdown = gr.Dropdown(
+                                    ["0 - spleeter (vocals, music)",
+                                    "1 - spleeter (vocals, drums, bass, other)",
+                                    "2 - spleeter (vocals, drums, bass, piano, other)",
+                                    "3 - unmix XL (vocals, drums, bass, other)",
+                                    "4 - unmix HQ (vocals, drums, bass, other)",
+                                    "5 - unmix SD (vocals, drums, bass, other)",
+                                    "6 - unmix SE (vocals, music)",
+                                    "7 - MDX A (vocals, drums, bass, other)",
+                                    "8 - MDX B (vocals, drums, bass, other)",
+                                    "9 - UVR HQ (vocals, music)",
+                                    "10 - Demucs3 Model A (vocals, drums, bass, other)",
+                                    "11 - Demucs3 Model B (vocals, drums, bass, other)",
+                                    "12 - MDX-B Karaoke (lead/back vocals)",
+                                    "13 - Demucs2 (vocals, drums, bass, other)",
+                                    "14 - Zero Shot (Query Based) (LQ)",
+                                    "15 - Danna sep (vocals, drums, bass, other)",
+                                    "16 - Byte Dance (vocals, drums, bass, other)",
+                                    "17 - UVRv5 Demucs (vocals, music)",
+                                    "18 - MVSep DNR (music, sfx, speech)",
+                                    "19 - MVSep Vocal Model (vocals, music)",
+                                    "20 - Demucs4 HT (vocals, drums, bass, other)",
+                                    "--------------------------------------------------------------------------------------------------",
+                                    "22 - FoxJoy Reverb Removal (other)",
+                                    "23 - MDX B (vocals, instrumental)",
+                                    "24 - MVSep Demucs4HT DNR (dialog, sfx, music)",
+                                    "25 - MDX23C (vocals, instrumental)",
+                                    "26 - Ensemble (vocals, instrumental) [PREMIUM ONLY]",
+                                    "27 - Demucs4 Vocals 2023 (vocals, instrumental)",
+                                    "28 - Ensemble (vocals, instrumental, bass, drums, other) [PREMIUM ONLY]",
+                                    "29 - MVSep Piano (piano, other)",
+                                    "30 - Ensemble All-In (vocals, bass, drums, piano, guitar, lead/back vocals, other) [PREMIUM ONLY]",
+                                    "31 - MVSep Guitar (guitar, other)",
+                                    "-------------------------------------------------------------------------------------------------",
+                                    "33 - Vit Large 23 (vocals, instrum)",
+                                    "34 - MVSep Crowd removal (crowd, other)",
+                                    "35 - MVSep MelBand Roformer (vocals, instrum)",
+                                    "36 - BandIt Plus (speech, music, effects)",
+                                    "37 - DrumSep (kick, snare, cymbals, toms)",
+                                    "38 - LarsNet (kick, snare, cymbals, toms, hihat)",
+                                    "39 - Whisper (extract text from audio)",
+                                    "40 - BS Roformer (vocals, instrumental)",
+                                    "41 - MVSep Bass (bass, other)"],
+                                    max_choices=1,
+                                    value="11 - Demucs3 Model B (vocals, drums, bass, other)",
+                                    label="Model type:",
+                                    interactive=True,
+                                    type='index'
+                                )
                                 send_req = gr.Button("Send request", variant='primary')
-                                get_available_models = gr.Button("Get available models", variant='secondary')
                             send_req.click(
                                 mvsep_api_request,
-                                [mvsep_key, audio_file, sep_int],
+                                [mvsep_key, audio_file, sep_dropdown],
                                 [gr.Text(label="Output")]
                             )
-                            get_available_models.click(
-                                mvsep_list_available_models,
-                                None,
-                                [gr.Text(label="Models")]
-                            )
                 with gr.Tab("Get status of request"):
                     with gr.Row():
                         with gr.Column():
@@ -417,12 +424,8 @@ with gr.Blocks(theme='sudeepshouche/minimalist', title="Global Dataset Maker") a
                             )
 
         with gr.TabItem("Changelog"):
-            gr.Markdown("v0.99.5 - Name change from GDMGS to Cafeteria for easier pronunciation.")
+            gr.Markdown("v0.99.5 - Added bug fixes and Dropdown instead of button for MVSEP.")
             gr.Markdown("v0.99.4 - Added a button to display the available models for MVSEP.")
             gr.Markdown("v0.99.3 - Added MVSEP in Misc Tools. This is VERY EXPERIMENTAL and there will be bugs present.")
-            gr.Markdown("v0.99.2 - Added an mp4 file converter.")
-            gr.Markdown("v0.99.1 - Removed very old tools (including the 'Upcoming Features' tab) that did not fit with the nature of the program.")
-            gr.Markdown("v0.99 - Added 'Strict Duration' mode for the file splitter.")
-            gr.Markdown("v0.98.2 - Added new upcoming features tab.")
         
 app.launch()