1014

app.py

@@ -29,14 +29,22 @@ INSTRUCTION_MD = """
 
 # -------------------- Helper funcs --------------------
 def _start_and_load_first():
+    # 평가할 인덱스 순서 (셔플)
     order = random.sample(range(len(V)), k=min(TOTAL_PER_PARTICIPANT, len(V)))
     first_idx = order[0]
-    url, action = V[first_idx]["url"], _extract_action(V[first_idx])
+    v0 = V[first_idx]
+    url0, action0 = v0["url"], _extract_action(v0)
     return (
-        gr.update(visible=False),
-        gr.update(visible=True),
-        url, action, 5.0, "", 0, _progress_html(0, TOTAL_PER_PARTICIPANT),
-        order, 1  # order_state, ptr_state 초기화
+        gr.update(visible=False),             # page_intro off
+        gr.update(visible=True),              # page_eval on
+        url0,                                 # video
+        action0,                              # action_tb
+        5.0,                                  # score 초기값
+        "",                                   # status (빈 메시지)
+        0,                                    # done_state
+        _progress_html(0, TOTAL_PER_PARTICIPANT),
+        order,                                # order_state 초기화
+        1                                     # ptr_state: 다음 인덱스 포인터
     )
 
 start_btn.click(
@@ -299,25 +307,40 @@ with gr.Blocks(fill_height=True, css=GLOBAL_CSS) as demo:
     )
 
     # -------- Save & Next (노트 없음) --------
-    def save_and_next(participant_id, action_name, score_val, done_cnt):
+    def save_and_next(participant_id, action_name, score_val, done_cnt, order, ptr):
         if not participant_id or not participant_id.strip():
+            # PID 없으면 기존 화면 유지
             return (
                 gr.update(visible=True, value="❗ Please enter your Participant ID."),
-                gr.update(), gr.update(),        # video, action_tb (변경 없음)
+                gr.update(), gr.update(),                    # video, action_tb 변경 없음
                 done_cnt,
                 _progress_html(done_cnt, TOTAL_PER_PARTICIPANT),
-                5.0                              # score reset 유지
+                5.0,
+                ptr
             )
+
         status_msg = push(participant_id, action_name, score_val, "")
 
         new_done = int(done_cnt) + 1
+        # 종료 조건: 목표 개수 달성 or 순서 소진
         if new_done >= TOTAL_PER_PARTICIPANT or ptr >= len(order):
-            return (... 종료 UI ... , ptr)
+            return (
+                status_msg,                                  # status
+                None,                                        # video 비우기
+                "",                                          # action_tb 비우기
+                TOTAL_PER_PARTICIPANT,                       # done_state 최종
+                _progress_html(TOTAL_PER_PARTICIPANT, TOTAL_PER_PARTICIPANT),
+                5.0,                                         # score 리셋
+                ptr                                          # ptr 유지
+            )
+
+        # 다음 영상 로드
         next_idx = order[ptr]
         v = V[next_idx]
         return (
             status_msg,
-            v["url"], _extract_action(v),
+            v["url"],
+            _extract_action(v),
             new_done,
             _progress_html(new_done, TOTAL_PER_PARTICIPANT),
             5.0,