Update app.py

app.py

@@ -106,8 +106,6 @@ def clear_conversation_context():
     # Clear the context memory
     st.session_state.context_memory = []
     
-    st.session_state.context_cleared = True
-    
 def initialize_pipeline():
     """Initialize RAG pipeline with conversation memory support"""
     try:
@@ -412,49 +410,45 @@ def handle_submit(user_query: str):
             
             # Convert the Streamlit chat history format to RAG format
             rag_conversation_history = []
-
-            if not st.session_state.get('context_cleared', False):
-                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"
+        
+            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"
+                
+                # Handle content based on type
+                if isinstance(content, dict) and "answer" in content:
+                    rag_content = content["answer"]
+                else:
+                    rag_content = content
                     
-                    # Handle content based on type
-                    if isinstance(content, dict) and "answer" in content:
-                        rag_content = content["answer"]
-                    else:
-                        rag_content = content
-                        
-                    rag_conversation_history.append({"role": rag_role, "content": rag_content})
+                rag_conversation_history.append({"role": rag_role, "content": rag_content})
+            
+            # Store conversation context in session state
+            if 'context_memory' not in st.session_state:
+                st.session_state.context_memory = []
+            
+            # Process query with conversation history
+            with st.spinner("🔍 กำลังค้นหาคำตอบ..."):
+                result = st.session_state.pipeline.process_query(
+                    query=user_query, 
+                    conversation_history=rag_conversation_history
+                )
                 
-                # Store conversation context in session state
-                if 'context_memory' not in st.session_state:
-                    st.session_state.context_memory = []
+                # Create response with same structure as main()
+                response_dict = {
+                    "answer": result.get("answer", ""),
+                    "documents": result.get("relevant_docs", [])
+                }
                 
-                # Process query with conversation history
-                with st.spinner("🔍 กำลังค้นหาคำตอบ..."):
-                    result = st.session_state.pipeline.process_query(
-                        query=user_query, 
-                        conversation_history=rag_conversation_history
-                    )
-                    
-                    # Create response with same structure as main()
-                    response_dict = {
-                        "answer": result.get("answer", ""),
-                        "documents": result.get("relevant_docs", [])
-                    }
-                    
-                    # Update chat history and context
-                    add_to_history("assistant", response_dict)
-                    
-                    # Add this exchange to context memory for future reference
-                    st.session_state.context_memory.append({
-                        "query": user_query,
-                        "response": response_dict["answer"],
-                        "timestamp": datetime.now().isoformat()
-                    })
-            else:
-                # If context was cleared, only include the current query
-                st.session_state.context_cleared = False  # Reset flag
+                # Update chat history and context
+                add_to_history("assistant", response_dict)
+                
+                # Add this exchange to context memory for future reference
+                st.session_state.context_memory.append({
+                    "query": user_query,
+                    "response": response_dict["answer"],
+                    "timestamp": datetime.now().isoformat()
+                })
             
         except Exception as e:
             error_msg = f"❌ เกิดข้อผิดพลาด: {str(e)}"
@@ -482,7 +476,7 @@ def create_chat_input():
             placeholder="เช่น: วิชาเลือกมีอะไรบ้าง?"
         )
         
-        col1, col2, col3 = st.columns([5, 3, 2])
+        col1, col2 = st.columns([7, 3])
         
         with col1:
             submitted = st.form_submit_button(
@@ -498,23 +492,12 @@ 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.chat_history = []
             st.rerun()
-            
-        if clear_context_button:
-            clear_conversation_context()
-            st.info("ล้างบริบทสนทนาแล้ว แต่ยังคงประวัติการแสดงสนทนา")
 
 def main():
     # Page config