Update demo.py

demo.py

@@ -8,13 +8,22 @@ model_library = CachedModels()
 
 # Helper moved outside to avoid lambda issues in UI definition
 def get_audio_paths(path):
+    if not os.path.exists(path):
+        return []
     return [os.path.abspath(os.path.join(path, f)) for f in os.listdir(path) if os.path.splitext(f)[1].lower() in ('.mp3', '.wav', '.flac', '.ogg')]
 
 with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hue="zinc")) as app:
     with gr.Tabs():
         with gr.Tab("Inference"):
             with gr.Row():
-                voice_model = gr.Dropdown(label="Model Voice", choices=sorted(names), value=lambda:sorted(names)[0] if len(sorted(names)) > 0 else '', interactive=True)
+                # Initialize voice_model with proper choices
+                initial_names = sorted(names) if names else []
+                voice_model = gr.Dropdown(
+                    label="Model Voice", 
+                    choices=initial_names, 
+                    value=initial_names[0] if initial_names else None, 
+                    interactive=True
+                )
                 refresh_button = gr.Button("Refresh", variant="primary")
                 spk_item = gr.Slider(
                     minimum=0,
@@ -33,7 +42,6 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
             with gr.Row():
                 with gr.Column():
                     with gr.Row():
-                        # Fixed: Use correct parameter name
                         dropbox = gr.Audio(label="Drop your audio here & hit the Reload button.", type="filepath")
                     with gr.Row():
                         record_button = gr.Audio(sources=["microphone"], label="OR Record audio.", type="filepath")
@@ -47,7 +55,6 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
                     with gr.Row():
                         audio_player = gr.Audio()
                         
-                        # Fixed: Proper function to update audio player
                         def update_audio_player(path):
                             if path and os.path.exists(path):
                                 return path
@@ -59,7 +66,6 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
                             outputs=[audio_player]
                         )
                         
-                        # Fixed: Handle record button properly
                         def handle_record(audio):
                             if audio:
                                 return audio
@@ -71,7 +77,6 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
                             outputs=[input_audio0]
                         )
                         
-                        # Fixed: Handle dropbox upload
                         def handle_upload(audio):
                             if audio:
                                 return audio
@@ -150,34 +155,35 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
                     # Consolidated refresh logic
                     def refresh_ui():
                         # Get updated lists
-                        # Assuming change_choices is imported from original or defined elsewhere
                         try:
                             model_choices, index_choices = change_choices()
-                        except:
-                            # Fallback if change_choices doesn't return two values
+                        except Exception as e:
+                            print(f"Error in change_choices: {e}")
                             model_choices = []
                             index_choices = []
                         
+                        # Ensure model_choices and index_choices are lists
+                        if not isinstance(model_choices, list):
+                            model_choices = []
+                        if not isinstance(index_choices, list):
+                            index_choices = []
+                        
                         audio_paths = get_audio_paths('audios')
-
-                        # Helper to safely get the first item
-                        def safe_first(data):
-                            if not data:
-                                return ""
-                            if isinstance(data, dict):
-                                return next(iter(data.values()))
-                            if isinstance(data, list) and len(data) > 0:
-                                return data[0]
-                            return ""
-
-                        default_audio = safe_first(audio_paths)
-                        default_model = safe_first(model_choices)
-                        default_index = safe_first(index_choices)
+                        
+                        # Get current values
+                        current_model = voice_model.value if hasattr(voice_model, 'value') else None
+                        current_index = file_index2.value if hasattr(file_index2, 'value') else None
+                        current_audio = input_audio0.value if hasattr(input_audio0, 'value') else None
+                        
+                        # Set defaults
+                        default_model = current_model if current_model in model_choices else (model_choices[0] if model_choices else None)
+                        default_index = current_index if current_index in index_choices else (index_choices[0] if index_choices else None)
+                        default_audio = current_audio if current_audio in audio_paths else (audio_paths[0] if audio_paths else None)
 
                         return (
-                            gr.update(choices=model_choices, value=default_model), # voice_model
-                            gr.update(choices=index_choices, value=default_index), # file_index2
-                            gr.update(choices=audio_paths, value=default_audio)    # input_audio0
+                            gr.update(choices=model_choices, value=default_model),  # voice_model
+                            gr.update(choices=index_choices, value=default_index),  # file_index2
+                            gr.update(choices=audio_paths, value=default_audio)     # input_audio0
                         )
 
                     refresh_button.click(
@@ -272,12 +278,10 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
                     dataset_folder = gr.Textbox(
                         label="dataset folder", value='dataset'
                     )
-                    # Fixed: Use correct file handling
                     easy_uploader = gr.File(label="Drop your audio files here", file_count="multiple", file_types=["audio"])
                     but1 = gr.Button("1. Process", variant="primary")
                     info1 = gr.Textbox(label="Information", value="", visible=True)
                     
-                    # Fixed: Proper file upload handling
                     def handle_file_upload(files, folder):
                         if not folder or folder.strip() == "":
                             gr.Warning('Please enter a folder name for your dataset')
@@ -420,7 +424,6 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
                             interactive=True,
                         )
                         with gr.Accordion(label="Change pretrains", open=False):
-                            # Fixed: Get pretrained choices
                             def get_pretrained_choices(sr, letter):
                                 pretrained_dir = 'assets/pretrained_v2'
                                 if not os.path.exists(pretrained_dir):
@@ -453,14 +456,12 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
                                     gr.update(choices=d_choices, value=d_choices[0] if d_choices else "")
                                 )
                             
-                            # Bind update function to changes
                             sr2.change(fn=update_pretrained_dropdowns, inputs=[sr2, if_f0_3, version19], outputs=[pretrained_G14, pretrained_D15])
                             version19.change(fn=update_pretrained_dropdowns, inputs=[sr2, if_f0_3, version19], outputs=[pretrained_G14, pretrained_D15])
 
                     with gr.Row():
                         download_model = gr.Button('5.Download Model')
                     with gr.Row():
-                        # Fixed: File handling for model download
                         model_files = gr.File(label='Your Model and Index file can be downloaded here:')
                         
                         def download_model_files(name):