Validate Kokoro voice metadata names

Author: basnijholt

agent_cli/server/tts/wyoming_handler.py

@@ -4,7 +4,6 @@
 
 import logging
 from functools import partial
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 from wyoming.audio import AudioChunk, AudioStart, AudioStop
@@ -38,11 +37,18 @@
 def _tts_voice(name: str, backend_type: str) -> TtsVoice:
     """Build Wyoming voice metadata for a registered TTS model."""
     if backend_type == "kokoro":
-        from agent_cli.server.tts.backends.kokoro import DEFAULT_VOICE  # noqa: PLC0415
+        prefix, separator, voice_name = name.partition("_")
+        is_voice = (
+            separator == "_"
+            and prefix[:1] in _KOKORO_LANGUAGE_TAGS
+            and prefix[1:] in {"f", "m"}
+            and bool(voice_name)
+        )
+        if not is_voice:
+            from agent_cli.server.tts.backends.kokoro import DEFAULT_VOICE  # noqa: PLC0415
 
-        if name == "kokoro" or Path(name).suffix.lower() == ".pth":
             name = DEFAULT_VOICE
-        language = _KOKORO_LANGUAGE_TAGS.get(Path(name).stem[:1].lower(), "en")
+        language = _KOKORO_LANGUAGE_TAGS[name[0]]
         return TtsVoice(
             name=name,
             description=f"Kokoro TTS {name}",

tests/test_server_tts_wyoming.py

@@ -33,7 +33,10 @@ def test_kokoro_voice_language_tags(name: str, language: str) -> None:
     assert _tts_voice(name, "kokoro").languages == [language]
 
 
-@pytest.mark.parametrize("model_name", ["kokoro", "/models/kokoro-v1_0.pth"])
+@pytest.mark.parametrize(
+    "model_name",
+    ["kokoro", "/models/kokoro-v1_0.pth", "kokoro-v1_0", "custom-model"],
+)
 def test_kokoro_model_name_advertises_default_voice(model_name: str) -> None:
     """Kokoro model identifiers should not be advertised as voice names."""
     voice = _tts_voice(model_name, "kokoro")