|
|
@@ -257,6 +257,7 @@ class ThreadRunner:
|
|
|
thread_id=run.thread_id,
|
|
|
run_id=run.id,
|
|
|
step_details={
|
|
|
+ "reasoning_content": response_msg.reasoning_content,
|
|
|
"type": "tool_calls",
|
|
|
"tool_calls": [tool_call_dict for _, tool_call_dict in tool_calls],
|
|
|
},
|
|
|
@@ -291,6 +292,7 @@ class ThreadRunner:
|
|
|
run_step_id=new_run_step.id,
|
|
|
step_details={
|
|
|
"type": "tool_calls",
|
|
|
+ #"reasoning_content": response_msg.reasoning_content,
|
|
|
"tool_calls": tool_calls_with_outputs,
|
|
|
},
|
|
|
completed=not external_tool_call_dict,
|
|
|
@@ -338,12 +340,15 @@ class ThreadRunner:
|
|
|
response_msg.content = (
|
|
|
'[{"text": {"value": "", "annotations": []}, "type": "text"}]'
|
|
|
)
|
|
|
+ if response_msg.reasoning_content == "":
|
|
|
+ response_msg.reasoning_content = None
|
|
|
+
|
|
|
# 无 tool call 信息,message 生成结束,更新状态
|
|
|
new_message = MessageService.modify_message_sync(
|
|
|
session=self.session,
|
|
|
thread_id=run.thread_id,
|
|
|
message_id=llm_callback_handler.message.id,
|
|
|
- body=MessageUpdate(content=response_msg.content),
|
|
|
+ body=MessageUpdate(content=response_msg.content, reasoning_content=response_msg.reasoning_content),
|
|
|
)
|
|
|
self.event_handler.pub_message_completed(new_message)
|
|
|
|
|
|
@@ -428,13 +433,6 @@ class ThreadRunner:
|
|
|
"""
|
|
|
for content in message.content:
|
|
|
if content["type"] == "text":
|
|
|
- # message_content = content["text"]["value"]
|
|
|
- '''
|
|
|
- {
|
|
|
- "text": "图片主要讲了什么?",
|
|
|
- "type": "text"
|
|
|
- }
|
|
|
- '''
|
|
|
message_content.append(
|
|
|
{"type": "text", "text": content["text"]["value"]}
|
|
|
)
|
|
|
@@ -454,22 +452,10 @@ class ThreadRunner:
|
|
|
for content in message.content:
|
|
|
if content["type"] == "text":
|
|
|
assistant_content += content["text"]["value"]
|
|
|
- '''
|
|
|
- if message_content == "":
|
|
|
- message_content = (
|
|
|
- "You are a multilingual AI assistant.\n"
|
|
|
- + "- Detect user language; reply in same language unless told otherwise.\n"
|
|
|
- + "- Default to English if detection is unclear.\n"
|
|
|
- + "- Give concise, accurate, and safe answers; admit when unsure.\n"
|
|
|
- + "- Keep tone and style consistent; adapt examples to user's context.\n"
|
|
|
- + "- For code, include explanations and comments in user's language.\n"
|
|
|
- + "- If a question is ambiguous, ask for clarification.\n"
|
|
|
- )
|
|
|
- '''
|
|
|
if assistant_content == "":
|
|
|
assistant_content = "\r\n"
|
|
|
|
|
|
- chat_messages.append(msg_util.new_message(role, assistant_content))
|
|
|
+ chat_messages.append(msg_util.new_message(role, assistant_content, message.reasoning_content))
|
|
|
|
|
|
chat_messages.reverse() # 倒序排列,最新的消息在前面
|
|
|
return chat_messages # 暂时只支持5条消息,后续正价token上限
|