Update app.py

app.py

@@ -106,7 +106,7 @@ 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
+    st.session_state.context_cleared = True
     
 def initialize_pipeline():
     """Initialize RAG pipeline with conversation memory support"""
@@ -412,44 +412,49 @@ 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"
-                
-                # Handle content based on type
-                if isinstance(content, dict) and "answer" in content:
-                    rag_content = content["answer"]
-                else:
-                    rag_content = content
+
+            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"
                     
-                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
-                )
-                
-                # Create response with same structure as main()
-                response_dict = {
-                    "answer": result.get("answer", ""),
-                    "documents": result.get("relevant_docs", [])
-                }
+                    # 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})
                 
-                # Update chat history and context
-                add_to_history("assistant", response_dict)
+                # Store conversation context in session state
+                if 'context_memory' not in st.session_state:
+                    st.session_state.context_memory = []
                 
-                # 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()
-                })
+                # 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
             
         except Exception as e:
             error_msg = f"❌ เกิดข้อผิดพลาด: {str(e)}"