Compare commits

...

14 Commits

Author SHA1 Message Date
3cbdddf773 fix: 搜索结果放到用户消息下面,折叠显示
- 搜索结果追加到最后一条用户消息的 message-body 中
- 默认折叠,点击展开/收起
- 显示搜索关键词和结果数量
2026-04-13 17:01:08 +08:00
c0ed6cd505 fix: get_agent_config 添加 tools 字段返回 2026-04-13 16:46:00 +08:00
25e92b1fb1 fix: 搜索功能修复
- 添加详细日志帮助调试
- 搜索结果发送到前端展示
- 前端增加搜索结果展示组件
- 修复 datetime 导入错误
2026-04-13 16:34:00 +08:00
142904dff4 feat: 重构工具配置为通用模型,增加使用统计
- ToolConfig 模型:支持多种工具类型(搜索、计算器、代码执行等)
- ToolUsageLog 模型:记录工具调用日志
- 工具使用统计:调用次数、成功率、错误记录
- 后台管理界面:工具列表+统计展示
- API 重构:/api/v2/tools(替代 search-tools)
2026-04-13 16:15:26 +08:00
b9e99da01b fix: 搜索改为勾选即执行,不再依赖关键词检测 2026-04-13 16:00:32 +08:00
34f02ad4d4 fix: 修复数据库缺少tools字段,移动搜索复选框到输入框区域 2026-04-13 13:31:14 +08:00
0c9bfca346 feat: 添加搜索工具功能(Tavily Search)
- 新增 SearchToolConfig 模型:支持搜索工具配置
- Agent 增加 tools 字段:可配置可用工具列表
- 后台管理增加搜索工具配置页面
- Agent 管理增加工具启用开关
- 网页端增加搜索工具禁用复选框
- WebSocket chat 处理增加搜索调用逻辑
- 默认配置 Tavily Search API
2026-04-13 13:26:43 +08:00
85dd206154 fix: 简化新建对话判断条件,只检查无对话ID且无消息 2026-04-13 12:20:56 +08:00
1b9bb1090c fix: 新建对话时检查是否已经是新建状态,避免重复创建空对话 2026-04-13 12:18:03 +08:00
2373040b04 fix: 修复JS语法错误 - 删除重复代码块 2026-04-13 11:26:30 +08:00
f0789d6bbc style: 版本切换控件简化并整合到操作按钮区域 2026-04-13 11:11:06 +08:00
e05233fb4f fix: 修复loading动画不去掉的问题 - isRegenerating标志在user_message时被错误重置 2026-04-13 11:02:32 +08:00
7fa143b5b0 feat: assistant消息支持多版本历史,重新生成保留旧版本+版本切换控件 2026-04-13 10:53:18 +08:00
b573638bf8 fix: 复制按钮使用传统方法确保可用,重新生成不再重复显示用户消息 2026-04-13 10:37:47 +08:00
5 changed files with 1116 additions and 29 deletions

View File

@@ -18,11 +18,11 @@ import os
from models_v2 import (
init_db, get_db, SessionLocal,
User, Conversation, Message, SystemConfig,
LLMProvider, Agent, Channel, ChannelAgentMapping, MatrixRoomMapping,
LLMProvider, Agent, Channel, ChannelAgentMapping, MatrixRoomMapping, ToolConfig, ToolUsageLog,
init_default_data
)
from services.llm_service import llm_service
from services.agent_service import AgentService, LLMProviderService, ChannelService
from services.agent_service import AgentService, LLMProviderService, ChannelService, ToolService
from services.conversation_service import ConversationService
# 配置日志
@@ -204,6 +204,7 @@ async def get_agents(db: Session = Depends(get_db)):
"thinking_prompt": a.thinking_prompt,
"thinking_prefix": a.thinking_prefix,
"thinking_suffix": a.thinking_suffix,
"tools": a.tools or [], # 工具列表
"max_history": a.max_history,
"temperature_override": a.temperature_override,
"is_default": a.is_default,
@@ -418,6 +419,162 @@ async def unbind_agent(mapping_id: int, db: Session = Depends(get_db)):
return {"success": success}
# ==================== 工具配置 API ====================
@app.get("/api/v2/tools")
async def get_tools(tool_type: str = None, db: Session = Depends(get_db)):
"""获取所有工具配置"""
service = ToolService(db)
if tool_type:
tools = service.get_tools_by_type(tool_type)
else:
tools = service.get_all_tools()
return {
"tools": [
{
"id": t.id,
"name": t.name,
"tool_type": t.tool_type,
"provider": t.provider,
"config": t.config,
"is_active": t.is_active,
"is_default": t.is_default,
"total_calls": t.total_calls,
"success_calls": t.success_calls,
"failed_calls": t.failed_calls
}
for t in tools
]
}
@app.post("/api/v2/tools")
async def create_tool(data: dict, db: Session = Depends(get_db)):
"""创建工具配置"""
service = ToolService(db)
tool = service.create_tool(data)
return {"success": True, "tool": {"id": tool.id, "name": tool.name, "tool_type": tool.tool_type}}
@app.put("/api/v2/tools/{tool_id}")
async def update_tool(tool_id: int, data: dict, db: Session = Depends(get_db)):
"""更新工具配置"""
service = ToolService(db)
if data.get('is_default'):
service.set_default_tool(tool_id)
tool = service.update_tool(tool_id, data)
if not tool:
return {"success": False, "message": "工具不存在"}
return {"success": True, "tool": {"id": tool.id, "name": tool.name}}
@app.delete("/api/v2/tools/{tool_id}")
async def delete_tool(tool_id: int, db: Session = Depends(get_db)):
"""删除工具配置"""
service = ToolService(db)
success = service.delete_tool(tool_id)
return {"success": success}
@app.post("/api/v2/tools/{tool_id}/default")
async def set_tool_default(tool_id: int, db: Session = Depends(get_db)):
"""设置默认工具"""
service = ToolService(db)
success = service.set_default_tool(tool_id)
return {"success": success}
@app.get("/api/v2/tools/stats")
async def get_tool_stats(days: int = 7, db: Session = Depends(get_db)):
"""获取工具使用统计"""
service = ToolService(db)
stats = service.get_usage_stats(days=days)
return stats
@app.post("/api/v2/tools/search")
async def perform_search(data: dict, db: Session = Depends(get_db)):
"""执行搜索供前端或Agent调用"""
import httpx
import time
query = data.get('query')
if not query:
return {"success": False, "message": "缺少搜索关键词"}
service = ToolService(db)
tool_id = data.get('tool_id')
if tool_id:
tool = service.get_tool(tool_id)
else:
tool = service.get_default_tool('search')
if not tool or not tool.config.get('api_key'):
return {"success": False, "message": "未配置搜索工具"}
# Tavily Search API
if tool.provider == 'tavily' or tool.tool_type == 'search':
start_time = time.time()
try:
tavily_url = "https://api.tavily.com/search"
config = tool.config
payload = {
"api_key": config.get('api_key'),
"query": query,
"max_results": config.get('max_results', 5),
"include_raw_content": config.get('include_raw_content', False),
"search_depth": config.get('search_depth', 'basic')
}
async with httpx.AsyncClient(timeout=30) as client:
response = await client.post(tavily_url, json=payload)
result = response.json()
duration_ms = int((time.time() - start_time) * 1000)
# 更新统计和日志
service.increment_stats(tool.id, True)
service.log_usage({
'tool_id': tool.id,
'tool_type': 'search',
'query': query,
'success': True,
'result_summary': f'{len(result.get("results", []))} results',
'conversation_id': data.get('conversation_id'),
'agent_id': data.get('agent_id'),
'duration_ms': duration_ms
})
return {
"success": True,
"results": result.get("results", []),
"query": query
}
except Exception as e:
duration_ms = int((time.time() - start_time) * 1000)
service.increment_stats(tool.id, False)
service.log_usage({
'tool_id': tool.id,
'tool_type': 'search',
'query': query,
'success': False,
'error_message': str(e),
'conversation_id': data.get('conversation_id'),
'duration_ms': duration_ms
})
return {"success": False, "message": str(e)}
return {"success": False, "message": "不支持的搜索提供商"}
# ==================== 对话 API保留原有 ====================
@app.get("/api/conversations")
@@ -610,6 +767,7 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
conversation_id = data.get("conversation_id")
enable_thinking = data.get("enable_thinking", True)
agent_id_override = data.get("agent_id")
disabled_tools = data.get("disabled_tools", []) # 禁用的工具列表
if agent_id_override:
agent = agent_service.get_agent(agent_id_override)
@@ -619,6 +777,102 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
if not message.strip():
continue
# 获取Agent配置
agent_config = agent_service.get_agent_config(current_agent_id)
agent_tools = agent_config.get('agent', {}).get('tools', [])
# 检查是否需要执行搜索
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:
# 只要启用了搜索工具且未禁用,就执行搜索
logger.info("搜索条件满足,开始执行搜索")
# 执行搜索
tool_service = ToolService(db)
search_tool = tool_service.get_default_tool('search')
logger.info(f"获取到搜索工具: {search_tool.name if search_tool else 'None'}")
if search_tool and search_tool.config.get('api_key'):
# 执行搜索
tool_service = ToolService(db)
search_tool = tool_service.get_default_tool('search')
if search_tool and search_tool.config.get('api_key'):
import httpx
import time
start_time = time.time()
try:
logger.info(f"执行搜索: query={message}")
tavily_url = "https://api.tavily.com/search"
config = search_tool.config
payload = {
"api_key": config.get('api_key'),
"query": message,
"max_results": config.get('max_results', 5),
"search_depth": config.get('search_depth', 'basic')
}
# 同步调用
with httpx.Client(timeout=30) as client:
resp = client.post(tavily_url, json=payload)
search_result = resp.json()
duration_ms = int((time.time() - start_time) * 1000)
if search_result.get("results"):
# 构建搜索上下文给LLM
search_context = "\n\n【搜索结果】\n"
for i, r in enumerate(search_result["results"][:5], 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'])} 条结果")
# 构建搜索结果给前端展示
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]
]
# 发送搜索结果给前端
await websocket.send_json({
"type": "search_results",
"conversation_id": conversation_id,
"results": search_results_for_client,
"query": message
})
# 更新统计和日志
tool_service.increment_stats(search_tool.id, True)
tool_service.log_usage({
'tool_id': search_tool.id,
'tool_type': 'search',
'query': message,
'success': True,
'result_summary': f'{len(search_result["results"])} results',
'conversation_id': conversation_id,
'agent_id': current_agent_id,
'duration_ms': duration_ms
})
except Exception as e:
duration_ms = int((time.time() - start_time) * 1000)
logger.error(f"搜索失败: {e}")
tool_service.increment_stats(search_tool.id, False)
tool_service.log_usage({
'tool_id': search_tool.id,
'tool_type': 'search',
'query': message,
'success': False,
'error_message': str(e),
'conversation_id': conversation_id,
'duration_ms': duration_ms
})
# 获取或创建会话
if conversation_id:
conversation = conv_service.get_conversation(conversation_id)
@@ -664,6 +918,14 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
# 获取对话历史
history = conv_service.get_conversation_history(conversation_id, limit=agent_config['agent'].get('max_history', 20))
# 如果有搜索结果,添加到消息中
if search_context:
# 在系统提示中添加搜索结果说明
modified_system_prompt = agent_config['agent'].get('system_prompt', '') + "\n\n如果提供了搜索结果,请基于搜索结果回答用户问题,并注明信息来源。"
agent_config['agent']['system_prompt'] = modified_system_prompt
# 将搜索结果作为系统消息添加到历史
history.append({"role": "system", "content": f"以下是搜索到的相关信息,请参考这些内容回答用户问题:{search_context}"})
# 使用非流式调用LLM简化版本确保稳定
try:
# 调用LLM非流式

View File

@@ -58,6 +58,9 @@ class Agent(Base):
name = Column(String(100), unique=True, index=True) # Agent名称
display_name = Column(String(100)) # 显示名称
# 工具配置
tools = Column(JSON, default=list) # 可用工具列表 ["search", "calculator", ...]
# 大模型配置
llm_provider_id = Column(Integer, ForeignKey('llm_providers.id'))
model_override = Column(String(100), nullable=True) # 覆盖Provider默认模型
@@ -224,6 +227,60 @@ class MatrixRoomMapping(Base):
created_at = Column(DateTime, default=datetime.utcnow)
# ==================== 搜索工具配置 ====================
class ToolConfig(Base):
"""工具配置(通用,支持搜索、计算器、代码执行等)"""
__tablename__ = 'tool_configs'
id = Column(Integer, primary_key=True, index=True)
name = Column(String(100)) # 工具名称,如 "Tavily Search"、"Calculator"
tool_type = Column(String(50), index=True) # 工具类型search, calculator, code_runner, image_gen, etc.
provider = Column(String(50), nullable=True) # 提供商可选tavily, google, wolfram, etc.
# API配置JSON不同工具可能有不同配置
config = Column(JSON, default=dict)
# search示例: {"api_key": "xxx", "max_results": 5, "search_depth": "basic"}
# calculator示例: {"api_base": "xxx"}
# 状态
is_active = Column(Boolean, default=True)
is_default = Column(Boolean, default=False) # 是否为该类型的默认工具
# 统计
total_calls = Column(Integer, default=0) # 总调用次数
success_calls = Column(Integer, default=0) # 成功次数
failed_calls = Column(Integer, default=0) # 失败次数
created_at = Column(DateTime, default=datetime.utcnow)
updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
class ToolUsageLog(Base):
"""工具使用日志"""
__tablename__ = 'tool_usage_logs'
id = Column(Integer, primary_key=True, index=True)
tool_id = Column(Integer, ForeignKey('tool_configs.id'))
tool_type = Column(String(50), index=True)
# 调用信息
query = Column(Text) # 调用参数/查询内容
success = Column(Boolean, default=True)
error_message = Column(Text, nullable=True)
result_summary = Column(Text, nullable=True) # 结果摘要
# 关联信息
conversation_id = Column(String(100), nullable=True)
agent_id = Column(Integer, nullable=True)
user_id = Column(String(100), nullable=True)
# 性能
duration_ms = Column(Integer, nullable=True) # 调用耗时(毫秒)
called_at = Column(DateTime, default=datetime.utcnow)
# ==================== 系统配置(保留) ====================
class SystemConfig(Base):
@@ -335,6 +392,18 @@ def init_default_data():
)
db.add(matrix_mapping)
# 5. 创建默认搜索工具配置
search_config = SearchToolConfig(
name="Tavily Search",
provider="tavily",
api_key="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",
max_results=5,
search_depth="basic",
is_active=True,
is_default=True
)
db.add(search_config)
db.commit()
print("默认数据初始化完成")

View File

@@ -5,7 +5,7 @@ from sqlalchemy.orm import Session
from typing import List, Optional, Dict
import logging
from models_v2 import Agent, LLMProvider, ChannelAgentMapping, Channel, init_default_data
from models_v2 import Agent, LLMProvider, ChannelAgentMapping, Channel, ToolConfig, ToolUsageLog, init_default_data
logger = logging.getLogger(__name__)
@@ -52,6 +52,7 @@ class AgentService:
thinking_prompt=data.get('thinking_prompt'),
thinking_prefix=data.get('thinking_prefix', ''),
thinking_suffix=data.get('thinking_suffix', ''),
tools=data.get('tools', []), # 工具列表
max_history=data.get('max_history', 20),
temperature_override=data.get('temperature_override'),
is_active=data.get('is_active', True),
@@ -125,6 +126,7 @@ class AgentService:
'model_override': agent.model_override,
'max_history': agent.max_history,
'temperature_override': agent.temperature_override,
'tools': agent.tools or [], # 工具列表
'is_default': agent.is_default,
'is_active': agent.is_active
},
@@ -405,4 +407,172 @@ class ChannelService:
'is_active': channel.is_active,
'is_primary': channel.is_primary,
'agent_mappings': self.get_channel_agents(channel_id)
}
}
class ToolService:
"""工具管理服务"""
def __init__(self, db: Session):
self.db = db
def get_all_tools(self) -> List[ToolConfig]:
"""获取所有工具配置"""
return self.db.query(ToolConfig).order_by(ToolConfig.tool_type, ToolConfig.is_default.desc()).all()
def get_tools_by_type(self, tool_type: str) -> List[ToolConfig]:
"""获取指定类型的工具"""
return self.db.query(ToolConfig).filter(ToolConfig.tool_type == tool_type).all()
def get_active_tools(self) -> List[ToolConfig]:
"""获取活跃的工具"""
return self.db.query(ToolConfig).filter(ToolConfig.is_active == True).all()
def get_tool(self, tool_id: int) -> Optional[ToolConfig]:
"""获取单个工具"""
return self.db.query(ToolConfig).filter(ToolConfig.id == tool_id).first()
def get_default_tool(self, tool_type: str) -> Optional[ToolConfig]:
"""获取指定类型的默认工具"""
tool = self.db.query(ToolConfig).filter(
ToolConfig.tool_type == tool_type,
ToolConfig.is_default == True,
ToolConfig.is_active == True
).first()
if not tool:
tool = self.db.query(ToolConfig).filter(
ToolConfig.tool_type == tool_type,
ToolConfig.is_active == True
).first()
return tool
def create_tool(self, data: Dict) -> ToolConfig:
"""创建工具配置"""
tool = ToolConfig(
name=data.get('name'),
tool_type=data.get('tool_type', 'search'),
provider=data.get('provider'),
config=data.get('config', {}),
is_active=data.get('is_active', True),
is_default=data.get('is_default', False)
)
self.db.add(tool)
self.db.commit()
self.db.refresh(tool)
return tool
def update_tool(self, tool_id: int, data: Dict) -> Optional[ToolConfig]:
"""更新工具配置"""
tool = self.get_tool(tool_id)
if not tool:
return None
for key, value in data.items():
if hasattr(tool, key) and value is not None:
setattr(tool, key, value)
self.db.commit()
self.db.refresh(tool)
return tool
def delete_tool(self, tool_id: int) -> bool:
"""删除工具配置"""
tool = self.get_tool(tool_id)
if not tool:
return False
self.db.delete(tool)
self.db.commit()
return True
def set_default_tool(self, tool_id: int) -> bool:
"""设置默认工具"""
tool = self.get_tool(tool_id)
if not tool:
return False
# 清除同类型的其他默认
self.db.query(ToolConfig).filter(
ToolConfig.tool_type == tool.tool_type
).update({ToolConfig.is_default: False})
tool.is_default = True
self.db.commit()
return True
def increment_stats(self, tool_id: int, success: bool):
"""更新工具调用统计"""
tool = self.get_tool(tool_id)
if tool:
tool.total_calls += 1
if success:
tool.success_calls += 1
else:
tool.failed_calls += 1
self.db.commit()
def log_usage(self, data: Dict) -> ToolUsageLog:
"""记录工具使用日志"""
log = ToolUsageLog(
tool_id=data.get('tool_id'),
tool_type=data.get('tool_type'),
query=data.get('query'),
success=data.get('success', True),
error_message=data.get('error_message'),
result_summary=data.get('result_summary'),
conversation_id=data.get('conversation_id'),
agent_id=data.get('agent_id'),
user_id=data.get('user_id'),
duration_ms=data.get('duration_ms')
)
self.db.add(log)
self.db.commit()
self.db.refresh(log)
return log
def get_usage_stats(self, days: int = 7) -> Dict:
"""获取工具使用统计"""
from datetime import datetime, timedelta
start_date = datetime.utcnow() - timedelta(days=days)
# 按工具类型统计
logs = self.db.query(ToolUsageLog).filter(
ToolUsageLog.called_at >= start_date
).all()
stats = {
'total_calls': len(logs),
'success_rate': sum(1 for l in logs if l.success) / len(logs) * 100 if logs else 0,
'by_type': {},
'by_tool': {},
'recent_errors': []
}
for log in logs:
# 按类型
if log.tool_type not in stats['by_type']:
stats['by_type'][log.tool_type] = {'total': 0, 'success': 0, 'failed': 0}
stats['by_type'][log.tool_type]['total'] += 1
if log.success:
stats['by_type'][log.tool_type]['success'] += 1
else:
stats['by_type'][log.tool_type]['failed'] += 1
# 按工具
tool = self.get_tool(log.tool_id) if log.tool_id else None
tool_name = tool.name if tool else f'Tool#{log.tool_id}'
if tool_name not in stats['by_tool']:
stats['by_tool'][tool_name] = {'total': 0, 'success': 0}
stats['by_tool'][tool_name]['total'] += 1
if log.success:
stats['by_tool'][tool_name]['success'] += 1
# 最近错误
if not log.success and log.error_message:
stats['recent_errors'].append({
'tool': tool_name,
'error': log.error_message[:100],
'time': log.called_at.isoformat()
})
return stats

View File

@@ -42,6 +42,7 @@
<div class="nav-item active" data-page="llm-providers"><i class="ri-cloud-line"></i> 大模型池</div>
<div class="nav-item" data-page="agents"><i class="ri-robot-2-line"></i> Agent管理</div>
<div class="nav-item" data-page="channels"><i class="ri-chat-3-line"></i> 渠道管理</div>
<div class="nav-item" data-page="tools"><i class="ri-tools-line"></i> 工具管理</div>
<div class="nav-item" data-page="stats"><i class="ri-bar-chart-box-line"></i> 统计数据</div>
</div>
</div>
@@ -109,6 +110,33 @@
</div>
</div>
<!-- 工具管理 -->
<div class="page-section" id="page-tools">
<div class="page-header"><h2><i class="ri-tools-line"></i> 工具管理</h2></div>
<div class="row">
<div class="col-md-8">
<div class="card">
<div class="card-header d-flex justify-content-between">
<span>工具列表(搜索、计算器、代码执行等)</span>
<button class="btn btn-primary btn-sm" onclick="showAddToolModal()"><i class="ri-add-line"></i> 添加工具</button>
</div>
<div class="card-body">
<table class="table">
<thead><tr><th>名称</th><th>类型</th><th>提供商</th><th>调用次数</th><th>成功率</th><th>默认</th><th>状态</th><th>操作</th></tr></thead>
<tbody id="tools-list"><tr><td colspan="8" class="text-center">加载中...</td></tr></tbody>
</table>
</div>
</div>
</div>
<div class="col-md-4">
<div class="card">
<div class="card-header"><i class="ri-bar-chart-line"></i> 工具使用统计近7天</div>
<div class="card-body" id="tool-stats">加载中...</div>
</div>
</div>
</div>
</div>
<!-- 统计 -->
<div class="page-section" id="page-stats">
<div class="page-header"><h2><i class="ri-bar-chart-box-line"></i> 统计数据</h2></div>
@@ -152,6 +180,8 @@
<div class="row mt-3"><div class="col-md-4 form-check"><input type="checkbox" class="form-check-input" id="agent-active" checked><label class="form-check-label">启用</label></div><div class="col-md-4 form-check"><input type="checkbox" class="form-check-input" id="agent-default"><label class="form-check-label">默认</label></div><div class="col-md-4"><label class="form-label">温度覆盖</label><input type="number" class="form-control" id="agent-temperature-override" step="0.1"></div></div>
<hr><h6>思考功能</h6>
<div class="thinking-config"><div class="form-check"><input type="checkbox" class="form-check-input" id="agent-enable-thinking" checked><label class="form-check-label">启用思考</label></div><div class="mt-2"><label class="form-label">思考提示词</label><textarea class="form-control" id="agent-thinking-prompt" rows="2"></textarea></div><div class="row mt-2"><div class="col-md-6"><label class="form-label">前缀</label><input type="text" class="form-control" id="agent-thinking-prefix"></div><div class="col-md-6"><label class="form-label">后缀</label><input type="text" class="form-control" id="agent-thinking-suffix"></div></div></div>
<hr><h6>工具配置</h6>
<div class="thinking-config"><div class="form-check"><input type="checkbox" class="form-check-input" id="agent-tool-search"><label class="form-check-label">启用搜索工具</label></div><small class="text-muted">启用后 Agent 可以使用搜索功能获取实时信息</small></div>
</form></div>
<div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">取消</button><button type="button" class="btn btn-primary" onclick="saveAgent()">保存</button></div>
</div></div></div>
@@ -180,6 +210,43 @@
<div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">取消</button><button type="button" class="btn btn-primary" onclick="saveMatrixConfig()">保存</button></div>
</div></div></div>
<!-- Tool Modal -->
<div class="modal fade" id="toolModal"><div class="modal-dialog modal-lg"><div class="modal-content">
<div class="modal-header"><h5 class="modal-title">添加/编辑工具</h5><button type="button" class="btn-close" data-bs-dismiss="modal"></button></div>
<div class="modal-body"><form id="tool-form">
<input type="hidden" id="tool-id">
<div class="row">
<div class="col-md-6"><label class="form-label">名称 *</label><input type="text" class="form-control" id="tool-name" required></div>
<div class="col-md-6"><label class="form-label">类型 *</label><select class="form-select" id="tool-type" onchange="updateToolForm()">
<option value="search">搜索工具</option>
<option value="calculator">计算器</option>
<option value="code_runner">代码执行</option>
<option value="image_gen">图像生成</option>
<option value="translator">翻译</option>
<option value="weather">天气查询</option>
<option value="custom">自定义</option>
</select></div>
</div>
<div class="row mt-3">
<div class="col-md-6"><label class="form-label">提供商</label><select class="form-select" id="tool-provider">
<option value=""></option>
<option value="tavily">Tavily</option>
<option value="google">Google</option>
<option value="bing">Bing</option>
<option value="wolfram">Wolfram</option>
<option value="openai">OpenAI</option>
<option value="anthropic">Anthropic</option>
<option value="custom">自定义</option>
</select></div>
<div class="col-md-6"><label class="form-label">API Key</label><input type="text" class="form-control" id="tool-api-key"></div>
</div>
<div class="mt-3"><label class="form-label">配置参数JSON格式</label><textarea class="form-control" id="tool-config" rows="3">{"max_results": 5, "search_depth": "basic"}</textarea></div>
<div class="mt-3 form-check"><input type="checkbox" class="form-check-input" id="tool-active" checked><label class="form-check-label">启用</label></div>
<div class="mt-2 form-check"><input type="checkbox" class="form-check-input" id="tool-default"><label class="form-check-label">设为该类型默认</label></div>
</form></div>
<div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">取消</button><button type="button" class="btn btn-primary" onclick="saveTool()">保存</button></div>
</div></div></div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
<script>
// 全局数据
@@ -190,6 +257,7 @@
if (page === 'llm-providers') loadProviders();
if (page === 'agents') loadAgents();
if (page === 'channels') loadChannels();
if (page === 'tools') loadTools();
if (page === 'stats') loadStats();
}
@@ -348,11 +416,18 @@
document.getElementById('agent-thinking-prompt').value = a.thinking_prompt || '';
document.getElementById('agent-thinking-prefix').value = a.thinking_prefix || '';
document.getElementById('agent-thinking-suffix').value = a.thinking_suffix || '';
// 工具配置
const tools = a.tools || [];
document.getElementById('agent-tool-search').checked = tools.includes('search');
new bootstrap.Modal(document.getElementById('agentModal')).show();
}
async function saveAgent() {
const id = document.getElementById('agent-id').value;
// 处理工具列表
const tools = [];
if (document.getElementById('agent-tool-search').checked) tools.push('search');
const data = {
name: document.getElementById('agent-name').value,
display_name: document.getElementById('agent-display-name').value,
@@ -367,7 +442,8 @@
enable_thinking: document.getElementById('agent-enable-thinking').checked,
thinking_prompt: document.getElementById('agent-thinking-prompt').value,
thinking_prefix: document.getElementById('agent-thinking-prefix').value,
thinking_suffix: document.getElementById('agent-thinking-suffix').value
thinking_suffix: document.getElementById('agent-thinking-suffix').value,
tools: tools // 工具列表
};
const res = await fetch(id ? `/api/v2/agents/${id}` : '/api/v2/agents', { method: id ? 'PUT' : 'POST', headers:{'Content-Type':'application/json'}, body: JSON.stringify(data) });
const result = await res.json();
@@ -482,6 +558,178 @@
document.getElementById('stat-agents').textContent = (agentsData.agents || []).length;
}
// ===== 工具管理 =====
async function loadTools() {
const res = await fetch('/api/v2/tools');
const data = await res.json();
const tools = data.tools || [];
const tbody = document.getElementById('tools-list');
if (tools.length === 0) {
tbody.innerHTML = '<tr><td colspan="8" class="text-center text-muted">暂无工具,点击添加按钮创建</td></tr>';
} else {
tbody.innerHTML = tools.map(t => {
const successRate = t.total_calls > 0 ? Math.round(t.success_calls / t.total_calls * 100) : 0;
return `
<tr>
<td>${t.name}</td>
<td><span class="badge bg-info">${t.tool_type}</span></td>
<td>${t.provider || '-'}</td>
<td>${t.total_calls}</td>
<td><span class="badge ${successRate >= 90 ? 'bg-success' : successRate >= 70 ? 'bg-warning' : 'bg-danger'}">${successRate}%</span></td>
<td>${t.is_default ? '<i class="ri-check-line text-success"></i>' : ''}</td>
<td>${t.is_active ? '<span class="badge bg-success">启用</span>' : '<span class="badge bg-secondary">禁用</span>'}</td>
<td>
<button class="btn btn-sm btn-outline-primary" onclick="editTool(${t.id})"><i class="ri-edit-line"></i></button>
<button class="btn btn-sm btn-outline-danger" onclick="deleteTool(${t.id})"><i class="ri-delete-bin-line"></i></button>
</td>
</tr>
`;
}).join('');
}
// 加载统计
loadToolStats();
}
async function loadToolStats() {
const res = await fetch('/api/v2/tools/stats?days=7');
const stats = await res.json();
const container = document.getElementById('tool-stats');
if (stats.total_calls === 0) {
container.innerHTML = '<p class="text-muted">暂无使用记录</p>';
return;
}
let html = `<p><strong>总调用:</strong> ${stats.total_calls} 次</p>`;
html += `<p><strong>成功率:</strong> ${Math.round(stats.success_rate)}%</p>`;
if (stats.by_type) {
html += '<hr><h6>按类型:</h6>';
for (const [type, data] of Object.entries(stats.by_type)) {
html += `<p><span class="badge bg-info">${type}</span> ${data.total}次 (成功${data.success})</p>`;
}
}
if (stats.recent_errors && stats.recent_errors.length > 0) {
html += '<hr><h6>最近错误:</h6>';
stats.recent_errors.slice(0, 3).forEach(e => {
html += `<p class="text-danger small">${e.tool}: ${e.error}</p>`;
});
}
container.innerHTML = html;
}
function showAddToolModal() {
document.getElementById('tool-id').value = '';
document.getElementById('tool-name').value = '';
document.getElementById('tool-type').value = 'search';
document.getElementById('tool-provider').value = 'tavily';
document.getElementById('tool-api-key').value = '';
document.getElementById('tool-config').value = '{"max_results": 5, "search_depth": "basic"}';
document.getElementById('tool-active').checked = true;
document.getElementById('tool-default').checked = false;
updateToolForm();
new bootstrap.Modal(document.getElementById('toolModal')).show();
}
function updateToolForm() {
const type = document.getElementById('tool-type').value;
const providerSelect = document.getElementById('tool-provider');
const configTextarea = document.getElementById('tool-config');
// 根据类型设置默认配置
const defaults = {
'search': { provider: 'tavily', config: '{"api_key": "", "max_results": 5, "search_depth": "basic"}' },
'calculator': { provider: 'wolfram', config: '{"api_key": ""}' },
'code_runner': { provider: '', config: '{"timeout": 30, "language": "python"}' },
'image_gen': { provider: 'openai', config: '{"api_key": "", "model": "dall-e-3"}' },
'translator': { provider: '', config: '{"source": "auto", "target": "zh"}' },
'weather': { provider: '', config: '{"api_key": ""}' },
'custom': { provider: '', config: '{}' }
};
const def = defaults[type] || defaults['custom'];
providerSelect.value = def.provider;
configTextarea.value = def.config;
}
async function editTool(id) {
const res = await fetch('/api/v2/tools');
const data = await res.json();
const tool = (data.tools || []).find(t => t.id === id);
if (!tool) return;
document.getElementById('tool-id').value = tool.id;
document.getElementById('tool-name').value = tool.name;
document.getElementById('tool-type').value = tool.tool_type;
document.getElementById('tool-provider').value = tool.provider || '';
document.getElementById('tool-config').value = JSON.stringify(tool.config || {});
document.getElementById('tool-active').checked = tool.is_active;
document.getElementById('tool-default').checked = tool.is_default;
// 提取 API Key
const apiKey = tool.config?.api_key || '';
document.getElementById('tool-api-key').value = apiKey;
new bootstrap.Modal(document.getElementById('toolModal')).show();
}
async function saveTool() {
const id = document.getElementById('tool-id').value;
// 解析配置 JSON
let config = {};
try {
config = JSON.parse(document.getElementById('tool-config').value);
} catch (e) {
alert('配置 JSON 格式错误');
return;
}
// 添加 API Key 到配置
const apiKey = document.getElementById('tool-api-key').value;
if (apiKey) config.api_key = apiKey;
const data = {
name: document.getElementById('tool-name').value,
tool_type: document.getElementById('tool-type').value,
provider: document.getElementById('tool-provider').value,
config: config,
is_active: document.getElementById('tool-active').checked,
is_default: document.getElementById('tool-default').checked
};
let res;
if (id) {
res = await fetch(`/api/v2/tools/${id}`, { method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(data) });
} else {
res = await fetch('/api/v2/tools', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(data) });
}
const result = await res.json();
if (result.success) {
bootstrap.Modal.getInstance(document.getElementById('toolModal')).hide();
loadTools();
alert('保存成功');
} else {
alert('保存失败: ' + result.message);
}
}
async function deleteTool(id) {
if (!confirm('确定删除此工具配置?')) return;
const res = await fetch(`/api/v2/tools/${id}`, { method: 'DELETE' });
const result = await res.json();
if (result.success) {
loadTools();
alert('删除成功');
} else {
alert('删除失败');
}
}
// ===== 初始化 =====
document.addEventListener('DOMContentLoaded', function() {
// 页面切换事件绑定

View File

@@ -32,6 +32,9 @@
.agent-selector select { padding: 8px 12px; border: 1px solid #ddd; border-radius: 8px; font-size: 14px; cursor: pointer; min-width: 150px; }
.ws-status { font-size: 12px; color: #666; background: #f0f0f0; padding: 4px 8px; border-radius: 4px; }
.ws-status.connected { color: #10a37f; }
.tool-toggle { display: flex; align-items: center; gap: 6px; font-size: 12px; }
.tool-toggle input { width: 14px; height: 14px; }
.tool-toggle label { cursor: pointer; }
.messages-container { flex: 1; overflow-y: auto; padding: 24px; }
.message { max-width: 800px; margin: 0 auto 24px; display: flex; gap: 16px; }
@@ -52,12 +55,30 @@
.user-message-text { background: #f0f0f0; padding: 12px 16px; border-radius: 12px; font-size: 15px; }
/* 消息操作按钮 */
.message-actions { display: flex; gap: 8px; margin-top: 8px; }
.message-actions { display: flex; gap: 8px; margin-top: 8px; align-items: center; flex-wrap: wrap; }
.action-btn { padding: 6px 12px; background: #f5f5f5; border: 1px solid #e0e0e0; border-radius: 6px; cursor: pointer; font-size: 12px; color: #666; display: flex; align-items: center; gap: 4px; transition: all 0.2s; }
.action-btn:hover { background: #e8e8e8; border-color: #ccc; }
.action-btn.copied { color: #10a37f; border-color: #10a37f; background: #e8f5e9; }
.action-btn.regenerate:hover { color: #667eea; border-color: #667eea; }
/* 版本切换控件 - 简洁版 */
.version-switcher { display: none; align-items: center; gap: 4px; margin-left: 4px; }
.version-switcher.show { display: flex; }
.version-arrow { width: 24px; height: 24px; border-radius: 4px; background: #f5f5f5; border: 1px solid #e0e0e0; cursor: pointer; display: flex; align-items: center; justify-content: center; color: #666; font-size: 14px; transition: all 0.2s; }
.version-arrow:hover { background: #e8e8e8; border-color: #667eea; color: #667eea; }
.version-arrow:disabled { opacity: 0.4; cursor: not-allowed; background: #f5f5f5; }
.version-label { font-size: 11px; color: #888; padding: 0 2px; }
/* 加载动画 */
.loading-indicator { display: flex; align-items: center; justify-content: center; gap: 8px; padding: 16px; color: #667eea; }
.loading-spinner { width: 20px; height: 20px; border: 2px solid #667eea; border-top-color: transparent; border-radius: 50%; animation: spin 1s linear infinite; }
@keyframes spin { to { transform: rotate(360deg); } }
/* 消息内容容器 */
.response-container { position: relative; }
.response-version { display: none; }
.response-version.active { display: block; }
/* 思考内容样式 */
.thinking-block { background: #f8f9fa; border-left: 3px solid #667eea; padding: 12px 16px; margin: 8px 0 16px 0; font-size: 14px; color: #666; border-radius: 4px; position: relative; }
.thinking-header { display: flex; align-items: center; justify-content: space-between; cursor: pointer; }
@@ -65,6 +86,17 @@
.thinking-toggle { font-size: 12px; color: #667eea; }
.thinking-content { margin-top: 12px; display: none; }
.thinking-content.expanded { display: block; }
.search-results-box { margin: 12px 0; padding: 10px 12px; background: linear-gradient(135deg, #f0f7ff 0%, #e8f4f8 100%); border-radius: 8px; border: 1px solid #d0e8f0; }
.search-results-header { display: flex; align-items: center; justify-content: space-between; cursor: pointer; }
.search-results-header h5 { margin: 0; font-size: 13px; color: #10a37f; display: flex; align-items: center; gap: 6px; }
.search-results-toggle { font-size: 12px; color: #666; }
.search-results-content { margin-top: 10px; display: none; }
.search-results-content.expanded { display: block; }
.search-result-item { margin-bottom: 8px; padding: 8px 10px; background: white; border-radius: 6px; border: 1px solid #eee; }
.search-result-item:last-child { margin-bottom: 0; }
.search-result-title { font-size: 13px; color: #10a37f; font-weight: 500; margin-bottom: 4px; }
.search-result-snippet { font-size: 12px; color: #666; line-height: 1.4; }
.search-result-url { font-size: 11px; color: #999; margin-top: 4px; overflow: hidden; text-overflow: ellipsis; }
/* Agent信息 */
.agent-info { font-size: 12px; color: #999; margin-top: 8px; }
@@ -138,6 +170,10 @@
<button class="send-btn" id="sendBtn" onclick="sendMessage()"><i class="ri-send-plane-fill"></i></button>
</div>
<div class="quick-phrases-bar">
<div class="tool-toggle">
<input type="checkbox" id="enableSearch" checked>
<label for="enableSearch"><i class="ri-search-line"></i> 搜索</label>
</div>
<button class="add-phrase-btn" onclick="showAddPhraseModal()"><i class="ri-add-line"></i> 添加</button>
<div class="phrase-list-wrapper" id="phraseListWrapper" onwheel="scrollPhrases(event)">
<div class="phrase-list" id="quickPhrasesList"></div>
@@ -171,6 +207,10 @@
let agents = [];
let quickPhrases = [];
let lastUserMessage = null; // 存储最后一条用户消息,用于重新生成
let isRegenerating = false; // 标志:正在重新生成,跳过用户消息显示
let regeneratingMessageId = null; // 正在重新生成的消息ID
let messageVersionCounter = 0; // 消息版本计数器
let messageVersions = {}; // 存储每个assistant消息的多个版本 { messageId: [{content, thinking}] }
document.addEventListener('DOMContentLoaded', () => {
loadAgents();
@@ -240,10 +280,24 @@
case 'stream_end': document.getElementById('sendBtn').disabled = false; break;
case 'user_message':
lastUserMessage = data.message.content; // 存储最后一条用户消息
appendMessage('user', data.message.content);
if (!isRegenerating) {
appendMessage('user', data.message.content);
}
// 注意:不要在这里重置 isRegenerating要等 assistant_message 处理后再重置
break;
case 'assistant_message':
if (isRegenerating && regeneratingMessageId) {
// 添加新版本到现有消息
addResponseVersion(regeneratingMessageId, data.message.content, data.message.thinking_content);
regeneratingMessageId = null;
isRegenerating = false; // 在这里重置标志
} else {
appendMessage('assistant', data.message.content, data.message.thinking_content, data.message.agent_name);
}
document.getElementById('sendBtn').disabled = false;
break;
case 'assistant_message': appendMessage('assistant', data.message.content, data.message.thinking_content, data.message.agent_name); document.getElementById('sendBtn').disabled = false; break;
case 'error': showError(data.message); document.getElementById('sendBtn').disabled = false; break;
case 'search_results': displaySearchResults(data.results, data.query); break;
}
}
@@ -256,6 +310,17 @@
div.className = `message ${role}`;
const avatar = role === 'user' ? '👤' : '🤖';
let messageId = null;
if (role === 'assistant') {
// 为assistant消息生成唯一ID
messageId = `msg_${++messageVersionCounter}`;
div.id = messageId;
div.dataset.messageId = messageId;
// 初始化版本存储
messageVersions[messageId] = [{ content, thinking }];
}
let html = `<div class="message-avatar">${avatar}</div><div class="message-body">`;
// 思考内容
@@ -269,10 +334,14 @@
</div>`;
}
// 消息内容
// 消息内容 - assistant使用版本容器
html += `<div class="message-content">`;
if (role === 'assistant') {
html += `<div class="markdown-body">${marked.parse(content)}</div>`;
html += `<div class="response-container" id="${messageId}_container">
<div class="response-version active" data-version="0">
<div class="markdown-body">${marked.parse(content)}</div>
</div>
</div>`;
} else {
html += `<div class="user-message-text">${escapeHtml(content)}</div>`;
}
@@ -283,7 +352,13 @@
html += `<div class="message-actions">`;
html += `<button class="action-btn" onclick="copyMessage(this)"><i class="ri-file-copy-line"></i> 复制</button>`;
if (role === 'assistant') {
html += `<button class="action-btn regenerate" onclick="regenerateMessage()"><i class="ri-refresh-line"></i> 重新生成</button>`;
html += `<button class="action-btn regenerate" onclick="regenerateMessage('${messageId}')"><i class="ri-refresh-line"></i> 重新生成</button>`;
// 版本切换控件 - 放在重新生成按钮后面
html += `<span class="version-switcher" id="${messageId}_version_switcher">`;
html += `<button class="version-arrow" onclick="switchVersion('${messageId}', -1)" data-dir="prev"><i class="ri-arrow-left-s-line"></i></button>`;
html += `<span class="version-label" id="${messageId}_version_label">1/1</span>`;
html += `<button class="version-arrow" onclick="switchVersion('${messageId}', 1)" data-dir="next"><i class="ri-arrow-right-s-line"></i></button>`;
html += `</span>`;
}
html += `</div>`;
@@ -298,6 +373,167 @@
container.scrollTop = container.scrollHeight;
}
// 添加新版本到现有消息
function addResponseVersion(messageId, content, thinking) {
const versions = messageVersions[messageId];
if (!versions) return;
// 添加新版本
versions.push({ content, thinking });
const newVersionIndex = versions.length - 1;
// 更新容器
const container = document.getElementById(`${messageId}_container`);
if (container) {
// 先移除loading如果有
hideLoadingIndicator(messageId);
// 添加思考块(如果有)
const messageBody = container.closest('.message-body');
if (thinking && messageBody) {
// 先移除旧的思考块
const oldThinking = messageBody.querySelector('.thinking-block');
if (oldThinking) oldThinking.remove();
// 添加新的思考块
const thinkingHtml = `<div class="thinking-block">
<div class="thinking-header" onclick="toggleThinking(this)">
<span><i class="ri-lightbulb-line"></i> 思考过程</span>
<span class="thinking-toggle">点击展开</span>
</div>
<div class="thinking-content">${escapeHtml(thinking)}</div>
</div>`;
messageBody.insertAdjacentHTML('afterbegin', thinkingHtml);
}
// 隐藏所有旧版本,显示最新版本
container.querySelectorAll('.response-version').forEach(v => v.classList.remove('active'));
const newVersionHtml = `<div class="response-version active" data-version="${newVersionIndex}">
<div class="markdown-body">${marked.parse(content)}</div>
</div>`;
container.insertAdjacentHTML('beforeend', newVersionHtml);
}
// 更新复制源
const messageDiv = document.getElementById(messageId);
if (messageDiv) {
const copySource = messageDiv.querySelector('.copy-source');
if (copySource) copySource.value = content;
}
// 显示版本切换控件并更新指示器
showVersionControls(messageId);
}
// 显示loading动画
function showLoadingIndicator(messageId) {
const container = document.getElementById(`${messageId}_container`);
if (container) {
// 隐藏所有版本
container.querySelectorAll('.response-version').forEach(v => v.classList.remove('active'));
// 显示loading
const loadingHtml = `<div class="loading-indicator" id="${messageId}_loading">
<div class="loading-spinner"></div>
<span>正在生成...</span>
</div>`;
container.insertAdjacentHTML('beforeend', loadingHtml);
}
}
// 隐藏loading动画
function hideLoadingIndicator(messageId) {
const loading = document.getElementById(`${messageId}_loading`);
if (loading) loading.remove();
}
// 显示版本切换控件
function showVersionControls(messageId) {
const switcher = document.getElementById(`${messageId}_version_switcher`);
const versions = messageVersions[messageId];
if (switcher && versions && versions.length > 1) {
switcher.classList.add('show');
// 新生成的版本是最后一个,切换到最新版本
const container = document.getElementById(`${messageId}_container`);
if (container) {
// 隐藏所有版本,显示最后一个
container.querySelectorAll('.response-version').forEach(v => v.classList.remove('active'));
const lastVersion = container.querySelector(`.response-version[data-version="${versions.length - 1}"]`);
if (lastVersion) lastVersion.classList.add('active');
}
updateVersionIndicator(messageId);
}
}
// 更新版本指示器
function updateVersionIndicator(messageId) {
const container = document.getElementById(`${messageId}_container`);
const label = document.getElementById(`${messageId}_version_label`);
const versions = messageVersions[messageId];
if (!container || !label || !versions) return;
// 找到当前激活的版本
const activeVersion = container.querySelector('.response-version.active');
const currentIndex = activeVersion ? parseInt(activeVersion.dataset.version) : 0;
label.textContent = `${currentIndex + 1}/${versions.length}`;
// 更新按钮状态
const switcher = document.getElementById(`${messageId}_version_switcher`);
if (switcher) {
const prevBtn = switcher.querySelector('[data-dir="prev"]');
const nextBtn = switcher.querySelector('[data-dir="next"]');
if (prevBtn) prevBtn.disabled = currentIndex === 0;
if (nextBtn) nextBtn.disabled = currentIndex === versions.length - 1;
}
}
// 切换版本
function switchVersion(messageId, direction) {
const container = document.getElementById(`${messageId}_container`);
const versions = messageVersions[messageId];
if (!container || !versions) return;
// 找到当前激活的版本
const activeVersion = container.querySelector('.response-version.active');
const currentIndex = activeVersion ? parseInt(activeVersion.dataset.version) : 0;
const newIndex = currentIndex + direction;
if (newIndex < 0 || newIndex >= versions.length) return;
// 切换显示
container.querySelectorAll('.response-version').forEach(v => {
v.classList.remove('active');
if (parseInt(v.dataset.version) === newIndex) v.classList.add('active');
});
// 更新复制源
const messageDiv = document.getElementById(messageId);
if (messageDiv) {
const copySource = messageDiv.querySelector('.copy-source');
if (copySource) copySource.value = versions[newIndex].content;
}
// 更新思考块
const messageBody = container.closest('.message-body');
if (messageBody && versions[newIndex].thinking) {
// 移除旧的思考块
const oldThinking = messageBody.querySelector('.thinking-block');
if (oldThinking) oldThinking.remove();
// 添加新版本的思考块
const thinkingHtml = `<div class="thinking-block">
<div class="thinking-header" onclick="toggleThinking(this)">
<span><i class="ri-lightbulb-line"></i> 思考过程</span>
<span class="thinking-toggle">点击展开</span>
</div>
<div class="thinking-content">${escapeHtml(versions[newIndex].thinking)}</div>
</div>`;
messageBody.insertAdjacentHTML('afterbegin', thinkingHtml);
}
updateVersionIndicator(messageId);
}
function toggleThinking(header) {
const block = header.parentElement;
const content = block.querySelector('.thinking-content');
@@ -313,37 +549,58 @@
function copyMessage(btn) {
// 从隐藏input获取原始内容
const hiddenInput = btn.closest('.message-body').querySelector('.copy-source');
const actionsDiv = btn.parentElement;
const messageBody = actionsDiv.parentElement;
const hiddenInput = messageBody.querySelector('.copy-source');
if (!hiddenInput) {
console.error('找不到复制源');
btn.innerHTML = '<i class="ri-error-line"></i> 失败';
return;
}
const text = hiddenInput.value;
navigator.clipboard.writeText(text).then(() => {
btn.innerHTML = '<i class="ri-check-line"></i> 已复制';
btn.classList.add('copied');
setTimeout(() => {
btn.innerHTML = '<i class="ri-file-copy-line"></i> 复制';
btn.classList.remove('copied');
}, 2000);
}).catch(err => {
// 使用传统复制方法(兼容性更好)
const textarea = document.createElement('textarea');
textarea.value = text;
textarea.style.position = 'fixed';
textarea.style.left = '-9999px';
textarea.style.top = '0';
document.body.appendChild(textarea);
textarea.focus();
textarea.select();
try {
const success = document.execCommand('copy');
if (success) {
btn.innerHTML = '<i class="ri-check-line"></i> 已复制';
btn.classList.add('copied');
setTimeout(() => {
btn.innerHTML = '<i class="ri-file-copy-line"></i> 复制';
btn.classList.remove('copied');
}, 2000);
} else {
btn.innerHTML = '<i class="ri-error-line"></i> 失败';
}
} catch (err) {
console.error('复制失败:', err);
btn.innerHTML = '<i class="ri-error-line"></i> 失败';
});
}
document.body.removeChild(textarea);
}
function regenerateMessage() {
function regenerateMessage(messageId) {
if (!lastUserMessage) {
alert('没有可重新生成的消息');
return;
}
// 移除最后一条助手消息
const container = document.getElementById('messagesContainer');
const messages = container.querySelectorAll('.message.assistant');
if (messages.length > 0) {
messages[messages.length - 1].remove();
}
// 设置重新生成标志,避免再次显示用户消息
isRegenerating = true;
regeneratingMessageId = messageId;
// 显示loading动画
showLoadingIndicator(messageId);
// 重新发送最后一条用户消息
document.getElementById('sendBtn').disabled = true;
if (ws?.readyState === WebSocket.OPEN) {
@@ -378,6 +635,66 @@
container.appendChild(div);
}
function displaySearchResults(results, query) {
if (!results || results.length === 0) return;
const container = document.getElementById('messagesContainer');
// 找到最后一条用户消息
const userMessages = container.querySelectorAll('.message.user');
const lastUserMsg = userMessages[userMessages.length - 1];
if (!lastUserMsg) {
// 没有用户消息,作为独立消息显示
const div = document.createElement('div');
div.className = 'message assistant';
div.innerHTML = `<div class="message-avatar">🔍</div><div class="message-body">${buildSearchResultsHtml(results, query)}</div>`;
container.appendChild(div);
} else {
// 在用户消息的 message-body 中追加搜索结果
const msgBody = lastUserMsg.querySelector('.message-body');
if (msgBody) {
msgBody.innerHTML += buildSearchResultsHtml(results, query);
}
}
// 滚动到底部
container.scrollTop = container.scrollHeight;
}
function buildSearchResultsHtml(results, query) {
const resultId = 'sr-' + Date.now();
let html = `<div class="search-results-box">
<div class="search-results-header" onclick="toggleSearchResults('${resultId}')">
<h5><i class="ri-search-line"></i> 搜索: ${escapeHtml(query.substring(0, 30))}${query.length > 30 ? '...' : ''} (${results.length}条结果)</h5>
<span class="search-results-toggle" id="${resultId}-toggle">展开 <i class="ri-arrow-down-s-line"></i></span>
</div>
<div class="search-results-content" id="${resultId}">`;
for (const r of results) {
html += `<div class="search-result-item">
<div class="search-result-title">${escapeHtml(r.title)}</div>
<div class="search-result-snippet">${escapeHtml(r.snippet)}</div>
<div class="search-result-url">${escapeHtml(r.url)}</div>
</div>`;
}
html += '</div></div>';
return html;
}
function toggleSearchResults(id) {
const content = document.getElementById(id);
const toggle = document.getElementById(id + '-toggle');
if (content.classList.contains('expanded')) {
content.classList.remove('expanded');
toggle.innerHTML = '展开 <i class="ri-arrow-down-s-line"></i>';
} else {
content.classList.add('expanded');
toggle.innerHTML = '收起 <i class="ri-arrow-up-s-line"></i>';
}
}
// 会话管理
async function loadConversations() {
const res = await fetch('/api/conversations');
@@ -406,6 +723,15 @@
}
async function createNewConversation() {
// 检查是否已经是新建对话状态无对话ID且无消息
const container = document.getElementById('messagesContainer');
const hasMessages = container.querySelectorAll('.message').length > 0;
// 如果当前没有对话ID且没有消息则不创建新对话
if (!currentConversationId && !hasMessages) {
return; // 已经是新建对话状态,无需创建
}
const res = await fetch('/api/conversations', { method: 'POST' });
const data = await res.json();
currentConversationId = data.id;
@@ -429,8 +755,20 @@
document.getElementById('sendBtn').disabled = true;
input.value = '';
input.style.height = 'auto';
// 获取工具禁用状态
const enableSearch = document.getElementById('enableSearch').checked;
const disabledTools = [];
if (!enableSearch) disabledTools.push('search');
if (ws?.readyState === WebSocket.OPEN) {
ws.send(JSON.stringify({ action: 'chat', message: msg, conversation_id: currentConversationId, agent_id: currentAgentId }));
ws.send(JSON.stringify({
action: 'chat',
message: msg,
conversation_id: currentConversationId,
agent_id: currentAgentId,
disabled_tools: disabledTools // 禁用的工具列表
}));
}
}