1014

app.py

@@ -8,7 +8,10 @@ from huggingface_hub import HfApi, hf_hub_download
 REPO_ID = os.getenv("RESULTS_REPO", "sgtlim/videoeval_results")  # 업로드한 리포와 일치
 HF_TOKEN = os.getenv("HF_TOKEN")
 RESULTS_FILE = "results.csv"
-TOTAL_PER_PARTICIPANT = 50  # 목표 평가 개수(세션 기준)
+TOTAL_PER_PARTICIPANT = 30  # 목표 평가 개수(세션 기준)
+
+order_state = gr.State([])
+ptr_state = gr.State(0)
 
 # videos.json 예시: {"url": "...mp4", "id": "BodyWeightSquats__XXXX.mp4", "action": "BodyWeightSquats"}
 with open("videos.json", "r", encoding="utf-8") as f:
@@ -25,6 +28,23 @@ 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])
+    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 초기화
+    )
+
+start_btn.click(
+    _start_and_load_first,
+    inputs=[],
+    outputs=[page_intro, page_eval, video, action_tb, score, status, done_state, progress, order_state, ptr_state]
+)
+
 def _read_csv_bytes():
     try:
         p = hf_hub_download(
@@ -291,28 +311,23 @@ with gr.Blocks(fill_height=True, css=GLOBAL_CSS) as demo:
         status_msg = push(participant_id, action_name, score_val, "")
 
         new_done = int(done_cnt) + 1
-        if new_done >= TOTAL_PER_PARTICIPANT:
-            return (
-                status_msg,
-                None, "",                        # 마지막: 새 비디오 로드 안 함
-                TOTAL_PER_PARTICIPANT,
-                _progress_html(TOTAL_PER_PARTICIPANT, TOTAL_PER_PARTICIPANT),
-                5.0
-            )
-
-        url, next_action = pick_one()
+        if new_done >= TOTAL_PER_PARTICIPANT or ptr >= len(order):
+            return (... 종료 UI ... , ptr)
+        next_idx = order[ptr]
+        v = V[next_idx]
         return (
             status_msg,
-            url, next_action,
+            v["url"], _extract_action(v),
             new_done,
             _progress_html(new_done, TOTAL_PER_PARTICIPANT),
-            5.0
+            5.0,
+            ptr + 1
         )
 
     save_next.click(
         save_and_next,
-        inputs=[pid, action_tb, score, done_state],
-        outputs=[status, video, action_tb, done_state, progress, score]
+        inputs=[pid, action_tb, score, done_state, order_state, ptr_state],
+        outputs=[status, video, action_tb, done_state, progress, score, ptr_state]
     )
 
 if __name__ == "__main__":