Update app.py

app.py

@@ -224,42 +224,87 @@ def display_chat_history():
 if 'context_memory' not in st.session_state:
     st.session_state.context_memory = []
 
-def submit():
+def handle_submit():
+    """Handle form submission logic"""
     if not st.session_state.query_input:
         st.warning("⚠️ กรุณาระบุคำถาม")
         return
 
-    user_query = st.session_state.query_input.strip()  # Strip unnecessary spaces
-    st.session_state.query_input = ""  # Clear input
-
-    # Prevent duplicate user query from being added twice
+    user_query = st.session_state.query_input.strip()
+    
+    # Important: Clear input immediately to prevent duplicate submissions
+    st.session_state.query_input = ""
+    
+    # Prevent duplicate submissions by checking last message
     if not st.session_state.chat_history or st.session_state.chat_history[-1][1] != user_query:
-        st.session_state.chat_history.append(("user", user_query))
-
-    # Maintain a rolling context of past interactions
-    if len(st.session_state.context_memory) > 5:  # Limit to last 5 Q&A pairs
-        st.session_state.context_memory.pop(0)
-
-    try:
-        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)
-
-        assistant_answer = result["answer"]
-
-        st.session_state.chat_history.append(("assistant", assistant_answer))
-        st.session_state.context_memory.append({"query": user_query, "answer": assistant_answer})
-
-        add_to_qa_history(user_query, assistant_answer)
-
-    except Exception as e:
-        st.session_state.chat_history.append(("assistant", f"❌ เกิดข้อผิดพลาด: {str(e)}"))
-        st.error(f"Query processing error: {e}")
+        try:
+            st.session_state.processing_query = True
+            
+            # Add user message to chat history
+            st.session_state.chat_history.append(("user", user_query))
+            
+            # Maintain context memory
+            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}"
+            
+            # Process query
+            result = st.session_state.pipeline.process_query(query_with_context)
+            assistant_answer = result["answer"]
+            
+            # Update chat history and context
+            st.session_state.chat_history.append(("assistant", assistant_answer))
+            st.session_state.context_memory.append({"query": user_query, "answer": assistant_answer})
+            
+            # Save to QA history
+            add_to_qa_history(user_query, assistant_answer)
+            
+        except Exception as e:
+            st.session_state.chat_history.append(("assistant", f"❌ เกิดข้อผิดพลาด: {str(e)}"))
+            st.error(f"Query processing error: {e}")
+        
+        finally:
+            st.session_state.processing_query = False
+            st.rerun()  # Refresh the page to show new messages
 
-    finally:
-        st.session_state.processing_query = False  # Reset flag
+def create_chat_input():
+    """Create the chat input section with form handling"""
+    with st.form(key="chat_form", clear_on_submit=True):
+        st.markdown("""
+            <label for="query_input" style="font-size: 1.2rem; font-weight: 600; margin-bottom: 1rem; display: block;">
+                <span style="color: #ffffff; border-left: 4px solid #ffffff; padding-left: 0.8rem;">
+                    โปรดระบุคำถามเกี่ยวกับปฏิทินการศึกษา:
+                </span>
+            </label>
+        """, unsafe_allow_html=True)
+        
+        # Text input
+        st.text_input(
+            "",
+            key="query_input",
+            placeholder="เช่น: วันสุดท้ายของการสอบปากเปล่าในภาคเรียนที่ 1/2567 คือวันที่เท่าไร?"
+        )
+        
+        # Button layout
+        col1, col2, col3 = st.columns([1, 1, 4])
+        
+        with col1:
+            submit_button = st.form_submit_button(
+                "📤 ส่งคำถาม",
+                type="primary",
+                use_container_width=True,
+                on_click=handle_submit
+            )
+        
+        with col2:
+            if st.button("🗑️ ล้างประวัติ", type="secondary", use_container_width=True):
+                st.session_state.context_memory = []
+                st.session_state.chat_history = []
+                st.rerun()
 
 def main():
     # Page config
@@ -307,7 +352,7 @@ def main():
     chat_col, info_col = st.columns([7, 3])
     
     with chat_col:
-        # Chat history display first
+        # Display chat history
         for i, (role, content) in enumerate(st.session_state.chat_history):
             if role == "user":
                 st.markdown(f"""
@@ -316,9 +361,7 @@ def main():
                         {content}
                     </div>
                 """, unsafe_allow_html=True)
-        
             else:
-                # ✅ FIX: Handle both string and dictionary content safely
                 if isinstance(content, dict):  
                     assistant_response = content.get('answer', '❌ ไม่มีข้อมูลคำตอบ')
                 else:  
@@ -331,9 +374,7 @@ def main():
                     </div>
                 """, unsafe_allow_html=True)
 
-                # Add expanders right after the answer (if additional document references exist)
                 if isinstance(content, dict) and content.get('documents'):
-                    # Add expanders right after the answer
                     with st.expander("📚 แสดงข้อมูลอ้างอิง", expanded=False):
                         for i, doc in enumerate(content['documents'], 1):
                             st.markdown(f"""
@@ -343,6 +384,9 @@ def main():
                                 </div>
                             """, unsafe_allow_html=True)
 
+        # Create chat input using the new form-based approach
+        create_chat_input()
+
         # Input section at the bottom
         with st.container():
             st.markdown("""