Update app.py

app.py

@@ -394,7 +394,7 @@ if 'context_memory' not in st.session_state:
     st.session_state.context_memory = []
 
 def handle_submit(user_query: str):
-    """Enhanced query handling with conversation history"""
+    """Enhanced query handling with improved conversation history tracking"""
     if not user_query:
         st.warning("⚠️ กรุณาระบุคำถาม")
         return
@@ -410,8 +410,11 @@ def handle_submit(user_query: str):
             add_to_history("user", user_query)
             
             # Convert the Streamlit chat history format to RAG format
+            # Include more context history (up to 5 previous exchanges)
             rag_conversation_history = []
-            for role, content in st.session_state.chat_history:
+            history_to_include = st.session_state.chat_history[-11:] if len(st.session_state.chat_history) > 10 else st.session_state.chat_history
+            
+            for role, content in history_to_include:
                 # Map Streamlit's role names to the format used in the RAG system
                 rag_role = "user" if role == "user" else "assistant"
                 
@@ -427,8 +430,29 @@ def handle_submit(user_query: str):
             if 'context_memory' not in st.session_state:
                 st.session_state.context_memory = []
             
-            # Process query with conversation history
+            # Process query with improved conversation history
             with st.spinner("🔍 กำลังค้นหาคำตอบ..."):
+                # Add debug logging to verify context
+                print(f"Processing query with {len(rag_conversation_history)} context messages")
+                
+                # Add special handling for reference questions
+                reference_keywords = ["ก่อนหน้านี้", "ก่อนหน้า", "ที่ผ่านมา", "คำถามก่อนหน้า", "คำถามที่แล้ว", 
+                                     "previous", "earlier", "before", "last time", "last question"]
+                
+                is_reference_question = any(keyword in user_query.lower() for keyword in reference_keywords)
+                
+                # If this is a reference question, emphasize context in the query
+                if is_reference_question and len(rag_conversation_history) >= 3:
+                    # Extract the previous user question (should be 2 positions back)
+                    previous_questions = [msg["content"] for msg in rag_conversation_history[:-2] 
+                                          if msg["role"] == "user"]
+                    
+                    if previous_questions:
+                        prev_question = previous_questions[-1]
+                        enhanced_query = f"คำถามนี้อ้างอิงถึงคำถามก่อนหน้า '{prev_question}' โปรดพิจารณาบริบทนี้ในการตอบ: {user_query}"
+                        print(f"Enhanced reference query: {enhanced_query}")
+                        user_query = enhanced_query
+                
                 result = st.session_state.pipeline.process_query(
                     query=user_query, 
                     conversation_history=rag_conversation_history