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

refactor: update tool content handling for GPT and Dashscope models in OpenAIProvider

Browse Source
This commit is contained in:
Vaayne 2025-03-18 09:40:58 +08:00 committed by 亢奋猫
parent 48a6c4d017
commit 1e4bc56780
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/renderer/src/providers/OpenAIProvider.ts
View File

@ -534,24 +534,25 @@ export default class OpenAIProvider extends BaseProvider {
}
}
const provider = lastUserMessage?.model?.provider
const modelName = lastUserMessage?.model?.name
if (
lastUserMessage?.model?.provider === 'doubao' ||
lastUserMessage?.model?.name.toLowerCase().includes('deepseek')
modelName?.toLocaleLowerCase().includes('gpt') ||
(provider === 'dashscope' && modelName?.toLocaleLowerCase().includes('qwen'))
) {
console.log('doubao or deepseek only support tool content in text')
reqMessages.push({
role: 'tool',
content: JSON.stringify(toolResponsContent),
tool_call_id: toolCall.id
} as ChatCompletionToolMessageParam)
} else {
reqMessages.push({
role: 'tool',
content: toolResponsContent,
tool_call_id: toolCall.id
} as ChatCompletionToolMessageParam)
} else {
reqMessages.push({
role: 'tool',
content: JSON.stringify(toolResponsContent),
tool_call_id: toolCall.id
} as ChatCompletionToolMessageParam)
}
upsertMCPToolResponse(
toolResponses,
{ tool: mcpTool, status: 'done', response: toolCallResponse, id: toolCall.id },