🔧 refactor(providers): 优化配置管理器的类型推断

- 移除所有 getConfig 方法中的显式类型泛型声明 - 在 OllamaProvider 中将 ConfigurationManager 实例化移至构造函数 - 统一规范了 DashScope、Doubao、OpenAI 和 ZhipuAI 提供者的配置获取方式
littleCareless · Dec 12, 2024 · 9e97e1c · 9e97e1c
1 parent d9cebd5
commit 9e97e1c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/src/ai/providers/DashScopeProvider.ts b/src/ai/providers/DashScopeProvider.ts
@@ -122,10 +122,7 @@ export class DashScopeProvider extends BaseOpenAIProvider {
   constructor() {
     const configManager = ConfigurationManager.getInstance();
     super({
-      apiKey: configManager.getConfig<string>(
-        "PROVIDERS_DASHSCOPE_APIKEY",
-        false
-      ),
+      apiKey: configManager.getConfig("PROVIDERS_DASHSCOPE_APIKEY", false),
       baseURL: "https://api.dashscope.com/v1/services/chat/completions",
       providerId: "dashscope",
       providerName: "DashScope",

diff --git a/src/ai/providers/DoubaoProvider.ts b/src/ai/providers/DoubaoProvider.ts
@@ -123,7 +123,7 @@ export class DoubaoProvider extends BaseOpenAIProvider {
   constructor() {
     const configManager = ConfigurationManager.getInstance();
     super({
-      apiKey: configManager.getConfig<string>("PROVIDERS_DOUBAO_APIKEY", false),
+      apiKey: configManager.getConfig("PROVIDERS_DOUBAO_APIKEY", false),
       baseURL: "https://ark.cn-beijing.volces.com/api/v3/chat/completions",
       providerId: "doubao",
       providerName: "豆包 AI",

diff --git a/src/ai/providers/OllamaProvider.ts b/src/ai/providers/OllamaProvider.ts
@@ -17,18 +17,19 @@ export class OllamaProvider implements AIProvider {
     id: "ollama" as AIProviders,
     name: "Ollama",
   } as const;
+  private configManager: ConfigurationManager;
 
   constructor() {
+    this.configManager = ConfigurationManager.getInstance();
     const baseUrl = this.getBaseUrl();
     this.ollama = new Ollama({
       host: baseUrl,
     });
   }
 
   private getBaseUrl(): string {
-    const configManager = ConfigurationManager.getInstance();
     return (
-      configManager.getConfig<string>("PROVIDERS_OLLAMA_BASEURL") ||
+      this.configManager.getConfig("PROVIDERS_OLLAMA_BASEURL") ||
       "http://localhost:11434"
     );
   }
@@ -56,8 +57,7 @@ export class OllamaProvider implements AIProvider {
       params,
       async (truncatedDiff) => {
         const model =
-          params.model ||
-          ConfigurationManager.getInstance().getConfig<string>("MODEL");
+          params.model || this.configManager.getConfig("BASE_MODEL");
 
         const response = await this.ollama.chat({
           model: model.id,

diff --git a/src/ai/providers/OpenAIProvider.ts b/src/ai/providers/OpenAIProvider.ts
@@ -61,9 +61,9 @@ export class OpenAIProvider extends BaseOpenAIProvider {
   constructor() {
     const configManager = ConfigurationManager.getInstance();
     super({
-      apiKey: configManager.getConfig<string>("PROVIDERS_OPENAI_APIKEY", false),
-      baseURL: configManager.getConfig<string>("PROVIDERS_OPENAI_BASEURL", false),
-      apiVersion: configManager.getConfig<string>("BASE_MODEL", false),
+      apiKey: configManager.getConfig("PROVIDERS_OPENAI_APIKEY", false),
+      baseURL: configManager.getConfig("PROVIDERS_OPENAI_BASEURL", false),
+      apiVersion: configManager.getConfig("BASE_MODEL", false),
       providerId: "openai",
       providerName: "OpenAI",
       models: models,

diff --git a/src/ai/providers/ZhipuAIProvider.ts b/src/ai/providers/ZhipuAIProvider.ts
@@ -64,10 +64,7 @@ export class ZhipuAIProvider extends BaseOpenAIProvider {
   constructor() {
     const configManager = ConfigurationManager.getInstance();
     super({
-      apiKey: configManager.getConfig<string>(
-        "PROVIDERS_ZHIPUAI_APIKEY",
-        false
-      ),
+      apiKey: configManager.getConfig("PROVIDERS_ZHIPUAI_APIKEY", false),
       baseURL: "https://open.bigmodel.cn/api/paas/v4/",
       providerId: "zhipu",
       providerName: "zhipu",