Update app.py

app.py

@@ -334,20 +334,18 @@ def save_feedback_to_huggingface():
 def main():
     load_environment()
 
-    # Initialize session state
-    for key, default in {
-        "chat_ready": False,
-        "chat_history": [],
-        "vectorstore": None,
-        "feedback_submitted": False,
-        "last_question": "",
-        "feedback_log": []
-    }.items():
-        if key not in st.session_state:
-            st.session_state[key] = default
+    # Initialize session state safely
+    if "chat_ready" not in st.session_state:
+        st.session_state.chat_ready = False
+    if "chat_history" not in st.session_state:
+        st.session_state.chat_history = []
+    if "vectorstore" not in st.session_state:
+        st.session_state.vectorstore = None
     if "feedback_log" not in st.session_state:
         st.session_state.feedback_log = []
-        
+    if "feedback_submitted" not in st.session_state:
+        st.session_state.feedback_submitted = False
+
     st.header("Chat with MODTRAN Documents 📄")
 
     if not st.session_state.chat_ready:
@@ -357,24 +355,53 @@ def main():
             st.session_state.chat_ready = True
             st.success("MODTRAN User Manual loaded successfully!")
 
-    # UI after feedback submission
-    if st.session_state.feedback_submitted:
-        st.success("✅ Thank you for your feedback!")
-        st.info("You may now ask another question.")
-        st.markdown(f"📝 Feedbacks collected: **{len(st.session_state.feedback_log)} / 5**")
-        # Reset UI state for next question
-        st.session_state.user_input = ""
-        st.session_state.last_question = ""
-        st.session_state.feedback_submitted = False
-
-    user_question = st.text_input("Ask your question:", key="user_input")
-
-    # Question handling logic
-    if (
-        st.session_state.chat_ready and
-        user_question and
-        user_question != st.session_state.last_question
-    ):
+    # Show entire conversation history
+    for i, exchange in enumerate(st.session_state.chat_history):
+        st.markdown(f"**You:** {exchange['user']}")
+        st.markdown(f"**MODTRAN Bot:** {exchange['bot']}")
+
+        # If rated, show rating
+        if "rating" in exchange:
+            st.markdown(f"⭐️ You rated this: {exchange['rating']}/5")
+
+        # If last answer not yet rated, show rating form
+        elif i == len(st.session_state.chat_history) - 1:
+            with st.form(key=f"feedback_form_{i}"):
+                rating = st.radio(
+                    "Rate this response:",
+                    options=["1", "2", "3", "4", "5"],
+                    key=f"rating_{i}",
+                    horizontal=True
+                )
+                submitted = st.form_submit_button("Submit Rating")
+                if submitted:
+                    # Save rating
+                    st.session_state.chat_history[i]["rating"] = rating
+                    st.session_state.feedback_log.append({
+                        "question": exchange["user"],
+                        "response": exchange["bot"],
+                        "rating": rating,
+                        "timestamp": datetime.now().isoformat()
+                    })
+
+                    print(f"📌 Feedbacks collected so far: {len(st.session_state.feedback_log)}")
+
+                    # Upload feedbacks when 5 are collected
+                    if len(st.session_state.feedback_log) >= 5:
+                        print("📦 Upload threshold reached — saving feedback to Hugging Face.")
+                        save_feedback_to_huggingface()
+
+                    st.success("✅ Thank you for your feedback!")
+                    st.session_state.feedback_submitted = True
+                    st.rerun()
+
+    # Show how many feedbacks collected
+    st.markdown(f"📝 Feedbacks collected: **{len(st.session_state.feedback_log)} / 5**")
+
+    # Show input box for next question
+    user_question = st.text_input("Ask your next question:", key="user_input")
+
+    if user_question:
         with st.spinner("Generating answer..."):
             try:
                 set_global_vectorstore(st.session_state.vectorstore)
@@ -382,43 +409,15 @@ def main():
             except Exception as e:
                 response = f"⚠️ Something went wrong: {e}"
 
-        # Show answer and feedback form
-        st.markdown("### Answer:")
-        st.write(response)
-
-        st.session_state.chat_history.append({"user": user_question, "bot": response})
-        st.session_state.last_question = user_question
-
-        st.markdown(f"📝 Feedbacks collected: **{len(st.session_state.feedback_log)} / 5**")
-
-        with st.form(key=f"feedback_form_{len(st.session_state.chat_history)}"):
-            rating = st.radio(
-                "Rate this response:",
-                options=["1", "2", "3", "4", "5"],
-                key=f"rating_{len(st.session_state.chat_history)}",
-                horizontal=True
-            )
-            submitted = st.form_submit_button("Submit Rating")
-            if submitted:
-                feedback = {
-                    "question": user_question,
-                    "response": response,
-                    "rating": rating,
-                    "timestamp": datetime.datetime.now().isoformat()
-                }
-                st.session_state.feedback_log.append(feedback)
-
-                if len(st.session_state.feedback_log) >= 1:
-                    print("📦 Upload threshold reached — saving feedback to Hugging Face.")
-                    save_feedback_to_huggingface()
-
-                st.session_state.feedback_submitted = True
-                st.rerun()
-
-
-
-
+        # Append new conversation
+        st.session_state.chat_history.append({
+            "user": user_question,
+            "bot": response
+        })
 
+        # Clear input and rerun for a clean view
+        st.session_state.user_input = ""
+        st.rerun()
 
 if __name__ == "__main__":
     load_environment()