feat: update default model and let 1p1l model show dialect and speaker dropdown

app.py

@@ -60,7 +60,7 @@ def text_to_speech(
     if use_default_emb_or_custom == "default":
         wav = model.tts(
             parse_ipa(ipa),
-            speaker_name=speaker,
+            speaker_name=speaker if len(models_config[model_id]["speaker_mapping"]) > 1 else None,
             language_name=dialect,
             split_sentences=False,
         )
@@ -82,11 +82,9 @@ def text_to_speech(
 def when_model_selected(model_id):
     model_config = models_config[model_id]
 
-    speaker_drop_down_choices = []
-    if "speaker_mapping" in model_config:
-        speaker_drop_down_choices = [
-            (k, v) for k, v in model_config["speaker_mapping"].items()
-        ]
+    speaker_drop_down_choices = [
+        (k, v) for k, v in model_config["speaker_mapping"].items()
+    ]
     
     dialect_drop_down_choices = [
         (k, v) for k, v in model_config["dialect_mapping"].items()
@@ -100,12 +98,12 @@ def when_model_selected(model_id):
         gr.update(
             choices=speaker_drop_down_choices,
             value=speaker_drop_down_choices[0][1] if len(speaker_drop_down_choices) > 0 else None,
-            visible=len(speaker_drop_down_choices) > 1,
+            interactive=len(speaker_drop_down_choices) > 1,
         ),
         gr.update(
             choices=dialect_drop_down_choices,
             value=dialect_drop_down_choices[0][1],
-            visible=len(dialect_drop_down_choices) > 1,
+            interactive=len(dialect_drop_down_choices) > 1,
         ),
         gr.update(visible=use_default_emb_or_ref_radio_visible, value="default"),
     )
@@ -161,6 +159,7 @@ with demo:
         ],
         value=list(models_config[default_model_id]["speaker_mapping"].values())[0],
         label="語者",
+        interactive=len(models_config[default_model_id]["speaker_mapping"]) > 1,
     )
     use_default_emb_or_custom_radio.input(
         use_default_emb_or_custom_radio_input,
@@ -175,6 +174,7 @@ with demo:
         ],
         value=list(models_config[default_model_id]["dialect_mapping"].values())[0],
         label="腔調",
+        interactive=len(models_config[default_model_id]["dialect_mapping"]) > 1,
     )
 
     model_drop_down.input(

configs/models.yaml

@@ -1,13 +1,20 @@
+sixian-1p-240417:
+  model: ${load_model:formospeech/taiwanese-hakka-tts-sixian-1p-240417}
+  dialect_mapping:
+    四縣: sixian
+  speaker_mapping: # display_name: id
+    四縣／女（64）: XF
+
 sixian-hailu-mix:
   model: ${load_model:formospeech/taiwanese-hakka-tts-sixian-hailu-mix}
   dialect_mapping:
     四縣: sixian
     海陸: hailu
   speaker_mapping: # display_name: id
-    四縣／女: XF
-    四縣／男: XM
-    海陸／女: HF
-    海陸／男: HM
+    四縣／女（64）: XF
+    四縣／男（53）: XM
+    海陸／女（54）: HF
+    海陸／男（56）: HM
 
 sixian-hailu-mix-se:
   model: ${load_model:formospeech/taiwanese-hakka-tts-sixian-hailu-mix-se}
@@ -15,13 +22,9 @@ sixian-hailu-mix-se:
     四縣: sixian
     海陸: hailu
   speaker_mapping: # display_name: id
-    四縣／女: XF
-    四縣／男: XM
-    海陸／女: HF
-    海陸／男: HM
+    四縣／女（64）: XF
+    四縣／男（53）: XM
+    海陸／女（54）: HF
+    海陸／男（56）: HM
 
-sixian-1p-240417:
-  model: ${load_model:formospeech/taiwanese-hakka-tts-sixian-1p-240417}
-  dialect_mapping:
-    四縣: sixian