Update app.py

app.py

@@ -17,6 +17,10 @@ if 'submit_clicked' not in st.session_state:
     st.session_state.submit_clicked = False
 if 'init_time' not in st.session_state:
     st.session_state.init_time = None
+if 'should_clear_input' not in st.session_state:
+    st.session_state.should_clear_input = False
+if 'current_input' not in st.session_state:
+    st.session_state.current_input = ""
 
 # THEN: Import your modules
 from rag_engine import process_query, load_model
@@ -61,13 +65,6 @@ div[data-baseweb="input"] > div {
 <div class="main-title">Indian Spiritual Texts Q&A</div>
 """, unsafe_allow_html=True)
 
-# Function to process query (only on explicit submission)
-def process_input():
-    if st.session_state.query_input:  # Only process if input is not empty
-        st.session_state.last_query = st.session_state.query_input
-        st.session_state.query_input = ""  # Clear the input field
-        st.session_state.submit_clicked = True
-
 # Handle initialization and success message timing
 if not st.session_state.initialized:
     # Show loading message
@@ -89,7 +86,7 @@ if not st.session_state.initialized:
         
         # Force rerun to start the timer for removing the message
         time.sleep(0.1)  # Small delay to ensure message appears
-        st.experimental_rerun()
+        st.rerun()
         
     except Exception as e:
         init_message.error(f"Error initializing: {str(e)}")
@@ -100,22 +97,26 @@ elif st.session_state.init_time is not None:
         init_message.empty()
         st.session_state.init_time = None  # Reset timer after clearing
 
-# Query input with callback ONLY for Enter key
+# Function to handle form submission (Enter key or button)
+def handle_submit():
+    if st.session_state.query_input:  # Only process if input is not empty
+        st.session_state.last_query = st.session_state.query_input
+        st.session_state.should_clear_input = True
+        st.session_state.submit_clicked = True
+
+# Query input with callback for Enter key
 query = st.text_input(
     "Ask your question:",
     key="query_input",
-    on_change=None  # Don't trigger on any change, only on enter
+    on_change=handle_submit if not st.session_state.should_clear_input else None
 )
 
-# Only process enter key press here
-if query and query != st.session_state.get('previous_query', ''):
-    st.session_state.previous_query = query
-    st.session_state.last_query = query
+# Clear input if needed (after processing)
+if st.session_state.should_clear_input:
+    # We can't modify the widget value directly, so we'll rerun with a blank value
+    st.session_state.should_clear_input = False
     st.session_state.query_input = ""
-    st.session_state.submit_clicked = True
-    # Force refresh to update UI immediately
-    st.experimental_rerun()
-
+    
 # Display the current question if there is one
 if st.session_state.last_query:
     st.markdown("### Current Question:")
@@ -128,18 +129,17 @@ with col1:
 with col2:
     word_limit = st.slider("Word limit:", 50, 500, 200)
 
-# Process button - separate from the input field's behavior
+# Process button
 if st.button("Get Answer"):
-    if query:  # If there's text in the input field
-        st.session_state.last_query = query
-        st.session_state.query_input = ""
+    if st.session_state.query_input:  # If there's text in the input field
+        st.session_state.last_query = st.session_state.query_input
+        st.session_state.should_clear_input = True
         st.session_state.submit_clicked = True
-        # Force refresh
-        st.experimental_rerun()
+        # We'll clear the input on the next run
 
 # Only process the query if explicitly submitted
 if st.session_state.submit_clicked and st.session_state.last_query:
-    # Reset the submit flag
+    # Reset the submit flag first
     st.session_state.submit_clicked = False
     
     # Process the query