Update app.py

app.py

@@ -1,153 +1,138 @@
 import gradio as gr
-from openai import OpenAI
 import random
-import re
-
-# ✅ 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."
-}
-
-levels = [300, 600, 850, 1050, 1250]
+from openai import OpenAI
 
-# --- OpenAIクライアント設定 ---
-client = OpenAI(
-    base_url=BASE_URL,
-    api_key=API_KEY
-)
+# OpenAI APIキーをコード内で指定
+client = OpenAI(api_key="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")
+
+# 各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に問題生成を依頼 ---
+# 問題生成（GPTで作成）
 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:
-
-    Q: <question text>
-    A. <option>
-    B. <option>
-    C. <option>
-    D. <option>
-    Correct: <A/B/C/D>
-
-    Passage:
+    以下の英文に関する英語の読解問題を1問だけ作成してください。
+    問題形式は4択（A〜D）で、答えは1つだけ正しいものにしてください。
+    出力形式はJSONで：
+    {{
+      "question": "質問文",
+      "choices": ["A", "B", "C", "D"],
+      "answer": "A"
+    }}
+    英文:
     {text}
     """
-
-    response = client.chat.completions.create(
-        model="google/gemma-3-27b-it:free",
-        messages=[{"role": "user", "content": prompt}],
-        max_tokens=400,
-        temperature=0.7,
+    response = client.responses.create(
+        model="gpt-4.1-mini",
+        input=prompt
     )
-    full_output = response.choices[0].message.content.strip()
+    try:
+        import json
+        q = json.loads(response.output[0].content[0].text.strip())
+        return q
+    except:
+        return {
+            "question": "Error: failed to generate question.",
+            "choices": ["A", "B", "C", "D"],
+            "answer": "A"
+        }
+
+# 初期設定
+def start_test():
+    return {
+        "level": 850,  # 中間レベルから開始
+        "asked": [],
+        "score": 0,
+        "count": 0
+    }, "Let's begin the adaptive reading test!", "", "", [], ""
+
+# 回答処理
+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"❌ Wrong! The correct answer was {state['current_q']['answer']}."
+
+    # レベル調整
+    if correct:
+        state["level"] = min(1250, state["level"] + 250)
+        state["score"] += 1
+    else:
+        state["level"] = max(300, state["level"] - 250)
 
-    # --- 正解を抽出 ---
-    match = re.search(r"Correct:\s*([A-D])", full_output, re.IGNORECASE)
-    correct_option = match.group(1).upper() if match else None
+    state["count"] += 1
 
-    # --- 「Correct:」行を削除して受験者には非表示にする ---
-    visible_question = re.sub(r"(?i)Correct:\s*[A-D]", "", full_output).strip()
+    # 5問終了で結果表示
+    if state["count"] >= 5:
+        result = f"Test finished! Your estimated reading level: {state['level']}L"
+        return state, result, "", "", [], ""
 
-    return visible_question, correct_option
+    # 新しい教材選択（重複回避）
+    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)
 
-# --- 適応型ロジック ---
-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
+    # 新しい問題生成
+    q = generate_question(text)
+    state["current_q"] = q
 
-# --- テスト開始 ---
-def start_test():
-    level = 850  # 中間レベルから開始
-    text = texts[level]
-    question, correct = generate_question(text)
-    return f"Lexile: {level}L", text, question, level, correct, "", ""
-
-# --- 回答を処理して次へ ---
-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, new_correct = 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:
-        feedback += f"\n➡️ Moving to next level: **{new_level}L**"
-
-    # 回答欄をリセット
-    return (
-        feedback,
-        f"Lexile: {new_level}L",
-        new_text,
-        new_question,
-        new_level,
-        new_correct,
-        None,  # user_answerリセット
-        ""
-    )
+    return state, text, q["question"], "", q["choices"], feedback
 
-# --- Gradio UI ---
+# 最初の問題を出す
+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"], ""
+
+# Gradio UI
 with gr.Blocks() as demo:
-    gr.Markdown("# 📘 Adaptive Reading Level Test (Lexile-based)")
-
-    start_btn = gr.Button("▶️ Start 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="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,
-            hidden_correct,
-            user_answer,
-            feedback_display,
-        ],
-    )
+    gr.Markdown("## 📘 Adaptive Reading Test (Lexile-based, 5 levels)")
 
-    # --- Submit & Move to Next ---
-    submit_btn.click(
-        fn=next_step,
-        inputs=[hidden_level, user_answer, hidden_correct],
-        outputs=[
-            feedback_display,
-            level_display,
-            text_display,
-            question_display,
-            hidden_level,
-            hidden_correct,
-            user_answer,
-            feedback_display,
-        ],
-    )
+    state = gr.State()
+    passage = gr.Textbox(label="Reading Passage", interactive=False)
+    question = gr.Textbox(label="Question", interactive=False)
+    feedback = gr.Textbox(label="Feedback", interactive=False)
+    choices = gr.Radio(label="Your Answer", choices=["A", "B", "C", "D"])
+    msg = gr.Textbox(label="System Message", interactive=False)
+
+    with gr.Row():
+        start_btn = gr.Button("▶️ Start Test")
+        next_btn = gr.Button("➡️ Submit Answer & Next")
+
+    start_btn.click(start_test, outputs=[state, msg, passage, question, choices, feedback])\
+              .then(get_first_question, inputs=state, outputs=[state, passage, question, choices, feedback])
+
+    next_btn.click(next_step, inputs=[state, choices], outputs=[state, passage, question, choices, feedback, msg])
 
-demo.launch()
+demo.launch(share=True)