Update app.py

app.py

@@ -34,16 +34,17 @@ def stream_chat_with_rag(
 
     # Build the conversation prompt including system prompt and history
     conversation = system_prompt + "\n\n" + f"For Client: {client_name}\n"
-    for user_input, assistant_response in history:
-        conversation += f"User: {user_input}\nAssistant: {assistant_response}\n"
-    conversation += f"User: {message}\nAssistant:"
+    if history:  # Check if history exists
+        for user_input, assistant_response in history:
+            conversation += f"User: {user_input}\nAssistant: {assistant_response}\n"
+    conversation += f"User: {message}\nAssistant:"  # Add the current message
 
     # Prepare the data to send to the API
-    # Remove 'history' from the payload since the API does not accept it
     api_payload = {
-        "message": conversation,  # Include the history in the message
+        "message": conversation,  # Include the history in the message,
+        "history": history
         "client_name": client_name,
-        "system_prompt": "",  # Optionally set to empty if included in message
+        "system_prompt": "",  # Optionally set to empty if included in the message
         "num_retrieved_docs": num_retrieved_docs,
         "num_docs_final": num_docs_final,
         "temperature": temperature,
@@ -53,27 +54,92 @@ def stream_chat_with_rag(
         "penalty": penalty,
     }
 
-    # Make the API call to get the assistant's reply
-    response = client.predict(
-        api_name="/chat",
-        **api_payload
-    )
+    try:
+        # Make the API call to get the assistant's reply
+        response = client.predict(
+            api_name="/chat",
+            **api_payload
+        )
+
+        # Extract the assistant's reply
+        if isinstance(response, tuple):
+            answer = response[0]
+        else:
+            answer = response
+
+        # Debugging statements
+        print("The Answer in stream_chat_with_rag:")
+        print(answer)
+
+        # Update the conversation history
+        history.append((message, answer))
+
+    # except Exception as e:
+    #     print(f"An error occurred: {e}")
+    #     answer = "There was an error retrieving the response."
+
+    # # Return the updated history
+    # return history
+
+
+# def stream_chat_with_rag(
+#     message: str,
+#     history: list,
+#     client_name: str,
+#     system_prompt: str,
+#     num_retrieved_docs: int = 10,
+#     num_docs_final: int = 9,
+#     temperature: float = 0,
+#     max_new_tokens: int = 1024,
+#     top_p: float = 1.0,
+#     top_k: int = 20,
+#     penalty: float = 1.2,
+# ):
+#     print(f"Message: {message}")
+#     print(f"History: {history}")
+
+#     # Build the conversation prompt including system prompt and history
+#     conversation = system_prompt + "\n\n" + f"For Client: {client_name}\n"
+#     for user_input, assistant_response in history:
+#         conversation += f"User: {user_input}\nAssistant: {assistant_response}\n"
+#     conversation += f"User: {message}\nAssistant:"
+
+#     # Prepare the data to send to the API
+#     # Remove 'history' from the payload since the API does not accept it
+#     api_payload = {
+#         "message": conversation,  # Include the history in the message
+#         "client_name": client_name,
+#         "system_prompt": "",  # Optionally set to empty if included in message
+#         "num_retrieved_docs": num_retrieved_docs,
+#         "num_docs_final": num_docs_final,
+#         "temperature": temperature,
+#         "max_new_tokens": max_new_tokens,
+#         "top_p": top_p,
+#         "top_k": top_k,
+#         "penalty": penalty,
+#     }
+
+#     # Make the API call to get the assistant's reply
+#     response = client.predict(
+#         api_name="/chat",
+#         **api_payload
+#     )
 
-    # Extract the assistant's reply
-    if isinstance(response, tuple):
-        answer = response[0]
-    else:
-        answer = response
+#     # Extract the assistant's reply
+#     if isinstance(response, tuple):
+#         answer = response[0]
+#     else:
+#         answer = response
 
-    # Debugging statements
-    print("The Answer in stream_chat_with_rag:")
-    print(answer)
+#     # Debugging statements
+#     print("The Answer in stream_chat_with_rag:")
+#     print(answer)
 
-    # Update the conversation history
-    history.append((message, answer))
+#     # Update the conversation history
+#     history.append((message, answer))
 
-    # Return the updated history
-    #return history
+#     # Return the updated history
+#     #return history
 
 
 # Function to handle PDF processing API call