fix: Removed unnecesary code

Author: asafgardin

.eslintrc.js

@@ -0,0 +1,20 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+
+/** @type {import('eslint').Linter.Config[]} */
+export default [
+  {files: ["**/*.{js,mjs,cjs,ts}"]},
+  {languageOptions: { globals: globals.browser }},
+  {rules: {
+    "semi": "off",
+    "no-unreachable": "error", // Already in ts, but perhaps it catches more cases
+    "@typescript-eslint/explicit-function-return-type": "off",
+    "@typescript-eslint/strict-boolean-expressions": "off", // Often works incorrectly
+      "@typescript-eslint/no-floating-promises": "off",
+    },
+  },
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+];

eslint.config.js

@@ -15,7 +15,7 @@
   "scripts": {
     "build": "tsc",
     "test": "jest",
-    "lint": "eslint src -c .eslintrc.js",
+    "lint": "eslint . .ts,.tsx",
     "format": "prettier --write \"src/**/*.ts\"",
     "prepare": "npm run build",
     "example": "npx tsx src/script.ts"
@@ -39,17 +39,20 @@
     "node-fetch": "^2.7.0"
   },
   "devDependencies": {
+    "@eslint/js": "^9.14.0",
     "@types/node-fetch": "^2.6.11",
     "@typescript-eslint/eslint-plugin": "^8.13.0",
     "@typescript-eslint/parser": "^8.13.0",
     "eslint": "^9.14.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
+    "globals": "^15.12.0",
     "prettier": "^3.3.3",
     "ts-node": "^10.5.0",
     "tsc-multi": "^1.1.0",
     "tsconfig-paths": "^4.0.0",
     "tsx": "^4.19.2",
-    "typescript": "^4.8.2"
+    "typescript": "^4.8.2",
+    "typescript-eslint": "^8.13.0"
   }
 }

package-lock.json

@@ -11,8 +11,8 @@ import {
   PromiseOrValue,
   DefaultQuery,
 } from './models';
-import { APIPromise } from './APIPromise';
 import { AI21EnvConfig } from './EnvConfig.js';
+import { handleAPIResponse } from './ResponseHandler.js';
 
 export type Headers = Record<string, string | null | undefined>;
 
@@ -61,19 +61,19 @@ export abstract class APIClient {
 
     this.options = options;
   }
-  get<Req, Rsp>(path: string, opts?: PromiseOrValue<RequestOptions<Req>>): APIPromise<Rsp> {
+  get<Req, Rsp>(path: string, opts?: PromiseOrValue<RequestOptions<Req>>): Promise<Rsp> {
     return this.makeRequest('get', path, opts);
   }
 
-  post<Req, Rsp>(path: string, opts?: PromiseOrValue<RequestOptions<Req>>): APIPromise<Rsp> {
+  post<Req, Rsp>(path: string, opts?: PromiseOrValue<RequestOptions<Req>>): Promise<Rsp> {
     return this.makeRequest('post', path, opts);
   }
 
-  put<Req, Rsp>(path: string, opts?: PromiseOrValue<RequestOptions<Req>>): APIPromise<Rsp> {
+  put<Req, Rsp>(path: string, opts?: PromiseOrValue<RequestOptions<Req>>): Promise<Rsp> {
     return this.makeRequest('put', path, opts);
   }
 
-  delete<Req, Rsp>(path: string, opts?: PromiseOrValue<RequestOptions<Req>>): APIPromise<Rsp> {
+  delete<Req, Rsp>(path: string, opts?: PromiseOrValue<RequestOptions<Req>>): Promise<Rsp> {
     return this.makeRequest('delete', path, opts);
   }
 
@@ -116,14 +116,14 @@ export abstract class APIClient {
     method: HTTPMethod,
     path: string,
     opts?: PromiseOrValue<RequestOptions<Req>>,
-  ): APIPromise<Rsp> {
+  ): Promise<Rsp> {
     const options = {
       method,
       path,
       ...opts,
     };
 
-    return new APIPromise(this.performRequest(options as FinalRequestOptions));
+    return this.performRequest(options as FinalRequestOptions).then(handleAPIResponse);
   }
 
   private async performRequest(options: FinalRequestOptions): Promise<APIResponseProps> {
@@ -155,3 +155,4 @@ export abstract class APIClient {
     );
   }
 }
+

package.json

@@ -0,0 +1,24 @@
+import { APIResponseProps } from './models';
+import { AI21Error } from './errors';
+import { Stream } from './Streaming';
+
+
+export async function handleAPIResponse({response, options }: APIResponseProps): Promise<any> {
+  if (options.stream) {
+    if (!response.body) {
+      throw new AI21Error('Response body is null');
+    }
+    return new Stream(response);
+  }
+
+  const contentType = response.headers.get('content-type');
+  const data = contentType?.includes('application/json') 
+    ? await response.json()
+    : await response.text();
+
+  return {
+    data,
+    response,
+  };
+}
+

src/APIPromise.ts

@@ -1,4 +1,3 @@
-import { APIPromise } from '../../APIPromise';
 import * as Models from '../../models';
 import { APIResource } from '../../APIResource';
 import { Stream } from '../../Streaming';
@@ -7,17 +6,17 @@ export class Completions extends APIResource {
   create(
     body: Models.ChatCompletionCreateParamsNonStreaming,
     options?: Models.RequestOptions,
-  ): APIPromise<Models.ChatCompletionResponse>;
+  ): Promise<Models.ChatCompletionResponse>;
 
   create(
     body: Models.ChatCompletionCreateParamsStreaming,
     options?: Models.RequestOptions,
-  ): APIPromise<Stream<Models.ChatCompletionChunk>>;
+  ): Promise<Stream<Models.ChatCompletionChunk>>;
 
   create(
     body: Models.ChatCompletionCreateParams,
     options?: Models.RequestOptions,
-  ): APIPromise<Stream<Models.ChatCompletionChunk> | Models.ChatCompletionResponse>;
+  ): Promise<Stream<Models.ChatCompletionChunk> | Models.ChatCompletionResponse>;
 
   create(body: Models.ChatCompletionCreateParams, options?: Models.RequestOptions) {
     return this._client.post<Models.ChatCompletionCreateParams, Models.ChatCompletionResponse>(
@@ -27,6 +26,6 @@ export class Completions extends APIResource {
         ...options,
         stream: body.stream ?? false,
       } as Models.RequestOptions<Models.ChatCompletionCreateParams>,
-    ) as APIPromise<Models.ChatCompletionResponse> | APIPromise<Stream<Models.ChatCompletionChunk>>;
+    ) as Promise<Models.ChatCompletionResponse> | Promise<Stream<Models.ChatCompletionChunk>>;
   }
 }