neo4j-labs
diff --git a/‎backend/score.py
+12-32 b/‎backend/score.py
+12-32
diff --git a/‎backend/src/graphDB_dataAccess.py
+1-1 b/‎backend/src/graphDB_dataAccess.py
+1-1
diff --git a/‎backend/src/shared/constants.py
-84 b/‎backend/src/shared/constants.py
-84
diff --git a/‎backend/test_integrationqa.py
+21 b/‎backend/test_integrationqa.py
+21
diff --git a/‎frontend/src/components/ChatBot/ChunkInfo.tsx
+1-1 b/‎frontend/src/components/ChatBot/ChunkInfo.tsx
+1-1
diff --git a/‎frontend/src/components/ChatBot/CommunitiesInfo.tsx
+1-1 b/‎frontend/src/components/ChatBot/CommunitiesInfo.tsx
+1-1
diff --git a/‎frontend/src/components/ChatBot/EntitiesInfo.tsx
+1-1 b/‎frontend/src/components/ChatBot/EntitiesInfo.tsx
+1-1
diff --git a/‎frontend/src/components/ChatBot/chatInfo.ts
+1-1 b/‎frontend/src/components/ChatBot/chatInfo.ts
+1-1
diff --git a/‎frontend/src/components/Content.tsx
+78-11 b/‎frontend/src/components/Content.tsx
+78-11
@@ -36,7 +36,6 @@
 from src.ragas_eval import *
 from starlette.types import ASGIApp, Message, Receive, Scope, Send
 import gzip
-from langchain_neo4j import Neo4jGraph
 
 logger = CustomLogger()
 CHUNK_DIR = os.path.join(os.path.dirname(__file__), "chunks")
@@ -82,9 +81,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,
@@ -930,6 +930,16 @@ async def fetch_chunktext(
    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,
@@ -945,8 +955,6 @@ async def fetch_chunktext(
        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)),
@@ -963,34 +971,6 @@ async def fetch_chunktext(
    finally:
        gc.collect()
 
-@app.post("/backend_connection_configuation")
-async def backend_connection_configuation():
-    try:
-        graph = Neo4jGraph()
-        logging.info(f'login connection status of object: {graph}')
-        if graph is not None:
-            graph_connection = True
-            isURI = os.getenv('NEO4J_URI')
-            isUsername= os.getenv('NEO4J_USERNAME')
-            isDatabase= os.getenv('NEO4J_DATABASE')
-            isPassword= os.getenv('NEO4J_PASSWORD')
-            encoded_password = encode_password(isPassword)
-            graphDb_data_Access = graphDBdataAccess(graph)
-            gds_status = graphDb_data_Access.check_gds_version()
-            write_access = graphDb_data_Access.check_account_access(database=isDatabase)
-            return create_api_response('Success',message=f"Backend connection successful",data={'graph_connection':graph_connection,'uri':isURI,'user_name':isUsername,'database':isDatabase,'password':encoded_password,'gds_status':gds_status,'write_access':write_access})
-        else:
-            graph_connection = False
-            return create_api_response('Success',message=f"Backend connection is not successful",data=graph_connection)
-    except Exception as e:
-        graph_connection = False
-        job_status = "Failed"
-        message="Unable to connect backend DB"
-        error_message = str(e)
-        logging.exception(f'{error_message}')
-        return create_api_response(job_status, message=message, error=error_message + ' or fill from the login dialog', data=graph_connection)
-    finally:
-        gc.collect()    
 
 if __name__ == "__main__":
     uvicorn.run(app)
@@ -362,7 +362,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
 
@@ -164,90 +164,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
 
@@ -137,6 +137,27 @@ def test_graph_website(model_name):
     #     print("Fail: ", e)
     return weburl_result
 
+def test_graph_website(model_name):
+    """Test graph creation from a Website page."""
+     #graph, model, source_url, source_type
+    source_url = 'https://www.amazon.com/'
+    source_type = 'web-url'
+    create_source_node_graph_web_url(graph, model_name, source_url, source_type)
+
+    weburl_result = extract_graph_from_web_page(URI, USERNAME, PASSWORD, DATABASE, model_name, source_url, '', '')
+    logging.info("WebUrl test done")
+    print(weburl_result)
+
+    try:
+        assert weburl_result['status'] == 'Completed'
+        assert weburl_result['nodeCount'] > 0
+        assert weburl_result['relationshipCount'] > 0
+        print("Success")
+    except AssertionError as e:
+        print("Fail: ", e)
+    return weburl_result
+
+
 def test_graph_from_youtube_video(model_name):
    """Test graph creation from a YouTube video."""
    source_url = 'https://www.youtube.com/watch?v=T-qy-zPWgqA'
 
@@ -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;
@@ -37,4 +37,4 @@ export const handleGraphNodeClick = async (
       setLoadingGraphView(false);
     }
   }
-};
+};
@@ -4,7 +4,16 @@ import { Button, Typography, Flex, StatusIndicator, useMediaQuery } from '@neo4j
 import { useCredentials } from '../context/UserCredentials';
 import { useFileContext } from '../context/UsersFiles';
 import { extractAPI } from '../utils/FileAPI';
-import { BannerAlertProps, ChildRef, ContentProps, CustomFile, OptionType, UserCredentials, chunkdata } from '../types';
+import {
+  BannerAlertProps,
+  ChildRef,
+  ContentProps,
+  CustomFile,
+  OptionType,
+  UserCredentials,
+  chunkdata,
+  connectionState,
+} from '../types';
 import deleteAPI from '../services/DeleteFiles';
 import { postProcessing } from '../services/PostProcessing';
 import { triggerStatusUpdateAPI } from '../services/ServerSideStatusUpdateAPI';
@@ -57,7 +66,16 @@ const Content: React.FC<ContentProps> = ({
   const [openGraphView, setOpenGraphView] = useState<boolean>(false);
   const [inspectedName, setInspectedName] = useState<string>('');
   const [documentName, setDocumentName] = useState<string>('');
-  const { setUserCredentials, userCredentials, setConnectionStatus, isGdsActive, isReadOnlyUser } = useCredentials();
+  const {
+    setUserCredentials,
+    userCredentials,
+    connectionStatus,
+    setConnectionStatus,
+    isGdsActive,
+    setGdsActive,
+    setIsReadOnlyUser,
+    isReadOnlyUser,
+  } = useCredentials();
   const [showConfirmationModal, setshowConfirmationModal] = useState<boolean>(false);
   const [extractLoading, setextractLoading] = useState<boolean>(false);
   const [retryFile, setRetryFile] = useState<string>('');
@@ -90,12 +108,11 @@ 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 { updateStatusForLargeFiles } = useServerSideEvent(
     (inMinutes, time, fileName) => {
       showNormalToast(`${fileName} will take approx ${time} ${inMinutes ? 'Min' : 'Sec'}`);
@@ -106,14 +123,55 @@ const Content: React.FC<ContentProps> = ({
     }
   );
   const childRef = useRef<ChildRef>(null);
-  const incrementPage = async () => {
+  const incrementPage = () => {
     setCurrentPage((prev) => prev + 1);
-    await getChunks(documentName, currentPage + 1);
   };
-  const decrementPage = async () => {
+  const decrementPage = () => {
     setCurrentPage((prev) => prev - 1);
-    await getChunks(documentName, currentPage - 1);
   };
+  useEffect(() => {
+    if (!init && !searchParams.has('connectURL')) {
+      let session = localStorage.getItem('neo4j.connection');
+      if (session) {
+        let neo4jConnection = JSON.parse(session);
+        setUserCredentials({
+          uri: neo4jConnection.uri,
+          userName: neo4jConnection.user,
+          password: atob(neo4jConnection.password),
+          database: neo4jConnection.database,
+          port: neo4jConnection.uri.split(':')[2],
+        });
+        if (neo4jConnection.isgdsActive !== undefined) {
+          setGdsActive(neo4jConnection.isgdsActive);
+        }
+        if (neo4jConnection.isReadOnlyUser !== undefined) {
+          setIsReadOnlyUser(neo4jConnection.isReadOnlyUser);
+        }
+      } else {
+        setOpenConnection((prev) => ({ ...prev, openPopUp: true }));
+      }
+      setInit(true);
+    } else {
+      setOpenConnection((prev) => ({ ...prev, openPopUp: true }));
+    }
+  }, []);
+  useEffect(() => {
+    if (currentPage >= 1) {
+      (async () => {
+        await getChunks(documentName, currentPage);
+      })();
+    }
+  }, [currentPage, documentName]);
+  useEffect(() => {
+    setFilesData((prevfiles) => {
+      return prevfiles.map((curfile) => {
+        return {
+          ...curfile,
+          model: curfile.status === 'New' || curfile.status === 'Reprocess' ? model : curfile.model,
+        };
+      });
+    });
+  }, [model]);
 
   useEffect(() => {
     if (afterFirstRender) {
@@ -206,6 +264,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);
@@ -848,7 +915,7 @@ const Content: React.FC<ContentProps> = ({
                 setTotalPageCount(null);
               }
               setCurrentPage(1);
-              await getChunks(name, 1);
+              // await getChunks(name, 1);
             }
           }}
           ref={childRef}
@@ -931,4 +998,4 @@ const Content: React.FC<ContentProps> = ({
   );
 };
 
-export default Content;
+export default Content;
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,4 @@ export const handleGraphNodeClick = async (`
`37`	`37`	`setLoadingGraphView(false);`
`38`	`38`	`}`
`39`	`39`	`}`
`40`		`-};`
	`40`	`+};`