Merge pull request #191 from neo4j-labs/DEV

DEV to STAGING

Author: kartikpersistent

README.md

@@ -114,7 +114,7 @@ KNN_MIN_SCORE = ""\
 https://github.com/neo4j-labs/llm-graph-builder/assets/121786590/b725a503-6ade-46d2-9e70-61d57443c311
 
 ## Links
- The Public [ Google cloud Run URL](https://staging-frontend-dcavk67s4a-uc.a.run.app/).
+ The Public [ Google cloud Run URL](https://devfrontend-dcavk67s4a-uc.a.run.app).
  [Workspace URL](https://workspace-preview.neo4j.io/workspace)
 
 

backend/src/graphDB_dataAccess.py

@@ -44,7 +44,6 @@ def create_source_node(self, obj_source_node:sourceNode):
     def update_source_node(self, obj_source_node:sourceNode):
         try:
             processed_time = obj_source_node.updated_at - obj_source_node.created_at
-            job_status = "Completed"
             logging.info("Update source node properties")
             self.graph.query("""MERGE(d:Document {fileName :$fn}) SET d.status = $st, d.createdAt = $c_at, 
                             d.updatedAt = $u_at, d.processingTime = $pt, d.nodeCount= $n_count, 

backend/src/main.py

@@ -62,7 +62,7 @@ def create_source_node_graph_local_file(uri, userName, password, file, model, db
     logging.error(f"Error in creating document node: {error_message}")
     return create_api_response(job_status, message=message,error=error_message,file_source=obj_source_node.source,file_name=obj_source_node.file_name)
 
-def create_source_node_graph_url(uri, userName, password ,model, source_url=None, db_name=None,wiki_query:List[str]=None,aws_access_key_id=None,aws_secret_access_key=None, gcs_bucket_name=None, gcs_bucket_folder=None):
+def create_source_node_graph_url(uri, userName, password ,model, source_url=None, db_name=None, wiki_query:str=None, aws_access_key_id=None,aws_secret_access_key=None, gcs_bucket_name=None, gcs_bucket_folder=None):
     """
       Creates a source node in Neo4jGraph and sets properties.
       
@@ -157,16 +157,19 @@ def create_source_node_graph_url(uri, userName, password ,model, source_url=None
               source_type = 'text'
               job_status = 'Completed'
               pages = WikipediaLoader(query=query.strip(), load_max_docs=1, load_all_available_meta=True).load()
-              obj_source_node = sourceNode()
-              obj_source_node.file_name = query.strip()
-              obj_source_node.file_type = source_type
-              obj_source_node.file_source = 'Wikipedia'
-              obj_source_node.file_size = sys.getsizeof(pages[0].page_content)
-              obj_source_node.model = model
-              obj_source_node.url = pages[0].metadata['source']
-              obj_source_node.created_at = datetime.now()
-              obj_source_node.status = 'New'
               try:
+                if not pages:
+                   Failed_count+=1
+                   continue
+                obj_source_node = sourceNode()
+                obj_source_node.file_name = query.strip()
+                obj_source_node.file_type = source_type
+                obj_source_node.file_source = 'Wikipedia'
+                obj_source_node.file_size = sys.getsizeof(pages[0].page_content)
+                obj_source_node.model = model
+                obj_source_node.url = pages[0].metadata['source']
+                obj_source_node.created_at = datetime.now()
+                obj_source_node.status = 'New'
                 graphDb_data_Access = graphDBdataAccess(graph)
                 graphDb_data_Access.create_source_node(obj_source_node)
                 success_count+=1
@@ -273,9 +276,17 @@ def extract_graph_from_file(uri, userName, password, model, db_name=None, file=N
         logging.error(f"Pdf content or Youtube transcript is not available")
         graphDb_data_Access.update_exception_db(file_name,message)
         return create_api_response(job_status,message=message,file_name=file_name)
-        
-    # update_node_prop = "SET d.createdAt ='{}', d.updatedAt = '{}', d.processingTime = '{}',d.status = '{}', d.errorMessage = '{}',d.nodeCount= {}, d.relationshipCount = {}, d.model = '{}'"
-    # pages = loader.load_and_split()
+
+    obj_source_node = sourceNode()
+    status = "Processing"
+    obj_source_node.file_name = file_name
+    obj_source_node.status = status
+    obj_source_node.created_at = start_time
+    obj_source_node.updated_at = start_time
+    logging.info(file_name)
+    logging.info(obj_source_node)
+    # graphDb_data_Access.update_source_node(obj_source_node)
+    
     full_document_content = ""
     bad_chars = ['"', "\n", "'"]
     for i in range(0,len(pages)):
@@ -336,7 +347,6 @@ def extract_graph_from_file(uri, userName, password, model, db_name=None, file=N
     obj_source_node.node_count = nodes_created
     obj_source_node.relationship_count = relationships_created
 
-    graphDb_data_Access = graphDBdataAccess(graph)
     graphDb_data_Access.update_source_node(obj_source_node)
 
     output = {

backend/temp.pdf

@@ -40,6 +40,8 @@ services:
       - /app/node_modules
     environment:
       - BACKEND_API_URL=${BACKEND_API_URL-}
+      - BLOOM_URL=${BLOOM_URL}
+      - REACT_APP_SOURCES=${REACT_APP_SOURCES}
     container_name: frontend
     ports:
       - "5173:5173"

docker-compose.yml

@@ -1,7 +1,9 @@
 # Step 1: Build the React application
 FROM node:20 AS build
-ENV BACKEND_API_URL "https://staging-frontend-dcavk67s4a-uc.a.run.app/"
-ENV BLOOM_URL "https://bloom-latest.s3.eu-west-2.amazonaws.com/assets/index.html?connectURL=neo4j%2B://"
+ENV BACKEND_API_URL "https://devbackend-new-dcavk67s4a-uc.a.run.app"
+#ENV BLOOM_URL "https://bloom-latest.s3.eu-west-2.amazonaws.com/assets/index.html?connectURL={CONNECT_URL}&search=Show+me+a+graph"
+ENV BLOOM_URL "https://bloom-latest.s3.eu-west-2.amazonaws.com/assets/index.html?connectURL={CONNECT_URL}&search=Show+me+a+graph&featureGenAISuggestions=true&featureGenAISuggestionsInternal=true"
+ENV REACT_APP_SOURCES "local,wikipedia,s3,gcs"
 WORKDIR /app
 COPY package.json .npmrc  yarn.lock ./
 RUN yarn add @neo4j-nvl/interaction-handlers @neo4j-nvl/core @neo4j-nvl/react

frontend/Dockerfile

@@ -47,7 +47,7 @@
 }
 
 .contentWithChatBot {
-  width: calc(-385px + 100dvw);
+  width: calc(-425px + 100dvw);
   height: calc(100dvh - 60px);
   padding: 3px;
   display: flex;

frontend/src/App.css

@@ -2,13 +2,12 @@ import './App.css';
 import '@neo4j-ndl/base/lib/neo4j-ds-styles.css';
 import ThemeWrapper from './context/ThemeWrapper';
 import QuickStarter from './components/QuickStarter';
-function App() {
+const App: React.FC = () => {
   return (
-    //  @ts-ignore
     <ThemeWrapper>
       <QuickStarter />
     </ThemeWrapper>
   );
-}
+};
 
 export default App;

frontend/src/App.tsx

@@ -1,32 +1,26 @@
-import { Button, IconButton, Tip } from '@neo4j-ndl/react';
+import { IconButton, Tip } from '@neo4j-ndl/react';
 
 const ButtonWithToolTip = ({
   text,
   children,
   onClick,
-  ishrefButton,
-  href,
-  target,
+  size = 'medium',
+  clean,
+  grouped,
 }: {
   text: string;
   children: React.ReactNode;
   onClick?: () => void;
-  ishrefButton?: boolean;
-  href?: string;
-  target?: string;
+  size?: 'small' | 'medium' | 'large';
+  clean?: boolean;
+  grouped?: boolean;
 }) => {
   return (
     <Tip allowedPlacements={['left']}>
       <Tip.Trigger>
-        {ishrefButton ? (
-          <Button fill='outlined' href={href} target={target}>
-            {children}
-          </Button>
-        ) : (
-          <IconButton aria-label={text} size='medium' clean grouped onClick={onClick}>
-            {children}
-          </IconButton>
-        )}
+        <IconButton aria-label={text} size={size} clean={clean} grouped={grouped} onClick={onClick}>
+          {children}
+        </IconButton>
       </Tip.Trigger>
       <Tip.Content isPortaled={false} style={{ whiteSpace: 'nowrap' }}>
         {text}

frontend/src/components/ButtonWithToolTip.tsx

@@ -3,7 +3,7 @@ import { useEffect, useRef, useState } from 'react';
 import { Button, Widget, Typography, Avatar, TextInput } from '@neo4j-ndl/react';
 import ChatBotUserAvatar from '../assets/images/chatbot-user.png';
 import ChatBotAvatar from '../assets/images/chatbot-ai.png';
-import { ChatbotProps } from '../types';
+import { ChatbotProps, UserCredentials } from '../types';
 import { useCredentials } from '../context/UserCredentials';
 import chatBotAPI from '../services/QnaAPI';
 import { v4 as uuidv4 } from 'uuid';
@@ -80,7 +80,7 @@ export default function Chatbot(props: ChatbotProps) {
       setLoading(true);
       setInputMessage('');
       simulateTypingEffect(' ');
-      const chatresponse = await chatBotAPI(userCredentials, inputMessage, sessionId);
+      const chatresponse = await chatBotAPI(userCredentials as UserCredentials, inputMessage, sessionId);
       chatbotReply = chatresponse?.data?.message;
       simulateTypingEffect(chatbotReply);
       setLoading(false);
@@ -171,6 +171,7 @@ export default function Chatbot(props: ChatbotProps) {
         <form onSubmit={handleSubmit} className='flex gap-2.5 w-full'>
           <TextInput
             className='n-bg-palette-neutral-bg-default flex-grow-7 w-full'
+            aria-label='chatbot-input'
             type='text'
             value={inputMessage}
             fluid