From 15a9bc15c9f52b8a845aec334935c038f31ec84e Mon Sep 17 00:00:00 2001 From: mosade <384466872@qq.com> Date: Fri, 26 Jul 2024 19:23:40 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20Avoid=20baseURL=20being?= =?UTF-8?q?=20an=20empty=20string,=20resulting=20in=20incorrect=20client?= =?UTF-8?q?=20fetch=20(#3308)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agent-runtime/utils/openaiCompatibleFactory/index.ts | 6 ++++-- src/services/chat.ts | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/libs/agent-runtime/utils/openaiCompatibleFactory/index.ts b/src/libs/agent-runtime/utils/openaiCompatibleFactory/index.ts index 38a4b1d295f6..dc01d5da95e8 100644 --- a/src/libs/agent-runtime/utils/openaiCompatibleFactory/index.ts +++ b/src/libs/agent-runtime/utils/openaiCompatibleFactory/index.ts @@ -128,8 +128,10 @@ export const LobeOpenAICompatibleFactory = = any> private _options: ConstructorOptions; constructor(options: ClientOptions & Record = {}) { - const { apiKey, baseURL = DEFAULT_BASE_URL, ...res } = options; - this._options = options as ConstructorOptions; + const _options = { ...options, baseURL: options.baseURL?.trim() || DEFAULT_BASE_URL }; + const { apiKey, baseURL = DEFAULT_BASE_URL, ...res } = _options; + this._options = _options as ConstructorOptions; + if (!apiKey) throw AgentRuntimeError.createError(ErrorType?.invalidAPIKey); this.client = new OpenAI({ apiKey, baseURL, ...constructorOptions, ...res }); diff --git a/src/services/chat.ts b/src/services/chat.ts index 71db985a9cff..cac91db34e14 100644 --- a/src/services/chat.ts +++ b/src/services/chat.ts @@ -125,6 +125,10 @@ export function initializeWithClientStore(provider: string, payload: any) { break; } case ModelProvider.Perplexity: { + providerOptions = { + apikey: providerAuthPayload?.apiKey, + baseURL: providerAuthPayload?.endpoint, + }; break; } case ModelProvider.Qwen: {