From f1c89227520e30c065c3bf752c0517606e0b699b Mon Sep 17 00:00:00 2001 From: kangfenmao Date: Thu, 19 Sep 2024 15:21:24 +0800 Subject: [PATCH] fix: openai sdk request error --- src/renderer/src/providers/AnthropicProvider.ts | 4 ++-- src/renderer/src/providers/OpenAIProvider.ts | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/renderer/src/providers/AnthropicProvider.ts b/src/renderer/src/providers/AnthropicProvider.ts index 76a9b17c..eea143ab 100644 --- a/src/renderer/src/providers/AnthropicProvider.ts +++ b/src/renderer/src/providers/AnthropicProvider.ts @@ -53,13 +53,13 @@ export default class AnthropicProvider extends BaseProvider { const model = assistant.model || defaultModel const { contextCount, maxTokens } = getAssistantSettings(assistant) - let userMessagesParams: MessageParam[][] = [] + const userMessagesParams: MessageParam[] = [] const _messages = filterMessages(filterContextMessages(takeRight(messages, contextCount + 2))) onFilterMessages(_messages) for (const message of _messages) { - userMessagesParams = userMessagesParams.concat(await this.getMessageParam(message)) + userMessagesParams.push(await this.getMessageParam(message)) } const userMessages = flatten(userMessagesParams) diff --git a/src/renderer/src/providers/OpenAIProvider.ts b/src/renderer/src/providers/OpenAIProvider.ts index 3f2e2093..9eecc5c3 100644 --- a/src/renderer/src/providers/OpenAIProvider.ts +++ b/src/renderer/src/providers/OpenAIProvider.ts @@ -34,6 +34,13 @@ export default class OpenAIProvider extends BaseProvider { } private async getMessageParam(message: Message): Promise { + if (message.role !== 'user') { + return { + role: message.role, + content: message.content + } + } + const parts: ChatCompletionContentPart[] = [ { type: 'text',