fix counter bugs

app.py

@@ -35,12 +35,14 @@ VERBAL_MSG = "Please verbally describe why you are satisfied or unsatisfied at t
 DEFAULT_SCENARIO = "Product advertisement"
 METHODS = ["Baseline", "Experimental"]
 MAX_ROUND = 5
+
 # intermittent memory
 counter1, counter2 = 1, 1
 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
 
 ########################################################################################################
 # Generating images with two methods
@@ -126,21 +128,16 @@ def display_info_message(msg, duration=5):
     gr.Info(msg, duration=duration)
 
 def switch_tab(active_tab):
-    print("switching tab")
     if active_tab == "Task A":
         return gr.Tabs(selected="Task B")
     else:
         return gr.Tabs(selected="Task A")
 
 def check_satisfaction(sim_radio, active_tab):
-    global counter1, counter2, current_task1, current_task2
-    method = current_task1 if active_tab == "Task A" else current_task2
-    counter = counter1 if method == METHODS[0] else counter2
-
+    global enable_submit
     fully_satisfied_option = ["Satisfied", "Very Satisfied"]  # The value to trigger submit
-    enable_submit = sim_radio in fully_satisfied_option
-   
-    return gr.update(interactive=enable_submit)
+    if sim_radio in fully_satisfied_option:
+        enable_submit = True
 
 def check_participant(participant):
     if participant == "":
@@ -180,9 +177,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
+    global counter1, counter2, responses_memory, current_task1, current_task2, task1_success, task2_success, enable_submit
     
     task1_success, task2_success = False, False
+    enable_submit = False
     counter1, counter2 = 1, 1
     
     if check_participant(participant):
@@ -254,8 +252,8 @@ def redesign(participant, scenario, prompt, sim_radio, current_images, history_i
     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
+
         responses_memory[participant][method][counter] = {}
         responses_memory[participant][method][counter]["prompt"] = prompt
         responses_memory[participant][method][counter]["sim_radio"] = sim_radio
@@ -267,18 +265,18 @@ def redesign(participant, scenario, prompt, sim_radio, current_images, history_i
         elif current_images:
             history_images.extend(current_images)
         current_images = []
+        
         examples_state = gr.update(samples=history_prompts, visible=True)
         prompt_state = gr.update(interactive=True)
-        next_state = gr.update(interactive=False) if counter >= MAX_ROUND else gr.update(visible=True, interactive=True)
+        next_state = gr.update(visible=True, interactive=True)
         redesign_state = gr.update(interactive=False) if counter >= MAX_ROUND else gr.update(interactive=True)
-        submit_state = gr.update(interactive=True) if counter >= MAX_ROUND else gr.update(interactive=False)
+        submit_state = gr.update(interactive=True) if counter >= MAX_ROUND or enable_submit else gr.update(interactive=False)
 
+        # update counter
         if method == METHODS[0]:
             counter1 += 1
-            counter = counter1
         else:
             counter2 += 1
-            counter = counter2
 
         return None, None, None, current_images, history_images, examples_state, prompt_state, next_state, redesign_state, submit_state
     else:
@@ -287,7 +285,7 @@ def redesign(participant, scenario, prompt, sim_radio, current_images, history_i
 
 def save_response(participant, scenario, prompt, sim_radio, active_tab):
     global current_task1, current_task2 # not change
-    global task1_success, task2_success, counter1, counter2, responses_memory, assigned_scenarios # will change
+    global task1_success, task2_success, counter1, counter2, enable_submit, 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):
@@ -316,7 +314,8 @@ def save_response(participant, scenario, prompt, sim_radio, active_tab):
                 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]
 
@@ -512,8 +511,8 @@ with gr.Blocks(theme=gr.themes.Soft(font=[gr.themes.GoogleFont("Inconsolata"), "
     # prompt2.change(fn=reset_gallery, inputs=[], outputs=[gallery_state2])
     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_btn2])
+    sim_radio1.change(fn=check_satisfaction, inputs=[sim_radio1, active_tab])
+    sim_radio2.change(fn=check_satisfaction, inputs=[sim_radio2, active_tab])
     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])