Fix #5 by improving the internals of OpenAIProvider

Author: seratch

packages/agents-openai/src/openaiProvider.ts

@@ -2,6 +2,7 @@ import { Model, ModelProvider } from '@openai/agents-core';
 import OpenAI from 'openai';
 import {
   DEFAULT_OPENAI_MODEL,
+  getDefaultOpenAIClient,
   getDefaultOpenAIKey,
   shouldUseResponsesByDefault,
 } from './defaults';
@@ -24,7 +25,7 @@ export type OpenAIProviderOptions = {
  * The provider of OpenAI's models (or Chat Completions compatible ones)
  */
 export class OpenAIProvider implements ModelProvider {
-  #client?: OpenAI;
+  #client: OpenAI;
   #useResponses?: boolean;
   #options: OpenAIProviderOptions;
 
@@ -37,9 +38,19 @@ export class OpenAIProvider implements ModelProvider {
       if (this.#options.baseURL) {
         throw new Error('Cannot provide both baseURL and openAIClient');
       }
-      this.#client = this.#options.openAIClient;
     }
-
+    this.#client =
+      // If the constructor does not accept the OpenAI client,
+      this.#options.openAIClient ??
+      // this provider checks if there is the default client first,
+      getDefaultOpenAIClient() ??
+      // and then manually creates a new one.
+      new OpenAI({
+        apiKey: this.#options.apiKey ?? getDefaultOpenAIKey(),
+        baseURL: this.#options.baseURL,
+        organization: this.#options.organization,
+        project: this.#options.project,
+      });
     this.#useResponses = this.#options.useResponses;
   }
 
@@ -48,15 +59,6 @@ export class OpenAIProvider implements ModelProvider {
    * never actually use the client.
    */
   #getClient(): OpenAI {
-    if (!this.#client) {
-      this.#client = new OpenAI({
-        apiKey: this.#options.apiKey ?? getDefaultOpenAIKey(),
-        baseURL: this.#options.baseURL,
-        organization: this.#options.organization,
-        project: this.#options.project,
-      });
-    }
-
     return this.#client;
   }