feat: wip

Author: amirai21

src/fetch/BaseFetch.ts

@@ -3,6 +3,11 @@ import { AI21Error } from '../errors';
 import { FinalRequestOptions, CrossPlatformResponse } from '../types';
 import { APIResponseProps } from '../types/API';
 
+export type APIResponse<T> = {
+  data?: T;
+  response: CrossPlatformResponse;
+};
+
 export abstract class BaseFetch {
   abstract call(url: string, options: FinalRequestOptions): Promise<CrossPlatformResponse>;
   async handleResponse<T>({ response, options }: APIResponseProps) {

src/files/BrowserFilesHandler.ts

@@ -17,6 +17,7 @@ export class BrowserFilesHandler extends BaseFilesHandler {
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   getMultipartFormDataHeaders(formData: UnifiedFormData): Record<string, string> | null {
+    /* In browser, we don't need to set any additional headers for multipart/form-data, as the browser will handle it */
     return {};
   }
 }

src/files/NodeFilesHandler.ts

@@ -1,6 +1,7 @@
 import { UnifiedFormData } from 'types';
 import { FilePathOrFileObject } from 'types/rag';
 import { BaseFilesHandler } from './BaseFilesHandler';
+import { FormDataNode } from 'types/API';
 
 export class NodeFilesHandler extends BaseFilesHandler {
   async convertReadableStream(whatwgStream: ReadableStream): Promise<NodeJS.ReadableStream> {
@@ -19,15 +20,9 @@ export class NodeFilesHandler extends BaseFilesHandler {
     });
   }
 
-  async getBoundary(formData: UnifiedFormData): Promise<string | undefined> {
-    const { default: FormDataNode } = await import('form-data');
-    if (formData instanceof FormDataNode) {
-      return formData.getBoundary();
-    } else {
-      throw new Error(
-        'getBoundary invoked with native browser FormData instance instead of NodeJS form-data',
-      );
-    }
+  getBoundary(formData: UnifiedFormData): string {
+    const formDataNode = formData as FormDataNode;
+    return formDataNode.getBoundary();
   }
 
   async createFormData(file: FilePathOrFileObject): Promise<UnifiedFormData> {
@@ -51,9 +46,8 @@ export class NodeFilesHandler extends BaseFilesHandler {
 
   getMultipartFormDataHeaders(formData: UnifiedFormData): Record<string, string> | null {
     if (formData instanceof FormData) {
-      return null;
+      throw new Error('getMultipartFormDataHeaders invoked with native browser FormData instance instead of NodeJS form-data');
     }
-
     const boundary = formData.getBoundary();
     return {
       'Content-Type': `multipart/form-data; boundary=${boundary}`,

src/types/API.ts

@@ -30,4 +30,5 @@ export type Headers = Record<string, string | null | undefined>;
 export type CrossPlatformResponse = Response | import('node-fetch').Response;
 export type CrossPlatformReadableStream = ReadableStream<Uint8Array> | import('stream/web').ReadableStream;
 
-export type UnifiedFormData = FormData | import('form-data');
+export type FormDataNode = import('form-data');
+export type UnifiedFormData = FormData | FormDataNode;

src/types/index.ts

@@ -36,6 +36,7 @@ export {
   type Headers,
   type CrossPlatformResponse,
   type UnifiedFormData,
+  type FormDataNode,
 } from './API';
 
 export {