Update app.py

app.py

@@ -222,47 +222,58 @@ def display_chat_history():
             """, unsafe_allow_html=True)
 
 def submit():
-    if st.session_state.query_input:
-        if st.session_state.pipeline is None:
-            st.error("❌ ไม่สามารถเชื่อมต่อกับระบบได้ กรุณาลองใหม่อีกครั้ง")
-            return
+    if not st.session_state.query_input:
+        st.warning("⚠️ กรุณาระบุคำถาม")
+        return
 
-        # Store user query
-        user_query = st.session_state.query_input
-        st.session_state.chat_history.append(("user", user_query))
+    if st.session_state.pipeline is None:
+        st.error("❌ ไม่สามารถเชื่อมต่อกับระบบได้ กรุณาลองใหม่อีกครั้ง")
+        return
 
-        # Prevent duplicate runs by checking if a query is already being processed
-        if 'processing_query' in st.session_state and st.session_state.processing_query:
-            return
+    # Store user query
+    user_query = st.session_state.query_input
+    st.session_state.chat_history.append(("user", user_query))
 
-        # Mark that a query is being processed
-        st.session_state.processing_query = True
+    # Avoid infinite reruns
+    if "processing_query" in st.session_state and st.session_state.processing_query:
+        return
 
-        # Add loading message as an assistant's response
-        st.session_state.chat_history.append(("assistant", {"answer": "🔍 กำลังค้นหาคำตอบ...", "documents": [], "query_info": {}}))
-        st.rerun()  # Trigger UI update for spinner
+    st.session_state.processing_query = True
 
-        try:
-            # Process query
-            result = st.session_state.pipeline.process_query(user_query)
+    # Display a loading message
+    st.session_state.chat_history.append(("assistant", {
+        "answer": "🔍 กำลังค้นหาคำตอบ...",
+        "documents": [],
+        "query_info": {}
+    }))
+    
+    # **No `st.rerun()` here yet! Just update chat**
+    st.session_state.query_input = ""  # Clear input after submission
+    st.experimental_rerun()  # This will force a refresh once
 
-            # Replace loading message with actual response
-            st.session_state.chat_history[-1] = ("assistant", {
-                "answer": result["answer"],
-                "documents": result["documents"],
-                "query_info": result["query_info"]
-            })
+    try:
+        # Process the query
+        result = st.session_state.pipeline.process_query(user_query)
 
-        except Exception as e:
-            # Replace spinner with error message
-            st.session_state.chat_history[-1] = ("assistant", {"answer": f"❌ เกิดข้อผิดพลาด: {str(e)}", "documents": [], "query_info": {}})
+        # Replace loading message with actual answer
+        st.session_state.chat_history[-1] = ("assistant", {
+            "answer": result["answer"],
+            "documents": result["documents"],
+            "query_info": result["query_info"]
+        })
+
+    except Exception as e:
+        # Replace with an error message if query fails
+        st.session_state.chat_history[-1] = ("assistant", {
+            "answer": f"❌ เกิดข้อผิดพลาด: {str(e)}",
+            "documents": [],
+            "query_info": {}
+        })
 
-        # Reset input and allow new queries
-        st.session_state.query_input = ""
-        st.session_state.processing_query = False
-        st.rerun()
+    # Reset processing flag
+    st.session_state.processing_query = False
+    st.experimental_rerun()  # Refresh UI once processing is done
 
-     
 def main():
     # Page config
     st.set_page_config(