From 05abeab0a396aefddff4f1b85ae7e09696f9eff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=C2=B7Dong?= <98630204+GeorgeDong32@users.noreply.github.com> Date: Sun, 8 Jun 2025 12:38:50 +0800 Subject: [PATCH] fix(migrate): old translateModel incorrect (#6965) * fix(migrate): old translateModel incorrect * fix(migrate): old translateModel incorrect * feat(models): improve default model init * fix(migrate): update translateModel check * fix(migrate): update translateModel check --- src/renderer/src/config/models.ts | 37 +++++++++++++++++++++++++++++++ src/renderer/src/store/llm.ts | 8 +++---- src/renderer/src/store/migrate.ts | 8 +++---- 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts index 3a98d6a854..1f68bda3ed 100644 --- a/src/renderer/src/config/models.ts +++ b/src/renderer/src/config/models.ts @@ -395,6 +395,37 @@ export function getModelLogo(modelId: string) { } export const SYSTEM_MODELS: Record = { + defaultModel: [ + { + // 默认助手模型 + id: 'deepseek-ai/DeepSeek-V3', + name: 'deepseek-ai/DeepSeek-V3', + provider: 'silicon', + group: 'deepseek-ai' + }, + { + // 默认话题命名模型 + id: 'Qwen/Qwen3-8B', + name: 'Qwen/Qwen3-8B', + provider: 'silicon', + group: 'Qwen' + }, + { + // 默认翻译模型 + id: 'deepseek-ai/DeepSeek-V3', + name: 'deepseek-ai/DeepSeek-V3', + provider: 'silicon', + group: 'deepseek-ai' + }, + { + // 默认快捷助手模型 + id: 'deepseek-ai/DeepSeek-V3', + name: 'deepseek-ai/DeepSeek-V3', + provider: 'silicon', + group: 'deepseek-ai' + } + ], + aihubmix: [ { id: 'gpt-4o', @@ -605,6 +636,12 @@ export const SYSTEM_MODELS: Record = { name: 'BAAI/bge-m3', provider: 'silicon', group: 'BAAI' + }, + { + id: 'Qwen/Qwen3-8B', + name: 'Qwen/Qwen3-8B', + provider: 'silicon', + group: 'Qwen' } ], ppio: [ diff --git a/src/renderer/src/store/llm.ts b/src/renderer/src/store/llm.ts index 96afd8b521..d5c8fd566d 100644 --- a/src/renderer/src/store/llm.ts +++ b/src/renderer/src/store/llm.ts @@ -491,10 +491,10 @@ export const INITIAL_PROVIDERS: Provider[] = [ ] const initialState: LlmState = { - defaultModel: SYSTEM_MODELS.silicon[1], - topicNamingModel: SYSTEM_MODELS.silicon[2], - translateModel: SYSTEM_MODELS.silicon[1], - quickAssistantModel: SYSTEM_MODELS.silicon[1], + defaultModel: SYSTEM_MODELS.defaultModel[0], + topicNamingModel: SYSTEM_MODELS.defaultModel[1], + translateModel: SYSTEM_MODELS.defaultModel[2], + quickAssistantModel: SYSTEM_MODELS.defaultModel[3], providers: INITIAL_PROVIDERS, settings: { ollama: { diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts index 45d13ad512..f792383afd 100644 --- a/src/renderer/src/store/migrate.ts +++ b/src/renderer/src/store/migrate.ts @@ -1501,13 +1501,11 @@ const migrateConfig = { '111': (state: RootState) => { try { addSelectionAction(state, 'quote') - - //if user has not set translate model(old default), set it to the new default model(deekseek v3) if ( - state.llm.translateModel.provider === SYSTEM_MODELS.silicon[3].provider && - state.llm.translateModel.id === SYSTEM_MODELS.silicon[3].id + state.llm.translateModel.provider === 'silicon' && + state.llm.translateModel.id === 'meta-llama/Llama-3.3-70B-Instruct' ) { - state.llm.translateModel = SYSTEM_MODELS.silicon[1] + state.llm.translateModel = SYSTEM_MODELS.defaultModel[2] } return state