Dev

README.md

@@ -149,7 +149,7 @@ Allow unauthenticated request : Yes
 | VITE_LLM_MODELS              | Mandatory          | diffbot,openai-gpt-3.5,openai-gpt-4o | Models available for selection on the frontend, used for entities extraction and Q&A
 | VITE_CHAT_MODES              | Mandatory          | vector,graph+vector,graph,hybrid | Chat modes available for Q&A
 | VITE_ENV                     | Mandatory          | DEV or PROD           | Environment variable for the app                                                                 |
-| VITE_TIME_PER_CHUNK          | Optional           | 4             | Time per chunk for processing                                                                    |
+| VITE_TIME_PER_PAGE          | Optional           | 50             | Time per page for processing                                                                    |
 | VITE_CHUNK_SIZE              | Optional           | 5242880       | Size of each chunk of file for upload                                                                |
 | VITE_GOOGLE_CLIENT_ID        | Optional           |               | Client ID for Google authentication                                                              |
 | GCS_FILE_CACHE          | Optional           | False         | If set to True, will save the files to process into GCS. If set to False, will save the files locally   |

backend/src/QA_integration_new.py

@@ -41,7 +41,7 @@
 
 def get_neo4j_retriever(graph, retrieval_query,document_names,mode,index_name="vector",keyword_index="keyword", search_k=CHAT_SEARCH_KWARG_K, score_threshold=CHAT_SEARCH_KWARG_SCORE_THRESHOLD):
     try:
-        if mode == "fulltext" or mode == "fulltext+graph":
+        if mode == "fulltext" or mode == "graph + vector + fulltext":
             neo_db = Neo4jVector.from_existing_graph(
                 embedding=EMBEDDING_FUNCTION,
                 index_name=index_name,

example.env

@@ -30,7 +30,6 @@ VITE_BLOOM_URL="https://workspace-preview.neo4j.io/workspace/explore?connectURL=
 VITE_REACT_APP_SOURCES="local,youtube,wiki,s3,web"
 VITE_LLM_MODELS="diffbot,openai-gpt-3.5,openai-gpt-4o" # ",ollama_llama3"
 VITE_ENV="DEV"
-VITE_TIME_PER_CHUNK=4
 VITE_TIME_PER_PAGE=50
 VITE_CHUNK_SIZE=5242880
 VITE_GOOGLE_CLIENT_ID=""

frontend/Dockerfile

@@ -6,7 +6,6 @@ ARG VITE_REACT_APP_SOURCES=""
 ARG VITE_LLM_MODELS=""
 ARG VITE_GOOGLE_CLIENT_ID=""
 ARG VITE_BLOOM_URL="https://workspace-preview.neo4j.io/workspace/explore?connectURL={CONNECT_URL}&search=Show+me+a+graph&featureGenAISuggestions=true&featureGenAISuggestionsInternal=true"
-ARG VITE_TIME_PER_CHUNK=4
 ARG VITE_TIME_PER_PAGE=50
 ARG VITE_LARGE_FILE_SIZE=5242880
 ARG VITE_CHUNK_SIZE=5242880
@@ -23,8 +22,8 @@ RUN VITE_BACKEND_API_URL=$VITE_BACKEND_API_URL \
     VITE_LLM_MODELS=$VITE_LLM_MODELS \
     VITE_GOOGLE_CLIENT_ID=$VITE_GOOGLE_CLIENT_ID \
     VITE_BLOOM_URL=$VITE_BLOOM_URL \
-    VITE_TIME_PER_CHUNK=$VITE_TIME_PER_CHUNK \
     VITE_CHUNK_SIZE=$VITE_CHUNK_SIZE \
+    VITE_TIME_PER_PAGE=$VITE_TIME_PER_PAGE \
     VITE_ENV=$VITE_ENV \
     VITE_LARGE_FILE_SIZE=${VITE_LARGE_FILE_SIZE} \
     VITE_CHAT_MODES=$VITE_CHAT_MODES \

frontend/example.env

@@ -3,7 +3,6 @@ VITE_BLOOM_URL="https://workspace-preview.neo4j.io/workspace/explore?connectURL=
 VITE_REACT_APP_SOURCES="local,youtube,wiki,s3,web"
 VITE_LLM_MODELS="diffbot,openai-gpt-3.5,openai-gpt-4o"
 VITE_ENV="DEV"
-VITE_TIME_PER_CHUNK=4
 VITE_TIME_PER_PAGE=50
 VITE_CHUNK_SIZE=5242880
 VITE_LARGE_FILE_SIZE=5242880

frontend/src/API/Index.ts

@@ -0,0 +1,7 @@
+import axios from 'axios';
+import { url } from '../utils/Utils';
+
+const api = axios.create({
+  baseURL: url(),
+});
+export default api;

frontend/src/components/ChatBot/ChatInfoModal.tsx

@@ -175,7 +175,7 @@ const ChatInfoModal: React.FC<chatInfoMessage> = ({
       ) : (
         <Tabs size='large' fill='underline' onChange={onChangeTabs} value={activeTab}>
           {mode != 'graph' ? <Tabs.Tab tabId={3}>Sources used</Tabs.Tab> : <></>}
-          {mode === 'graph+vector' || mode === 'graph' ? <Tabs.Tab tabId={4}>Top Entities used</Tabs.Tab> : <></>}
+          {mode === 'graph+vector' || mode === 'graph' || mode === 'graph+vector+fulltext' ? <Tabs.Tab tabId={4}>Top Entities used</Tabs.Tab> : <></>}
           {mode === 'graph' && cypher_query?.trim().length ? (
             <Tabs.Tab tabId={6}>Generated Cypher Query</Tabs.Tab>
           ) : (

frontend/src/components/ChatBot/ChatModeToggle.tsx

@@ -31,7 +31,12 @@ export default function ChatModeToggle({
         () =>
           chatModes?.map((m) => {
             return {
-              title: capitalize(m),
+              title: m.includes('+')
+                ? m
+                    .split('+')
+                    .map((s) => capitalize(s))
+                    .join('+')
+                : capitalize(m),
               onClick: () => {
                 setchatMode(m);
               },

frontend/src/components/Dropdown.tsx

@@ -1,6 +1,6 @@
 import { Dropdown, Tip } from '@neo4j-ndl/react';
 import { OptionType, ReusableDropdownProps } from '../types';
-import { useMemo } from 'react';
+import { useMemo, useReducer } from 'react';
 import { capitalize } from '../utils/Utils';
 
 const DropdownComponent: React.FC<ReusableDropdownProps> = ({
@@ -13,14 +13,15 @@ const DropdownComponent: React.FC<ReusableDropdownProps> = ({
   isDisabled,
   value,
 }) => {
+  const [disableTooltip, toggleDisableState] = useReducer((state) => !state, false);
   const handleChange = (selectedOption: OptionType | null | void) => {
     onSelect(selectedOption);
   };
   const allOptions = useMemo(() => options, [options]);
   return (
     <>
       <div className={view === 'ContentView' ? 'w-[150px]' : ''}>
-        <Tip allowedPlacements={['top']}>
+        <Tip allowedPlacements={['top']} isDisabled={disableTooltip}>
           <Tip.Trigger>
             <Dropdown
               type='select'
@@ -49,6 +50,12 @@ const DropdownComponent: React.FC<ReusableDropdownProps> = ({
                 menuPlacement: 'auto',
                 isDisabled: isDisabled,
                 value: value,
+                onMenuOpen: () => {
+                  toggleDisableState();
+                },
+                onMenuClose: () => {
+                  toggleDisableState();
+                },
               }}
               size='medium'
               fluid

frontend/src/components/Graph/GraphViewModal.tsx

@@ -196,43 +196,50 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
   }, [open]);
 
   // The search and update nodes
-  const handleSearch = useCallback((value: string) => {
-    const query = value.toLowerCase();
-    const updatedNodes = nodes.map((node) => {
-      if (query === '') {
+  const handleSearch = useCallback(
+    (value: string) => {
+      const query = value.toLowerCase();
+      const updatedNodes = nodes.map((node) => {
+        if (query === '') {
+          return {
+            ...node,
+            activated: false,
+            selected: false,
+            size: graphLabels.nodeSize,
+          };
+        }
+        const { id, properties, caption } = node;
+        const propertiesMatch = properties?.id?.toLowerCase().includes(query);
+        const match = id.toLowerCase().includes(query) || propertiesMatch || caption?.toLowerCase().includes(query);
         return {
           ...node,
+          activated: match,
+          selected: match,
+          size:
+            match && viewPoint === graphLabels.showGraphView
+              ? 100
+              : match && viewPoint !== graphLabels.showGraphView
+              ? 50
+              : graphLabels.nodeSize,
+        };
+      });
+      // deactivating any active relationships
+      const updatedRelationships = relationships.map((rel) => {
+        return {
+          ...rel,
           activated: false,
           selected: false,
-          size: graphLabels.nodeSize
         };
-      }
-      const { id, properties, caption } = node;
-      const propertiesMatch = properties?.id?.toLowerCase().includes(query);
-      const match = id.toLowerCase().includes(query) || propertiesMatch || caption?.toLowerCase().includes(query);
-      return {
-        ...node,
-        activated: match,
-        selected: match,
-        size: (match && viewPoint === graphLabels.showGraphView) ? 100 : (match && viewPoint !== graphLabels.showGraphView) ? 50 : graphLabels.nodeSize
-      };
-
-    });
-    // deactivating any active relationships
-    const updatedRelationships = relationships.map((rel) => {
-      return {
-        ...rel,
-        activated: false,
-        selected: false,
-      };
-    });
-    setNodes(updatedNodes);
-    setRelationships(updatedRelationships);
-  }, [nodes]);
+      });
+      setNodes(updatedNodes);
+      setRelationships(updatedRelationships);
+    },
+    [nodes]
+  );
 
   useEffect(() => {
-    handleSearch(debouncedQuery)
-  }, [debouncedQuery])
+    handleSearch(debouncedQuery);
+  }, [debouncedQuery]);
 
   const initGraph = (
     graphType: GraphType[],
@@ -340,7 +347,12 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
         ...node,
         activated: isActive,
         selected: isActive,
-        size: (isActive && viewPoint === graphLabels.showGraphView) ? 100 : (isActive && viewPoint !== graphLabels.showGraphView) ? 50 : graphLabels.nodeSize
+        size:
+          isActive && viewPoint === graphLabels.showGraphView
+            ? 100
+            : isActive && viewPoint !== graphLabels.showGraphView
+            ? 50
+            : graphLabels.nodeSize,
       };
     });
     // deactivating any active relationships
@@ -372,7 +384,7 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
         ...node,
         activated: false,
         selected: false,
-        size: graphLabels.nodeSize
+        size: graphLabels.nodeSize,
       };
     });
     if (searchQuery !== '') {
@@ -568,4 +580,4 @@ const GraphViewModal: React.FunctionComponent<GraphViewModalProps> = ({
     </>
   );
 };
-export default GraphViewModal;
+export default GraphViewModal;

frontend/src/components/Graph/LegendsChip.tsx

@@ -1,14 +1,6 @@
 import { LegendChipProps } from '../../types';
 import Legend from '../UI/Legend';
 
-export const LegendsChip: React.FunctionComponent<LegendChipProps> = ({
-  scheme,
-  label,
-  type,
-  count,
-  onClick,
-}) => {
-  return (
-    <Legend title={label} count={count} bgColor={scheme[label]} type={type} onClick={onClick}/>
-  );
+export const LegendsChip: React.FunctionComponent<LegendChipProps> = ({ scheme, label, type, count, onClick }) => {
+  return <Legend title={label} count={count} bgColor={scheme[label]} type={type} onClick={onClick} />;
 };

frontend/src/components/Layout/PageLayout.tsx

@@ -175,4 +175,4 @@ export default function PageLayoutNew({
       />
     </div>
   );
-}
+}

frontend/src/components/Popups/DeletePopUp/DeletePopUp.tsx

@@ -54,4 +54,4 @@ export default function DeletePopUp({
       </Dialog.Actions>
     </Dialog>
   );
-}
+}

frontend/src/components/Popups/GraphEnhancementDialog/DeleteTabForOrphanNodes/index.tsx

@@ -279,4 +279,4 @@ export default function DeletePopUpForOrphanNodes({
       </Flex>
     </div>
   );
-}
+}

frontend/src/components/Popups/GraphEnhancementDialog/index.tsx

@@ -126,4 +126,4 @@ export default function GraphEnhancementDialog({
       </Dialog.Content>
     </Dialog>
   );
-}
+}

frontend/src/components/Popups/LargeFilePopUp/LargeFilesAlert.tsx

@@ -100,4 +100,4 @@ const LargeFilesAlert: FC<LargefilesProps> = ({ largeFiles, handleToggle, checke
     </Box>
   );
 };
-export default LargeFilesAlert;
+export default LargeFilesAlert;

frontend/src/components/QuickStarter.tsx

@@ -42,4 +42,4 @@ const QuickStarter: React.FunctionComponent = () => {
     </UserCredentialsWrapper>
   );
 };
-export default QuickStarter;
+export default QuickStarter;

frontend/src/services/CancelAPI.ts

@@ -1,6 +1,5 @@
-import axios from 'axios';
-import { url } from '../utils/Utils';
 import { UserCredentials, commonserverresponse } from '../types';
+import api from '../API/Index';
 
 const cancelAPI = async (filenames: string[], source_types: string[]) => {
   try {
@@ -14,7 +13,7 @@ const cancelAPI = async (filenames: string[], source_types: string[]) => {
     }
     formData.append('filenames', JSON.stringify(filenames));
     formData.append('source_types', JSON.stringify(source_types));
-    const response = await axios.post<commonserverresponse>(`${url()}/cancelled_job`, formData);
+    const response = await api.post<commonserverresponse>(`/cancelled_job`, formData);
     return response;
   } catch (error) {
     console.log('Error Posting the Question:', error);

frontend/src/services/ChunkEntitiesInfo.ts

@@ -1,6 +1,5 @@
-import axios from 'axios';
-import { url } from '../utils/Utils';
 import { ChatInfo_APIResponse, UserCredentials } from '../types';
+import api from '../API/Index';
 
 const chunkEntitiesAPI = async (userCredentials: UserCredentials, chunk_ids: string) => {
   try {
@@ -10,7 +9,7 @@ const chunkEntitiesAPI = async (userCredentials: UserCredentials, chunk_ids: str
     formData.append('password', userCredentials?.password ?? '');
     formData.append('chunk_ids', chunk_ids);
 
-    const response: ChatInfo_APIResponse = await axios.post(`${url()}/chunk_entities`, formData, {
+    const response: ChatInfo_APIResponse = await api.post(`/chunk_entities`, formData, {
       headers: {
         'Content-Type': 'multipart/form-data',
       },

frontend/src/services/CommonAPI.ts

@@ -1,5 +1,6 @@
-import axios, { AxiosResponse, Method } from 'axios';
+import { AxiosResponse, Method } from 'axios';
 import { UserCredentials, FormDataParams } from '../types';
+import api from '../API/Index';
 
 // API Call
 const apiCall = async (
@@ -16,7 +17,7 @@ const apiCall = async (
     for (const key in additionalParams) {
       formData.append(key, additionalParams[key]);
     }
-    const response: AxiosResponse = await axios({
+    const response: AxiosResponse = await api({
       method: method,
       url: url,
       data: formData,

frontend/src/services/ConnectAPI.ts

@@ -1,5 +1,4 @@
-import axios from 'axios';
-import { url } from '../utils/Utils';
+import api from '../API/Index';
 
 const connectAPI = async (connectionURI: string, username: string, password: string, database: string) => {
   try {
@@ -8,7 +7,7 @@ const connectAPI = async (connectionURI: string, username: string, password: str
     formData.append('database', database ?? '');
     formData.append('userName', username ?? '');
     formData.append('password', password ?? '');
-    const response = await axios.post(`${url()}/connect`, formData, {
+    const response = await api.post(`/connect`, formData, {
       headers: {
         'Content-Type': 'multipart/form-data',
       },

frontend/src/services/DeleteFiles.ts

@@ -1,6 +1,5 @@
-import axios from 'axios';
-import { url } from '../utils/Utils';
 import { CustomFile, UserCredentials } from '../types';
+import api from '../API/Index';
 
 const deleteAPI = async (userCredentials: UserCredentials, selectedFiles: CustomFile[], deleteEntities: boolean) => {
   try {
@@ -14,7 +13,7 @@ const deleteAPI = async (userCredentials: UserCredentials, selectedFiles: Custom
     formData.append('deleteEntities', JSON.stringify(deleteEntities));
     formData.append('filenames', JSON.stringify(filenames));
     formData.append('source_types', JSON.stringify(source_types));
-    const response = await axios.post(`${url()}/delete_document_and_entities`, formData);
+    const response = await api.post(`/delete_document_and_entities`, formData);
     return response;
   } catch (error) {
     console.log('Error Posting the Question:', error);

frontend/src/services/DeleteOrphanNodes.ts

@@ -1,6 +1,5 @@
-import axios from 'axios';
-import { url } from '../utils/Utils';
 import { UserCredentials } from '../types';
+import api from '../API/Index';
 
 const deleteOrphanAPI = async (userCredentials: UserCredentials, selectedNodes: string[]) => {
   try {
@@ -10,7 +9,7 @@ const deleteOrphanAPI = async (userCredentials: UserCredentials, selectedNodes:
     formData.append('userName', userCredentials?.userName ?? '');
     formData.append('password', userCredentials?.password ?? '');
     formData.append('unconnected_entities_list', JSON.stringify(selectedNodes));
-    const response = await axios.post(`${url()}/delete_unconnected_nodes`, formData);
+    const response = await api.post(`/delete_unconnected_nodes`, formData);
     return response;
   } catch (error) {
     console.log('Error Posting the Question:', error);