resolved

.gitignore

@@ -0,0 +1,2 @@
+.env
+data/

app.py

@@ -8,7 +8,11 @@ load_dotenv()
 
 # Use followin json data to feed to Chroma
 import json
+<<<<<<< HEAD
 with open("final_data_for_vectorstore.json",'r') as file:
+=======
+with open("data/processed/final_data_for_vectorstore.json",'r') as file:
+>>>>>>> 612a8de184fb59eb13e55539c9c67457aef5f624
     data4chroma= json.load(file)
 
 # Initiate vector store

requirements.txt

@@ -1,3 +1,21 @@
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+langchain_ollama
+pymupdf
+chromadb
+langchain
+langchain_community
+langchain-huggingface
+langchain_chroma
+gradio
+gradio_client
+torch
+pyprojroot
+=======
+langchain_ollama
+pymupdf
+>>>>>>> 612a8de184fb59eb13e55539c9c67457aef5f624
 chromadb
 langchain
 langchain_community
@@ -5,6 +23,13 @@ langchain-huggingface
 langchain_chroma
 gradio
 gradio_client
+<<<<<<< HEAD
 python-dotenv
 sentence-transformers
-huggingface
+huggingface
+=======
+torch
+pyprojroot
+>>>>>>> 00121f50fc674cbd0c4c33e2937b6aaed654db54
+python-dotenv
+>>>>>>> 612a8de184fb59eb13e55539c9c67457aef5f624