Update app.py

app.py

@@ -44,35 +44,38 @@ materials = {
 # ===== 問題生成 =====
 def generate_question(text):
     prompt = f"""
-    Please create one English reading comprehension question about the following passage.
-    Format your output strictly as JSON like this:
-    {{
-      "question": "Question text",
-      "choices": ["A) ...", "B) ...", "C) ...", "D) ..."],
-      "answer": "A"
-    }}
-    The correct answer must not be explicitly revealed in the choices or question text.
+    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:
     {text}
     """
 
-    try:
-        response = client.chat.completions.create(
-            model="google/gemma-3-27b-it:free",
-            messages=[{"role": "user", "content": prompt}],
-            max_tokens=300,
-            temperature=0.7
-        )
-        data = response.choices[0].message.content.strip()
-        q = json.loads(data)
-        return q
-    except Exception as e:
-        print("⚠️ Error generating question:", e)
-        return {
-            "question": "Error generating question.",
-            "choices": ["A) ---", "B) ---", "C) ---", "D) ---"],
-            "answer": "A"
-        }
+    response = client.chat.completions.create(
+        model="google/gemma-3-27b-it:free",
+        messages=[{"role": "user", "content": prompt}],
+        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
+
 
 # ===== テスト初期化 =====
 def start_test():