Update app.py

app.py

@@ -18,7 +18,6 @@ from calendar_rag import (
     ProcessingConfig,
     LocalizationConfig
 )
-
 # Custom CSS for enhanced styling
 def load_custom_css():
     st.markdown("""
@@ -106,6 +105,8 @@ def clear_conversation_context():
     # Clear the context memory
     st.session_state.context_memory = []
     
+    # Note: We keep st.session_state.chat_history for UI display purposes
+    
 def initialize_pipeline():
     """Initialize RAG pipeline with conversation memory support"""
     try:
@@ -410,7 +411,6 @@ def handle_submit(user_query: str):
             
             # Convert the Streamlit chat history format to RAG format
             rag_conversation_history = []
-        
             for role, content in st.session_state.chat_history:
                 # Map Streamlit's role names to the format used in the RAG system
                 rag_role = "user" if role == "user" else "assistant"
@@ -429,27 +429,17 @@ def handle_submit(user_query: str):
             
             # Process query with conversation history
             with st.spinner("🔍 กำลังค้นหาคำตอบ..."):
-
-                if len(st.session_state.context_memory) > 5:
-                    st.session_state.context_memory.pop(0)
+                result = st.session_state.pipeline.process_query(
+                    query=user_query, 
+                    conversation_history=rag_conversation_history
+                )
                 
-                # Build query with context
-                query_with_context = "\n".join(
-                    [f"Q: {qa['query']}\nA: {qa['answer']}" for qa in st.session_state.context_memory]
-                ) + f"\nQ: {user_query}"
-                
-                result = st.session_state.pipeline.process_query(query_with_context)
-                
-                # Create response dictionary with answer and documents
+                # Create response with same structure as main()
                 response_dict = {
                     "answer": result.get("answer", ""),
-                    "documents": result.get("documents", [])
+                    "documents": result.get("relevant_docs", [])
                 }
                 
-                # Update chat history and context
-                st.session_state.chat_history.append(("assistant", response_dict))
-                st.session_state.context_memory.append({"query": user_query, "answer": response_dict})
-                
                 # Update chat history and context
                 add_to_history("assistant", response_dict)
                 
@@ -486,7 +476,7 @@ def create_chat_input():
             placeholder="เช่น: วิชาเลือกมีอะไรบ้าง?"
         )
         
-        col1, col2 = st.columns([7, 3])
+        col1, col2, col3 = st.columns([5, 3, 2])
         
         with col1:
             submitted = st.form_submit_button(
@@ -502,13 +492,23 @@ def create_chat_input():
                 use_container_width=True
             )
             
+        with col3:
+            clear_context_button = st.form_submit_button(
+                "🧠 ล้างบริบทสนทนา",
+                type="secondary",
+                use_container_width=True
+            )
+            
         if submitted:
             handle_submit(query)
         
         if clear_button:
-            st.session_state.context_memory = []
             st.session_state.chat_history = []
             st.rerun()
+            
+        if clear_context_button:
+            clear_conversation_context()
+            st.info("ล้างบริบทสนทนาแล้ว แต่ยังคงประวัติการแสดงสนทนา")
 
 def main():
     # Page config