livekit-plugins-elevenlabs 1.0.0.dev5__py3-none-any.whl → 1.0.0rc1__py3-none-any.whl

livekit/plugins/elevenlabs/tts.py

@@ -34,6 +34,12 @@ from livekit.agents import (
     tts,
     utils,
 )
+from livekit.agents.types import (
+    DEFAULT_API_CONNECT_OPTIONS,
+    NOT_GIVEN,
+    NotGivenOr,
+)
+from livekit.agents.utils import is_given
 
 from .log import logger
 from .models import TTSEncoding, TTSModels
@@ -50,9 +56,9 @@ def _sample_rate_from_format(output_format: TTSEncoding) -> int:
 class VoiceSettings:
     stability: float  # [0.0 - 1.0]
     similarity_boost: float  # [0.0 - 1.0]
-    style: float | None = None  # [0.0 - 1.0]
-    speed: float | None = 1.0  # [0.8 - 1.2]
-    use_speaker_boost: bool | None = False
+    style: NotGivenOr[float] = NOT_GIVEN  # [0.0 - 1.0]
+    speed: NotGivenOr[float] = NOT_GIVEN  # [0.8 - 1.2]
+    use_speaker_boost: NotGivenOr[bool] = NOT_GIVEN
 
 
 @dataclass
@@ -60,7 +66,7 @@ class Voice:
     id: str
     name: str
     category: str
-    settings: VoiceSettings | None = None
+    settings: NotGivenOr[VoiceSettings] = NOT_GIVEN
 
 
 DEFAULT_VOICE = Voice(
@@ -86,11 +92,11 @@ class _TTSOptions:
     api_key: str
     voice: Voice
     model: TTSModels | str
-    language: str | None
+    language: NotGivenOr[str]
     base_url: str
     encoding: TTSEncoding
     sample_rate: int
-    streaming_latency: int
+    streaming_latency: NotGivenOr[int]
     word_tokenizer: tokenize.WordTokenizer
     chunk_length_schedule: list[int]
     enable_ssml_parsing: bool
@@ -103,17 +109,15 @@ class TTS(tts.TTS):
         *,
         voice: Voice = DEFAULT_VOICE,
         model: TTSModels | str = "eleven_flash_v2_5",
-        api_key: str | None = None,
-        base_url: str | None = None,
-        streaming_latency: int = 0,
+        api_key: NotGivenOr[str] = NOT_GIVEN,
+        base_url: NotGivenOr[str] = NOT_GIVEN,
+        streaming_latency: NotGivenOr[int] = NOT_GIVEN,
         inactivity_timeout: int = WS_INACTIVITY_TIMEOUT,
-        word_tokenizer: tokenize.WordTokenizer | None = None,
+        word_tokenizer: NotGivenOr[tokenize.WordTokenizer] = NOT_GIVEN,
         enable_ssml_parsing: bool = False,
-        chunk_length_schedule: list[int] = None,  # range is [50, 500]
+        chunk_length_schedule: NotGivenOr[list[int]] = NOT_GIVEN,  # range is [50, 500]
         http_session: aiohttp.ClientSession | None = None,
-        # deprecated
-        model_id: TTSModels | str | None = None,
-        language: str | None = None,
+        language: NotGivenOr[str] = NOT_GIVEN,
     ) -> None:
         """
         Create a new instance of ElevenLabs TTS.
@@ -129,10 +133,10 @@ class TTS(tts.TTS):
             enable_ssml_parsing (bool): Enable SSML parsing for input text. Defaults to False.
             chunk_length_schedule (list[int]): Schedule for chunk lengths, ranging from 50 to 500. Defaults to [80, 120, 200, 260].
             http_session (aiohttp.ClientSession | None): Custom HTTP session for API requests. Optional.
-            language (str | None): Language code for the TTS model, as of 10/24/24 only valid for "eleven_turbo_v2_5". Optional.
-        """
+            language (NotGivenOr[str]): Language code for the TTS model, as of 10/24/24 only valid for "eleven_turbo_v2_5".
+        """  # noqa: E501
 
-        if chunk_length_schedule is None:
+        if not is_given(chunk_length_schedule):
             chunk_length_schedule = [80, 120, 200, 260]
         super().__init__(
             capabilities=tts.TTSCapabilities(
@@ -142,19 +146,13 @@ class TTS(tts.TTS):
             num_channels=1,
         )
 
-        if model_id is not None:
-            logger.warning(
-                "model_id is deprecated and will be removed in 1.5.0, use model instead",
-            )
-            model = model_id
-
-        api_key = api_key or os.environ.get("ELEVEN_API_KEY")
-        if not api_key:
+        elevenlabs_api_key = api_key if is_given(api_key) else os.environ.get("ELEVEN_API_KEY")
+        if not elevenlabs_api_key:
             raise ValueError(
-                "ElevenLabs API key is required, either as argument or set ELEVEN_API_KEY environmental variable"
+                "ElevenLabs API key is required, either as argument or set ELEVEN_API_KEY environmental variable"  # noqa: E501
             )
 
-        if word_tokenizer is None:
+        if not is_given(word_tokenizer):
             word_tokenizer = tokenize.basic.WordTokenizer(
                 ignore_punctuation=False  # punctuation can help for intonation
             )
@@ -162,8 +160,8 @@ class TTS(tts.TTS):
         self._opts = _TTSOptions(
             voice=voice,
             model=model,
-            api_key=api_key,
-            base_url=base_url or API_BASE_URL_V1,
+            api_key=elevenlabs_api_key,
+            base_url=base_url if is_given(base_url) else API_BASE_URL_V1,
             encoding=_DefaultEncoding,
             sample_rate=self.sample_rate,
             streaming_latency=streaming_latency,
@@ -174,36 +172,14 @@ class TTS(tts.TTS):
             inactivity_timeout=inactivity_timeout,
         )
         self._session = http_session
-        self._pool = utils.ConnectionPool[aiohttp.ClientWebSocketResponse](
-            connect_cb=self._connect_ws,
-            close_cb=self._close_ws,
-            max_session_duration=inactivity_timeout,
-            mark_refreshed_on_get=True,
-        )
         self._streams = weakref.WeakSet[SynthesizeStream]()
 
-    async def _connect_ws(self) -> aiohttp.ClientWebSocketResponse:
-        session = self._ensure_session()
-        return await asyncio.wait_for(
-            session.ws_connect(
-                _stream_url(self._opts),
-                headers={AUTHORIZATION_HEADER: self._opts.api_key},
-            ),
-            self._conn_options.timeout,
-        )
-
-    async def _close_ws(self, ws: aiohttp.ClientWebSocketResponse):
-        await ws.close()
-
     def _ensure_session(self) -> aiohttp.ClientSession:
         if not self._session:
             self._session = utils.http_context.http_session()
 
         return self._session
 
-    def prewarm(self) -> None:
-        self._pool.prewarm()
-
     async def list_voices(self) -> list[Voice]:
         async with self._ensure_session().get(
             f"{self._opts.base_url}/voices",
@@ -214,25 +190,28 @@ class TTS(tts.TTS):
     def update_options(
         self,
         *,
-        voice: Voice = DEFAULT_VOICE,
-        model: TTSModels | str = "eleven_turbo_v2_5",
-        language: str | None = None,
+        voice: NotGivenOr[Voice] = NOT_GIVEN,
+        model: NotGivenOr[TTSModels | str] = NOT_GIVEN,
+        language: NotGivenOr[str] = NOT_GIVEN,
     ) -> None:
         """
         Args:
-            voice (Voice): Voice configuration. Defaults to `DEFAULT_VOICE`.
-            model (TTSModels | str): TTS model to use. Defaults to "eleven_turbo_v2_5".
-            language (str | None): Language code for the TTS model. Optional.
+            voice (NotGivenOr[Voice]): Voice configuration.
+            model (NotGivenOr[TTSModels | str]): TTS model to use.
+            language (NotGivenOr[str]): Language code for the TTS model.
         """
-        self._opts.model = model or self._opts.model
-        self._opts.voice = voice or self._opts.voice
-        self._opts.language = language or self._opts.language
+        if is_given(model):
+            self._opts.model = model
+        if is_given(voice):
+            self._opts.voice = voice
+        if is_given(language):
+            self._opts.language = language
 
     def synthesize(
         self,
         text: str,
         *,
-        conn_options: APIConnectOptions | None = None,
+        conn_options: APIConnectOptions = DEFAULT_API_CONNECT_OPTIONS,
     ) -> ChunkedStream:
         return ChunkedStream(
             tts=self,
@@ -242,8 +221,15 @@ class TTS(tts.TTS):
             session=self._ensure_session(),
         )
 
-    def stream(self, *, conn_options: APIConnectOptions | None = None) -> SynthesizeStream:
-        stream = SynthesizeStream(tts=self, pool=self._pool, opts=self._opts)
+    def stream(
+        self, *, conn_options: APIConnectOptions = DEFAULT_API_CONNECT_OPTIONS
+    ) -> SynthesizeStream:
+        stream = SynthesizeStream(
+            tts=self,
+            conn_options=conn_options,
+            opts=self._opts,
+            session=self._ensure_session(),
+        )
         self._streams.add(stream)
         return stream
 
@@ -251,7 +237,6 @@ class TTS(tts.TTS):
         for stream in list(self._streams):
             await stream.aclose()
         self._streams.clear()
-        await self._pool.aclose()
         await super().aclose()
 
 
@@ -264,7 +249,7 @@ class ChunkedStream(tts.ChunkedStream):
         tts: TTS,
         input_text: str,
         opts: _TTSOptions,
-        conn_options: APIConnectOptions | None = None,
+        conn_options: APIConnectOptions,
         session: aiohttp.ClientSession,
     ) -> None:
         super().__init__(tts=tts, input_text=input_text, conn_options=conn_options)
@@ -274,7 +259,7 @@ class ChunkedStream(tts.ChunkedStream):
         request_id = utils.shortuuid()
         voice_settings = (
             _strip_nones(dataclasses.asdict(self._opts.voice.settings))
-            if self._opts.voice.settings
+            if is_given(self._opts.voice.settings)
             else None
         )
         data = {
@@ -339,11 +324,12 @@ class SynthesizeStream(tts.SynthesizeStream):
         self,
         *,
         tts: TTS,
-        pool: utils.ConnectionPool[aiohttp.ClientWebSocketResponse],
+        session: aiohttp.ClientSession,
         opts: _TTSOptions,
+        conn_options: APIConnectOptions,
     ):
-        super().__init__(tts=tts)
-        self._opts, self._pool = opts, pool
+        super().__init__(tts=tts, conn_options=conn_options)
+        self._opts, self._session = opts, session
 
     async def _run(self) -> None:
         request_id = utils.shortuuid()
@@ -398,134 +384,141 @@ class SynthesizeStream(tts.SynthesizeStream):
         word_stream: tokenize.WordStream,
         request_id: str,
     ) -> None:
-        async with self._pool.connection() as ws_conn:
-            segment_id = utils.shortuuid()
-            expected_text = ""  # accumulate all tokens sent
-
-            decoder = utils.codecs.AudioStreamDecoder(
-                sample_rate=self._opts.sample_rate,
-                num_channels=1,
-            )
+        ws_conn = await self._session.ws_connect(
+            _stream_url(self._opts),
+            headers={AUTHORIZATION_HEADER: self._opts.api_key},
+        )
 
-            # 11labs protocol expects the first message to be an "init msg"
-            init_pkt = {
-                "text": " ",
-                "voice_settings": _strip_nones(dataclasses.asdict(self._opts.voice.settings))
-                if self._opts.voice.settings
-                else None,
-                "generation_config": {"chunk_length_schedule": self._opts.chunk_length_schedule},
-            }
-            await ws_conn.send_str(json.dumps(init_pkt))
-
-            @utils.log_exceptions(logger=logger)
-            async def send_task():
-                nonlocal expected_text
-                xml_content = []
-                async for data in word_stream:
-                    text = data.token
-                    expected_text += text
-                    # send the xml phoneme in one go
-                    if (
-                        self._opts.enable_ssml_parsing
-                        and data.token.startswith("<phoneme")
-                        or xml_content
-                    ):
-                        xml_content.append(text)
-                        if text.find("</phoneme>") > -1:
-                            text = self._opts.word_tokenizer.format_words(xml_content)
-                            xml_content = []
-                        else:
-                            continue
-
-                    data_pkt = {"text": f"{text} "}  # must always end with a space
-                    self._mark_started()
-                    await ws_conn.send_str(json.dumps(data_pkt))
-                if xml_content:
-                    logger.warning("11labs stream ended with incomplete xml content")
-                await ws_conn.send_str(json.dumps({"flush": True}))
-
-            # consumes from decoder and generates events
-            @utils.log_exceptions(logger=logger)
-            async def generate_task():
-                emitter = tts.SynthesizedAudioEmitter(
-                    event_ch=self._event_ch,
-                    request_id=request_id,
-                    segment_id=segment_id,
-                )
-                async for frame in decoder:
-                    emitter.push(frame)
-                emitter.flush()
+        segment_id = utils.shortuuid()
+        decoder = utils.codecs.AudioStreamDecoder(
+            sample_rate=self._opts.sample_rate,
+            num_channels=1,
+        )
 
-            # receives from ws and decodes audio
-            @utils.log_exceptions(logger=logger)
-            async def recv_task():
-                nonlocal expected_text
-                received_text = ""
-
-                while True:
-                    msg = await ws_conn.receive()
-                    if msg.type in (
-                        aiohttp.WSMsgType.CLOSED,
-                        aiohttp.WSMsgType.CLOSE,
-                        aiohttp.WSMsgType.CLOSING,
-                    ):
-                        raise APIStatusError(
-                            "11labs connection closed unexpectedly, not all tokens have been consumed",
-                            request_id=request_id,
-                        )
+        # 11labs protocol expects the first message to be an "init msg"
+        init_pkt = {
+            "text": " ",
+            "voice_settings": _strip_nones(dataclasses.asdict(self._opts.voice.settings))
+            if is_given(self._opts.voice.settings)
+            else None,
+            "generation_config": {"chunk_length_schedule": self._opts.chunk_length_schedule},
+        }
+        await ws_conn.send_str(json.dumps(init_pkt))
+        eos_sent = False
 
-                    if msg.type != aiohttp.WSMsgType.TEXT:
-                        logger.warning("unexpected 11labs message type %s", msg.type)
+        @utils.log_exceptions(logger=logger)
+        async def send_task():
+            nonlocal eos_sent
+            xml_content = []
+            async for data in word_stream:
+                text = data.token
+                # send the xml phoneme in one go
+                if (
+                    self._opts.enable_ssml_parsing
+                    and data.token.startswith("<phoneme")
+                    or xml_content
+                ):
+                    xml_content.append(text)
+                    if data.token.find("</phoneme>") > -1:
+                        text = self._opts.word_tokenizer.format_words(xml_content)
+                        xml_content = []
+                    else:
                         continue
 
-                    data = json.loads(msg.data)
-                    if data.get("audio"):
-                        b64data = base64.b64decode(data["audio"])
-                        decoder.push(b64data)
-
-                        if alignment := data.get("normalizedAlignment"):
-                            received_text += "".join(alignment.get("chars", [])).replace(" ", "")
-                            if received_text == expected_text:
-                                decoder.end_input()
-                                break
-                    elif data.get("error"):
-                        raise APIStatusError(
-                            message=data["error"],
-                            status_code=500,
-                            request_id=request_id,
-                            body=None,
-                        )
-                    else:
+                data_pkt = {"text": f"{text} "}  # must always end with a space
+                self._mark_started()
+                await ws_conn.send_str(json.dumps(data_pkt))
+            if xml_content:
+                logger.warning("11labs stream ended with incomplete xml content")
+
+            # no more token, mark eos
+            eos_pkt = {"text": ""}
+            await ws_conn.send_str(json.dumps(eos_pkt))
+            eos_sent = True
+
+        # consumes from decoder and generates events
+        @utils.log_exceptions(logger=logger)
+        async def generate_task():
+            emitter = tts.SynthesizedAudioEmitter(
+                event_ch=self._event_ch,
+                request_id=request_id,
+                segment_id=segment_id,
+            )
+            async for frame in decoder:
+                emitter.push(frame)
+            emitter.flush()
+
+        # receives from ws and decodes audio
+        @utils.log_exceptions(logger=logger)
+        async def recv_task():
+            nonlocal eos_sent
+
+            while True:
+                msg = await ws_conn.receive()
+                if msg.type in (
+                    aiohttp.WSMsgType.CLOSED,
+                    aiohttp.WSMsgType.CLOSE,
+                    aiohttp.WSMsgType.CLOSING,
+                ):
+                    if not eos_sent:
                         raise APIStatusError(
-                            message=f"unexpected 11labs message {data}",
-                            status_code=500,
+                            "11labs connection closed unexpectedly, not all tokens have been consumed",  # noqa: E501
                             request_id=request_id,
-                            body=None,
                         )
+                    return
 
-            tasks = [
-                asyncio.create_task(send_task()),
-                asyncio.create_task(recv_task()),
-                asyncio.create_task(generate_task()),
-            ]
-            try:
-                await asyncio.gather(*tasks)
-            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=request_id,
-                    body=None,
-                ) from e
-            except APIStatusError:
-                raise
-            except Exception as e:
-                raise APIConnectionError() from e
-            finally:
-                await utils.aio.gracefully_cancel(*tasks)
-                await decoder.aclose()
+                if msg.type != aiohttp.WSMsgType.TEXT:
+                    logger.warning("unexpected 11labs message type %s", msg.type)
+                    continue
+
+                data = json.loads(msg.data)
+                if data.get("audio"):
+                    b64data = base64.b64decode(data["audio"])
+                    decoder.push(b64data)
+
+                elif data.get("isFinal"):
+                    decoder.end_input()
+                    break
+                elif data.get("error"):
+                    raise APIStatusError(
+                        message=data["error"],
+                        status_code=500,
+                        request_id=request_id,
+                        body=None,
+                    )
+                else:
+                    raise APIStatusError(
+                        message=f"unexpected 11labs message {data}",
+                        status_code=500,
+                        request_id=request_id,
+                        body=None,
+                    )
+
+        tasks = [
+            asyncio.create_task(send_task()),
+            asyncio.create_task(recv_task()),
+            asyncio.create_task(generate_task()),
+        ]
+        try:
+            await asyncio.gather(*tasks)
+        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=request_id,
+                body=None,
+            ) from e
+        except APIStatusError:
+            raise
+        except Exception as e:
+            raise APIConnectionError() from e
+        finally:
+            await utils.aio.gracefully_cancel(*tasks)
+            await decoder.aclose()
+            if ws_conn is not None:
+                await ws_conn.close()
 
 
 def _dict_to_voices_list(data: dict[str, Any]):
@@ -543,7 +536,7 @@ def _dict_to_voices_list(data: dict[str, Any]):
 
 
 def _strip_nones(data: dict[str, Any]):
-    return {k: v for k, v in data.items() if v is not None}
+    return {k: v for k, v in data.items() if is_given(v) and v is not None}
 
 
 def _synthesize_url(opts: _TTSOptions) -> str:
@@ -555,7 +548,7 @@ def _synthesize_url(opts: _TTSOptions) -> str:
         f"{base_url}/text-to-speech/{voice_id}/stream?"
         f"model_id={model_id}&output_format={output_format}"
     )
-    if opts.streaming_latency:
+    if is_given(opts.streaming_latency):
         url += f"&optimize_streaming_latency={opts.streaming_latency}"
     return url
 
@@ -573,8 +566,8 @@ def _stream_url(opts: _TTSOptions) -> str:
         f"model_id={model_id}&output_format={output_format}&"
         f"enable_ssml_parsing={enable_ssml}&inactivity_timeout={inactivity_timeout}"
     )
-    if language is not None:
+    if is_given(language):
         url += f"&language_code={language}"
-    if opts.streaming_latency:
+    if is_given(opts.streaming_latency):
         url += f"&optimize_streaming_latency={opts.streaming_latency}"
     return url

livekit/plugins/elevenlabs/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.0.0.dev5"
+__version__ = '1.0.0.rc1'

{livekit_plugins_elevenlabs-1.0.0.dev5.dist-info → livekit_plugins_elevenlabs-1.0.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: livekit-plugins-elevenlabs
-Version: 1.0.0.dev5
+Version: 1.0.0rc1
 Summary: Agent Framework plugin for voice synthesis with ElevenLabs' API.
 Project-URL: Documentation, https://docs.livekit.io
 Project-URL: Website, https://livekit.io/
@@ -18,7 +18,7 @@ Classifier: Topic :: Multimedia :: Sound/Audio
 Classifier: Topic :: Multimedia :: Video
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Requires-Python: >=3.9.0
-Requires-Dist: livekit-agents[codecs]>=1.0.0.dev5
+Requires-Dist: livekit-agents[codecs]>=1.0.0.rc1
 Description-Content-Type: text/markdown
 
 # LiveKit Plugins Elevenlabs

livekit_plugins_elevenlabs-1.0.0rc1.dist-info/RECORD

@@ -0,0 +1,9 @@
+livekit/plugins/elevenlabs/__init__.py,sha256=YZVadomFq3JWiZN6GWXJbuE4vaNNWq1CmdH25du8qwg,1249
+livekit/plugins/elevenlabs/log.py,sha256=hIuXqDsEB5GBa7rQY3z4Uqi1oCqc_lRmCHZEmXz0LHw,73
+livekit/plugins/elevenlabs/models.py,sha256=nB43wLS1ilzS7IxLYVSQxBjKPnbiPl4AHpHAOlG2i00,273
+livekit/plugins/elevenlabs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+livekit/plugins/elevenlabs/tts.py,sha256=NrW-xONOPOHXycmX9mL1m0wrQjwfb_3ZIxy9Jf0oVf4,19568
+livekit/plugins/elevenlabs/version.py,sha256=pF0lh6G9GYL7Mj7EnfhjFifzlzdWx6u3RvB0Itch4UE,604
+livekit_plugins_elevenlabs-1.0.0rc1.dist-info/METADATA,sha256=KaLRiJ7Q7Ei1YH5mlkRmiNAR9nmln-kQsuINM_QeAM4,1321
+livekit_plugins_elevenlabs-1.0.0rc1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+livekit_plugins_elevenlabs-1.0.0rc1.dist-info/RECORD,,

livekit_plugins_elevenlabs-1.0.0.dev5.dist-info/RECORD

@@ -1,9 +0,0 @@
-livekit/plugins/elevenlabs/__init__.py,sha256=YZVadomFq3JWiZN6GWXJbuE4vaNNWq1CmdH25du8qwg,1249
-livekit/plugins/elevenlabs/log.py,sha256=hIuXqDsEB5GBa7rQY3z4Uqi1oCqc_lRmCHZEmXz0LHw,73
-livekit/plugins/elevenlabs/models.py,sha256=nB43wLS1ilzS7IxLYVSQxBjKPnbiPl4AHpHAOlG2i00,273
-livekit/plugins/elevenlabs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-livekit/plugins/elevenlabs/tts.py,sha256=eJ66yP3ta2FH0LgQ64wHdjOHEoavwguOg6GeaMIr9IU,20394
-livekit/plugins/elevenlabs/version.py,sha256=pXgCpV03nQI-5Kk-74NFyAdw1htj2cx6unwQHipEcfE,605
-livekit_plugins_elevenlabs-1.0.0.dev5.dist-info/METADATA,sha256=wOs4IhcM1fxfVMU3hg3F1mycvv_8pYQiG3vQHkTQ6wc,1324
-livekit_plugins_elevenlabs-1.0.0.dev5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-livekit_plugins_elevenlabs-1.0.0.dev5.dist-info/RECORD,,