@lobehub/chat 1.68.6 → 1.68.7

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 1.68.7](https://github.com/lobehub/lobe-chat/compare/v1.68.6...v1.68.7)
+
+<sup>Released on **2025-03-05**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor agent runtime to better code format.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor agent runtime to better code format, closes [#6284](https://github.com/lobehub/lobe-chat/issues/6284) ([fc1ed4a](https://github.com/lobehub/lobe-chat/commit/fc1ed4a))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.68.6](https://github.com/lobehub/lobe-chat/compare/v1.68.5...v1.68.6)
 
 <sup>Released on **2025-03-05**</sup>

package/changelog/v1.json

@@ -1,4 +1,13 @@
 [
+  {
+    "children": {
+      "improvements": [
+        "Refactor agent runtime to better code format."
+      ]
+    },
+    "date": "2025-03-05",
+    "version": "1.68.7"
+  },
   {
     "children": {
       "fixes": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.68.6",
+  "version": "1.68.7",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/app/(backend)/webapi/chat/[provider]/route.test.ts

@@ -71,7 +71,7 @@ describe('POST handler', () => {
 
       // migrate to new AgentRuntime init api
       const spy = vi
-        .spyOn(AgentRuntime, 'initializeWithProviderOptions')
+        .spyOn(AgentRuntime, 'initializeWithProvider')
         .mockResolvedValue(new AgentRuntime(mockRuntime));
 
       // 调用 POST 函数
@@ -117,7 +117,7 @@ describe('POST handler', () => {
 
       const mockRuntime: LobeRuntimeAI = { baseURL: 'abc', chat: vi.fn() };
 
-      vi.spyOn(AgentRuntime, 'initializeWithProviderOptions').mockResolvedValue(
+      vi.spyOn(AgentRuntime, 'initializeWithProvider').mockResolvedValue(
         new AgentRuntime(mockRuntime),
       );
 

package/src/libs/agent-runtime/AgentRuntime.test.ts

@@ -1,265 +1,96 @@
 // @vitest-environment node
 import { Langfuse } from 'langfuse';
 import { LangfuseGenerationClient, LangfuseTraceClient } from 'langfuse-core';
-import { ClientOptions } from 'openai';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import * as langfuseCfg from '@/config/langfuse';
 import { JWTPayload } from '@/const/auth';
 import { TraceNameMap } from '@/const/trace';
-import {
-  AgentRuntime,
-  ChatStreamPayload,
-  LobeAnthropicAI,
-  LobeAzureOpenAI,
-  LobeBedrockAI,
-  LobeGoogleAI,
-  LobeMistralAI,
-  LobeMoonshotAI,
-  LobeOllamaAI,
-  LobeOpenAI,
-  LobeOpenRouterAI,
-  LobePerplexityAI,
-  LobeRuntimeAI,
-  LobeTogetherAI,
-  LobeZhipuAI,
-  ModelProvider,
-} from '@/libs/agent-runtime';
-import { LobeStepfunAI } from '@/libs/agent-runtime/stepfun';
+import { AgentRuntime, ChatStreamPayload, LobeOpenAI, ModelProvider } from '@/libs/agent-runtime';
+import { providerRuntimeMap } from '@/libs/agent-runtime/runtimeMap';
 import { createTraceOptions } from '@/server/modules/AgentRuntime';
 
 import { AgentChatOptions } from './AgentRuntime';
-import { LobeBedrockAIParams } from './bedrock';
-
-// 模拟依赖项
-vi.mock('@/config/server', () => ({
-  getServerConfig: vi.fn(() => ({
-    // 确保为每个provider提供必要的配置信息
-    OPENAI_API_KEY: 'test-openai-key',
-    GOOGLE_API_KEY: 'test-google-key',
-
-    AZURE_API_KEY: 'test-azure-key',
-    AZURE_ENDPOINT: 'endpoint',
-
-    ZHIPU_API_KEY: 'test.zhipu-key',
-    MOONSHOT_API_KEY: 'test-moonshot-key',
-    AWS_SECRET_ACCESS_KEY: 'test-aws-secret',
-    AWS_ACCESS_KEY_ID: 'test-aws-id',
-    AWS_REGION: 'test-aws-region',
-    OLLAMA_PROXY_URL: 'test-ollama-url',
-    PERPLEXITY_API_KEY: 'test-perplexity-key',
-    ANTHROPIC_API_KEY: 'test-anthropic-key',
-    MISTRAL_API_KEY: 'test-mistral-key',
-    OPENROUTER_API_KEY: 'test-openrouter-key',
-    TOGETHERAI_API_KEY: 'test-togetherai-key',
-  })),
-}));
 
-describe('AgentRuntime', () => {
-  describe('should initialize with various providers', () => {
-    describe('OpenAI provider', () => {
-      it('should initialize correctly', async () => {
-        const jwtPayload: ClientOptions = { apiKey: 'user-openai-key', baseURL: 'user-endpoint' };
-
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.OpenAI, {
-          openai: jwtPayload,
-        });
-
-        expect(runtime).toBeInstanceOf(AgentRuntime);
-        expect(runtime['_runtime']).toBeInstanceOf(LobeOpenAI);
-        expect(runtime['_runtime'].baseURL).toBe('user-endpoint');
-      });
-    });
-
-    describe('Azure OpenAI provider', () => {
-      it('should initialize correctly', async () => {
-        const jwtPayload = {
-          apiKey: 'user-azure-key',
-          baseURL: 'user-azure-endpoint',
-          apiVersion: '2024-06-01',
-        };
-
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.Azure, {
-          azure: jwtPayload,
-        });
-
-        expect(runtime).toBeInstanceOf(AgentRuntime);
-        expect(runtime['_runtime']).toBeInstanceOf(LobeAzureOpenAI);
-        expect(runtime['_runtime'].baseURL).toBe('user-azure-endpoint');
-      });
-      it('should initialize with azureOpenAIParams correctly', async () => {
-        const jwtPayload = {
-          apiKey: 'user-openai-key',
-          baseURL: 'user-endpoint',
-          apiVersion: 'custom-version',
-        };
-
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.Azure, {
-          azure: jwtPayload,
-        });
-
-        expect(runtime).toBeInstanceOf(AgentRuntime);
-        const openAIRuntime = runtime['_runtime'] as LobeRuntimeAI;
-        expect(openAIRuntime).toBeInstanceOf(LobeAzureOpenAI);
-      });
-
-      it('should initialize with AzureAI correctly', async () => {
-        const jwtPayload = {
-          apiKey: 'user-azure-key',
-          baseURL: 'user-azure-endpoint',
-          apiVersion: '2024-06-01',
-        };
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.Azure, {
-          azure: jwtPayload,
-        });
-
-        expect(runtime['_runtime']).toBeInstanceOf(LobeAzureOpenAI);
-      });
-    });
-
-    describe('ZhiPu AI provider', () => {
-      it('should initialize correctly', async () => {
-        const jwtPayload: JWTPayload = { apiKey: 'zhipu.user-key' };
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.ZhiPu, {
-          zhipu: jwtPayload,
-        });
-
-        // 假设 LobeZhipuAI 是 ZhiPu 提供者的实现类
-        expect(runtime['_runtime']).toBeInstanceOf(LobeZhipuAI);
-      });
-    });
-
-    describe('Google provider', () => {
-      it('should initialize correctly', async () => {
-        const jwtPayload: JWTPayload = { apiKey: 'user-google-key' };
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.Google, {
-          google: jwtPayload,
-        });
-
-        // 假设 LobeGoogleAI 是 Google 提供者的实现类
-        expect(runtime['_runtime']).toBeInstanceOf(LobeGoogleAI);
-      });
-    });
-
-    describe('Moonshot AI provider', () => {
-      it('should initialize correctly', async () => {
-        const jwtPayload: JWTPayload = { apiKey: 'user-moonshot-key' };
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.Moonshot, {
-          moonshot: jwtPayload,
-        });
-
-        // 假设 LobeMoonshotAI 是 Moonshot 提供者的实现类
-        expect(runtime['_runtime']).toBeInstanceOf(LobeMoonshotAI);
-      });
-    });
-
-    describe('Bedrock AI provider', () => {
-      it('should initialize correctly with payload apiKey', async () => {
-        const jwtPayload: LobeBedrockAIParams = {
-          accessKeyId: 'user-aws-id',
-          accessKeySecret: 'user-aws-secret',
-          region: 'user-aws-region',
-        };
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.Bedrock, {
-          bedrock: jwtPayload,
-        });
-
-        // 假设 LobeBedrockAI 是 Bedrock 提供者的实现类
-        expect(runtime['_runtime']).toBeInstanceOf(LobeBedrockAI);
-      });
-    });
-
-    describe('Ollama provider', () => {
-      it('should initialize correctly', async () => {
-        const jwtPayload: JWTPayload = { baseURL: 'https://user-ollama-url' };
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.Ollama, {
-          ollama: jwtPayload,
-        });
-
-        // 假设 LobeOllamaAI 是 Ollama 提供者的实现类
-        expect(runtime['_runtime']).toBeInstanceOf(LobeOllamaAI);
-      });
-    });
-
-    describe('Perplexity AI provider', () => {
-      it('should initialize correctly', async () => {
-        const jwtPayload: JWTPayload = { apiKey: 'user-perplexity-key' };
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.Perplexity, {
-          perplexity: jwtPayload,
-        });
-
-        // 假设 LobePerplexityAI 是 Perplexity 提供者的实现类
-        expect(runtime['_runtime']).toBeInstanceOf(LobePerplexityAI);
-      });
-    });
-
-    describe('Anthropic AI provider', () => {
-      it('should initialize correctly', async () => {
-        const jwtPayload: JWTPayload = { apiKey: 'user-anthropic-key' };
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.Anthropic, {
-          anthropic: jwtPayload,
-        });
-
-        // 假设 LobeAnthropicAI 是 Anthropic 提供者的实现类
-        expect(runtime['_runtime']).toBeInstanceOf(LobeAnthropicAI);
-      });
-    });
-
-    describe('Mistral AI provider', () => {
-      it('should initialize correctly', async () => {
-        const jwtPayload: JWTPayload = { apiKey: 'user-mistral-key' };
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.Mistral, {
-          mistral: jwtPayload,
-        });
-
-        // 假设 LobeMistralAI 是 Mistral 提供者的实现类
-        expect(runtime['_runtime']).toBeInstanceOf(LobeMistralAI);
-      });
+const specialProviders = [
+  { id: 'openai', payload: { apiKey: 'user-openai-key', baseURL: 'user-endpoint' } },
+  {
+    id: ModelProvider.Azure,
+    payload: {
+      apiKey: 'user-azure-key',
+      baseURL: 'user-azure-endpoint',
+      apiVersion: '2024-06-01',
+    },
+  },
+  {
+    id: ModelProvider.AzureAI,
+    payload: {
+      apiKey: 'user-azure-key',
+      baseURL: 'user-azure-endpoint',
+    },
+  },
+  {
+    id: ModelProvider.Bedrock,
+    payload: {
+      accessKeyId: 'user-aws-id',
+      accessKeySecret: 'user-aws-secret',
+      region: 'user-aws-region',
+    },
+  },
+  {
+    id: ModelProvider.Ollama,
+    payload: { baseURL: 'https://user-ollama-url' },
+  },
+  {
+    id: ModelProvider.Cloudflare,
+    payload: { baseURLOrAccountID: 'https://user-ollama-url' },
+  },
+];
+
+const testRuntime = (providerId: string, payload?: any) => {
+  describe(`${providerId} provider runtime`, () => {
+    it('should initialize correctly', async () => {
+      const jwtPayload: JWTPayload = { apiKey: 'user-key', ...payload };
+      const runtime = await AgentRuntime.initializeWithProvider(providerId, jwtPayload);
+
+      // @ts-ignore
+      expect(runtime['_runtime']).toBeInstanceOf(providerRuntimeMap[providerId]);
+
+      if (payload?.baseURL) {
+        expect(runtime['_runtime'].baseURL).toBe(payload.baseURL);
+      }
     });
+  });
+};
+
+let mockModelRuntime: AgentRuntime;
+beforeEach(async () => {
+  const jwtPayload: JWTPayload = { apiKey: 'user-openai-key', baseURL: 'user-endpoint' };
+  mockModelRuntime = await AgentRuntime.initializeWithProvider(
+    ModelProvider.OpenAI,
+    jwtPayload,
+  );
+});
 
-    describe('OpenRouter AI provider', () => {
-      it('should initialize correctly', async () => {
-        const jwtPayload: JWTPayload = { apiKey: 'user-openrouter-key' };
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.OpenRouter, {
-          openrouter: jwtPayload,
-        });
+describe('AgentRuntime', () => {
+  describe('should initialize with various providers', () => {
+    const providers = Object.values(ModelProvider);
 
-        // 假设 LobeOpenRouterAI 是 OpenRouter 提供者的实现类
-        expect(runtime['_runtime']).toBeInstanceOf(LobeOpenRouterAI);
-      });
-    });
+    const specialProviderIds = [ModelProvider.VertexAI, ...specialProviders.map((p) => p.id)];
 
-    describe('Stepfun AI provider', () => {
-      it('should initialize correctly', async () => {
-        const jwtPayload: JWTPayload = { apiKey: 'user-stepfun-key' };
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.Stepfun, {
-          stepfun: jwtPayload,
-        });
+    const generalTestProviders = providers.filter(
+      (provider) => !specialProviderIds.includes(provider),
+    );
 
-        expect(runtime['_runtime']).toBeInstanceOf(LobeStepfunAI);
-      });
+    generalTestProviders.forEach((provider) => {
+      testRuntime(provider);
     });
 
-    describe('Together AI provider', () => {
-      it('should initialize correctly', async () => {
-        const jwtPayload: JWTPayload = { apiKey: 'user-togetherai-key' };
-        const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.TogetherAI, {
-          togetherai: jwtPayload,
-        });
-
-        // 假设 LobeTogetherAI 是 TogetherAI 提供者的实现类
-        expect(runtime['_runtime']).toBeInstanceOf(LobeTogetherAI);
-      });
-    });
+    specialProviders.forEach(({ id, payload }) => testRuntime(id, payload));
   });
 
   describe('AgentRuntime chat method', () => {
     it('should run correctly', async () => {
-      const jwtPayload: JWTPayload = { apiKey: 'user-openai-key', baseURL: 'user-endpoint' };
-      const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.OpenAI, {
-        openai: jwtPayload,
-      });
-
       const payload: ChatStreamPayload = {
         messages: [{ role: 'user', content: 'Hello, world!' }],
         model: 'text-davinci-002',
@@ -268,14 +99,9 @@ describe('AgentRuntime', () => {
 
       vi.spyOn(LobeOpenAI.prototype, 'chat').mockResolvedValue(new Response(''));
 
-      await runtime.chat(payload);
+      await mockModelRuntime.chat(payload);
     });
     it('should handle options correctly', async () => {
-      const jwtPayload: JWTPayload = { apiKey: 'user-openai-key', baseURL: 'user-endpoint' };
-      const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.OpenAI, {
-        openai: jwtPayload,
-      });
-
       const payload: ChatStreamPayload = {
         messages: [{ role: 'user', content: 'Hello, world!' }],
         model: 'text-davinci-002',
@@ -296,15 +122,10 @@ describe('AgentRuntime', () => {
 
       vi.spyOn(LobeOpenAI.prototype, 'chat').mockResolvedValue(new Response(''));
 
-      await runtime.chat(payload, createTraceOptions(payload, options));
+      await mockModelRuntime.chat(payload, createTraceOptions(payload, options));
     });
 
     describe('callback', async () => {
-      const jwtPayload: JWTPayload = { apiKey: 'user-openai-key', baseURL: 'user-endpoint' };
-      const runtime = await AgentRuntime.initializeWithProviderOptions(ModelProvider.OpenAI, {
-        openai: jwtPayload,
-      });
-
       const payload: ChatStreamPayload = {
         messages: [{ role: 'user', content: 'Hello, world!' }],
         model: 'text-davinci-002',
@@ -345,7 +166,7 @@ describe('AgentRuntime', () => {
         );
         vi.spyOn(LangfuseTraceClient.prototype, 'update').mockImplementation(updateMock);
 
-        await runtime.chat(payload, createTraceOptions(payload, options));
+        await mockModelRuntime.chat(payload, createTraceOptions(payload, options));
 
         expect(updateMock).toHaveBeenCalledWith({ tags: ['Tools Call'] });
       });
@@ -366,7 +187,7 @@ describe('AgentRuntime', () => {
           },
         );
 
-        await runtime.chat(payload, createTraceOptions(payload, options));
+        await mockModelRuntime.chat(payload, createTraceOptions(payload, options));
 
         // Verify onStart was called
         expect(updateMock).toHaveBeenCalledWith({ completionStartTime: expect.any(Date) });
@@ -389,7 +210,7 @@ describe('AgentRuntime', () => {
           },
         );
 
-        await runtime.chat(payload, createTraceOptions(payload, options));
+        await mockModelRuntime.chat(payload, createTraceOptions(payload, options));
 
         // Verify onCompletion was called with expected output
         expect(updateMock).toHaveBeenCalledWith({
@@ -419,7 +240,7 @@ describe('AgentRuntime', () => {
         const shutdownAsyncMock = vi.fn();
         vi.spyOn(Langfuse.prototype, 'shutdownAsync').mockImplementation(shutdownAsyncMock);
 
-        await runtime.chat(payload, createTraceOptions(payload, options));
+        await mockModelRuntime.chat(payload, createTraceOptions(payload, options));
 
         // Verify onCompletion was called with expected output
         expect(shutdownAsyncMock).toHaveBeenCalled();

package/src/libs/agent-runtime/AgentRuntime.ts

@@ -3,61 +3,18 @@ import { ClientOptions } from 'openai';
 import type { TracePayload } from '@/const/trace';
 
 import { LobeRuntimeAI } from './BaseAI';
-import { LobeAi21AI } from './ai21';
-import { LobeAi360AI } from './ai360';
-import { LobeAnthropicAI } from './anthropic';
-import { LobeAzureOpenAI } from './azureOpenai';
-import { LobeAzureAI } from './azureai';
-import { LobeBaichuanAI } from './baichuan';
-import { LobeBedrockAI, LobeBedrockAIParams } from './bedrock';
-import { LobeCloudflareAI, LobeCloudflareParams } from './cloudflare';
-import { LobeDeepSeekAI } from './deepseek';
-import { LobeFireworksAI } from './fireworksai';
-import { LobeGiteeAI } from './giteeai';
-import { LobeGithubAI } from './github';
-import { LobeGoogleAI } from './google';
-import { LobeGroq } from './groq';
-import { LobeHigressAI } from './higress';
-import { LobeHuggingFaceAI } from './huggingface';
-import { LobeHunyuanAI } from './hunyuan';
-import { LobeInternLMAI } from './internlm';
-import { LobeJinaAI } from './jina';
-import { LobeLMStudioAI } from './lmstudio';
-import { LobeMinimaxAI } from './minimax';
-import { LobeMistralAI } from './mistral';
-import { LobeMoonshotAI } from './moonshot';
-import { LobeNovitaAI } from './novita';
-import { LobeNvidiaAI } from './nvidia';
-import { LobeOllamaAI } from './ollama';
+import { LobeBedrockAIParams } from './bedrock';
+import { LobeCloudflareParams } from './cloudflare';
 import { LobeOpenAI } from './openai';
-import { LobeOpenRouterAI } from './openrouter';
-import { LobePerplexityAI } from './perplexity';
-import { LobePPIOAI } from './ppio';
-import { LobeQwenAI } from './qwen';
-import { LobeSambaNovaAI } from './sambanova';
-import { LobeSenseNovaAI } from './sensenova';
-import { LobeSiliconCloudAI } from './siliconcloud';
-import { LobeSparkAI } from './spark';
-import { LobeStepfunAI } from './stepfun';
-import { LobeTaichuAI } from './taichu';
-import { LobeTencentCloudAI } from './tencentcloud';
-import { LobeTogetherAI } from './togetherai';
+import { providerRuntimeMap } from './runtimeMap';
 import {
   ChatCompetitionOptions,
   ChatStreamPayload,
   EmbeddingsOptions,
   EmbeddingsPayload,
-  ModelProvider,
   TextToImagePayload,
   TextToSpeechPayload,
 } from './types';
-import { LobeUpstageAI } from './upstage';
-import { LobeVLLMAI } from './vllm';
-import { LobeVolcengineAI } from './volcengine';
-import { LobeWenxinAI } from './wenxin';
-import { LobeXAI } from './xai';
-import { LobeZeroOneAI } from './zeroone';
-import { LobeZhipuAI } from './zhipu';
 
 export interface AgentChatOptions {
   enableTrace?: boolean;
@@ -128,307 +85,25 @@ class AgentRuntime {
    * Try to initialize the runtime with the provider and the options.
    * @example
    * ```ts
-   * const runtime = await AgentRuntime.initializeWithProviderOptions(provider, {
-   *    [provider]: {...options},
-   * })
+   * const runtime = await AgentRuntime.initializeWithProviderOptions(provider, options)
    * ```
    * **Note**: If you try to get a AgentRuntime instance from client or server,
    * you should use the methods to get the runtime instance at first.
    * - `src/app/api/chat/agentRuntime.ts: initAgentRuntimeWithUserPayload` on server
    * - `src/services/chat.ts: initializeWithClientStore` on client
    */
-  static async initializeWithProviderOptions(
+  static async initializeWithProvider(
     provider: string,
-    params: Partial<{
-      ai21: Partial<ClientOptions>;
-      ai360: Partial<ClientOptions>;
-      anthropic: Partial<ClientOptions>;
-      azure: { apiKey?: string; apiVersion?: string; baseURL?: string };
-      azureai: { apiKey?: string; apiVersion?: string; baseURL?: string };
-      baichuan: Partial<ClientOptions>;
-      bedrock: Partial<LobeBedrockAIParams>;
-      cloudflare: Partial<LobeCloudflareParams>;
-      deepseek: Partial<ClientOptions>;
-      doubao: Partial<ClientOptions>;
-      fireworksai: Partial<ClientOptions>;
-      giteeai: Partial<ClientOptions>;
-      github: Partial<ClientOptions>;
-      google: { apiKey?: string; baseURL?: string };
-      groq: Partial<ClientOptions>;
-      higress: Partial<ClientOptions>;
-      huggingface: { apiKey?: string; baseURL?: string };
-      hunyuan: Partial<ClientOptions>;
-      internlm: Partial<ClientOptions>;
-      jina: Partial<ClientOptions>;
-      lmstudio: Partial<ClientOptions>;
-      minimax: Partial<ClientOptions>;
-      mistral: Partial<ClientOptions>;
-      moonshot: Partial<ClientOptions>;
-      novita: Partial<ClientOptions>;
-      nvidia: Partial<ClientOptions>;
-      ollama: Partial<ClientOptions>;
-      openai: Partial<ClientOptions>;
-      openrouter: Partial<ClientOptions>;
-      perplexity: Partial<ClientOptions>;
-      ppio: Partial<ClientOptions>;
-      qwen: Partial<ClientOptions>;
-      sambanova: Partial<ClientOptions>;
-      sensenova: Partial<ClientOptions>;
-      siliconcloud: Partial<ClientOptions>;
-      spark: Partial<ClientOptions>;
-      stepfun: Partial<ClientOptions>;
-      taichu: Partial<ClientOptions>;
-      tencentcloud: Partial<ClientOptions>;
-      togetherai: Partial<ClientOptions>;
-      upstage: Partial<ClientOptions>;
-      vllm: Partial<ClientOptions>;
-      volcengine: Partial<ClientOptions>;
-      wenxin: Partial<ClientOptions>;
-      xai: Partial<ClientOptions>;
-      zeroone: Partial<ClientOptions>;
-      zhipu: Partial<ClientOptions>;
-    }>,
+    params: Partial<
+      ClientOptions &
+        LobeBedrockAIParams &
+        LobeCloudflareParams & { apiKey?: string; apiVersion?: string; baseURL?: string }
+    >,
   ) {
-    let runtimeModel: LobeRuntimeAI;
+    // @ts-expect-error runtime map not include vertex so it will be undefined
+    const providerAI = providerRuntimeMap[provider] ?? LobeOpenAI;
+    const runtimeModel: LobeRuntimeAI = new providerAI(params);
 
-    switch (provider) {
-      default:
-      case ModelProvider.OpenAI: {
-        // Will use the openai as default provider
-        runtimeModel = new LobeOpenAI(params.openai ?? (params as any)[provider]);
-        break;
-      }
-
-      case ModelProvider.Azure: {
-        runtimeModel = new LobeAzureOpenAI(
-          params.azure?.baseURL,
-          params.azure?.apiKey,
-          params.azure?.apiVersion,
-        );
-        break;
-      }
-
-      case ModelProvider.AzureAI: {
-        runtimeModel = new LobeAzureAI(params.azureai);
-        break;
-      }
-
-      case ModelProvider.ZhiPu: {
-        runtimeModel = new LobeZhipuAI(params.zhipu);
-        break;
-      }
-
-      case ModelProvider.Google: {
-        runtimeModel = new LobeGoogleAI(params.google);
-        break;
-      }
-
-      case ModelProvider.Moonshot: {
-        runtimeModel = new LobeMoonshotAI(params.moonshot);
-        break;
-      }
-
-      case ModelProvider.Bedrock: {
-        runtimeModel = new LobeBedrockAI(params.bedrock);
-        break;
-      }
-
-      case ModelProvider.LMStudio: {
-        runtimeModel = new LobeLMStudioAI(params.lmstudio);
-        break;
-      }
-
-      case ModelProvider.Ollama: {
-        runtimeModel = new LobeOllamaAI(params.ollama);
-        break;
-      }
-
-      case ModelProvider.VLLM: {
-        runtimeModel = new LobeVLLMAI(params.vllm);
-        break;
-      }
-
-      case ModelProvider.Perplexity: {
-        runtimeModel = new LobePerplexityAI(params.perplexity);
-        break;
-      }
-
-      case ModelProvider.Anthropic: {
-        runtimeModel = new LobeAnthropicAI(params.anthropic);
-        break;
-      }
-
-      case ModelProvider.DeepSeek: {
-        runtimeModel = new LobeDeepSeekAI(params.deepseek);
-        break;
-      }
-
-      case ModelProvider.HuggingFace: {
-        runtimeModel = new LobeHuggingFaceAI(params.huggingface);
-        break;
-      }
-
-      case ModelProvider.Minimax: {
-        runtimeModel = new LobeMinimaxAI(params.minimax);
-        break;
-      }
-
-      case ModelProvider.Mistral: {
-        runtimeModel = new LobeMistralAI(params.mistral);
-        break;
-      }
-
-      case ModelProvider.Groq: {
-        runtimeModel = new LobeGroq(params.groq);
-        break;
-      }
-
-      case ModelProvider.Github: {
-        runtimeModel = new LobeGithubAI(params.github);
-        break;
-      }
-
-      case ModelProvider.OpenRouter: {
-        runtimeModel = new LobeOpenRouterAI(params.openrouter);
-        break;
-      }
-
-      case ModelProvider.TogetherAI: {
-        runtimeModel = new LobeTogetherAI(params.togetherai);
-        break;
-      }
-
-      case ModelProvider.FireworksAI: {
-        runtimeModel = new LobeFireworksAI(params.fireworksai);
-        break;
-      }
-
-      case ModelProvider.ZeroOne: {
-        runtimeModel = new LobeZeroOneAI(params.zeroone);
-        break;
-      }
-
-      case ModelProvider.Qwen: {
-        runtimeModel = new LobeQwenAI(params.qwen);
-        break;
-      }
-
-      case ModelProvider.Stepfun: {
-        runtimeModel = new LobeStepfunAI(params.stepfun);
-        break;
-      }
-
-      case ModelProvider.Novita: {
-        runtimeModel = new LobeNovitaAI(params.novita);
-        break;
-      }
-
-      case ModelProvider.Nvidia: {
-        runtimeModel = new LobeNvidiaAI(params.nvidia);
-        break;
-      }
-
-      case ModelProvider.Baichuan: {
-        runtimeModel = new LobeBaichuanAI(params.baichuan);
-        break;
-      }
-
-      case ModelProvider.Taichu: {
-        runtimeModel = new LobeTaichuAI(params.taichu);
-        break;
-      }
-
-      case ModelProvider.Ai360: {
-        runtimeModel = new LobeAi360AI(params.ai360);
-        break;
-      }
-
-      case ModelProvider.SiliconCloud: {
-        runtimeModel = new LobeSiliconCloudAI(params.siliconcloud);
-        break;
-      }
-
-      case ModelProvider.GiteeAI: {
-        runtimeModel = new LobeGiteeAI(params.giteeai);
-        break;
-      }
-
-      case ModelProvider.Upstage: {
-        runtimeModel = new LobeUpstageAI(params.upstage);
-        break;
-      }
-
-      case ModelProvider.Spark: {
-        runtimeModel = new LobeSparkAI(params.spark);
-        break;
-      }
-
-      case ModelProvider.Ai21: {
-        runtimeModel = new LobeAi21AI(params.ai21);
-        break;
-      }
-
-      case ModelProvider.Hunyuan: {
-        runtimeModel = new LobeHunyuanAI(params.hunyuan);
-        break;
-      }
-
-      case ModelProvider.SenseNova: {
-        runtimeModel = new LobeSenseNovaAI(params.sensenova);
-        break;
-      }
-
-      case ModelProvider.XAI: {
-        runtimeModel = new LobeXAI(params.xai);
-        break;
-      }
-
-      case ModelProvider.Jina: {
-        runtimeModel = new LobeJinaAI(params.jina);
-        break;
-      }
-
-      case ModelProvider.SambaNova: {
-        runtimeModel = new LobeSambaNovaAI(params.sambanova);
-        break;
-      }
-
-      case ModelProvider.Cloudflare: {
-        runtimeModel = new LobeCloudflareAI(params.cloudflare);
-        break;
-      }
-
-      case ModelProvider.InternLM: {
-        runtimeModel = new LobeInternLMAI(params.internlm);
-        break;
-      }
-
-      case ModelProvider.Higress: {
-        runtimeModel = new LobeHigressAI(params.higress);
-        break;
-      }
-
-      case ModelProvider.TencentCloud: {
-        runtimeModel = new LobeTencentCloudAI(params[provider]);
-        break;
-      }
-
-      case ModelProvider.Volcengine:
-      case ModelProvider.Doubao: {
-        runtimeModel = new LobeVolcengineAI(params.volcengine || params.doubao);
-        break;
-      }
-
-      case ModelProvider.Wenxin: {
-        runtimeModel = new LobeWenxinAI(params.wenxin);
-        break;
-      }
-
-      case ModelProvider.PPIO: {
-        runtimeModel = new LobePPIOAI(params.ppio ?? {});
-        break;
-      }
-    }
     return new AgentRuntime(runtimeModel);
   }
 }

package/src/libs/agent-runtime/azureOpenai/index.test.ts

@@ -16,11 +16,11 @@ describe('LobeAzureOpenAI', () => {
   let instance: LobeAzureOpenAI;
 
   beforeEach(() => {
-    instance = new LobeAzureOpenAI(
-      'https://test.openai.azure.com/',
-      'test_key',
-      '2023-03-15-preview',
-    );
+    instance = new LobeAzureOpenAI({
+      baseURL: 'https://test.openai.azure.com/',
+      apiKey: 'test_key',
+      apiVersion: '2023-03-15-preview',
+    });
 
     // 使用 vi.spyOn 来模拟 streamChatCompletions 方法
     vi.spyOn(instance['client'].chat.completions, 'create').mockResolvedValue(
@@ -42,14 +42,14 @@ describe('LobeAzureOpenAI', () => {
     });
 
     it('should create an instance of OpenAIClient with correct parameters', () => {
-      const endpoint = 'https://test.openai.azure.com/';
-      const apikey = 'test_key';
+      const baseURL = 'https://test.openai.azure.com/';
+      const apiKey = 'test_key';
       const apiVersion = '2023-03-15-preview';
 
-      const instance = new LobeAzureOpenAI(endpoint, apikey, apiVersion);
+      const instance = new LobeAzureOpenAI({ baseURL, apiKey, apiVersion });
 
       expect(instance.client).toBeInstanceOf(AzureOpenAI);
-      expect(instance.baseURL).toBe(endpoint);
+      expect(instance.baseURL).toBe(baseURL);
     });
   });
 

package/src/libs/agent-runtime/azureOpenai/index.ts

@@ -13,18 +13,18 @@ import { OpenAIStream } from '../utils/streams';
 export class LobeAzureOpenAI implements LobeRuntimeAI {
   client: AzureOpenAI;
 
-  constructor(endpoint?: string, apikey?: string, apiVersion?: string) {
-    if (!apikey || !endpoint)
+  constructor(params: { apiKey?: string; apiVersion?: string, baseURL?: string; } = {}) {
+    if (!params.apiKey || !params.baseURL)
       throw AgentRuntimeError.createError(AgentRuntimeErrorType.InvalidProviderAPIKey);
 
     this.client = new AzureOpenAI({
-      apiKey: apikey,
-      apiVersion,
+      apiKey: params.apiKey,
+      apiVersion: params.apiVersion,
       dangerouslyAllowBrowser: true,
-      endpoint,
+      endpoint: params.baseURL,
     });
 
-    this.baseURL = endpoint;
+    this.baseURL = params.baseURL;
   }
 
   baseURL: string;

package/src/libs/agent-runtime/runtimeMap.ts

@@ -0,0 +1,97 @@
+import { LobeAi21AI } from './ai21';
+import { LobeAi360AI } from './ai360';
+import LobeAnthropicAI from './anthropic';
+import { LobeAzureOpenAI } from './azureOpenai';
+import { LobeAzureAI } from './azureai';
+import { LobeBaichuanAI } from './baichuan';
+import LobeBedrockAI from './bedrock';
+import { LobeCloudflareAI } from './cloudflare';
+import { LobeDeepSeekAI } from './deepseek';
+import { LobeFireworksAI } from './fireworksai';
+import { LobeGiteeAI } from './giteeai';
+import { LobeGithubAI } from './github';
+import LobeGoogleAI from './google';
+import { LobeGroq } from './groq';
+import { LobeHigressAI } from './higress';
+import { LobeHuggingFaceAI } from './huggingface';
+import { LobeHunyuanAI } from './hunyuan';
+import { LobeInternLMAI } from './internlm';
+import { LobeJinaAI } from './jina';
+import { LobeLMStudioAI } from './lmstudio';
+import { LobeMinimaxAI } from './minimax';
+import { LobeMistralAI } from './mistral';
+import { LobeMoonshotAI } from './moonshot';
+import { LobeNovitaAI } from './novita';
+import { LobeNvidiaAI } from './nvidia';
+import LobeOllamaAI from './ollama';
+import { LobeOpenAI } from './openai';
+import { LobeOpenRouterAI } from './openrouter';
+import { LobePerplexityAI } from './perplexity';
+import { LobePPIOAI } from './ppio';
+import { LobeQwenAI } from './qwen';
+import { LobeSambaNovaAI } from './sambanova';
+import { LobeSenseNovaAI } from './sensenova';
+import { LobeSiliconCloudAI } from './siliconcloud';
+import { LobeSparkAI } from './spark';
+import { LobeStepfunAI } from './stepfun';
+import { LobeTaichuAI } from './taichu';
+import { LobeTencentCloudAI } from './tencentcloud';
+import { LobeTogetherAI } from './togetherai';
+import { ModelProvider } from './types';
+import { LobeUpstageAI } from './upstage';
+import { LobeVLLMAI } from './vllm';
+import { LobeVolcengineAI } from './volcengine';
+import { LobeWenxinAI } from './wenxin';
+import { LobeXAI } from './xai';
+import { LobeZeroOneAI } from './zeroone';
+import { LobeZhipuAI } from './zhipu';
+
+export const providerRuntimeMap = {
+  [ModelProvider.OpenAI]: LobeOpenAI,
+  [ModelProvider.Azure]: LobeAzureOpenAI,
+  [ModelProvider.AzureAI]: LobeAzureAI,
+  [ModelProvider.ZhiPu]: LobeZhipuAI,
+  [ModelProvider.Google]: LobeGoogleAI,
+  [ModelProvider.Moonshot]: LobeMoonshotAI,
+  [ModelProvider.Bedrock]: LobeBedrockAI,
+  [ModelProvider.LMStudio]: LobeLMStudioAI,
+  [ModelProvider.Ollama]: LobeOllamaAI,
+  [ModelProvider.VLLM]: LobeVLLMAI,
+  [ModelProvider.Perplexity]: LobePerplexityAI,
+  [ModelProvider.Anthropic]: LobeAnthropicAI,
+  [ModelProvider.DeepSeek]: LobeDeepSeekAI,
+  [ModelProvider.HuggingFace]: LobeHuggingFaceAI,
+  [ModelProvider.Minimax]: LobeMinimaxAI,
+  [ModelProvider.Mistral]: LobeMistralAI,
+  [ModelProvider.Groq]: LobeGroq,
+  [ModelProvider.Github]: LobeGithubAI,
+  [ModelProvider.OpenRouter]: LobeOpenRouterAI,
+  [ModelProvider.TogetherAI]: LobeTogetherAI,
+  [ModelProvider.FireworksAI]: LobeFireworksAI,
+  [ModelProvider.ZeroOne]: LobeZeroOneAI,
+  [ModelProvider.Stepfun]: LobeStepfunAI,
+  [ModelProvider.Qwen]: LobeQwenAI,
+  [ModelProvider.Novita]: LobeNovitaAI,
+  [ModelProvider.Nvidia]: LobeNvidiaAI,
+  [ModelProvider.Taichu]: LobeTaichuAI,
+  [ModelProvider.Baichuan]: LobeBaichuanAI,
+  [ModelProvider.Ai360]: LobeAi360AI,
+  [ModelProvider.SiliconCloud]: LobeSiliconCloudAI,
+  [ModelProvider.GiteeAI]: LobeGiteeAI,
+  [ModelProvider.Upstage]: LobeUpstageAI,
+  [ModelProvider.Spark]: LobeSparkAI,
+  [ModelProvider.Ai21]: LobeAi21AI,
+  [ModelProvider.Hunyuan]: LobeHunyuanAI,
+  [ModelProvider.SenseNova]: LobeSenseNovaAI,
+  [ModelProvider.XAI]: LobeXAI,
+  [ModelProvider.Jina]: LobeJinaAI,
+  [ModelProvider.SambaNova]: LobeSambaNovaAI,
+  [ModelProvider.Cloudflare]: LobeCloudflareAI,
+  [ModelProvider.InternLM]: LobeInternLMAI,
+  [ModelProvider.Higress]: LobeHigressAI,
+  [ModelProvider.TencentCloud]: LobeTencentCloudAI,
+  [ModelProvider.Volcengine]: LobeVolcengineAI,
+  [ModelProvider.PPIO]: LobePPIOAI,
+  [ModelProvider.Doubao]: LobeVolcengineAI,
+  [ModelProvider.Wenxin]: LobeWenxinAI,
+};

package/src/libs/agent-runtime/vertexai/index.ts

@@ -1,6 +1,8 @@
 import { VertexAI, VertexInit } from '@google-cloud/vertexai';
 
-import { AgentRuntimeError, AgentRuntimeErrorType, LobeGoogleAI } from '@/libs/agent-runtime';
+import { AgentRuntimeErrorType } from '../error';
+import { LobeGoogleAI } from '../google';
+import { AgentRuntimeError } from '../utils/createError';
 
 export class LobeVertexAI extends LobeGoogleAI {
   static initFromVertexAI(params?: VertexInit) {

package/src/server/modules/AgentRuntime/index.ts

@@ -130,8 +130,9 @@ export const initAgentRuntimeWithUserPayload = (
   payload: JWTPayload,
   params: any = {},
 ) => {
-  return AgentRuntime.initializeWithProviderOptions(provider, {
-    [provider]: { ...getLlmOptionsFromPayload(provider, payload), ...params },
+  return AgentRuntime.initializeWithProvider(provider, {
+    ...getLlmOptionsFromPayload(provider, payload),
+    ...params,
   });
 };
 

package/src/services/chat.ts

@@ -147,12 +147,10 @@ export function initializeWithClientStore(provider: string, payload: any) {
    * Configuration override order:
    * payload -> providerAuthPayload -> commonOptions
    */
-  return AgentRuntime.initializeWithProviderOptions(provider, {
-    [provider]: {
-      ...commonOptions,
-      ...providerAuthPayload,
-      ...payload,
-    },
+  return AgentRuntime.initializeWithProvider(provider, {
+    ...commonOptions,
+    ...providerAuthPayload,
+    ...payload,
   });
 }