xinyin025/LangBot
1
0
Fork 0
mirror of https://github.com/langbot-app/LangBot.git synced 2026-06-13 01:06:03 +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
parent 4005a8a3e2
commit 68cdd163d3
8 changed files with 323 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
pkg/pipeline/process/handlers/chat.py
View File

@@ -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:
@@ -70,31 +73,44 @@ class ChatMessageHandler(handler.MessageHandler):
else:
raise ValueError(f'未找到请求运行器: {query.pipeline_config["ai"]["runner"]["runner"]}')
if is_stream:
async for results in runner.run(query):
async for result in results:
# async for results in runner.run(query):
async for result in runner.run(query):
print(result)
query.resp_messages.append(result)
print(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)
# current_chain = platform_message.MessageChain([])
# for msg in accumulated_messages:
# if msg.content is not None:
# current_chain.append(platform_message.Plain(msg.content))
# query.resp_message_chain = [current_chain]
yield entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
yield entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
# for result in results:
#
# query.resp_messages.append(result)
# print(result)
#
# self.ap.logger.info(f'对话({query.query_id})流式响应: {self.cut_str(result.content)}')
#
# if result.content is not None:
# text_length += len(result.content)
#
# # current_chain = platform_message.MessageChain([])
# # for msg in accumulated_messages:
# # if msg.content is not None:
# # current_chain.append(platform_message.Plain(msg.content))
# # query.resp_message_chain = [current_chain]
#
# yield entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
# query.resp_messages.append(results)
# self.ap.logger.info(f'对话({query.query_id})响应')
# yield entities.StageProcessResult(result_type=entities.ResultType.CONTINUE, new_query=query)
else:
print("非流式")
async for result in runner.run(query):
query.resp_messages.append(result)
print(result)
self.ap.logger.info(f'对话({query.query_id})响应: {self.cut_str(result.readable_str())}')

9
pkg/pipeline/respback/respback.py
View File

@@ -3,6 +3,7 @@ from __future__ import annotations
import random
import asyncio
from typing_inspection.typing_objects import is_final
from ...platform.types import events as platform_events
from ...platform.types import message as platform_message
@@ -39,12 +40,16 @@ class SendResponseBackStage(stage.PipelineStage):
quote_origin = query.pipeline_config['output']['misc']['quote-origin']
has_chunks = any(isinstance(msg, llm_entities.MessageChunk) for msg in query.resp_messages)
print(has_chunks)
if has_chunks and hasattr(query.adapter,'reply_message_chunk'):
is_final = [msg.is_final for msg in query.resp_messages][0]
print(is_final)
await query.adapter.reply_message_chunk(
message_source=query.message_event,
message_id=query.query_id,
message_generator=query.resp_message_chain[-1],
message_id=query.message_event.message_chain.message_id,
message=query.resp_message_chain[-1],
quote_origin=quote_origin,
is_final=is_final,
)
else:
await query.adapter.reply_message(