Update Upload

serve/Ksort.py

@@ -135,7 +135,7 @@ def get_img_filename(conv_id, i):
     print(output_file)
     return output_file
 
-def vote_submit(states, rank, request: gr.Request):
+def vote_submit(states, textbox, rank, request: gr.Request):
     conv_id = states[0].conv_id
 
     for i in range(len(states)):
@@ -145,10 +145,11 @@ def vote_submit(states, rank, request: gr.Request):
         data = {
             "models_name": [x.model_name for x in states],
             "img_rank": [x for x in rank],
+            "prompt": [textbox],
         }
         fout.write(json.dumps(data) + "\n")
 
-def vote_ssh_submit(states, rank):
+def vote_ssh_submit(states, textbox, rank):
     conv_id = states[0].conv_id
     output_dir = create_remote_directory(conv_id)
     # upload_image(states, output_dir)
@@ -156,6 +157,7 @@ def vote_ssh_submit(states, rank):
     data = {
         "models_name": [x.model_name for x in states],
         "img_rank": [x for x in rank],
+        "prompt": [textbox],
     }
     output_file = os.path.join(output_dir, "result.json")
     # upload_informance(data, output_file)
@@ -166,10 +168,10 @@ def vote_ssh_submit(states, rank):
 
 
 def submit_response_igm(
-    state0, state1, state2, state3, model_selector0, model_selector1, model_selector2, model_selector3, rank, request: gr.Request
+    state0, state1, state2, state3, model_selector0, model_selector1, model_selector2, model_selector3, textbox, rank, request: gr.Request
 ):
-    vote_submit([state0, state1, state2, state3], rank, request)
-    vote_ssh_submit([state0, state1, state2, state3], rank)
+    vote_submit([state0, state1, state2, state3], textbox, rank, request)
+    vote_ssh_submit([state0, state1, state2, state3], textbox, rank)
     if model_selector0 == "":
         return (disable_btn,) * 6 + (
             gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True),
@@ -186,12 +188,12 @@ def submit_response_igm(
             ) + (disable_btn,)
     
 def submit_response_rank_igm(
-    state0, state1, state2, state3, model_selector0, model_selector1, model_selector2, model_selector3, rank, right_vote_text, request: gr.Request
+    state0, state1, state2, state3, model_selector0, model_selector1, model_selector2, model_selector3, textbox, rank, right_vote_text, request: gr.Request
 ):
     print(rank)
     if right_vote_text == "right":
-        vote_submit([state0, state1, state2, state3], rank, request)
-        vote_ssh_submit([state0, state1, state2, state3], rank)
+        vote_submit([state0, state1, state2, state3], textbox, rank, request)
+        vote_ssh_submit([state0, state1, state2, state3], textbox, rank)
         if model_selector0 == "":
             return (disable_btn,) * 16 + (disable_btn,) * 3 + ("wrong",) + (
                 gr.Markdown(f"### Model A: {state0.model_name.split('_')[1]}", visible=True),

serve/gradio_web.py

@@ -214,10 +214,10 @@ def build_side_by_side_ui_anony(models):
 
     dummy_img_output = gr.Image(width=512, visible=False)
     gr.Examples(
-        examples=[["A train crossing a bridge that is going over a body of water", os.path.join("./examples", "example1.jpg")],
-                  ["The man in the business suit wears a striped blue and white tie", os.path.join("./examples", "example2.jpg")],
-                  ["A skier stands on a small ledge in the snow",os.path.join("./examples", "example3.jpg")],
-                  ["The bathroom with green tile and a red shower curtain", os.path.join("./examples", "example4.jpg")]],
+        examples=[["A train crossing a bridge that is going over a body of water.", os.path.join("./examples", "example1.jpg")],
+                  ["The man in the business suit wears a striped blue and white tie.", os.path.join("./examples", "example2.jpg")],
+                  ["A skier stands on a small ledge in the snow.",os.path.join("./examples", "example3.jpg")],
+                  ["The bathroom with green tile and a red shower curtain.", os.path.join("./examples", "example4.jpg")]],
         inputs = [textbox, dummy_img_output])
 
     # vote_list = [Top1_btn, Top2_btn, Top3_btn, Top4_btn, Revote_btn, Submit_btn]
@@ -373,7 +373,7 @@ def build_side_by_side_ui_anony(models):
         outputs=[vote_submit_btn, vote_mode_btn]
     ).then(
         submit_response_rank_igm,
-        inputs=[state0, state1, state2, state3, dummy_left_model, dummy_left1_model, dummy_right_model, dummy_right1_model, rank, right_vote_text],
+        inputs=[state0, state1, state2, state3, dummy_left_model, dummy_left1_model, dummy_right_model, dummy_right1_model, textbox, rank, right_vote_text],
         outputs=[A1_btn, A2_btn, A3_btn, A4_btn, B1_btn, B2_btn, B3_btn, B4_btn, C1_btn, C2_btn, C3_btn, C4_btn, D1_btn, D2_btn, D3_btn, D4_btn, \
                     vote_textbox, vote_submit_btn, vote_mode_btn, right_vote_text, \
                     model_selector_left, model_selector_left1, model_selector_right, model_selector_right1],
@@ -452,35 +452,35 @@ def build_side_by_side_ui_anony(models):
 
     leftvote_btn.click(
         submit_response_igm,
-        inputs=[state0, state1, state2, state3, dummy_left_model, dummy_left1_model, dummy_right_model, dummy_right1_model, rankA],
+        inputs=[state0, state1, state2, state3, dummy_left_model, dummy_left1_model, dummy_right_model, dummy_right1_model, textbox, rankA],
         outputs=[textbox, leftvote_btn, left1vote_btn, rightvote_btn, right1vote_btn, tie_btn, \
                  model_selector_left, model_selector_left1, model_selector_right, model_selector_right1, \
                  vote_mode_btn]
     )
     left1vote_btn.click(
         submit_response_igm,
-        inputs=[state0, state1, state2, state3, dummy_left_model, dummy_left1_model, dummy_right_model, dummy_right1_model, rankB],
+        inputs=[state0, state1, state2, state3, dummy_left_model, dummy_left1_model, dummy_right_model, dummy_right1_model, textbox, rankB],
         outputs=[textbox, leftvote_btn, left1vote_btn, rightvote_btn, right1vote_btn, tie_btn, \
                  model_selector_left, model_selector_left1, model_selector_right, model_selector_right1, \
                  vote_mode_btn]
     )
     rightvote_btn.click(
         submit_response_igm,
-        inputs=[state0, state1, state2, state3, dummy_left_model, dummy_left1_model, dummy_right_model, dummy_right1_model, rankC],
+        inputs=[state0, state1, state2, state3, dummy_left_model, dummy_left1_model, dummy_right_model, dummy_right1_model, textbox, rankC],
         outputs=[textbox, leftvote_btn, left1vote_btn, rightvote_btn, right1vote_btn, tie_btn, \
                  model_selector_left, model_selector_left1, model_selector_right, model_selector_right1, \
                  vote_mode_btn]
     )
     right1vote_btn.click(
         submit_response_igm,
-        inputs=[state0, state1, state2, state3, dummy_left_model, dummy_left1_model, dummy_right_model, dummy_right1_model, rankD],
+        inputs=[state0, state1, state2, state3, dummy_left_model, dummy_left1_model, dummy_right_model, dummy_right1_model, textbox, rankD],
         outputs=[textbox, leftvote_btn, left1vote_btn, rightvote_btn, right1vote_btn, tie_btn, \
                  model_selector_left, model_selector_left1, model_selector_right, model_selector_right1, \
                  vote_mode_btn]
     )
     tie_btn.click(
         submit_response_igm,
-        inputs=[state0, state1, state2, state3, dummy_left_model, dummy_left1_model, dummy_right_model, dummy_right1_model, rankTie],
+        inputs=[state0, state1, state2, state3, dummy_left_model, dummy_left1_model, dummy_right_model, dummy_right1_model, textbox, rankTie],
         outputs=[textbox, leftvote_btn, left1vote_btn, rightvote_btn, right1vote_btn, tie_btn, \
                  model_selector_left, model_selector_left1, model_selector_right, model_selector_right1, \
                  vote_mode_btn]