Resolve merge conflicts

app.py

@@ -203,16 +203,19 @@ except Exception as e:
     print(f"⚠️ Error initializing vector store: {str(e)}")
     raise
 
-# Function to get similar passages
+# Initialize the similarity search function
 def get_similar_passages(query, k=5):
     query_embedding = embeddings.embed_query(query)
-    D, I = index.search(query_embedding.reshape(1, -1), k)
-    return [texts[i] for i in I[0]]
+    return similarity_search(query_embedding, k)
 
 # Setup retriever function
 def get_context(query):
-    passages = get_similar_passages(query)
-    return "\n\n".join(passages)
+    try:
+        passages = get_similar_passages(query)
+        return "\n\n".join(passages)
+    except Exception as e:
+        print(f"⚠️ Error in retrieval: {str(e)}")
+        return "The Archives are experiencing difficulties retrieving the information."
 
 # ----------------------
 # 3️⃣ Gemini LLM + RAG Chain

packages.txt

@@ -1,6 +1,8 @@
 python3-dev
 build-essential
+libopenblas-dev
 libpq-dev
 ffmpeg
 git
-git-lfs
+git-lfs
+pkg-config

requirements-hf.txt

@@ -10,10 +10,18 @@ transformers==4.31.0
 torch==2.0.1
 numpy==1.24.3
 
-# Vector store and ML
-faiss-cpu==1.7.4
-numpy>=1.24.3
-scikit-learn>=1.3.0
+# Core ML dependencies (install order matters)
+numpy==1.24.3
+scipy==1.11.3
+scikit-learn==1.3.0
+
+# Vector store
+faiss-cpu
+faiss-gpu
+
+# Additional ML dependencies
+threadpoolctl>=3.2.0
+joblib>=1.3.2
 
 # Utilities
 requests==2.31.0