fix: 搜索结果数量根据工具配置读取,不再固定5条
This commit is contained in:
10
main_v2.py
10
main_v2.py
@@ -839,19 +839,21 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
|
|||||||
|
|
||||||
if search_result.get("results"):
|
if search_result.get("results"):
|
||||||
# 构建搜索上下文(给LLM)
|
# 构建搜索上下文(给LLM)
|
||||||
|
max_for_llm = config.get('max_results', 5)
|
||||||
search_context = "\n\n【搜索结果】\n"
|
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"
|
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 = [
|
search_results_for_client = [
|
||||||
{
|
{
|
||||||
"title": r.get('title', 'N/A'),
|
"title": r.get('title', 'N/A'),
|
||||||
"snippet": r.get('content', r.get('snippet', ''))[:150],
|
"snippet": r.get('content', r.get('snippet', ''))[:150],
|
||||||
"url": r.get('url', 'N/A')
|
"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({
|
await websocket.send_json({
|
||||||
"type": "search_results",
|
"type": "search_results",
|
||||||
|
|||||||
Reference in New Issue
Block a user