Update app.py

app.py

@@ -176,23 +176,28 @@ def ask_bot(query):
     full_query = standard_prompt + query
     return full_query
 
-def add_to_chat_history(speaker, message, history_key):
-    if history_key in st.session_state:
-        st.session_state[history_key].append({"speaker": speaker, "message": message})
-
-def construct_context(chat_history):
-    # Limit the context to the last few interactions (e.g., last 5)
-    limited_history = chat_history[-5:]
-    return " ".join([f"{entry['speaker']}: {entry['message']}" for entry in limited_history])
-
-def display_latest_messages(chat_history):
-    latest_messages = chat_history[-2:]
-    for chat_entry in latest_messages:
-        speaker, message = chat_entry['speaker'], chat_entry['message']
-        background_color = "#ffeecf" if speaker == "User" else "#e0ecff"
-        st.markdown(f"<div style='background-color: {background_color}; padding: 10px; border-radius: 10px; margin: 10px;'>{speaker}: {message}</div>", unsafe_allow_html=True)
+def get_chatbot_response(query, VectorStore):
+    chain = load_chatbot()
+    docs = VectorStore.similarity_search(query=query, k=5)
+    with get_openai_callback() as cb:
+        response = chain.run(input_documents=docs, question=query)
+    return handle_no_answer(response)
+
+def combine_chat_history_with_query(chat_history, query):
+    combined_history = ""
+    for chat in chat_history:
+        if len(chat) >= 2:
+            combined_history += f"{chat[0]}: {chat[1]} "
+    return combined_history + query
 
-    
+def display_new_messages(placeholder, chat_history):
+    new_messages = chat_history[-2:]
+    for chat in new_messages:
+        background_color = "#ffeecf" if chat[2] == "new" else "#ffeecf" if chat[0] == "User" else "#ffeecf"
+        placeholder.markdown(f"<div style='background-color: {background_color}; padding: 10px; border-radius: 10px; margin: 10px;'>{chat[0]}: {chat[1]}</div>", unsafe_allow_html=True)
+
+def mark_messages_as_old(chat_history):
+    return [(sender, msg, "old") for sender, msg, _ in chat_history]
 
 def page1():
     try:
@@ -258,49 +263,27 @@ def page1():
 
 
         
-            if query:
-                full_query = ask_bot(query)  # Generate full query using ask_bot function
-            
-                # Start timing
-                start_time = time.time()
-            
-                with st.spinner('Bot is thinking...'):
-                    # Load the chatbot model
-                    chain = load_chatbot()
-            
-                    # Perform the similarity search and get the response
-                    docs = VectorStore.similarity_search(query=full_query, k=5)
-                    with get_openai_callback() as cb:
-                        response = chain.run(input_documents=docs, question=full_query)
-                        response = handle_no_answer(response)
-            
-                # Stop timing
-                end_time = time.time()
-            
-                # Calculate duration
-                duration = end_time - start_time
-                st.text(f"Response time: {duration:.2f} seconds")
-            
-                # Update chat history after the bot's response
-                st.session_state['chat_history_page1'].append(("User", query))
-                st.session_state['chat_history_page1'].append(("Bot", response))
-            
-                # Display new messages at the bottom
-                new_messages = st.session_state['chat_history_page1'][-2:]
-                for chat in new_messages:
-                    background_color = "#ffeecf" if chat[2] == "new" else "#ffeecf" if chat[0] == "User" else "#ffeecf"
-                    new_messages_placeholder.markdown(f"<div style='background-color: {background_color}; padding: 10px; border-radius: 10px; margin: 10px;'>{chat[0]}: {chat[1]}</div>", unsafe_allow_html=True)
-            
-                # Clear the input field after the query is made
-                query = ""
-                
-# Mark all messages as old after displaying
-st.session_state['chat_history_page1'] = [(sender, msg, "old") for sender, msg, _ in st.session_state['chat_history_page1']]
+        if query:
+            full_query = ask_bot(query)
+            combined_query = combine_chat_history_with_query(st.session_state['chat_history_page1'], full_query)
+            st.session_state['chat_history_page1'].append(("User", query, "new"))
+
+            start_time = time.time()
+            with st.spinner('Bot is thinking...'):
+                response = get_chatbot_response(combined_query, VectorStore)
+                st.session_state['chat_history_page1'].append(("Bot", response, "new"))
+
+            end_time = time.time()
+            duration = end_time - start_time
+            st.text(f"Response time: {duration:.2f} seconds")
+
+            display_new_messages(new_messages_placeholder, st.session_state['chat_history_page1'])
+            query = ""
+
+            st.session_state['chat_history_page1'] = mark_messages_as_old(st.session_state['chat_history_page1'])
 
     except Exception as e:
         st.error(f"Upsi, an unexpected error occurred: {e}")
-        # Optionally log the exception details to a file or error tracking service
-
 
 
 def page2():