Separate form submission for each sample

app.py

@@ -2,6 +2,7 @@ import os
 import random
 import uuid
 from datetime import datetime
+from itertools import chain
 
 import gradio as gr
 
@@ -68,12 +69,18 @@ def update_commit_view(sample_ind):
 
     commit_messages = tuple(record[model] for model in models_shuffled)
 
-    return (github_link_md, diff_view, repo_val, hash_val, diff_loaded_timestamp) + commit_messages + tuple(
+    return (
+        github_link_md, diff_view, repo_val, hash_val, diff_loaded_timestamp,
+        n_forms_submitted) + commit_messages + tuple(
         models_shuffled)
 
 
 def reset_answers():
-    return (None,) * (n_models * N_QUESTIONS)
+    return (None,) * (N_QUESTIONS * n_models)
+
+
+def reset_submit_buttons():
+    return tuple(gr.Button(value="Submit", interactive=True) for _ in range(n_models))
 
 
 def next_sample(current_sample_ind, shuffled_idx):
@@ -82,7 +89,7 @@ def next_sample(current_sample_ind, shuffled_idx):
 
     current_sample_ind += 1
     updated_view = update_commit_view(shuffled_idx[current_sample_ind])
-    return (current_sample_ind,) + updated_view + reset_answers()
+    return (current_sample_ind,) + updated_view + reset_answers() + reset_submit_buttons()
 
 
 with open("head.html") as head_file:
@@ -109,88 +116,102 @@ with gr.Blocks(theme=gr.themes.Soft(), head=head_html, css="style_overrides.css"
             github_link = gr.Markdown()
             diff_view = gr.HTML()
         with gr.Column(scale=1):
-            commit_msg = []
-            is_correct = []
-            has_what = []
-            has_why = []
-            is_not_verbose = []
-            has_headline = []
-            easy_to_read = []
-            overall_rating = []
-            comments = []
-            model_name = []
+            # commit_msg = []
+            # is_correct = []
+            # # has_what = []
+            # # has_why = []
+            # is_not_verbose = []
+            # # has_headline = []
+            # easy_to_read = []
+            # overall_rating = []
+            # comments = []
+            # model_name = []
+
+            commit_msgs = []
+            questions = []
+            model_names = []
+            submit_buttons = []
 
             SCALE = list(range(1, 6))
 
             for model_ind in range(n_models):
                 with gr.Tab(f"Variant #{model_ind + 1}"):
-                    commit_msg.append(gr.TextArea(label="Commit message (can be scrollable)",
-                                                  interactive=False,
-                                                  ))
+                    commit_msgs.append(gr.TextArea(label="Commit message (can be scrollable)",
+                                                   interactive=False,
+                                                   ))
                     gr.Markdown("## Please, rate your level of agreement with each statement\n"
                                 "\n"
                                 "*1 - strongly disagree, 2 - disagree, 3 - not sure, 4 - agree, 5 - strongly agree*")
 
-                    is_correct.append(gr.Radio(
+                    model_questions = []
+
+                    model_questions.append(gr.Radio(
                         info='The information provided in the commit message is consistent with the code changes.',
-                        label=f'is_correct_{model_ind}',
+                        label=f'is_correct',
                         show_label=False,
                         choices=SCALE,
                         interactive=True))
 
-                    # has_what.append(gr.Radio(
+                    # model_questions.append(gr.Radio(
                     #     info='The commit message answers the question of WHAT changes have been made.',
-                    #     label=f'has_what_{model_ind}',
+                    #     label=f'has_what',
                     #     show_label=False,
                     #     choices=SCALE,
                     #     interactive=True))
                     #
-                    # has_why.append(gr.Radio(
+                    # model_questions.append(gr.Radio(
                     #     info='The commit message answers the question of WHY these changes have been made.',
-                    #     label=f'has_why_{model_ind}',
+                    #     label=f'has_why',
                     #     show_label=False,
                     #     choices=SCALE,
                     #     interactive=True))
 
-                    is_not_verbose.append(gr.Radio(
+                    model_questions.append(gr.Radio(
                         info='The commit message can be substantially shortened without loss of important information.',
-                        label=f'is_not_verbose_{model_ind}',
+                        label=f'is_not_verbose',
                         show_label=False,
                         choices=SCALE,
                         interactive=True))
 
-                    # has_headline.append(gr.Radio(
+                    # model_questions.append(gr.Radio(
                     #     info='The commit message includes a short headline that provides a good overview of the '
                     #          'changes.',
-                    #     label=f'has_headline_{model_ind}',
+                    #     label=f'has_headline',
                     #     show_label=False,
                     #     choices=SCALE,
                     #     interactive=True))
 
-                    easy_to_read.append(gr.Radio(
+                    model_questions.append(gr.Radio(
                         info='The commit message is easy to read and to understand.',
-                        label=f'easy_to_read_{model_ind}',
+                        label=f'easy_to_read',
                         show_label=False,
                         choices=SCALE,
                         interactive=True))
 
-                    overall_rating.append(gr.Radio(
+                    model_questions.append(gr.Radio(
                         info='Please, describe your overall impression of the commit message (1 - very bad, 5 - very '
                              'good)',
-                        label=f'overall_rating_{model_ind}',
+                        label=f'overall_rating',
                         show_label=False,
                         choices=SCALE,
                         interactive=True))
 
-                    comments.append(gr.Textbox(
+                    model_questions.append(gr.Textbox(
                         info='Additional comments on the commit message',
-                        label=f'comments_{model_ind}',
+                        label=f'comments',
                         show_label=False,
                         interactive=True))
 
-                    model_name.append(gr.Textbox(interactive=False, label=f'model_{model_ind}', visible=False))
+                    assert len(model_questions) == N_QUESTIONS
+
+                    questions.append(model_questions)
+                    model_names.append(gr.Textbox(interactive=False, label=f'model', visible=False))
+
+                    submit_buttons.append(gr.Button(value="Submit"))
+
+            n_forms_submitted = gr.Number(visible=False, value=0, precision=0)
+            continue_btn = gr.Button(value=f"0/{n_models} forms submitted", interactive=False)
 
-            submit_btn = gr.Button("Submit all and continue")
             session_val = gr.Textbox(info='Session', interactive=False, container=True, show_label=False,
                                      label='session')
 
@@ -208,8 +229,9 @@ with gr.Blocks(theme=gr.themes.Soft(), head=head_html, css="style_overrides.css"
         repo_val,
         hash_val,
         sample_loaded_timestamp,
-        *commit_msg,
-        *model_name,
+        n_forms_submitted,
+        *commit_msgs,
+        *model_names,
     ]
 
     feedback_metadata = [
@@ -217,36 +239,38 @@ with gr.Blocks(theme=gr.themes.Soft(), head=head_html, css="style_overrides.css"
         repo_val,
         hash_val,
         sample_loaded_timestamp,
-        sample_submitted_timestamp,
-        *model_name
+        sample_submitted_timestamp
     ]
 
-    feedback_answers = [
-        *is_correct,
-        # *has_what,
-        # *has_why,
-        *is_not_verbose,
-        # *has_headline,
-        *easy_to_read,
-        *overall_rating,
-        *comments
-    ]
-
-    assert len(feedback_answers) == N_QUESTIONS * n_models
+    saver.setup([current_sample_sld] + feedback_metadata + questions[0] + [model_names[0], ], "feedback")
 
-    saver.setup([current_sample_sld] + feedback_metadata + feedback_answers, "feedback")
+    questions_list = list(chain.from_iterable(questions))
 
     skip_btn.click(next_sample, inputs=[current_sample_sld, shuffled_idx_val],
-                   outputs=[current_sample_sld] + commit_view + feedback_answers)
+                   outputs=[current_sample_sld] + commit_view + questions_list + submit_buttons)
 
+    continue_btn.click(next_sample, inputs=[current_sample_sld, shuffled_idx_val],
+                       outputs=[current_sample_sld] + commit_view + questions_list + submit_buttons)
 
-    def submit(current_sample, shuffled_idx, *args):
-        saver.flag((current_sample,) + args)
-        return next_sample(current_sample, shuffled_idx)
 
-
-    submit_btn.click(submit, inputs=[current_sample_sld, shuffled_idx_val] + feedback_metadata + feedback_answers,
-                     outputs=[current_sample_sld] + commit_view + feedback_answers)
+    def submit_for_model(current_sample, n_forms_submitted_val, *args):
+        saver.flag((current_sample,) + args)
+        n_forms_submitted_val += 1
+        all_forms_submitted = n_forms_submitted_val == n_models
+        return (gr.Button(value="Submitted", interactive=False),
+                n_forms_submitted_val,
+                gr.Button(
+                    "Next sample" if all_forms_submitted else f"{n_forms_submitted_val}/{n_models} forms submitted",
+                    interactive=all_forms_submitted))
+
+
+    for model_ind in range(n_models):
+        submit_buttons[model_ind].click(
+            submit_for_model,
+            inputs=[current_sample_sld, n_forms_submitted] + feedback_metadata + questions[model_ind] + [
+                model_names[model_ind], ],
+            outputs=[submit_buttons[model_ind], n_forms_submitted, continue_btn]
+        )
 
 
     def init_session(current_sample):