liumaolin
commited on
Commit
·
b7ae839
1
Parent(s):
3a6b6fc
增强任务有效性检查,添加日志记录以便于调试。
Browse files
src/voice_dialogue/services/audio/generator.py
CHANGED
|
@@ -83,6 +83,7 @@ class TTSAudioGenerator(BaseThread, TaskStatusMixin):
|
|
| 83 |
return
|
| 84 |
|
| 85 |
if not self.is_task_valid(voice_task):
|
|
|
|
| 86 |
return
|
| 87 |
|
| 88 |
if has_no_words(voice_task.answer_sentence):
|
|
|
|
| 83 |
return
|
| 84 |
|
| 85 |
if not self.is_task_valid(voice_task):
|
| 86 |
+
logger.info(f"TTS 音频生成: 任务<{voice_task.id}> 无效")
|
| 87 |
return
|
| 88 |
|
| 89 |
if has_no_words(voice_task.answer_sentence):
|
src/voice_dialogue/services/audio/player.py
CHANGED
|
@@ -41,6 +41,7 @@ class AudioStreamPlayer(BaseThread, TaskStatusMixin, HistoryMixin, PerformanceLo
|
|
| 41 |
return # 任务被中断,结束处理
|
| 42 |
|
| 43 |
if not self.is_task_valid(voice_task):
|
|
|
|
| 44 |
return # 任务无效,结束处理
|
| 45 |
|
| 46 |
# 等待用户彻底静音的信号
|
|
|
|
| 41 |
return # 任务被中断,结束处理
|
| 42 |
|
| 43 |
if not self.is_task_valid(voice_task):
|
| 44 |
+
logger.info(f"音频播放: 任务<{voice_task.id}> 无效")
|
| 45 |
return # 任务无效,结束处理
|
| 46 |
|
| 47 |
# 等待用户彻底静音的信号
|
src/voice_dialogue/services/mixins.py
CHANGED
|
@@ -13,16 +13,24 @@ class TaskStatusMixin:
|
|
| 13 |
|
| 14 |
def is_task_interrupted(self, voice_task: VoiceTask) -> bool:
|
| 15 |
"""检查语音任务是否被其他任务中断"""
|
| 16 |
-
|
| 17 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 18 |
|
| 19 |
def is_task_valid(self, voice_task: VoiceTask) -> bool:
|
| 20 |
"""检查语音任务是否有效(会话匹配、未被丢弃等)"""
|
| 21 |
if self.is_task_interrupted(voice_task):
|
| 22 |
return False
|
| 23 |
if voice_task.session_id != session_manager.current_id:
|
|
|
|
| 24 |
return False
|
| 25 |
if voice_task.answer_id in dropped_audio_cache:
|
|
|
|
| 26 |
return False
|
| 27 |
return True
|
| 28 |
|
|
|
|
| 13 |
|
| 14 |
def is_task_interrupted(self, voice_task: VoiceTask) -> bool:
|
| 15 |
"""检查语音任务是否被其他任务中断"""
|
| 16 |
+
if not voice_state_manager.interrupt_task_id:
|
| 17 |
+
return False
|
| 18 |
+
|
| 19 |
+
if voice_task.id != voice_state_manager.interrupt_task_id:
|
| 20 |
+
logger.info(f"任务<{voice_task.id}> 被任务<{voice_state_manager.interrupt_task_id}> 中断")
|
| 21 |
+
return True
|
| 22 |
+
|
| 23 |
+
return False
|
| 24 |
|
| 25 |
def is_task_valid(self, voice_task: VoiceTask) -> bool:
|
| 26 |
"""检查语音任务是否有效(会话匹配、未被丢弃等)"""
|
| 27 |
if self.is_task_interrupted(voice_task):
|
| 28 |
return False
|
| 29 |
if voice_task.session_id != session_manager.current_id:
|
| 30 |
+
logger.info(f"任务<{voice_task.id}> 会话不匹配: {voice_task.session_id} != {session_manager.current_id}")
|
| 31 |
return False
|
| 32 |
if voice_task.answer_id in dropped_audio_cache:
|
| 33 |
+
logger.info(f"任务<{voice_task.id}> 被丢弃: {voice_task.answer_id}")
|
| 34 |
return False
|
| 35 |
return True
|
| 36 |
|