Update app.py

app.py

@@ -120,36 +120,26 @@ def detect_onnx_models(path):
     onnx_models = glob.glob(path + '/*.onnx')
     onnx_configs = glob.glob(path + '/*.json')
     if len(onnx_models) > 1:
-        return onnx_models, onnx_configs
+        return onnx_models, onnx_configs  # Return both lists as a tuple
     elif len(onnx_models) == 1:
         return onnx_models[0], onnx_configs[0]
     else:
         return None
 
-
-renamed_audio_file = None
-
-# Define an endpoint to serve the speaker_id_map
 @app.get("/get_speaker_id_map")
-async def get_speaker_id_map():
-    # You can load the speaker_id_map from the selected model's config here
-    # For example, you can use the selected_model value from the request
-    # to determine which model's config to load and extract the speaker_id_map.
-    
-    # Replace this with the actual code to load the speaker_id_map
-    selected_model = "model_name"  # Replace with the selected model name
-    config = model_configurations[selected_model]
+async def get_speaker_id_map(selected_model: str):
+    config = model_configurations.get(selected_model)
     
     if config:
         speaker_id_map = config.get("speaker_id_map", {})
         return {"speaker_id_map": speaker_id_map}
     
-    # Handle the case where the config is not available
+    # Handle the case where the config is not available for the selected model
     return {"speaker_id_map": {}}
 
 @app.on_event("startup")
 async def load_model_data():
-    global onnx_models  # Make onnx_models available globally
+    global onnx_models, model_configurations  # Make these variables available globally
     # Load data for all models in the directory upon startup
     sys.path.append('./content/piper/src/python')
     models_path = "./content/piper/src/python"
@@ -162,18 +152,17 @@ async def load_model_data():
     sess_options = onnxruntime.SessionOptions()
 
     # Collect data for all models in the directory and populate model_configurations
-    model_names = detect_onnx_models(models_path)
+    model_names, config_names = detect_onnx_models(models_path)
     onnx_models = model_names  # Populate onnx_models here
-    for model_name in model_names:
+    for config_name in config_names:
         # Load the configuration data for each model (including speaker_id_map)
-        config = load_model_configuration(model_name)
-        model_configurations[model_name] = config
-
-
-def load_model_configuration(model_name):
-    # Assuming model_name is the path to the ONNX model file, e.g., 'model.onnx'
-    config_file_path = model_name.replace('.onnx', '.json')
+        config = load_model_configuration(config_name)  # Use config_name as the argument
+        model_configurations[config_name] = config  # Use config_name as the key
 
+def load_model_configuration(config_name):
+    # Assuming config_name is the path to the ONNX model config file, e.g., 'model.json'
+    config_file_path = config_name
+    
     try:
         with open(config_file_path, 'r') as config_file:
             config_data = json.load(config_file)