xinyin025/LangBot
1
0
Fork 0
mirror of https://github.com/langbot-app/LangBot.git synced 2026-07-16 17:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

流式基本流程已通过修改了yield和return的冲突导致的问题

Browse Source
This commit is contained in:
Dong_master
2025-07-04 03:26:44 +08:00
committed by Junyan Qin
parent ee545a163f
commit 4908996cac
8 changed files with 304 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/pipeline/process/handlers/chat.py
+23 -15
View File
@@ -1,6 +1,6 @@
from __future__ import annotations
from itertools import accumulate
import uuid
import typing
import traceback
@@ -59,8 +59,11 @@ class ChatMessageHandler(handler.MessageHandler):
query.user_message.content = event_ctx.event.alter
text_length = 0
is_stream = query.adapter.is_stream_output_supported()
try:
is_stream = query.adapter.is_stream
except AttributeError:
is_stream = False
print(is_stream)
try:
for r in runner_module.preregistered_runners:
@@ -68,23 +71,28 @@ class ChatMessageHandler(handler.MessageHandler):
runner = r(self.ap, query.pipeline_config)
break
else:
raise ValueError(f'Request runner not found: {query.pipeline_config["ai"]["runner"]["runner"]}')
raise ValueError(f'未找到请求运行器: {query.pipeline_config["ai"]["runner"]["runner"]}')
if is_stream:
async for results in runner.run(query):
async for result in results:
resp_message_id = uuid.uuid4()
await query.adapter.create_message_card(resp_message_id, query.message_event)
async for result in runner.run(query):
result.resp_message_id = resp_message_id
if query.resp_messages:
query.resp_messages.pop()
if query.resp_message_chain:
query.resp_message_chain.pop()
query.resp_messages.append(result)
query.resp_messages.append(result)
self.ap.logger.info(f'对话({query.query_id})流式响应: {self.cut_str(result.readable_str())}')
self.ap.logger.info(f'对话({query.query_id})流式响应: {self.cut_str(result.readable_str())}')
if result.content is not None:
text_length += len(result.content)
if result.content is not None:
text_length += len(result.content)
yield entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
yield entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
# else:
# yield entities.StageProcessResult(result_type=entities.ResultType.INTERRUPT, new_query=query)
else:
async for result in runner.run(query):
query.resp_messages.append(result)
@@ -96,7 +104,7 @@ class ChatMessageHandler(handler.MessageHandler):
yield entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
query.session.using_conversation.messages.append(query.user_message)
query.session.using_conversation.messages.extend(query.resp_messages)
except Exception as e:
self.ap.logger.error(f'Request failed({query.query_id}): {type(e).__name__} {str(e)}')