add back RVC tab and old models

app.py

@@ -1748,17 +1748,17 @@ def zip_downloader(model):
         return f'./weights/{model}.pth', "Could not find Index file."
 
 
-#download_from_url('https://drive.google.com/uc?id=1O98vvnle_nZP8ZdpnZFLZ5TU1UZe7x0p&confirm=t', 'JVKE-main', 'jvke')
-#download_from_url('https://drive.google.com/uc?id=1Wag0vPlp42kRDffccXljjjlK7QsHf2xe&confirm=t', 'JVKE-main-v2', 'jvke')
-#download_from_url('https://drive.google.com/uc?id=1h810cil3YRlN4pu4oO43zKq9z3cYjItp&confirm=t', 'jvke-nighttime-v4', 'jvke')
-download_from_url('https://drive.google.com/uc?id=1fa6FSLwqSQMI49NvSXOpI4pUVuKsrop5&confirm=t', 'Andoni', 'cmss60')
-download_from_url('https://drive.google.com/uc?id=1iGhD93_szvs0xyg-U5z_jhfBECBxcTfK&confirm=t', 'Alex', 'cmss60')
-download_from_url('https://drive.google.com/uc?id=1DwRru_WFh4LS0eqU_39qEPuwltj9ZTRr&confirm=t', 'Elaine', 'cmss60')
-download_from_url('https://drive.google.com/uc?id=1Xen2BBRoqfF3CNO_XqEr2ZgCcITz--Je&confirm=t', 'Emily', 'cmss60')
-download_from_url('https://drive.google.com/uc?id=1gHfrS1rnhnj3sHdnOM4vx04rcxucc74D&confirm=t', 'Justis', 'cmss60')
-download_from_url('https://drive.google.com/uc?id=1PlQELpXawx74mEv9MYeREcyvwE7vFFe_&confirm=t', 'Kayana', 'cmss60')
-download_from_url('https://drive.google.com/uc?id=16hJvfWAhuWWVEeXyDYt9PHJl-k_Kouxf&confirm=t', 'Prince', 'cmss60')
-download_from_url('https://drive.google.com/uc?id=1zE1tP95_unNjVkqYb0aBt3AsBq_u9-R9&confirm=t', 'Lupe', 'cmss60')
+download_from_url('https://drive.google.com/uc?id=1O98vvnle_nZP8ZdpnZFLZ5TU1UZe7x0p&confirm=t', 'JVKE-main', 'jvke')
+download_from_url('https://drive.google.com/uc?id=1Wag0vPlp42kRDffccXljjjlK7QsHf2xe&confirm=t', 'JVKE-main-v2', 'jvke')
+download_from_url('https://drive.google.com/uc?id=1h810cil3YRlN4pu4oO43zKq9z3cYjItp&confirm=t', 'jvke-nighttime-v4', 'jvke')
+# download_from_url('https://drive.google.com/uc?id=1fa6FSLwqSQMI49NvSXOpI4pUVuKsrop5&confirm=t', 'Andoni', 'cmss60')
+# download_from_url('https://drive.google.com/uc?id=1iGhD93_szvs0xyg-U5z_jhfBECBxcTfK&confirm=t', 'Alex', 'cmss60')
+# download_from_url('https://drive.google.com/uc?id=1DwRru_WFh4LS0eqU_39qEPuwltj9ZTRr&confirm=t', 'Elaine', 'cmss60')
+# download_from_url('https://drive.google.com/uc?id=1Xen2BBRoqfF3CNO_XqEr2ZgCcITz--Je&confirm=t', 'Emily', 'cmss60')
+# download_from_url('https://drive.google.com/uc?id=1gHfrS1rnhnj3sHdnOM4vx04rcxucc74D&confirm=t', 'Justis', 'cmss60')
+# download_from_url('https://drive.google.com/uc?id=1PlQELpXawx74mEv9MYeREcyvwE7vFFe_&confirm=t', 'Kayana', 'cmss60')
+# download_from_url('https://drive.google.com/uc?id=16hJvfWAhuWWVEeXyDYt9PHJl-k_Kouxf&confirm=t', 'Prince', 'cmss60')
+# download_from_url('https://drive.google.com/uc?id=1zE1tP95_unNjVkqYb0aBt3AsBq_u9-R9&confirm=t', 'Lupe', 'cmss60')
 weight_root = "weights"
 index_root = "logs"
 names = []
@@ -1774,7 +1774,366 @@ for root, dirs, files in os.walk(index_root, topdown=False):
 
 with gr.Blocks(theme=gr.themes.Default(primary_hue="pink", secondary_hue="rose"), title="HITGEN AI") as app:
     with gr.Tabs():
-        with gr.TabItem("Inference"):
+        with gr.TabItem("Voice Conversion"):
+            # gr.HTML("<h1>  Ilaria RVC 💖   </h1>")     
+            # gr.HTML("<h10>   You can find voice models on AI Hub: https://discord.gg/aihub   </h10>")   
+            # gr.HTML("<h4>  Huggingface port by Ilaria of the Rejekt Easy GUI </h4>")
+
+            # Inference Preset Row
+            # with gr.Row():
+            #     mangio_preset = gr.Dropdown(label="Inference Preset", choices=sorted(get_presets()))
+            #     mangio_preset_name_save = gr.Textbox(
+            #         label="Your preset name"
+            #     )
+            #     mangio_preset_save_btn = gr.Button('Save Preset', variant="primary")
+
+            # Other RVC stuff
+            with gr.Row():
+                sid0 = gr.Dropdown(label="1. Choose your model", choices=sorted(names), value=check_for_name())
+                refresh_button = gr.Button("Refresh", variant="primary")
+                if check_for_name() != '':
+                    get_vc(sorted(names)[0])
+                vc_transform0 = gr.Number(label="Key Shift: 0 for no key shifted output; 12 f for output an octave higher and -12 for output an octave lower.", value=0)
+                #clean_button = gr.Button(i18n("卸载音色省显存"), variant="primary")
+                spk_item = gr.Slider(
+                    minimum=0,
+                    maximum=2333,
+                    step=1,
+                    label="",
+                    value=0,
+                    visible=False,
+                    interactive=True,
+                )
+                #clean_button.click(fn=clean, inputs=[], outputs=[sid0])
+                sid0.change(
+                    fn=get_vc,
+                    inputs=[sid0],
+                    outputs=[spk_item],
+                )
+                but0 = gr.Button("Convert", variant="primary")
+            with gr.Row():
+                with gr.Column():
+                    with gr.Row():
+                        dropbox = gr.File(label="Drag your audio file and click refresh.")
+                    with gr.Row():
+                        record_button=gr.Audio(source="microphone", label="Or you can use your microphone!", type="filepath")
+                    with gr.Row():
+                        input_audio0 = gr.Dropdown(
+                            label="2.Choose the audio file.",
+                            value="./audios/Test_Audio.mp3",
+                            choices=audio_files
+                            )
+                        dropbox.upload(fn=save_to_wav2, inputs=[dropbox], outputs=[input_audio0])
+                        dropbox.upload(fn=change_choices2, inputs=[], outputs=[input_audio0])
+                        refresh_button2 = gr.Button("Refresh", variant="primary", size='sm')
+                        record_button.change(fn=save_to_wav, inputs=[record_button], outputs=[input_audio0])
+                        record_button.change(fn=change_choices2, inputs=[], outputs=[input_audio0])    
+                    # with gr.Row():
+                    #     with gr.Accordion('ElevenLabs / Google TTS', open=False):
+                    #         with gr.Column():
+                    #             lang = gr.Radio(label='Chinese & Japanese do not work with ElevenLabs currently.',choices=['en','it','es','fr','pt','zh-CN','de','hi','ja'], value='en')
+                    #             api_box = gr.Textbox(label="Enter your API Key for ElevenLabs, or leave empty to use GoogleTTS", value='')
+                    #             elevenid=gr.Dropdown(label="Voice:", choices=eleven_voices)
+                    #         with gr.Column():
+                    #             tfs = gr.Textbox(label="Input your Text", interactive=True, value="This is a test.")
+                    #             tts_button = gr.Button(value="Speak")
+                    #             tts_button.click(fn=elevenTTS, inputs=[api_box,tfs, elevenid, lang], outputs=[record_button, input_audio0])
+                    # with gr.Row():
+                    #     with gr.Accordion('Wav2Lip', open=False, visible=False):
+                    #         with gr.Row():
+                    #             size = gr.Radio(label='Resolution:',choices=['Half','Full'])
+                    #             face = gr.UploadButton("Upload A Character",type='file')
+                    #             faces = gr.Dropdown(label="OR Choose one:", choices=['None','Ben Shapiro','Andrew Tate'])
+                    #         with gr.Row():
+                    #             preview = gr.Textbox(label="Status:",interactive=False)
+                    #             face.upload(fn=success_message,inputs=[face], outputs=[preview, faces])
+                    #         with gr.Row():
+                    #             animation = gr.Video(type='filepath')
+                    #             refresh_button2.click(fn=change_choices2, inputs=[], outputs=[input_audio0, animation])
+                    #         with gr.Row():
+                    #             animate_button = gr.Button('Animate')
+                        
+                with gr.Column():
+                    vc_output2 = gr.Audio(
+                        label="Final Result! (Click on the three dots to download the audio)",
+                        type='filepath',
+                        interactive=False,
+                    )
+                    
+                    # with gr.Accordion('IlariaTTS', open=True):
+                    #     with gr.Column():
+                    #         ilariaid=gr.Dropdown(label="Voice:", choices=ilariavoices, value="English-Jenny (Female)")
+                    #         ilariatext = gr.Textbox(label="Input your Text", interactive=True, value="This is a test.")
+                    #         ilariatts_button = gr.Button(value="Speak")
+                    #         ilariatts_button.click(fn=ilariaTTS, inputs=[ilariatext, ilariaid], outputs=[record_button, input_audio0])    
+
+                #with gr.Column():
+                    with gr.Accordion("Index Settings", open=False):
+                        #with gr.Row():
+                        
+                            file_index1 = gr.Dropdown(
+                                label="3. Choose the index file (in case it wasn't automatically found.)",
+                                choices=get_indexes(),
+                                value=get_index(),
+                                interactive=True,
+                                )
+                            sid0.change(fn=match_index, inputs=[sid0],outputs=[file_index1])
+                            refresh_button.click(
+                                fn=change_choices, inputs=[], outputs=[sid0, file_index1]
+                                )
+                            # file_big_npy1 = gr.Textbox(
+                            #     label=i18n("特征文件路径"),
+                            #     value="E:\\codes\py39\\vits_vc_gpu_train\\logs\\mi-test-1key\\total_fea.npy",
+                            #     interactive=True,
+                            # )
+                            index_rate1 = gr.Slider(
+                                minimum=0,
+                                maximum=1,
+                                label="",
+                                value=0,
+                                interactive=True,
+                                )
+
+                    # animate_button.click(fn=mouth, inputs=[size, face, vc_output2, faces], outputs=[animation, preview])
+
+                    with gr.Accordion("Advanced Options", open=False):
+                        f0method0 = gr.Radio(
+                            label="Optional: Change the Pitch Extraction Algorithm. Extraction methods are sorted from 'worst quality' to 'best quality'. If you don't know what you're doing, leave rmvpe.",
+                            choices=["pm", "dio", "crepe-tiny", "mangio-crepe-tiny", "crepe", "harvest", "mangio-crepe", "rmvpe"], # Fork Feature. Add Crepe-Tiny
+                            value="rmvpe",
+                            interactive=True,
+                        )
+                        
+                        crepe_hop_length = gr.Slider(
+                            minimum=1,
+                            maximum=512,
+                            step=1,
+                            label="Mangio-Crepe Hop Length. Higher numbers will reduce the chance of extreme pitch changes but lower numbers will increase accuracy. 64-192 is a good range to experiment with.",
+                            value=120,
+                            interactive=True,
+                            visible=False,
+                            )
+                        f0method0.change(fn=whethercrepeornah, inputs=[f0method0], outputs=[crepe_hop_length])
+                        filter_radius0 = gr.Slider(
+                            minimum=0,
+                            maximum=7,
+                            label="",
+                            value=3,
+                            step=1,
+                            interactive=True,
+                            )
+                        resample_sr0 = gr.Slider(
+                            minimum=0,
+                            maximum=48000,
+                            label="",
+                            value=0,
+                            step=1,
+                            interactive=True,
+                            visible=False
+                            )
+                        rms_mix_rate0 = gr.Slider(
+                            minimum=0,
+                            maximum=1,
+                            label="",
+                            value=0.21,
+                            interactive=True,
+                            )
+                        protect0 = gr.Slider(
+                            minimum=0,
+                            maximum=0.5,
+                            label="",
+                            value=0,
+                            step=0.01,
+                            interactive=True,
+                            )
+                        formanting = gr.Checkbox(
+                            value=bool(DoFormant),
+                            label="[EXPERIMENTAL] Formant shift inference audio",
+                            info="Used for male to female and vice-versa conversions",
+                            interactive=True,
+                            visible=True,
+                        )
+                        
+                        formant_preset = gr.Dropdown(
+                            value='',
+                            choices=get_fshift_presets(),
+                            label="browse presets for formanting",
+                            visible=bool(DoFormant),
+                        )
+                        formant_refresh_button = gr.Button(
+                            value='\U0001f504',
+                            visible=bool(DoFormant),
+                            variant='primary',
+                        )
+                        #formant_refresh_button = ToolButton( elem_id='1')
+                        #create_refresh_button(formant_preset, lambda: {"choices": formant_preset}, "refresh_list_shiftpresets")
+                        
+                        qfrency = gr.Slider(
+                                value=Quefrency,
+                                info="Default value is 1.0",
+                                label="Frequency for formant shifting",
+                                minimum=0.0,
+                                maximum=16.0,
+                                step=0.1,
+                                visible=bool(DoFormant),
+                                interactive=True,
+                            )
+                        tmbre = gr.Slider(
+                            value=Timbre,
+                            info="Default value is 1.0",
+                            label="Timbre for formant shifting",
+                            minimum=0.0,
+                            maximum=16.0,
+                            step=0.1,
+                            visible=bool(DoFormant),
+                            interactive=True,
+                        )
+                        
+                        formant_preset.change(fn=preset_apply, inputs=[formant_preset, qfrency, tmbre], outputs=[qfrency, tmbre])
+                        frmntbut = gr.Button("Apply", variant="primary", visible=bool(DoFormant))
+                        formanting.change(fn=formant_enabled,inputs=[formanting,qfrency,tmbre,frmntbut,formant_preset,formant_refresh_button],outputs=[formanting,qfrency,tmbre,frmntbut,formant_preset,formant_refresh_button])
+                        frmntbut.click(fn=formant_apply,inputs=[qfrency, tmbre], outputs=[qfrency, tmbre])
+                        formant_refresh_button.click(fn=update_fshift_presets,inputs=[formant_preset, qfrency, tmbre],outputs=[formant_preset, qfrency, tmbre])
+            
+            with gr.Row():
+                vc_output1 = gr.Textbox("")
+                f0_file = gr.File(label="", visible=False)
+                
+                but0.click(
+                    vc_single,
+                    [
+                        spk_item,
+                        input_audio0,
+                        vc_transform0,
+                        f0_file,
+                        f0method0,
+                        file_index1,
+                        # file_index2,
+                        # file_big_npy1,
+                        index_rate1,
+                        filter_radius0,
+                        resample_sr0,
+                        rms_mix_rate0,
+                        protect0,
+                        crepe_hop_length
+                    ],
+                    [vc_output1, vc_output2],
+                )
+                        
+            with gr.Accordion("Batch Conversion",open=False, visible=False):
+                with gr.Row():
+                    with gr.Column():
+                        vc_transform1 = gr.Number(
+                            label="", value=0
+                        )
+                        opt_input = gr.Textbox(label="", value="opt")
+                        f0method1 = gr.Radio(
+                            label="",
+                            choices=["pm", "harvest", "crepe", "rmvpe"],
+                            value="rmvpe",
+                            interactive=True,
+                        )
+                        filter_radius1 = gr.Slider(
+                            minimum=0,
+                            maximum=7,
+                            label="",
+                            value=3,
+                            step=1,
+                            interactive=True,
+                        )
+                    with gr.Column():
+                        file_index3 = gr.Textbox(
+                            label="",
+                            value="",
+                            interactive=True,
+                        )
+                        file_index4 = gr.Dropdown(
+                            label="",
+                            choices=sorted(index_paths),
+                            interactive=True,
+                        )
+                        refresh_button.click(
+                            fn=lambda: change_choices()[1],
+                            inputs=[],
+                            outputs=file_index4,
+                        )
+                        # file_big_npy2 = gr.Textbox(
+                        #     label=i18n("特征文件路径"),
+                        #     value="E:\\codes\\py39\\vits_vc_gpu_train\\logs\\mi-test-1key\\total_fea.npy",
+                        #     interactive=True,
+                        # )
+                        index_rate2 = gr.Slider(
+                            minimum=0,
+                            maximum=1,
+                            label="",
+                            value=1,
+                            interactive=True,
+                        )
+                    with gr.Column():
+                        resample_sr1 = gr.Slider(
+                            minimum=0,
+                            maximum=48000,
+                            label="",
+                            value=0,
+                            step=1,
+                            interactive=True,
+                        )
+                        rms_mix_rate1 = gr.Slider(
+                            minimum=0,
+                            maximum=1,
+                            label="",
+                            value=1,
+                            interactive=True,
+                        )
+                        protect1 = gr.Slider(
+                            minimum=0,
+                            maximum=0.5,
+                            label="",
+                            value=0.33,
+                            step=0.01,
+                            interactive=True,
+                        )
+                    with gr.Column():
+                        dir_input = gr.Textbox(
+                            label="",
+                            value="E:\codes\py39\\test-20230416b\\todo-songs",
+                        )
+                        inputs = gr.File(
+                            file_count="multiple", label=""
+                        )
+                    with gr.Row():
+                        format1 = gr.Radio(
+                            label="",
+                            choices=["wav", "flac", "mp3", "m4a"],
+                            value="flac",
+                            interactive=True,
+                        )
+                        but1 = gr.Button("", variant="primary")
+                        vc_output3 = gr.Textbox(label="")
+                    but1.click(
+                        vc_multi,
+                        [
+                            spk_item,
+                            dir_input,
+                            opt_input,
+                            inputs,
+                            vc_transform1,
+                            f0method1,
+                            file_index3,
+                            file_index4,
+                            # file_big_npy2,
+                            index_rate2,
+                            filter_radius1,
+                            resample_sr1,
+                            rms_mix_rate1,
+                            protect1,
+                            format1,
+                            crepe_hop_length,
+                        ],
+                        [vc_output3],
+                    )
+                    but1.click(fn=lambda: easy_uploader.clear())
+        with gr.TabItem("TTS"):
             app.load(update_message)
 
             # Other RVC stuff
@@ -2456,5 +2815,5 @@ with gr.Blocks(theme=gr.themes.Default(primary_hue="pink", secondary_hue="rose")
                 "-------------------------------\n"
             )
                 
-    app.queue(concurrency_count=511, max_size=1022).launch(share=False, quiet=False, auth=[('jvke', 'thisfeelslikeai'), ('cmss60', 'yourseedislate')])
+    app.queue(concurrency_count=511, max_size=1022).launch(share=False, quiet=False, auth=[('jvke', 'thisfeelslikeai')])
 #endregion