Update app.py

app.py

@@ -2,11 +2,11 @@ import gradio as gr
 from openai import OpenAI
 import random
 
-# ✅ OpenRouter APIキーを直接設定（Hugging Face Secretに置き換える場合は os.getenv() 推奨）
-API_KEY = "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"
+# ✅ OpenRouter APIキー（ここに直接書く）
+API_KEY = "sk-or-v1-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 BASE_URL = "https://openrouter.ai/api/v1"
 
-# Lexile難易度別教材
+# --- 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.",
@@ -17,28 +17,39 @@ texts = {
 
 levels = [300, 600, 850, 1050, 1250]
 
+# --- OpenAIクライアント設定 ---
 client = OpenAI(
     base_url=BASE_URL,
     api_key=API_KEY
 )
 
-# --- AIによる問題生成 ---
+# --- AIに問題生成を依頼 ---
 def generate_question(text):
     prompt = f"""
     Read the following passage and generate ONE multiple-choice question with 4 options (A–D).
-    Mark the correct answer with an asterisk (*). Use concise English.
+    Clearly mark the correct answer with an asterisk (*).
+    The format must be:
+
+    Q: <question text>
+    A. <option>
+    B. <option>
+    C. <option>
+    D. <option>
+    Correct: <A/B/C/D>
 
     Passage:
     {text}
     """
+
     response = client.chat.completions.create(
         model="google/gemma-3-27b-it:free",
         messages=[{"role": "user", "content": prompt}],
-        max_tokens=300
+        max_tokens=400,
+        temperature=0.7,
     )
     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:
@@ -47,37 +58,47 @@ def adaptive_test(prev_level, prev_correct):
         new_level = levels[idx - 1]
     else:
         new_level = prev_level
-
-    text = texts[new_level]
-    question = generate_question(text)
-    return new_level, text, question
+    return new_level
 
 # --- テスト開始 ---
 def start_test():
-    level = 850  # 真ん中から開始
+    level = 850  # 中間レベルから開始
     text = texts[level]
     question = generate_question(text)
-    return f"Lexile: {level}L", text, question, level
+    return f"Lexile: {level}L", text, question, level, None, ""
 
-# --- 回答処理 ---
+# --- 回答を処理して次へ ---
 def next_step(prev_level, user_answer, question_text):
     # 正解の抽出
-    lines = question_text.split("\n")
     correct_option = None
-    for line in lines:
-        if "*" in line:
-            correct_option = line.replace("*", "").split(".")[0].strip().upper()
+    for line in question_text.splitlines():
+        if line.lower().startswith("correct:"):
+            correct_option = line.split(":")[1].strip().upper()
             break
 
-    correct = (user_answer.strip().upper() == correct_option)
-    new_level, new_text, new_question = adaptive_test(prev_level, correct)
+    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\n🎯 Your estimated reading level is **{new_level}L**."
-        return feedback, "", "", new_level
+        feedback += f"\n🎯 Your estimated reading level is **{new_level}L** (final)."
     else:
-        return feedback, new_text, new_question, new_level
+        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をリセット
+        ""
+    )
 
 # --- Gradio UI ---
 with gr.Blocks() as demo:
@@ -85,26 +106,28 @@ with gr.Blocks() as demo:
 
     start_btn = gr.Button("▶️ Start Test")
 
-    level_display = gr.Textbox(label="Current Level")
-    text_display = gr.Textbox(label="Reading Passage")
-    question_display = gr.Textbox(label="Question (A–D)", lines=8)
+    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)
 
-    user_answer = gr.Textbox(label="Your Answer (A–D)")
-    submit_btn = gr.Button("Next")
+    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)
 
+    # --- Start Test ---
     start_btn.click(
         fn=start_test,
         inputs=[],
-        outputs=[level_display, text_display, question_display, hidden_level]
+        outputs=[level_display, text_display, question_display, hidden_level, user_answer, feedback_display]
     )
 
+    # --- Submit & Move to Next ---
     submit_btn.click(
         fn=next_step,
         inputs=[hidden_level, user_answer, question_display],
-        outputs=[feedback_display, text_display, question_display, hidden_level]
+        outputs=[feedback_display, level_display, text_display, question_display, hidden_level, user_answer, feedback_display]
     )
 
 demo.launch()