whai/cherry-studio
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: Add Doubao provider support for model type detection

Browse Source 
(cherry picked from commit 008b84e128484c98eb59c75d8f44cbc320509049)
This commit is contained in:
ousugo 2025-02-19 14:16:20 +08:00 committed by 亢奋猫
parent e541c7b429
commit 29ba156b9a
2 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/renderer/src/config/models.ts
View File

@ -196,8 +196,8 @@ export function getModelLogo(modelId: string) {
glm: isLight ? ChatGLMModelLogo : ChatGLMModelLogoDark, glm: isLight ? ChatGLMModelLogo : ChatGLMModelLogoDark,
deepseek: isLight ? DeepSeekModelLogo : DeepSeekModelLogoDark, deepseek: isLight ? DeepSeekModelLogo : DeepSeekModelLogoDark,
qwen: isLight ? QwenModelLogo : QwenModelLogoDark, qwen: isLight ? QwenModelLogo : QwenModelLogoDark,
"qwq-": isLight ? QwenModelLogo : QwenModelLogoDark, 'qwq-': isLight ? QwenModelLogo : QwenModelLogoDark,
"qvq-": isLight ? QwenModelLogo : QwenModelLogoDark, 'qvq-': isLight ? QwenModelLogo : QwenModelLogoDark,
Omni: isLight ? QwenModelLogo : QwenModelLogoDark, Omni: isLight ? QwenModelLogo : QwenModelLogoDark,
gemma: isLight ? GemmaModelLogo : GemmaModelLogoDark, gemma: isLight ? GemmaModelLogo : GemmaModelLogoDark,
'yi-': isLight ? YiModelLogo : YiModelLogoDark, 'yi-': isLight ? YiModelLogo : YiModelLogoDark,
@ -1604,6 +1604,10 @@ export function isEmbeddingModel(model: Model): boolean {
return false return false
} }
if (model.provider === 'doubao') {
return EMBEDDING_REGEX.test(model.name)
}
return EMBEDDING_REGEX.test(model.id) || model.type?.includes('embedding') || false return EMBEDDING_REGEX.test(model.id) || model.type?.includes('embedding') || false
} }
@ -1612,6 +1616,10 @@ export function isVisionModel(model: Model): boolean {
return false return false
} }
if (model.provider === 'doubao') {
return VISION_REGEX.test(model.name) || model.type?.includes('vision') || false
}
return VISION_REGEX.test(model.id) || model.type?.includes('vision') || false return VISION_REGEX.test(model.id) || model.type?.includes('vision') || false
} }
@ -1620,6 +1628,10 @@ export function isReasoningModel(model: Model): boolean {
return false return false
} }
if (model.provider === 'doubao') {
return REASONING_REGEX.test(model.name) || model.type?.includes('reasoning') || false
}
return REASONING_REGEX.test(model.id) || model.type?.includes('reasoning') || false return REASONING_REGEX.test(model.id) || model.type?.includes('reasoning') || false
} }

30
src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
View File

@ -192,9 +192,15 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
const modelTypeContent = (model: Model) => { const modelTypeContent = (model: Model) => {
// 获取默认选中的类型 // 获取默认选中的类型
const defaultTypes = [ const defaultTypes = [
...(VISION_REGEX.test(model.id) ? ['vision'] : []), ...((model.provider === 'doubao' ? VISION_REGEX.test(model.name) : VISION_REGEX.test(model.id))
...(EMBEDDING_REGEX.test(model.id) ? ['embedding'] : []), ? ['vision']
...(REASONING_REGEX.test(model.id) ? ['reasoning'] : []) : []),
...((model.provider === 'doubao' ? EMBEDDING_REGEX.test(model.name) : EMBEDDING_REGEX.test(model.id))
? ['embedding']
: []),
...((model.provider === 'doubao' ? REASONING_REGEX.test(model.name) : REASONING_REGEX.test(model.id))
? ['reasoning']
: [])
] as ModelType[] ] as ModelType[]
// 合并现有选择和默认类型 // 合并现有选择和默认类型
@ -206,9 +212,21 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
value={selectedTypes} value={selectedTypes}
onChange={(types) => onUpdateModelTypes(model, types as ModelType[])} onChange={(types) => onUpdateModelTypes(model, types as ModelType[])}
options={[ options={[
{ label: t('models.type.vision'), value: 'vision', disabled: VISION_REGEX.test(model.id) }, {
{ label: t('models.type.embedding'), value: 'embedding', disabled: EMBEDDING_REGEX.test(model.id) }, label: t('models.type.vision'),
{ label: t('models.type.reasoning'), value: 'reasoning', disabled: REASONING_REGEX.test(model.id) } value: 'vision',
disabled: model.provider === 'doubao' ? VISION_REGEX.test(model.name) : VISION_REGEX.test(model.id)
},
{
label: t('models.type.embedding'),
value: 'embedding',
disabled: model.provider === 'doubao' ? EMBEDDING_REGEX.test(model.name) : EMBEDDING_REGEX.test(model.id)
},
{
label: t('models.type.reasoning'),
value: 'reasoning',
disabled: model.provider === 'doubao' ? REASONING_REGEX.test(model.name) : REASONING_REGEX.test(model.id)
}
]} ]}
/> />
</div> </div>