wyoming-piper 1.6.3__py3-none-any.whl → 2.2.0__py3-none-any.whl

{wyoming_piper-1.6.3.dist-info → wyoming_piper-2.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wyoming-piper
-Version: 1.6.3
+Version: 2.2.0
 Summary: Wyoming Server for Piper
 Author-email: Michael Hansen <mike@rhasspy.org>
 License: MIT
@@ -8,30 +8,34 @@ Project-URL: Homepage, http://github.com/rhasspy/wyoming-piper
 Keywords: rhasspy,wyoming,piper,tts
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
-Classifier: Topic :: Text Processing :: Linguistic
-Classifier: Programming Language :: Python :: 3.8
+Classifier: Topic :: Multimedia :: Sound/Audio :: Speech
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: wyoming<1.8,>=1.7.2
-Requires-Dist: regex==2024.11.6
+Requires-Dist: wyoming<2,>=1.8
+Requires-Dist: regex>=2024.11.6
+Requires-Dist: piper-tts<2,>=1.4.0
+Requires-Dist: sentence-stream<2,>=1.2.0
 Provides-Extra: dev
-Requires-Dist: black==22.12.0; extra == "dev"
-Requires-Dist: flake8==6.0.0; extra == "dev"
-Requires-Dist: isort==5.11.3; extra == "dev"
-Requires-Dist: mypy==0.991; extra == "dev"
-Requires-Dist: pylint==2.15.9; extra == "dev"
-Requires-Dist: pytest==7.4.4; extra == "dev"
-Requires-Dist: pytest-asyncio==0.23.3; extra == "dev"
-Requires-Dist: build==1.2.2.post1; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: pylint; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-asyncio; extra == "dev"
+Requires-Dist: build; extra == "dev"
 Requires-Dist: scipy<2,>=1.10; extra == "dev"
 Requires-Dist: numpy<2,>=1.20; extra == "dev"
-Requires-Dist: python-speech-features==0.6; extra == "dev"
+Requires-Dist: python-speech-features<1,>=0.6; extra == "dev"
+Provides-Extra: zeroconf
+Requires-Dist: piper-tts[zeroconf]; extra == "zeroconf"
+Provides-Extra: zh
+Requires-Dist: piper-tts[zh]; extra == "zh"
 Dynamic: license-file
 
 # Wyoming Piper

wyoming_piper-2.2.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+wyoming_piper/__init__.py,sha256=z1dsCtGazHHufHQpoVgNtMObt25qYBSOM85o7xgbIJA,139
+wyoming_piper/__main__.py,sha256=I_i_zcO7Z7_mSPTJVe207jnMGKymeNlDlNph4DC_Py8,8104
+wyoming_piper/const.py,sha256=04sCdtJ2QGuF1BQGkOuQW10og61PgH3fCnPhaYu-YoU,1015
+wyoming_piper/download.py,sha256=At1RBaVKsTTAO71LAJn8bDeJnvJXBS0vA6iCIo6BqZs,6349
+wyoming_piper/file_hash.py,sha256=HMuwrgEIg-bCOXHG0wE3vtjrqGD7QaA_UNfvBMXeUcY,1107
+wyoming_piper/handler.py,sha256=LHbJLmhq9j4rZE7fBrDJhPGm1nFIegNXfRlsjFOGhno,10195
+wyoming_piper/voices.json,sha256=Fkqd82jiQGWAZrD_q6_5adVRMaPEAWh1ehezFeGkeFw,217559
+wyoming_piper-2.2.0.dist-info/licenses/LICENSE.md,sha256=E3RtUJ105V6iJl--8gS7fNv4SoMVsCB-mIMmy1Q4cCg,1071
+wyoming_piper-2.2.0.dist-info/METADATA,sha256=IQlhbgewWw46T0Ot8ACoil5kZLylNU4mTLI6bkV8WsE,2614
+wyoming_piper-2.2.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+wyoming_piper-2.2.0.dist-info/entry_points.txt,sha256=n2UgsOCQitQ5Itr20aITTWZLL2dAtaVKn5pdecXdDHE,61
+wyoming_piper-2.2.0.dist-info/top_level.txt,sha256=t7U7-u1sK_4xy_qbTJhxQRbxle3cLQfPq2oVLezHVNU,14
+wyoming_piper-2.2.0.dist-info/RECORD,,

{wyoming_piper-1.6.3.dist-info → wyoming_piper-2.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

wyoming_piper/process.py

@@ -1,171 +0,0 @@
-#!/usr/bin/env python3
-import argparse
-import asyncio
-import json
-import logging
-import tempfile
-import time
-from dataclasses import dataclass
-from typing import Any, Dict, Optional
-
-from .download import ensure_voice_exists, find_voice
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@dataclass
-class PiperProcess:
-    """Info for a running Piper process (one voice)."""
-
-    name: str
-    proc: "asyncio.subprocess.Process"
-    config: Dict[str, Any]
-    wav_dir: tempfile.TemporaryDirectory
-    last_used: int = 0
-
-    def get_speaker_id(self, speaker: str) -> Optional[int]:
-        """Get speaker by name or id."""
-        return _get_speaker_id(self.config, speaker)
-
-    @property
-    def is_multispeaker(self) -> bool:
-        """True if model has more than one speaker."""
-        return _is_multispeaker(self.config)
-
-
-def _get_speaker_id(config: Dict[str, Any], speaker: str) -> Optional[int]:
-    """Get speaker by name or id."""
-    speaker_id_map = config.get("speaker_id_map", {})
-    speaker_id = speaker_id_map.get(speaker)
-    if speaker_id is None:
-        try:
-            # Try to interpret as an id
-            speaker_id = int(speaker)
-        except ValueError:
-            pass
-
-    return speaker_id
-
-
-def _is_multispeaker(config: Dict[str, Any]) -> bool:
-    """True if model has more than one speaker."""
-    return config.get("num_speakers", 1) > 1
-
-
-# -----------------------------------------------------------------------------
-
-
-class PiperProcessManager:
-    """Manager of running Piper processes."""
-
-    def __init__(self, args: argparse.Namespace, voices_info: Dict[str, Any]):
-        self.voices_info = voices_info
-        self.args = args
-        self.processes: Dict[str, PiperProcess] = {}
-        self.processes_lock = asyncio.Lock()
-
-    async def get_process(self, voice_name: Optional[str] = None) -> PiperProcess:
-        """Get a running Piper process or start a new one if necessary."""
-        voice_speaker: Optional[str] = None
-        if voice_name is None:
-            # Default voice
-            voice_name = self.args.voice
-
-        if voice_name == self.args.voice:
-            # Default speaker
-            voice_speaker = self.args.speaker
-
-        assert voice_name is not None
-
-        # Resolve alias
-        voice_info = self.voices_info.get(voice_name, {})
-        voice_name = voice_info.get("key", voice_name)
-        assert voice_name is not None
-
-        piper_proc = self.processes.get(voice_name)
-        if (piper_proc is None) or (piper_proc.proc.returncode is not None):
-            # Remove if stopped
-            self.processes.pop(voice_name, None)
-
-            # Start new Piper process
-            if self.args.max_piper_procs > 0:
-                # Restrict number of running processes
-                while len(self.processes) >= self.args.max_piper_procs:
-                    # Stop least recently used process
-                    lru_proc_name, lru_proc = sorted(
-                        self.processes.items(), key=lambda kv: kv[1].last_used
-                    )[0]
-                    _LOGGER.debug("Stopping process for: %s", lru_proc_name)
-                    self.processes.pop(lru_proc_name, None)
-                    if lru_proc.proc.returncode is None:
-                        try:
-                            lru_proc.proc.terminate()
-                            await lru_proc.proc.wait()
-                        except Exception:
-                            _LOGGER.exception("Unexpected error stopping piper process")
-
-            _LOGGER.debug(
-                "Starting process for: %s (%s/%s)",
-                voice_name,
-                len(self.processes) + 1,
-                self.args.max_piper_procs,
-            )
-
-            ensure_voice_exists(
-                voice_name,
-                self.args.data_dir,
-                self.args.download_dir,
-                self.voices_info,
-            )
-
-            onnx_path, config_path = find_voice(voice_name, self.args.data_dir)
-            with open(config_path, "r", encoding="utf-8") as config_file:
-                config = json.load(config_file)
-
-            wav_dir = tempfile.TemporaryDirectory()
-            piper_args = [
-                "--model",
-                str(onnx_path),
-                "--config",
-                str(config_path),
-                "--output_dir",
-                str(wav_dir.name),
-                "--json-input",  # piper 1.1+
-            ]
-
-            if voice_speaker is not None:
-                if _is_multispeaker(config):
-                    speaker_id = _get_speaker_id(config, voice_speaker)
-                    if speaker_id is not None:
-                        piper_args.extend(["--speaker", str(speaker_id)])
-
-            if self.args.noise_scale:
-                piper_args.extend(["--noise-scale", str(self.args.noise_scale)])
-
-            if self.args.length_scale:
-                piper_args.extend(["--length-scale", str(self.args.length_scale)])
-
-            if self.args.noise_w:
-                piper_args.extend(["--noise-w", str(self.args.noise_w)])
-
-            _LOGGER.debug(
-                "Starting piper process: %s args=%s", self.args.piper, piper_args
-            )
-            piper_proc = PiperProcess(
-                name=voice_name,
-                proc=await asyncio.create_subprocess_exec(
-                    self.args.piper,
-                    *piper_args,
-                    stdin=asyncio.subprocess.PIPE,
-                    stdout=asyncio.subprocess.PIPE,
-                    stderr=asyncio.subprocess.DEVNULL,
-                ),
-                config=config,
-                wav_dir=wav_dir,
-            )
-            self.processes[voice_name] = piper_proc
-
-        # Update used
-        piper_proc.last_used = time.monotonic_ns()
-
-        return piper_proc

wyoming_piper/sentence_boundary.py

@@ -1,58 +0,0 @@
-"""Guess the sentence boundaries in text."""
-
-from collections.abc import Iterable
-
-import regex as re
-
-SENTENCE_END = r"[.!?…]|[。！？]|[؟]|[।॥]"
-ABBREVIATION_RE = re.compile(r"\b\p{L}{1,3}\.$", re.UNICODE)
-
-SENTENCE_BOUNDARY_RE = re.compile(
-    rf"(.*?(?:{SENTENCE_END}+))(?=\s+[\p{{Lu}}\p{{Lt}}\p{{Lo}}]|(?:\s+\d+\.\s+))",
-    re.DOTALL,
-)
-WORD_ASTERISKS = re.compile(r"\*+([^\*]+)\*+")
-LINE_ASTERICKS = re.compile(r"(?<=^|\n)\s*\*+")
-
-
-class SentenceBoundaryDetector:
-    def __init__(self) -> None:
-        self.remaining_text = ""
-        self.current_sentence = ""
-
-    def add_chunk(self, chunk: str) -> Iterable[str]:
-        self.remaining_text += chunk
-        while self.remaining_text:
-            match = SENTENCE_BOUNDARY_RE.search(self.remaining_text)
-            if not match:
-                break
-
-            match_text = match.group(0)
-
-            if not self.current_sentence:
-                self.current_sentence = match_text
-            elif ABBREVIATION_RE.search(self.current_sentence[-5:]):
-                self.current_sentence += match_text
-            else:
-                yield remove_asterisks(self.current_sentence.strip())
-                self.current_sentence = match_text
-
-            if not ABBREVIATION_RE.search(self.current_sentence[-5:]):
-                yield remove_asterisks(self.current_sentence.strip())
-                self.current_sentence = ""
-
-            self.remaining_text = self.remaining_text[match.end() :]
-
-    def finish(self) -> str:
-        text = (self.current_sentence + self.remaining_text).strip()
-        self.remaining_text = ""
-        self.current_sentence = ""
-
-        return remove_asterisks(text)
-
-
-def remove_asterisks(text: str) -> str:
-    """Remove *asterisks* surrounding **words**"""
-    text = WORD_ASTERISKS.sub(r"\1", text)
-    text = LINE_ASTERICKS.sub("", text)
-    return text

wyoming_piper-1.6.3.dist-info/RECORD

@@ -1,15 +0,0 @@
-wyoming_piper/__init__.py,sha256=z1dsCtGazHHufHQpoVgNtMObt25qYBSOM85o7xgbIJA,139
-wyoming_piper/__main__.py,sha256=SuJ6XY6zy68N8L-N_n_EIWK0vpZwbYQXW5vlSC8BpW8,7445
-wyoming_piper/const.py,sha256=04sCdtJ2QGuF1BQGkOuQW10og61PgH3fCnPhaYu-YoU,1015
-wyoming_piper/download.py,sha256=UpczxHWqLkcOblHmrwgBHSR6wG1LR-hZ4V6QSsrghns,6185
-wyoming_piper/file_hash.py,sha256=HMuwrgEIg-bCOXHG0wE3vtjrqGD7QaA_UNfvBMXeUcY,1107
-wyoming_piper/handler.py,sha256=WVpmnRVYmsd3DrLcMfBOsuo_J1HJ0h00-HwQ1iZEToo,7360
-wyoming_piper/process.py,sha256=L_qqxQcQawrC940fwlv4u6KM9KjCq6N6ym-OADSZcrM,5794
-wyoming_piper/sentence_boundary.py,sha256=pHVo92_weusnVLRVicnS0-Tst_eR-pMrnRrGL96HxC8,1875
-wyoming_piper/voices.json,sha256=elUT3cM0Wlgo8N8E5nhMbMSCPB8zU4SY2XGKwe-T2ys,209108
-wyoming_piper-1.6.3.dist-info/licenses/LICENSE.md,sha256=E3RtUJ105V6iJl--8gS7fNv4SoMVsCB-mIMmy1Q4cCg,1071
-wyoming_piper-1.6.3.dist-info/METADATA,sha256=sNP4bue0pO2mFBb3xUnXfgibofOvaCFuJqN7Hik3fmQ,2543
-wyoming_piper-1.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wyoming_piper-1.6.3.dist-info/entry_points.txt,sha256=n2UgsOCQitQ5Itr20aITTWZLL2dAtaVKn5pdecXdDHE,61
-wyoming_piper-1.6.3.dist-info/top_level.txt,sha256=t7U7-u1sK_4xy_qbTJhxQRbxle3cLQfPq2oVLezHVNU,14
-wyoming_piper-1.6.3.dist-info/RECORD,,