Merge pull request #99 from neo4j-labs/DEV

Dev

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://frontend-dcavk67s4a-uc.a.run.app).
+ The Public [ Google cloud Run URL](https://prod-frontend-dcavk67s4a-uc.a.run.app).
  [Workspace URL](https://workspace-preview.neo4j.io/workspace)
 
 

backend/requirements.txt

@@ -61,13 +61,12 @@ jsonpointer==2.4
 jupyter_client==8.6.0
 jupyter_core==5.5.0
 kiwisolver==1.4.5
-langchain==0.1.1
-langchain-community==0.0.20
-langchain-core==0.1.23
-langchain-experimental==0.0.49
-langchain-openai==0.0.2.post1
+langchain==0.1.11
+langchain-community==0.0.27
+langchain-core==0.1.30
+langchain-experimental==0.0.53
+langchain-openai==0.0.8
 langdetect==1.0.9
-langsmith==0.0.87
 layoutparser==0.3.4
 lxml==5.1.0
 MarkupSafe==2.1.5
@@ -97,7 +96,7 @@ nvidia-nvtx-cu12==12.1.105
 omegaconf==2.3.0
 onnx==1.15.0
 onnxruntime==1.15.1
-openai==1.7.1
+openai
 opencv-python==4.9.0.80
 opencv-python-headless==4.9.0.80
 packaging==23.2
@@ -181,4 +180,4 @@ poppler-utils
 pytesseract
 pdf2image
 youtube-transcript-api
-pytube
+pytube

backend/score.py

@@ -5,6 +5,7 @@
 from fastapi.middleware.cors import CORSMiddleware
 from src.main import *
 import asyncio
+import base64
 
 
 def healthy_condition():
@@ -30,7 +31,7 @@ def sick():
 
 @app.post("/sources")
 async def create_source_knowledge_graph(
-    uri=Form(), database=Form(), userName=Form(), password=Form(), file: UploadFile = File(...), model=Form()
+    uri=Form(None), userName=Form(None), password=Form(None), file: UploadFile = File(...), model=Form(),database=Form(None), 
 ):
     """
     Calls 'create_source_node_graph' function in a new thread to create
@@ -46,36 +47,36 @@ async def create_source_knowledge_graph(
          'Source' Node creation in Neo4j database
     """
     result = await asyncio.to_thread(
-        create_source_node_graph_local_file, uri, database, userName, password, file, model
+        create_source_node_graph_local_file, uri, userName, password, file, model, database
     )
     return result
 
 @app.post("/url/scan")
 async def create_source_knowledge_graph_url(
-    uri=Form(),
-    database=Form(),
-    userName=Form(),
-    password=Form(),
+    uri=Form(None),
+    userName=Form(None),
+    password=Form(None),
     source_url=Form(),
+    database=Form(None),
     aws_access_key_id=Form(None),
     aws_secret_access_key=Form(None),
     max_limit=Form(5),
     query_source=Form(None),
     model=Form(None)
 ):
     return create_source_node_graph_url(
-        uri, database, userName, password, source_url, max_limit, query_source, model, aws_access_key_id, aws_secret_access_key
+        uri, userName, password, source_url, model, database, aws_access_key_id, aws_secret_access_key
     )
 
 
 @app.post("/extract")
 async def extract_knowledge_graph_from_file(
-    uri=Form(),
-    database=Form(),
-    userName=Form(),
-    password=Form(),
+    uri=Form(None),
+    userName=Form(None),
+    password=Form(None),
+    model=Form(None),
+    database=Form(None),
     file: UploadFile = File(None),
-    model=Form(),
     source_url=Form(None),
     aws_access_key_id=Form(None),
     aws_secret_access_key=Form(None),
@@ -101,10 +102,10 @@ async def extract_knowledge_graph_from_file(
         return await asyncio.to_thread(
             extract_graph_from_file,
             uri,
-            database,
             userName,
             password,
             model,
+            database,
             file=file,
             source_url=None,
             wiki_query=wiki_query,
@@ -114,10 +115,10 @@ async def extract_knowledge_graph_from_file(
         return await asyncio.to_thread(
             extract_graph_from_file,
             uri,
-            database,
             userName,
             password,
             model,
+            database,
             source_url=source_url,
             aws_access_key_id=aws_access_key_id,
             aws_secret_access_key=aws_secret_access_key,
@@ -129,11 +130,17 @@ async def extract_knowledge_graph_from_file(
 
 
 @app.get("/sources_list")
-async def get_source_list(uri=Form(),database=Form(),userName=Form(),password=Form()):
+async def get_source_list(uri:str,
+                          userName:str,
+                          password:str,
+                          database:str=None):
     """
     Calls 'get_source_list_from_graph' which returns list of sources which alreday exist in databse
     """
-    result = await asyncio.to_thread(get_source_list_from_graph,uri,database,userName,password)
+    decoded_password = decode_password(password)
+    if " " in uri:
+       uri= uri.replace(" ","+")
+    result = await asyncio.to_thread(get_source_list_from_graph,uri,userName,decoded_password,database)
     return result
 
 @app.post("/update_similarity_graph")
@@ -144,6 +151,11 @@ async def update_similarity_graph():
 
     result = await asyncio.to_thread(update_graph)
     return result
+
+def decode_password(pwd):
+    sample_string_bytes = base64.b64decode(pwd)
+    decoded_password = sample_string_bytes.decode("utf-8")
+    return decoded_password
 
 if __name__ == "__main__":
     uvicorn.run(app)