Update main/app/app.py

main/app/app.py

@@ -68,7 +68,7 @@ with gr.Blocks(title=" Ultimate RVC Maker ⚡", theme=theme) as app:
                             overlap = gr.Radio(label=translations["overlap"], info=translations["overlap_info"], choices=["0.25", "0.5", "0.75", "0.99"], value="0.25", interactive=True)
                         with gr.Row():
                             mdx_hop_length = gr.Slider(label="Hop length", info=translations["hop_length_info"], minimum=1, maximum=8192, value=1024, step=1, interactive=True, visible=backing.value or reverb.value or separator_model.value in mdx_model)
-            with gr.Row():
+            
                 with gr.Column():
                     input = gr.File(label=translations["drop_audio"], file_types=[".wav", ".mp3", ".flac", ".ogg", ".opus", ".m4a", ".mp4", ".aac", ".alac", ".wma", ".aiff", ".webm", ".ac3"])    
                     with gr.Accordion(translations["use_url"], open=False):
@@ -434,118 +434,16 @@ with gr.Blocks(title=" Ultimate RVC Maker ⚡", theme=theme) as app:
                     api_name="convert_audio"
                 )
 
-        
-        with gr.TabItem(translations["downloads"], visible=configs.get("downloads_tab", True)):
-            gr.Markdown(translations["download_markdown"])
-            with gr.Row():
-                gr.Markdown(translations["download_markdown_2"])
-            with gr.Row():
-                with gr.Accordion(translations["model_download"], open=True):
-                    with gr.Row():
-                        downloadmodel = gr.Radio(label=translations["model_download_select"], choices=[translations["download_url"], translations["download_from_csv"], translations["search_models"], translations["upload"]], interactive=True, value=translations["download_url"])
-                    with gr.Row():
-                        gr.Markdown("___")
-                    with gr.Column():
-                        with gr.Row():
-                            url_input = gr.Textbox(label=translations["model_url"], value="", placeholder="https://...", scale=6)
-                            download_model_name = gr.Textbox(label=translations["modelname"], value="", placeholder=translations["modelname"], scale=2)
-                        url_download = gr.Button(value=translations["downloads"], scale=2)
-                    with gr.Column():
-                        model_browser = gr.Dropdown(choices=models.keys(), label=translations["model_warehouse"], scale=8, allow_custom_value=True, visible=False)
-                        download_from_browser = gr.Button(value=translations["get_model"], scale=2, variant="primary", visible=False)
-                    with gr.Column():
-                        search_name = gr.Textbox(label=translations["name_to_search"], placeholder=translations["modelname"], interactive=True, scale=8, visible=False)
-                        search = gr.Button(translations["search_2"], scale=2, visible=False)
-                        search_dropdown = gr.Dropdown(label=translations["select_download_model"], value="", choices=[], allow_custom_value=True, interactive=False, visible=False)
-                        download = gr.Button(translations["downloads"], variant="primary", visible=False)
-                    with gr.Column():
-                        model_upload = gr.File(label=translations["drop_model"], file_types=[".pth", ".onnx", ".index", ".zip"], visible=False)
-            with gr.Row():
-                with gr.Accordion(translations["download_pretrained_2"], open=False):
-                    with gr.Row():
-                        pretrain_download_choices = gr.Radio(label=translations["model_download_select"], choices=[translations["download_url"], translations["list_model"], translations["upload"]], value=translations["download_url"], interactive=True)  
-                    with gr.Row():
-                        gr.Markdown("___")
-                    with gr.Column():
-                        with gr.Row():
-                            pretrainD = gr.Textbox(label=translations["pretrained_url"].format(dg="D"), value="", info=translations["only_huggingface"], placeholder="https://...", interactive=True, scale=4)
-                            pretrainG = gr.Textbox(label=translations["pretrained_url"].format(dg="G"), value="", info=translations["only_huggingface"], placeholder="https://...", interactive=True, scale=4)
-                        download_pretrain_button = gr.Button(translations["downloads"], scale=2)
-                    with gr.Column():
-                        with gr.Row():
-                            pretrain_choices = gr.Dropdown(label=translations["select_pretrain"], info=translations["select_pretrain_info"], choices=list(fetch_pretrained_data().keys()), value="Titan_Medium", allow_custom_value=True, interactive=True, scale=6, visible=False)
-                            sample_rate_pretrain = gr.Dropdown(label=translations["pretrain_sr"], info=translations["pretrain_sr"], choices=["48k", "40k", "32k"], value="48k", interactive=True, visible=False)
-                        download_pretrain_choices_button = gr.Button(translations["downloads"], scale=2, variant="primary", visible=False)
-                    with gr.Row():
-                        pretrain_upload_g = gr.File(label=translations["drop_pretrain"].format(dg="G"), file_types=[".pth"], visible=False)
-                        pretrain_upload_d = gr.File(label=translations["drop_pretrain"].format(dg="D"), file_types=[".pth"], visible=False)
-            with gr.Row():
-                url_download.click(
-                    fn=download_model, 
-                    inputs=[
-                        url_input, 
-                        download_model_name
-                    ], 
-                    outputs=[url_input],
-                    api_name="download_model"
-                )
-                download_from_browser.click(
-                    fn=lambda model: download_model(models[model], model), 
-                    inputs=[model_browser], 
-                    outputs=[model_browser],
-                    api_name="download_browser"
-                )
-            with gr.Row():
-                downloadmodel.change(fn=change_download_choices, inputs=[downloadmodel], outputs=[url_input, download_model_name, url_download, model_browser, download_from_browser, search_name, search, search_dropdown, download, model_upload])
-                search.click(fn=search_models, inputs=[search_name], outputs=[search_dropdown, download])
-                model_upload.upload(fn=save_drop_model, inputs=[model_upload], outputs=[model_upload])
-                download.click(
-                    fn=lambda model: download_model(model_options[model], model), 
-                    inputs=[search_dropdown], 
-                    outputs=[search_dropdown],
-                    api_name="search_models"
-                )
-            with gr.Row():
-                pretrain_download_choices.change(fn=change_download_pretrained_choices, inputs=[pretrain_download_choices], outputs=[pretrainD, pretrainG, download_pretrain_button, pretrain_choices, sample_rate_pretrain, download_pretrain_choices_button, pretrain_upload_d, pretrain_upload_g])
-                pretrain_choices.change(fn=update_sample_rate_dropdown, inputs=[pretrain_choices], outputs=[sample_rate_pretrain])
-            with gr.Row():
-                download_pretrain_button.click(
-                    fn=download_pretrained_model,
-                    inputs=[
-                        pretrain_download_choices, 
-                        pretrainD, 
-                        pretrainG
-                    ],
-                    outputs=[pretrainD],
-                    api_name="download_pretrain_link"
-                )
-                download_pretrain_choices_button.click(
-                    fn=download_pretrained_model,
-                    inputs=[
-                        pretrain_download_choices, 
-                        pretrain_choices, 
-                        sample_rate_pretrain
-                    ],
-                    outputs=[pretrain_choices],
-                    api_name="download_pretrain_choices"
-                )
-                pretrain_upload_g.upload(
-                    fn=lambda pretrain_upload_g: shutil.move(pretrain_upload_g.name, os.path.join("assets", "models", "pretrained_custom")), 
-                    inputs=[pretrain_upload_g], 
-                    outputs=[],
-                    api_name="upload_pretrain_g"
-                )
-                pretrain_upload_d.upload(
-                    fn=lambda pretrain_upload_d: shutil.move(pretrain_upload_d.name, os.path.join("assets", "models", "pretrained_custom")), 
-                    inputs=[pretrain_upload_d], 
-                    outputs=[],
-                    api_name="upload_pretrain_d"
-                )
 
         with gr.TabItem(translations["convert_text"], visible=configs.get("tts_tab", True)):
             gr.Markdown(translations["convert_text_markdown"])
             with gr.Row():
                 gr.Markdown(translations["convert_text_markdown_2"])
+            with gr.Accordion(translations["model_accordion"], open=True):
+                with gr.Row():
+                    model_pth0 = gr.Dropdown(label=translations["model_name"], choices=model_name, value=model_name[0] if len(model_name) >= 1 else "", interactive=True, allow_custom_value=True)
+                    model_index0 = gr.Dropdown(label=translations["index_path"], choices=index_path, value=index_path[0] if len(index_path) >= 1 else "", interactive=True, allow_custom_value=True)
+                        
             with gr.Row():
                 with gr.Column():
                     with gr.Group():
@@ -565,14 +463,9 @@ with gr.Blocks(title=" Ultimate RVC Maker ⚡", theme=theme) as app:
                     tts_voice = gr.Dropdown(label=translations["voice"], choices=edgetts, interactive=True, value="vi-VN-NamMinhNeural")
                     tts_pitch = gr.Slider(minimum=-20, maximum=20, step=1, info=translations["pitch_info_2"], label=translations["pitch"], value=0, interactive=True)
                 with gr.Column():
-                    with gr.Accordion(translations["model_accordion"], open=True):
-                        with gr.Row():
-                            model_pth0 = gr.Dropdown(label=translations["model_name"], choices=model_name, value=model_name[0] if len(model_name) >= 1 else "", interactive=True, allow_custom_value=True)
-                            model_index0 = gr.Dropdown(label=translations["index_path"], choices=index_path, value=index_path[0] if len(index_path) >= 1 else "", interactive=True, allow_custom_value=True)
-                        with gr.Row():
-                            refesh1 = gr.Button(translations["refesh"])
-                        with gr.Row():
-                            index_strength0 = gr.Slider(label=translations["index_strength"], info=translations["index_strength_info"], minimum=0, maximum=1, value=0.5, step=0.01, interactive=True, visible=model_index0.value != "")
+                    refesh1 = gr.Button(translations["refesh"])
+                    with gr.Row():
+                        index_strength0 = gr.Slider(label=translations["index_strength"], info=translations["index_strength_info"], minimum=0, maximum=1, value=0.5, step=0.01, interactive=True, visible=model_index0.value != "")
                     with gr.Accordion(translations["output_path"], open=False):
                         export_format0 = gr.Radio(label=translations["export_format"], info=translations["export_info"], choices=["wav", "mp3", "flac", "ogg", "opus", "m4a", "mp4", "aac", "alac", "wma", "aiff", "webm", "ac3"], value="wav", interactive=True)
                         output_audio0 = gr.Textbox(label=translations["output_tts"], value="audios/tts.wav", placeholder="audios/tts.wav", info=translations["tts_output"], interactive=True)
@@ -689,6 +582,115 @@ with gr.Blocks(title=" Ultimate RVC Maker ⚡", theme=theme) as app:
                 )
 
         
+        
+        with gr.TabItem(translations["downloads"], visible=configs.get("downloads_tab", True)):
+            gr.Markdown(translations["download_markdown"])
+            with gr.Row():
+                gr.Markdown(translations["download_markdown_2"])
+            with gr.Row():
+                with gr.Accordion(translations["model_download"], open=True):
+                    with gr.Row():
+                        downloadmodel = gr.Radio(label=translations["model_download_select"], choices=[translations["download_url"], translations["download_from_csv"], translations["search_models"], translations["upload"]], interactive=True, value=translations["download_url"])
+                    with gr.Row():
+                        gr.Markdown("___")
+                    with gr.Column():
+                        with gr.Row():
+                            url_input = gr.Textbox(label=translations["model_url"], value="", placeholder="https://...", scale=6)
+                            download_model_name = gr.Textbox(label=translations["modelname"], value="", placeholder=translations["modelname"], scale=2)
+                        url_download = gr.Button(value=translations["downloads"], scale=2)
+                    with gr.Column():
+                        model_browser = gr.Dropdown(choices=models.keys(), label=translations["model_warehouse"], scale=8, allow_custom_value=True, visible=False)
+                        download_from_browser = gr.Button(value=translations["get_model"], scale=2, variant="primary", visible=False)
+                    with gr.Column():
+                        search_name = gr.Textbox(label=translations["name_to_search"], placeholder=translations["modelname"], interactive=True, scale=8, visible=False)
+                        search = gr.Button(translations["search_2"], scale=2, visible=False)
+                        search_dropdown = gr.Dropdown(label=translations["select_download_model"], value="", choices=[], allow_custom_value=True, interactive=False, visible=False)
+                        download = gr.Button(translations["downloads"], variant="primary", visible=False)
+                    with gr.Column():
+                        model_upload = gr.File(label=translations["drop_model"], file_types=[".pth", ".onnx", ".index", ".zip"], visible=False)
+            with gr.Row():
+                with gr.Accordion(translations["download_pretrained_2"], open=False):
+                    with gr.Row():
+                        pretrain_download_choices = gr.Radio(label=translations["model_download_select"], choices=[translations["download_url"], translations["list_model"], translations["upload"]], value=translations["download_url"], interactive=True)  
+                    with gr.Row():
+                        gr.Markdown("___")
+                    with gr.Column():
+                        with gr.Row():
+                            pretrainD = gr.Textbox(label=translations["pretrained_url"].format(dg="D"), value="", info=translations["only_huggingface"], placeholder="https://...", interactive=True, scale=4)
+                            pretrainG = gr.Textbox(label=translations["pretrained_url"].format(dg="G"), value="", info=translations["only_huggingface"], placeholder="https://...", interactive=True, scale=4)
+                        download_pretrain_button = gr.Button(translations["downloads"], scale=2)
+                    with gr.Column():
+                        with gr.Row():
+                            pretrain_choices = gr.Dropdown(label=translations["select_pretrain"], info=translations["select_pretrain_info"], choices=list(fetch_pretrained_data().keys()), value="Titan_Medium", allow_custom_value=True, interactive=True, scale=6, visible=False)
+                            sample_rate_pretrain = gr.Dropdown(label=translations["pretrain_sr"], info=translations["pretrain_sr"], choices=["48k", "40k", "32k"], value="48k", interactive=True, visible=False)
+                        download_pretrain_choices_button = gr.Button(translations["downloads"], scale=2, variant="primary", visible=False)
+                    with gr.Row():
+                        pretrain_upload_g = gr.File(label=translations["drop_pretrain"].format(dg="G"), file_types=[".pth"], visible=False)
+                        pretrain_upload_d = gr.File(label=translations["drop_pretrain"].format(dg="D"), file_types=[".pth"], visible=False)
+            with gr.Row():
+                url_download.click(
+                    fn=download_model, 
+                    inputs=[
+                        url_input, 
+                        download_model_name
+                    ], 
+                    outputs=[url_input],
+                    api_name="download_model"
+                )
+                download_from_browser.click(
+                    fn=lambda model: download_model(models[model], model), 
+                    inputs=[model_browser], 
+                    outputs=[model_browser],
+                    api_name="download_browser"
+                )
+            with gr.Row():
+                downloadmodel.change(fn=change_download_choices, inputs=[downloadmodel], outputs=[url_input, download_model_name, url_download, model_browser, download_from_browser, search_name, search, search_dropdown, download, model_upload])
+                search.click(fn=search_models, inputs=[search_name], outputs=[search_dropdown, download])
+                model_upload.upload(fn=save_drop_model, inputs=[model_upload], outputs=[model_upload])
+                download.click(
+                    fn=lambda model: download_model(model_options[model], model), 
+                    inputs=[search_dropdown], 
+                    outputs=[search_dropdown],
+                    api_name="search_models"
+                )
+            with gr.Row():
+                pretrain_download_choices.change(fn=change_download_pretrained_choices, inputs=[pretrain_download_choices], outputs=[pretrainD, pretrainG, download_pretrain_button, pretrain_choices, sample_rate_pretrain, download_pretrain_choices_button, pretrain_upload_d, pretrain_upload_g])
+                pretrain_choices.change(fn=update_sample_rate_dropdown, inputs=[pretrain_choices], outputs=[sample_rate_pretrain])
+            with gr.Row():
+                download_pretrain_button.click(
+                    fn=download_pretrained_model,
+                    inputs=[
+                        pretrain_download_choices, 
+                        pretrainD, 
+                        pretrainG
+                    ],
+                    outputs=[pretrainD],
+                    api_name="download_pretrain_link"
+                )
+                download_pretrain_choices_button.click(
+                    fn=download_pretrained_model,
+                    inputs=[
+                        pretrain_download_choices, 
+                        pretrain_choices, 
+                        sample_rate_pretrain
+                    ],
+                    outputs=[pretrain_choices],
+                    api_name="download_pretrain_choices"
+                )
+                pretrain_upload_g.upload(
+                    fn=lambda pretrain_upload_g: shutil.move(pretrain_upload_g.name, os.path.join("assets", "models", "pretrained_custom")), 
+                    inputs=[pretrain_upload_g], 
+                    outputs=[],
+                    api_name="upload_pretrain_g"
+                )
+                pretrain_upload_d.upload(
+                    fn=lambda pretrain_upload_d: shutil.move(pretrain_upload_d.name, os.path.join("assets", "models", "pretrained_custom")), 
+                    inputs=[pretrain_upload_d], 
+                    outputs=[],
+                    api_name="upload_pretrain_d"
+                )
+
+        
         with gr.TabItem(translations["training_model"], visible=configs.get("training_tab", True)):
             gr.Markdown(f"## {translations['training_model']}")
             with gr.Row():