Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-22 07:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

打断判断优先级调整

Browse Source
This commit is contained in:
Sakura-RanChen
2026-04-14 15:05:55 +08:00
parent a0497fdc48
commit ad01b05940
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/xiaozhi-server/core/providers/tts/alibl_stream.py
+8 -8
View File
@@ -103,14 +103,6 @@ class TTSProvider(TTSProviderBase):
try:
message = self.tts_text_queue.get(timeout=1)
# 过滤旧消息：检查sentence_id是否匹配
if message.sentence_id != self.conn.sentence_id:
continue
logger.bind(tag=TAG).debug(
f"收到TTS任务｜{message.sentence_type.name} ｜ {message.content_type.name} | 会话ID: {message.sentence_id}"
)
if self.conn.client_abort:
try:
logger.bind(tag=TAG).info("收到打断信息，终止TTS文本处理线程")
@@ -123,6 +115,14 @@ class TTSProvider(TTSProviderBase):
logger.bind(tag=TAG).error(f"取消TTS会话失败: {str(e)}")
continue
# 过滤旧消息：检查sentence_id是否匹配
if message.sentence_id != self.conn.sentence_id:
continue
logger.bind(tag=TAG).debug(
f"收到TTS任务｜{message.sentence_type.name} ｜ {message.content_type.name} | 会话ID: {message.sentence_id}"
)
if message.sentence_type == SentenceType.FIRST:
# 初始化会话
try:
main/xiaozhi-server/core/providers/tts/aliyun_stream.py
+8 -8
View File
@@ -216,14 +216,6 @@ class TTSProvider(TTSProviderBase):
try:
message = self.tts_text_queue.get(timeout=1)
# 过滤旧消息：检查sentence_id是否匹配
if message.sentence_id != self.conn.sentence_id:
continue
logger.bind(tag=TAG).debug(
f"收到TTS任务｜{message.sentence_type.name} ｜ {message.content_type.name} | 会话ID: {message.sentence_id}"
)
if self.conn.client_abort:
logger.bind(tag=TAG).info("收到打断信息，终止TTS文本处理线程")
asyncio.run_coroutine_threadsafe(
@@ -232,6 +224,14 @@ class TTSProvider(TTSProviderBase):
)
continue
# 过滤旧消息：检查sentence_id是否匹配
if message.sentence_id != self.conn.sentence_id:
continue
logger.bind(tag=TAG).debug(
f"收到TTS任务｜{message.sentence_type.name} ｜ {message.content_type.name} | 会话ID: {message.sentence_id}"
)
if message.sentence_type == SentenceType.FIRST:
# 初始化参数
try:
main/xiaozhi-server/core/providers/tts/base.py
+3 -3
View File
@@ -320,12 +320,12 @@ class TTSProviderBase(ABC):
while not self.conn.stop_event.is_set():
try:
message = self.tts_text_queue.get(timeout=1)
# 过滤旧消息：检查sentence_id是否匹配
if message.sentence_id != self.conn.sentence_id:
continue
if self.conn.client_abort:
logger.bind(tag=TAG).info("收到打断信息，终止TTS文本处理线程")
continue
# 过滤旧消息：检查sentence_id是否匹配
if message.sentence_id != self.conn.sentence_id:
continue
if message.sentence_type == SentenceType.FIRST:
self.current_sentence_id = message.sentence_id
self.tts_stop_request = False
main/xiaozhi-server/core/providers/tts/huoshan_double_stream.py
+8 -8
View File
@@ -273,14 +273,6 @@ class TTSProvider(TTSProviderBase):
try:
message = self.tts_text_queue.get(timeout=1)
# 过滤旧消息：检查sentence_id是否匹配
if message.sentence_id != self.conn.sentence_id:
continue
logger.bind(tag=TAG).debug(
f"收到TTS任务｜{message.sentence_type.name} ｜ {message.content_type.name} | 会话ID: {message.sentence_id}"
)
if self.conn.client_abort:
try:
logger.bind(tag=TAG).info("收到打断信息，终止TTS文本处理线程")
@@ -299,6 +291,14 @@ class TTSProvider(TTSProviderBase):
logger.bind(tag=TAG).error(f"取消TTS会话失败: {str(e)}")
continue
# 过滤旧消息：检查sentence_id是否匹配
if message.sentence_id != self.conn.sentence_id:
continue
logger.bind(tag=TAG).debug(
f"收到TTS任务｜{message.sentence_type.name} ｜ {message.content_type.name} | 会话ID: {message.sentence_id}"
)
if message.sentence_type == SentenceType.FIRST:
# 初始化参数
try:
main/xiaozhi-server/core/providers/tts/xunfei_stream.py
+4 -4
View File
@@ -155,6 +155,10 @@ class TTSProvider(TTSProviderBase):
try:
message = self.tts_text_queue.get(timeout=1)
if self.conn.client_abort:
logger.bind(tag=TAG).info("收到打断信息，终止TTS文本处理线程")
continue
# 过滤旧消息：检查sentence_id是否匹配
if message.sentence_id != self.conn.sentence_id:
continue
@@ -169,10 +173,6 @@ class TTSProvider(TTSProviderBase):
# 增加序列号
self.text_seq += 1
if self.conn.client_abort:
logger.bind(tag=TAG).info("收到打断信息，终止TTS文本处理线程")
continue
if message.sentence_type == SentenceType.FIRST:
# 初始化参数
try: