Update app.py

app.py

@@ -1,11 +1,18 @@
 import gradio as gr
 import random
 from openai import OpenAI
+import json
 
-# OpenAI APIキーをコード内で指定
-client = OpenAI(api_key="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")
+# ✅ ここで直接APIキーを指定
+API_KEY = "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"
 
-# 各Lexileレベルの教材（例として簡単な文を配置）
+# ✅ OpenRouter経由のクライアント設定（base_urlを必ず指定）
+client = OpenAI(
+    base_url="https://openrouter.ai/api/v1",
+    api_key=API_KEY
+)
+
+# ===== Lexileレベル別教材 =====
 materials = {
     300: [
         "The cat is on the mat.",
@@ -34,45 +41,56 @@ materials = {
     ]
 }
 
-# 問題生成（GPTで作成）
+# ===== GPTで問題生成 =====
 def generate_question(text):
     prompt = f"""
-    以下の英文に関する英語の読解問題を1問だけ作成してください。
-    問題形式は4択（A〜D）で、答えは1つだけ正しいものにしてください。
-    出力形式はJSONで：
+    Please create one English reading comprehension question about the following passage.
+    Format the response strictly as JSON in this format:
     {{
-      "question": "質問文",
-      "choices": ["A", "B", "C", "D"],
+      "question": "Question text",
+      "choices": ["A) ...", "B) ...", "C) ...", "D) ..."],
       "answer": "A"
     }}
-    英文:
+    Ensure that the correct answer is NOT explicitly shown or hinted in the question or choices.
+    Passage:
     {text}
     """
-    response = client.responses.create(
-        model="gpt-4.1-mini",
-        input=prompt
-    )
+
     try:
-        import json
-        q = json.loads(response.output[0].content[0].text.strip())
+        response = client.chat.completions.create(
+            model="google/gemma-3-27b-it:free",  # ✅ OpenRouter無料モデル
+            messages=[{"role": "user", "content": prompt}],
+            max_tokens=300
+        )
+        data = response.choices[0].message.content.strip()
+        q = json.loads(data)
         return q
-    except:
+    except Exception as e:
+        print("⚠️ Error generating question:", e)
         return {
-            "question": "Error: failed to generate question.",
-            "choices": ["A", "B", "C", "D"],
+            "question": "Error generating question.",
+            "choices": ["A) ---", "B) ---", "C) ---", "D) ---"],
             "answer": "A"
         }
 
-# 初期設定
+# ===== テスト初期化 =====
 def start_test():
     return {
-        "level": 850,  # 中間レベルから開始
+        "level": 850,
         "asked": [],
         "score": 0,
         "count": 0
-    }, "Let's begin the adaptive reading test!", "", "", [], ""
+    }, "✅ Test started! Beginning from 850L.", "", "", [], ""
+
+# ===== 最初の問題生成 =====
+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.", "", "", [], ""
@@ -80,7 +98,7 @@ def next_step(state, user_choice):
     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
@@ -89,35 +107,26 @@ def next_step(state, user_choice):
 
     state["count"] += 1
 
-    # 5問終了で結果表示
+    # 5問で終了
     if state["count"] >= 5:
-        result = f"Test finished! Your estimated reading level: {state['level']}L"
+        result = f"🎯 Test finished! Your estimated reading level: {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)
 
-    # 新しい問題生成
     q = generate_question(text)
     state["current_q"] = q
 
     return state, text, q["question"], "", q["choices"], feedback
 
-# 最初の問題を出す
-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
+# ===== Gradio UI =====
 with gr.Blocks() as demo:
-    gr.Markdown("## 📘 Adaptive Reading Test (Lexile-based, 5 levels)")
+    gr.Markdown("## 📘 Adaptive Reading Test (Lexile-based, 5 questions)")
 
     state = gr.State()
     passage = gr.Textbox(label="Reading Passage", interactive=False)
@@ -128,11 +137,12 @@ with gr.Blocks() as demo:
 
     with gr.Row():
         start_btn = gr.Button("▶️ Start Test")
-        next_btn = gr.Button("➡️ Submit Answer & Next")
+        next_btn = gr.Button("➡️ Submit & 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])
+    next_btn.click(next_step, inputs=[state, choices],
+                   outputs=[state, passage, question, choices, feedback, msg])
 
 demo.launch(share=True)