hf fix new branch

Dockerfile

@@ -1,59 +1,38 @@
 #------------------------
-#------------------------
 # STAGE 1: Backend build
 #------------------------
-#------------------------
 FROM python:3.9-slim-buster as backend
 WORKDIR /app/backend
 
+# Copy necessary files
 COPY requirements.txt .
 COPY build_scripts/build.sh .
 
+# Set environment variable, make the script executable and run it
 ENV STAGE=backend
-RUN chmod +x ./build.sh && ./build.sh
-COPY requirements.txt .
-COPY build_scripts/build.sh .
-
-ENV STAGE=backend
-RUN chmod +x ./build.sh && ./build.sh
-
-# Make the script executable
-RUN chmod +x ./build.sh
-# Make the script executable
-RUN chmod +x ./build.sh
+RUN chmod +x ./build.sh && \
+    ./build.sh backend && \
+    rm -rf /var/lib/apt/lists/*
 
-# Execute the script with backend as argument
-RUN ./build.sh backend
-# Execute the script with backend as argument
-RUN ./build.sh backend
+# Copy the rest of the backend app
 COPY web_app/backend/ .
 
 CMD ["python", "run.py"]
-#-------------------------
+
 #-------------------------
 # STAGE 2: Frontend build
 #-------------------------
-#-------------------------
 FROM node:14-alpine as frontend
 WORKDIR /app/frontend
 
-# Grouped copy for package-related files
-COPY web_app/frontend/package*.json .
-# Grouped copy for package-related files
+# Grouped copy for package-related files and the frontend app
 COPY web_app/frontend/package*.json .
 COPY web_app/frontend/ .
 COPY build_scripts/build.sh .
-COPY build_scripts/build.sh .
 
+# Set environment variable, make the script executable and run it
 ENV STAGE=frontend
-RUN chmod +x ./build.sh && ./build.sh
-ENV STAGE=frontend
-RUN chmod +x ./build.sh && ./build.sh
+RUN chmod +x ./build.sh && ./build.sh frontend
 
-# Execute the script with frontend as argument
-RUN ./build.sh frontend
-# Execute the script with frontend as argument
-RUN ./build.sh frontend
 EXPOSE 3000
-
 CMD ["serve", "-s", "dist", "-l", "3000"] 

requirements.txt

@@ -121,7 +121,7 @@ prometheus-client==0.17.1
 prompt-toolkit==3.0.39
 protobuf==4.23.4
 psutil==5.9.5
-psycopg2-binary==2.9.1
+#psycopg2-binary==2.9.1
 ptyprocess==0.7.0
 pulsar-client==3.2.0
 pure-eval==0.2.2

web_app/backend/app/answers_model.py

@@ -1,5 +1,5 @@
 import pinecone
-from dotenv import load_dotenv
+from dotenv import load_dotenv, find_dotenv
 from langchain.embeddings.openai import OpenAIEmbeddings
 from langchain.memory import ConversationBufferMemory
 from langchain.vectorstores import Pinecone
@@ -8,7 +8,7 @@ from langchain.chains import RetrievalQA
 from langchain import PromptTemplate
 
 # Load environment variables
-load_dotenv()
+load_dotenv(find_dotenv())
 
 # Setting up embeddings
 embedder = OpenAIEmbeddings()
@@ -62,3 +62,14 @@ qa = RetrievalQA.from_chain_type(
 def generate_question_response(query: str) -> str:
     return qa.run(query)
 
+if __name__ == "__main__":
+    # Sample query
+    test_query = "What is the capital of France?"
+    
+    # Generate a response using the model
+    response = generate_question_response(test_query)
+    
+    # Print the query and its response
+    print(f"Query: {test_query}")
+    print(f"Response: {response}")
+

web_app/backend/app/chatbot_routes.py

@@ -1,16 +1,22 @@
 from app import app
 from flask import send_from_directory, jsonify, request
 import os
-from dotenv import load_dotenv
+from dotenv import load_dotenv, find_dotenv
 from app.question_model import generate_response
 from app.answers_model import generate_question_response
 from fpdf import FPDF
 import yagmail
 
-print(os.getcwd())
-
 # Load the environment variables
-load_dotenv()
+load_dotenv(find_dotenv())
+
+print(f"Loading .env from: {find_dotenv()}")
+
+# Add a route to help with error handling
+@app.errorhandler(500)
+def internal_error(error):
+    app.logger.error("Server Error: %s", error)
+    return jsonify(message="Internal Server Error"), 500
 
 # Route to handle user prompt questions
 @app.route('/sendText', methods=['POST'])
@@ -25,8 +31,8 @@ def handle_text():
     
         return jsonify(message='Received!', output=output), 200
     except Exception as e:
-        print(f'Error occurred: {e}')
-        return jsonify(message='Error occurred', error=str(e), type=str(type(e))), 500
+        app.logger.error(f"Error occurred during sendText: {e}")
+        return jsonify(message='Error occurred during sendText', error=str(e), type=str(type(e))), 500
 
 # Route to handle suggested questions
 @app.route('/sendQuestions', methods=['POST'])
@@ -50,8 +56,8 @@ def handle_questions():
 
         return jsonify(message='Received!', output=output), 200
     except Exception as e:
-        print(f'Error occurred: {e}')
-        return jsonify(message='Error occurred', error=str(e), type=str(type(e))), 500
+        app.logger.error(f"Error occurred during sendText: {e}")
+        return jsonify(message='Error occurred during sendText', error=str(e), type=str(type(e))), 500
 
 @app.route('/exportChat', methods=['POST'])
 def export_chat():

web_app/backend/app/question_model.py

@@ -4,10 +4,12 @@ from langchain.embeddings.openai import OpenAIEmbeddings
 from langchain.prompts import PromptTemplate
 from langchain.chat_models import ChatOpenAI
 from langchain.chains import LLMChain
-from dotenv import load_dotenv
+from dotenv import load_dotenv, find_dotenv
 import os
 
-load_dotenv()
+# Load the environment variables
+load_dotenv(find_dotenv())
+
 
 # Load the data
 # Get the directory of the current file

web_app/backend/run.py

@@ -1,4 +1,4 @@
 from app import app
 
 if __name__ == "__main__":
-    app.run(host="0.0.0.0", port=5000)
+    app.run(host="0.0.0.0", port=5000, debug=True)

web_app/frontend/src/hooks/useChat.js

@@ -24,8 +24,8 @@ export default function useChatHandler() {
     setLoading(true);
     let success = false;
     try {
-      const sendTextResponse = await axios.post('http://127.0.0.1:5000/sendText', { text });
-      const sendQuestionsResponse = await axios.post('http://127.0.0.1:5000/sendQuestions', { text });
+      const sendTextResponse = await axios.post('http://localhost:5000/sendText', { text });
+      const sendQuestionsResponse = await axios.post('http://localhost:5000/sendQuestions', { text });
   
       const newChatItem = {
         question: text,
@@ -60,7 +60,7 @@ export default function useChatHandler() {
     setChatHistory([...chatHistory]);
   
     try {
-      const response = await axios.post('http://127.0.0.1:5000/sendText', { 
+      const response = await axios.post('http://localhost:5000/sendText', { 
         text: chatHistory[chatItemIndex].followUps[followUpIndex].text 
       });
   
@@ -69,7 +69,7 @@ export default function useChatHandler() {
       chatHistory[chatItemIndex].followUps[followUpIndex].loading = false;
   
       // Get new follow-up questions based on the follow-up response.
-      const sendQuestionsResponse = await axios.post('http://127.0.0.1:5000/sendQuestions', { text: response.data.output });
+      const sendQuestionsResponse = await axios.post('http://localhost:5000/sendQuestions', { text: response.data.output });
   
       // Add to FollowUp array
       const newFollowUps = sendQuestionsResponse.data.output.followUps.map(followUp => ({