feat: add tools and upload file switch

xiaokaiwangdragonplus · xiaokaiwangdragonplus · commit d3c537562f10 · 2025-12-22T17:04:33.000+08:00
diff --git a/service/src/chatgpt/index.ts b/service/src/chatgpt/index.ts
@@ -58,9 +58,11 @@ const processThreads: { userId: string, chatUuid: number, abort: AbortController
 
 async function chatReplyProcess(options: RequestOptions) {
   const globalConfig = await getCacheConfig()
-  const model = options.room.chatModel
+  const chatModelWithKeyId = options.room.chatModel
+  // 解析模型名称，支持格式 "modelName|keyId"，提取实际的模型名称用于 API 调用
+  const model = chatModelWithKeyId.includes('|') ? chatModelWithKeyId.split('|')[0] : chatModelWithKeyId
   const searchEnabled = options.room.searchEnabled
-  const key = await getRandomApiKey(options.user, model)
+  const key = await getRandomApiKey(options.user, chatModelWithKeyId)
   const userId = options.user._id.toString()
   const maxContextCount = options.room.maxContextCount ?? 10
   const messageId = options.messageId
@@ -560,7 +562,22 @@ async function randomKeyConfig(keys: KeyConfig[]): Promise<KeyConfig | null> {
 }
 
 async function getRandomApiKey(user: UserInfo, chatModel: string): Promise<KeyConfig | undefined> {
-  const keys = (await getCacheApiKeys()).filter(d => hasAnyRole(d.userRoles, user.roles)).filter(d => d.chatModels.includes(chatModel))
+  // 解析模型名称，支持格式 "modelName|keyId"
+  let actualModelName = chatModel
+  let specifiedKeyId: string | undefined
+  if (chatModel.includes('|')) {
+    const parts = chatModel.split('|')
+    actualModelName = parts[0]
+    specifiedKeyId = parts[1]
+  }
+
+  let keys = (await getCacheApiKeys()).filter(d => hasAnyRole(d.userRoles, user.roles)).filter(d => d.chatModels.includes(actualModelName))
+
+  // 如果指定了 keyId，只返回匹配的 key
+  if (specifiedKeyId) {
+    keys = keys.filter(key => key._id.toString() === specifiedKeyId)
+    return keys.length > 0 ? keys[0] : undefined
+  }
 
   return randomKeyConfig(keys)
 }
diff --git a/service/src/index.ts b/service/src/index.ts
@@ -209,27 +209,81 @@ router.post('/session', async (req, res) => {
 
       const keys = (await getCacheApiKeys()).filter(d => hasAnyRole(d.userRoles, user.roles))
 
-      const count: { key: string, count: number }[] = []
+      // 为每个 key 和模型的组合生成不同的选项
+      const modelKeyMap = new Map<string, Array<{ keyId: string, toolsEnabled: boolean, imageUploadEnabled: boolean }>>()
       chatModelOptions.forEach((chatModel) => {
         keys.forEach((key) => {
           if (key.chatModels.includes(chatModel.value)) {
-            if (count.filter(d => d.key === chatModel.value).length <= 0) {
-              count.push({ key: chatModel.value, count: 1 })
-            }
-            else {
-              const thisCount = count.filter(d => d.key === chatModel.value)[0]
-              thisCount.count++
+            const keyId = key._id.toString()
+            if (!modelKeyMap.has(chatModel.value)) {
+              modelKeyMap.set(chatModel.value, [])
             }
+            const configs = modelKeyMap.get(chatModel.value)!
+            configs.push({
+              keyId,
+              toolsEnabled: key.toolsEnabled || false,
+              imageUploadEnabled: key.imageUploadEnabled || false,
+            })
           }
         })
       })
-      count.forEach((c) => {
-        const thisChatModel = chatModelOptions.filter(d => d.value === c.key)[0]
-        const suffix = c.count > 1 ? ` (${c.count})` : ''
-        chatModels.push({
-          label: `${thisChatModel.label}${suffix}`,
-          key: c.key,
-          value: c.key,
+
+      // 为每个配置组合生成唯一的选项
+      modelKeyMap.forEach((configs, modelValue) => {
+        const thisChatModel = chatModelOptions.find(d => d.value === modelValue)
+        if (!thisChatModel)
+          return
+
+        // 按照功能分组（toolsEnabled 和 imageUploadEnabled）
+        const configGroups = new Map<string, typeof configs>()
+        configs.forEach((config) => {
+          const groupKey = `${config.toolsEnabled}-${config.imageUploadEnabled}`
+          if (!configGroups.has(groupKey)) {
+            configGroups.set(groupKey, [])
+          }
+          configGroups.get(groupKey)!.push(config)
+        })
+
+        // 为每个功能组生成选项
+        configGroups.forEach((groupConfigs) => {
+          const config = groupConfigs[0] // 取第一个作为代表
+          const suffix = []
+          if (config.toolsEnabled)
+            suffix.push('Tools')
+          if (config.imageUploadEnabled)
+            suffix.push('Image')
+
+          // 构建标签后缀
+          let labelSuffix = ''
+          if (suffix.length > 0) {
+            // 有特殊功能
+            labelSuffix = groupConfigs.length > 1
+              ? ` (${suffix.join(', ')}, ${groupConfigs.length})`
+              : ` (${suffix.join(', ')})`
+          }
+          else {
+            // 没有特殊功能
+            labelSuffix = groupConfigs.length > 1
+              ? ` (${groupConfigs.length})`
+              : ''
+          }
+
+          // 构建选项
+          if (suffix.length === 0 && groupConfigs.length > 0) {
+            chatModels.push({
+              label: `${thisChatModel.label}${labelSuffix}`,
+              key: modelValue,
+              value: modelValue,
+            })
+          }
+          else {
+            // 需要key来判断用走特殊逻辑
+            chatModels.push({
+              label: `${thisChatModel.label}${labelSuffix}`,
+              key: `${modelValue}|${config.keyId}`,
+              value: `${modelValue}|${config.keyId}`,
+            })
+          }
         })
       })
 
diff --git a/service/src/routes/room.ts b/service/src/routes/room.ts
@@ -95,13 +95,42 @@ router.post('/room-create', auth, async (req, res) => {
     const room = await createChatRoom(userId, title, roomId, user.config?.chatModel, user.config?.maxContextCount)
     // 根据chatModel判断并设置imageUploadEnabled
     if (user && room.chatModel) {
+      // 解析模型名称，支持格式 "modelName|keyId"
+      let actualModelName = room.chatModel
+      let specifiedKeyId: string | undefined
+      if (room.chatModel.includes('|')) {
+        const parts = room.chatModel.split('|')
+        actualModelName = parts[0]
+        specifiedKeyId = parts[1]
+      }
+
       const keys = (await getCacheApiKeys()).filter(d => hasAnyRole(d.userRoles, user.roles))
-      const imageUploadEnabled = keys.some(key =>
-        key.chatModels.includes(room.chatModel)
-        && key.imageUploadEnabled === true,
-      )
+      let imageUploadEnabled = false
+      let toolsEnabled = false
+      if (specifiedKeyId) {
+        // 如果指定了 keyId，使用该 key 的配置
+        const specifiedKey = keys.find(key => key._id.toString() === specifiedKeyId && key.chatModels.includes(actualModelName))
+        if (specifiedKey) {
+          imageUploadEnabled = specifiedKey.imageUploadEnabled || false
+          toolsEnabled = specifiedKey.toolsEnabled || false
+        }
+      }
+      else {
+        // 如果没有指定 keyId，使用原有逻辑
+        imageUploadEnabled = false
+        toolsEnabled = false
+      }
+
       await updateRoomImageUploadEnabled(userId, roomId, imageUploadEnabled || false)
+      await updateRoomToolsEnabled(userId, roomId, toolsEnabled || false)
+      if (toolsEnabled) {
+        await updateRoomThinkEnabled(userId, roomId, false)
+        await updateRoomSearchEnabled(userId, roomId, false)
+        room.thinkEnabled = false
+        room.searchEnabled = false
+      }
       room.imageUploadEnabled = imageUploadEnabled || false
+      room.toolsEnabled = toolsEnabled || false
     }
     res.send({ status: 'Success', message: null, data: room })
   }
@@ -153,17 +182,32 @@ router.post('/room-chatmodel', auth, async (req, res) => {
       // 根据新选择的chatModel，动态判断toolsEnabled
       const user = await getUserById(userId)
       if (user) {
+        // 解析模型名称，支持格式 "modelName|keyId"
+        let actualModelName = chatModel
+        let specifiedKeyId: string | undefined
+        if (chatModel.includes('|')) {
+          const parts = chatModel.split('|')
+          actualModelName = parts[0]
+          specifiedKeyId = parts[1]
+        }
+
         const keys = (await getCacheApiKeys()).filter(d => hasAnyRole(d.userRoles, user.roles))
-        const responsesApiKeysForModel = keys.filter(key =>
-          key.keyModel === 'ResponsesAPI'
-          && key.chatModels.includes(chatModel),
-        )
-        const toolsEnabled = responsesApiKeysForModel.length > 0
-          && responsesApiKeysForModel.every(key => key.toolsEnabled === true)
-        const imageUploadEnabled = keys.some(key =>
-          key.chatModels.includes(chatModel)
-          && key.imageUploadEnabled === true,
-        )
+
+        let toolsEnabled = false
+        let imageUploadEnabled = false
+
+        if (specifiedKeyId) {
+          // 如果指定了 keyId，使用该 key 的配置
+          const specifiedKey = keys.find(key => key._id.toString() === specifiedKeyId && key.chatModels.includes(actualModelName))
+          if (specifiedKey) {
+            toolsEnabled = specifiedKey.toolsEnabled || false
+            imageUploadEnabled = specifiedKey.imageUploadEnabled || false
+          }
+        }
+        else {
+          toolsEnabled = false
+          imageUploadEnabled = false
+        }
 
         // 更新房间的toolsEnabled状态
         await updateRoomToolsEnabled(userId, roomId, toolsEnabled || false)
diff --git a/src/store/modules/chat/index.ts b/src/store/modules/chat/index.ts
@@ -60,6 +60,8 @@ export const useChatStore = defineStore('chat-store', () => {
       maxContextCount: result.data?.maxContextCount ?? 10,
       searchEnabled: result.data?.searchEnabled,
       thinkEnabled: result.data?.thinkEnabled,
+      toolsEnabled: result.data?.toolsEnabled,
+      imageUploadEnabled: result.data?.imageUploadEnabled,
     })
 
     state.chat.unshift({ roomId, data: [] })
