Skip to content

在异步多轮对话中，会丢失FIRST LAST； FIRST与LAST每次对话都要有 #2555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

在异步多轮对话中，会丢失FIRST LAST； FIRST与LAST每次对话都要有 #2555

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions main/xiaozhi-server/core/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,17 +726,18 @@ def chat(self, query, depth=0):
self.logger.bind(tag=TAG).info(f"大模型收到用户消息: {query}")
self.llm_finish_task = False

# 为最顶层时新建会话ID和发送FIRST请求
# depth!=0目前只能表示是非用户发起的请求，与对话逻辑无关，这里所有tts对话都应该发送FIRST和LAST，没有例外
if depth == 0:
self.sentence_id = str(uuid.uuid4().hex)
self.dialogue.put(Message(role="user", content=query))
self.tts.tts_text_queue.put(
TTSMessageDTO(
sentence_id=self.sentence_id,
sentence_type=SentenceType.FIRST,
content_type=ContentType.ACTION,
)
# 发送开始标记
self.sentence_id = str(uuid.uuid4().hex)
self.tts.tts_text_queue.put(
TTSMessageDTO(
sentence_id=self.sentence_id,
sentence_type=SentenceType.FIRST,
content_type=ContentType.ACTION,
)
)

# Define intent functions
functions = None
Expand Down Expand Up @@ -826,6 +827,14 @@ def chat(self, query, depth=0):
content_detail=content,
)
)
# 发送结束标记
self.tts.tts_text_queue.put(
TTSMessageDTO(
sentence_id=self.sentence_id,
sentence_type=SentenceType.LAST,
content_type=ContentType.ACTION,
)
)
# 处理function call
if tool_call_flag:
bHasError = False
Expand Down Expand Up @@ -879,14 +888,7 @@ def chat(self, query, depth=0):
text_buff = "".join(response_message)
self.tts_MessageText = text_buff
self.dialogue.put(Message(role="assistant", content=text_buff))
if depth == 0:
self.tts.tts_text_queue.put(
TTSMessageDTO(
sentence_id=self.sentence_id,
sentence_type=SentenceType.LAST,
content_type=ContentType.ACTION,
)
)

self.llm_finish_task = True
# 使用lambda延迟计算，只有在DEBUG级别时才执行get_llm_dialogue()
self.logger.bind(tag=TAG).debug(
Expand Down