Only E5

app.py

@@ -17,7 +17,7 @@ qIDs = ["mbe_46", "mbe_132", "mbe_287", "mbe_326", "mbe_334", "mbe_389", "mbe_56
 mode_options = ["e5", "colbert"]
 # Control global variables
 step = 0
-mode = 0
+mode = 1
 
 def load_user_data(id):
     global user_data
@@ -171,12 +171,12 @@ with gr.Blocks(theme = theme) as user_eval:
             global current_response
             step += 1
             # Add user data to the current response
-            current_response[user_data["modes"][user_data["current"]][mode] + "_scores"].append([e0, e1, e2, e3])
+            current_response["e5_scores"].append([e0, e1, e2, e3])
             # Next item
-            if step == len(current_question["top10_" + user_data["modes"][user_data["current"]][mode]]): # should always be 10
+            if step == len(current_question["top10_e5"]): # should always be 10
                 # Step 10: all sources 
                 collapsible_string = "<h2> Set of Passages </h2>\n"
-                for i, passage in enumerate(current_question["top10_" + user_data["modes"][user_data["current"]][mode]]):
+                for i, passage in enumerate(current_question["top10_e5"]):
                     collapsible_string += """
                             <strong>Passage """ + str(i + 1) + """</strong>
                             <p> """ + passage + """ </p>
@@ -194,7 +194,7 @@ with gr.Blocks(theme = theme) as user_eval:
                 return {
                     selection: gr.HTML("""
                         <h2> Retrieved Passage </h2> 
-                        <p> """ + current_question["top10_" + user_data["modes"][user_data["current"]][mode]][step] + "</p>"),
+                        <p> """ + current_question["top10_e5"][step] + "</p>"),
                     eval_0: gr.Radio(value = None),
                     eval_1: gr.Slider(value = 3),
                     eval_2: gr.Slider(value = 3),
@@ -211,11 +211,12 @@ with gr.Blocks(theme = theme) as user_eval:
             if step == 11:
                 # Step 11: guaranteed to be generation
                 # Add user data to the current response as SET evaluation, which comes before the generation
-                current_response[user_data["modes"][user_data["current"]][mode] + "_set"] = [e_h, e_s]
+                # CHANGED FROM user_data["modes"][user_data["current"]] + "_set", as are all direct references to top10_e5
+                current_response["e5_set"] = [e_h, e_s]
                 return {
                     selection: gr.HTML("""
                         <h2> Autogenerated Response </h2>
-                        <p>""" + markdown(current_question["generation_" + user_data["modes"][user_data["current"]][mode]]) + "</p>"),
+                        <p>""" + markdown(current_question["generation_e5"]) + "</p>"),
                     eval_helps: gr.Slider(value = 0),
                     eval_satisfied: gr.Slider(value = 3)
                 }
@@ -236,7 +237,8 @@ with gr.Blocks(theme = theme) as user_eval:
                 # When mode is 1 -> display GP and GP generation, then switch
                 if step == 12: 
                     # The user just evaluated a generation for mode 1
-                    current_response[user_data["modes"][user_data["current"]][mode] + "_generation"] = [e_h, e_s]
+                    # CHANGE from user_data["modes"][user_data["current"]] + "_generation"
+                    current_response["e5_generation"] = [e_h, e_s]
                     return {
                         selection: gr.HTML("""
                             <h2> Retrieved Passage </h2> 
@@ -348,7 +350,7 @@ with gr.Blocks(theme = theme) as user_eval:
         global step 
         global mode
         step = 0
-        if mode == 0:
+        if mode == 0: # temporarily disabled — will never be mode 0
             mode = 1 # update mode to 1, will restart with same Q, next set of Ps
             print("Next set of passages for same question")
             return {
@@ -358,7 +360,8 @@ with gr.Blocks(theme = theme) as user_eval:
                 question: gr.Row(visible = False),
             }
         else:
-            mode = 0 # reset mode to 0, will restart with new Q (set up new Q), first set of Ps
+            # reset mode to 0, will restart with new Q (set up new Q), first set of Ps
+            # mode = 0 -> RIGHT NOW, ALWAYS 1
             print("New question")
             new_answers = current_question["answers"].copy()
             new_answers[current_question["correct_answer_index"]] = "**" + current_question["answers"][current_question["correct_answer_index"]] + "** ✅"
@@ -385,8 +388,8 @@ with gr.Blocks(theme = theme) as user_eval:
                         + """ + new_answers[3]),
                 selection: gr.HTML("""
                     <h2> Retrieved Passage </h2>
-                    <p> """ + current_question["top10_" + user_data["modes"][user_data["current"]][mode]][0] + "</p>")
-            }
+                    <p> """ + current_question["top10_e5"][0] + "</p>")
+            }                                   # note change from "top10_" + user_data["modes"][user_data["current"]][mode]][0]
 
     forward_btn.change(fn = toggle, inputs = None, outputs = [scores_p, scores_g, evals, question, q_text, a, b, c, d, passage_display, selection])
 
@@ -417,7 +420,8 @@ with gr.Blocks(theme = theme) as user_eval:
                     login: gr.Row(visible = False),
                     selection: gr.HTML("""
                     <h2> Retrieved Passage </h2>
-                    <p> """ + current_question["top10_" + user_data["modes"][user_data["current"]][mode]][0] + "</p>"),
+                    <p> """ + current_question["top10_e5"][0] + "</p>"),
+                                            # when testing both ColBERT and E5, this was "top10_" + user_data["modes"][user_data["current"]][mode]][0]
                     passage_display: gr.Markdown("""
                         ## Question and Answer
                         *""" + current_question["question"] +