Improved UI

app.py

@@ -38,55 +38,55 @@ def click_timer(is_checked, state):
         state["timer_start"] = datetime.now().isoformat()
     return state
 
-def record_run(name, session_start, attempts, wrongs, total_time, familiarity):
-    """Append one row per run to Google Sheets, including attempt count, time & familiarity."""
+def record_run(name, session_start, attempt_num, elapsed_sec, familiarity, correct_count, wrong_list):
+    """
+    Append one row with exactly:
+      Name | StartTime | #Attempt | ElapsedSec | Familiarity | AttemptsList | WrongsList
+    """
     ws.append_row([
         name,
-        session_start,               # when they clicked Start
-        len(attempts),               # number of Submit clicks
-        total_time,                  # elapsed seconds
+        session_start,               # when that grid/timer started
+        attempt_num,                 # 1, 2, 3, …
+        elapsed_sec,                 # seconds for this attempt
         familiarity,                 # slider value
-        json.dumps(attempts),        # full list of correct counts
-        json.dumps(wrongs)           # full list of wrong lists
+        json.dumps([correct_count]), # e.g. [9]
+        json.dumps(wrong_list)       # e.g. ["217_1.png","243_2.png"]
     ])
 
 def get_new_grid(state=None):
-    # # 1) Preserve or initialize timer & history
-    # if state is None or "session_start" not in state:
-    #     session_start = datetime.now().isoformat()
+    """
+    Generate a fresh 4×4 grid:
+      - Preserve attempt_count
+      - **Reset** timer_start to "now" whenever the user hits Retry (i.e. state is not None)
+      - Leave timer_start unset on initial load (so they must click Start or first Fake?)
+    """
+
+    # # 1) Initialize or preserve only attempts/wrongs and any existing timer
+    # if state is None or "attempts" not in state:
     #     attempts = []
     #     wrongs   = []
+    #     # do NOT set timer_start here—that only comes from the checkbox
     # else:
-    #     session_start = state["session_start"]
-    #     attempts      = state["attempts"]
-    #     wrongs        = state["wrongs"]
-
-
-    # 1) Initialize or preserve only attempts/wrongs and any existing timer
-    if state is None or "attempts" not in state:
-        attempts = []
-        wrongs   = []
-        # do NOT set timer_start here—that only comes from the checkbox
-    else:
-        attempts = state["attempts"]
-        wrongs   = state["wrongs"]
-    # preserve timer_start if previously set
-    timer_start = state.get("timer_start") if state else None
-
-
-    # 2) Pick & shuffle images
-    ai_files   = [os.path.join(folder_ai, f) for f in os.listdir(folder_ai)
-                  if f.lower().endswith(".png")]
-    real_files = [os.path.join(folder_real, f) for f in os.listdir(folder_real)
-                  if f.lower().endswith(".png")]
-    t = random.randint(4, 12)
-    sel_ai   = random.sample(ai_files, t)
-    sel_real = random.sample(real_files, 16 - t)
-    combined = [(p, False) for p in sel_ai] + [(p, True) for p in sel_real]
-    random.shuffle(combined)
-
-    paths = [p for p, _ in combined]
-    truth = [lbl for _, lbl in combined]
+    #     attempts = state["attempts"]
+    #     wrongs   = state["wrongs"]
+    # # preserve timer_start if previously set
+    # timer_start = state.get("timer_start") if state else None
+
+    # 1) Preserve attempt_count or start at 0
+    attempt_count = (state or {}).get("attempt_count", 0)
+
+
+      # 2) Sample & shuffle images as before
+    ai_files   = [os.path.join(folder_ai, f) for f in os.listdir(folder_ai)   if f.endswith(".png")]
+    real_files = [os.path.join(folder_real, f) for f in os.listdir(folder_real) if f.endswith(".png")]
+    t          = random.randint(4, 12)
+    sel_ai     = random.sample(ai_files, t)
+    sel_real   = random.sample(real_files, 16 - t)
+    combo      = [(p, False) for p in sel_ai] + [(p, True) for p in sel_real]
+    random.shuffle(combo)
+    paths, truth = zip(*combo)
+
+    # 3) Build thumbnails + reset flags
     thumbs = [np.array(Image.open(p).convert("RGB")) for p in paths]
     resets = [False] * 16
 
@@ -100,87 +100,67 @@ def get_new_grid(state=None):
     # }
 
     new_state = {
-        "attempts": attempts,
-        "wrongs": wrongs,
         "paths": paths,
-        "truth": truth
+        "truth": truth,
+        "attempt_count": attempt_count ,  # increment attempt count
     }
-    # carry over the timer only if they've clicked to start it
-    if timer_start is not None:
-        new_state["timer_start"] = timer_start
+    # Reset timer on Retry (state exists); leave unset on first load (state is None)
+    if state is not None:
+        new_state["timer_start"] = datetime.now().isoformat()
 
-    # 4) Return images, resets, and the full state
     return (*thumbs, *resets, new_state)
+
 def evaluate(
     sel0, sel1, sel2, sel3,
     sel4, sel5, sel6, sel7,
     sel8, sel9, sel10, sel11,
     sel12, sel13, sel14, sel15,
-    state
+    state,
+    user_name,
+    familiarity
 ):
+    # 1) Increment the simple count
+    attempt_count = state.get("attempt_count", 0) + 1
+    state["attempt_count"] = attempt_count
+
+    # 2) Border logic as before...
     sels  = [sel0, sel1, sel2, sel3, sel4, sel5, sel6, sel7,
              sel8, sel9, sel10, sel11, sel12, sel13, sel14, sel15]
-    paths = state["paths"]
-    truth = state["truth"]
     bordered, wrong_list = [], []
     correct_count = 0
 
     for i, chosen in enumerate(sels):
-        img     = Image.open(paths[i]).convert("RGB")
-        is_real = truth[i]
-        if chosen == (not is_real):
-            color = "green"
+        img     = Image.open(state["paths"][i]).convert("RGB")
+        is_real = state["truth"][i]
+        correct = chosen == (not is_real)
+        color   = "green" if correct else "red"
+        if correct:
             correct_count += 1
         else:
-            wrong_list.append(os.path.basename(paths[i]))
-            color = "red"
+            wrong_list.append(os.path.basename(state["paths"][i]))
         bordered.append(np.array(ImageOps.expand(img, border=5, fill=color)))
 
-    # accumulate this attempt in state
-    
-    state["attempts"].append(correct_count)
-    state["wrongs"].append(wrong_list)
-
-    return (*bordered, state)
-
-def done_now(name, state, familiarity):
-    # only use the timer_start from the box click; if missing, elapsed = 0
-    timer_iso = state.get("timer_start")
-    if timer_iso is None:
-        elapsed   = 0.0
-        timer_iso = datetime.now().isoformat()
-    else:
-        start     = datetime.fromisoformat(timer_iso)
-        elapsed   = (datetime.now() - start).total_seconds()
-    
-    # if they never clicked Start or Submit, elapsed = 0; else from first interaction
+    # 3) Timer logic
     timer_iso = state.get("timer_start")
-    if timer_iso:
-        elapsed = (datetime.now() - datetime.fromisoformat(timer_iso)).total_seconds()
-    else:
-        elapsed = 0.0
-        timer_iso = datetime.now().isoformat()
+    elapsed   = (datetime.now() - datetime.fromisoformat(timer_iso)).total_seconds() if timer_iso else 0.0
 
-    # record the whole run; if they never started timer, timestamp now
-    record_run(
-        name,
-        state.get("timer_start", datetime.now().isoformat()),
-        state["attempts"],
-        state["wrongs"],
-        elapsed,
-        familiarity
-    )
-
-    minutes = int(elapsed // 60)
-    seconds = int(elapsed % 60)
+    # incremented earlier in evaluate:
+    attempt_num = state["attempt_count"]
 
-    return (
-        f"Run recorded for '{name}'.\n"
-        f"Familiarity: {familiarity}/10\n"
-        f"Total time: {minutes}m {seconds}s\n"
-        f"Thanks for playing ^_^!"
+    record_run(
+        user_name,                # your textbox input
+        state["timer_start"],     # ISO start time for this grid
+        attempt_num,              # 1, 2, 3, ...
+        elapsed,                  # per‐attempt elapsed
+        familiarity,              # slider input
+        correct_count,            # how many correct this try
+        wrong_list                # which files were wrong
     )
+  # 5) Summary text
+    pct     = correct_count / 16 * 100
+    summary = f"Attempt {attempt_count}: {correct_count}/16 correct ({pct:.1f}%), time {elapsed:.1f}s. \n Retry to improve your score!  (The grid of images will refresh )"
 
+    return (*bordered, state, summary)
 
 
 with gr.Blocks() as demo:
@@ -196,7 +176,7 @@ with gr.Blocks() as demo:
 
         user_name = gr.Textbox(label="Your name", placeholder="e.g. Can be anonymous ex: 'Trisolaris123'")
 
-        gr.Markdown("# Instructions: Click the images you think are AI-generated. \nYou can submit multiple times per grid if you want to improve your score. \nClick 'Refresh Grid' to get a new set of images. \nWhen you are done, click 'I am done now' to record your results.")
+        gr.Markdown("# Instructions: Click the images you think are AI-generated. \nWhen you are done, click 'Submit' to record your results.\nClick 'Retry' to get a new set of images and improve your score (infinite retries). ")
         #         Familiarity slider (1=first time, 10=expert)
         familiarity = gr.Slider(
             minimum=1, maximum=10, step=1, value=1,
@@ -227,30 +207,25 @@ with gr.Blocks() as demo:
             cb.change(fn=click_timer, inputs=[cb, state], outputs=[state])
 
         submit_btn  = gr.Button("Submit")
-        refresh_btn = gr.Button("Refresh Grid")
-        done_btn    = gr.Button("I am done now")
-        done_out    = gr.Textbox(interactive=False)
+        retry_btn  = gr.Button("Retry")
+        score_out  = gr.Textbox(label="Score & Time", interactive=False)
 
         demo.load(
             fn=get_new_grid,
             inputs=[state],
             outputs=[*image_components, *checkbox_components, state]
         )
-        refresh_btn.click(
+        retry_btn.click(
             fn=get_new_grid,
             inputs=[state],
             outputs=[*image_components, *checkbox_components, state]
         )
         submit_btn.click(
             fn=evaluate,
-            inputs=[*checkbox_components, state],
-            outputs=[*image_components, state]
-        )
-        done_btn.click(
-            fn=done_now,
-            inputs=[user_name, state, familiarity],
-            outputs=[done_out]
+            inputs=[*checkbox_components, state,user_name, familiarity],
+            outputs=[*image_components, state,score_out]
         )
+        
 
     # Reveal main UI only after agreeing to terms
     terms_cb.change(