Update app.py

app.py

@@ -1,8 +1,9 @@
 import gradio as gr
 from openai import OpenAI
 import random
+import re
 
-# ✅ OpenRouter APIキー（ここに直接書く）
+# ✅ OpenRouter APIキーをここに直接書く
 API_KEY = "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"
 BASE_URL = "https://openrouter.ai/api/v1"
 
@@ -27,8 +28,8 @@ client = OpenAI(
 def generate_question(text):
     prompt = f"""
     Read the following passage and generate ONE multiple-choice question with 4 options (A–D).
-    Clearly mark the correct answer with an asterisk (*).
-    The format must be:
+    Clearly mark the correct answer in the format below.
+    Return ONLY in this format:
 
     Q: <question text>
     A. <option>
@@ -47,9 +48,18 @@ def generate_question(text):
         max_tokens=400,
         temperature=0.7,
     )
-    return response.choices[0].message.content.strip()
+    full_output = response.choices[0].message.content.strip()
 
-# --- 適応型テストの進行 ---
+    # --- 正解を抽出 ---
+    match = re.search(r"Correct:\s*([A-D])", full_output, re.IGNORECASE)
+    correct_option = match.group(1).upper() if match else None
+
+    # --- 「Correct:」行を削除して受験者には非表示にする ---
+    visible_question = re.sub(r"(?i)Correct:\s*[A-D]", "", full_output).strip()
+
+    return visible_question, correct_option
+
+# --- 適応型ロジック ---
 def adaptive_test(prev_level, prev_correct):
     idx = levels.index(prev_level)
     if prev_correct and idx < len(levels) - 1:
@@ -64,24 +74,15 @@ def adaptive_test(prev_level, prev_correct):
 def start_test():
     level = 850  # 中間レベルから開始
     text = texts[level]
-    question = generate_question(text)
-    return f"Lexile: {level}L", text, question, level, None, ""
+    question, correct = generate_question(text)
+    return f"Lexile: {level}L", text, question, level, correct, "", ""
 
 # --- 回答を処理して次へ ---
-def next_step(prev_level, user_answer, question_text):
-    # 正解の抽出
-    correct_option = None
-    for line in question_text.splitlines():
-        if line.lower().startswith("correct:"):
-            correct_option = line.split(":")[1].strip().upper()
-            break
-
+def next_step(prev_level, user_answer, correct_option):
     correct = (user_answer == correct_option)
-
-    # レベルを更新
     new_level = adaptive_test(prev_level, correct)
     new_text = texts[new_level]
-    new_question = generate_question(new_text)
+    new_question, new_correct = generate_question(new_text)
 
     feedback = "✅ Correct!" if correct else "❌ Incorrect."
     if new_level == prev_level:
@@ -89,14 +90,15 @@ def next_step(prev_level, user_answer, question_text):
     else:
         feedback += f"\n➡️ Moving to next level: **{new_level}L**"
 
-    # 回答欄をリセットするために "" を返す
+    # 回答欄をリセット
     return (
         feedback,
         f"Lexile: {new_level}L",
         new_text,
         new_question,
         new_level,
-        None,  # user_answerをリセット
+        new_correct,
+        None,  # user_answerリセット
         ""
     )
 
@@ -108,26 +110,44 @@ with gr.Blocks() as demo:
 
     level_display = gr.Textbox(label="Current Level", interactive=False)
     text_display = gr.Textbox(label="Reading Passage", lines=6, interactive=False)
-    question_display = gr.Textbox(label="Generated Question", lines=8, interactive=False)
+    question_display = gr.Textbox(label="Question", lines=8, interactive=False)
 
     user_answer = gr.Radio(choices=["A", "B", "C", "D"], label="Your Answer")
     submit_btn = gr.Button("Submit Answer")
 
     feedback_display = gr.Markdown()
     hidden_level = gr.Number(visible=False)
+    hidden_correct = gr.Textbox(visible=False)
 
     # --- Start Test ---
     start_btn.click(
         fn=start_test,
         inputs=[],
-        outputs=[level_display, text_display, question_display, hidden_level, user_answer, feedback_display]
+        outputs=[
+            level_display,
+            text_display,
+            question_display,
+            hidden_level,
+            hidden_correct,
+            user_answer,
+            feedback_display,
+        ],
     )
 
     # --- Submit & Move to Next ---
     submit_btn.click(
         fn=next_step,
-        inputs=[hidden_level, user_answer, question_display],
-        outputs=[feedback_display, level_display, text_display, question_display, hidden_level, user_answer, feedback_display]
+        inputs=[hidden_level, user_answer, hidden_correct],
+        outputs=[
+            feedback_display,
+            level_display,
+            text_display,
+            question_display,
+            hidden_level,
+            hidden_correct,
+            user_answer,
+            feedback_display,
+        ],
     )
 
 demo.launch()