Update app.py

app.py

@@ -17,10 +17,6 @@ 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
@@ -97,26 +93,19 @@ elif st.session_state.init_time is not None:
         init_message.empty()
         st.session_state.init_time = None  # Reset timer after clearing
 
-# 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
+# Create a form for handling the user input
+with st.form(key="query_form"):
+    # Put the input inside the form
+    query = st.text_input("Ask your question:", key="query_input")
+    
+    # Submit button within the form
+    submit_button = st.form_submit_button("Get Answer")
+    
+    # Process form submission
+    if submit_button and query:
+        st.session_state.last_query = query
         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=handle_submit if not st.session_state.should_clear_input else None
-)
-
-# 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 = ""
-    
 # Display the current question if there is one
 if st.session_state.last_query:
     st.markdown("### Current Question:")
@@ -129,17 +118,9 @@ with col1:
 with col2:
     word_limit = st.slider("Word limit:", 50, 500, 200)
 
-# Process button
-if st.button("Get Answer"):
-    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
-        # 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 first
+    # Reset the submit flag
     st.session_state.submit_clicked = False
     
     # Process the query