Update app.py

app.py

@@ -300,96 +300,84 @@ vectorstore = Chroma.from_documents(documents=splits, embedding=HuggingFaceEmbed
 # Set up the retriever to fetch relevant phrases based on the user's query
 retriever = vectorstore.as_retriever()
 
-
-# Initialize a list to store chat messages
+# Initialize chat history
 if "messages" not in st.session_state:
     st.session_state.messages = []
 
-# Text input for user message
-user_input = st.text_input("You:", key="input")
-
+# Display chat messages from history on app rerun
+for message in st.session_state.messages:
+    with st.chat_message(message["role"]):
+        st.markdown(message["content"])
 
-# Loop for continuous interaction
-if user_input:
+# React to user input
+if user_input := st.chat_input("What is up?"):
     try:
-        # Take user input
-        st.session_state.messages.append(f"You: {user_input}")
+
         time_now = get_current_time()
         current_date = get_date()
+        # Display user message in chat message container
+        st.chat_message("user").markdown(user_input)
+        # Add user message to chat history
+        st.session_state.messages.append({"role": "user", "content": user_input})
 
         sentimenttocheck = ""
-        res = tagging_chain.invoke({"input": user_input, "traning_data": retriever})
+        res = tagging_chain().invoke({"input": user_input, "traning_data": retriever})
         sentimenttocheck += res.sentiment
 
         if sentimenttocheck == "set reminder":
             reminders_thr = get_reminders()
             database_thr = format_reminders_for_context(reminders_thr)
             new_remind = ""
-            for new_reminder in rag_chain_tt.stream({"question": user_input, "context": database_thr, "date_tt": get_date(), "current_time": time_now}):
+            for new_reminder in rag_chain_tt().stream({"question": user_input, "context": database_thr, "date_tt": get_date(), "current_time": get_current_time()}):
                 new_remind += new_reminder.content
             print(f"New reminder: {new_remind}")
             if new_remind == "repeated_reminder":
-                st.session_state.messages.append("Reminder already existed!")
+                response_st = "Reminder already existed!"
             else:
                 try:
                     with sqlite3.connect('reminders.db') as conn:
                         cursor = conn.cursor()
-
-                        # Execute the update query
                         cursor.execute(new_remind)
                         conn.commit()
-
-                    # Check if the update was successful
-                    if cursor.rowcount > 0:
-                        st.session_state.messages.append("New reminder created.")
-                    else:
-                        st.session_state.messages.append("No reminder created, Errors occur")
-
+                    response_st = "New reminder created." if cursor.rowcount > 0 else "No reminder created, Errors occur"
                 except sqlite3.Error as e:
-                    st.session_state.messages.append(f"An error occurred while updating the reminder: {e}")
+                    response_st = f"An error occurred while updating the reminder: {e}"
         elif sentimenttocheck == "update reminder":
             reminders_sec = get_reminders()
             database_sec = format_reminders_for_context(reminders_sec)
             updated_remind = ""
-            for updated_cont in rag_chaining.stream({"question": user_input, "context": database_sec, "date_tt": get_date()}):
+            for updated_cont in rag_chaining().stream({"question": user_input, "context": database_sec, "date_tt": get_date()}):
                 updated_remind += updated_cont.content
             print(f"Database: {updated_remind}")
             if updated_remind == "reminder_x":
-                st.session_state.messages.append("No reminder found to change!")
+                response_st = "No reminder found to change!"
             else:
                 try:
                     with sqlite3.connect('reminders.db') as conn:
                         cursor = conn.cursor()
-
-                        # Execute the update query
                         cursor.execute(updated_remind)
                         conn.commit()
-
-                    # Check if the update was successful
-                    if cursor.rowcount > 0:
-                        st.session_state.messages.append("Reminder updated successfully.")
-                    else:
-                        st.session_state.messages.append("No reminder found to update with the given details.")
-
+                    response_st = "Reminder updated successfully." if cursor.rowcount > 0 else "No reminder found to update with the given details."
                 except sqlite3.Error as e:
-                    st.session_state.messages.append(f"An error occurred while updating the reminder: {e}")
+                    response_st = f"An error occurred while updating the reminder: {e}"
         elif sentimenttocheck == "check reminder":
             reminders = get_reminders()
             database = format_reminders_for_context(reminders)
             response_max = ""
-            for max in rag_chain.stream({"question": user_input, "context": database, "date_tt": get_date()}):
+            for max in rag_chain_tt().stream({"question": user_input, "context": database, "date_tt": get_date()}):
                 response_max += max.content
             st.session_state.messages.append(f"Database remind: {response_max}")
         elif sentimenttocheck == "remove reminder":
-          st.session_state.messages.append("Remove Reminder")
+            st.session_state.messages.append("Remove Reminder")
         else:
-          ai_response = get_ai_response(user_input)
-          st.session_state.messages.append(f"{ai_response}")
+            response_st = get_ai_response(user_input)
+        
+        # Display assistant response in chat message container
+        with st.chat_message("assistant"):
+            st.markdown(response_st)
+        # Add assistant response to chat history
+        st.session_state.messages.append({"role": "assistant", "content": response_st})
 
     except Exception as e:
         # Print the error and continue
-        st.session_state.messages.append(f"\nAn error occurred: {e}. Please try again.")
-
-# Display the chat history
-for message in st.session_state.messages:
-    st.write(message)
+        st.session_state.messages.append(f"\nAn error occurred: {e}. Please try again.")