livekit-plugins-elevenlabs 0.7.0.dev2__py3-none-any.whl → 0.7.1__py3-none-any.whl

livekit/plugins/elevenlabs/tts.py

@@ -101,9 +101,7 @@ class TTS(tts.TTS):
         word_tokenizer: tokenize.WordTokenizer = tokenize.basic.WordTokenizer(
             ignore_punctuation=False  # punctuation can help for intonation
         ),
-        # default value of 11labs is [120, 160, 250, 290], but we want faster responses by default
-        # (range is 50-500)
-        chunk_length_schedule: list[int] = [80, 120, 200, 260],
+        chunk_length_schedule: list[int] = [80, 120, 200, 260],  # range is [50, 500]
         http_session: aiohttp.ClientSession | None = None,
     ) -> None:
         super().__init__(
@@ -208,8 +206,7 @@ class SynthesizeStream(tts.SynthesizeStream):
         opts: _TTSOptions,
     ):
         super().__init__()
-        self._opts = opts
-        self._session = session
+        self._opts, self._session = opts, session
         self._mp3_decoder = utils.codecs.Mp3StreamDecoder()
 
     @utils.log_exceptions(logger=logger)
@@ -222,31 +219,39 @@ class SynthesizeStream(tts.SynthesizeStream):
             word_stream = None
             async for input in self._input_ch:
                 if isinstance(input, str):
-                    if not word_stream:
+                    if word_stream is None:
+                        # new segment (after flush for e.g)
                         word_stream = self._opts.word_tokenizer.stream()
                         self._segments_ch.send_nowait(word_stream)
 
                     word_stream.push_text(input)
                 elif isinstance(input, self._FlushSentinel):
-                    word_stream.end_input()
+                    if word_stream is not None:
+                        word_stream.end_input()
+
                     word_stream = None
 
             self._segments_ch.close()
 
+        @utils.log_exceptions(logger=logger)
         async def _run():
             async for word_stream in self._segments_ch:
                 await self._run_ws(word_stream)
 
-        await asyncio.gather(_tokenize_input(), _run(), return_exceptions=True)
+        tasks = [
+            asyncio.create_task(_tokenize_input()),
+            asyncio.create_task(_run()),
+        ]
+        try:
+            await asyncio.gather(*tasks)
+        finally:
+            await utils.aio.gracefully_cancel(*tasks)
 
     async def _run_ws(
         self,
         word_stream: tokenize.WordStream,
-        max_retry: int = 1,
+        max_retry: int = 3,
     ) -> None:
-        request_id = utils.shortuuid()
-        segment_id = utils.shortuuid()
-
         ws_conn: aiohttp.ClientWebSocketResponse | None = None
         for try_i in range(max_retry):
             retry_delay = 5
@@ -268,6 +273,10 @@ class SynthesizeStream(tts.SynthesizeStream):
         if ws_conn is None:
             raise Exception(f"failed to connect to 11labs after {max_retry} retries")
 
+        request_id = utils.shortuuid()
+        segment_id = utils.shortuuid()
+
+        # 11labs protocol expects the first message to be an "init msg"
         init_pkt = dict(
             text=" ",
             try_trigger_generation=True,
@@ -291,7 +300,6 @@ class SynthesizeStream(tts.SynthesizeStream):
                     text=f"{data.token} ",  # must always end with a space
                     try_trigger_generation=False,
                 )
-                print(data_pkt)
                 await ws_conn.send_str(json.dumps(data_pkt))
 
             # no more token, mark eos
@@ -300,6 +308,8 @@ class SynthesizeStream(tts.SynthesizeStream):
             eos_sent = True
 
         async def recv_task():
+            nonlocal eos_sent
+
             while True:
                 msg = await ws_conn.receive()
                 if msg.type in (

livekit/plugins/elevenlabs/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.7.0-dev.2"
+__version__ = "0.7.1"

{livekit_plugins_elevenlabs-0.7.0.dev2.dist-info → livekit_plugins_elevenlabs-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: livekit-plugins-elevenlabs
-Version: 0.7.0.dev2
+Version: 0.7.1
 Summary: Agent Framework plugin for voice synthesis with ElevenLabs' API.
 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[codecs] >=0.7.2
+Requires-Dist: livekit-agents[codecs] >=0.8.0.dev0
 
 # LiveKit Plugins Elevenlabs
 

livekit_plugins_elevenlabs-0.7.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+livekit/plugins/elevenlabs/__init__.py,sha256=ez1ybDPt7GfKAKgPkxZFRB7Vyd-_i-0hfUMI79GQ5w4,1091
+livekit/plugins/elevenlabs/log.py,sha256=hIuXqDsEB5GBa7rQY3z4Uqi1oCqc_lRmCHZEmXz0LHw,73
+livekit/plugins/elevenlabs/models.py,sha256=8jTchztgpiTokHEaWUK8PPxWWfvm5SMrOGsJpzxbYAw,362
+livekit/plugins/elevenlabs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+livekit/plugins/elevenlabs/tts.py,sha256=fEqtmbzvuJ0Pso0kzJ_37_2aCHES7W1kKUwTycLRGpM,13318
+livekit/plugins/elevenlabs/version.py,sha256=JOBYrlKcxbTTRXkUKH0921GsmV-i71_KHczg2cgQiLc,600
+livekit_plugins_elevenlabs-0.7.1.dist-info/METADATA,sha256=PuFr70N0Y4YzxtzkeMmxwnyLkrQbynCUN0YKFu6gQV0,1311
+livekit_plugins_elevenlabs-0.7.1.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+livekit_plugins_elevenlabs-0.7.1.dist-info/top_level.txt,sha256=OoDok3xUmXbZRvOrfvvXB-Juu4DX79dlq188E19YHoo,8
+livekit_plugins_elevenlabs-0.7.1.dist-info/RECORD,,

livekit_plugins_elevenlabs-0.7.0.dev2.dist-info/RECORD

@@ -1,10 +0,0 @@
-livekit/plugins/elevenlabs/__init__.py,sha256=ez1ybDPt7GfKAKgPkxZFRB7Vyd-_i-0hfUMI79GQ5w4,1091
-livekit/plugins/elevenlabs/log.py,sha256=hIuXqDsEB5GBa7rQY3z4Uqi1oCqc_lRmCHZEmXz0LHw,73
-livekit/plugins/elevenlabs/models.py,sha256=8jTchztgpiTokHEaWUK8PPxWWfvm5SMrOGsJpzxbYAw,362
-livekit/plugins/elevenlabs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-livekit/plugins/elevenlabs/tts.py,sha256=HpaHJQysUhThDdlYDHpQxroo9L2_m6G6QBAaNXs04K4,13032
-livekit/plugins/elevenlabs/version.py,sha256=LpPTO0u8YzF4Ep37Uh6FmXT3-n7H6OkH0IZmE0eXepE,606
-livekit_plugins_elevenlabs-0.7.0.dev2.dist-info/METADATA,sha256=ySSaOVf8y8acV-xWEQxWQPtuVWgduPShAyUkM0LiuBI,1311
-livekit_plugins_elevenlabs-0.7.0.dev2.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-livekit_plugins_elevenlabs-0.7.0.dev2.dist-info/top_level.txt,sha256=OoDok3xUmXbZRvOrfvvXB-Juu4DX79dlq188E19YHoo,8
-livekit_plugins_elevenlabs-0.7.0.dev2.dist-info/RECORD,,