feat: support node path and file object\ and browser file object

Author: amirai21

examples/studio/conversational-rag/rag-engine.ts

@@ -1,5 +1,5 @@
 import { AI21 } from 'ai21';
-import { FilePathOrFileObject, FileResponse, UploadFileResponse } from '../../../src/types/rag';
+import { FileResponse, UploadFileResponse } from '../../../src/types/rag';
 
 async function waitForFileProcessing(
   client: AI21,
@@ -21,11 +21,9 @@ async function waitForFileProcessing(
 async function uploadQueryUpdateDelete(fileInput) {
   const client = new AI21({ apiKey: process.env.AI21_API_KEY });
   try {
-    const uploadFileResponse: UploadFileResponse = await client.ragEngine.create(
-      fileInput,
-      { path: 'test10' },
-    );
-
+    const uploadFileResponse: UploadFileResponse = await client.ragEngine.create(fileInput, {
+      path: 'test10',
+    });
 
     const fileId = uploadFileResponse.fileId;
     let file: FileResponse = await waitForFileProcessing(client, fileId);
@@ -52,10 +50,11 @@ async function listFiles() {
   console.log(files);
 }
 
-const filePath = '/Users/amirkoblyansky/Documents/ukraine.txt'
+const filePath = '/Users/amirkoblyansky/Documents/ukraine.txt';
 const fileContent = Buffer.from('This is the content of the file.');
 const dummyFile = new File([fileContent], 'example.txt', { type: 'text/plain' });
 
+uploadQueryUpdateDelete(filePath).catch(console.error);
 uploadQueryUpdateDelete(dummyFile).catch(console.error);
 
-// listFiles().catch(console.error);
+listFiles().catch(console.error);

src/APIClient.ts

@@ -190,4 +190,3 @@ export abstract class APIClient {
     );
   }
 }
-

src/files/form-utils.ts

@@ -7,71 +7,70 @@ import { Readable } from 'stream';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const appendBodyToFormData = (formData: UnifiedFormData, body: Record<string, any>): void => {
-    for (const [key, value] of Object.entries(body)) {
-      if (Array.isArray(value)) {
-        value.forEach((item) => formData.append(key, item));
-      } else {
-        formData.append(key, value);
-      }
+  for (const [key, value] of Object.entries(body)) {
+    if (Array.isArray(value)) {
+      value.forEach((item) => formData.append(key, item));
+    } else {
+      formData.append(key, value);
     }
-  };
+  }
+};
 
 // Convert WHATWG ReadableStream to Node.js Readable Stream
 function convertReadableStream(whatwgStream: ReadableStream): Readable {
-    const reader = whatwgStream.getReader();
+  const reader = whatwgStream.getReader();
 
-    return new Readable({
-        async read() {
-            const { done, value } = await reader.read();
-            if (done) {
-                this.push(null);
-            } else {
-                this.push(value);
-            }
-        },
-    });
+  return new Readable({
+    async read() {
+      const { done, value } = await reader.read();
+      if (done) {
+        this.push(null);
+      } else {
+        this.push(value);
+      }
+    },
+  });
 }
 
-
 export async function createFormData(file: FilePathOrFileObject): Promise<UnifiedFormData> {
+  if (Runtime.isBrowser) {
+    const formData = new FormData();
 
-    if (Runtime.isBrowser) {
-        const formData = new FormData();
-
-        if (file instanceof window.File) {
-            formData.append('file', file);
-        } else {
-            throw new Error('Unsupported file type in browser');
-        }
- 
-        return formData;
-    } else { // Node environment:
+    if (file instanceof window.File) {
+      formData.append('file', file);
+    } else {
+      throw new Error('Unsupported file type in browser');
+    }
 
-        const { default: FormDataNode } = await import('form-data');
-        const formData = new FormDataNode();
+    return formData;
+  } else {
+    // Node environment:
 
-        if (typeof file === 'string') {
-            const { createReadStream } = await import('fs');
-            formData.append('file', createReadStream(file), { filename: file.split('/').pop() });
-        } else if (Buffer.isBuffer(file)) {
-            formData.append('file', file, { filename: 'TODO - add filename to buffer flow' });
-        } else if (file instanceof File) {
-            const nodeStream = convertReadableStream(file.stream());
-            formData.append('file', nodeStream, file.name);
-        } else {
-            throw new Error('Unsupported file type in Node.js');
-        }
+    const { default: FormDataNode } = await import('form-data');
+    const formData = new FormDataNode();
 
-        return formData;
+    if (typeof file === 'string') {
+      const { createReadStream } = await import('fs');
+      formData.append('file', createReadStream(file), { filename: file.split('/').pop() });
+    } else if (Buffer.isBuffer(file)) {
+      formData.append('file', file, { filename: 'TODO - add filename to buffer flow' });
+    } else if (file instanceof File) {
+      const nodeStream = convertReadableStream(file.stream());
+      formData.append('file', nodeStream, file.name);
+    } else {
+      throw new Error('Unsupported file type in Node.js');
     }
+
+    return formData;
+  }
 }
 
 export async function getBoundary(formData: UnifiedFormData): Promise<string | undefined> {
-    if (!Runtime.isBrowser) {
-        const { default: FormDataNode } = await import('form-data');
-        if (formData instanceof FormDataNode) {
-            return formData.getBoundary();
-        }
+  if (!Runtime.isBrowser) {
+    const { default: FormDataNode } = await import('form-data');
+    if (formData instanceof FormDataNode) {
+      return formData.getBoundary();
     }
-    return undefined;
+  }
+  return undefined;
 }

src/resources/rag/ragEngine.ts

@@ -1,22 +1,20 @@
 import * as Models from '../../types';
 import { APIResource } from '../../APIResource';
-import { UploadFileResponse, UploadFileRequest, ListFilesFilters, UpdateFileRequest, FilePathOrFileObject } from '../../types/rag';
+import {
+  UploadFileResponse,
+  UploadFileRequest,
+  ListFilesFilters,
+  UpdateFileRequest,
+  FilePathOrFileObject,
+} from '../../types/rag';
 import { FileResponse } from 'types/rag/FileResponse';
 
 const RAG_ENGINE_PATH = '/library/files';
 
 export class RAGEngine extends APIResource {
-  create(
-    file: string,
-    body: UploadFileRequest,
-    options?: Models.RequestOptions,
-  ): Promise<UploadFileResponse>;
+  create(file: string, body: UploadFileRequest, options?: Models.RequestOptions): Promise<UploadFileResponse>;
 
-  create(
-    file: File,
-    body: UploadFileRequest,
-    options?: Models.RequestOptions,
-  ): Promise<UploadFileResponse>;
+  create(file: File, body: UploadFileRequest, options?: Models.RequestOptions): Promise<UploadFileResponse>;
 
   create(
     file: FilePathOrFileObject,