fix bug on counter, image

app.py

@@ -42,7 +42,7 @@ responses_memory = {}
 assigned_scenarios = list(SCENARIOS.keys())[:2]
 current_task1, current_task2 = METHODS # current task 1 (tab 1)
 task1_success, task2_success = False, False
-enable_submit = False
+enable_submit1, enable_submit2 = False, False
 
 ########################################################################################################
 # Generating images with two methods
@@ -134,13 +134,14 @@ def switch_tab(active_tab):
         return gr.Tabs(selected="Task A")
 
 def check_satisfaction(sim_radio, active_tab):
-    global enable_submit
+    global enable_submit1, enable_submit2, counter1, counter2
+    method = current_task1 if active_tab == "Task A" else current_task2
+    enable_submit = enable_submit1 if method == METHODS[0] else enable_submit2
+    counter = counter1 if method == METHODS[0] else counter2
+
     fully_satisfied_option = ["Satisfied", "Very Satisfied"]  # The value to trigger submit
-    if sim_radio in fully_satisfied_option:
-        enable_submit = True
-        return gr.update(interactive=True)
-    else:
-        return gr.skip()
+    if_submit = sim_radio in fully_satisfied_option or enable_submit or counter > MAX_ROUND
+    return gr.update(interactive=if_submit)
 
 def check_participant(participant):
     if participant == "":
@@ -180,10 +181,10 @@ def set_user(participant):
 
 def display_scenario(participant, choice):
     # reset intermittent storage when scenario change
-    global counter1, counter2, responses_memory, current_task1, current_task2, task1_success, task2_success, enable_submit
-    
+    global counter1, counter2, responses_memory, current_task1, current_task2, task1_success, task2_success, enable_submit1, enable_submit2
+
     task1_success, task2_success = False, False
-    enable_submit = False
+    enable_submit1, enable_submit2 = False, False
     counter1, counter2 = 1, 1
     
     if check_participant(participant):
@@ -251,11 +252,12 @@ def generate_image(participant, scenario, prompt, active_tab, like_image, dislik
             yield gallery_images
     
 def redesign(participant, scenario, prompt, sim_radio, like_radio, dislike_radio, current_images, history_images, active_tab):
-    global counter1, counter2, responses_memory, current_task1, current_task2
+    global counter1, counter2, responses_memory, current_task1, current_task2, enable_submit1, enable_submit2
     method = current_task1 if active_tab == "Task A" else current_task2
 
     if check_evaluation(sim_radio) and check_participant(participant):
         counter = counter1 if method == METHODS[0] else counter2
+        enable_submit = enable_submit1 if method == METHODS[0] else enable_submit2
 
         responses_memory[participant][method][counter] = {}
         responses_memory[participant][method][counter]["prompt"] = prompt
@@ -264,6 +266,8 @@ def redesign(participant, scenario, prompt, sim_radio, like_radio, dislike_radio
         responses_memory[participant][method][counter]["satisfied_img"] = f"round {counter}, {like_radio}"
         responses_memory[participant][method][counter]["unsatisfied_img"] = f"round {counter}, {dislike_radio}"
         
+        enable_submit = True if sim_radio in ["Satisfied", "Very Satisfied"] or enable_submit else False
+
         history_prompts = [[v["prompt"]] for v in responses_memory[participant][method].values()]
         if not history_images: 
             history_images = current_images
@@ -280,8 +284,10 @@ def redesign(participant, scenario, prompt, sim_radio, like_radio, dislike_radio
         # update counter
         if method == METHODS[0]:
             counter1 += 1
+            enable_submit1 = enable_submit
         else:
             counter2 += 1
+            enable_submit2 = enable_submit
 
         return None, None, None, current_images, history_images, examples_state, prompt_state, next_state, redesign_state, submit_state
     else:
@@ -290,7 +296,7 @@ def redesign(participant, scenario, prompt, sim_radio, like_radio, dislike_radio
 
 def save_response(participant, scenario, prompt, sim_radio, like_radio, dislike_radio, active_tab):
     global current_task1, current_task2 # not change
-    global task1_success, task2_success, counter1, counter2, enable_submit, responses_memory, assigned_scenarios # will change
+    global task1_success, task2_success, counter1, counter2, enable_submit1, enable_submit2, responses_memory, assigned_scenarios # will change
 
     method = current_task1 if active_tab == "Task A" else current_task2
     if check_evaluation(sim_radio) and check_participant(participant):
@@ -303,7 +309,6 @@ def save_response(participant, scenario, prompt, sim_radio, like_radio, dislike_
         responses_memory[participant][method][counter]["satisfied_img"] = f"round {counter}, {like_radio}" 
         responses_memory[participant][method][counter]["unsatisfied_img"] = f"round {counter}, {dislike_radio}"
         
-
         try:
             gc = gspread.service_account(filename='credentials.json')
             sheet = gc.open("DiverseGen-phase3").sheet1 
@@ -316,16 +321,25 @@ def save_response(participant, scenario, prompt, sim_radio, like_radio, dislike_
             # reset global variables
             if method == METHODS[0]:
                 counter1 = 1
+                enable_submit1 = False
             else:
                 counter2 = 1
+                enable_submit2 = False
             if active_tab == "Task A":
                 task1_success = True
             else:
                 task2_success = True
-            enable_submit = False
+
 
             # decide if change scenario
-            next_scenario = assigned_scenarios[1] if task1_success and task2_success else assigned_scenarios[0]
+            if scenario == assigned_scenarios[0]:
+                next_scenario = assigned_scenarios[1] if task1_success and task2_success else assigned_scenarios[0]
+            else:
+                if task1_success and task2_success:
+                    display_info_message("You have finished all scenarios, thank you!")
+                    next_scenario = assigned_scenarios[0]
+                else:
+                    next_scenario = assigned_scenarios[1]
 
             # reset buttons
             prompt_state = gr.update(interactive=False)
@@ -520,7 +534,7 @@ with gr.Blocks(theme=gr.themes.Soft(font=[gr.themes.GoogleFont("Inconsolata"), "
     next_btn1.click(fn=generate_image, inputs=[participant, scenario, prompt1, active_tab, like_image1, dislike_image1], outputs=[images_method1])
     next_btn2.click(fn=generate_image, inputs=[participant, scenario, prompt2, active_tab, like_image2, dislike_image2], outputs=[images_method2])
     sim_radio1.change(fn=check_satisfaction, inputs=[sim_radio1, active_tab], outputs=[submit_btn1])
-    sim_radio2.change(fn=check_satisfaction, inputs=[sim_radio2, active_tab], outputs=[submit_btn1])
+    sim_radio2.change(fn=check_satisfaction, inputs=[sim_radio2, active_tab], outputs=[submit_btn2])
     dislike_radio1.select(fn=select_image, inputs=[dislike_radio1, images_method1], outputs=[dislike_image1])
     like_radio1.select(fn=select_image, inputs=[like_radio1, images_method1], outputs=[like_image1])
     dislike_radio2.select(fn=select_image, inputs=[dislike_radio2, images_method2], outputs=[dislike_image2])

utils.py

@@ -37,7 +37,7 @@ IMAGES = {
                                             "ours": ["images/scenario2_ours1.png","images/scenario2_ours2.png","images/scenario2_ours3.png","images/scenario2_ours4.png"]},
     "Fictional character generation": {"baseline": ["images/scenario3_base1.png","images/scenario3_base2.png","images/scenario3_base3.png","images/scenario3_base4.png"], 
                                             "ours": ["images/scenario3_ours1.png","images/scenario3_ours2.png","images/scenario3_ours3.png","images/scenario3_ours4.png"]},
-    "Interior Design": {"baseline": ["images/scenario4_base1.png","images/scenario4_base2.png","images/scenario3_base4.png","images/scenario4_base4.png"], 
+    "Interior Design": {"baseline": ["images/scenario4_base1.png","images/scenario4_base2.png","images/scenario4_base3.png","images/scenario4_base4.png"], 
                                             "ours": ["images/scenario4_ours1.png","images/scenario4_ours2.png","images/scenario4_ours3.png","images/scenario4_ours4.png"]},
 }