livekit-plugins-cartesia 0.4.2__py3-none-any.whl → 0.4.5__py3-none-any.whl

livekit/plugins/cartesia/__init__.py

@@ -28,3 +28,12 @@ class CartesiaPlugin(Plugin):
 
 
 Plugin.register_plugin(CartesiaPlugin())
+
+# Cleanup docs of unexported modules
+_module = dir()
+NOT_IN_ALL = [m for m in _module if m not in __all__]
+
+__pdoc__ = {}
+
+for n in NOT_IN_ALL:
+    __pdoc__[n] = False

livekit/plugins/cartesia/tts.py

@@ -22,7 +22,17 @@ from dataclasses import dataclass
 from typing import Any
 
 import aiohttp
-from livekit.agents import tokenize, tts, utils
+from livekit import rtc
+from livekit.agents import (
+    DEFAULT_API_CONNECT_OPTIONS,
+    APIConnectionError,
+    APIConnectOptions,
+    APIStatusError,
+    APITimeoutError,
+    tokenize,
+    tts,
+    utils,
+)
 
 from .log import logger
 from .models import (
@@ -43,7 +53,7 @@ BUFFERED_WORDS_COUNT = 8
 
 @dataclass
 class _TTSOptions:
-    model: TTSModels
+    model: TTSModels | str
     encoding: TTSEncoding
     sample_rate: int
     voice: str | list[float]
@@ -57,7 +67,7 @@ class TTS(tts.TTS):
     def __init__(
         self,
         *,
-        model: TTSModels = "sonic-english",
+        model: TTSModels | str = "sonic-english",
         language: str = "en",
         encoding: TTSEncoding = "pcm_s16le",
         voice: str | list[float] = TTSDefaultVoiceId,
@@ -112,99 +122,145 @@ class TTS(tts.TTS):
 
         return self._session
 
-    def synthesize(self, text: str) -> "ChunkedStream":
-        return ChunkedStream(text, self._opts, self._ensure_session())
+    def update_options(
+        self,
+        *,
+        model: TTSModels | None = None,
+        language: str | None = None,
+        voice: str | list[float] | None = None,
+        speed: TTSVoiceSpeed | float | None = None,
+        emotion: list[TTSVoiceEmotion | str] | None = None,
+    ) -> None:
+        """
+        Update the Text-to-Speech (TTS) configuration options.
+
+        This method allows updating the TTS settings, including model type, language, voice, speed,
+        and emotion. If any parameter is not provided, the existing value will be retained.
+
+        Args:
+            model (TTSModels, optional): The Cartesia TTS model to use. Defaults to "sonic-english".
+            language (str, optional): The language code for synthesis. Defaults to "en".
+            voice (str | list[float], optional): The voice ID or embedding array.
+            speed (TTSVoiceSpeed | float, optional): Voice Control - Speed (https://docs.cartesia.ai/user-guides/voice-control)
+            emotion (list[TTSVoiceEmotion], optional): Voice Control - Emotion (https://docs.cartesia.ai/user-guides/voice-control)
+        """
+        self._opts.model = model or self._opts.model
+        self._opts.language = language or self._opts.language
+        self._opts.voice = voice or self._opts.voice
+        self._opts.speed = speed or self._opts.speed
+        if emotion is not None:
+            self._opts.emotion = emotion
+
+    def synthesize(
+        self,
+        text: str,
+        *,
+        conn_options: APIConnectOptions = DEFAULT_API_CONNECT_OPTIONS,
+    ) -> ChunkedStream:
+        return ChunkedStream(
+            tts=self,
+            input_text=text,
+            conn_options=conn_options,
+            opts=self._opts,
+            session=self._ensure_session(),
+        )
 
-    def stream(self) -> "SynthesizeStream":
-        return SynthesizeStream(self._opts, self._ensure_session())
+    def stream(
+        self, *, conn_options: APIConnectOptions = DEFAULT_API_CONNECT_OPTIONS
+    ) -> "SynthesizeStream":
+        return SynthesizeStream(
+            tts=self,
+            conn_options=conn_options,
+            opts=self._opts,
+            session=self._ensure_session(),
+        )
 
 
 class ChunkedStream(tts.ChunkedStream):
     """Synthesize chunked text using the bytes endpoint"""
 
     def __init__(
-        self, text: str, opts: _TTSOptions, session: aiohttp.ClientSession
+        self,
+        *,
+        tts: TTS,
+        input_text: str,
+        conn_options: APIConnectOptions,
+        opts: _TTSOptions,
+        session: aiohttp.ClientSession,
     ) -> None:
-        super().__init__()
-        self._text, self._opts, self._session = text, opts, session
+        super().__init__(tts=tts, input_text=input_text, conn_options=conn_options)
+        self._opts, self._session = opts, session
 
-    @utils.log_exceptions(logger=logger)
-    async def _main_task(self):
+    async def _run(self) -> None:
+        request_id = utils.shortuuid()
         bstream = utils.audio.AudioByteStream(
             sample_rate=self._opts.sample_rate, num_channels=NUM_CHANNELS
         )
-        request_id, segment_id = utils.shortuuid(), utils.shortuuid()
-
-        data = _to_cartesia_options(self._opts)
-        data["transcript"] = self._text
-
-        async with self._session.post(
-            "https://api.cartesia.ai/tts/bytes",
-            headers={
-                API_AUTH_HEADER: self._opts.api_key,
-                API_VERSION_HEADER: API_VERSION,
-            },
-            json=data,
-        ) as resp:
-            async for data, _ in resp.content.iter_chunks():
-                for frame in bstream.write(data):
-                    self._event_ch.send_nowait(
-                        tts.SynthesizedAudio(
-                            request_id=request_id, segment_id=segment_id, frame=frame
+
+        json = _to_cartesia_options(self._opts)
+        json["transcript"] = self._input_text
+
+        headers = {
+            API_AUTH_HEADER: self._opts.api_key,
+            API_VERSION_HEADER: API_VERSION,
+        }
+
+        try:
+            async with self._session.post(
+                "https://api.cartesia.ai/tts/bytes",
+                headers=headers,
+                json=json,
+                timeout=aiohttp.ClientTimeout(
+                    total=30,
+                    sock_connect=self._conn_options.timeout,
+                ),
+            ) as resp:
+                resp.raise_for_status()
+                async for data, _ in resp.content.iter_chunks():
+                    for frame in bstream.write(data):
+                        self._event_ch.send_nowait(
+                            tts.SynthesizedAudio(
+                                request_id=request_id,
+                                frame=frame,
+                            )
                         )
-                    )
 
-            for frame in bstream.flush():
-                self._event_ch.send_nowait(
-                    tts.SynthesizedAudio(
-                        request_id=request_id, segment_id=segment_id, frame=frame
+                for frame in bstream.flush():
+                    self._event_ch.send_nowait(
+                        tts.SynthesizedAudio(request_id=request_id, frame=frame)
                     )
-                )
+        except asyncio.TimeoutError as e:
+            raise APITimeoutError() from e
+        except aiohttp.ClientResponseError as e:
+            raise APIStatusError(
+                message=e.message,
+                status_code=e.status,
+                request_id=None,
+                body=None,
+            ) from e
+        except Exception as e:
+            raise APIConnectionError() from e
 
 
 class SynthesizeStream(tts.SynthesizeStream):
     def __init__(
         self,
+        *,
+        tts: TTS,
+        conn_options: APIConnectOptions,
         opts: _TTSOptions,
         session: aiohttp.ClientSession,
     ):
-        super().__init__()
+        super().__init__(tts=tts, conn_options=conn_options)
         self._opts, self._session = opts, session
         self._sent_tokenizer_stream = tokenize.basic.SentenceTokenizer(
             min_sentence_len=BUFFERED_WORDS_COUNT
         ).stream()
 
-    @utils.log_exceptions(logger=logger)
-    async def _main_task(self) -> None:
-        retry_count = 0
-        max_retry = 3
-        while self._input_ch.qsize() or not self._input_ch.closed:
-            try:
-                url = f"wss://api.cartesia.ai/tts/websocket?api_key={self._opts.api_key}&cartesia_version={API_VERSION}"
-                ws = await self._session.ws_connect(url)
-                retry_count = 0  # connected successfully, reset the retry_count
-
-                await self._run_ws(ws)
-            except Exception as e:
-                if retry_count >= max_retry:
-                    logger.exception(
-                        f"failed to connect to Cartesia after {max_retry} tries"
-                    )
-                    break
-
-                retry_delay = min(retry_count * 2, 10)  # max 10s
-                retry_count += 1
-
-                logger.warning(
-                    f"Cartesia connection failed, retrying in {retry_delay}s",
-                    exc_info=e,
-                )
-                await asyncio.sleep(retry_delay)
-
-    async def _run_ws(self, ws: aiohttp.ClientWebSocketResponse) -> None:
+    async def _run(self) -> None:
         request_id = utils.shortuuid()
 
-        async def sentence_stream_task():
+        async def _sentence_stream_task(ws: aiohttp.ClientWebSocketResponse):
             base_pkt = _to_cartesia_options(self._opts)
             async for ev in self._sent_tokenizer_stream:
                 token_pkt = base_pkt.copy()
@@ -219,7 +275,7 @@ class SynthesizeStream(tts.SynthesizeStream):
             end_pkt["continue"] = False
             await ws.send_str(json.dumps(end_pkt))
 
-        async def input_task():
+        async def _input_task():
             async for data in self._input_ch:
                 if isinstance(data, self._FlushSentinel):
                     self._sent_tokenizer_stream.flush()
@@ -227,12 +283,28 @@ class SynthesizeStream(tts.SynthesizeStream):
                 self._sent_tokenizer_stream.push_text(data)
             self._sent_tokenizer_stream.end_input()
 
-        async def recv_task():
+        async def _recv_task(ws: aiohttp.ClientWebSocketResponse):
             audio_bstream = utils.audio.AudioByteStream(
                 sample_rate=self._opts.sample_rate,
                 num_channels=NUM_CHANNELS,
             )
 
+            last_frame: rtc.AudioFrame | None = None
+
+            def _send_last_frame(*, segment_id: str, is_final: bool) -> None:
+                nonlocal last_frame
+                if last_frame is not None:
+                    self._event_ch.send_nowait(
+                        tts.SynthesizedAudio(
+                            request_id=request_id,
+                            segment_id=segment_id,
+                            frame=last_frame,
+                            is_final=is_final,
+                        )
+                    )
+
+                    last_frame = None
+
             while True:
                 msg = await ws.receive()
                 if msg.type in (
@@ -248,26 +320,18 @@ class SynthesizeStream(tts.SynthesizeStream):
 
                 data = json.loads(msg.data)
                 segment_id = data.get("context_id")
-                # Once we receive audio for a segment, we can start a new segment
+
                 if data.get("data"):
                     b64data = base64.b64decode(data["data"])
                     for frame in audio_bstream.write(b64data):
-                        self._event_ch.send_nowait(
-                            tts.SynthesizedAudio(
-                                request_id=request_id,
-                                segment_id=segment_id,
-                                frame=frame,
-                            )
-                        )
+                        _send_last_frame(segment_id=segment_id, is_final=False)
+                        last_frame = frame
                 elif data.get("done"):
                     for frame in audio_bstream.flush():
-                        self._event_ch.send_nowait(
-                            tts.SynthesizedAudio(
-                                request_id=request_id,
-                                segment_id=segment_id,
-                                frame=frame,
-                            )
-                        )
+                        _send_last_frame(segment_id=segment_id, is_final=False)
+                        last_frame = frame
+
+                    _send_last_frame(segment_id=segment_id, is_final=True)
 
                     if segment_id == request_id:
                         # we're not going to receive more frames, close the connection
@@ -276,16 +340,28 @@ class SynthesizeStream(tts.SynthesizeStream):
                 else:
                     logger.error("unexpected Cartesia message %s", data)
 
-        tasks = [
-            asyncio.create_task(input_task()),
-            asyncio.create_task(sentence_stream_task()),
-            asyncio.create_task(recv_task()),
-        ]
+        url = f"wss://api.cartesia.ai/tts/websocket?api_key={self._opts.api_key}&cartesia_version={API_VERSION}"
+
+        ws: aiohttp.ClientWebSocketResponse | None = None
 
         try:
-            await asyncio.gather(*tasks)
+            ws = await asyncio.wait_for(
+                self._session.ws_connect(url), self._conn_options.timeout
+            )
+
+            tasks = [
+                asyncio.create_task(_input_task()),
+                asyncio.create_task(_sentence_stream_task(ws)),
+                asyncio.create_task(_recv_task(ws)),
+            ]
+
+            try:
+                await asyncio.gather(*tasks)
+            finally:
+                await utils.aio.gracefully_cancel(*tasks)
         finally:
-            await utils.aio.gracefully_cancel(*tasks)
+            if ws is not None:
+                await ws.close()
 
 
 def _to_cartesia_options(opts: _TTSOptions) -> dict[str, Any]:

livekit/plugins/cartesia/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.4.2"
+__version__ = "0.4.5"

{livekit_plugins_cartesia-0.4.2.dist-info → livekit_plugins_cartesia-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: livekit-plugins-cartesia
-Version: 0.4.2
+Version: 0.4.5
 Summary: LiveKit Agents Plugin for Cartesia
 Home-page: https://github.com/livekit/agents
 License: Apache-2.0
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
-Requires-Dist: livekit-agents >=0.8.0.dev0
+Requires-Dist: livekit-agents>=0.11
 
 # LiveKit Plugins Cartesia
 

livekit_plugins_cartesia-0.4.5.dist-info/RECORD

@@ -0,0 +1,10 @@
+livekit/plugins/cartesia/__init__.py,sha256=UTa6Q7IxhRBCwPftowHEUDvmBg99J_UjGS_yxTzKD7g,1095
+livekit/plugins/cartesia/log.py,sha256=4Mnhjng_DU1dIWP9IWjIQGZ67EV3LnQhWMWCHVudJbo,71
+livekit/plugins/cartesia/models.py,sha256=fOO276Vzw3OkDUWUVcw7PH95ctFy38rj3q9I6_mYQ7M,950
+livekit/plugins/cartesia/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+livekit/plugins/cartesia/tts.py,sha256=SZH1tYHxKDgZ5PbBHkC86vATPkxu81UGnU44FCEzasI,13778
+livekit/plugins/cartesia/version.py,sha256=NVa5L7bU73cSrgbGChyGQDqP6rLxpFdXF6hoIrBpXM8,600
+livekit_plugins_cartesia-0.4.5.dist-info/METADATA,sha256=HRCHZl35yVnXjG5yvSYCilcJeefHsve7-xKt1bOkGsE,1245
+livekit_plugins_cartesia-0.4.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+livekit_plugins_cartesia-0.4.5.dist-info/top_level.txt,sha256=OoDok3xUmXbZRvOrfvvXB-Juu4DX79dlq188E19YHoo,8
+livekit_plugins_cartesia-0.4.5.dist-info/RECORD,,

{livekit_plugins_cartesia-0.4.2.dist-info → livekit_plugins_cartesia-0.4.5.dist-info}/WHEEL

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

livekit_plugins_cartesia-0.4.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-livekit/plugins/cartesia/__init__.py,sha256=BUfWY_evL5dUHn9hBDQVor6ssctDKQfbQfZy5SWndN8,926
-livekit/plugins/cartesia/log.py,sha256=4Mnhjng_DU1dIWP9IWjIQGZ67EV3LnQhWMWCHVudJbo,71
-livekit/plugins/cartesia/models.py,sha256=fOO276Vzw3OkDUWUVcw7PH95ctFy38rj3q9I6_mYQ7M,950
-livekit/plugins/cartesia/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-livekit/plugins/cartesia/tts.py,sha256=kUGIhsmHqIK2m_FV44_nwjHp0c7Zb2H7UG9VayNIae8,11341
-livekit/plugins/cartesia/version.py,sha256=jabhjXzHcov1Cy2z9FGgyHFpSQ3hFKqu3vly20WQeTs,600
-livekit_plugins_cartesia-0.4.2.dist-info/METADATA,sha256=w9ZGYOicE_fUFVTnhgvewGgWgwmaInoG9w6BGTiOu-8,1252
-livekit_plugins_cartesia-0.4.2.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-livekit_plugins_cartesia-0.4.2.dist-info/top_level.txt,sha256=OoDok3xUmXbZRvOrfvvXB-Juu4DX79dlq188E19YHoo,8
-livekit_plugins_cartesia-0.4.2.dist-info/RECORD,,