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

fix: finish_reason undefined

Browse Source
This commit is contained in:
kangfenmao 2025-03-05 20:25:06 +08:00
parent c95c7faa5f
commit 05b3810d4a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,9 +375,11 @@ export default class OpenAIProvider extends BaseProvider {
// Extract citations from the raw response if available // Extract citations from the raw response if available
const citations = (chunk as OpenAI.Chat.Completions.ChatCompletionChunk & { citations?: string[] })?.citations const citations = (chunk as OpenAI.Chat.Completions.ChatCompletionChunk & { citations?: string[] })?.citations
const finishReason = chunk.choices[0]?.finish_reason
if (delta?.tool_calls) { if (delta?.tool_calls) {
const chunkToolCalls: OpenAI.Chat.Completions.ChatCompletionChunk.Choice.Delta.ToolCall[] = delta.tool_calls const chunkToolCalls: OpenAI.Chat.Completions.ChatCompletionChunk.Choice.Delta.ToolCall[] = delta.tool_calls
if (chunk.choices[0].finish_reason !== 'tool_calls') { if (finishReason !== 'tool_calls') {
if (toolCalls.length === 0) { if (toolCalls.length === 0) {
for (const toolCall of chunkToolCalls) { for (const toolCall of chunkToolCalls) {
toolCalls.push(toolCall as ChatCompletionMessageToolCall) toolCalls.push(toolCall as ChatCompletionMessageToolCall)
@ -391,7 +393,7 @@ export default class OpenAIProvider extends BaseProvider {
} }
} }
if (chunk.choices[0].finish_reason === 'tool_calls') { if (finishReason === 'tool_calls') {
console.log('start invoke tools', toolCalls) console.log('start invoke tools', toolCalls)
reqMessages.push({ reqMessages.push({
role: 'assistant', role: 'assistant',
@ -401,6 +403,7 @@ export default class OpenAIProvider extends BaseProvider {
for (const toolCall of toolCalls) { for (const toolCall of toolCalls) {
const mcpTool = this.openAIToolsToMcpTool(toolCall) const mcpTool = this.openAIToolsToMcpTool(toolCall)
console.log('mcpTool', JSON.stringify(mcpTool, null, 2)) console.log('mcpTool', JSON.stringify(mcpTool, null, 2))
if (!mcpTool) { if (!mcpTool) {
console.log('Invalid tool', toolCall) console.log('Invalid tool', toolCall)
continue continue
@ -411,6 +414,7 @@ export default class OpenAIProvider extends BaseProvider {
name: mcpTool.name, name: mcpTool.name,
args: mcpTool.inputSchema args: mcpTool.inputSchema
}) })
console.log(`Tool ${mcpTool.serverName} - ${mcpTool.name} Call Response:`) console.log(`Tool ${mcpTool.serverName} - ${mcpTool.name} Call Response:`)
console.log(toolCallResponse) console.log(toolCallResponse)
@ -448,7 +452,6 @@ export default class OpenAIProvider extends BaseProvider {
onChunk({ onChunk({
text: delta?.content || '', text: delta?.content || '',
// @ts-ignore key is not typed
reasoning_content: delta?.reasoning_content || delta?.reasoning || '', reasoning_content: delta?.reasoning_content || delta?.reasoning || '',
usage: chunk.usage, usage: chunk.usage,
metrics: { metrics: {