add print log

jiangtao · jiangtao · commit 98f343264dee · 2025-02-23T11:46:49.000+08:00
diff --git a/core/connection.py b/core/connection.py
@@ -325,7 +325,6 @@ def speak_and_play(self, text):
         if tts_file is None:
             self.logger.bind(tag=TAG).error(f"tts转换失败，{text}")
             return None, text
-            
         self.logger.bind(tag=TAG).debug(f"TTS 文件生成完毕: {tts_file}")
         return tts_file, text
 
@@ -362,19 +361,4 @@ def stop_all_tasks(self):
         while self.scheduled_tasks:
             task = self.scheduled_tasks.popleft()
             task.cancel()
-        self.scheduled_tasks.clear()
-
-    def full_to_half(text):
-        """
-        将全角字符转换为半角字符
-        包括：数字、字母、标点符号
-        """
-        result = ""
-        for char in text:
-            code = ord(char)
-            if code == 0x3000:  # 全角空格
-                char = ' '
-            elif 0xFF01 <= code <= 0xFF5E:  # 全角字符范围
-                char = chr(code - 0xFEE0)
-            result += char
-        return result
+        self.scheduled_tasks.clear()
diff --git a/core/handle/audioHandle.py b/core/handle/audioHandle.py
@@ -59,7 +59,6 @@ async def isLLMWantToFinish(conn):
     first_text = conn.tts_first_text
     last_text = conn.tts_last_text
     _, last_text_without_punctuation = remove_punctuation_and_length(last_text)
-    logger.bind(tag=TAG).info(f"last_text_without_punctuation: {last_text_without_punctuation}, last_text: {last_text}, first_text: {first_text}")
     if "再见" in last_text_without_punctuation or "拜拜" in last_text_without_punctuation:
         return True
     _, first_text_without_punctuation = remove_punctuation_and_length(first_text)
@@ -84,7 +83,7 @@ async def sendAudioMessage(conn, audios, duration, text):
     if text == conn.tts_first_text:
         logger.bind(tag=TAG).info(f"发送第一段语音: {text}")
         conn.tts_start_speak_time = time.time()
-    #base_delay = len(text) * 0.45
+
     # 发送 sentence_start（每个音频文件之前发送一次）
     sentence_task = asyncio.create_task(
         schedule_with_interrupt(base_delay, send_tts_message(conn, "sentence_start", text))
@@ -101,7 +100,7 @@ async def sendAudioMessage(conn, audios, duration, text):
         stop_duration = conn.tts_duration - (time.time() - conn.tts_start_speak_time)
         logger.bind(tag=TAG).info(f"llm_finish_task: {text}, stop_duration: {stop_duration}")
         stop_task = asyncio.create_task(
-            schedule_with_interrupt(base_delay, send_tts_message(conn, 'stop'))
+            schedule_with_interrupt(stop_duration, send_tts_message(conn, 'stop'))
         )
         conn.scheduled_tasks.append(stop_task)
         if await isLLMWantToFinish(conn):
diff --git a/core/providers/tts/base.py b/core/providers/tts/base.py
@@ -82,47 +82,4 @@ def wav_to_opus_data(self, wav_file_path):
             opus_data = encoder.encode(np_frame.tobytes(), frame_size)
             opus_datas.append(opus_data)
 
-
         return opus_datas, duration
-
-    def read_opus_data(self, opus_file_path, format='opus'):
-        """
-        直接读取opus文件数据并解码重新编码，确保格式一致
-        """
-        try:
-            # 使用pydub获取音频时长和PCM数据
-            audio = AudioSegment.from_file(opus_file_path, format=format)
-            duration = len(audio) / 1000.0
-
-            # 确保音频格式正确
-            audio = audio.set_channels(1)  # 单声道
-            audio = audio.set_frame_rate(16000)  # 16kHz采样率
-            audio = audio.set_sample_width(2)  # 16位采样
-            
-            # 获取原始PCM数据
-            raw_data = audio.raw_data
-
-            # 初始化Opus编码器
-            encoder = opuslib_next.Encoder(16000, 1, opuslib_next.APPLICATION_AUDIO)
-
-            # 编码参数
-            frame_duration = 60  # 60ms per frame
-            frame_size = int(16000 * frame_duration / 1000)  # 960 samples/frame
-
-            opus_datas = []
-            # 按帧处理所有音频数据
-            for i in range(0, len(raw_data), frame_size * 2):
-                chunk = raw_data[i:i + frame_size * 2]
-                
-                if len(chunk) < frame_size * 2:
-                    chunk += b'\x00' * (frame_size * 2 - len(chunk))
-
-                np_frame = np.frombuffer(chunk, dtype=np.int16)
-                opus_data = encoder.encode(np_frame.tobytes(), frame_size)
-                opus_datas.append(opus_data)
-
-            return opus_datas, duration
-
-        except Exception as e:
-            logger.bind(tag=TAG).error(f"处理音频文件失败: {e}")
-            return [], 0
