🐛 fix: Avoid baseURL being an empty string, resulting in incorrect cl…

…ient fetch (lobehub#3308)
geekhuashan · Jul 26, 2024 · 15a9bc1 · 15a9bc1
1 parent 4327799
commit 15a9bc1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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 = <T extends Record<string, any> = any>
     private _options: ConstructorOptions<T>;
 
     constructor(options: ClientOptions & Record<string, any> = {}) {
-      const { apiKey, baseURL = DEFAULT_BASE_URL, ...res } = options;
-      this._options = options as ConstructorOptions<T>;
+      const _options = { ...options, baseURL: options.baseURL?.trim() || DEFAULT_BASE_URL };
+      const { apiKey, baseURL = DEFAULT_BASE_URL, ...res } = _options;
+      this._options = _options as ConstructorOptions<T>;
+
       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
@@ -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: {