dvc890 commited on
Commit
e8bfcb9
·
verified ·
1 Parent(s): c1ea969

Upload 63 files

Browse files
Files changed (4) hide show
  1. ai-routes.js +10 -5
  2. components/ai/AdminPanel.tsx +66 -5
  3. models.js +7 -1
  4. types.ts +6 -0
ai-routes.js CHANGED
@@ -74,7 +74,7 @@ function convertGeminiToOpenAI(baseParams) {
74
 
75
  const PROVIDERS = { GEMINI: 'GEMINI', OPENROUTER: 'OPENROUTER', GEMMA: 'GEMMA', DOUBAO: 'DOUBAO' };
76
  const DEFAULT_OPENROUTER_MODELS = ['qwen/qwen3-coder:free', 'openai/gpt-oss-120b:free', 'qwen/qwen3-235b-a22b:free', 'tngtech/deepseek-r1t-chimera:free'];
77
- const DEFAULT_DOUBAO_MODEL = 'doubao-seed-1-6-251015';
78
 
79
  // Runtime override logic
80
  let runtimeProviderOrder = [];
@@ -173,7 +173,7 @@ async function getDoubaoContextId(apiKey, model, systemMessage, userId) {
173
  return null;
174
  }
175
 
176
- async function streamDoubao(baseParams, res, userId, mode = 'chat') {
177
  const keys = await getKeyPool('doubao');
178
  if (keys.length === 0) throw new Error("No Doubao API keys configured");
179
 
@@ -181,7 +181,12 @@ async function streamDoubao(baseParams, res, userId, mode = 'chat') {
181
  const messages = convertGeminiToOpenAI(baseParams);
182
  if (messages.length === 0) throw new Error("Doubao: Empty messages");
183
 
184
- const model = DEFAULT_DOUBAO_MODEL;
 
 
 
 
 
185
  const apiUrl = 'https://ark.cn-beijing.volces.com/api/v3/chat/completions';
186
 
187
  // Extract System Prompt for Context Creation if needed
@@ -220,7 +225,7 @@ async function streamDoubao(baseParams, res, userId, mode = 'chat') {
220
  }
221
  }
222
 
223
- console.log(`[AI] 🚀 Requesting Doubao...`);
224
 
225
  const response = await axios.post(apiUrl, requestBody, {
226
  headers: {
@@ -424,7 +429,7 @@ async function streamContentWithSmartFallback(baseParams, res, userId, mode = 'c
424
  console.log(`[AI] 👉 Trying Provider: ${provider}... Mode: ${mode}`);
425
  if (provider === PROVIDERS.GEMINI) return await streamGemini(baseParams, res);
426
  else if (provider === PROVIDERS.OPENROUTER) return await streamOpenRouter(baseParams, res);
427
- else if (provider === PROVIDERS.DOUBAO) return await streamDoubao(baseParams, res, userId, mode);
428
  else if (provider === PROVIDERS.GEMMA) return await streamGemma(baseParams, res);
429
  } catch (e) {
430
  console.error(`[AI] ❌ Provider ${provider} Failed: ${e.message}`);
 
74
 
75
  const PROVIDERS = { GEMINI: 'GEMINI', OPENROUTER: 'OPENROUTER', GEMMA: 'GEMMA', DOUBAO: 'DOUBAO' };
76
  const DEFAULT_OPENROUTER_MODELS = ['qwen/qwen3-coder:free', 'openai/gpt-oss-120b:free', 'qwen/qwen3-235b-a22b:free', 'tngtech/deepseek-r1t-chimera:free'];
77
+ const DEFAULT_DOUBAO_MODEL = 'doubao-seed-1-6-251015'; // Default fallback
78
 
79
  // Runtime override logic
80
  let runtimeProviderOrder = [];
 
173
  return null;
174
  }
175
 
176
+ async function streamDoubao(baseParams, res, userId, mode = 'chat', config) {
177
  const keys = await getKeyPool('doubao');
178
  if (keys.length === 0) throw new Error("No Doubao API keys configured");
179
 
 
181
  const messages = convertGeminiToOpenAI(baseParams);
182
  if (messages.length === 0) throw new Error("Doubao: Empty messages");
183
 
184
+ // DETERMINE MODEL: Use configured custom model (endpoint) if available, otherwise default
185
+ let model = DEFAULT_DOUBAO_MODEL;
186
+ if (config && config.doubaoModels && config.doubaoModels.length > 0) {
187
+ model = config.doubaoModels[0].id;
188
+ }
189
+
190
  const apiUrl = 'https://ark.cn-beijing.volces.com/api/v3/chat/completions';
191
 
192
  // Extract System Prompt for Context Creation if needed
 
225
  }
226
  }
227
 
228
+ console.log(`[AI] 🚀 Requesting Doubao (Model: ${model})...`);
229
 
230
  const response = await axios.post(apiUrl, requestBody, {
231
  headers: {
 
429
  console.log(`[AI] 👉 Trying Provider: ${provider}... Mode: ${mode}`);
430
  if (provider === PROVIDERS.GEMINI) return await streamGemini(baseParams, res);
431
  else if (provider === PROVIDERS.OPENROUTER) return await streamOpenRouter(baseParams, res);
432
+ else if (provider === PROVIDERS.DOUBAO) return await streamDoubao(baseParams, res, userId, mode, config);
433
  else if (provider === PROVIDERS.GEMMA) return await streamGemma(baseParams, res);
434
  } catch (e) {
435
  console.error(`[AI] ❌ Provider ${provider} Failed: ${e.message}`);
components/ai/AdminPanel.tsx CHANGED
@@ -1,8 +1,8 @@
1
 
2
  import React, { useState, useEffect } from 'react';
3
  import { api } from '../../services/api';
4
- import { SystemConfig, OpenRouterModelConfig } from '../../types';
5
- import { Bot, CheckCircle, X, BarChart2, Brain, Activity, ShieldCheck, Power, Key, Trash2, Plus, Save, Layers, ArrowUp, ArrowDown } from 'lucide-react';
6
  import { BarChart, Bar, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer, PieChart, Pie, Cell, Legend } from 'recharts';
7
  import { Toast, ToastState } from '../Toast';
8
 
@@ -36,12 +36,17 @@ export const AdminPanel: React.FC = () => {
36
  const [newOpenRouterKey, setNewOpenRouterKey] = useState('');
37
  const [newDoubaoKey, setNewDoubaoKey] = useState(''); // New Doubao Input
38
 
39
- // Model Management
40
  const [orModels, setOrModels] = useState<OpenRouterModelConfig[]>([]);
41
  const [newModelId, setNewModelId] = useState('');
42
  const [newModelName, setNewModelName] = useState('');
43
  const [newModelApiUrl, setNewModelApiUrl] = useState('');
44
 
 
 
 
 
 
45
  // Provider Priority
46
  const [providerOrder, setProviderOrder] = useState<string[]>(['GEMINI', 'OPENROUTER', 'DOUBAO', 'GEMMA']);
47
 
@@ -60,6 +65,9 @@ export const AdminPanel: React.FC = () => {
60
  }
61
  setOrModels(cfg.openRouterModels && cfg.openRouterModels.length > 0 ? cfg.openRouterModels : DEFAULT_OR_MODELS);
62
 
 
 
 
63
  if (cfg.aiProviderOrder && cfg.aiProviderOrder.length > 0) {
64
  setProviderOrder(cfg.aiProviderOrder);
65
  }
@@ -99,6 +107,9 @@ export const AdminPanel: React.FC = () => {
99
  else if (type === 'doubao') setDoubaoKeys(doubaoKeys.filter((_, i) => i !== index));
100
  };
101
 
 
 
 
102
  const handleAddModel = () => {
103
  if (!newModelId.trim()) return;
104
  setOrModels([...orModels, {
@@ -109,7 +120,6 @@ export const AdminPanel: React.FC = () => {
109
  }]);
110
  setNewModelId(''); setNewModelName(''); setNewModelApiUrl('');
111
  };
112
-
113
  const handleRemoveModel = (idx: number) => setOrModels(orModels.filter((_, i) => i !== idx));
114
  const handleMoveModel = (idx: number, direction: -1 | 1) => {
115
  const newArr = [...orModels]; const targetIdx = idx + direction;
@@ -118,6 +128,23 @@ export const AdminPanel: React.FC = () => {
118
  setOrModels(newArr);
119
  };
120
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
121
  const handleMoveProviderOrder = (idx: number, direction: -1 | 1) => {
122
  const newArr = [...providerOrder]; const targetIdx = idx + direction;
123
  if (targetIdx < 0 || targetIdx >= newArr.length) return;
@@ -132,6 +159,7 @@ export const AdminPanel: React.FC = () => {
132
  ...systemConfig,
133
  apiKeys: { gemini: geminiKeys, openrouter: openRouterKeys, doubao: doubaoKeys },
134
  openRouterModels: orModels,
 
135
  aiProviderOrder: providerOrder
136
  });
137
  await api.ai.resetPool();
@@ -239,6 +267,39 @@ export const AdminPanel: React.FC = () => {
239
  </div>
240
  </div>
241
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
242
  <div className="mt-8 border-t border-gray-100 pt-6">
243
  <div className="flex justify-between items-center mb-4"><h4 className="font-bold text-gray-700 text-sm">OpenAI 格式大模型列表管理</h4></div>
244
  <div className="space-y-2 mb-4 bg-gray-50 p-3 rounded-lg border border-gray-200">{orModels.map((m, idx) => (<div key={idx} className="flex items-center gap-2 bg-white p-2 rounded border border-gray-100 shadow-sm"><div className="flex flex-col gap-0.5 px-1"><button onClick={()=>handleMoveModel(idx, -1)} className="text-gray-400 hover:text-blue-500 disabled:opacity-30" disabled={idx===0}><ArrowUp size={12}/></button><button onClick={()=>handleMoveModel(idx, 1)} className="text-gray-400 hover:text-blue-500 disabled:opacity-30" disabled={idx===orModels.length-1}><ArrowDown size={12}/></button></div><div className="flex-1 min-w-0"><div className="text-sm font-bold text-gray-800">{m.name || m.id}</div><div className="text-xs text-gray-400 font-mono truncate" title={m.id}>ID: {m.id}</div>{m.apiUrl && <div className="text-[10px] text-blue-500 truncate" title={m.apiUrl}>API: {m.apiUrl}</div>}</div><div className="flex items-center gap-2">{m.isCustom ? (<span className="text-[10px] bg-blue-50 text-blue-600 px-2 py-0.5 rounded">自定义</span>) : (<span className="text-[10px] bg-gray-100 text-gray-500 px-2 py-0.5 rounded">内置</span>)}<button onClick={() => handleRemoveModel(idx)} className={`p-1.5 rounded transition-colors ${m.isCustom ? 'text-gray-400 hover:text-red-500 hover:bg-red-50' : 'text-gray-200 cursor-not-allowed'}`} disabled={!m.isCustom}><Trash2 size={16}/></button></div></div>))}</div>
@@ -252,4 +313,4 @@ export const AdminPanel: React.FC = () => {
252
  </div>
253
  </div>
254
  );
255
- };
 
1
 
2
  import React, { useState, useEffect } from 'react';
3
  import { api } from '../../services/api';
4
+ import { SystemConfig, OpenRouterModelConfig, DoubaoModelConfig } from '../../types';
5
+ import { Bot, CheckCircle, X, BarChart2, Brain, Activity, ShieldCheck, Power, Key, Trash2, Plus, Save, Layers, ArrowUp, ArrowDown, Server } from 'lucide-react';
6
  import { BarChart, Bar, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer, PieChart, Pie, Cell, Legend } from 'recharts';
7
  import { Toast, ToastState } from '../Toast';
8
 
 
36
  const [newOpenRouterKey, setNewOpenRouterKey] = useState('');
37
  const [newDoubaoKey, setNewDoubaoKey] = useState(''); // New Doubao Input
38
 
39
+ // Model Management - OpenRouter
40
  const [orModels, setOrModels] = useState<OpenRouterModelConfig[]>([]);
41
  const [newModelId, setNewModelId] = useState('');
42
  const [newModelName, setNewModelName] = useState('');
43
  const [newModelApiUrl, setNewModelApiUrl] = useState('');
44
 
45
+ // Model Management - Doubao
46
+ const [doubaoModels, setDoubaoModels] = useState<DoubaoModelConfig[]>([]);
47
+ const [newDoubaoModelId, setNewDoubaoModelId] = useState(''); // Endpoint ID
48
+ const [newDoubaoModelName, setNewDoubaoModelName] = useState('');
49
+
50
  // Provider Priority
51
  const [providerOrder, setProviderOrder] = useState<string[]>(['GEMINI', 'OPENROUTER', 'DOUBAO', 'GEMMA']);
52
 
 
65
  }
66
  setOrModels(cfg.openRouterModels && cfg.openRouterModels.length > 0 ? cfg.openRouterModels : DEFAULT_OR_MODELS);
67
 
68
+ // Load Doubao Models
69
+ setDoubaoModels(cfg.doubaoModels || []);
70
+
71
  if (cfg.aiProviderOrder && cfg.aiProviderOrder.length > 0) {
72
  setProviderOrder(cfg.aiProviderOrder);
73
  }
 
107
  else if (type === 'doubao') setDoubaoKeys(doubaoKeys.filter((_, i) => i !== index));
108
  };
109
 
110
+ // --- Model Management Functions ---
111
+
112
+ // OpenRouter
113
  const handleAddModel = () => {
114
  if (!newModelId.trim()) return;
115
  setOrModels([...orModels, {
 
120
  }]);
121
  setNewModelId(''); setNewModelName(''); setNewModelApiUrl('');
122
  };
 
123
  const handleRemoveModel = (idx: number) => setOrModels(orModels.filter((_, i) => i !== idx));
124
  const handleMoveModel = (idx: number, direction: -1 | 1) => {
125
  const newArr = [...orModels]; const targetIdx = idx + direction;
 
128
  setOrModels(newArr);
129
  };
130
 
131
+ // Doubao
132
+ const handleAddDoubaoModel = () => {
133
+ if (!newDoubaoModelId.trim()) return;
134
+ setDoubaoModels([...doubaoModels, {
135
+ id: newDoubaoModelId.trim(),
136
+ name: newDoubaoModelName.trim() || newDoubaoModelId.trim()
137
+ }]);
138
+ setNewDoubaoModelId(''); setNewDoubaoModelName('');
139
+ };
140
+ const handleRemoveDoubaoModel = (idx: number) => setDoubaoModels(doubaoModels.filter((_, i) => i !== idx));
141
+ const handleMoveDoubaoModel = (idx: number, direction: -1 | 1) => {
142
+ const newArr = [...doubaoModels]; const targetIdx = idx + direction;
143
+ if (targetIdx < 0 || targetIdx >= newArr.length) return;
144
+ [newArr[idx], newArr[targetIdx]] = [newArr[targetIdx], newArr[idx]];
145
+ setDoubaoModels(newArr);
146
+ };
147
+
148
  const handleMoveProviderOrder = (idx: number, direction: -1 | 1) => {
149
  const newArr = [...providerOrder]; const targetIdx = idx + direction;
150
  if (targetIdx < 0 || targetIdx >= newArr.length) return;
 
159
  ...systemConfig,
160
  apiKeys: { gemini: geminiKeys, openrouter: openRouterKeys, doubao: doubaoKeys },
161
  openRouterModels: orModels,
162
+ doubaoModels: doubaoModels, // NEW
163
  aiProviderOrder: providerOrder
164
  });
165
  await api.ai.resetPool();
 
267
  </div>
268
  </div>
269
 
270
+ {/* DOUBAO MODEL MANAGEMENT */}
271
+ <div className="mt-8 border-t border-gray-100 pt-6">
272
+ <div className="flex justify-between items-center mb-4"><h4 className="font-bold text-gray-700 text-sm flex items-center"><Server className="mr-2" size={16}/> 豆包/火山引擎模型管理 (接入点 ID)</h4></div>
273
+ <div className="bg-blue-50 border border-blue-100 p-3 rounded-lg mb-4 text-xs text-blue-700">
274
+ 火山引擎使用 <b>接入点 ID (Endpoint ID)</b> 来标识模型部署。格式如 <code>ep-2024060401xxxx-xxxxx</code>。请在火山引擎控制台创建接入点后在此添加。
275
+ <br/>系统将默认使用列表中的<b>第一个模型</b>。
276
+ </div>
277
+ <div className="space-y-2 mb-4 bg-gray-50 p-3 rounded-lg border border-gray-200">
278
+ {doubaoModels.length === 0 ? <div className="text-center text-gray-400 text-xs py-2">暂无配置模型,将使用系统默认种子模型。</div> : doubaoModels.map((m, idx) => (
279
+ <div key={idx} className="flex items-center gap-2 bg-white p-2 rounded border border-gray-100 shadow-sm">
280
+ <div className="flex flex-col gap-0.5 px-1">
281
+ <button onClick={()=>handleMoveDoubaoModel(idx, -1)} className="text-gray-400 hover:text-blue-500 disabled:opacity-30" disabled={idx===0}><ArrowUp size={12}/></button>
282
+ <button onClick={()=>handleMoveDoubaoModel(idx, 1)} className="text-gray-400 hover:text-blue-500 disabled:opacity-30" disabled={idx===doubaoModels.length-1}><ArrowDown size={12}/></button>
283
+ </div>
284
+ <div className="flex-1 min-w-0">
285
+ <div className="text-sm font-bold text-gray-800">{m.name || m.id}</div>
286
+ <div className="text-xs text-gray-400 font-mono truncate" title={m.id}>ID: {m.id}</div>
287
+ </div>
288
+ <div className="flex items-center gap-2">
289
+ {idx === 0 && <span className="text-[10px] bg-green-50 text-green-600 px-2 py-0.5 rounded font-bold">默认</span>}
290
+ <button onClick={() => handleRemoveDoubaoModel(idx)} className="p-1.5 rounded text-gray-400 hover:text-red-500 hover:bg-red-50"><Trash2 size={16}/></button>
291
+ </div>
292
+ </div>
293
+ ))}
294
+ </div>
295
+ <div className="flex flex-col md:flex-row gap-2 items-end bg-gray-50 p-3 rounded-lg border border-gray-200">
296
+ <div className="flex-1 w-full"><label className="text-xs text-gray-500 mb-1 block">接入点 ID (Endpoint ID) *</label><input className="w-full border border-gray-300 rounded px-2 py-1.5 text-sm" value={newDoubaoModelId} onChange={e=>setNewDoubaoModelId(e.target.value)} placeholder="如: ep-2024xxxx-xxxxx"/></div>
297
+ <div className="flex-1 w-full"><label className="text-xs text-gray-500 mb-1 block">显示名称</label><input className="w-full border border-gray-300 rounded px-2 py-1.5 text-sm" value={newDoubaoModelName} onChange={e=>setNewDoubaoModelName(e.target.value)} placeholder="如: Doubao Pro 32k"/></div>
298
+ <button onClick={handleAddDoubaoModel} className="bg-indigo-600 text-white px-4 py-1.5 rounded text-sm hover:bg-indigo-700 h-9 w-full md:w-auto">添加</button>
299
+ </div>
300
+ </div>
301
+
302
+ {/* OPENROUTER MODEL MANAGEMENT */}
303
  <div className="mt-8 border-t border-gray-100 pt-6">
304
  <div className="flex justify-between items-center mb-4"><h4 className="font-bold text-gray-700 text-sm">OpenAI 格式大模型列表管理</h4></div>
305
  <div className="space-y-2 mb-4 bg-gray-50 p-3 rounded-lg border border-gray-200">{orModels.map((m, idx) => (<div key={idx} className="flex items-center gap-2 bg-white p-2 rounded border border-gray-100 shadow-sm"><div className="flex flex-col gap-0.5 px-1"><button onClick={()=>handleMoveModel(idx, -1)} className="text-gray-400 hover:text-blue-500 disabled:opacity-30" disabled={idx===0}><ArrowUp size={12}/></button><button onClick={()=>handleMoveModel(idx, 1)} className="text-gray-400 hover:text-blue-500 disabled:opacity-30" disabled={idx===orModels.length-1}><ArrowDown size={12}/></button></div><div className="flex-1 min-w-0"><div className="text-sm font-bold text-gray-800">{m.name || m.id}</div><div className="text-xs text-gray-400 font-mono truncate" title={m.id}>ID: {m.id}</div>{m.apiUrl && <div className="text-[10px] text-blue-500 truncate" title={m.apiUrl}>API: {m.apiUrl}</div>}</div><div className="flex items-center gap-2">{m.isCustom ? (<span className="text-[10px] bg-blue-50 text-blue-600 px-2 py-0.5 rounded">自定义</span>) : (<span className="text-[10px] bg-gray-100 text-gray-500 px-2 py-0.5 rounded">内置</span>)}<button onClick={() => handleRemoveModel(idx)} className={`p-1.5 rounded transition-colors ${m.isCustom ? 'text-gray-400 hover:text-red-500 hover:bg-red-50' : 'text-gray-200 cursor-not-allowed'}`} disabled={!m.isCustom}><Trash2 size={16}/></button></div></div>))}</div>
 
313
  </div>
314
  </div>
315
  );
316
+ };
models.js CHANGED
@@ -122,13 +122,19 @@ const ConfigSchema = new mongoose.Schema({
122
  emailNotify: Boolean,
123
  enableAI: { type: Boolean, default: true },
124
  aiTotalCalls: { type: Number, default: 0 },
125
- aiProviderOrder: { type: [String], default: ['GEMINI', 'OPENROUTER', 'GEMMA'] }, // NEW
 
126
  periodConfig: [{ period: Number, name: String, startTime: String, endTime: String }],
127
  apiKeys: {
128
  gemini: [String],
129
  openrouter: [String],
130
  doubao: [String] // NEW: Doubao Key Pool
131
  },
 
 
 
 
 
132
  openRouterModels: [{
133
  id: String,
134
  name: String,
 
122
  emailNotify: Boolean,
123
  enableAI: { type: Boolean, default: true },
124
  aiTotalCalls: { type: Number, default: 0 },
125
+ // Updated default to include DOUBAO
126
+ aiProviderOrder: { type: [String], default: ['GEMINI', 'OPENROUTER', 'DOUBAO', 'GEMMA'] },
127
  periodConfig: [{ period: Number, name: String, startTime: String, endTime: String }],
128
  apiKeys: {
129
  gemini: [String],
130
  openrouter: [String],
131
  doubao: [String] // NEW: Doubao Key Pool
132
  },
133
+ // NEW: Doubao Custom Models (Endpoints)
134
+ doubaoModels: [{
135
+ id: String, // Endpoint ID (e.g. ep-2024xxxx)
136
+ name: String // Friendly Name
137
+ }],
138
  openRouterModels: [{
139
  id: String,
140
  name: String,
types.ts CHANGED
@@ -177,6 +177,11 @@ export interface OpenRouterModelConfig {
177
  isCustom: boolean; // Built-in vs Custom
178
  }
179
 
 
 
 
 
 
180
  export interface SystemConfig {
181
  systemName: string;
182
  semester: string;
@@ -196,6 +201,7 @@ export interface SystemConfig {
196
  openrouter?: string[];
197
  doubao?: string[]; // NEW: Doubao keys
198
  };
 
199
  openRouterModels?: OpenRouterModelConfig[];
200
  }
201
 
 
177
  isCustom: boolean; // Built-in vs Custom
178
  }
179
 
180
+ export interface DoubaoModelConfig {
181
+ id: string; // Endpoint ID (e.g., ep-2024...)
182
+ name?: string;
183
+ }
184
+
185
  export interface SystemConfig {
186
  systemName: string;
187
  semester: string;
 
201
  openrouter?: string[];
202
  doubao?: string[]; // NEW: Doubao keys
203
  };
204
+ doubaoModels?: DoubaoModelConfig[]; // NEW
205
  openRouterModels?: OpenRouterModelConfig[];
206
  }
207