Update app.py

app.py

@@ -68,31 +68,28 @@ def search(query: str, k: int = 2 ):
 # returns scores (List[float]): the retrieval scores from either FAISS (IndexFlatL2 by default) and examples (dict) format
 # called by talk function that passes prompt
 
-def format_prompt(prompt,retrieved_documents,k):
+def format_prompt(prompt,retrieved_documents,k,history,memory_limit=3):
     """using the retrieved documents we will prompt the model to generate our responses"""   
     PROMPT = f"Question:{prompt}\nContext:"
     for idx in range(k) :
         PROMPT+= f"{retrieved_documents['0'][idx]}\n"
-    return PROMPT
-
-#def add_history(formatted_prompt, history, memory_limit=3):
-    # always keep len(history) <= memory_limit
- #   if len(history) > memory_limit:
-  #      history = history[-memory_limit:]
-
-   # if len(history) == 0:
-    #    return PROMPT + f"{formatted_prompt} [/INST]"
-
-    #formatted_message = PROMPT + f"{history[0][0]} [/INST] {history[0][1]} </s>"
-
+    if len(history) == 0:
+        return PROMPT
+    
+    if len(history) > memory_limit:
+        history = history[-memory_limit:]
+    
+    print("checkwohist")
+    PROMPT = PROMPT + f"{history[0][0]} [/INST] {history[0][1]} </s>"
+    print("checkwthhist")
+    print(PROMPT)
     # Handle conversation history
-#    for user_msg, model_answer in history[1:]:
- #       formatted_message += f"<s>[INST] {user_msg} [/INST] {model_answer} </s>"
-
-  #  # Handle the current message
-   # formatted_message += f"<s>[INST] {formatted_prompt} [/INST]"
+    for user_message, bot_message in history[1:]:
+        PROMPT += f"<s>[INST] {user_msg} [/INST] {model_answer} </s>"
+    print("checkwthhist2")
+    print(PROMPT)
+    return PROMPT
 
-    #return formatted_message
 
 # Called by talk function to add retrieved documents to the prompt. Keeps adding text of retrieved documents to string that are retreived
 
@@ -101,7 +98,7 @@ def talk(prompt, history):
     scores , retrieved_documents = search(prompt, k) # get retrival scores and examples in dictionary format based on the prompt passed
     print(retrieved_documents.keys())
 #    print("check4")
-    formatted_prompt = format_prompt(prompt,retrieved_documents,k) # create a new prompt using the retrieved documents
+    formatted_prompt = format_prompt(prompt,retrieved_documents,k,history,memory_limit=3) # create a new prompt using the retrieved documents
     print("check5")
 #    print(retrieved_documents['0'])
 #    print(formatted_prompt)