Update app.py

app.py

@@ -1,52 +1,34 @@
 import gradio as gr
-import random
-import json
 from openai import OpenAI
+import random
 
-# ✅ APIキーをここに直接指定
+# ✅ OpenRouter APIキー（ここに直接書く）
 API_KEY = "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"
+BASE_URL = "https://openrouter.ai/api/v1"
+
+# --- Lexile難易度別教材 ---
+texts = {
+    300: "Tom has a red ball. He plays with it in the park. The sun is bright.",
+    600: "A young boy found a lost puppy near the river. He decided to take care of it.",
+    850: "Sarah enjoyed reading stories about ancient civilizations and their discoveries.",
+    1050: "The scientist developed a new hypothesis about the evolution of animal behavior.",
+    1250: "Philosophers have long debated the intricate relationship between free will and determinism."
+}
 
-# ✅ OpenRouterクライアント設定
+levels = [300, 600, 850, 1050, 1250]
+
+# --- OpenAIクライアント設定 ---
 client = OpenAI(
-    base_url="https://openrouter.ai/api/v1",
+    base_url=BASE_URL,
     api_key=API_KEY
 )
 
-# ===== Lexileレベルごとの教材 =====
-materials = {
-    300: [
-        "The cat is on the mat.",
-        "A boy runs in the park.",
-        "She has a red apple."
-    ],
-    600: [
-        "The young girl likes to read books after school.",
-        "A small bird made a nest in the tree near the house.",
-        "The sun sets behind the mountains every evening."
-    ],
-    850: [
-        "Many students find mathematics both challenging and rewarding.",
-        "Farmers often depend on weather forecasts to plan their work.",
-        "The history of flight began with dreams of human wings."
-    ],
-    1050: [
-        "Scientific discoveries often arise from unexpected observations.",
-        "Economic systems rely on trust between consumers and producers.",
-        "The poet’s work explores the relationship between nature and emotion."
-    ],
-    1250: [
-        "Philosophical inquiry seeks to understand the foundations of knowledge and ethics.",
-        "Technological innovation continuously reshapes modern societies.",
-        "Globalization has transformed the way nations interact politically and economically."
-    ]
-}
-
-# ===== 問題生成 =====
+# --- AIに問題生成を依頼 ---
 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 in the format below.
-    Return ONLY in this format:
+    Clearly mark the correct answer with an asterisk (*).
+    The format must be:
 
     Q: <question text>
     A. <option>
@@ -65,101 +47,87 @@ def generate_question(text):
         max_tokens=400,
         temperature=0.7,
     )
-    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
-
+    return response.choices[0].message.content.strip()
+
+# --- 適応型テストの進行 ---
+def adaptive_test(prev_level, prev_correct):
+    idx = levels.index(prev_level)
+    if prev_correct and idx < len(levels) - 1:
+        new_level = levels[idx + 1]
+    elif not prev_correct and idx > 0:
+        new_level = levels[idx - 1]
+    else:
+        new_level = prev_level
+    return new_level
 
-# ===== テスト初期化 =====
+# --- テスト開始 ---
 def start_test():
-    state = {
-        "level": 850,  # 初期レベル（中間）
-        "asked": [],
-        "score": 0,
-        "count": 0
-    }
-    return state, "✅ Test started! Please read the passage carefully.", "", "", [], ""
-
-# ===== 最初の問題を取得 =====
-def get_first_question(state):
-    text = random.choice(materials[state["level"]])
-    state["asked"].append(text)
-    q = generate_question(text)
-    state["current_q"] = q
-    return state, text, q["question"], "", q["choices"], ""
-
-# ===== 回答処理 =====
-def next_step(state, user_choice):
-    if not state or "current_q" not in state:
-        return state, "Please start the test first.", "", "", [], ""
-
-    correct = user_choice == state["current_q"]["answer"]
-    feedback = "✅ Correct!" if correct else f"❌ Incorrect. The correct answer was {state['current_q']['answer']}."
-
-    # レベル変動
-    if correct:
-        state["level"] = min(1250, state["level"] + 250)
-        state["score"] += 1
+    level = 850  # 中間レベルから開始
+    text = texts[level]
+    question = generate_question(text)
+    return f"Lexile: {level}L", text, question, level, None, ""
+
+# --- 回答を処理して次へ ---
+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
+
+    correct = (user_answer == correct_option)
+
+    # レベルを更新
+    new_level = adaptive_test(prev_level, correct)
+    new_text = texts[new_level]
+    new_question = generate_question(new_text)
+
+    feedback = "✅ Correct!" if correct else "❌ Incorrect."
+    if new_level == prev_level:
+        feedback += f"\n🎯 Your estimated reading level is **{new_level}L** (final)."
     else:
-        state["level"] = max(300, state["level"] - 250)
-
-    state["count"] += 1
-
-    # 5問で終了
-    if state["count"] >= 5:
-        result = f"🎯 Test finished! Your estimated reading ability corresponds to approximately {state['level']}L."
-        return state, result, "", "", [], ""
-
-    # 新しい教材を重複なしで選択
-    available = [t for t in materials[state["level"]] if t not in state["asked"]]
-    if not available:
-        available = materials[state["level"]]
-    text = random.choice(available)
-    state["asked"].append(text)
+        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をリセット
+        ""
+    )
 
-    q = generate_question(text)
-    state["current_q"] = q
+# --- Gradio UI ---
+with gr.Blocks() as demo:
+    gr.Markdown("# 📘 Adaptive Reading Level Test (Lexile-based)")
 
-    # 次の問題を返す（選択肢リセット）
-    return state, text, q["question"], "", q["choices"], feedback
+    start_btn = gr.Button("▶️ Start Test")
 
-# ===== Gradio UI =====
-with gr.Blocks() as demo:
-    gr.Markdown("## 📘 Adaptive Reading Test")
+    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)
 
-    state = gr.State()
-    passage = gr.Textbox(label="Reading Passage", lines=6, interactive=False)
-    question = gr.Textbox(label="Question", lines=2, interactive=False)
-    feedback = gr.Textbox(label="Feedback", lines=2, interactive=False)
-    choices = gr.Radio(label="Your Answer", choices=["A", "B", "C", "D"], value=None)
-    msg = gr.Textbox(label="Message", lines=2, interactive=False)
+    user_answer = gr.Radio(choices=["A", "B", "C", "D"], label="Your Answer")
+    submit_btn = gr.Button("Submit Answer")
 
-    with gr.Row():
-        start_btn = gr.Button("▶️ Start Test")
-        next_btn = gr.Button("➡️ Submit & Next")
+    feedback_display = gr.Markdown()
+    hidden_level = gr.Number(visible=False)
 
-    # スタートボタン
+    # --- Start Test ---
     start_btn.click(
-        start_test,
-        outputs=[state, msg, passage, question, choices, feedback]
-    ).then(
-        get_first_question,
-        inputs=state,
-        outputs=[state, passage, question, choices, feedback]
+        fn=start_test,
+        inputs=[],
+        outputs=[level_display, text_display, question_display, hidden_level, user_answer, feedback_display]
     )
 
-    # 次の問題ボタン
-    next_btn.click(
-        next_step,
-        inputs=[state, choices],
-        outputs=[state, passage, question, choices, feedback, msg]
+    # --- 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]
     )
 
-demo.launch(share=True)
+demo.launch()