diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts index 6eae34a6..6a344b69 100644 --- a/src/renderer/src/config/models.ts +++ b/src/renderer/src/config/models.ts @@ -124,10 +124,10 @@ import ViduModelLogo from '@renderer/assets/images/models/vidu.png' import ViduModelLogoDark from '@renderer/assets/images/models/vidu_dark.png' import WenxinModelLogo from '@renderer/assets/images/models/wenxin.png' import WenxinModelLogoDark from '@renderer/assets/images/models/wenxin_dark.png' -import YiModelLogo from '@renderer/assets/images/models/yi.png' -import YiModelLogoDark from '@renderer/assets/images/models/yi_dark.png' import XirangModelLogo from '@renderer/assets/images/models/xirang.png' import XirangModelLogoDark from '@renderer/assets/images/models/xirang_dark.png' +import YiModelLogo from '@renderer/assets/images/models/yi.png' +import YiModelLogoDark from '@renderer/assets/images/models/yi_dark.png' import { getProviderByModel } from '@renderer/services/AssistantService' import { Assistant, Model } from '@renderer/types' import OpenAI from 'openai' @@ -1718,20 +1718,7 @@ export const SYSTEM_MODELS: Record = { group: 'Jina' } ], - xirang: [ - { - id: 'xirang-1', - name: 'DeepSeek-R1', - provider: 'xirang', - group: 'xirang' - }, - { - id: 'xirang-2', - name: 'DeepSeek-V3', - provider: 'xirang', - group: 'xirang' - } - ] + xirang: [] } export const TEXT_TO_IMAGES_MODELS = [ diff --git a/src/renderer/src/config/providers.ts b/src/renderer/src/config/providers.ts index 2c839bd0..47d2fb93 100644 --- a/src/renderer/src/config/providers.ts +++ b/src/renderer/src/config/providers.ts @@ -35,9 +35,9 @@ import SiliconFlowProviderLogo from '@renderer/assets/images/providers/silicon.p import StepProviderLogo from '@renderer/assets/images/providers/step.png' import TogetherProviderLogo from '@renderer/assets/images/providers/together.png' import BytedanceProviderLogo from '@renderer/assets/images/providers/volcengine.png' +import XirangProviderLogo from '@renderer/assets/images/providers/xirang.png' import ZeroOneProviderLogo from '@renderer/assets/images/providers/zero-one.png' import ZhipuProviderLogo from '@renderer/assets/images/providers/zhipu.png' -import XirangProviderLogo from '@renderer/assets/images/providers/xirang.png' export function getProviderLogo(providerId: string) { switch (providerId) { case 'openai': @@ -328,13 +328,13 @@ export const PROVIDER_CONFIG = { }, xirang: { api: { - url: 'https://wishub-x1.ctyun.cn/v1/' + url: 'https://wishub-x1.ctyun.cn' }, websites: { official: 'https://www.ctyun.cn', - apiKey: 'https://www.ctyun.cn/act/xirang/deepseek', - docs: 'https://www.ctyun.cn/document', - models: 'https://www.ctyun.cn/act/xirang/deepseek' + apiKey: 'https://huiju.ctyun.cn/service/serviceGroup', + docs: 'https://www.ctyun.cn/products/ctxirang', + models: 'https://huiju.ctyun.cn/modelSquare/' } }, dashscope: { diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json index 804a9560..857879ba 100644 --- a/src/renderer/src/i18n/locales/en-us.json +++ b/src/renderer/src/i18n/locales/en-us.json @@ -560,7 +560,7 @@ "yi": "Yi", "zhinao": "360AI", "zhipu": "ZHIPU AI", - "xirang": "TyyCloud Xirang" + "xirang": "State Cloud Xirang" }, "settings": { "about": "About & Feedback", diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json index d26f1c46..f83a07e0 100644 --- a/src/renderer/src/i18n/locales/ru-ru.json +++ b/src/renderer/src/i18n/locales/ru-ru.json @@ -560,7 +560,7 @@ "yi": "Yi", "zhinao": "360AI", "zhipu": "ZHIPU AI", - "xirang": "TyyCloud Xirang" + "xirang": "State Cloud Xirang" }, "settings": { "about": "О программе и обратная связь", diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index 1aac824b..62a8225e 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -560,7 +560,7 @@ "yi": "零一万物", "zhinao": "360智脑", "zhipu": "智谱AI", - "xirang": "天翼云 息壤" + "xirang": "天翼云息壤" }, "settings": { "about": "关于我们", diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json index ec10c256..72143aab 100644 --- a/src/renderer/src/i18n/locales/zh-tw.json +++ b/src/renderer/src/i18n/locales/zh-tw.json @@ -560,7 +560,7 @@ "yi": "零一萬物", "zhinao": "360智腦", "zhipu": "智譜AI", - "xirang": "天翼雲 息壤" + "xirang": "天翼雲息壤" }, "settings": { "about": "關於與回饋", diff --git a/src/renderer/src/providers/OpenAIProvider.ts b/src/renderer/src/providers/OpenAIProvider.ts index 49a34f1a..f63a74b1 100644 --- a/src/renderer/src/providers/OpenAIProvider.ts +++ b/src/renderer/src/providers/OpenAIProvider.ts @@ -42,7 +42,7 @@ export default class OpenAIProvider extends BaseProvider { } private get isNotSupportFiles() { - const providers = ['deepseek', 'baichuan', 'minimax', 'doubao'] + const providers = ['deepseek', 'baichuan', 'minimax', 'doubao', 'xirang'] return providers.includes(this.provider.id) } diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts index 505aa684..7cb583f9 100644 --- a/src/renderer/src/store/migrate.ts +++ b/src/renderer/src/store/migrate.ts @@ -1122,29 +1122,6 @@ const migrateConfig = { return state }, '73': (state: RootState) => { - const tempProviders = state.llm.providers - const xirangProvider = tempProviders.find((provider) => provider.id === 'xirang') - if (!xirangProvider) { - tempProviders.unshift({ - id: 'xirang', - name: 'Xirang', - type: 'openai', - apiKey: '', - apiHost: 'https://wishub-x1.ctyun.cn', - models: SYSTEM_MODELS.xirang, - isSystem: true, - enabled: false - }) - } - return { - ...state, - llm: { - ...state.llm, - providers: tempProviders - } - } - }, - '74': (state: RootState) => { if (state.websearch) { state.websearch.searchWithTime = true state.websearch.maxResults = 5 @@ -1200,6 +1177,19 @@ const migrateConfig = { .trim() } + return state + }, + '74': (state: RootState) => { + state.llm.providers.push({ + id: 'xirang', + name: 'Xirang', + type: 'openai', + apiKey: '', + apiHost: 'https://wishub-x1.ctyun.cn', + models: SYSTEM_MODELS.xirang, + isSystem: true, + enabled: false + }) return state } }