From bc824776446a43362ea041b31b0fb1a7b4fcadcc Mon Sep 17 00:00:00 2001 From: icarus Date: Wed, 6 Aug 2025 20:09:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor(config):=20=E6=9B=B4=E6=96=B0=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=A8=A1=E5=9E=8B=E9=85=8D=E7=BD=AE=E5=92=8C=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将vertexai和dashscope的模型配置从空数组更新为对应的系统模型 - 修改SYSTEM_MODELS的类型定义以包含SystemProviderId - 移除未使用的模型配置如o3、gitee-ai和zhinao --- src/renderer/src/config/models.ts | 145 +-------------------------- src/renderer/src/config/providers.ts | 4 +- 2 files changed, 6 insertions(+), 143 deletions(-) diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts index bba2b8da2e..6dac677be0 100644 --- a/src/renderer/src/config/models.ts +++ b/src/renderer/src/config/models.ts @@ -145,7 +145,7 @@ import YiModelLogoDark from '@renderer/assets/images/models/yi_dark.png' import YoudaoLogo from '@renderer/assets/images/providers/netease-youdao.svg' import NomicLogo from '@renderer/assets/images/providers/nomic.png' import { getProviderByModel } from '@renderer/services/AssistantService' -import { Model } from '@renderer/types' +import { Model, SystemProviderId } from '@renderer/types' import { getLowerBaseModelName, isUserSelectedModelType } from '@renderer/utils' import OpenAI from 'openai' @@ -431,7 +431,7 @@ export function getModelLogo(modelId: string) { return undefined } -export const SYSTEM_MODELS: Record = { +export const SYSTEM_MODELS: Record = { defaultModel: [ { // 默认助手模型 @@ -462,6 +462,7 @@ export const SYSTEM_MODELS: Record = { group: 'deepseek-ai' } ], + vertexai: [], '302ai': [ { id: 'deepseek-chat', @@ -641,129 +642,6 @@ export const SYSTEM_MODELS: Record = { { id: 'deepseek-r1', name: 'DeepSeek-R1', provider: 'burncloud', group: 'deepseek-ai' }, { id: 'deepseek-v3', name: 'DeepSeek-V3', provider: 'burncloud', group: 'deepseek-ai' } ], - - o3: [ - { - id: 'gpt-4o', - provider: 'o3', - name: 'GPT-4o', - group: 'OpenAI' - }, - { - id: 'o1-mini', - provider: 'o3', - name: 'o1-mini', - group: 'OpenAI' - }, - { - id: 'o1-preview', - provider: 'o3', - name: 'o1-preview', - group: 'OpenAI' - }, - { - id: 'o3-mini', - provider: 'o3', - name: 'o3-mini', - group: 'OpenAI' - }, - { - id: 'o3-mini-high', - provider: 'o3', - name: 'o3-mini-high', - group: 'OpenAI' - }, - { - id: 'claude-3-7-sonnet-20250219', - provider: 'o3', - name: 'claude-3-7-sonnet-20250219', - group: 'Anthropic' - }, - { - id: 'claude-3-5-sonnet-20241022', - provider: 'o3', - name: 'claude-3-5-sonnet-20241022', - group: 'Anthropic' - }, - { - id: 'claude-3-5-haiku-20241022', - provider: 'o3', - name: 'claude-3-5-haiku-20241022', - group: 'Anthropic' - }, - { - id: 'claude-3-opus-20240229', - provider: 'o3', - name: 'claude-3-opus-20240229', - group: 'Anthropic' - }, - { - id: 'claude-3-haiku-20240307', - provider: 'o3', - name: 'claude-3-haiku-20240307', - group: 'Anthropic' - }, - { - id: 'claude-3-5-sonnet-20240620', - provider: 'o3', - name: 'claude-3-5-sonnet-20240620', - group: 'Anthropic' - }, - { - id: 'deepseek-ai/Deepseek-R1', - provider: 'o3', - name: 'DeepSeek R1', - group: 'DeepSeek' - }, - { - id: 'deepseek-reasoner', - provider: 'o3', - name: 'deepseek-reasoner', - group: 'DeepSeek' - }, - { - id: 'deepseek-chat', - provider: 'o3', - name: 'deepseek-chat', - group: 'DeepSeek' - }, - { - id: 'deepseek-ai/DeepSeek-V3', - provider: 'o3', - name: 'DeepSeek V3', - group: 'DeepSeek' - }, - { - id: 'text-embedding-3-small', - provider: 'o3', - name: 'text-embedding-3-small', - group: '嵌入模型' - }, - { - id: 'text-embedding-ada-002', - provider: 'o3', - name: 'text-embedding-ada-002', - group: '嵌入模型' - }, - { - id: 'text-embedding-v2', - provider: 'o3', - name: 'text-embedding-v2', - group: '嵌入模型' - }, - { - id: 'Doubao-embedding', - provider: 'o3', - name: 'Doubao-embedding', - group: '嵌入模型' - }, - { - id: 'Doubao-embedding-large', - provider: 'o3', - name: 'Doubao-embedding-large', - group: '嵌入模型' - } - ], ollama: [], lmstudio: [], silicon: [ @@ -976,7 +854,6 @@ export const SYSTEM_MODELS: Record = { group: 'Claude 3' } ], - 'gitee-ai': [], deepseek: [ { id: 'deepseek-chat', @@ -1380,7 +1257,7 @@ export const SYSTEM_MODELS: Record = { group: 'deepseek-ai' } ], - bailian: [ + dashscope: [ { id: 'qwen-vl-plus', name: 'qwen-vl-plus', provider: 'dashscope', group: 'qwen-vl', owned_by: 'system' }, { id: 'qwen-coder-plus', name: 'qwen-coder-plus', provider: 'dashscope', group: 'qwen-coder', owned_by: 'system' }, { id: 'qwen-turbo', name: 'qwen-turbo', provider: 'dashscope', group: 'qwen-turbo', owned_by: 'system' }, @@ -1751,20 +1628,6 @@ export const SYSTEM_MODELS: Record = { group: 'Llama3' } ], - zhinao: [ - { - id: '360gpt-pro', - provider: 'zhinao', - name: '360gpt-pro', - group: '360Gpt' - }, - { - id: '360gpt-turbo', - provider: 'zhinao', - name: '360gpt-turbo', - group: '360Gpt' - } - ], hunyuan: [ { id: 'hunyuan-pro', diff --git a/src/renderer/src/config/providers.ts b/src/renderer/src/config/providers.ts index f0e9abce51..788d593a6b 100644 --- a/src/renderer/src/config/providers.ts +++ b/src/renderer/src/config/providers.ts @@ -288,7 +288,7 @@ export const SYSTEM_PROVIDERS_CONFIG: Record = type: 'vertexai', apiKey: '', apiHost: 'https://aiplatform.googleapis.com', - models: [], + models: SYSTEM_MODELS.vertexai, isSystem: true, enabled: false, isVertex: true @@ -361,7 +361,7 @@ export const SYSTEM_PROVIDERS_CONFIG: Record = type: 'openai', apiKey: '', apiHost: 'https://dashscope.aliyuncs.com/compatible-mode/v1/', - models: SYSTEM_MODELS.bailian, + models: SYSTEM_MODELS.dashscope, isSystem: true, enabled: false },