Update app.py

app.py

@@ -26,7 +26,7 @@ levels = [1, 2, 3, 4, 5]
 _log_lock = threading.Lock()
 
 # =========================
-# ✅ ログ列（ユーザー指定の順序に固定）
+# ✅ ログ列（指定順）
 # =========================
 LOG_COLUMNS = [
     "user_id",
@@ -45,9 +45,9 @@ def _new_session_state():
     return {
         "session_id": str(uuid.uuid4()),
         "used_passages": set(),
-        "question_count": 0,  # ✅ 採点済み（submit_result保存済み）の問題数
+        "question_count": 0,  # ✅ 採点済み問題数
         "user_id": None,
-        "action_log": [],     # ✅ 1問の間の選択変更履歴（submit_resultにまとめて入れる）
+        "action_log": [],     # ✅ 1問中の選択変更履歴（submit時にまとめて保存）
     }
 
 # --- ログ追記（CSVのみ・固定カラムで統一） ---
@@ -66,15 +66,9 @@ def log_to_csv(entry: dict):
             lineterminator="\n",
         )
 
-# --- イベントログ（start / select / submit / submit_result を記録）
-# ※CSVに出す列はLOG_COLUMNSのみに固定
 def log_event(state: dict, **kwargs):
     now = (datetime.utcnow() + timedelta(hours=9)).strftime("%Y-%m-%d %H:%M:%S")
-    entry = {
-        "time": now,
-        "user_id": state.get("user_id"),
-        **kwargs
-    }
+    entry = {"time": now, "user_id": state.get("user_id"), **kwargs}
     log_to_csv(entry)
 
 # --- AIで問題生成 ---
@@ -118,7 +112,6 @@ Respond with one word: "Correct" or "Incorrect".
     )
     result = response.choices[0].message.content.strip().lower()
 
-    # "incorrect" の中に "correct" が含まれるため順序が重要
     if re.search(r"\bincorrect\b", result):
         return False
     if re.search(r"\bcorrect\b", result):
@@ -134,7 +127,7 @@ def adaptive_test(prev_level, prev_correct):
         return levels[idx - 1]
     return prev_level
 
-# --- passage取得（used_passages は state から渡す） ---
+# --- passage取得 ---
 def get_passage(level, used_passages):
     subset = passages_df[passages_df["level"] == level]
     available = [pid for pid in subset["passage_id"] if pid not in used_passages]
@@ -144,9 +137,8 @@ def get_passage(level, used_passages):
     text = subset[subset["passage_id"] == passage_id]["text"].iloc[0]
     return passage_id, text
 
-# --- 開始ボタン動作（startログを残す） ---
+# --- 開始ボタン動作（✅ start時だけログ） ---
 def start_test(student_id, state):
-    # 新規開始時は常に初期化
     state = _new_session_state()
 
     if not student_id or student_id.strip() == "":
@@ -166,7 +158,7 @@ def start_test(student_id, state):
     question = generate_question(text)
     displayed_time = datetime.utcnow() + timedelta(hours=9)
 
-    # ✅ startログ（表示された問題の情報を記録）
+    # ✅ startログ（choice/correct/actionsは空）
     log_event(
         state,
         question_number=1,
@@ -184,53 +176,22 @@ def start_test(student_id, state):
         "", True, displayed_time.isoformat(), 1, state["user_id"]
     )
 
-# --- 選択肢変更イベント（変更も全部、正確な情報付きでCSVに残す） ---
-def log_choice_change(choice, question_number, user_id, prev_level, question_text, passage_id, state):
+# --- 選択肢変更（✅ CSVには書かない。actionsにだけ溜める） ---
+def log_choice_change(choice, question_number, user_id, state):
     if not isinstance(state, dict):
         state = _new_session_state()
-
     if choice:
         t_iso = (datetime.utcnow() + timedelta(hours=9)).isoformat()
-
-        # ✅ メモリ上の操作履歴（submit_resultにまとめて入れる）
-        state["action_log"].append({
-            "action": "choice",
-            "choice": choice,
-            "time": t_iso
-        })
-
-        # ✅ selectログ（どの問題での選択か分かるように埋める）
-        log_event(
-            state,
-            question_number=question_number,
-            reading_level=prev_level,
-            passage_id=passage_id,
-            question=question_text,
-            choice=choice,
-            correct=None,
-            actions=None,
-        )
+        state["action_log"].append({"action": "choice", "choice": choice, "time": t_iso})
     return state
 
-# --- 回答送信（submitログ + 結果ログ） ---
+# --- 回答送信（✅ submit時だけログ） ---
 def next_step(prev_level, user_answer, question_text, passage_text,
               displayed_time, question_number, user_id, passage_id, state):
 
     if not isinstance(state, dict):
         state = _new_session_state()
 
-    # ✅ submitログ（ボタン押下ごとに必ず記録、未選択でも残す）
-    log_event(
-        state,
-        question_number=question_number,
-        reading_level=prev_level,
-        passage_id=passage_id,
-        question=question_text,
-        choice=user_answer,
-        correct=None,
-        actions=None,
-    )
-
     if not user_answer:
         return (
             state,
@@ -239,14 +200,12 @@ def next_step(prev_level, user_answer, question_text, passage_text,
         )
 
     submit_time = datetime.utcnow() + timedelta(hours=9)
-
-    # ✅ 採点済み数を増やす（=この問題は確定）
     state["question_count"] += 1
 
     correct = check_answer_with_ai(passage_text, question_text, user_answer)
     new_level = adaptive_test(prev_level, correct)
 
-    # ✅ submit_resultログ（採点結果 + その問題の選択変更履歴）
+    # ✅ submitログ（ここだけ記録）
     log_event(
         state,
         question_number=state["question_count"],
@@ -275,7 +234,7 @@ def next_step(prev_level, user_answer, question_text, passage_text,
     next_question = generate_question(next_text)
     next_display_time = datetime.utcnow() + timedelta(hours=9)
 
-    # ✅ 次の問題のために選択操作ログをリセット
+    # ✅ 次の問題のために選択変更履歴をリセット
     state["action_log"] = []
 
     feedback = "✅ Correct!" if correct else "❌ Incorrect."
@@ -287,7 +246,7 @@ def next_step(prev_level, user_answer, question_text, passage_text,
         None, "", True, next_display_time.isoformat(), state["question_count"] + 1, user_id, next_passage_id
     )
 
-# --- 管理者DL（再起動までの logs.csv を返す） ---
+# --- 管理者DL ---
 def download_logs(admin_password):
     if not ADMIN_PASSWORD:
         return None, "⚠️ ADMIN_PASSWORD が設定されていません（環境変数で設定してください）"
@@ -299,7 +258,6 @@ def download_logs(admin_password):
         if not os.path.exists(LOG_FILE):
             return None, "⚠️ logs.csv がまだ存在しません（ログが1件もありません）"
 
-        # DL安定のため一時コピーして返す
         tmp_dir = tempfile.mkdtemp()
         out_path = os.path.join(tmp_dir, "logs.csv")
         with open(LOG_FILE, "rb") as fsrc, open(out_path, "wb") as fdst:
@@ -311,7 +269,6 @@ def download_logs(admin_password):
 with gr.Blocks() as demo:
     gr.Markdown("# 📘 Reading Level Test")
 
-    # ✅ セッションごとの状態
     session_state = gr.State(_new_session_state())
 
     student_id_input = gr.Textbox(label="Student ID", placeholder="例: B123456")
@@ -325,7 +282,7 @@ with gr.Blocks() as demo:
     feedback_display = gr.Markdown()
 
     hidden_level = gr.Number(visible=False)
-    hidden_passage = gr.Textbox(visible=False)  # 互換用に残す（未使用）
+    hidden_passage = gr.Textbox(visible=False)  # 互換用（未使用）
     hidden_display_time = gr.Textbox(visible=False)
     hidden_question_number = gr.Number(visible=False)
     hidden_user_id = gr.Textbox(visible=False)
@@ -343,14 +300,13 @@ with gr.Blocks() as demo:
         ]
     )
 
-    # ✅ 選択肢変更ログ（変更も全部残す・正確な情報付き）
+    # ✅ 選択肢変更はCSVに書かず、actionsにだけ溜める
     user_answer.change(
         fn=log_choice_change,
-        inputs=[user_answer, hidden_question_number, hidden_user_id, hidden_level, question_display, hidden_passage_id, session_state],
+        inputs=[user_answer, hidden_question_number, hidden_user_id, session_state],
         outputs=[session_state]
     )
 
-    # ✅ 回答送信（submitログ + submit_resultログ）
     submit_btn.click(
         fn=next_step,
         inputs=[hidden_level, user_answer, question_display, text_display,
@@ -363,7 +319,6 @@ with gr.Blocks() as demo:
         ]
     )
 
-    # ✅ 表示のON/OFF制御
     def toggle_visibility(show):
         v = bool(show)
         return (