feat: v3.0 Function Calling模式 - LLM自主调用工具
This commit is contained in:
@@ -58,8 +58,8 @@
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<table class="table">
|
||||
<thead><tr><th>名称</th><th>API地址</th><th>默认模型</th><th>思考</th><th>视觉</th><th>状态</th><th>操作</th></tr></thead>
|
||||
<tbody id="providers-list"><tr><td colspan="7" class="text-center">加载中...</td></tr></tbody>
|
||||
<thead><tr><th>名称</th><th>API地址</th><th>默认模型</th><th>思考</th><th>视觉</th><th>FC</th><th>状态</th><th>操作</th></tr></thead>
|
||||
<tbody id="providers-list"><tr><td colspan="8" class="text-center">加载中...</td></tr></tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
@@ -164,6 +164,8 @@
|
||||
<div class="thinking-config"><div class="row"><div class="col-md-6 form-check"><input type="checkbox" class="form-check-input" id="provider-supports-thinking"><label class="form-check-label">支持原生思考</label></div><div class="col-md-6"><label class="form-label">思考模型名</label><input type="text" class="form-control" id="provider-thinking-model"></div></div></div>
|
||||
<hr><h6>视觉能力</h6>
|
||||
<div class="thinking-config"><div class="row"><div class="col-md-6 form-check"><input type="checkbox" class="form-check-input" id="provider-supports-vision"><label class="form-check-label">支持图片理解</label></div><div class="col-md-6"><label class="form-label">视觉模型名</label><input type="text" class="form-control" id="provider-vision-model" placeholder="留空则使用默认模型"></div></div><small class="text-muted mt-2 d-block">启用后可上传图片让AI识别分析内容</small></div>
|
||||
<hr><h6>Function Calling</h6>
|
||||
<div class="thinking-config"><div class="form-check"><input type="checkbox" class="form-check-input" id="provider-supports-function-calling"><label class="form-check-label">支持函数调用</label></div><small class="text-muted mt-2 d-block">启用后LLM可自主决定何时调用工具(更智能)</small></div>
|
||||
<div class="mt-3"><button type="button" class="btn btn-outline-primary" onclick="fetchProviderModels()"><i class="ri-refresh-line"></i> 获取模型</button><button type="button" class="btn btn-outline-secondary" onclick="testProviderConnection()"><i class="ri-link"></i> 测试连接</button></div>
|
||||
<div class="mt-2" id="provider-models-preview"></div><div class="mt-2" id="provider-test-result"></div>
|
||||
</form></div>
|
||||
@@ -331,6 +333,7 @@
|
||||
<td><strong>${p.name}</strong></td><td><small>${p.api_base||'-'}</small></td><td>${p.default_model||'auto'}</td>
|
||||
<td>${p.supports_thinking?'<span class="badge bg-success">支持</span>':'<span class="badge bg-secondary">不支持</span>'}</td>
|
||||
<td>${p.supports_vision?'<span class="badge bg-info">支持</span>':'<span class="badge bg-secondary">不支持</span>'}</td>
|
||||
<td>${p.supports_function_calling?'<span class="badge bg-primary">支持</span>':'<span class="badge bg-secondary">不支持</span>'}</td>
|
||||
<td>${p.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="editProvider(${p.id})"><i class="ri-edit-line"></i></button>
|
||||
<button class="btn btn-sm btn-outline-danger" onclick="deleteProvider(${p.id},'${p.name}')"><i class="ri-delete-bin-line"></i></button></td>
|
||||
@@ -349,6 +352,7 @@
|
||||
document.getElementById('provider-active').checked = true;
|
||||
document.getElementById('provider-supports-thinking').checked = false;
|
||||
document.getElementById('provider-supports-vision').checked = false;
|
||||
document.getElementById('provider-supports-function-calling').checked = false;
|
||||
document.getElementById('provider-models-preview').innerHTML = '';
|
||||
document.getElementById('provider-test-result').innerHTML = '';
|
||||
new bootstrap.Modal(document.getElementById('providerModal')).show();
|
||||
@@ -371,6 +375,7 @@
|
||||
document.getElementById('provider-thinking-model').value = p.thinking_model || '';
|
||||
document.getElementById('provider-supports-vision').checked = p.supports_vision;
|
||||
document.getElementById('provider-vision-model').value = p.vision_model || '';
|
||||
document.getElementById('provider-supports-function-calling').checked = p.supports_function_calling;
|
||||
new bootstrap.Modal(document.getElementById('providerModal')).show();
|
||||
}
|
||||
|
||||
@@ -389,7 +394,8 @@
|
||||
supports_thinking: document.getElementById('provider-supports-thinking').checked,
|
||||
thinking_model: document.getElementById('provider-thinking-model').value,
|
||||
supports_vision: document.getElementById('provider-supports-vision').checked,
|
||||
vision_model: document.getElementById('provider-vision-model').value
|
||||
vision_model: document.getElementById('provider-vision-model').value,
|
||||
supports_function_calling: document.getElementById('provider-supports-function-calling').checked
|
||||
};
|
||||
const res = await fetch(id ? `/api/v2/providers/${id}` : '/api/v2/providers', { method: id ? 'PUT' : 'POST', headers: {'Content-Type':'application/json'}, body: JSON.stringify(data) });
|
||||
const result = await res.json();
|
||||
|
||||
@@ -131,39 +131,9 @@
|
||||
/* 快捷语句 - 横向扁平 */
|
||||
.quick-phrases-bar { display: flex; align-items: center; gap: 8px; margin-top: 12px; position: relative; }
|
||||
|
||||
/* 工具折叠面板 - 放在输入行内 */
|
||||
.tools-collapsible { position: relative; }
|
||||
.tools-toggle-btn {
|
||||
width: 40px; height: 40px; background: #f5f5f5; border: 1px solid #e0e0e0; border-radius: 8px;
|
||||
cursor: pointer; display: flex; align-items: center; justify-content: center; font-size: 16px; color: #666;
|
||||
transition: all 0.2s; position: relative;
|
||||
}
|
||||
.tools-toggle-btn:hover { background: #e8e8e8; border-color: #10a37f; color: #10a37f; }
|
||||
.tools-toggle-btn.active { background: #e8f5e9; border-color: #10a37f; color: #10a37f; }
|
||||
.tools-badge {
|
||||
position: absolute; top: -4px; right: -4px;
|
||||
background: #10a37f; color: white; font-size: 10px; padding: 1px 4px; border-radius: 10px;
|
||||
min-width: 14px; text-align: center;
|
||||
}
|
||||
.tools-panel {
|
||||
display: none; position: absolute; bottom: 100%; left: 0; margin-bottom: 8px;
|
||||
background: white; border: 1px solid #e0e0e0; border-radius: 12px;
|
||||
box-shadow: 0 4px 20px rgba(0,0,0,0.15); min-width: 180px; z-index: 100;
|
||||
}
|
||||
.tools-panel.show { display: block; }
|
||||
.tools-panel-header {
|
||||
display: flex; justify-content: space-between; align-items: center;
|
||||
padding: 10px 14px; border-bottom: 1px solid #eee; font-weight: 500; color: #333; font-size: 13px;
|
||||
}
|
||||
.tools-panel-header button { background: none; border: none; color: #999; cursor: pointer; padding: 2px; }
|
||||
.tools-panel-header button:hover { color: #666; }
|
||||
.tools-panel-content { padding: 10px 14px; max-height: 280px; overflow-y: auto; }
|
||||
.tool-item { display: flex; align-items: center; gap: 6px; padding: 6px 0; }
|
||||
.tool-item input { width: 14px; height: 14px; }
|
||||
.tool-item label { cursor: pointer; font-size: 13px; color: #333; display: flex; align-items: center; gap: 4px; }
|
||||
.tool-item label i { color: #10a37f; font-size: 14px; }
|
||||
.tool-item.disabled { opacity: 0.5; }
|
||||
.tool-item.disabled label { color: #999; cursor: not-allowed; }
|
||||
/* 工具调用记录显示 */
|
||||
.tool-call-record { margin-top: 8px; padding: 8px 12px; background: #e8f5e9; border-radius: 8px; font-size: 12px; color: #10a37f; }
|
||||
.tool-call-record i { margin-right: 4px; }
|
||||
.add-phrase-btn { padding: 6px 10px; background: #f0f0f0; border: 1px solid #ddd; border-radius: 6px; cursor: pointer; font-size: 12px; color: #666; white-space: nowrap; flex-shrink: 0; }
|
||||
.add-phrase-btn:hover { background: #e8e8e8; }
|
||||
.phrase-list-wrapper { flex: 1; overflow-x: auto; overflow-y: hidden; scrollbar-width: thin; }
|
||||
@@ -212,7 +182,7 @@
|
||||
|
||||
<div class="main-content">
|
||||
<div class="chat-header">
|
||||
<h1>AI 对话 v2.0</h1>
|
||||
<h1>AI 对话 v3.0</h1>
|
||||
<div class="header-controls">
|
||||
<div class="agent-selector">
|
||||
<select id="agentSelect" onchange="switchAgent()"><option value="">加载中...</option></select>
|
||||
@@ -230,20 +200,6 @@
|
||||
<div class="input-row">
|
||||
<input type="file" id="fileInput" multiple accept="image/*,.pdf,.txt,.md,.json,.csv,.doc,.docx" style="display:none" onchange="handleFileUpload(event)">
|
||||
<button class="upload-btn" onclick="document.getElementById('fileInput').click()" title="上传文件"><i class="ri-attachment-2"></i></button>
|
||||
<!-- 工具按钮放附件右边 -->
|
||||
<div class="tools-collapsible">
|
||||
<button class="tools-toggle-btn" onclick="toggleToolsPanel()" title="工具设置">
|
||||
<i class="ri-tools-line"></i>
|
||||
<span class="tools-badge" id="toolsBadge" style="display:none;">0</span>
|
||||
</button>
|
||||
<div class="tools-panel" id="toolsPanel">
|
||||
<div class="tools-panel-header">
|
||||
<span>工具设置</span>
|
||||
<button onclick="toggleToolsPanel()"><i class="ri-close-line"></i></button>
|
||||
</div>
|
||||
<div class="tools-panel-content" id="toolsPanelContent"></div>
|
||||
</div>
|
||||
</div>
|
||||
<textarea id="messageInput" placeholder="输入消息..." rows="1"></textarea>
|
||||
<button class="send-btn" id="sendBtn" onclick="sendMessage()"><i class="ri-send-plane-fill"></i></button>
|
||||
</div>
|
||||
@@ -324,7 +280,6 @@
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
loadProviders(); // 加载大模型池
|
||||
loadToolsData(); // 加载工具列表
|
||||
loadAgents();
|
||||
loadQuickPhrases();
|
||||
connectWebSocket();
|
||||
@@ -359,117 +314,6 @@
|
||||
return agentTools.includes(toolType);
|
||||
}
|
||||
|
||||
// 获取当前Agent不支持的工具列表(用户已启用但Agent不支持)
|
||||
function getUnsupportedTools() {
|
||||
const unsupported = [];
|
||||
// 检查所有工具checkbox(排除disabled的)
|
||||
const toolCheckboxes = document.querySelectorAll('.tool-checkbox:not([disabled])');
|
||||
toolCheckboxes.forEach(cb => {
|
||||
if (cb.checked) {
|
||||
// 检查Agent是否支持
|
||||
if (!checkAgentToolSupport(cb.dataset.toolType)) {
|
||||
// 获取工具显示名称
|
||||
const label = cb.closest('.tool-item')?.querySelector('label')?.textContent?.trim() || cb.dataset.toolType;
|
||||
unsupported.push(label);
|
||||
}
|
||||
}
|
||||
});
|
||||
return unsupported;
|
||||
}
|
||||
|
||||
// 渲染工具选择区域(根据系统工具列表)
|
||||
function renderToolToggles() {
|
||||
const container = document.getElementById('toolsPanelContent');
|
||||
if (!container || toolsData.length === 0) return;
|
||||
|
||||
// 获取当前Agent支持的工具
|
||||
const agent = agents.find(a => a.id === currentAgentId);
|
||||
const agentTools = agent?.tools || [];
|
||||
|
||||
// 渲染工具checkbox列表
|
||||
let html = '';
|
||||
toolsData.filter(t => t.is_active).forEach(t => {
|
||||
const toolType = t.tool_type || 'unknown';
|
||||
const isSupported = agentTools.includes(toolType);
|
||||
const icon = getToolIconFrontend(toolType);
|
||||
const disabledClass = isSupported ? '' : 'disabled';
|
||||
html += `<div class="tool-item ${disabledClass}">
|
||||
<input type="checkbox" class="tool-checkbox" id="tool-${toolType}" data-tool-type="${toolType}" ${isSupported ? 'checked' : ''} ${!isSupported ? 'disabled' : ''} onchange="showToolWarning()">
|
||||
<label for="tool-${toolType}"><i class="${icon}"></i> ${t.name}</label>
|
||||
</div>`;
|
||||
});
|
||||
|
||||
container.innerHTML = html || '<div class="text-muted" style="padding:8px;">暂无可用工具</div>';
|
||||
|
||||
// 更新工具数量badge
|
||||
updateToolsBadge();
|
||||
}
|
||||
|
||||
// 更新工具数量badge
|
||||
function updateToolsBadge() {
|
||||
const badge = document.getElementById('toolsBadge');
|
||||
const selectedCount = document.querySelectorAll('.tool-checkbox:checked').length;
|
||||
if (selectedCount > 0) {
|
||||
badge.textContent = selectedCount;
|
||||
badge.style.display = 'inline';
|
||||
} else {
|
||||
badge.style.display = 'none';
|
||||
}
|
||||
}
|
||||
|
||||
// 切换工具面板显示
|
||||
function toggleToolsPanel() {
|
||||
const panel = document.getElementById('toolsPanel');
|
||||
const btn = document.querySelector('.tools-toggle-btn');
|
||||
panel.classList.toggle('show');
|
||||
btn.classList.toggle('active');
|
||||
}
|
||||
|
||||
// 前端工具图标
|
||||
function getToolIconFrontend(toolType) {
|
||||
const icons = {
|
||||
'search': 'ri-search-line',
|
||||
'calculator': 'ri-calculator-line',
|
||||
'code': 'ri-code-line',
|
||||
'image': 'ri-image-line',
|
||||
'web': 'ri-global-line'
|
||||
};
|
||||
return icons[toolType] || 'ri-tools-line';
|
||||
}
|
||||
|
||||
// 加载工具列表
|
||||
let toolsData = [];
|
||||
async function loadToolsData() {
|
||||
try {
|
||||
const res = await fetch('/api/v2/tools');
|
||||
const data = await res.json();
|
||||
toolsData = data.tools || [];
|
||||
renderToolToggles();
|
||||
} catch (e) { console.error('加载工具列表失败:', e); }
|
||||
}
|
||||
|
||||
// 显示工具不支持提示
|
||||
function showToolWarning() {
|
||||
updateToolsBadge(); // 更新badge数量
|
||||
|
||||
const unsupported = getUnsupportedTools();
|
||||
const warningDiv = document.getElementById('tool-warning-tip');
|
||||
|
||||
if (unsupported.length > 0) {
|
||||
const agent = agents.find(a => a.id === currentAgentId);
|
||||
const agentName = agent?.display_name || agent?.name || '当前Agent';
|
||||
const msg = `<i class="ri-alert-line"></i> <strong>${agentName}</strong> 不支持 <strong>${unsupported.join('、')}</strong> 工具,请关闭或切换Agent`;
|
||||
|
||||
warningDiv.innerHTML = msg;
|
||||
warningDiv.style.display = 'block';
|
||||
// 禁用发送按钮
|
||||
document.getElementById('sendBtn').disabled = true;
|
||||
} else {
|
||||
warningDiv.style.display = 'none';
|
||||
document.getElementById('sendBtn').disabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
// 加载Agent
|
||||
async function loadAgents() {
|
||||
try {
|
||||
@@ -479,10 +323,6 @@
|
||||
const defaultAgent = agents.find(a => a.is_default) || agents[0];
|
||||
if (defaultAgent) currentAgentId = defaultAgent.id;
|
||||
renderAgentSelect();
|
||||
// 加载后检查工具支持
|
||||
showToolWarning();
|
||||
// 渲染工具选择区域
|
||||
renderToolToggles();
|
||||
} catch (e) { console.error('加载Agent失败:', e); }
|
||||
}
|
||||
|
||||
@@ -505,8 +345,6 @@
|
||||
if (ws?.readyState === WebSocket.OPEN) ws.send(JSON.stringify({ action: 'switch_agent', agent_id: currentAgentId }));
|
||||
await createNewConversation();
|
||||
showAgentSwitchNotice();
|
||||
// 切换Agent后检查工具支持
|
||||
showToolWarning();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1208,16 +1046,6 @@
|
||||
return;
|
||||
}
|
||||
|
||||
// 检查工具支持
|
||||
const unsupported = getUnsupportedTools();
|
||||
if (unsupported.length > 0) {
|
||||
const agent = agents.find(a => a.id === currentAgentId);
|
||||
const agentName = agent?.display_name || agent?.name || '当前Agent';
|
||||
alert(`⚠️ ${agentName} 不支持 ${unsupported.join('、')} 工具\n\n请关闭不支持的工具,或切换到支持该工具的Agent。`);
|
||||
document.getElementById('sendBtn').disabled = false;
|
||||
return;
|
||||
}
|
||||
|
||||
document.getElementById('sendBtn').disabled = true;
|
||||
input.value = '';
|
||||
input.style.height = 'auto';
|
||||
@@ -1230,13 +1058,7 @@
|
||||
pendingFiles = [];
|
||||
document.getElementById('filePreviewArea').innerHTML = '';
|
||||
|
||||
// 获取禁用的工具列表(所有系统工具 - 用户选中的工具)
|
||||
const disabledTools = [];
|
||||
const allToolTypes = toolsData.filter(t => t.is_active).map(t => t.tool_type);
|
||||
const selectedTools = Array.from(document.querySelectorAll('.tool-checkbox:checked')).map(cb => cb.dataset.toolType);
|
||||
allToolTypes.forEach(t => {
|
||||
if (!selectedTools.includes(t)) disabledTools.push(t);
|
||||
});
|
||||
// v3.0: Function Calling模式,不再需要 disabled_tools
|
||||
|
||||
// 发送消息(包含文件)
|
||||
if (ws?.readyState === WebSocket.OPEN) {
|
||||
@@ -1245,7 +1067,6 @@
|
||||
message: msg,
|
||||
conversation_id: currentConversationId,
|
||||
agent_id: currentAgentId,
|
||||
disabled_tools: disabledTools,
|
||||
files: lastSentFiles || [] // 发送的文件列表
|
||||
}));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user