Fixing deployment

.gitignore

@@ -11,7 +11,3 @@ __pycache__/
 # /data/
 # tests / validation artifacts
 # /validation/
-EOF
-
-git add .gitignore
-# do NOT commit this yet if you prefer to review

src/ingest.py

@@ -1,12 +1,10 @@
 import argparse
 import os
 
-<<<<<<< HEAD
 from langchain_community.document_loaders import DirectoryLoader, TextLoader
 from langchain.text_splitter import RecursiveCharacterTextSplitter
 from langchain_community.vectorstores import Chroma
 from langchain_community.embeddings import OpenAIEmbeddings
-=======
 from langchain.text_splitter import RecursiveCharacterTextSplitter
 from langchain_community.vectorstores import Chroma
 from langchain_community.embeddings import OpenAIEmbeddings
@@ -22,7 +20,6 @@ try:
     _HAS_KG = True
 except Exception:
     _HAS_KG = False
->>>>>>> ba5a1f4 (Adding kg to deployment)
 
 
 def load_documents(data_dir: str):
@@ -72,8 +69,6 @@ def ingest(data_dir: str, persist_dir: str, chunk_size: int, chunk_overlap: int)
 
     os.makedirs(persist_dir, exist_ok=True)
 
-<<<<<<< HEAD
-=======
     # Prepare KG store and local chunk index
     chunks_index = {}
     kg_path = os.path.join(persist_dir, "kg_store.ttl")
@@ -125,15 +120,12 @@ def ingest(data_dir: str, persist_dir: str, chunk_size: int, chunk_overlap: int)
                 pass
 
     # Persist Chroma vectorstore
->>>>>>> ba5a1f4 (Adding kg to deployment)
     Chroma.from_documents(
         split_docs,
         embedding=embeddings,
         persist_directory=persist_dir,
     )
     print(f"Vectorstore built and persisted to {persist_dir}")
-<<<<<<< HEAD
-=======
 
     # Persist chunks index for runtime (simple json mapping)
     try:
@@ -150,20 +142,14 @@ def ingest(data_dir: str, persist_dir: str, chunk_size: int, chunk_overlap: int)
             print(f"KG persisted to {kg_path}")
         except Exception:
             pass
->>>>>>> ba5a1f4 (Adding kg to deployment)
 
 
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("--data-dir", type=str, default="./data")
     parser.add_argument("--persist-dir", type=str, default="./vectorstore")
-<<<<<<< HEAD
-    parser.add_argument("--chunk-size", type=int, default=800)
-    parser.add_argument("--chunk-overlap", type=int, default=200)
-=======
     parser.add_argument("--chunk-size", type=int, default=200)
     parser.add_argument("--chunk-overlap", type=int, default=50)
->>>>>>> ba5a1f4 (Adding kg to deployment)
     args = parser.parse_args()
 
     ingest(

src/utils/rag_runtime.py

@@ -6,8 +6,6 @@ import streamlit as st
 
 from src.vectorstore import get_retriever
 from src.qa_chain import make_conversational_chain
-<<<<<<< HEAD
-=======
 import os
 import json
 from typing import Dict, List, Tuple
@@ -18,7 +16,6 @@ try:
     _HAS_KG = True
 except Exception:
     _HAS_KG = False
->>>>>>> ba5a1f4 (Adding kg to deployment)
 
 
 def run_ingest_cli(data_dir: str, persist_dir: str) -> None:
@@ -31,10 +28,7 @@ def run_ingest_cli(data_dir: str, persist_dir: str) -> None:
     Raises:
         CalledProcessError: If the underlying subprocess fails.
     """
-<<<<<<< HEAD
-=======
-    # Updated to point to the CLI module inside the ingest package
->>>>>>> ba5a1f4 (Adding kg to deployment)
+
     cmd = [
         sys.executable,
         "-m",
@@ -46,9 +40,6 @@ def run_ingest_cli(data_dir: str, persist_dir: str) -> None:
     ]
     subprocess.run(cmd, check=True)
 
-
-<<<<<<< HEAD
-=======
 def _load_chunks_index(persist_dir: str) -> Dict[str, Dict]:
     idx_path = os.path.join(persist_dir, "chunks_index.json")
     if not os.path.exists(idx_path):
@@ -107,7 +98,6 @@ def answer_with_kg(
     return chain({"question": augmented_question, "chat_history": chat_history})
 
 
->>>>>>> ba5a1f4 (Adding kg to deployment)
 @st.cache_resource(show_spinner=False)
 def build_or_load_retriever_cached(
         data_dir: str,

src/vectorstore.py

@@ -51,11 +51,8 @@ class HybridRetriever(BaseRetriever):
 def get_retriever(
         persist_dir: str,
         top_k: int,
-<<<<<<< HEAD
-        retrieval_mode: RetrievalMode = "mmr",
-=======
-        retrieval_mode: RetrievalMode = "hybrid",
->>>>>>> ba5a1f4 (Adding kg to deployment)
+        retrieval_mode: RetrievalMode = "hybrid"
+
 ):
     db = get_vectorstore(persist_dir=persist_dir)
     mode = retrieval_mode.lower()