Update web-app.py

web-app.py

@@ -1,24 +1,31 @@
 import gradio as gr
 import os, shutil
-import subprocess
+import subprocess, glob
 from datetime import datetime
 os.environ["rmvpe_root"] = "assets/rmvpe"
 os.environ['index_root']="logs"
 os.environ['weight_root']="assets/weights"
 
-def convert(audio_picker,model_picker):
+def convert(audio_picker,model_picker,index_picker,index_rate,pitch):
     gr.Warning("Your audio is being converted. Please wait.")
     now = datetime.now().strftime("%d%m%Y%H%M%S")
+    index_files = glob.glob(f"logs/{index_picker}/*.index")
+    if index_files:
+        print(f"Found index: {index_files[0]}")
+    else:
+        gr.Warning("Sorry, I couldn't find your .index file.")
+        print("Did not find a matching .index file")
+        index_files = [f'logs/{model_picker}/fake_index.index']
     command = [
         "python",
         "tools/infer_cli.py",
-        "--f0up_key", "0",
+        "--f0up_key", str(pitch),
         "--input_path", f"audios/{audio_picker}",
-        "--index_path", f"logs/{model_picker}/*.index",
+        "--index_path", index_files[0],
         "--f0method", "rmvpe",
         "--opt_path", f"audios/cli_output_{now}.wav",
         "--model_name", f"{model_picker}",
-        "--index_rate", "0.8",
+        "--index_rate", str(float(index_rate)),
         "--device", "cpu",
         "--filter_radius", "3",
         "--resample_sr", "0",
@@ -54,10 +61,16 @@ for file, link in files.items():
             print(f"Error downloading {file}: {e}")
             
 def download_from_url(url, model):
+    if model =='':
+        try:
+            model = url.split('/')[-1].split('?')[0]
+        except:
+            return "You need to name your model. For example: My-Model", {"choices":show_available("assets/weights"),"__type__":"update"}
+    url=url.replace('/blob/main/','/resolve/main/')
+    model=model.replace('.pth','').replace('.index','').replace('.zip','')
+    print(f"Model name: {model}")
     if url == '':
         return "URL cannot be left empty.", {"choices":show_available("assets/weights"),"__type__":"update"}
-    if model =='':
-        return "You need to name your model. For example: My-Model", {"choices":show_available("assets/weights"),"__type__":"update"}
     url = url.strip()
     zip_dirs = ["zips", "unzips"]
     for directory in zip_dirs:
@@ -68,6 +81,13 @@ def download_from_url(url, model):
     zipfile = model + '.zip'
     zipfile_path = './zips/' + zipfile
     try:
+        if url.endswith('.pth'):
+            subprocess.run(["wget", url, "-O", f'./assets/weights/{model}.pth'])
+            return f"Sucessfully downloaded as {model}.pth", {"choices":show_available("assets/weights"),"__type__":"update"}
+        elif url.endswith('.index'):
+            if not os.path.exists(f'./logs/{model}'): os.makedirs(f'./logs/{model}')
+            subprocess.run(["wget", url, "-O", f'./logs/{model}/added_{model}.index'])
+            return f"Successfully downloaded as added_{model}.index", {"choices":show_available("assets/weights"),"__type__":"update"}
         if "drive.google.com" in url:
             subprocess.run(["gdown", url, "--fuzzy", "-O", zipfile_path])
         elif "mega.nz" in url:
@@ -94,7 +114,7 @@ def download_from_url(url, model):
         return "Success.", {"choices":show_available("assets/weights"),"__type__":"update"}
     except:
         return "There's been an error.", {"choices":show_available("assets/weights"),"__type__":"update"}
-            
+
 def show_available(filepath,format=None):
     if format:
         print(f"Format: {format}")
@@ -106,11 +126,16 @@ def show_available(filepath,format=None):
             else:
                 print(f"Does not match format: {file}")
         print(f"Matches: {files}")
+        if len(files) < 1:
+            return ['']
         return files
+    if len(os.listdir(filepath)) < 1:
+        return ['']
     return os.listdir(filepath)
   
 def upload_file(file):
     audio_formats = ['.wav', '.mp3', '.ogg', '.flac', '.aac']
+    print(file)
     try:
         _, ext = os.path.splitext(file.name)
         filename = os.path.basename(file.name)
@@ -128,25 +153,21 @@ def upload_file(file):
     return {"choices":show_available('audios'),"__type__": "update","value":filename}
 
 def refresh():
-    return {"choices":show_available("audios"),"__type__": "update"},{"choices":show_available("assets/weights",".pth"),"__type__": "update"}
+    return {"choices":show_available("audios"),"__type__": "update"},{"choices":show_available("assets/weights",".pth"),"__type__": "update"},{"choices":show_available("logs"),"__type__": "update"}
 
 def update_audio_player(choice):
     return os.path.join("audios",choice)
 
-app = gr.Blocks()
-with app:
-    with gr.Tabs():
-        with gr.TabItem("Rejekts/EasyGUI"):
-            gr.Markdown(
-                value="""
-               Rejekts EasyGUI
-                """
-    )
+with gr.Blocks() as app:
+    with gr.Row():
+        with gr.Column():
+            gr.HTML("<img  src='file/a.png' alt='easy>")
     with gr.Row():
         with gr.Column():
             with gr.Tabs():
                 with gr.TabItem("1.Choose a voice model:"):
-                    model_picker = gr.Dropdown(label="",choices=show_available('assets/weights','.pth'),value='',interactive=True)
+                    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)
                 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)")
@@ -156,6 +177,9 @@ with app:
                         with gr.Column():
                             download_button = gr.Button("Download")
                             download_button.click(fn=download_from_url,inputs=[url,model_rename],outputs=[url,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)
         
     with gr.Row():
         with gr.Tabs():
@@ -164,14 +188,14 @@ with app:
                 audio_picker = gr.Dropdown(label="",choices=show_available('audios'),value='',interactive=True)
                 recorder.stop_recording(upload_file, inputs=[recorder],outputs=[audio_picker])
             with gr.TabItem("(Or upload a new file here)"):
-                dropbox = gr.Audio(label="Drop an audio here.",sources=['upload'])
+                dropbox = gr.File(label="Drop an audio here.",file_types=['.wav', '.mp3', '.ogg', '.flac', '.aac'], type="filepath")
                 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])
+        audio_refresher.click(fn=refresh,inputs=[],outputs=[audio_picker,model_picker,index_picker])
         convert_button = gr.Button("Convert")
     with gr.Row():
         audio_player = gr.Audio()
         audio_picker.change(fn=update_audio_player, inputs=[audio_picker],outputs=[audio_player])
-        convert_button.click(convert, inputs=[audio_picker,model_picker],outputs=[audio_picker,audio_player])
+        convert_button.click(convert, inputs=[audio_picker,model_picker,index_picker,index_rate,pitch],outputs=[audio_picker,audio_player])
 
 app.queue().launch()