Merge branch 'STAGING' into DEV

Author: prakriti-solankey

backend/Dockerfile

@@ -9,4 +9,18 @@ RUN apt-get update \
     && apt install -y tesseract-ocr \
     && export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH \
     && pip install --no-cache-dir --upgrade -r /code/requirements.txt
-CMD ["uvicorn", "score:app", "--host", "0.0.0.0", "--port", "8000"]
+    
+# Installing gcloud
+#RUN curl https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz > /tmp/google-cloud-sdk.tar.gz
+
+# Installing the package
+#RUN mkdir -p /usr/local/gcloud \
+#  && tar -C /usr/local/gcloud -xvf /tmp/google-cloud-sdk.tar.gz \
+#  && /usr/local/gcloud/google-cloud-sdk/install.sh
+
+# Adding the package path to local
+#ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin
+
+CMD ["uvicorn", "score:app", "--host", "0.0.0.0", "--port", "8000"]
+#CMD ["gcloud", "auth", "application-default", "login", "--quiet", "--no-user-output-enabled"]
+

backend/requirements.txt

@@ -38,7 +38,7 @@ frozenlist==1.4.1
 fsspec==2024.2.0
 google-api-core==2.18.0
 google-auth==2.29.0
-google-cloud-aiplatform==1.45.0
+google-cloud-aiplatform==1.46.0
 google-cloud-bigquery==3.19.0
 google-cloud-core==2.4.1
 google-cloud-resource-manager==1.12.3
@@ -78,6 +78,8 @@ langchain-text-splitters==0.0.1
 langdetect==1.0.9
 langsmith==0.1.31
 layoutparser==0.3.4
+langserve
+langchain-cli
 lxml==5.1.0
 MarkupSafe==2.1.5
 marshmallow==3.20.2

backend/score.py

@@ -8,7 +8,8 @@
 import uvicorn
 import asyncio
 import base64
-
+from langserve import add_routes
+from langchain_google_vertexai import ChatVertexAI
 
 
 def healthy_condition():
@@ -30,6 +31,9 @@ def sick():
     allow_methods=["*"],
     allow_headers=["*"],
 )
+
+add_routes(app,ChatVertexAI(), path="/vertexai")
+
 app.add_api_route("/health", health([healthy_condition, healthy]))
 
 @app.post("/sources")

backend/src/gemini_llm.py

@@ -25,7 +25,7 @@
 from langchain_community.graphs.graph_document import Node
 
 load_dotenv()
-logging.basicConfig(format='%(asctime)s - %(message)s',level='INFO')
+logging.basicConfig(format='%(asctime)s - %(message)s',level='DEBUG')
 
 system_prompt = (
     "# Knowledge Graph Instructions for GPT-4\n"
@@ -295,7 +295,12 @@ def get_graph_from_Gemini(model_version,
     graph_document_list = []
     lst_chunk_chunkId_document=[]
     location = "us-central1"
+    #project_id = "llm-experiments-387609"                            
     credentials, project_id = google.auth.default()
+    if hasattr(credentials, "service_account_email"):
+      logging.info(credentials.service_account_email)
+    else:
+        logging.info("WARNING: no service account credential. User account credential?")                           
     vertexai.init(project=project_id, location=location)
 
     # combined_chunk_document_list=[]

backend/src/main.py

@@ -21,6 +21,8 @@
 import warnings
 from pytube import YouTube
 import sys
+from langchain.globals import set_debug
+set_debug(True)
 warnings.filterwarnings("ignore")
 
 load_dotenv()