Update app.py

app.py

@@ -6,22 +6,42 @@ import random
 API_KEY = "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"
 BASE_URL = "https://openrouter.ai/api/v1"
 
-# --- Lexile難易度別教材 ---
+# --- Lexile難易度別教材（各3文） ---
 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."
+    300: [
+        "Tom has a red ball. He plays with it in the park. The sun is bright.",
+        "A dog runs after a stick. The boy laughs as the dog brings it back.",
+        "The girl eats an apple under the tree while the wind blows softly."
+    ],
+    600: [
+        "A young boy found a lost puppy near the river. He decided to take care of it.",
+        "Mary saw a rainbow after the rain stopped and felt happy.",
+        "The teacher asked the students to write a short story about friendship."
+    ],
+    850: [
+        "Sarah enjoyed reading stories about ancient civilizations and their discoveries.",
+        "During the festival, people decorated the streets with lights and music.",
+        "James wanted to learn how airplanes could stay in the sky for so long."
+    ],
+    1050: [
+        "The scientist developed a new hypothesis about the evolution of animal behavior.",
+        "Farmers began to adopt sustainable methods to protect soil health.",
+        "A historian analyzed old letters to understand social changes during the war."
+    ],
+    1250: [
+        "Philosophers have long debated the intricate relationship between free will and determinism.",
+        "Modern architecture often reflects both functionality and aesthetic simplicity.",
+        "Researchers in neuroscience continue to explore how memory is formed and stored."
+    ]
 }
 
 levels = [300, 600, 850, 1050, 1250]
 
 # --- OpenAIクライアント設定 ---
-client = OpenAI(
-    base_url=BASE_URL,
-    api_key=API_KEY
-)
+client = OpenAI(base_url=BASE_URL, api_key=API_KEY)
+
+# --- 出題済みテキストを管理するセット ---
+used_texts = set()
 
 # --- AIに問題生成を依頼 ---
 def generate_question(text):
@@ -35,7 +55,6 @@ def generate_question(text):
     B. <option>
     C. <option>
     D. <option>
-    Correct: <A/B/C/D>
 
     Passage:
     {text}
@@ -47,7 +66,27 @@ def generate_question(text):
         max_tokens=400,
         temperature=0.7,
     )
-    return response.choices[0].message.content.strip()
+    raw_output = response.choices[0].message.content.strip()
+
+    # --- 正解の抽出 ---
+    correct_option = None
+    for line in raw_output.splitlines():
+        if line.lower().startswith("correct:"):
+            correct_option = line.split(":")[1].strip().upper()
+            break
+
+    # --- アスタリスク除去（*印があっても削除） ---
+    cleaned_lines = []
+    for line in raw_output.splitlines():
+        if "*" in line:
+            line = line.replace("*", "").strip()
+        # Correct行は表示しない
+        if not line.lower().startswith("correct:"):
+            cleaned_lines.append(line)
+
+    cleaned_output = "\n".join(cleaned_lines)
+    return cleaned_output, correct_option
+
 
 # --- 適応型テストの進行 ---
 def adaptive_test(prev_level, prev_correct):
@@ -60,28 +99,39 @@ def adaptive_test(prev_level, prev_correct):
         new_level = prev_level
     return new_level
 
+
+# --- 未使用の文章を取得 ---
+def get_unused_text(level):
+    available = [t for t in texts[level] if (level, t) not in used_texts]
+    if not available:
+        # すべて使った場合はリセット
+        used_texts.clear()
+        available = texts[level]
+    chosen = random.choice(available)
+    used_texts.add((level, chosen))
+    return chosen
+
+
 # --- テスト開始 ---
 def start_test():
     level = 850  # 中間レベルから開始
-    text = texts[level]
-    question = generate_question(text)
-    return f"Lexile: {level}L", text, question, level, None, ""
+    text = get_unused_text(level)
+    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, question_text, correct_option):
+    if correct_option is None:
+        feedback = "⚠️ No correct answer found in the generated question."
+        return feedback, f"Lexile: {prev_level}L", "", "", prev_level, None, ""
 
     correct = (user_answer == correct_option)
 
     # レベルを更新
     new_level = adaptive_test(prev_level, correct)
-    new_text = texts[new_level]
-    new_question = generate_question(new_text)
+    new_text = get_unused_text(new_level)
+    new_question, new_correct = generate_question(new_text)
 
     feedback = "✅ Correct!" if correct else "❌ Incorrect."
     if new_level == prev_level:
@@ -89,17 +139,17 @@ 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,
         ""
     )
 
+
 # --- Gradio UI ---
 with gr.Blocks() as demo:
     gr.Markdown("# 📘 Adaptive Reading Level Test (Lexile-based)")
@@ -115,19 +165,35 @@ with gr.Blocks() as demo:
 
     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,
+            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, question_display, hidden_correct],
+        outputs=[
+            feedback_display,
+            level_display,
+            text_display,
+            question_display,
+            hidden_level,
+            hidden_correct,
+            feedback_display,
+        ],
     )
 
 demo.launch()