Fix session_state issues

app.py

@@ -37,27 +37,6 @@ st.markdown(
 )
 
 
-def send_evaluation(
-    client, deployment_id, request_log_id, prediction_log_id, evaluation_input
-):
-    """Send evaluation to Deeploy."""
-    try:
-        with st.spinner("Submitting evaluation..."):
-            # Call the explain endpoint as it also includes the prediction
-            client.evaluate(
-                deployment_id, request_log_id, prediction_log_id, evaluation_input
-            )
-        return True
-    except Exception as e:
-        logging.error(e)
-        st.error(
-            "Failed to submit feedback."
-            + "Check whether you are using the right model URL and token for evaluations. "
-            + "Contact Deeploy if the problem persists."
-        )
-        st.write(f"Error message: {e}")
-
-
 def get_model_url():
     model_url = st.text_area(
         "Model URL (without the /explain endpoint, default is the demo deployment)",
@@ -112,10 +91,27 @@ with st.sidebar:
     }
     client = Client(**client_options)
 
-# with tabs[0] as loan_application:
-if "selected" not in st.session_state:
-    st.session_state.selected = "Loan Application"
-# if selected == "Loan Application":
+
+def submit_and_clear():
+    try:
+        # Call the explain endpoint as it also includes the prediction
+        client.evaluate(
+            deployment_id, request_log_id, prediction_log_id, st.session_state.evaluation_input
+        )
+        st.toast(":green[Feedback submitted successfully.]", icon="✅")
+        st.session_state.eval_selected = False
+        st.session_state.predict_button_clicked = False
+        st.session_state.eval_selected = False
+    except Exception as e:
+        logging.error(e)
+        st.error(
+            "Failed to submit feedback."
+            + "Check whether you are using the right model URL and token for evaluations. "
+            + "Contact Deeploy if the problem persists."
+        )
+        st.toast(f"Failed to submit feedback: {e}")
+
+
 # Attributes
 st.subheader("Loan Application")
 with st.expander("Application form", expanded=False):
@@ -202,18 +198,17 @@ if deployment_token != "my-secret-token":
     )
     if predict_button:
         st.session_state.predict_button_clicked = True
-        st.session_state.selected = "Loan Decision"
-
-
-if st.session_state.selected == "Loan Decision":
-    # If no prediction, show "loading..."
-    # FIXME: Cleanup session state so that it's not sending a request to the explain endpoint each time
-    try:
+        # st.session_state.selected = "Loan Decision"
         with st.spinner("Loading prediction and explanation..."):
             # Call the explain endpoint as it also includes the prediction
             exp = client.explain(
                 request_body=request_body, deployment_id=deployment_id
             )
+            st.session_state.exp = exp
+
+if st.session_state.predict_button_clicked:
+    try:
+        exp = st.session_state.exp
         # Read explanation to dataframe from json
         predictions = exp["predictions"]
         request_log_id = exp["requestLogId"]
@@ -362,13 +357,14 @@ if st.session_state.selected == "Loan Decision":
             )
             ChangeButtonColour("No, I disagree", "white", "#DD360C")
             # ChangeButtonColour("No, I disagree", "#DD360C", "#F0F0F0")
-        st.session_state["eval_selected"] = False
+        if "eval_selected" not in st.session_state:
+            st.session_state["eval_selected"] = False
         if yes_button:
             st.session_state.eval_selected = True
             st.session_state.evaluation_input = {
                 "result": 0  # Agree with the prediction
             }
-            placeholder = "Income is sufficient, given applicant's background"
+            st.session_state.placeholder = "Income is sufficient, given applicant's background"
         if no_button:
             st.session_state.eval_selected = True
             desired_output = not predictions[0]
@@ -376,47 +372,14 @@ if st.session_state.selected == "Loan Decision":
                 "result": 1,  # Disagree with the prediction
                 "value": {"predictions": [desired_output]},
             }
-            placeholder = "Income is too low, given applicant's background"
+            st.session_state.placeholder = "Income is too low, given applicant's background"
 
-        if 'success' not in st.session_state:
-            st.session_state['success'] = False
         if st.session_state.eval_selected:
-            comment = st.text_input("Would you like to add a comment?", placeholder=placeholder)
+            comment = st.text_input("Would you like to add a comment?", placeholder=st.session_state.placeholder)
             if comment:
                 st.session_state.evaluation_input["explanation"] = comment
-            logging.debug(
-                "Selected feedback:" + str(st.session_state.evaluation_input)
-            )
-            success = True
-            print(success)
-            if st.button("Submit", key="submit_button"):
-                with st.spinner("Submitting evaluation..."):
-                    try:
-                        # Call the explain endpoint as it also includes the prediction
-                        client.evaluate(
-                            deployment_id, request_log_id, prediction_log_id, evaluation_input
-                        )
-                    except Exception as e:
-                        success = False
-                        logging.error(e)
-                        st.error(
-                            "Failed to submit feedback."
-                            + "Check whether you are using the right model URL and token for evaluations. "
-                            + "Contact Deeploy if the problem persists."
-                        )
-                        st.write(f"Error message: {e}")
-                    print(success)
-                if success:
-                    st.session_state.success = True
-                else:
-                    st.error("Evaluation failed. Check whether your token allows for evaluations.")
-                # st.session_state.eval_selected = False
-                # yes_button = False
-                # no_button = False
-                # print(st.session_state.success)
-        # print(st.session_state.success)
-        if st.session_state.success:
-            st.success("Feedback submitted successfully.")
+
+            st.button("Submit", key="submit_button", on_click=submit_and_clear)                    
 
     except Exception as e:
         logging.error(e)
@@ -425,4 +388,3 @@ if st.session_state.selected == "Loan Decision":
             + "Check whether you are using the right model URL and Token. "
             + "Contact Deeploy if the problem persists."
         )
-        # st.write(f"Error message: {e}")