Update app.py

app.py

@@ -152,8 +152,6 @@ def load_model_configuration(model_name):
         return None
 
         
-#@app.post("/synthesize")
-#@app.post("/", response_class=FileResponse)
 @app.post("/", response_class=HTMLResponse)
 async def main(
     request: Request,
@@ -166,82 +164,62 @@ async def main(
     noise_scale_w_slider: float = Form(...),
     play: bool = Form(True)
 ):
-
-        # Handle loading the selected model and speaker ID here
+    # Handle loading the selected model and speaker ID here
     if selected_model in onnx_models:
-        config = model_configurations[selected_model]
-        onnx_model = config["onnx_model"]  # Replace with the actual key for your ONNX model file
-        model, config = load_onnx(onnx_model, sess_options, providers)
-        speaker_id_map = config.get("speaker_id_map", {})
-    if isinstance(onnx_models, str):
-        # Show loading message and disable the form
+        model_name = selected_model
+        config = load_model_configuration(model_name)
+        onnx_model = config.get("onnx_model")  # Replace with the actual key for your ONNX model file
+        if config:
+            model, _ = load_onnx(onnx_model, sess_options, providers)
+            speaker_id_map = config.get("speaker_id_map", {})
+
+            auto_play = play
+            audio = inferencing(model, config, 1, text_input, speed_slider, noise_scale_slider, noise_scale_w_slider, auto_play)
+            temp_dir = tempfile.mkdtemp()
+            renamed_audio_file = os.path.join(temp_dir, "download.mp3")
+            audio.export(renamed_audio_file, format="mp3")
+
+            # Generate a unique file ID
+            file_id = str(uuid.uuid4())
+
+            # Store the file path with the generated file ID
+            files[file_id] = renamed_audio_file
+
+            # Create a URL to download the file
+            file_url = f'/download?fileId={file_id}'
+
+            # Cleanup code for temp_dir here
+
+            # Restore the form and return the response
+            response_html = """
+            <script>
+            document.getElementById("loading-message").innerText = "Audio generated successfully!";
+            document.getElementById("synthesize_button").disabled = false;
+            </script>
+            """
+    else:
+        # The selected_model is not found in the list; handle this case as needed
+        # You can show an error message or handle it differently
         response_html = """
-        <div id="loading-message">Generating your audio, please wait...</div>
+        <div id="error-message">Selected model not found.</div>
         <script>
         document.getElementById("synthesize_button").disabled = true;
         </script>
         """
-if selected_model in onnx_models:
-    # The selected_model is found in the list of model file paths
-    model_name = selected_model
-    config = load_model_configuration(model_name)
-    onnx_model = model_name  # Replace with the actual key for your ONNX model file
-    if config:
-        model, _ = load_onnx(onnx_model, sess_options, providers)
-        speaker_id_map = config.get("speaker_id_map", {})
-else:
-    # The selected_model is not found in the list; handle this case as needed
-    # You can show an error message or handle it differently
-    response_html = """
-    <div id="error-message">Selected model not found.</div>
-    <script>
-    document.getElementById("synthesize_button").disabled = true;
-    </script>
-    """
-        auto_play = play
-        audio = inferencing(model, config, 1, text_input, speed_slider, noise_scale_slider, noise_scale_w_slider, auto_play)
-        temp_dir = tempfile.mkdtemp()
-
-
-        renamed_audio_file = os.path.join(temp_dir, "download.mp3")
-
-        audio.export(renamed_audio_file, format="mp3")
-        # Save the generated audio as a temporary file
-        filepath = renamed_audio_file
-    
-   # Generate a unique file ID
-        file_id = str(uuid.uuid4())
-    
-    # Store the file path with the generated file ID
-        files[file_id] = filepath
-    
-      # Create a URL to download the file
-        file_url = f'/download?fileId={file_id}'
-        # Restore the form and return the response
-        response_html += """
-        <script>
-        document.getElementById("loading-message").innerText = "Audio generated successfully!";
-        document.getElementById("synthesize_button").disabled = false;
-        </script>
-        """
-
-
-       
-    
-
-        # Save the audio as a temporary WAV file
-    return templates.TemplateResponse("interface.html", {"request": request, "file_url": file_url, "text_input": text_input, "data": data, "model_names": model_configurations.keys(),  # Pass the list of available model names
-        "selected_model": selected_model,  # Pass the selected model
-        "speaker_id_map": speaker_id_map,  # Pass the speaker ID map for the selected model
-        "selected_speaker_id": selected_speaker_id,  # Pass the selected speaker ID
-    #    "model": model,  # Pass the loaded model (if any) 
-        "voices": voices, "dynamic_content": response_html})
-   
-    # Serve the audio file with the correct media type
- #   return FileResponse(renamed_audio_file)
-
 
- #   return {"message": f"Text to synthesize: {text_input}, Speed: {speed_slider}, Play: {play}"}
+    # Pass the necessary data to the HTML template
+    return templates.TemplateResponse("interface.html", {
+        "request": request,
+        "file_url": file_url,
+        "text_input": text_input,
+        "data": data,
+        "model_names": model_configurations.keys(),
+        "selected_model": selected_model,
+        "speaker_id_map": speaker_id_map,
+        "selected_speaker_id": selected_speaker_id,
+        "voices": voices,  # Make sure to populate this variable
+        "dynamic_content": response_html
+    })
 
 @app.get("/download")
 async def download_file(fileId: str):