Compare commits

...

5 Commits

Author SHA1 Message Date
d1431ac521 fix: WebSocket history 消息添加 extra_data 字段,搜索结果可正确显示 2026-04-13 23:10:13 +08:00
49e15130f1 fix: 使用 insertAdjacentHTML 在设置 innerHTML 后添加搜索结果 2026-04-13 19:00:26 +08:00
9aaff7ee87 fix: appendMessage 接收 extraData 参数,在创建消息时直接处理搜索结果显示 2026-04-13 17:52:59 +08:00
b5284ce18e fix: 搜索结果持久化保存,刷新页面后历史对话也显示搜索结果
- 用户消息 extra_data 存储搜索结果
- API 返回消息时包含 extra_data
- 前端 displayHistory 处理历史搜索结果显示
2026-04-13 17:36:19 +08:00
8aa1f5fd88 fix: 搜索结果数量根据工具配置读取,不再固定5条 2026-04-13 17:16:37 +08:00
2 changed files with 34 additions and 8 deletions

View File

@@ -648,6 +648,7 @@ async def get_messages(conversation_id: str, db: Session = Depends(get_db)):
"role": m.role,
"content": m.content,
"thinking_content": m.thinking_content, # v2新增
"extra_data": m.extra_data, # 包含搜索结果等
"source": m.source,
"agent_id": m.agent_id, # v2新增
"model_used": m.model_used, # v2新增
@@ -742,6 +743,7 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
"role": m.role,
"content": m.content,
"thinking_content": m.thinking_content,
"extra_data": m.extra_data, # 包含搜索结果等
"agent_id": m.agent_id, # 每条消息的Agent ID
"source": m.source,
"created_at": m.created_at.isoformat()
@@ -807,6 +809,7 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
# 4. 执行搜索并发送搜索结果
search_context = None
search_results_for_client = None # 用于发送给前端和保存
logger.info(f"检查搜索条件: agent_tools={agent_tools}, disabled_tools={disabled_tools}")
if 'search' in agent_tools and 'search' not in disabled_tools:
@@ -839,19 +842,21 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
if search_result.get("results"):
# 构建搜索上下文给LLM
max_for_llm = config.get('max_results', 5)
search_context = "\n\n【搜索结果】\n"
for i, r in enumerate(search_result["results"][:5], 1):
for i, r in enumerate(search_result["results"][:max_for_llm], 1):
search_context += f"{i}. {r.get('title', 'N/A')}\n {r.get('content', r.get('snippet', 'N/A'))[:200]}\n 来源: {r.get('url', 'N/A')}\n"
logger.info(f"搜索完成: {len(search_result['results'])} 条结果")
logger.info(f"搜索完成: {len(search_result['results'])} 条结果,使用 {min(len(search_result['results']), max_for_llm)}")
# 发送搜索结果给前端
# 发送搜索结果给前端(按配置的数量)
max_display = config.get('max_results', 5)
search_results_for_client = [
{
"title": r.get('title', 'N/A'),
"snippet": r.get('content', r.get('snippet', ''))[:150],
"url": r.get('url', 'N/A')
}
for r in search_result["results"][:5]
for r in search_result["results"][:max_display]
]
await websocket.send_json({
"type": "search_results",
@@ -886,12 +891,13 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
'duration_ms': duration_ms
})
# 5. 保存用户消息到数据库
# 5. 保存用户消息到数据库(包含搜索结果)
user_msg = conv_service.add_message(
conversation_id=conversation.id,
role='user',
content=message,
source='web'
source='web',
extra_data={'search_results': search_results_for_client, 'search_query': message} if search_results_for_client else None
)
# 6. 获取对话历史(包含刚保存的用户消息)

View File

@@ -304,7 +304,7 @@
}
// 消息渲染
function appendMessage(role, content, thinking = null, agentName = null) {
function appendMessage(role, content, thinking = null, agentName = null, extraData = null) {
const container = document.getElementById('messagesContainer');
container.querySelector('.welcome')?.remove();
@@ -371,6 +371,23 @@
html += '</div>';
div.innerHTML = html;
// 如果是用户消息且有搜索结果在设置innerHTML后追加
if (role === 'user' && extraData) {
console.log('Processing extraData for user message:', extraData);
console.log('search_results exists:', extraData.search_results);
if (extraData.search_results && extraData.search_results.length > 0) {
console.log('Building search results HTML for', extraData.search_results.length, 'results');
const searchHtml = buildSearchResultsHtml(extraData.search_results, extraData.search_query || content);
const bodyDiv = div.querySelector('.message-body');
console.log('bodyDiv found:', bodyDiv != null);
if (bodyDiv) {
bodyDiv.insertAdjacentHTML('beforeend', searchHtml);
console.log('Search results HTML inserted');
}
}
}
container.appendChild(div);
container.scrollTop = container.scrollHeight;
}
@@ -622,7 +639,10 @@
function displayHistory(messages) {
const container = document.getElementById('messagesContainer');
container.innerHTML = '';
messages.forEach(m => appendMessage(m.role, m.content, m.thinking_content));
messages.forEach(m => {
console.log('displayHistory message:', m.role, 'extra_data:', m.extra_data);
appendMessage(m.role, m.content, m.thinking_content, null, m.extra_data);
});
}
function clearMessages() {