Dev to staging

backend/src/document_sources/gcs_bucket.py

@@ -53,7 +53,7 @@ def get_documents_from_gcs(gcs_project_id, gcs_bucket_name, gcs_bucket_folder, g
   else:
       blob_name = gcs_blob_filename  
 
-  logging.info(f"GCS project_id : {gcs_project_id}")
+  logging.info(f"GCS project_id : {gcs_project_id}")  
 
   if access_token is None:
     storage_client = storage.Client(project=gcs_project_id)

frontend/src/components/DropZone.tsx

@@ -1,16 +1,15 @@
-import axios from 'axios';
 import { Dropzone, Flex, Typography } from '@neo4j-ndl/react';
 import React, { useState, useEffect, FunctionComponent } from 'react';
 import Loader from '../utils/Loader';
 import { v4 as uuidv4 } from 'uuid';
 import { useCredentials } from '../context/UserCredentials';
 import { useFileContext } from '../context/UsersFiles';
 import CustomAlert from './Alert';
-import { CustomFile, CustomFileBase, UploadResponse, alertStateType } from '../types';
+import { CustomFile, CustomFileBase, UserCredentials, alertStateType } from '../types';
 import { buttonCaptions, chunkSize } from '../utils/Constants';
-import { url } from '../utils/Utils';
 import { InformationCircleIconOutline } from '@neo4j-ndl/react/icons';
 import IconButtonWithToolTip from './IconButtonToolTip';
+import { uploadAPI } from '../utils/FileAPI';
 
 const DropZone: FunctionComponent = () => {
   const { filesData, setFilesData, model } = useFileContext();
@@ -122,12 +121,7 @@ const DropZone: FunctionComponent = () => {
           })
         );
         try {
-          const apiResponse = await axios.post<UploadResponse>(`${url()}/upload`, formData, {
-            headers: {
-              'Content-Type': 'multipart/form-data',
-            },
-          });
-
+          const apiResponse=await uploadAPI(chunk,userCredentials as UserCredentials,model,chunkNumber,totalChunks,file.name)
           if (apiResponse?.data.status === 'Failed') {
             throw new Error(
               JSON.stringify({ message: apiResponse.data.message, fileName: apiResponse.data.file_name })
@@ -283,7 +277,7 @@ const DropZone: FunctionComponent = () => {
               setalertDetails({
                 showAlert: true,
                 alertType: 'error',
-                alertMessage: 'Failed To Upload, File is larger than 15MB',
+                alertMessage: 'Failed To Upload, Unsupported file extention',
               });
             }
           },

frontend/src/types.ts

@@ -67,8 +67,11 @@ export type ExtractParams = {
 } & { [key: string]: any };
 
 export type UploadParams = {
-  file: File;
+  file: Blob;
   model: string;
+  chunkNumber:number;
+  totalChunks:number;
+  originalname:string
 } & { [key: string]: any };
 
 export type FormDataParams = ExtractParams | UploadParams;

frontend/src/utils/FileAPI.ts

@@ -4,11 +4,11 @@ import { UserCredentials, ExtractParams, UploadParams } from '../types';
 import { apiCall } from '../services/CommonAPI';
 
 // Upload Call
-export const uploadAPI = async (file: File, userCredentials: UserCredentials, model: string): Promise<any> => {
-  const urlUpload = `${url()}/sources`;
+export const uploadAPI = async (file: Blob, userCredentials: UserCredentials, model: string, chunkNumber: number, totalChunks: number,originalname:string): Promise<any> => {
+  const urlUpload = `${url()}/upload`;
   const method: Method = 'post';
   const commonParams: UserCredentials = userCredentials;
-  const additionalParams: UploadParams = { file, model };
+  const additionalParams: UploadParams = { file, model, chunkNumber, totalChunks ,originalname};
   const response = await apiCall(urlUpload, method, commonParams, additionalParams);
   return response;
 };