From b0758cccde8709af7fa31aed8c019029c97be82b Mon Sep 17 00:00:00 2001 From: suruiqiang Date: Tue, 11 Feb 2025 16:08:30 +0800 Subject: [PATCH] optimization --- app/client/platforms/alibaba.ts | 10 ++++++---- app/client/platforms/bytedance.ts | 11 ++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/client/platforms/alibaba.ts b/app/client/platforms/alibaba.ts index 13cb558f9..44dbd847a 100644 --- a/app/client/platforms/alibaba.ts +++ b/app/client/platforms/alibaba.ts @@ -171,6 +171,9 @@ export class QwenApi implements LLMApi { reasoning_content: string | null; }; }>; + + if (!choices?.length) return { isThinking: false, content: "" }; + const tool_calls = choices[0]?.message?.tool_calls; if (tool_calls?.length > 0) { const index = tool_calls[0]?.index; @@ -190,6 +193,7 @@ export class QwenApi implements LLMApi { runTools[index]["function"]["arguments"] += args; } } + const reasoning = choices[0]?.message?.reasoning_content; const content = choices[0]?.message?.content; @@ -227,10 +231,8 @@ export class QwenApi implements LLMApi { toolCallMessage: any, toolCallResult: any[], ) => { - // @ts-ignore - requestPayload?.messages?.splice( - // @ts-ignore - requestPayload?.messages?.length, + requestPayload?.input?.messages?.splice( + requestPayload?.input?.messages?.length, 0, toolCallMessage, ...toolCallResult, diff --git a/app/client/platforms/bytedance.ts b/app/client/platforms/bytedance.ts index 5d7ddebeb..5e2e63f58 100644 --- a/app/client/platforms/bytedance.ts +++ b/app/client/platforms/bytedance.ts @@ -37,7 +37,7 @@ export interface OpenAIListModelResponse { }>; } -interface RequestPayload { +interface RequestPayloadForByteDance { messages: { role: "system" | "user" | "assistant"; content: string | MultimodalContent[]; @@ -105,7 +105,7 @@ export class DoubaoApi implements LLMApi { }; const shouldStream = !!options.config.stream; - const requestPayload: RequestPayload = { + const requestPayload: RequestPayloadForByteDance = { messages, stream: shouldStream, model: modelConfig.model, @@ -157,6 +157,9 @@ export class DoubaoApi implements LLMApi { reasoning_content: string | null; }; }>; + + if (!choices?.length) return { isThinking: false, content: "" }; + const tool_calls = choices[0]?.delta?.tool_calls; if (tool_calls?.length > 0) { const index = tool_calls[0]?.index; @@ -209,13 +212,11 @@ export class DoubaoApi implements LLMApi { }, // processToolMessage, include tool_calls message and tool call results ( - requestPayload: RequestPayload, + requestPayload: RequestPayloadForByteDance, toolCallMessage: any, toolCallResult: any[], ) => { - // @ts-ignore requestPayload?.messages?.splice( - // @ts-ignore requestPayload?.messages?.length, 0, toolCallMessage,