Update app.py

app.py

@@ -12,6 +12,7 @@ API_KEY = os.getenv("API_KEY")
 BASE_URL = "https://openrouter.ai/api/v1"
 LOG_FILE = os.getenv("LOG_FILE", "logs.csv")
 
+# ✅ 管理者DL用パスワード（環境変数で設定）
 ADMIN_PASSWORD = os.getenv("ADMIN_PASSWORD", "0421")
 
 client = OpenAI(base_url=BASE_URL, api_key=API_KEY)
@@ -21,10 +22,11 @@ passages_df = pd.read_csv("passage.csv")
 
 levels = [1, 2, 3, 4, 5]
 
+# ✅ ログの同時書き込みガード（ログは全ユーザーで共有）
 _log_lock = threading.Lock()
 
 # =========================
-# ログ列（固定・指定順）
+# ✅ ログ列（指定順）
 # =========================
 LOG_COLUMNS = [
     "user_id",
@@ -39,7 +41,7 @@ LOG_COLUMNS = [
 ]
 
 # =========================
-# 文字化け防止（ASCII正規化）
+# ✅ 文字化け対策（方法②：ASCII 正規化）
 # =========================
 def normalize_text_for_csv(text: str) -> str:
     if not text:
@@ -51,19 +53,20 @@ def normalize_text_for_csv(text: str) -> str:
             .replace("‘", "'")
             .replace("“", '"')
             .replace("”", '"')
+            .replace("\u00a0", " ")   # NBSP 対策（地味に効く）
     )
 
-# --- セッション state ---
+# --- セッション state 初期化 ---
 def _new_session_state():
     return {
         "session_id": str(uuid.uuid4()),
         "used_passages": set(),
-        "question_count": 0,
+        "question_count": 0,  # ✅ 採点済み問題数
         "user_id": None,
-        "action_log": [],
+        "action_log": [],     # ✅ 1問中の選択変更履歴（submit時にまとめて保存）
     }
 
-# --- CSV追記（列固定） ---
+# --- ログ追記（CSVのみ・固定カラムで統一） ---
 def log_to_csv(entry: dict):
     with _log_lock:
         row = {col: entry.get(col, None) for col in LOG_COLUMNS}
@@ -80,19 +83,16 @@ def log_to_csv(entry: dict):
         )
 
 def log_event(state: dict, **kwargs):
+    # ✅ Excelで#####になりにくいよう「JST」を付けてテキスト化
     now = (datetime.utcnow() + timedelta(hours=9)).strftime("%Y-%m-%d %H:%M:%S") + " JST"
 
-    # ✅ 正規化（ここが追加ポイント）
-    if "question" in kwargs:
+    # ✅ 文字化け対策（CSVに書く直前で正規化）
+    if "question" in kwargs and isinstance(kwargs["question"], str):
         kwargs["question"] = normalize_text_for_csv(kwargs["question"])
     if "actions" in kwargs and isinstance(kwargs["actions"], str):
         kwargs["actions"] = normalize_text_for_csv(kwargs["actions"])
 
-    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で問題生成 ---
@@ -135,13 +135,14 @@ Respond with one word: "Correct" or "Incorrect".
         temperature=0,
     )
     result = response.choices[0].message.content.strip().lower()
+
     if re.search(r"\bincorrect\b", result):
         return False
     if re.search(r"\bcorrect\b", result):
         return True
     return False
 
-# --- 難易度調整 ---
+# --- 自動難易度調整 ---
 def adaptive_test(prev_level, prev_correct):
     idx = levels.index(prev_level)
     if prev_correct and idx < len(levels) - 1:
@@ -160,7 +161,7 @@ def get_passage(level, used_passages):
     text = subset[subset["passage_id"] == passage_id]["text"].iloc[0]
     return passage_id, text
 
-# --- Start Test ---
+# --- 開始ボタン動作（✅ start時だけログ） ---
 def start_test(student_id, state):
     state = _new_session_state()
 
@@ -179,7 +180,9 @@ def start_test(student_id, state):
     state["used_passages"].add(passage_id)
 
     question = generate_question(text)
+    displayed_time = datetime.utcnow() + timedelta(hours=9)
 
+    # ✅ startログ：actions列に "start test pushed" を入れる
     log_event(
         state,
         question_number=1,
@@ -191,29 +194,28 @@ def start_test(student_id, state):
         actions="start test pushed",
     )
 
-    displayed_time = datetime.utcnow() + timedelta(hours=9)
-
     return (
         state,
         text, question, level, passage_id, None,
         "", True, displayed_time.isoformat(), 1, state["user_id"]
     )
 
-# --- 選択変更（CSVには書かない） ---
+# --- 選択肢変更（✅ 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()
-        state["action_log"].append({
-            "action": "choice",
-            "choice": choice,
-            "time": t_iso
-        })
+        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()
+
     if not user_answer:
         return (
             state,
@@ -221,9 +223,13 @@ def next_step(prev_level, user_answer, question_text, passage_text,
             None, "", True, displayed_time, question_number, user_id, passage_id
         )
 
+    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ログ（ここだけ記録）
     log_event(
         state,
         question_number=state["question_count"],
@@ -235,96 +241,133 @@ def next_step(prev_level, user_answer, question_text, passage_text,
         actions=json.dumps(state["action_log"], ensure_ascii=False),
     )
 
+    # ✅ 最終問題なら結果だけ大きく表示（仕様そのまま）
     if state["question_count"] >= 5:
+        final_level = prev_level if correct else new_level
         return (
             state,
-            f"<h1>🎯 Your Reading level: <strong>Level {prev_level}</strong></h1>",
-            "", "", prev_level,
+            f"<h1>🎯 Your Reading level: <strong>Level {final_level}</strong></h1>",
+            "", "", final_level,
             None, "", False, "", "", user_id, passage_id
         )
 
-    next_level = adaptive_test(prev_level, correct)
-    next_passage_id, next_text = get_passage(next_level, state["used_passages"])
+    # --- 次の問題へ ---
+    next_passage_id, next_text = get_passage(new_level, state["used_passages"])
     state["used_passages"].add(next_passage_id)
 
     next_question = generate_question(next_text)
+    next_display_time = datetime.utcnow() + timedelta(hours=9)
+
+    # ✅ 次の問題のために選択変更履歴をリセット
     state["action_log"] = []
 
+    feedback = "✅ Correct!" if correct else "❌ Incorrect."
+
     return (
         state,
-        "➡️ Loading next question…",
-        next_text, next_question, next_level,
-        None, "", True,
-        (datetime.utcnow() + timedelta(hours=9)).isoformat(),
-        state["question_count"] + 1,
-        user_id,
-        next_passage_id
+        feedback + "\n➡️ Loading next question…",
+        next_text, next_question, new_level,
+        None, "", True, next_display_time.isoformat(), state["question_count"] + 1, user_id, next_passage_id
     )
 
-# --- Admin download ---
+# --- 管理者DL ---
 def download_logs(admin_password):
-    if admin_password != ADMIN_PASSWORD:
+    if not ADMIN_PASSWORD:
+        return None, "⚠️ ADMIN_PASSWORD が設定されていません（環境変数で設定してください）"
+
+    if (admin_password or "") != ADMIN_PASSWORD:
         return None, "❌ Password incorrect."
 
-    if not os.path.exists(LOG_FILE):
-        return None, "⚠️ logs.csv が存在しません"
+    with _log_lock:
+        if not os.path.exists(LOG_FILE):
+            return None, "⚠️ logs.csv がまだ存在しません（ログが1件もありません）"
 
-    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:
-        fdst.write(fsrc.read())
+        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:
+            fdst.write(fsrc.read())
 
     return out_path, "✅ logs.csv is ready."
 
-# --- UI ---
+# --- Gradio UI ---
 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")
+    student_id_input = gr.Textbox(label="Student ID", placeholder="例: B123456")
     start_btn = gr.Button("▶️ Start Test")
 
-    text_display = gr.Textbox(label="Reading Passage", lines=15)
-    question_display = gr.Textbox(label="Question", lines=6)
-    user_answer = gr.Radio(["A", "B", "C", "D"])
+    text_display = gr.Textbox(label="Reading Passage", lines=15, interactive=False)
+    question_display = gr.Textbox(label="Question", lines=6, interactive=False)
+    user_answer = gr.Radio(["A", "B", "C", "D"], label="Your Answer")
     submit_btn = gr.Button("Submit Answer")
 
-    feedback = gr.Markdown()
+    feedback_display = gr.Markdown()
 
     hidden_level = gr.Number(visible=False)
-    hidden_time = gr.Textbox(visible=False)
-    hidden_qnum = gr.Number(visible=False)
-    hidden_uid = gr.Textbox(visible=False)
-    hidden_pid = 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)
+    hidden_passage_id = gr.Textbox(visible=False)
+    test_visible = gr.State(False)
 
     start_btn.click(
-        start_test,
-        [student_id_input, session_state],
-        [session_state, text_display, question_display, hidden_level, hidden_pid,
-         user_answer, feedback, hidden_time, hidden_qnum, hidden_uid]
+        fn=start_test,
+        inputs=[student_id_input, session_state],
+        outputs=[
+            session_state,
+            text_display, question_display, hidden_level, hidden_passage_id, user_answer,
+            feedback_display, test_visible, hidden_display_time,
+            hidden_question_number, hidden_user_id
+        ]
     )
 
+    # ✅ 選択肢変更はCSVに書かず、actionsにだけ溜める
     user_answer.change(
-        log_choice_change,
-        [user_answer, hidden_qnum, hidden_uid, session_state],
-        [session_state]
+        fn=log_choice_change,
+        inputs=[user_answer, hidden_question_number, hidden_user_id, session_state],
+        outputs=[session_state]
     )
 
     submit_btn.click(
-        next_step,
-        [hidden_level, user_answer, question_display, text_display,
-         hidden_time, hidden_qnum, hidden_uid, hidden_pid, session_state],
-        [session_state, feedback, text_display, question_display, hidden_level,
-         user_answer, hidden_time, hidden_qnum, hidden_uid, hidden_pid]
+        fn=next_step,
+        inputs=[hidden_level, user_answer, question_display, text_display,
+                hidden_display_time, hidden_question_number, hidden_user_id, hidden_passage_id, session_state],
+        outputs=[
+            session_state,
+            feedback_display, text_display, question_display, hidden_level,
+            user_answer, hidden_passage, test_visible, hidden_display_time,
+            hidden_question_number, hidden_user_id, hidden_passage_id
+        ]
     )
 
-    gr.Markdown("## 🔒 Admin")
-    pw = gr.Textbox(type="password")
-    dl = gr.Button("Download logs.csv")
-    out = gr.File()
-    msg = gr.Markdown()
+    def toggle_visibility(show):
+        v = bool(show)
+        return (
+            gr.update(visible=v), gr.update(visible=v),
+            gr.update(visible=v), gr.update(visible=v)
+        )
 
-    dl.click(download_logs, [pw], [out, msg])
+    test_visible.change(
+        fn=toggle_visibility,
+        inputs=test_visible,
+        outputs=[text_display, question_display, user_answer, submit_btn]
+    )
+
+    gr.Markdown("---")
+    gr.Markdown("## 🔒 Admin: Download logs (since last restart)")
+
+    admin_pw = gr.Textbox(label="Admin Password", type="password", placeholder="Enter admin password")
+    dl_btn = gr.Button("⬇️ Download logs.csv")
+    dl_file = gr.File(label="logs.csv (download)")
+    dl_msg = gr.Markdown()
+
+    dl_btn.click(
+        fn=download_logs,
+        inputs=[admin_pw],
+        outputs=[dl_file, dl_msg]
+    )
 
 demo.launch()