Skip to content

Commit 165a00f

Browse files
author
yaojin
committed
prompt 完整消息存储
1 parent fded7c9 commit 165a00f

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

src/backend/bisheng/api/v1/workstation.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ async def event_stream():
338338
web_list = []
339339
error = False
340340
final_res = ''
341+
final_result = None
341342
resoning_res = ''
342343
# prompt 长度token截断
343344
max_token = wsConfig.maxTokens
@@ -438,18 +439,18 @@ async def event_stream():
438439
# 循环获取task 结果,不等待
439440
try:
440441
if task.done():
441-
final_res = task.result() # Raise any exception if the task failed
442+
final_result = task.result() # Raise any exception if the task failed
442443
needBreak = True
443444
except Exception as e:
444445
logger.error(f'Error in task: {e}')
445446
break
446447
# 结束流式输出
447448
if resoning_res:
448-
final_res = ''':::thinking\n''' + resoning_res + '''\n:::''' + final_res.content
449+
final_res = ''':::thinking\n''' + resoning_res + '''\n:::''' + final_result.content
449450
elif web_list:
450-
final_res = ''':::web\n''' + json.dumps(web_list) + '''\n:::''' + final_res.content
451+
final_res = ''':::web\n''' + json.dumps(web_list) + '''\n:::''' + final_result.content
451452
else:
452-
final_res = final_res.content if not isinstance(final_res, str) else final_res
453+
final_res = final_result.content if final_result else final_res
453454

454455
yield final_message(conversaiton, conversaiton.flow_name, message, final_res, error,
455456
modelName)

0 commit comments

Comments
 (0)