Update app.py

app.py

@@ -429,17 +429,27 @@ def handle_submit(user_query: str):
             
             # Process query with conversation history
             with st.spinner("🔍 กำลังค้นหาคำตอบ..."):
-                result = st.session_state.pipeline.process_query(
-                    query=user_query, 
-                    conversation_history=rag_conversation_history
-                )
+
+                if len(st.session_state.context_memory) > 5:
+                    st.session_state.context_memory.pop(0)
+                
+                # 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 with same structure as main()
+                # Create response dictionary with answer and documents
                 response_dict = {
                     "answer": result.get("answer", ""),
-                    "documents": result.get("relevant_docs", [])
+                    "documents": result.get("documents", [])
                 }
                 
+                # 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)
                 
@@ -496,6 +506,7 @@ def create_chat_input():
             handle_submit(query)
         
         if clear_button:
+            st.session_state.context_memory = []
             st.session_state.chat_history = []
             st.rerun()