Cleanup template

app.py

@@ -62,11 +62,12 @@ def ChangeButtonColour(widget_label, font_color, background_color="transparent")
         """
     components.html(f"{htmlstr}", height=0, width=0)
 
-def predict():
-    with st.spinner("Loading prediction and explanation..."):
+def predict_callback():
+    with st.spinner("Loading prediction..."):
         try:
+            print("Request body: ", request_body)
             # Call the explain endpoint as it also includes the prediction
-            exp = client.predict(
+            pred = client.predict(
                 request_body=request_body, deployment_id=deployment_id
             )
         except Exception as e:
@@ -77,22 +78,18 @@ def predict():
                 + "Contact Deeploy if the problem persists."
             )
             return
-        st.session_state.exp = exp
+        st.session_state.pred = pred
     st.session_state.evaluation_submitted = False    
-    hide_expander()
 
-def hide_expander():
-    st.session_state.expander_toggle = False
-
-def show_expander():
-    st.session_state.expander_toggle = True
 
 def submit_and_clear(evaluation: str):
     if evaluation == "yes":
         st.session_state.evaluation_input["result"] = 0 # Agree with the prediction
     else:
-        desired_output = not predictions[0]
+        # Disagree with the prediction
         st.session_state.evaluation_input["result"] = 1
+        # In binary classification problems we can just flip the prediction
+        desired_output = not predictions[0]
         st.session_state.evaluation_input["value"] = {"predictions": [desired_output]}
     try:
         # Call the explain endpoint as it also includes the prediction
@@ -100,8 +97,7 @@ def submit_and_clear(evaluation: str):
             deployment_id, request_log_id, prediction_log_id, st.session_state.evaluation_input
         )
         st.session_state.evaluation_submitted = True
-        st.session_state.exp = None
-        show_expander()
+        st.session_state.pred = None
     except Exception as e:
         logging.error(e)
         st.error(
@@ -112,11 +108,8 @@ def submit_and_clear(evaluation: str):
 
 
 # Define defaults for the session state
-if "expander_toggle" not in st.session_state:
-    st.session_state.expander_toggle = True
-
-if "exp" not in st.session_state:
-    st.session_state.exp = None
+if "pred" not in st.session_state:
+    st.session_state.pred = None
 
 if "evaluation_submitted" not in st.session_state:
     st.session_state.evaluation_submitted = False
@@ -149,7 +142,7 @@ with st.sidebar:
 #     st.write(st.session_state)
 
 # Input (for IRIS dataset)
-with st.expander("Input values for prediction", expanded=st.session_state.expander_toggle):
+with st.expander("Input values for prediction", expanded=True):
     st.write("Please input the values for the model.")
     col1, col2 = st.columns(2)
     with col1:
@@ -171,33 +164,6 @@ request_body = {
 }
 
 # Predict and explain
-predict_button = st.button("Predict", on_click=predict)
-if st.session_state.exp is not None:
-    st.write(st.session_state.exp)
-    # predictions = st.session_state.exp["predictions"]
-    # request_log_id = exp["requestLogId"]
-    # prediction_log_id = exp["predictionLogIds"][0]
-
-    # # exp_df = pd.DataFrame(
-    # #     [exp["explanations"][0]["shap_values"]], columns=exp["featureLabels"]
-    # # )
-    # st.write("Predictions:", predictions)
-
-    # # Evaluation
-    # if st.session_state.evaluation_submitted is False:
-    #     evaluation = st.radio("Do you agree with the prediction?", ("yes", "no"))
-    #     if evaluation == "no":
-    #         desired_output = # TODO
-    #         st.session_state.evaluation_input = {
-    #             "result": 1,
-    #             "value": {"predictions": [desired_output]},
-    #         }
-    #     else:
-    #         st.session_state.evaluation_input = {"result": 0}
-
-    #     submit_button = st.button("Submit evaluation", on_click=submit_and_clear, args=(evaluation,))
-    # else:
-    #     st.success("Evaluation submitted successfully.")
-    
-
-
+predict_button = st.button("Predict", on_click=predict_callback)
+if st.session_state.pred is not None:
+    st.write(st.session_state.pred)