Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2025-12-25 11:20:07 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(OpenAIProvider): refine system message handling for specific model IDs (#5397)

Browse Source 
* fix(OpenAIProvider): refine system message handling for specific model IDs

* refactor(OpenAIProvider): introduce OPENAI_NO_SUPPORT_DEV_ROLE_MODELS for model ID checks
This commit is contained in:
SuYao 2025-04-27 15:10:01 +08:00 committed by GitHub
parent 0fe34a12a3
commit 175d189634
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2168,6 +2168,8 @@ export const GEMINI_SEARCH_MODELS = [
'gemini-2.5-flash-preview-04-17'
]
export const OPENAI_NO_SUPPORT_DEV_ROLE_MODELS = ['o1-preview', 'o1-mini']
export const PERPLEXITY_SEARCH_MODELS = ['sonar-pro', 'sonar', 'sonar-reasoning', 'sonar-reasoning-pro']
export function isTextToImageModel(model: Model): boolean {
@ -2202,7 +2204,7 @@ export function isVisionModel(model: Model): boolean {
if (!model) {
return false
}
// 新添字段 copilot-vision-request 后可使用 vision
// 新添字段 copilot-vision-request 后可使用 vision
// if (model.provider === 'copilot') {
// return false
// }

5
src/renderer/src/providers/AiProvider/OpenAIProvider.ts
View File

@ -8,7 +8,8 @@ import {
isReasoningModel,
isSupportedModel,
isVisionModel,
isZhipuModel
isZhipuModel,
OPENAI_NO_SUPPORT_DEV_ROLE_MODELS
} from '@renderer/config/models'
import { getStoreSetting } from '@renderer/hooks/useSettings'
import i18n from '@renderer/i18n'
@ -317,7 +318,7 @@ export default class OpenAIProvider extends BaseProvider {
const { contextCount, maxTokens, streamOutput } = getAssistantSettings(assistant)
messages = addImageFileToContents(messages)
let systemMessage = { role: 'system', content: assistant.prompt || '' }
if (isOpenAIoSeries(model)) {
if (isOpenAIoSeries(model) && !OPENAI_NO_SUPPORT_DEV_ROLE_MODELS.includes(model.id)) {
systemMessage = {
role: 'developer',
content: `Formatting re-enabled${systemMessage ? '\n' + systemMessage.content : ''}`