feat: Added emv config

Author: asafgardin

src/Client.ts

@@ -1,33 +1,47 @@
-import { STUDIO_BASE_URL } from "./Constants";
 import * as Core from "./Core";
+import { AI21EnvConfig } from "./EnvConfig";
+import { MissingAPIKeyError } from "./errors";
 import { Chat } from "./resources/chat";
 
 export interface AI21Options {
     apiKey: string;
     baseURL: string;
     via: string | null;
+    timeout: number;
+    maxRetries: number;
 }
 export class AI21 extends Core.APIClient {
+    private apiKey: string;
     private _options: AI21Options;
 
     constructor(
-        apiKey: string = process.env.AI21_API_KEY ?? '',
-        baseURL: string = process.env.AI21_BASE_URL ?? STUDIO_BASE_URL,
+        apiKey: string = AI21EnvConfig.API_KEY,
+        baseURL: string = AI21EnvConfig.BASE_URL,
+        timeout: number = AI21EnvConfig.TIMEOUT_SECONDS,
+        maxRetries: number = AI21EnvConfig.MAX_RETRIES,
         via: string | null = null,
     ) {
         const options: AI21Options = {
             apiKey,
             baseURL,
             via,
+            timeout,
+            maxRetries,
         };
 
         super({
             baseURL,
-            timeout: 60000,
+            timeout,
             apiKey,
+            maxRetries,
             options: {}
         });
-        this.apiKey = apiKey
+
+        if (!apiKey) {
+            throw new MissingAPIKeyError();
+        }
+
+        this.apiKey = apiKey;
         this._options = options;
     }
 

src/Constants.ts

@@ -1 +1,2 @@
-export const STUDIO_BASE_URL = 'https://api.ai21.com/studio/v1';
+export const STUDIO_BASE_URL = 'https://api.ai21.com/studio/v1';
+export const DEFAULT_TIMEOUT = 60000;

src/Core.ts

@@ -143,7 +143,6 @@ export class APIPromise<T> extends Promise<T> {
 
 export abstract class APIClient {
     protected options: ClientOptions;
-    protected apiKey: string;
     protected baseURL: string;
     protected maxRetries: number;
     protected timeout: number;
@@ -165,7 +164,6 @@ export abstract class APIClient {
         this.maxRetries = validatePositiveInteger('maxRetries', maxRetries);
         this.timeout = validatePositiveInteger('timeout', timeout);
 
-        this.apiKey = apiKey;
         this.options = options;
       }
     get<Req, Rsp>(path: string, opts?: PromiseOrValue<RequestOptions<Req>>): APIPromise<Rsp> {

src/EnvConfig.ts

@@ -0,0 +1,15 @@
+import { DEFAULT_TIMEOUT } from "./Constants";
+
+import { STUDIO_BASE_URL } from "./Constants";
+
+export class AI21EnvConfig {
+    static readonly API_KEY = process.env.AI21_API_KEY ?? '';
+    static readonly BASE_URL = process.env.AI21_BASE_URL ?? STUDIO_BASE_URL;
+    static readonly TIMEOUT_SECONDS = process.env.AI21_TIMEOUT_SECONDS ? 
+        Number(process.env.AI21_TIMEOUT_SECONDS) : 
+        DEFAULT_TIMEOUT;
+    static readonly MAX_RETRIES = process.env.AI21_MAX_RETRIES ? 
+        Number(process.env.AI21_MAX_RETRIES) : 
+        3;
+    static readonly LOG_LEVEL = process.env.AI21_LOG_LEVEL ?? 'info';
+}

src/errors.ts

@@ -1 +1,7 @@
 export class AI21Error extends Error {}
+
+export class MissingAPIKeyError extends AI21Error {
+    constructor() {
+        super("API key is required");
+    }
+}