Fix nested strings issue

This commit is contained in:
Mark Backman
2024-10-02 12:26:30 -04:00
parent 096a15eef6
commit cd2e29f285
2 changed files with 7 additions and 7 deletions

View File

@@ -136,17 +136,17 @@ class AWSTTSService(TTSService):
ssml = "<speak>" ssml = "<speak>"
if self._settings["language"]: if self._settings["language"]:
ssml += f"<lang xml:lang='{self._settings["language"]}'>" ssml += f"<lang xml:lang='{self._settings['language']}'>"
prosody_attrs = [] prosody_attrs = []
# Prosody tags are only supported for standard and neural engines # Prosody tags are only supported for standard and neural engines
if self._settings["engine"] != "generative": if self._settings["engine"] != "generative":
if self._settings["rate"]: if self._settings["rate"]:
prosody_attrs.append(f"rate='{self._settings["rate"]}'") prosody_attrs.append(f"rate='{self._settings['rate']}'")
if self._settings["pitch"]: if self._settings["pitch"]:
prosody_attrs.append(f"pitch='{self._settings["pitch"]}'") prosody_attrs.append(f"pitch='{self._settings['pitch']}'")
if self._settings["volume"]: if self._settings["volume"]:
prosody_attrs.append(f"volume='{self._settings["volume"]}'") prosody_attrs.append(f"volume='{self._settings['volume']}'")
if prosody_attrs: if prosody_attrs:
ssml += f"<prosody {' '.join(prosody_attrs)}>" ssml += f"<prosody {' '.join(prosody_attrs)}>"

View File

@@ -292,15 +292,15 @@ class ElevenLabsTTSService(WordTTSService):
url = f"{self._url}/v1/text-to-speech/{voice_id}/stream-input?model_id={model}&output_format={output_format}" url = f"{self._url}/v1/text-to-speech/{voice_id}/stream-input?model_id={model}&output_format={output_format}"
if self._settings["optimize_streaming_latency"]: if self._settings["optimize_streaming_latency"]:
url += f"&optimize_streaming_latency={self._settings["optimize_streaming_latency"]}" url += f"&optimize_streaming_latency={self._settings['optimize_streaming_latency']}"
# language can only be used with the 'eleven_turbo_v2_5' model # language can only be used with the 'eleven_turbo_v2_5' model
if self._settings["language"]: if self._settings["language"]:
if model == "eleven_turbo_v2_5": if model == "eleven_turbo_v2_5":
url += f"&language_code={self._settings["language"]}" url += f"&language_code={self._settings['language']}"
else: else:
logger.debug( logger.debug(
f"Language code [{self._settings["language"]}] not applied. Language codes can only be used with the 'eleven_turbo_v2_5' model." f"Language code [{self._settings['language']}] not applied. Language codes can only be used with the 'eleven_turbo_v2_5' model."
) )
self._websocket = await websockets.connect(url) self._websocket = await websockets.connect(url)