fix: user agent

Author: asafgardin

src/Client.ts

@@ -1,14 +1,33 @@
 import * as Core from "./Core";
 import { Chat } from "./resources/chat";
 
+export interface AI21Options {
+    apiKey: string;
+    baseURL: string;
+    via: string | null;
+}
 export class AI21 extends Core.APIClient {
-    constructor(apiKey: string) {
+    private _options: AI21Options;
+
+    constructor(
+        apiKey: string = process.env.AI21_API_KEY || '',
+        baseURL: string = process.env.AI21_BASE_URL || 'https://api.ai21.com/studio/v1',
+        via: string | null,
+    ) {
+        const options: AI21Options = {
+            apiKey,
+            baseURL,
+            via,
+        };
+
         super({
-            baseURL: 'https://api.ai21.com/studio/v1',
+            baseURL,
             timeout: 60000,
             apiKey,
             options: {}
         });
+
+        this._options = options;
     }
 
     protected override authHeaders(opts: Core.FinalRequestOptions): Core.Headers {
@@ -17,5 +36,21 @@ export class AI21 extends Core.APIClient {
         };
     }
 
+    protected override defaultHeaders(opts: Core.FinalRequestOptions): Core.Headers {
+        return {
+          ...super.defaultHeaders(opts),
+          'User-Agent': this.getUserAgent(),
+        };
+      }
+    
+    protected override getUserAgent(): string {
+        let userAgent = super.getUserAgent();
+        
+        if (this._options.via) {
+            userAgent += ` via ${this._options.via}`;
+        }
+        return userAgent;
+    }
+
     chat: Chat = new Chat(this);
 }

src/Core.ts

@@ -150,16 +150,14 @@ export abstract class APIClient {
 
     constructor({
         baseURL,
-        maxRetries = 2,
-        timeout = 600000, // 10 minutes
-        // fetch: overridenFetch,
+        maxRetries = 3,
+        timeout = 300000,
         apiKey,
         options,
       }: {
         baseURL: string;
         maxRetries?: number | undefined;
         timeout: number | undefined;
-        // fetch: Fetch | undefined;
         apiKey: string;
         options: ClientOptions;
       }) {
@@ -186,16 +184,15 @@ export abstract class APIClient {
         return this.makeRequest('delete', path, opts);
     }
 
-      private getUserAgent(): string {
-        return `${this.constructor.name}/JS ${VERSION}`;
+    protected getUserAgent(): string {
+        return`AI21 Typescript SDK ${VERSION}`;
       }
 
       protected defaultHeaders(opts: FinalRequestOptions): Headers {
         return {
           Accept: 'application/json',
           'Content-Type': 'application/json',
           'User-Agent': this.getUserAgent(),
-        //   ...getPlatformHeaders(),
           ...this.authHeaders(opts),
         };
       }
@@ -255,18 +252,12 @@ export abstract class APIClient {
           return { response, options, controller };
       }
 
-      protected static isRunningInBrowser(): boolean {
+    protected static isRunningInBrowser(): boolean {
         return (
           typeof window !== 'undefined' &&
           typeof window.document !== 'undefined' &&
           typeof fetch === 'function'
         );
       }
 }
-export const readEnv = (env: string): string | undefined => {
-    if (typeof process !== 'undefined' && process.env) {
-      return process.env[env]?.trim() ?? undefined;
-    }
-    return undefined;
-  };