update:优化

main/xiaozhi-server/core/providers/tts/ttson.py

@@ -4,11 +4,11 @@ import json
 import requests
 import shutil
 from datetime import datetime
-
-from pydub import AudioSegment
-
 from core.providers.tts.base import TTSProviderBase
-from core.providers.tts.dto.dto import TTSMessageDTO, MsgType, SentenceType
+from config.logger import setup_logging
+
+TAG = __name__
+logger = setup_logging()
 
 
 class TTSProvider(TTSProviderBase):
@@ -39,8 +39,7 @@ class TTSProvider(TTSProviderBase):
             f"tts-{datetime.now().date()}@{uuid.uuid4().hex}{extension}",
         )
 
-    async def text_to_speak(self, u_id, text, is_last_text=False, is_first_text=False):
-        tmp_file = self.generate_filename()
+    async def text_to_speak(self, text, output_file):
         url = f"{self.url}{self.token}"
         result = "firefly"
         payload = json.dumps(
@@ -59,7 +58,8 @@ class TTSProvider(TTSProviderBase):
 
         resp = requests.request("POST", url, data=payload)
         if resp.status_code != 200:
-            return
+            logger.bind(tag=TAG).error(f"TTSON 请求失败: {resp.text}")
+            raise Exception(f"{__name__}: TTS请求失败")
         resp_json = resp.json()
         try:
             result = (
@@ -71,29 +71,15 @@ class TTSProvider(TTSProviderBase):
                 + "&voice_audio_path="
                 + resp_json["voice_path"]
             )
+
+            audio_content = requests.get(result)
+            with open(output_file, "wb") as f:
+                f.write(audio_content.content)
+                return True
+            voice_path = resp_json.get("voice_path")
+            des_path = output_file
+            shutil.move(voice_path, des_path)
+
         except Exception as e:
             print("error:", e)
-
-        audio_content = requests.get(result)
-        with open(tmp_file, "wb") as f:
-            f.write(audio_content.content)
-            # 使用 pydub 读取临时文件
-            audio = AudioSegment.from_file(tmp_file, format="mp3")
-            audio = audio.set_channels(1).set_frame_rate(16000)
-            opus_datas = self.wav_to_opus_data_audio_raw(audio.raw_data)
-            yield TTSMessageDTO(
-                u_id=u_id,
-                msg_type=MsgType.TTS_TEXT_RESPONSE,
-                content=opus_datas,
-                tts_finish_text=text,
-                sentence_type=SentenceType.SENTENCE_START,
-            )
-            # 用完后删除临时文件
-            try:
-                os.remove(tmp_file)
-            except FileNotFoundError:
-                # 若文件不存在，忽略该异常
-                pass
-        voice_path = resp_json.get("voice_path")
-        des_path = tmp_file
-        shutil.move(voice_path, des_path)
+            raise Exception(f"{__name__}: TTS请求失败")