inference tab

app.py

@@ -52,6 +52,7 @@ def load_model(model_picker,index_picker):
 def convert(audio_picker,model_picker,index_picker,index_rate,pitch,method):
     warn("Your audio is being converted. Please wait.")
     now = datetime.now().strftime("%d%m%Y%H%M%S")
+    save_as = f"audios/cli_output_{now}.wav"
     index_files = glob.glob(f"logs/{index_picker}/*.index")
     if index_files:
         print(f"Found index: {index_files[0]}")
@@ -67,7 +68,7 @@ def convert(audio_picker,model_picker,index_picker,index_rate,pitch,method):
         "--input_path", f"audios/{audio_picker}",
         "--index_path", index_files[0],
         "--f0method", method,
-        "--opt_path", f"audios/cli_output_{now}.wav",
+        "--opt_path", save_as,
         "--model_name", f"{model_picker}",
         "--index_rate", str(float(index_rate)),
         "--device", device,
@@ -270,10 +271,32 @@ with gr.Blocks() as app:
     with gr.Row():
         with gr.Column():
             with gr.Tabs():
-                with gr.TabItem("1.Choose a voice model:"):
+                with gr.TabItem("1. Inference:"):
                     model_picker = gr.Dropdown(label="Model: ",choices=show_available('assets/weights','.pth'),value=show_available('assets/weights','.pth')[0],interactive=True,allow_custom_value=True)
                     index_picker = gr.Dropdown(label="Index:",interactive=True,choices=show_available('logs'),value=show_available('logs')[0],allow_custom_value=True)
                     model_picker.change(fn=load_model,inputs=[model_picker,index_picker],outputs=[index_picker])
+
+                    with gr.Accordion("Inference Settings", open=False):
+                        index_rate = gr.Slider(label='Index Rate: ',minimum=0,maximum=1,value=0.66,step=0.01)
+                        pitch = gr.Slider(label='Pitch (-12 lowers it an octave, 0 keeps the original pitch, 12 lifts it an octave): ',minimum =-12, maximum=12, step=1, value=0, interactive=True)
+                        method = gr.Dropdown(label="Method:",choices=["rmvpe","pm"],value="rmvpe")
+
+
+                    with gr.Column():
+                        with gr.Tabs():
+                            with gr.TabItem("2.Choose an audio file:"):
+                                recorder = gr.Microphone(label="Record audio here...",type='filepath')
+                                audio_picker = gr.Dropdown(label="",choices=show_available('audios'),value='',interactive=True)
+                                try:
+                                    recorder.stop_recording(upload_file, inputs=[recorder],outputs=[audio_picker])
+                                except:
+                                    recorder.upload(upload_file, inputs=[recorder],outputs=[audio_picker])
+                            with gr.TabItem("(Or upload a new file here)"):
+                                try:
+                                    dropbox = gr.File(label="Drop an audio here.",file_types=['.wav', '.mp3', '.ogg', '.flac', '.aac'], type="filepath")
+                                except:#Version Compatibiliy
+                                    dropbox = gr.File(label="Drop an audio here.",file_types=['.wav', '.mp3', '.ogg', '.flac', '.aac'], type="file")
+        
                 with gr.TabItem("(Or download a model here)"):
                     with gr.Row():
                         url = gr.Textbox(label="Paste the URL here:",value="",placeholder="(i.e. https://huggingface.co/repo/model/resolve/main/model.zip)")
@@ -287,26 +310,9 @@ with gr.Blocks() as app:
                         selected_import = gr.Dropdown(choices=list(models.keys()),label="OR Search Models (Quality UNKNOWN)",scale=5)
                         import_model = gr.Button("Download")
                         import_model.click(fn=import_from_name,inputs=[selected_import],outputs=[selected_import,model_picker])
-                with gr.TabItem("Advanced"):
-                    index_rate = gr.Slider(label='Index Rate: ',minimum=0,maximum=1,value=0.66,step=0.01)
-                    pitch = gr.Slider(label='Pitch (-12 lowers it an octave, 0 keeps the original pitch, 12 lifts it an octave): ',minimum =-12, maximum=12, step=1, value=0, interactive=True)
-                    method = gr.Dropdown(label="Method:",choices=["rmvpe","pm"],value="rmvpe")
-        
-    with gr.Row():
-        with gr.Tabs():
-            with gr.TabItem("2.Choose an audio file:"):
-                recorder = gr.Microphone(label="Record audio here...",type='filepath')
-                audio_picker = gr.Dropdown(label="",choices=show_available('audios'),value='',interactive=True)
-                try:
-                    recorder.stop_recording(upload_file, inputs=[recorder],outputs=[audio_picker])
-                except:
-                    recorder.upload(upload_file, inputs=[recorder],outputs=[audio_picker])
-            with gr.TabItem("(Or upload a new file here)"):
-                try:
-                    dropbox = gr.File(label="Drop an audio here.",file_types=['.wav', '.mp3', '.ogg', '.flac', '.aac'], type="filepath")
-                except:#Version Compatibiliy
-                    dropbox = gr.File(label="Drop an audio here.",file_types=['.wav', '.mp3', '.ogg', '.flac', '.aac'], type="file")
-                dropbox.upload(fn=upload_file, inputs=[dropbox],outputs=[audio_picker])
+                
+    
+        dropbox.upload(fn=upload_file, inputs=[dropbox],outputs=[audio_picker])
         audio_refresher = gr.Button("Refresh")
         audio_refresher.click(fn=refresh,inputs=[],outputs=[audio_picker,model_picker,index_picker])
         convert_button = gr.Button("Convert")
@@ -321,4 +327,4 @@ with gr.Blocks() as app:
                 stereo_player = gr.Audio(interactive=False)
                 audio_player.change(fn=stereo, inputs=[audio_player],outputs=[stereo_player])
 
-app.queue(max_size=20).launch(debug=True,allowed_paths=["kofi_button.png"])
+app.queue(max_size=20).launch(debug=True,allowed_paths=["kofi_button.png"])