Update demo.py

demo.py

@@ -33,8 +33,8 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
             with gr.Row():
                 with gr.Column():
                     with gr.Row():
-                        # Sources must be a list in Gradio 4+
-                        dropbox = gr.Audio(label="Drop your audio here & hit the Reload button.", sources=["upload"])
+                        # 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")
                     with gr.Row():
@@ -47,23 +47,38 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
                     with gr.Row():
                         audio_player = gr.Audio()
                         
-                        # Updated logic for Gradio 6 (using gr.update)
+                        # Fixed: Proper function to update audio player
+                        def update_audio_player(path):
+                            if path and os.path.exists(path):
+                                return path
+                            return None
+                        
                         input_audio0.change(
+                            fn=update_audio_player,
                             inputs=[input_audio0],
-                            outputs=[audio_player],
-                            fn=lambda path: path if os.path.exists(path) else None
+                            outputs=[audio_player]
                         )
                         
-                        # Replaced stop_recording (deprecated) with change
+                        # Fixed: Handle record button properly
+                        def handle_record(audio):
+                            if audio:
+                                return audio
+                            return ""
+                        
                         record_button.change(
-                            fn=lambda audio: audio,
+                            fn=handle_record,
                             inputs=[record_button], 
                             outputs=[input_audio0]
                         )
                         
-                        # Updated logic assuming audio is path (type="filepath")
-                        dropbox.upload(
-                            fn=lambda audio: audio,
+                        # Fixed: Handle dropbox upload
+                        def handle_upload(audio):
+                            if audio:
+                                return audio
+                            return ""
+                        
+                        dropbox.change(
+                            fn=handle_upload,
                             inputs=[dropbox], 
                             outputs=[input_audio0]
                         )
@@ -136,23 +151,24 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
                     def refresh_ui():
                         # Get updated lists
                         # Assuming change_choices is imported from original or defined elsewhere
-                        # It needs to return (model_choices, index_choices)
-                        model_choices, index_choices = change_choices()
+                        try:
+                            model_choices, index_choices = change_choices()
+                        except:
+                            # Fallback if change_choices doesn't return two values
+                            model_choices = []
+                            index_choices = []
                         
                         audio_paths = get_audio_paths('audios')
 
-                        # Helper to safely get the first item from list or dict
-                        # Fixes KeyError: 0 when change_choices returns a dictionary
+                        # Helper to safely get the first item
                         def safe_first(data):
-                            if not data: return ""
+                            if not data:
+                                return ""
                             if isinstance(data, dict):
-                                # If it's a dict, Gradio uses values as the actual data/paths
                                 return next(iter(data.values()))
-                            try:
-                                # Assume it's a list or sequence
+                            if isinstance(data, list) and len(data) > 0:
                                 return data[0]
-                            except (IndexError, KeyError):
-                                return ""
+                            return ""
 
                         default_audio = safe_first(audio_paths)
                         default_model = safe_first(model_choices)
@@ -256,17 +272,39 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
                     dataset_folder = gr.Textbox(
                         label="dataset folder", value='dataset'
                     )
-                    # Replaced gr.Files with gr.File(file_count="multiple")
+                    # 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)
                     
-                    easy_uploader.upload(inputs=[dataset_folder], outputs=[], fn=lambda folder: os.makedirs(folder, exist_ok=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')
+                            return []
+                        if not os.path.exists(folder):
+                            os.makedirs(folder, exist_ok=True)
+                        
+                        saved_files = []
+                        for file_obj in files:
+                            if hasattr(file_obj, 'name'):  # Handle Gradio file object
+                                filename = os.path.basename(file_obj.name)
+                                dest_path = os.path.join(folder, filename)
+                                shutil.copy2(file_obj.name, dest_path)
+                                saved_files.append(dest_path)
+                            elif isinstance(file_obj, str):  # Handle string path
+                                filename = os.path.basename(file_obj)
+                                dest_path = os.path.join(folder, filename)
+                                shutil.copy2(file_obj, dest_path)
+                                saved_files.append(dest_path)
+                        return []
+                    
                     easy_uploader.upload(
-                        fn=lambda files, folder: [shutil.copy2(f.name, os.path.join(folder, os.path.split(f.name)[1])) for f in files] if folder != "" else gr.Warning('Please enter a folder name for your dataset'),
+                        fn=handle_file_upload,
                         inputs=[easy_uploader, dataset_folder], 
                         outputs=[]
                     )
+                    
                     gpus6 = gr.Textbox(
                         label="Enter the GPU numbers to use separated by -, (e.g. 0-1-2)",
                         value=gpus,
@@ -382,9 +420,14 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
                             interactive=True,
                         )
                         with gr.Accordion(label="Change pretrains", open=False):
-                            # Replaced lambda in value definition
+                            # Fixed: Get pretrained choices
                             def get_pretrained_choices(sr, letter):
-                                return [os.path.abspath(os.path.join('assets/pretrained_v2', file)) for file in os.listdir('assets/pretrained_v2') if file.endswith('.pth') and sr in file and letter in file]
+                                pretrained_dir = 'assets/pretrained_v2'
+                                if not os.path.exists(pretrained_dir):
+                                    return []
+                                return [os.path.abspath(os.path.join(pretrained_dir, file)) 
+                                       for file in os.listdir(pretrained_dir) 
+                                       if file.endswith('.pth') and sr in file and letter in file]
 
                             pretrained_G14 = gr.Dropdown(
                                 label="pretrained G",
@@ -402,24 +445,40 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
                             )
 
                             def update_pretrained_dropdowns(sr, f0, ver):
-                                g_choices = get_pretrained_choices(sr, 'G')
-                                d_choices = get_pretrained_choices(sr, 'D')
+                                sr_str = sr if isinstance(sr, str) else str(sr)
+                                g_choices = get_pretrained_choices(sr_str, 'G')
+                                d_choices = get_pretrained_choices(sr_str, 'D')
                                 return (
                                     gr.update(choices=g_choices, value=g_choices[0] if g_choices else ""),
                                     gr.update(choices=d_choices, value=d_choices[0] if d_choices else "")
                                 )
                             
-                            # Bind update function to changes in sr2 or version19
+                            # 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():
-                        # Replaced gr.Files with gr.File
-                        model_files = gr.File(label='Your Model and Index file can be downloaded here:', file_count="multiple")
+                        # 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):
+                            if not name or name.strip() == "":
+                                return [], "Please enter a model name"
+                            
+                            model_path = f'assets/weights/{name}'
+                            index_pattern = f'logs/{name.split(".")[0]}/added_*.index'
+                            
+                            files = []
+                            if os.path.exists(model_path):
+                                files.extend([os.path.join(model_path, f) for f in os.listdir(model_path)])
+                            files.extend(glob.glob(index_pattern))
+                            
+                            return files, f"Found {len(files)} files"
+                        
                         download_model.click(
-                            fn=lambda name: os.listdir(f'assets/weights/{name}') + glob.glob(f'logs/{name.split(".")[0]}/added_*.index'),
+                            fn=download_model_files,
                             inputs=[training_name], 
                             outputs=[model_files, info3]
                         )
@@ -479,7 +538,7 @@ with gr.Blocks(title="🔊", theme=gr.themes.Base(primary_hue="blue", neutral_hu
                         api_name="train_start_all",
                     )
 
-    # Populate UI on load instead of using lambdas in value
+    # Populate UI on load
     app.load(
         fn=refresh_ui,
         inputs=[],