neo4j-labs
diff --git a/‎backend/score.py‎
Lines changed: 57 additions & 4 deletions b/‎backend/score.py‎
Lines changed: 57 additions & 4 deletions
diff --git a/‎backend/src/graphDB_dataAccess.py‎
Lines changed: 1 addition & 1 deletion b/‎backend/src/graphDB_dataAccess.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎backend/src/graph_query.py‎
Lines changed: 1 addition & 3 deletions b/‎backend/src/graph_query.py‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎backend/src/shared/constants.py‎
Lines changed: 0 additions & 84 deletions b/‎backend/src/shared/constants.py‎
Lines changed: 0 additions & 84 deletions
diff --git a/‎frontend/src/components/ChatBot/ChunkInfo.tsx‎
Lines changed: 1 addition & 1 deletion b/‎frontend/src/components/ChatBot/ChunkInfo.tsx‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎frontend/src/components/ChatBot/CommunitiesInfo.tsx‎
Lines changed: 1 addition & 1 deletion b/‎frontend/src/components/ChatBot/CommunitiesInfo.tsx‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎frontend/src/components/ChatBot/EntitiesInfo.tsx‎
Lines changed: 1 addition & 1 deletion b/‎frontend/src/components/ChatBot/EntitiesInfo.tsx‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎frontend/src/components/ChatBot/chatInfo.ts‎
Lines changed: 1 addition & 1 deletion b/‎frontend/src/components/ChatBot/chatInfo.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎frontend/src/components/Content.tsx‎
Lines changed: 66 additions & 9 deletions b/‎frontend/src/components/Content.tsx‎
Lines changed: 66 additions & 9 deletions
@@ -18,7 +18,7 @@
 from src.communities import create_communities
 from src.neighbours import get_neighbour_nodes
 import json
-from typing import List
+from typing import List, Mapping, Union
 from starlette.middleware.sessions import SessionMiddleware
 from google.oauth2.credentials import Credentials
 import os
@@ -30,8 +30,8 @@
 from Secweb.XFrameOptions import XFrame
 from fastapi.middleware.gzip import GZipMiddleware
 from src.ragas_eval import *
-from starlette.types import ASGIApp, Receive, Scope, Send
-from langchain_neo4j import Neo4jGraph
+from starlette.types import ASGIApp, Message, Receive, Scope, Send
+import gzip
 
 logger = CustomLogger()
 CHUNK_DIR = os.path.join(os.path.dirname(__file__), "chunks")
@@ -77,9 +77,10 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send):
         await gzip_middleware(scope, receive, send)
 app = FastAPI()
 # SecWeb(app=app, Option={'referrer': False, 'xframe': False})
-# app.add_middleware(ContentSecurityPolicy, Option={'default-src': ["'self'"], 'base-uri': ["'self'"], 'block-all-mixed-content': []}, script_nonce=False, style_nonce=False, report_only=False)
+app.add_middleware(ContentSecurityPolicy, Option={'default-src': ["'self'"], 'base-uri': ["'self'"], 'block-all-mixed-content': []}, script_nonce=False, style_nonce=False, report_only=False)
 app.add_middleware(XContentTypeOptions)
 app.add_middleware(XFrame, Option={'X-Frame-Options': 'DENY'})
+#app.add_middleware(GZipMiddleware, minimum_size=1000, compresslevel=5)
 app.add_middleware(CustomGZipMiddleware, minimum_size=1000, compresslevel=5,paths=["/sources_list","/url/scan","/extract","/chat_bot","/chunk_entities","/get_neighbours","/graph_query","/schema","/populate_graph_schema","/get_unconnected_nodes_list","/get_duplicate_nodes","/fetch_chunktext"])
 app.add_middleware(
     CORSMiddleware,
@@ -845,5 +846,57 @@ async def retry_processing(uri=Form(), userName=Form(), password=Form(), databas
     finally:
         gc.collect()        
 
+@app.post("/fetch_chunktext")
+async def fetch_chunktext(
+   uri: str = Form(),
+   database: str = Form(),
+   userName: str = Form(),
+   password: str = Form(),
+   document_name: str = Form(),
+   page_no: int = Form(1)
+):
+   try:
+       payload_json_obj = {
+           'api_name': 'fetch_chunktext',
+           'db_url': uri,
+           'userName': userName,
+           'database': database,
+           'document_name': document_name,
+           'page_no': page_no,
+           'logging_time': formatted_time(datetime.now(timezone.utc))
+       }
+       logger.log_struct(payload_json_obj, "INFO")
+       start = time.time()
+       result = await asyncio.to_thread(
+           get_chunktext_results,
+           uri=uri,
+           username=userName,
+           password=password,
+           database=database,
+           document_name=document_name,
+           page_no=page_no
+       )
+       end = time.time()
+       elapsed_time = end - start
+       json_obj = {
+           'api_name': 'fetch_chunktext',
+           'db_url': uri,
+           'document_name': document_name,
+           'page_no': page_no,
+           'logging_time': formatted_time(datetime.now(timezone.utc)),
+           'elapsed_api_time': f'{elapsed_time:.2f}'
+       }
+       logger.log_struct(json_obj, "INFO")
+       return create_api_response('Success', data=result, message=f"Total elapsed API time {elapsed_time:.2f}")
+   except Exception as e:
+       job_status = "Failed"
+       message = "Unable to get chunk text response"
+       error_message = str(e)
+       logging.exception(f'Exception in fetch_chunktext: {error_message}')
+       return create_api_response(job_status, message=message, error=error_message)
+   finally:
+       gc.collect()
+
+
 if __name__ == "__main__":
     uvicorn.run(app)
@@ -356,7 +356,7 @@ def get_duplicate_nodes_list(self):
         score_value = float(os.environ.get('DUPLICATE_SCORE_VALUE'))
         text_distance = int(os.environ.get('DUPLICATE_TEXT_DISTANCE'))
         query_duplicate_nodes = """
-                MATCH (n:!Chunk&!Session&!Document&!`__Community__`) with n 
+                MATCH (n:!Chunk&!Session&!Document&!`__Community__`&!`__Entity__`) with n 
                 WHERE n.embedding is not null and n.id is not null // and size(toString(n.id)) > 3
                 WITH n ORDER BY count {{ (n)--() }} DESC, size(toString(n.id)) DESC // updated
                 WITH collect(n) as nodes
 
@@ -227,7 +227,6 @@ def get_graph_results(uri, username, password,database,document_names):
 
 def get_chunktext_results(uri, username, password, database, document_name, page_no):
    """Retrieves chunk text, position, and page number from graph data with pagination."""
-   driver = None
    try:
        logging.info("Starting chunk text query process")
        offset = 10
@@ -256,5 +255,4 @@ def get_chunktext_results(uri, username, password, database, document_name, page
        logging.error(f"An error occurred in get_chunktext_results. Error: {str(e)}")
        raise Exception("An error occurred in get_chunktext_results. Please check the logs for more details.") from e
    finally:
-       if driver:
-           driver.close()
+       driver.close()
@@ -173,90 +173,6 @@
 LIMIT $limit
 """
 
-NODEREL_COUNT_QUERY_WITH_COMMUNITY = """
-MATCH (d:Document)
-WHERE d.fileName IS NOT NULL
-OPTIONAL MATCH (d)<-[po:PART_OF]-(c:Chunk)
-OPTIONAL MATCH (c)-[he:HAS_ENTITY]->(e:__Entity__)
-OPTIONAL MATCH (c)-[sim:SIMILAR]->(c2:Chunk)
-OPTIONAL MATCH (c)-[nc:NEXT_CHUNK]->(c3:Chunk)
-OPTIONAL MATCH (e)-[ic:IN_COMMUNITY]->(comm:__Community__)
-OPTIONAL MATCH (comm)-[pc1:PARENT_COMMUNITY]->(first_level:__Community__)
-OPTIONAL MATCH (first_level)-[pc2:PARENT_COMMUNITY]->(second_level:__Community__)
-OPTIONAL MATCH (second_level)-[pc3:PARENT_COMMUNITY]->(third_level:__Community__)
-WITH
-  d.fileName AS filename,
-  count(DISTINCT c) AS chunkNodeCount,
-  count(DISTINCT po) AS partOfRelCount,
-  count(DISTINCT he) AS hasEntityRelCount,
-  count(DISTINCT sim) AS similarRelCount,
-  count(DISTINCT nc) AS nextChunkRelCount,
-  count(DISTINCT e) AS entityNodeCount,
-  collect(DISTINCT e) AS entities,
-  count(DISTINCT comm) AS baseCommunityCount,
-  count(DISTINCT first_level) AS firstlevelcommCount,
-  count(DISTINCT second_level) AS secondlevelcommCount,
-  count(DISTINCT third_level) AS thirdlevelcommCount,
-  count(DISTINCT ic) AS inCommunityCount,
-  count(DISTINCT pc1) AS parentCommunityRelCount1,
-  count(DISTINCT pc2) AS parentCommunityRelCount2,
-  count(DISTINCT pc3) AS parentCommunityRelCount3
-WITH
-  filename,
-  chunkNodeCount,
-  partOfRelCount + hasEntityRelCount + similarRelCount + nextChunkRelCount AS chunkRelCount,
-  entityNodeCount,
-  entities,
-  baseCommunityCount + firstlevelcommCount + secondlevelcommCount + thirdlevelcommCount AS commCount,
-  inCommunityCount + parentCommunityRelCount1 + parentCommunityRelCount2 + parentCommunityRelCount3 AS communityRelCount
-CALL (entities) {
-  UNWIND entities AS e
-  RETURN sum(COUNT { (e)-->(e2:__Entity__) WHERE e2 in entities }) AS entityEntityRelCount
-}
-RETURN
-  filename,
-  COALESCE(chunkNodeCount, 0) AS chunkNodeCount,
-  COALESCE(chunkRelCount, 0) AS chunkRelCount,
-  COALESCE(entityNodeCount, 0) AS entityNodeCount,
-  COALESCE(entityEntityRelCount, 0) AS entityEntityRelCount,
-  COALESCE(commCount, 0) AS communityNodeCount,
-  COALESCE(communityRelCount, 0) AS communityRelCount
-"""
-NODEREL_COUNT_QUERY_WITHOUT_COMMUNITY = """
-MATCH (d:Document)
-WHERE d.fileName = $document_name
-OPTIONAL MATCH (d)<-[po:PART_OF]-(c:Chunk)
-OPTIONAL MATCH (c)-[he:HAS_ENTITY]->(e:__Entity__)
-OPTIONAL MATCH (c)-[sim:SIMILAR]->(c2:Chunk)
-OPTIONAL MATCH (c)-[nc:NEXT_CHUNK]->(c3:Chunk)
-WITH
-  d.fileName AS filename,
-  count(DISTINCT c) AS chunkNodeCount,
-  count(DISTINCT po) AS partOfRelCount,
-  count(DISTINCT he) AS hasEntityRelCount,
-  count(DISTINCT sim) AS similarRelCount,
-  count(DISTINCT nc) AS nextChunkRelCount,
-  count(DISTINCT e) AS entityNodeCount,
-  collect(DISTINCT e) AS entities
-WITH
-  filename,
-  chunkNodeCount,
-  partOfRelCount + hasEntityRelCount + similarRelCount + nextChunkRelCount AS chunkRelCount,
-  entityNodeCount,
-  entities
-CALL (entities) {
-  UNWIND entities AS e
-  RETURN sum(COUNT { (e)-->(e2:__Entity__) WHERE e2 in entities }) AS entityEntityRelCount
-}
-RETURN
-  filename,
-  COALESCE(chunkNodeCount, 0) AS chunkNodeCount,
-  COALESCE(chunkRelCount, 0) AS chunkRelCount,
-  COALESCE(entityNodeCount, 0) AS entityNodeCount,
-  COALESCE(entityEntityRelCount, 0) AS entityEntityRelCount
-"""
-
-
 ## CHAT SETUP
 CHAT_MAX_TOKENS = 1000
 CHAT_SEARCH_KWARG_SCORE_THRESHOLD = 0.5
 
@@ -268,4 +268,4 @@ const ChunkInfo: FC<ChunkProps> = ({ loading, chunks, mode }) => {
     </>
   );
 };
-export default ChunkInfo;
+export default ChunkInfo;
@@ -79,4 +79,4 @@ const CommunitiesInfo: FC<CommunitiesProps> = ({ loading, communities, mode }) =
   );
 };
 
-export default CommunitiesInfo;
+export default CommunitiesInfo;
@@ -150,4 +150,4 @@ const EntitiesInfo: FC<EntitiesProps> = ({ loading, mode, graphonly_entities, in
     </>
   );
 };
-export default EntitiesInfo;
+export default EntitiesInfo;
@@ -40,4 +40,4 @@ export const handleGraphNodeClick = async (
       setLoadingGraphView(false);
     }
   }
-};
+};
@@ -11,6 +11,7 @@ import {
   CustomFile,
   OptionType,
   UserCredentials,
+  chunkdata,
   connectionState,
 } from '../types';
 import deleteAPI from '../services/DeleteFiles';
@@ -36,7 +37,6 @@ import { useMessageContext } from '../context/UserMessages';
 import PostProcessingToast from './Popups/GraphEnhancementDialog/PostProcessingCheckList/PostProcessingToast';
 import { getChunkText } from '../services/getChunkText';
 import ChunkPopUp from './Popups/ChunkPopUp';
-import { isExpired, isFileReadyToProcess } from '../utils/Utils';
 
 const ConfirmationDialog = lazy(() => import('./Popups/LargeFilePopUp/ConfirmationDialog'));
 
@@ -56,13 +56,29 @@ const Content: React.FC<ContentProps> = ({
   // const [init, setInit] = useState<boolean>(false);
   const [openGraphView, setOpenGraphView] = useState<boolean>(false);
   const [inspectedName, setInspectedName] = useState<string>('');
-  const { setUserCredentials, userCredentials, connectionStatus, setConnectionStatus } = useCredentials();
+  const [documentName, setDocumentName] = useState<string>('');
+  const {
+    setUserCredentials,
+    userCredentials,
+    connectionStatus,
+    setConnectionStatus,
+    isGdsActive,
+    setGdsActive,
+    setIsReadOnlyUser,
+    isReadOnlyUser,
+  } = useCredentials();
   const [showConfirmationModal, setshowConfirmationModal] = useState<boolean>(false);
   const [showExpirationModal, setshowExpirationModal] = useState<boolean>(false);
   const [extractLoading, setextractLoading] = useState<boolean>(false);
   const [retryFile, setRetryFile] = useState<string>('');
   const [retryLoading, setRetryLoading] = useState<boolean>(false);
   const [showRetryPopup, toggleRetryPopup] = useReducer((state) => !state, false);
+  const [showChunkPopup, toggleChunkPopup] = useReducer((state) => !state, false);
+  const [chunksLoading, toggleChunksLoading] = useReducer((state) => !state, false);
+  const [currentPage, setCurrentPage] = useState<number>(0);
+  const [totalPageCount, setTotalPageCount] = useState<number | null>(null);
+  const [textChunks, setTextChunks] = useState<chunkdata[]>([]);
+
   const [alertStateForRetry, setAlertStateForRetry] = useState<BannerAlertProps>({
     showAlert: false,
     alertType: 'neutral',
@@ -90,13 +106,12 @@ const Content: React.FC<ContentProps> = ({
     setchatModes,
     model,
   } = useFileContext();
-  const [viewPoint, setViewPoint] = useState<'tableView' | 'showGraphView' | 'chatInfoView' | 'neighborView'>(
-    'tableView'
-  );
+  const [viewPoint, setViewPoint] = useState<'tableView' | 'showGraphView' | 'chatInfoView'|'neighborView'>('tableView');
   const [showDeletePopUp, setshowDeletePopUp] = useState<boolean>(false);
   const [deleteLoading, setdeleteLoading] = useState<boolean>(false);
   const [searchParams] = useSearchParams();
 
+
   const { updateStatusForLargeFiles } = useServerSideEvent(
     (inMinutes, time, fileName) => {
       showNormalToast(`${fileName} will take approx ${time} ${inMinutes ? 'Min' : 'Sec'}`);
@@ -107,7 +122,12 @@ const Content: React.FC<ContentProps> = ({
     }
   );
   const childRef = useRef<ChildRef>(null);
-
+  const incrementPage = () => {
+    setCurrentPage((prev) => prev + 1);
+  };
+  const decrementPage = () => {
+    setCurrentPage((prev) => prev - 1);
+  };
   useEffect(() => {
     if (!init && !searchParams.has('connectURL')) {
       let session = localStorage.getItem('neo4j.connection');
@@ -128,7 +148,13 @@ const Content: React.FC<ContentProps> = ({
       setOpenConnection((prev) => ({ ...prev, openPopUp: true }));
     }
   }, []);
-
+  useEffect(() => {
+    if (currentPage >= 1) {
+      (async () => {
+        await getChunks(documentName, currentPage);
+      })();
+    }
+  }, [currentPage, documentName]);
   useEffect(() => {
     setFilesData((prevfiles) => {
       return prevfiles.map((curfile) => {
@@ -275,7 +301,15 @@ const Content: React.FC<ContentProps> = ({
     }
     toggleChunksLoading();
   };
-
+  const getChunks = async (name: string, pageNo: number) => {
+    toggleChunksLoading();
+    const response = await getChunkText(userCredentials as UserCredentials, name, pageNo);
+    setTextChunks(response.data.data.pageitems);
+    if (!totalPageCount) {
+      setTotalPageCount(response.data.data.total_pages);
+    }
+    toggleChunksLoading();
+  };
   const extractData = async (uid: string, isselectedRows = false, filesTobeProcess: CustomFile[]) => {
     if (!isselectedRows) {
       const fileItem = filesData.find((f) => f.id == uid);
@@ -535,7 +569,7 @@ const Content: React.FC<ContentProps> = ({
         .filter((f) => f.status === 'New' || f.status == 'Reprocess');
       addFilesToQueue(selectedNewFiles as CustomFile[]);
     }
-  }
+  };
 
   const handleOpenGraphClick = () => {
     const bloomUrl = process.env.VITE_BLOOM_URL;
@@ -798,6 +832,18 @@ const Content: React.FC<ContentProps> = ({
           view='contentView'
         ></DeletePopUp>
       )}
+      {showChunkPopup && (
+        <ChunkPopUp
+          chunksLoading={chunksLoading}
+          onClose={() => toggleChunkPopup()}
+          showChunkPopup={showChunkPopup}
+          chunks={textChunks}
+          incrementPage={incrementPage}
+          decrementPage={decrementPage}
+          currentPage={currentPage}
+          totalPageCount={totalPageCount}
+        ></ChunkPopUp>
+      )}
       {showEnhancementDialog && (
         <GraphEnhancementDialog
           open={showEnhancementDialog}
@@ -897,6 +943,17 @@ const Content: React.FC<ContentProps> = ({
             setRetryFile(id);
             toggleRetryPopup();
           }}
+          onChunkView={async (name) => {
+            setDocumentName(name);
+            if (name != documentName) {
+              toggleChunkPopup();
+              if (totalPageCount) {
+                setTotalPageCount(null);
+              }
+              setCurrentPage(1);
+              // await getChunks(name, 1);
+            }
+          }}
           ref={childRef}
           handleGenerateGraph={processWaitingFilesOnRefresh}
         ></FileTable>
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,4 @@ export const handleGraphNodeClick = async (`
`40`	`40`	`setLoadingGraphView(false);`
`41`	`41`	`}`
`42`	`42`	`}`
`43`		`-};`
	`43`	`+};`