Merge pull request #7 from lingrottin/main

rxliuli · web-flow · commit b3b4e94974fa · 2025-07-03T22:41:29.000+08:00
Fix #6
diff --git a/src/llm/openai.ts b/src/llm/openai.ts
@@ -190,9 +190,6 @@ function openaiResponse(options: { createClient: (req: ChatCompletionCreateParam
 }
 
 export function openai(env: Record<string, string>): IChat {
-  const client = new OpenAI({
-    apiKey: env.OPENAI_API_KEY,
-  })
   const oldModels = [
     'chatgpt-4o-latest',
     'codex-mini-latest',
@@ -263,27 +260,22 @@ export function openai(env: Record<string, string>): IChat {
     'o4-mini',
     'o4-mini-2025-04-16',
   ]
+  // 将 client 从一个值换成函数来惰性求值，这样只会在实际请求时（而不是创建列表时）创建 OpenAI 对象
+  const client_builder = (model: string): IChat => {
+    let base_client = new OpenAI({
+      apiKey: env.OPENAI_API_KEY,
+    })
+    if (oldModels.includes(model)) {
+      return openaiBase({ createClient: () => base_client })
+    } else {
+      return openaiResponse({ createClient: () => base_client })
+    }
+  }
   return {
     name: 'openai',
     supportModels: [...oldModels, ...newModels],
     requiredEnv: ['OPENAI_API_KEY'],
-    invoke(req) {
-      const oldCllient = openaiBase({ createClient: () => client })
-      const newClient = openaiResponse({ createClient: () => client })
-      if (oldModels.includes(req.model)) {
-        return oldCllient.invoke(req)
-      } else {
-        return newClient.invoke(req)
-      }
-    },
-    stream(req, signal) {
-      const oldCllient = openaiBase({ createClient: () => client })
-      const newClient = openaiResponse({ createClient: () => client })
-      if (oldModels.includes(req.model)) {
-        return oldCllient.stream(req, signal)
-      } else {
-        return newClient.stream(req, signal)
-      }
-    },
+    invoke: (req) => client_builder(req.model).invoke(req),
+    stream: (req, signal) => client_builder(req.model).stream(req, signal),
   }
 }
