Merge branch 'STAGING' into DEV

Author: kaustubh-darekar

README.md

@@ -31,12 +31,10 @@ If you are using Neo4j Desktop, you will not be able to use the docker-compose b
 ### Local deployment
 #### Running through docker-compose
 By default only OpenAI and Diffbot are enabled since Gemini requires extra GCP configurations.
-Accoroding to enviornment we are configuring the models which is indicated by VITE_LLM_MODELS_PROD variable we can configure model based on our need.
+According to enviornment we are configuring the models which is indicated by VITE_LLM_MODELS_PROD variable we can configure model based on our need.
 EX:
 ```env
 VITE_LLM_MODELS_PROD="openai_gpt_4o,openai_gpt_4o_mini,diffbot,gemini_1.5_flash"
-
-```
 You can then run Docker Compose to build and start all components:
 ```bash
 docker-compose up --build
@@ -60,7 +58,7 @@ You can of course combine all (local, youtube, wikipedia, s3 and gcs) or remove
 ### Chat Modes
 
 By default,all of the chat modes will be available: vector, graph_vector, graph, fulltext, graph_vector_fulltext , entity_vector and global_vector.
-By default,all of the chat modes will be available: vector, graph_vector, graph, fulltext, graph_vector_fulltext , entity_vector and global_vector.
+
 If none of the mode is mentioned in the chat modes variable all modes will be available:
 ```env
 VITE_CHAT_MODES=""
@@ -103,7 +101,7 @@ Alternatively, you can run the backend and frontend separately:
 To deploy the app and packages on Google Cloud Platform, run the following command on google cloud run:
 ```bash
 # Frontend deploy 
-gcloud run deploy dev-frontend --set-env-vars "VITE_BACKEND_API_URL=" --set-env-vars "VITE_FRONTEND_HOSTNAME=hostname.us-central1.run.app" --set-env-vars "VITE_SEGMENT_API_URL=https://cdn.segment.com/v1/projects/4SGwdwzuDm5WkFvQtz7D6ATQlo14yjmW/settings"
+gcloud run deploy dev-frontend 
 source location current directory > Frontend
 region : 32 [us-central 1]
 Allow unauthenticated request : Yes

backend/requirements.txt

@@ -58,4 +58,5 @@ graphdatascience==1.12
 Secweb==1.11.0
 ragas==0.2.6
 rouge_score==0.1.2
-langchain-neo4j==0.2.0
+langchain-neo4j==0.2.0
+

backend/src/graphDB_dataAccess.py

@@ -535,5 +535,4 @@ def update_node_relationship_count(self,document_name):
                     "nodeCount" : nodeCount,
                     "relationshipCount" : relationshipCount
                     }
-            
         return response

backend/src/llm.py

@@ -191,6 +191,7 @@ async def get_graph_document_list(
     return graph_document_list
 
 
+
 async def get_graph_from_llm(model, chunkId_chunkDoc_list, allowedNodes, allowedRelationship, additional_instructions=None):
     try:
         llm, model_name = get_llm(model)

backend/src/make_relationships.py

@@ -37,7 +37,6 @@ def merge_relationship_between_chunk_and_entites(graph: Neo4jGraph, graph_docume
 
 
 def create_chunk_embeddings(graph, chunkId_chunkDoc_list, file_name):
-    
     isEmbedding = os.getenv('IS_EMBEDDING')
 
     embeddings, dimension = EMBEDDING_FUNCTION , EMBEDDING_DIMENSION

frontend/src/components/Content.tsx

@@ -715,6 +715,8 @@ const Content: React.FC<ContentProps> = ({
         setshowExpirationModal(true);
       } else if (largeFileExists && isGCSActive) {
         setshowConfirmationModal(true);
+      } else if (largeFileExists && isGCSActive) {
+        setshowExpirationModal(true);
       } else {
         handleGenerateGraph(selectedRows.filter((f) => isFileReadyToProcess(f, false)));
       }
@@ -738,7 +740,7 @@ const Content: React.FC<ContentProps> = ({
       } else if (expiredFileExists && isGCSActive) {
         setshowExpirationModal(true);
       } else {
-        handleGenerateGraph(filesData.filter((f) => f.status === 'New' || f.status === 'Ready to Reprocess'));
+        handleGenerateGraph(filesData.filter((f) => isFileReadyToProcess(f, false)));
       }
     }
   };
@@ -799,6 +801,19 @@ const Content: React.FC<ContentProps> = ({
           ></ConfirmationDialog>
         </Suspense>
       )}
+      {showExpirationModal && filesForProcessing.length && (
+        <Suspense fallback={<FallBackDialog />}>
+          <ConfirmationDialog
+            open={showExpirationModal}
+            largeFiles={filesForProcessing}
+            extractHandler={handleGenerateGraph}
+            onClose={() => setshowExpirationModal(false)}
+            loading={extractLoading}
+            selectedRows={childRef.current?.getSelectedRows() as CustomFile[]}
+            isLargeDocumentAlert={false}
+          ></ConfirmationDialog>
+        </Suspense>
+      )}
       {showDeletePopUp && (
         <DeletePopUp
           open={showDeletePopUp}

frontend/src/components/Layout/PageLayout.tsx

@@ -125,7 +125,6 @@ const PageLayout: React.FC = () => {
         }
       };
       // To update credentials if environment values differ
-
       const updateSessionIfNeeded = (envCredentials: any, storedSession: string) => {
         try {
           const storedCredentials = JSON.parse(storedSession);