Update app.py

app.py

@@ -196,82 +196,54 @@ def natural_vote1_last_response(
     request: gr.Request
 ):
     print(f"Very Natural (voted). ip: {get_ip(request)}")
-    vote_last_response(
-        "Very Natural", request
-    )
-    return (disable_btn,) * 4
+    return ("Very Natural",)+(disable_btn,) * 4
 
 def natural_vote2_last_response(
     request: gr.Request
 ):
     print(f"Somewhat Awkward (voted). ip: {get_ip(request)}")
-    vote_last_response(
-        "Somewhat Awkward", request
-    )
-    return (disable_btn,) * 4
+    return ("Somewhat Awkward",)+(disable_btn,) * 4
 
 def natural_vote3_last_response(
     request: gr.Request
 ):
     print(f"Very Awkward (voted). ip: {get_ip(request)}")
-    vote_last_response(
-        "Very Awkward", request
-    )
-    return (disable_btn,) * 4
+    return ("Very Awkward",)+(disable_btn,) * 4
 
 def natural_vote4_last_response(
     request: gr.Request
 ):
     print(f"Unnatural (voted). ip: {get_ip(request)}")
-    vote_last_response(
-        "Unnatural", request
-    )
-    return (disable_btn,) * 4
+    return ("Unnatural",)+(disable_btn,) * 4
 
 def relevant_vote1_last_response(
     request: gr.Request
 ):
     print(f"Highly Relevant (voted). ip: {get_ip(request)}")
-    vote_last_response(
-        "Highly Relevant", request
-    )
-    return (disable_btn,) * 4
+    return ("Highly Relevant",)+(disable_btn,) * 4
 
 def relevant_vote2_last_response(
     request: gr.Request
 ):
     print(f"Partially Relevant (voted). ip: {get_ip(request)}")
-    vote_last_response(
-        "Partially Relevant", request
-    )
-    return (disable_btn,) * 4
+    return ("Partially Relevant",)+(disable_btn,) * 4
 
 def relevant_vote3_last_response(
     request: gr.Request
 ):
     print(f"Slightly Irrelevant (voted). ip: {get_ip(request)}")
-    vote_last_response(
-        "Slightly Irrelevant", request
-    )
-    return (disable_btn,) * 4
+    return ("Slightly Irrelevant",)+(disable_btn,) * 4
 
 def relevant_vote4_last_response(
     request: gr.Request
 ):
     print(f"Completely Irrelevant (voted). ip: {get_ip(request)}")
-    vote_last_response(
-        "Completely Irrelevant", request
-    )
-    return (disable_btn,) * 4
+    return ("Completely Irrelevant",)+(disable_btn,) * 4
 
 import json
 import time
 
-if not os.path.exists("save_dict.json"):
-    print("file error")
-    with open("save_dict.json", 'w') as f:
-        json.dump([], f)
-print(os.path.abspath("save_dict.json"))
+
 def transcribe(stream, new_chunk):
     sr, y = new_chunk
     global text_str
@@ -397,7 +369,7 @@ with gr.Blocks(
                 state = gr.State()
         with gr.Row():
             feedback_btn = gr.Button(
-                value="Please give your feedback below", visible=True, interactive=False, elem_id="button"
+                value="Please provide your feedback after each system response below.", visible=True, interactive=False, elem_id="button"
             )
         with gr.Row():
             natural_btn1 = gr.Button(
@@ -443,18 +415,21 @@ with gr.Blocks(
             relevant_btn3,
             relevant_btn4,
         ]
-        user_audio.stream(transcribe, inputs=[state, user_audio], outputs=[state, output_asr_text, output_text, output_audio])
+        natural_response = gr.Textbox(label="natural_response",visible=False,interactive=False)
+        diversity_response = gr.Textbox(label="diversity_response",visible=False,interactive=False)
+        callback.setup([user_audio, output_asr_text, output_text, output_audio,natural_response,diversity_response],"flagged_data_points")
+        user_audio.stream(transcribe, inputs=[state, user_audio], outputs=[state, output_asr_text, output_text, output_audio]).then(lambda *args: callback.flag(list(args)),[user_audio,output_asr_text, output_text, output_audio], None,preprocess=False)
         output_audio.play(
             flash_buttons, [], btn_list
         )
-        natural_btn1.click(natural_vote1_last_response,[],natural_btn_list)
-        natural_btn2.click(natural_vote2_last_response,[],natural_btn_list)
-        natural_btn3.click(natural_vote3_last_response,[],natural_btn_list)
-        natural_btn4.click(natural_vote4_last_response,[],natural_btn_list)
-        relevant_btn1.click(relevant_vote1_last_response,[],relevant_btn_list)
-        relevant_btn2.click(relevant_vote2_last_response,[],relevant_btn_list)
-        relevant_btn3.click(relevant_vote3_last_response,[],relevant_btn_list)
-        relevant_btn4.click(relevant_vote4_last_response,[],relevant_btn_list)
+        natural_btn1.click(natural_vote1_last_response,[], outputs=[natural_response]+natural_btn_list).then(lambda *args: callback.flag(list(args)),[natural_response], None,preprocess=False)
+        natural_btn2.click(natural_vote2_last_response,[],[natural_response]+natural_btn_list).then(lambda *args: callback.flag(list(args)),[natural_response], None,preprocess=False)
+        natural_btn3.click(natural_vote3_last_response,[],[natural_response]+natural_btn_list).then(lambda *args: callback.flag(list(args)),natural_response, None,preprocess=False)
+        natural_btn4.click(natural_vote4_last_response,[],[natural_response]+natural_btn_list).then(lambda *args: callback.flag(list(args)),[natural_response], None,preprocess=False)
+        relevant_btn1.click(relevant_vote1_last_response,[],[diversity_response]+relevant_btn_list).then(lambda *args: callback.flag(list(args)),[diversity_response], None,preprocess=False)
+        relevant_btn2.click(relevant_vote2_last_response,[],[diversity_response]+relevant_btn_list).then(lambda *args: callback.flag(list(args)),[diversity_response], None,preprocess=False)
+        relevant_btn3.click(relevant_vote3_last_response,[],[diversity_response]+relevant_btn_list).then(lambda *args: callback.flag(list(args)),[diversity_response], None,preprocess=False)
+        relevant_btn4.click(relevant_vote4_last_response,[],[diversity_response]+relevant_btn_list).then(lambda *args: callback.flag(list(args)),[diversity_response], None,preprocess=False)
 # with demo:
 #     start_button = gr.Button("Record Screen 🔴")
 #     video_component = gr.Video(interactive=True, show_share_button=True, include_audio=True)