corrected

app/chains.py

@@ -6,8 +6,8 @@ from prompts import (
     raw_prompt,
     raw_prompt_formatted, 
     history_prompt_formatted, 
-    question_prompt_formatted,
-    context_prompt_formatted,
+    standalone_prompt_formatted,
+    rag_prompt_formatted,
     format_context,
     tokenizer
 )
@@ -16,6 +16,7 @@ from data_indexing import DataIndexer
 
 data_indexer = DataIndexer()
 
+
 llm = HuggingFaceEndpoint(
     repo_id="meta-llama/Meta-Llama-3-8B-Instruct",
     huggingfacehub_api_token=os.environ['HF_TOKEN'],
@@ -37,15 +38,13 @@ history_chain = (
 ).with_types(input_type=schemas.HistoryInput)
 
 rag_chain = (
-    {
-      'question': question_prompt_formatted | llm,
-      'hybrid_search': RunnablePassthrough()   
-    }
+    RunnablePassthrough.assign(new_question=standalone_prompt_formatted | llm)
     | {
-        'context': lambda x: format_context(data_indexer.search(x['question'], hybrid_search=x['hybrid_search'])),
-        'standalone_question': lambda x: x['question']
+        'context': lambda x: format_context(data_indexer.search(x['new_question'], hybrid_search=x['hybrid_search'])),
+        'standalone_question': lambda x: x['new_question'],
+        'test': lambda x : print(x)
     }
-    | context_prompt_formatted
+    | rag_prompt_formatted
     | llm
 ).with_types(input_type=schemas.RagInput)
 

app/crud.py

@@ -1,6 +1,5 @@
 from sqlalchemy.orm import Session
 import models, schemas
-from fastapi import HTTPException
 
 
 def get_or_create_user(db: Session, username: str):
@@ -25,4 +24,4 @@ def get_user_chat_history(db: Session, username: str):
     user = db.query(models.User).filter(models.User.username == username).first()
     if not user:
         return []
-    return db.query(models.Message).filter(models.Message.user_id == user.id).all()
+    return user.messages

app/data_indexing.py

@@ -38,8 +38,8 @@ class DataIndexer:
             ) 
 
         self.index = self.pinecone_client.Index(self.index_name)
-        self.source_index = self.get_source_index()
-        # self.source_index = None
+        # self.source_index = self.get_source_index()
+        self.source_index = None
 
     def get_source_index(self):
         if not os.path.isfile(self.source_file):

app/main.py

@@ -7,7 +7,7 @@ from langserve.serialization import WellKnownLCSerializer
 from typing import Any, List
 import crud, models, schemas
 from database import SessionLocal, engine
-from chains import llm, simple_chain, formatted_chain, history_chain, rag_chain
+from chains import simple_chain, formatted_chain, history_chain, rag_chain
 from prompts import format_chat_history
 from callbacks import LogResponseCallback
 

app/prompts.py

@@ -17,7 +17,7 @@ Follow Up question: {question}
 helpful answer:
 """
 
-question_prompt = """
+standalone_prompt = """
 Given the following conversation and a follow up question, rephrase the 
 follow up question to be a standalone question, in its original language.
 
@@ -29,7 +29,7 @@ Follow Up Input: {question}
 Standalone question:
 """
 
-context_prompt = """
+rag_prompt = """
 Answer the question based only on the following context:
 {context}
 
@@ -65,6 +65,6 @@ def format_context(docs: List[str]):
 raw_prompt_formatted = format_prompt(raw_prompt)
 raw_prompt = PromptTemplate.from_template(raw_prompt)
 history_prompt_formatted = format_prompt(history_prompt)
-question_prompt_formatted = format_prompt(question_prompt)
-context_prompt_formatted = format_prompt(context_prompt)
+standalone_prompt_formatted = format_prompt(standalone_prompt)
+rag_prompt_formatted = format_prompt(rag_prompt)