Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0086eaa1d6 | |||
| 8e17ef5e15 | |||
| 773fb89b01 |
147
backend/app.py
147
backend/app.py
@@ -166,6 +166,21 @@ def init_db():
|
||||
)
|
||||
''')
|
||||
|
||||
# 用户智能体配置表(我的智能体)
|
||||
cursor.execute('''
|
||||
CREATE TABLE IF NOT EXISTS user_agents (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
user_id INTEGER NOT NULL,
|
||||
agent_id TEXT NOT NULL,
|
||||
category TEXT NOT NULL,
|
||||
is_pinned INTEGER DEFAULT 0,
|
||||
is_favorite INTEGER DEFAULT 0,
|
||||
added_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
FOREIGN KEY (user_id) REFERENCES users(id),
|
||||
UNIQUE(user_id, agent_id)
|
||||
)
|
||||
''')
|
||||
|
||||
# 对话表(用户对话数据)
|
||||
cursor.execute('''
|
||||
CREATE TABLE IF NOT EXISTS conversations (
|
||||
@@ -707,6 +722,138 @@ def delete_user_conversation(user_id, conv_id):
|
||||
return jsonify({'success': True})
|
||||
|
||||
|
||||
# ==================== 用户智能体数据同步 ====================
|
||||
|
||||
@app.route('/api/user/<int:user_id>/agents', methods=['GET'])
|
||||
def get_user_agents(user_id):
|
||||
"""获取用户智能体配置"""
|
||||
conn = get_db()
|
||||
cursor = conn.cursor()
|
||||
cursor.execute('''
|
||||
SELECT agent_id, category, is_pinned, is_favorite, added_at
|
||||
FROM user_agents WHERE user_id = ?
|
||||
''', (user_id,))
|
||||
|
||||
agents_data = {
|
||||
'myAgents': {}, # {category: [agent_ids]}
|
||||
'favoriteAgents': [], # [agent_ids]
|
||||
'pinnedAgents': {} # {category: [agent_ids]}
|
||||
}
|
||||
|
||||
for row in cursor.fetchall():
|
||||
agent_id = row['agent_id']
|
||||
category = row['category']
|
||||
is_pinned = row['is_pinned']
|
||||
is_favorite = row['is_favorite']
|
||||
|
||||
# 添加到 myAgents
|
||||
if category not in agents_data['myAgents']:
|
||||
agents_data['myAgents'][category] = []
|
||||
agents_data['myAgents'][category].append(agent_id)
|
||||
|
||||
# 添加到 pinnedAgents
|
||||
if is_pinned:
|
||||
if category not in agents_data['pinnedAgents']:
|
||||
agents_data['pinnedAgents'][category] = []
|
||||
agents_data['pinnedAgents'][category].append(agent_id)
|
||||
|
||||
# 添加到 favoriteAgents
|
||||
if is_favorite:
|
||||
agents_data['favoriteAgents'].append(agent_id)
|
||||
|
||||
conn.close()
|
||||
return jsonify(agents_data)
|
||||
|
||||
|
||||
@app.route('/api/user/<int:user_id>/agents/<agent_id>', methods=['POST'])
|
||||
def add_user_agent(user_id, agent_id):
|
||||
"""添加智能体到用户列表"""
|
||||
data = request.json
|
||||
category = data.get('category', 'basic')
|
||||
is_pinned = data.get('is_pinned', 0)
|
||||
is_favorite = data.get('is_favorite', 0)
|
||||
|
||||
conn = get_db()
|
||||
cursor = conn.cursor()
|
||||
|
||||
try:
|
||||
cursor.execute('''
|
||||
INSERT INTO user_agents (user_id, agent_id, category, is_pinned, is_favorite)
|
||||
VALUES (?, ?, ?, ?, ?)
|
||||
''', (user_id, agent_id, category, is_pinned, is_favorite))
|
||||
conn.commit()
|
||||
conn.close()
|
||||
return jsonify({'success': True})
|
||||
except:
|
||||
# 已存在,更新
|
||||
cursor.execute('''
|
||||
UPDATE user_agents SET category=?, is_pinned=?, is_favorite=?
|
||||
WHERE user_id=? AND agent_id=?
|
||||
''', (category, is_pinned, is_favorite, user_id, agent_id))
|
||||
conn.commit()
|
||||
conn.close()
|
||||
return jsonify({'success': True})
|
||||
|
||||
|
||||
@app.route('/api/user/<int:user_id>/agents/<agent_id>', methods=['DELETE'])
|
||||
def remove_user_agent(user_id, agent_id):
|
||||
"""从用户列表移除智能体"""
|
||||
conn = get_db()
|
||||
cursor = conn.cursor()
|
||||
cursor.execute('DELETE FROM user_agents WHERE user_id=? AND agent_id=?', (user_id, agent_id))
|
||||
conn.commit()
|
||||
conn.close()
|
||||
return jsonify({'success': True})
|
||||
|
||||
|
||||
@app.route('/api/user/<int:user_id>/agents/<agent_id>/pin', methods=['POST'])
|
||||
def toggle_user_agent_pin(user_id, agent_id):
|
||||
"""切换智能体置顶状态"""
|
||||
data = request.json
|
||||
is_pinned = data.get('is_pinned', 1)
|
||||
category = data.get('category', 'basic')
|
||||
|
||||
conn = get_db()
|
||||
cursor = conn.cursor()
|
||||
|
||||
# 检查是否存在
|
||||
cursor.execute('SELECT id FROM user_agents WHERE user_id=? AND agent_id=?', (user_id, agent_id))
|
||||
if cursor.fetchone():
|
||||
cursor.execute('UPDATE user_agents SET is_pinned=? WHERE user_id=? AND agent_id=?',
|
||||
(is_pinned, user_id, agent_id))
|
||||
else:
|
||||
cursor.execute('INSERT INTO user_agents (user_id, agent_id, category, is_pinned) VALUES (?, ?, ?, ?)',
|
||||
(user_id, agent_id, category, is_pinned))
|
||||
|
||||
conn.commit()
|
||||
conn.close()
|
||||
return jsonify({'success': True})
|
||||
|
||||
|
||||
@app.route('/api/user/<int:user_id>/agents/<agent_id>/favorite', methods=['POST'])
|
||||
def toggle_user_agent_favorite(user_id, agent_id):
|
||||
"""切换智能体收藏状态"""
|
||||
data = request.json
|
||||
is_favorite = data.get('is_favorite', 1)
|
||||
category = data.get('category', 'basic')
|
||||
|
||||
conn = get_db()
|
||||
cursor = conn.cursor()
|
||||
|
||||
# 检查是否存在
|
||||
cursor.execute('SELECT id FROM user_agents WHERE user_id=? AND agent_id=?', (user_id, agent_id))
|
||||
if cursor.fetchone():
|
||||
cursor.execute('UPDATE user_agents SET is_favorite=? WHERE user_id=? AND agent_id=?',
|
||||
(is_favorite, user_id, agent_id))
|
||||
else:
|
||||
cursor.execute('INSERT INTO user_agents (user_id, agent_id, category, is_favorite) VALUES (?, ?, ?, ?)',
|
||||
(user_id, agent_id, category, is_favorite))
|
||||
|
||||
conn.commit()
|
||||
conn.close()
|
||||
return jsonify({'success': True})
|
||||
|
||||
|
||||
# ==================== 大模型接口管理 ====================
|
||||
|
||||
@app.route('/api/admin/llm', methods=['GET'])
|
||||
|
||||
235
www/app.js
235
www/app.js
@@ -294,14 +294,47 @@ let thinkingBtn = null;
|
||||
let searchBtn = null;
|
||||
|
||||
// 初始化
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
document.addEventListener('DOMContentLoaded', async () => {
|
||||
// 初始化 appContainer
|
||||
appContainer = document.getElementById('app');
|
||||
|
||||
// 从本地存储加载对话列表
|
||||
const saved = localStorage.getItem('conversations');
|
||||
if (saved) {
|
||||
conversations = JSON.parse(saved);
|
||||
// 加载用户登录状态(优先检查)
|
||||
const savedUser = localStorage.getItem('currentUser');
|
||||
if (savedUser) {
|
||||
currentUser = JSON.parse(savedUser);
|
||||
}
|
||||
|
||||
// 如果用户已登录且有ID,从 backend 加载对话数据
|
||||
if (currentUser && currentUser.id) {
|
||||
try {
|
||||
const res = await fetch(`/api/user/${currentUser.id}/conversations`);
|
||||
const data = await res.json();
|
||||
if (Array.isArray(data) && data.length > 0) {
|
||||
// 使用 backend 数据替换本地数据
|
||||
conversations = data;
|
||||
// 更新本地存储(离线可用)
|
||||
localStorage.setItem('conversations', JSON.stringify(conversations));
|
||||
} else {
|
||||
// backend 无数据,使用本地数据
|
||||
const saved = localStorage.getItem('conversations');
|
||||
if (saved) {
|
||||
conversations = JSON.parse(saved);
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
// backend 加载失败,使用本地数据
|
||||
console.error('加载 backend 对话失败:', e);
|
||||
const saved = localStorage.getItem('conversations');
|
||||
if (saved) {
|
||||
conversations = JSON.parse(saved);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// 未登录用户,从本地存储加载对话列表
|
||||
const saved = localStorage.getItem('conversations');
|
||||
if (saved) {
|
||||
conversations = JSON.parse(saved);
|
||||
}
|
||||
}
|
||||
|
||||
// 兼容旧数据格式(chat_history)
|
||||
@@ -323,7 +356,7 @@ document.addEventListener('DOMContentLoaded', () => {
|
||||
}
|
||||
}
|
||||
|
||||
// 加载用户智能体数据
|
||||
// 加载用户智能体数据(我的智能体)
|
||||
const savedMyAgents = localStorage.getItem('myAgents');
|
||||
if (savedMyAgents) {
|
||||
myAgents = JSON.parse(savedMyAgents);
|
||||
@@ -341,10 +374,26 @@ document.addEventListener('DOMContentLoaded', () => {
|
||||
pinnedAgents = JSON.parse(savedPinnedAgents);
|
||||
}
|
||||
|
||||
// 加载用户登录状态
|
||||
const savedUser = localStorage.getItem('currentUser');
|
||||
if (savedUser) {
|
||||
currentUser = JSON.parse(savedUser);
|
||||
// 如果用户已登录且有ID,从 backend 加载智能体配置
|
||||
if (currentUser && currentUser.id) {
|
||||
try {
|
||||
const res = await fetch(`/api/user/${currentUser.id}/agents`);
|
||||
const data = await res.json();
|
||||
if (data.myAgents) {
|
||||
myAgents = data.myAgents;
|
||||
localStorage.setItem('myAgents', JSON.stringify(myAgents));
|
||||
}
|
||||
if (data.favoriteAgents) {
|
||||
favoriteAgents = data.favoriteAgents;
|
||||
localStorage.setItem('favoriteAgents', JSON.stringify(favoriteAgents));
|
||||
}
|
||||
if (data.pinnedAgents) {
|
||||
pinnedAgents = data.pinnedAgents;
|
||||
localStorage.setItem('pinnedAgents', JSON.stringify(pinnedAgents));
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('加载智能体配置失败:', e);
|
||||
}
|
||||
}
|
||||
|
||||
// 加载每日使用统计
|
||||
@@ -1001,10 +1050,12 @@ function toggleAgentPin(agentId) {
|
||||
|
||||
const category = agent.category;
|
||||
|
||||
let is_pinned;
|
||||
if (pinnedAgents[category]?.includes(agentId)) {
|
||||
// 取消置顶
|
||||
pinnedAgents[category] = pinnedAgents[category].filter(id => id !== agentId);
|
||||
agent.is_pinned = false;
|
||||
is_pinned = 0;
|
||||
showToast('已取消置顶');
|
||||
} else {
|
||||
// 置顶
|
||||
@@ -1013,11 +1064,21 @@ function toggleAgentPin(agentId) {
|
||||
}
|
||||
pinnedAgents[category].push(agentId);
|
||||
agent.is_pinned = true;
|
||||
is_pinned = 1;
|
||||
showToast('已置顶');
|
||||
}
|
||||
|
||||
savePinnedAgents();
|
||||
saveMyAgents(); // 更新显示
|
||||
|
||||
// 同步到 backend
|
||||
if (currentUser && currentUser.id) {
|
||||
fetch(`/api/user/${currentUser.id}/agents/${agentId}/pin`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ is_pinned, category })
|
||||
}).catch(e => console.error('同步置顶失败:', e));
|
||||
}
|
||||
}
|
||||
|
||||
// 收藏/取消收藏智能体
|
||||
@@ -1025,20 +1086,32 @@ function toggleAgentFavorite(agentId) {
|
||||
const agent = agents.find(a => a.id === agentId);
|
||||
if (!agent) return;
|
||||
|
||||
let is_favorite;
|
||||
if (favoriteAgents.includes(agentId)) {
|
||||
// 取消收藏
|
||||
favoriteAgents = favoriteAgents.filter(id => id !== agentId);
|
||||
agent.is_favorite = false;
|
||||
is_favorite = 0;
|
||||
showToast('已取消收藏');
|
||||
} else {
|
||||
// 收藏
|
||||
favoriteAgents.push(agentId);
|
||||
agent.is_favorite = true;
|
||||
is_favorite = 1;
|
||||
showToast('已收藏');
|
||||
}
|
||||
|
||||
saveFavoriteAgents();
|
||||
saveMyAgents(); // 更新显示
|
||||
|
||||
// 同步到 backend
|
||||
if (currentUser && currentUser.id) {
|
||||
fetch(`/api/user/${currentUser.id}/agents/${agentId}/favorite`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ is_favorite, category: agent.category })
|
||||
}).catch(e => console.error('同步收藏失败:', e));
|
||||
}
|
||||
}
|
||||
|
||||
// 从用户智能体列表移除
|
||||
@@ -1067,6 +1140,13 @@ function removeAgentFromMyAgents(agentId) {
|
||||
savePinnedAgents();
|
||||
saveFavoriteAgents();
|
||||
showToast('已移除');
|
||||
|
||||
// 同步到 backend
|
||||
if (currentUser && currentUser.id) {
|
||||
fetch(`/api/user/${currentUser.id}/agents/${agentId}`, {
|
||||
method: 'DELETE'
|
||||
}).catch(e => console.error('同步移除失败:', e));
|
||||
}
|
||||
}
|
||||
|
||||
// ==================== 智能体发现页面 ====================
|
||||
@@ -1303,6 +1383,15 @@ function addAgentToMyAgents(agentId) {
|
||||
|
||||
saveMyAgents();
|
||||
showToast(`已添加 ${agent.name}`);
|
||||
|
||||
// 同步到 backend
|
||||
if (currentUser && currentUser.id) {
|
||||
fetch(`/api/user/${currentUser.id}/agents/${agentId}`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ category: agent.category })
|
||||
}).catch(e => console.error('同步添加智能体失败:', e));
|
||||
}
|
||||
}
|
||||
|
||||
// 从发现页面收藏智能体
|
||||
@@ -2502,6 +2591,9 @@ function handleLogin() {
|
||||
email: data.user.email || '',
|
||||
avatar: data.user.avatar || '👤',
|
||||
signature: data.user.signature || '',
|
||||
gender: data.user.gender || '',
|
||||
age: data.user.age || '',
|
||||
region: data.user.region || '',
|
||||
registeredAt: Date.now()
|
||||
};
|
||||
saveCurrentUser();
|
||||
@@ -2823,7 +2915,7 @@ function showAgentHistoryPage() {
|
||||
}
|
||||
|
||||
// 打开智能体对话
|
||||
function openAgent(agentId) {
|
||||
async function openAgent(agentId) {
|
||||
currentAgent = systemAgents.find(a => a.id === agentId);
|
||||
if (!currentAgent) return;
|
||||
|
||||
@@ -2844,9 +2936,31 @@ function openAgent(agentId) {
|
||||
setAgentUsed(agentId);
|
||||
}
|
||||
|
||||
// 如果用户已登录,先在 backend 创建对话
|
||||
let backendId = null;
|
||||
if (currentUser && currentUser.id) {
|
||||
try {
|
||||
const res = await fetch(`/api/user/${currentUser.id}/conversations`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
title: currentAgent.name,
|
||||
messages: [],
|
||||
agentId: agentId
|
||||
})
|
||||
});
|
||||
const data = await res.json();
|
||||
if (data.success && data.id) {
|
||||
backendId = data.id;
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('创建智能体对话失败:', e);
|
||||
}
|
||||
}
|
||||
|
||||
// 创建新对话并设置智能体
|
||||
const newConv = {
|
||||
id: Date.now().toString(),
|
||||
id: backendId || Date.now().toString(),
|
||||
title: currentAgent.name,
|
||||
messages: [],
|
||||
agentId: agentId,
|
||||
@@ -3297,15 +3411,33 @@ function togglePinConversation(convId) {
|
||||
}
|
||||
|
||||
// 创建新对话
|
||||
function createNewConversation() {
|
||||
async function createNewConversation() {
|
||||
// 检查未登录用户的对话限制
|
||||
if (!currentUser && !canCreateNewChat()) {
|
||||
showLimitDialog('chat_session');
|
||||
return;
|
||||
}
|
||||
|
||||
// 如果用户已登录,先在 backend 创建对话
|
||||
let backendId = null;
|
||||
if (currentUser && currentUser.id) {
|
||||
try {
|
||||
const res = await fetch(`/api/user/${currentUser.id}/conversations`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ title: '新对话', messages: [] })
|
||||
});
|
||||
const data = await res.json();
|
||||
if (data.success && data.id) {
|
||||
backendId = data.id;
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('创建对话失败:', e);
|
||||
}
|
||||
}
|
||||
|
||||
const newConv = {
|
||||
id: Date.now().toString(),
|
||||
id: backendId || Date.now().toString(), // 使用 backend ID 或本地 ID
|
||||
title: '新对话',
|
||||
messages: [],
|
||||
createdAt: Date.now(),
|
||||
@@ -3622,6 +3754,9 @@ async function sendMessage() {
|
||||
currentConversation.updatedAt = Date.now();
|
||||
saveConversations();
|
||||
|
||||
// 同步当前对话到 backend(用户已登录)
|
||||
syncConversationToBackend(currentConversation);
|
||||
|
||||
// 增加消息计数(未登录用户)
|
||||
if (!currentUser) {
|
||||
if (currentConversation.agentId) {
|
||||
@@ -3742,6 +3877,7 @@ async function streamGenerate(userMsgIndex) {
|
||||
contentEl.innerHTML = renderMarkdown(currentConversation.messages[aiMessageIndex].content);
|
||||
currentConversation.updatedAt = Date.now();
|
||||
saveConversations();
|
||||
syncConversationToBackend(currentConversation);
|
||||
renderMessages();
|
||||
};
|
||||
}
|
||||
@@ -3818,6 +3954,7 @@ async function streamGenerate(userMsgIndex) {
|
||||
hideStopGenerateBtn();
|
||||
currentConversation.updatedAt = Date.now();
|
||||
saveConversations();
|
||||
syncConversationToBackend(currentConversation);
|
||||
renderMessages();
|
||||
|
||||
// 自动总结标题:第一次对话和每隔5次对话
|
||||
@@ -4226,52 +4363,46 @@ function setupScrollListener() {
|
||||
function saveConversations() {
|
||||
// 保存到本地存储(离线可用)
|
||||
localStorage.setItem('conversations', JSON.stringify(conversations));
|
||||
|
||||
// 如果用户已登录,同步到 backend
|
||||
if (currentUser && currentUser.id) {
|
||||
syncConversationsToBackend();
|
||||
}
|
||||
}
|
||||
|
||||
// 同步对话数据到 backend
|
||||
async function syncConversationsToBackend() {
|
||||
// 同步单个对话到 backend(新创建或更新)
|
||||
async function syncConversationToBackend(conv) {
|
||||
if (!currentUser || !currentUser.id) return;
|
||||
|
||||
const convId = parseInt(conv.id);
|
||||
|
||||
try {
|
||||
// 批量同步所有对话
|
||||
for (const conv of conversations) {
|
||||
const convId = parseInt(conv.id);
|
||||
if (convId > 0) {
|
||||
// 更新现有对话
|
||||
await fetch(`/api/user/${currentUser.id}/conversations/${convId}`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
title: conv.title,
|
||||
messages: conv.messages,
|
||||
agentId: conv.agentId
|
||||
})
|
||||
});
|
||||
} else {
|
||||
// 新对话,需要创建
|
||||
const res = await fetch(`/api/user/${currentUser.id}/conversations`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
title: conv.title,
|
||||
messages: conv.messages,
|
||||
agentId: conv.agentId
|
||||
})
|
||||
});
|
||||
const data = await res.json();
|
||||
if (data.success && data.id) {
|
||||
// 更新本地ID为backend ID
|
||||
conv.id = data.id;
|
||||
}
|
||||
if (convId > 0 && convId < 1e12) {
|
||||
// 已有 backend ID,更新对话
|
||||
await fetch(`/api/user/${currentUser.id}/conversations/${convId}`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
title: conv.title,
|
||||
messages: conv.messages,
|
||||
agentId: conv.agentId
|
||||
})
|
||||
});
|
||||
} else {
|
||||
// 新对话(本地 ID 是时间戳),创建
|
||||
const res = await fetch(`/api/user/${currentUser.id}/conversations`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
title: conv.title,
|
||||
messages: conv.messages,
|
||||
agentId: conv.agentId
|
||||
})
|
||||
});
|
||||
const data = await res.json();
|
||||
if (data.success && data.id) {
|
||||
// 更新本地 ID 为 backend ID
|
||||
conv.id = data.id;
|
||||
// 更新 localStorage
|
||||
localStorage.setItem('conversations', JSON.stringify(conversations));
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
// 同步失败,静默处理(下次登录时会重新加载)
|
||||
console.error('同步对话失败:', e);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user