fix: CR

Author: asafgardin

src/APIClient.ts

@@ -8,7 +8,6 @@ import {
   FinalRequestOptions,
   APIResponseProps,
   HTTPMethod,
-  PromiseOrValue,
   DefaultQuery,
   Headers,
 } from './types/index.js';
@@ -43,19 +42,19 @@ export abstract class APIClient {
     this.maxRetries = validatePositiveInteger('maxRetries', maxRetries);
     this.timeout = validatePositiveInteger('timeout', timeout);
   }
-  get<Req, Rsp>(path: string, opts?: PromiseOrValue<RequestOptions<Req>>): Promise<Rsp> {
+  get<Req, Rsp>(path: string, opts?: RequestOptions<Req>): Promise<Rsp> {
     return this.makeRequest('get', path, opts);
   }
 
-  post<Req, Rsp>(path: string, opts?: PromiseOrValue<RequestOptions<Req>>): Promise<Rsp> {
+  post<Req, Rsp>(path: string, opts?: RequestOptions<Req>): Promise<Rsp> {
     return this.makeRequest('post', path, opts);
   }
 
-  put<Req, Rsp>(path: string, opts?: PromiseOrValue<RequestOptions<Req>>): Promise<Rsp> {
+  put<Req, Rsp>(path: string, opts?: RequestOptions<Req>): Promise<Rsp> {
     return this.makeRequest('put', path, opts);
   }
 
-  delete<Req, Rsp>(path: string, opts?: PromiseOrValue<RequestOptions<Req>>): Promise<Rsp> {
+  delete<Req, Rsp>(path: string, opts?: RequestOptions<Req>): Promise<Rsp> {
     return this.makeRequest('delete', path, opts);
   }
 
@@ -83,11 +82,7 @@ export abstract class APIClient {
 
   protected abstract defaultQuery(): DefaultQuery | undefined;
 
-  private makeRequest<Req, Rsp>(
-    method: HTTPMethod,
-    path: string,
-    opts?: PromiseOrValue<RequestOptions<Req>>,
-  ): Promise<Rsp> {
+  private makeRequest<Req, Rsp>(method: HTTPMethod, path: string, opts?: RequestOptions<Req>): Promise<Rsp> {
     const options = {
       method,
       path,
@@ -116,7 +111,7 @@ export abstract class APIClient {
     });
 
     if (!response.ok) {
-      throw new AI21Error(`Request failed with status ${response.status}`);
+      throw new AI21Error(`Request failed with status ${response.status}. ${await response.text()}`);
     }
 
     return { response, options, controller };

src/APIResource.ts

@@ -1,9 +1,9 @@
 import type { APIClient } from './APIClient';
 
 export class APIResource {
-  protected _client: APIClient;
+  protected client: APIClient;
 
   constructor(client: APIClient) {
-    this._client = client;
+    this.client = client;
   }
 }

src/ResponseHandler.ts

@@ -3,8 +3,8 @@ import { AI21Error } from './errors';
 import { Stream } from './Streaming';
 import { Response } from 'node-fetch';
 
-type APIResponse<T = unknown> = {
-  data: T;
+type APIResponse<T> = {
+  data?: T;
   response: Response;
 };
 
@@ -20,7 +20,7 @@ export async function handleAPIResponse<T>({
   }
 
   const contentType = response.headers.get('content-type');
-  const data = contentType?.includes('application/json') ? await response.json() : await response.text();
+  const data = contentType?.includes('application/json') ? await response.json() : null;
 
   return {
     data,

src/resources/chat/chat.ts

@@ -2,5 +2,5 @@ import { APIResource } from '../../APIResource';
 import { Completions } from './completions';
 
 export class Chat extends APIResource {
-  completions: Completions = new Completions(this._client);
+  completions: Completions = new Completions(this.client);
 }

src/resources/chat/completions.ts

@@ -19,7 +19,7 @@ export class Completions extends APIResource {
   ): Promise<Stream<Models.ChatCompletionChunk> | Models.ChatCompletionResponse>;
 
   create(body: Models.ChatCompletionCreateParams, options?: Models.RequestOptions) {
-    return this._client.post<Models.ChatCompletionCreateParams, Models.ChatCompletionResponse>(
+    return this.client.post<Models.ChatCompletionCreateParams, Models.ChatCompletionResponse>(
       '/chat/completions',
       {
         body,

src/types/API.ts

@@ -30,5 +30,4 @@ export type FinalRequestOptions = RequestOptions & {
 };
 
 export type DefaultQuery = Record<string, unknown>;
-export type PromiseOrValue<T> = T | Promise<T>;
 export type Headers = Record<string, string | null | undefined>;

src/types/index.ts

@@ -33,6 +33,5 @@ export {
   type FinalRequestOptions,
   type HTTPMethod,
   type DefaultQuery,
-  type PromiseOrValue,
   type Headers,
 } from './API';