address feedback

Author: deyaaeldeen

src/azure.ts

@@ -38,6 +38,7 @@ export interface AzureClientOptions extends ClientOptions {
 export class AzureOpenAI extends OpenAI {
   deploymentName: string | undefined;
   apiVersion: string = '';
+  override apiKey: string;
 
   /**
    * API Client for interfacing with the Azure OpenAI API.
@@ -109,16 +110,15 @@ export class AzureOpenAI extends OpenAI {
     }
 
     super({
-      apiKey,
+      apiKey: !azureADTokenProvider ? apiKey : async () => ({ token: await azureADTokenProvider() }),
       baseURL,
-      tokenProvider:
-        !azureADTokenProvider ? undefined : async () => ({ token: await azureADTokenProvider() }),
       ...opts,
       ...(dangerouslyAllowBrowser !== undefined ? { dangerouslyAllowBrowser } : {}),
     });
 
     this.apiVersion = apiVersion;
     this.deploymentName = deployment;
+    this.apiKey = apiKey ?? 'PLACEHOLDER_FOR_AZURE_AD_TOKEN_PROVIDER';
   }
 
   override async buildRequest(

src/beta/realtime/websocket.ts

@@ -37,9 +37,13 @@ export class OpenAIRealtimeWebSocket extends OpenAIRealtimeEmitter {
     super();
 
     const dangerouslyAllowBrowser =
-      props.dangerouslyAllowBrowser ??
-      (client as any)?._options?.dangerouslyAllowBrowser ??
-      (client?.apiKey.startsWith('ek_') ? true : null);
+      (
+        props.dangerouslyAllowBrowser ??
+        (client as any)?._options?.dangerouslyAllowBrowser ??
+        typeof client?.apiKey === 'function'
+      ) ?
+        true
+      : undefined;
 
     if (!dangerouslyAllowBrowser && isRunningInBrowser()) {
       throw new OpenAIError(

src/client.ts

@@ -200,11 +200,7 @@ export interface ClientOptions {
   /**
    * Defaults to process.env['OPENAI_API_KEY'].
    */
-  apiKey?: string | undefined;
-  /**
-   * A function that returns a token to use for authentication.
-   */
-  tokenProvider?: TokenProvider | undefined;
+  apiKey?: string | TokenProvider | undefined;
   /**
    * Defaults to process.env['OPENAI_ORG_ID'].
    */
@@ -299,7 +295,7 @@ export interface ClientOptions {
  * API Client for interfacing with the OpenAI API.
  */
 export class OpenAI {
-  apiKey: string;
+  apiKey: string | TokenProvider;
   organization: string | null;
   project: string | null;
   webhookSecret: string | null;
@@ -315,7 +311,6 @@ export class OpenAI {
   #encoder: Opts.RequestEncoder;
   protected idempotencyHeader?: string;
   private _options: ClientOptions;
-  private _tokenProvider: TokenProvider | undefined;
 
   /**
    * API Client for interfacing with the OpenAI API.
@@ -339,18 +334,11 @@ export class OpenAI {
     organization = readEnv('OPENAI_ORG_ID') ?? null,
     project = readEnv('OPENAI_PROJECT_ID') ?? null,
     webhookSecret = readEnv('OPENAI_WEBHOOK_SECRET') ?? null,
-    tokenProvider,
     ...opts
   }: ClientOptions = {}) {
-    if (apiKey === undefined && !tokenProvider) {
-      throw new Errors.OpenAIError(
-        'Missing credentials. Please pass one of `apiKey` and `tokenProvider`, or set the `OPENAI_API_KEY` environment variable.',
-      );
-    }
-
-    if (tokenProvider && apiKey) {
+    if (apiKey === undefined) {
       throw new Errors.OpenAIError(
-        'The `apiKey` and `tokenProvider` arguments are mutually exclusive; only one can be passed at a time.',
+        'Missing credentials. Please pass an `apiKey`, or set the `OPENAI_API_KEY` environment variable.',
       );
     }
 
@@ -359,7 +347,6 @@ export class OpenAI {
       organization,
       project,
       webhookSecret,
-      tokenProvider,
       ...opts,
       baseURL: baseURL || `https://api.openai.com/v1`,
     };
@@ -388,7 +375,6 @@ export class OpenAI {
     this._options = options;
 
     this.apiKey = apiKey ?? 'Missing Key';
-    this._tokenProvider = tokenProvider;
     this.organization = organization;
     this.project = project;
     this.webhookSecret = webhookSecret;
@@ -408,7 +394,6 @@ export class OpenAI {
       fetch: this.fetch,
       fetchOptions: this.fetchOptions,
       apiKey: this.apiKey,
-      tokenProvider: this._tokenProvider,
       organization: this.organization,
       project: this.project,
       webhookSecret: this.webhookSecret,
@@ -458,12 +443,12 @@ export class OpenAI {
   }
 
   async _setToken(): Promise<boolean> {
-    if (typeof this._tokenProvider === 'function') {
+    if (typeof this.apiKey === 'function') {
       try {
-        const token = await this._tokenProvider();
+        const token = await this.apiKey();
         if (!token || typeof token.token !== 'string') {
           throw new Errors.OpenAIError(
-            `Expected 'tokenProvider' argument to return a string but it returned ${token}`,
+            `Expected 'apiKey' function argument to return a string but it returned ${token}`,
           );
         }
         this.apiKey = token.token;
@@ -473,7 +458,7 @@ export class OpenAI {
           throw err;
         }
         throw new Errors.OpenAIError(
-          `Failed to get token from 'tokenProvider' function: ${err.message}`,
+          `Failed to get token from 'apiKey' function: ${err.message}`,
           // @ts-ignore
           { cause: err },
         );

tests/index.test.ts

@@ -736,7 +736,7 @@ describe('retries', () => {
       };
       const client = new OpenAI({
         baseURL: 'http://localhost:5000/',
-        tokenProvider: async () => ({ token: 'my token' }),
+        apiKey: async () => ({ token: 'my token' }),
         fetch: testFetch,
       });
       expect(
@@ -763,12 +763,12 @@ describe('retries', () => {
         });
       };
       let counter = 0;
-      async function tokenProvider() {
+      async function apiKey() {
         return { token: `token-${counter++}` };
       }
       const client = new OpenAI({
         baseURL: 'http://localhost:5000/',
-        tokenProvider,
+        apiKey,
         fetch: testFetch,
       });
       expect(
@@ -783,21 +783,6 @@ describe('retries', () => {
       ).toEqual('Bearer token-1');
     });
 
-    test('mutual exclusive', () => {
-      try {
-        new OpenAI({
-          baseURL: 'http://localhost:5000/',
-          tokenProvider: async () => ({ token: 'my token' }),
-          apiKey: 'my api key',
-        });
-      } catch (error: any) {
-        expect(error).toBeInstanceOf(Error);
-        expect(error.message).toEqual(
-          'The `apiKey` and `tokenProvider` arguments are mutually exclusive; only one can be passed at a time.',
-        );
-      }
-    });
-
     test('at least one', () => {
       try {
         new OpenAI({