Update app.py

app.py

@@ -10,42 +10,41 @@ API_KEY = os.getenv("API_KEY")
 BASE_URL = "https://openrouter.ai/api/v1"
 HF_TOKEN = os.getenv("HF_TOKEN")
 DATASET_REPO = "Toya0421/lexile_test_logging"
-
-# --- ログファイル ---
 LOG_FILE = "logs.csv"
 
-# --- passage本文は外部ファイルから読み込み ---
-PASSAGE_FILE = "passage.csv"
-passages_df = pd.read_csv(PASSAGE_FILE)
+client = OpenAI(base_url=BASE_URL, api_key=API_KEY)
 
-levels = [300, 600, 850, 1050, 1250]
+# --- 外部CSVとして管理する passsage_id / passage データ ---
+# （例）columns: passage_id, lexile_level, text
+passages_df = pd.read_csv("passage.csv")
 
-client = OpenAI(base_url=BASE_URL, api_key=API_KEY)
+levels = [300, 600, 850, 1050, 1250]
 
-# --- passage取得 ---
-def get_passage(level):
-    candidates = passages_df[passages_df["lexile_level"] == level]
-    row = candidates.sample(1).iloc[0]
-    return row["passage_id"], row["text"]
+# --- 状態 ---
+used_passages = set()
+question_count = 0
+current_user_id = None
+action_log = []  # ✅ 選択肢変更ログ
 
-# --- 問題生成 ---
+# --- AIで問題生成 ---
 def generate_question(text):
     prompt = f"""
     Read the following passage and create ONE multiple-choice question with 4 options (A–D).
-    Only output the question and options — DO NOT include which one is correct.
-    Format strictly as:
+    Only output the question and options.
+    Format:
     Q: <question text>
     A. <option>
     B. <option>
     C. <option>
     D. <option>
+
     Passage:
     {text}
     """
     response = client.chat.completions.create(
         model="google/gemma-3-27b-it:free",
         messages=[{"role": "user", "content": prompt}],
-        max_tokens=300,
+        max_tokens=250,
         temperature=0.7,
     )
     return response.choices[0].message.content.strip()
@@ -54,20 +53,22 @@ def generate_question(text):
 def check_answer_with_ai(text, question, user_answer):
     prompt = f"""
     Read the passage and question below. Decide if the user's answer is correct.
-    P: {text}
-    Q: {question}
-    User: {user_answer}
-    Respond only: Correct or Incorrect
+    Passage:
+    {text}
+    Question:
+    {question}
+    User Answer: {user_answer}
+    Respond with one word: "Correct" or "Incorrect".
     """
     response = client.chat.completions.create(
         model="google/gemma-3-27b-it:free",
         messages=[{"role": "user", "content": prompt}],
-        max_tokens=15,
+        max_tokens=10,
         temperature=0,
     )
     return response.choices[0].message.content.strip().lower() == "correct"
 
-# --- 難易度調整 ---
+# --- 自動難易度調整 ---
 def adaptive_test(prev_level, prev_correct):
     idx = levels.index(prev_level)
     if prev_correct and idx < len(levels) - 1:
@@ -76,7 +77,17 @@ def adaptive_test(prev_level, prev_correct):
         return levels[idx - 1]
     return prev_level
 
-# --- ログ書き込み（回答送信時のみ） ---
+# --- passage取得 ---
+def get_passage(level):
+    subset = passages_df[passages_df["lexile_level"] == level]
+    available = [pid for pid in subset["passage_id"] if pid not in used_passages]
+    if not available:
+        available = list(subset["passage_id"])
+    passage_id = random.choice(available)
+    text = subset[subset["passage_id"] == passage_id]["text"].iloc[0]
+    return passage_id, text
+
+# --- ログ追記 & Push ---
 def log_to_csv_and_push(entry):
     df = pd.DataFrame([entry])
     if os.path.exists(LOG_FILE):
@@ -88,49 +99,70 @@ def log_to_csv_and_push(entry):
     tmp_dir = tempfile.mkdtemp()
     tmp_path = os.path.join(tmp_dir, "data.parquet")
     all_logs.to_parquet(tmp_path)
+
     dataset = Dataset.from_parquet(tmp_path)
     dataset.push_to_hub(DATASET_REPO, token=HF_TOKEN)
 
-# --- 状態 ---
-used_passages = set()
-question_count = 0
-MAX_QUESTIONS = 5
-current_user_id = None
-action_log = []
-
-# --- テスト開始 ---
-def start_test(user_input_id):
+# --- 開始ボタン動作 ---
+def start_test(student_id):
     global used_passages, question_count, current_user_id, action_log
     used_passages = set()
     question_count = 0
     action_log = []
 
-    # ユーザーIDが空 → uuid割当
-    current_user_id = user_input_id.strip() if user_input_id else str(uuid.uuid4())
+    if not student_id or student_id.strip() == "":
+        return (
+            "", "", 0, "", "",
+            "⚠️ Student ID must be entered before starting.",
+            False, "", "", ""
+        )
+
+    current_user_id = student_id.strip()
 
     level = 850
     passage_id, text = get_passage(level)
     used_passages.add(passage_id)
 
     question = generate_question(text)
-
     displayed_time = datetime.utcnow() + timedelta(hours=9)
-    action_log.append({"action": "displayed", "time": displayed_time.isoformat(), "question_number": 1})
 
-    return text, question, level, passage_id, "", "", True, displayed_time.isoformat(), current_user_id
+    return (
+        text, question, level, passage_id, "",
+        "", True, displayed_time.isoformat(), 1, current_user_id
+    )
+
+# --- 選択肢変更イベント（ここで操作履歴を保存） ---
+def log_choice_change(choice, question_number, user_id):
+    global action_log
+    if choice:
+        action_log.append({
+            "action": "choice",
+            "choice": choice,
+            "time": (datetime.utcnow() + timedelta(hours=9)).isoformat(),
+            "question_number": question_number,
+            "user_id": user_id
+        })
+    return
 
 # --- 回答送信 ---
-def next_step(prev_level, user_answer, question_text, passage_text, displayed_time, user_id, passage_id):
+def next_step(prev_level, user_answer, question_text, passage_text,
+              displayed_time, question_number, user_id, passage_id):
+
     global question_count, used_passages, action_log
 
     if not user_answer:
-        return "⚠️ Please select an answer!", passage_text, question_text, prev_level, None, "", True, displayed_time, user_id, passage_id
+        return (
+            "⚠️ Please select an answer!", passage_text, question_text, prev_level,
+            None, "", True, displayed_time, question_number, user_id, passage_id
+        )
 
-    question_count += 1
     submit_time = datetime.utcnow() + timedelta(hours=9)
+    question_count += 1
+
     correct = check_answer_with_ai(passage_text, question_text, user_answer)
+    new_level = adaptive_test(prev_level, correct)
 
-    # ログ書き込み（回答送信時のみ）
+    # --- ✅ ログ保存 (actionsに選択履歴がすべて入る)
     entry = {
         "user_id": user_id,
         "question_number": question_count,
@@ -141,65 +173,99 @@ def next_step(prev_level, user_answer, question_text, passage_text, displayed_ti
         "correct": correct,
         "displayed_time": displayed_time,
         "submit_time": submit_time.strftime("%Y-%m-%d %H:%M:%S"),
-        "actions": json.dumps(action_log, ensure_ascii=False),
+        "actions": json.dumps(action_log, ensure_ascii=False)
     }
     log_to_csv_and_push(entry)
 
-    new_level = adaptive_test(prev_level, correct)
-    feedback = "✅ Correct!" if correct else "❌ Incorrect."
-
-    # 終了
-    if question_count >= MAX_QUESTIONS:
-        return f"🎯 Test finished!\nYour reading level: **{new_level}L**", "", "", new_level, None, "", False, "", user_id, passage_id
-
-    # 次の問題へ
-    candidates = passages_df[passages_df["lexile_level"] == new_level]
-    available = [pid for pid in candidates["passage_id"] if pid not in used_passages]
-    if not available:
-        available = list(candidates["passage_id"])
+    # ✅ 最終問題なら結果だけ大きく表示
+    if question_count >= 5:
+        return (
+            f"<h1>🎯 Your Lexile Score: <strong>{new_level}L</strong></h1>",
+            "", "", new_level,
+            None, "", False, "", "", user_id, passage_id
+        )
 
-    next_passage_id = random.choice(available)
-    next_text = passages_df[passages_df["passage_id"] == next_passage_id]["text"].iloc[0]
+    # --- 次の問題へ ---
+    next_passage_id, next_text = get_passage(new_level)
     used_passages.add(next_passage_id)
 
     next_question = generate_question(next_text)
     next_display_time = datetime.utcnow() + timedelta(hours=9)
 
-    action_log = [{"action": "displayed", "time": next_display_time.isoformat(), "question_number": question_count+1}]
+    # ✅ 新しい問題のために選択操作ログをリセット
+    action_log = []
+
+    feedback = "✅ Correct!" if correct else "❌ Incorrect."
 
-    return feedback + "\n➡️ Loading next question…", next_text, next_question, new_level, None, "", True, next_display_time.isoformat(), user_id, next_passage_id
+    return (
+        feedback + "\n➡️ Loading next question…",
+        next_text, next_question, new_level,
+        None, "", True, next_display_time.isoformat(), question_count + 1, user_id, next_passage_id
+    )
 
 # --- Gradio UI ---
 with gr.Blocks() as demo:
-    gr.Markdown("# 📘 Lexile Adaptive Reading Test")
+    gr.Markdown("# 📘 Lexile Level Test")
 
-    user_input_id = gr.Textbox(label="Enter your Student ID", placeholder="e.g. 2025012")
+    student_id_input = gr.Textbox(label="Student ID", placeholder="e.g. S123456")
     start_btn = gr.Button("▶️ Start Test")
 
-    text_display = gr.Textbox(label="Reading Passage", lines=6, interactive=False)
-    question_display = gr.Textbox(label="Question", lines=7, interactive=False)
-    answer_box = gr.Radio(choices=["A", "B", "C", "D"], label="Select Answer")
+    text_display = gr.Textbox(label="Reading Passage", lines=8, 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_display = gr.Markdown()
+
     hidden_level = gr.Number(visible=False)
-    hidden_passage_id = gr.Textbox(visible=False)
-    test_visible = gr.State(True)
+    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(
         fn=start_test,
-        inputs=[user_input_id],
-        outputs=[text_display, question_display, hidden_level, hidden_passage_id, answer_box,
-                 feedback_display, test_visible, hidden_display_time, hidden_user_id]
+        inputs=[student_id_input],
+        outputs=[
+            text_display, question_display, hidden_level, hidden_passage_id, user_answer,
+            feedback_display, test_visible, hidden_display_time,
+            hidden_question_number, hidden_user_id
+        ]
+    )
+
+    # ✅ 選択肢変更ログ
+    user_answer.change(
+        fn=log_choice_change,
+        inputs=[user_answer, hidden_question_number, hidden_user_id],
+        outputs=[]
     )
 
+    # ✅ 回答送信
     submit_btn.click(
         fn=next_step,
-        inputs=[hidden_level, answer_box, question_display, text_display, hidden_display_time, hidden_user_id, hidden_passage_id],
-        outputs=[feedback_display, text_display, question_display, hidden_level, answer_box,
-                 hidden_passage_id, test_visible, hidden_display_time, hidden_user_id, hidden_passage_id]
+        inputs=[hidden_level, user_answer, question_display, text_display,
+                hidden_display_time, hidden_question_number, hidden_user_id, hidden_passage_id],
+        outputs=[
+            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
+        ]
+    )
+
+    # ✅ 表示のON/OFF制御
+    def toggle_visibility(show):
+        v = bool(show)
+        return (
+            gr.update(visible=v), gr.update(visible=v),
+            gr.update(visible=v), gr.update(visible=v)
+        )
+
+    test_visible.change(
+        fn=toggle_visibility,
+        inputs=test_visible,
+        outputs=[text_display, question_display, user_answer, submit_btn]
     )
 
 demo.launch()