wyoming-piper 1.2.0__tar.gz → 1.3.0__tar.gz

{wyoming_piper-1.2.0 → wyoming_piper-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: wyoming_piper
-Version: 1.2.0
+Version: 1.3.0
 Summary: Wyoming Server for Piper
 Home-page: http://github.com/rhasspy/rhasspy3
 Author: Michael Hansen

{wyoming_piper-1.2.0 → wyoming_piper-1.3.0}/setup.py

@@ -19,7 +19,7 @@ data_files = [module_dir / "voices.json"]
 
 setup(
     name="wyoming_piper",
-    version="1.2.0",
+    version="1.3.0",
     description="Wyoming Server for Piper",
     url="http://github.com/rhasspy/rhasspy3",
     author="Michael Hansen",

{wyoming_piper-1.2.0 → wyoming_piper-1.3.0}/wyoming_piper/__main__.py

@@ -59,13 +59,19 @@ async def main() -> None:
         help="Maximum number of piper process to run simultaneously (default: 1)",
     )
     #
+    parser.add_argument(
+        "--update-voices",
+        action="store_true",
+        help="Download latest voices.json during startup",
+    )
+    #
     parser.add_argument("--debug", action="store_true", help="Log DEBUG messages")
     args = parser.parse_args()
 
     logging.basicConfig(level=logging.DEBUG if args.debug else logging.INFO)
 
     # Load voice info
-    voices_info = get_voices()
+    voices_info = get_voices(args.download_dir, update_voices=args.update_voices)
 
     # Resolve aliases for backwards compatibility with old voice names
     aliases_info: Dict[str, Any] = {}
@@ -102,7 +108,9 @@ async def main() -> None:
                         # if voice_info.get("speaker_id_map")
                         # else None,
                     )
-                    for voice_name, voice_info in voices_info.items()
+                    for voice_name, voice_info in sorted(
+                        voices_info.items(), key=lambda kv: kv[0]
+                    )
                     if not voice_info.get("_is_alias", False)
                 ],
             )

{wyoming_piper-1.2.0 → wyoming_piper-1.3.0}/wyoming_piper/download.py

@@ -20,9 +20,28 @@ class VoiceNotFoundError(Exception):
     pass
 
 
-def get_voices() -> Dict[str, Any]:
-    """Loads available voices from embedded JSON file."""
-    with open(_DIR / "voices.json", "r", encoding="utf-8") as voices_file:
+def get_voices(
+    download_dir: Union[str, Path], update_voices: bool = False
+) -> Dict[str, Any]:
+    """Loads available voices from downloaded or embedded JSON file."""
+    download_dir = Path(download_dir)
+    voices_download = download_dir / "voices.json"
+
+    if update_voices:
+        # Download latest voices.json
+        voices_url = URL_FORMAT.format(file="voices.json")
+        _LOGGER.debug("Downloading %s to %s", voices_url, voices_download)
+        with urlopen(voices_url) as response, open(
+            voices_download, "wb"
+        ) as download_file:
+            shutil.copyfileobj(response, download_file)
+
+    # Prefer downloaded file to embedded
+    voices_embedded = _DIR / "voices.json"
+    voices_path = voices_download if voices_download.exists() else voices_embedded
+
+    _LOGGER.debug("Loading %s", voices_path)
+    with open(voices_path, "r", encoding="utf-8") as voices_file:
         return json.load(voices_file)
 
 
@@ -32,10 +51,21 @@ def ensure_voice_exists(
     download_dir: Union[str, Path],
     voices_info: Dict[str, Any],
 ):
-    assert data_dirs, "No data dirs"
     if name not in voices_info:
+        # Try as file path to a custom voice
+        onnx_path = Path(name)
+        config_path = Path(name + ".json")
+        if onnx_path.exists():
+            if config_path.exists():
+                # Custom voice found
+                return
+
+            _LOGGER.warning("Missing custom voice config: %s", config_path)
+
         raise VoiceNotFoundError(name)
 
+    assert data_dirs, "No data dirs"
+
     voice_info = voices_info[name]
     voice_files = voice_info["files"]
     files_to_download: Set[str] = set()
@@ -109,6 +139,10 @@ def ensure_voice_exists(
 
 
 def find_voice(name: str, data_dirs: Iterable[Union[str, Path]]) -> Tuple[Path, Path]:
+    """Looks for the files for a voice.
+
+    Returns: tuple of onnx path, config path
+    """
     for data_dir in data_dirs:
         data_dir = Path(data_dir)
         onnx_path = data_dir / f"{name}.onnx"
@@ -117,4 +151,11 @@ def find_voice(name: str, data_dirs: Iterable[Union[str, Path]]) -> Tuple[Path,
         if onnx_path.exists() and config_path.exists():
             return onnx_path, config_path
 
+    # Try as a custom voice
+    onnx_path = Path(name)
+    config_path = Path(name + ".json")
+
+    if onnx_path.exists() and config_path.exists():
+        return onnx_path, config_path
+
     raise ValueError(f"Missing files for voice {name}")

{wyoming_piper-1.2.0 → wyoming_piper-1.3.0}/wyoming_piper/process.py

@@ -133,7 +133,6 @@ class PiperProcessManager:
                 "--json-input",  # piper 1.1+
             ]
 
-            _LOGGER.debug(voice_speaker)
             if voice_speaker is not None:
                 if _is_multispeaker(config):
                     speaker_id = _get_speaker_id(config, voice_speaker)

{wyoming_piper-1.2.0 → wyoming_piper-1.3.0}/wyoming_piper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: wyoming-piper
-Version: 1.2.0
+Version: 1.3.0
 Summary: Wyoming Server for Piper
 Home-page: http://github.com/rhasspy/rhasspy3
 Author: Michael Hansen