fix bugs

app.py

@@ -33,7 +33,7 @@ inverted_prompt = ""
 
 VERBAL_MSG = "Please verbally describe why you are satisfied or unsatisfied at the generated images."
 DEFAULT_SCENARIO = "Product advertisement"
-METHODS = ["Method 1", "Method 2"]
+METHODS = ["Baseline", "Experimental"]
 MAX_ROUND = 5
 # intermittent memory
 counter1, counter2 = 1, 1
@@ -138,9 +138,9 @@ def check_satisfaction(sim_radio, active_tab):
     counter = counter1 if method == METHODS[0] else counter2
 
     fully_satisfied_option = ["Satisfied", "Very Satisfied"]  # The value to trigger submit
-    enable_submit = sim_radio in fully_satisfied_option or counter >= MAX_ROUND
+    enable_submit = sim_radio in fully_satisfied_option
    
-    return gr.update(interactive=enable_submit), gr.update(interactive=(not enable_submit)) 
+    return gr.update(interactive=enable_submit)
 
 def check_participant(participant):
     if participant == "":
@@ -208,6 +208,8 @@ def display_scenario(participant, choice):
         dislike_image2: None,
         history_images1: [],
         history_images2: [],
+        example1.dataset: gr.update(samples=[], visible=False),
+        example2.dataset: gr.update(samples=[], visible=False),
         next_btn1: gr.update(interactive=False), 
         next_btn2: gr.update(interactive=False), 
         redesign_btn1: gr.update(interactive=True), 
@@ -252,17 +254,12 @@ 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):
-        if method == METHODS[0]:
-            counter1 += 1
-            counter = counter1
-        else:
-            counter2 += 1
-            counter = counter2
         
-        responses_memory[participant][method][counter-1] = {}
-        responses_memory[participant][method][counter-1]["prompt"] = prompt
-        responses_memory[participant][method][counter-1]["sim_radio"] = sim_radio
-        # responses_memory[participant][method][counter-1]["response"] = response
+        
+        responses_memory[participant][method][counter] = {}
+        responses_memory[participant][method][counter]["prompt"] = prompt
+        responses_memory[participant][method][counter]["sim_radio"] = sim_radio
+        # responses_memory[participant][method][counter]["response"] = response
         
         history_prompts = [[v["prompt"]] for v in responses_memory[participant][method].values()]
         if not history_images: 
@@ -276,6 +273,13 @@ def redesign(participant, scenario, prompt, sim_radio, current_images, history_i
         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)
 
+        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:
         return {submit_btn1: gr.skip()} if active_tab == "Task A" else {submit_btn2: gr.skip()}
@@ -299,7 +303,7 @@ def save_response(participant, scenario, prompt, sim_radio, active_tab):
             sheet = gc.open("DiverseGen-phase3").sheet1 
 
             for i, entry in responses_memory[participant][method].items():
-                sheet.append_row([participant, scenario, method, i, entry["prompt"], entry["sim_radio"]])
+                sheet.append_row([participant, scenario, f"{active_tab}, {method}", i, entry["prompt"], entry["sim_radio"]])
 
             display_info_message("✅ Your answer is saved!")
 
@@ -312,17 +316,18 @@ def save_response(participant, scenario, prompt, sim_radio, active_tab):
                 task1_success = True
             else:
                 task2_success = True
+            
             # decide if change scenario
             next_scenario = assigned_scenarios[1] if task1_success and task2_success else assigned_scenarios[0]
-            # update buttons
-            example_state = gr.update(samples=[], visible=False)
+
+            # reset buttons
             prompt_state = gr.update(interactive=False)
             next_state = gr.update(visible=False, interactive=False)
             submit_state = gr.update(interactive=False) 
             redesign_state = gr.update(interactive=False) 
             tabs = switch_tab(active_tab)
 
-            return None, None, None, None, None, [], [], example_state, prompt_state, next_state, redesign_state, submit_state, next_scenario, tabs
+            return None, None, None, prompt_state, next_state, redesign_state, submit_state, next_scenario, tabs
         
         except Exception as e:
             display_error_message(f"❌ Error saving response: {str(e)}")
@@ -501,14 +506,14 @@ with gr.Blocks(theme=gr.themes.Soft(font=[gr.themes.GoogleFont("Inconsolata"), "
     participant.change(fn=set_user, inputs=[participant], outputs=[scenario])
     scenario.change(display_scenario, 
         inputs=[participant, scenario], 
-        outputs=[scenario_content, prompt1, prompt2, images_method1, images_method2, like_image1, dislike_image1, like_image2, dislike_image2, history_images1, history_images2, next_btn1, next_btn2, redesign_btn1, redesign_btn2, submit_btn1, submit_btn2])
+        outputs=[scenario_content, prompt1, prompt2, images_method1, images_method2, like_image1, dislike_image1, like_image2, dislike_image2, history_images1, history_images2, example1.dataset, example2.dataset, next_btn1, next_btn2, redesign_btn1, redesign_btn2, submit_btn1, submit_btn2])
     
     # prompt1.change(fn=reset_gallery, inputs=[], outputs=[gallery_state1])
     # 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, redesign_btn1])
-    sim_radio2.change(fn=check_satisfaction, inputs=[sim_radio2, active_tab], outputs=[submit_btn2, redesign_btn2])
+    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])
     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])
@@ -526,11 +531,11 @@ with gr.Blocks(theme=gr.themes.Soft(font=[gr.themes.GoogleFont("Inconsolata"), "
     )
     submit_btn1.click(fn=save_response, 
         inputs=[participant, scenario, prompt1, sim_radio1, active_tab], 
-        outputs=[sim_radio1, dislike_radio1, like_radio1, like_image1, dislike_image1, images_method1, history_images1, example1.dataset, prompt1, next_btn1, redesign_btn1, submit_btn1, scenario, tabs])
+        outputs=[sim_radio1, dislike_radio1, like_radio1, prompt1, next_btn1, redesign_btn1, submit_btn1, scenario, tabs])
     
     submit_btn2.click(fn=save_response, 
         inputs=[participant, scenario, prompt2, sim_radio2, active_tab], 
-        outputs=[sim_radio2,  dislike_radio2, like_radio2, like_image2, dislike_image2, images_method2, history_images2, example2.dataset, prompt2, next_btn2, redesign_btn2, submit_btn2, scenario, tabs])
+        outputs=[sim_radio2,  dislike_radio2, like_radio2, prompt2, next_btn2, redesign_btn2, submit_btn2, scenario, tabs])
 
 
 if __name__ == "__main__":