Update app.py

app.py

@@ -18,6 +18,7 @@ ADMIN_PASSWORD = os.getenv("ADMIN_PASSWORD", "0421")
 client = OpenAI(base_url=BASE_URL, api_key=API_KEY)
 
 # --- 外部CSVとして管理する passage データ ---
+# passage.csv: passage_id,level,text,question,choices,answer の順
 passages_df = pd.read_csv("passage.csv")
 
 levels = [1, 2, 3, 4, 5]
@@ -64,6 +65,8 @@ def _new_session_state():
         "question_count": 0,  # ✅ 採点済み問題数
         "user_id": None,
         "action_log": [],     # ✅ 1問中の選択変更履歴（submit時にまとめて保存）
+        # ✅ CSVから読んだ正解（A/B/C/D）を保持
+        "current_answer": None,
     }
 
 # --- ログ追記（CSVのみ・固定カラムで統一） ---
@@ -95,52 +98,61 @@ def log_event(state: dict, **kwargs):
     entry = {"time": now, "user_id": state.get("user_id"), **kwargs}
     log_to_csv(entry)
 
-# --- AIで問題生成 ---
-def generate_question(text):
-    prompt = f"""
-Read the following passage and create ONE multiple-choice question with 4 options (A–D).
-Only output the question and options.
-Format:
-Q: <question text>
-A. <option>
-B. <option>
-C. <option>
-D. <option>
-Passage:
-{text}
-"""
-    response = client.chat.completions.create(
-        model="google/gemma-3-27b-it:free",
-        messages=[{"role": "user", "content": prompt}],
-        max_tokens=250,
-        temperature=0.7,
-    )
-    return response.choices[0].message.content.strip()
-
-# --- 正誤判定 ---
-def check_answer_with_ai(text, question, user_answer):
-    prompt = f"""
-Read the passage and question below. Decide if the user's answer is correct.
-Passage:
-{text}
-Question:
-{question}
-User Answer: {user_answer}
-Respond with one word: "Correct" or "Incorrect".
-"""
-    response = client.chat.completions.create(
-        model="google/gemma-3-27b-it:free",
-        messages=[{"role": "user", "content": prompt}],
-        max_tokens=10,
-        temperature=0,
-    )
-    result = response.choices[0].message.content.strip().lower()
-
-    if re.search(r"\bincorrect\b", result):
-        return False
-    if re.search(r"\bcorrect\b", result):
-        return True
-    return False
+# =========================
+# ✅ choices列を柔軟にパース
+#   - JSON配列: ["...", "...", "...", "..."]
+#   - 改行区切り / | / || / ; などにも対応（できるだけ）
+# =========================
+def _parse_choices(raw):
+    if raw is None:
+        return []
+    s = str(raw).strip()
+    if s == "":
+        return []
+    # JSONっぽい場合
+    if (s.startswith("[") and s.endswith("]")) or (s.startswith("{") and s.endswith("}")):
+        try:
+            obj = json.loads(s)
+            if isinstance(obj, list):
+                return [str(x).strip() for x in obj]
+        except Exception:
+            pass
+
+    # それ以外は区切り推定
+    # 優先: 改行 -> || -> | -> ; -> ,
+    if "\n" in s:
+        parts = [p.strip() for p in s.split("\n") if p.strip()]
+        return parts
+    if "||" in s:
+        parts = [p.strip() for p in s.split("||") if p.strip()]
+        return parts
+    if "|" in s:
+        parts = [p.strip() for p in s.split("|") if p.strip()]
+        return parts
+    if ";" in s:
+        parts = [p.strip() for p in s.split(";") if p.strip()]
+        return parts
+    if "," in s:
+        parts = [p.strip() for p in s.split(",") if p.strip()]
+        return parts
+
+    return [s]
+
+def _format_question_block(question, choices_list):
+    # choices を A-D に整形して question_display に入れる
+    labels = ["A", "B", "C", "D"]
+    # 4つ未満/超過でも崩れにくくする
+    choices = list(choices_list)[:4]
+    while len(choices) < 4:
+        choices.append("")
+
+    lines = []
+    q = "" if question is None else str(question).strip()
+    lines.append(f"Q: {q}")
+    for lab, opt in zip(labels, choices):
+        opt_s = "" if opt is None else str(opt).strip()
+        lines.append(f"{lab}. {opt_s}")
+    return "\n".join(lines)
 
 # --- 自動難易度調整 ---
 def adaptive_test(prev_level, prev_correct):
@@ -151,15 +163,29 @@ def adaptive_test(prev_level, prev_correct):
         return levels[idx - 1]
     return prev_level
 
-# --- passage取得 ---
+# --- passage取得（✅ CSVから question/choices/answer も返す） ---
 def get_passage(level, used_passages):
     subset = passages_df[passages_df["level"] == level]
     available = [pid for pid in subset["passage_id"] if pid not in used_passages]
     if not available:
         available = list(subset["passage_id"])
+
     passage_id = random.choice(available)
-    text = subset[subset["passage_id"] == passage_id]["text"].iloc[0]
-    return passage_id, text
+    row = subset[subset["passage_id"] == passage_id].iloc[0]
+
+    text = row["text"]
+    question = row["question"]
+    choices_raw = row["choices"]
+    answer = row["answer"]
+
+    choices_list = _parse_choices(choices_raw)
+    question_block = _format_question_block(question, choices_list)
+
+    # answer は A/B/C/D を想定（念のため整形）
+    ans = "" if answer is None else str(answer).strip().upper()
+    ans = ans[:1]  # "A" など1文字に寄せる
+
+    return passage_id, text, question_block, ans
 
 # --- 開始ボタン動作（✅ start時だけログ） ---
 def start_test(student_id, state):
@@ -176,10 +202,12 @@ def start_test(student_id, state):
     state["user_id"] = student_id.strip()
 
     level = 3
-    passage_id, text = get_passage(level, state["used_passages"])
+    passage_id, text, question_block, ans = get_passage(level, state["used_passages"])
     state["used_passages"].add(passage_id)
 
-    question = generate_question(text)
+    # ✅ この問題の正解を state に保持
+    state["current_answer"] = ans
+
     displayed_time = datetime.utcnow() + timedelta(hours=9)
 
     # ✅ startログ：actions列に "start test pushed" を入れる
@@ -196,7 +224,7 @@ def start_test(student_id, state):
 
     return (
         state,
-        text, question, level, passage_id, None,
+        text, question_block, level, passage_id, None,
         "", True, displayed_time.isoformat(), 1, state["user_id"]
     )
 
@@ -226,7 +254,10 @@ def next_step(prev_level, user_answer, question_text, passage_text,
     submit_time = datetime.utcnow() + timedelta(hours=9)
     state["question_count"] += 1
 
-    correct = check_answer_with_ai(passage_text, question_text, user_answer)
+    # ✅ CSVから読んだ正解（A/B/C/D）と比較（AI採点はしない）
+    correct_answer = (state.get("current_answer") or "").strip().upper()
+    correct = (str(user_answer).strip().upper() == correct_answer)
+
     new_level = adaptive_test(prev_level, correct)
 
     # ✅ submitログ（ここだけ記録）
@@ -252,10 +283,12 @@ def next_step(prev_level, user_answer, question_text, passage_text,
         )
 
     # --- 次の問題へ ---
-    next_passage_id, next_text = get_passage(new_level, state["used_passages"])
+    next_passage_id, next_text, next_question_block, next_ans = get_passage(new_level, state["used_passages"])
     state["used_passages"].add(next_passage_id)
 
-    next_question = generate_question(next_text)
+    # ✅ 次の問題の正解を state に保持
+    state["current_answer"] = next_ans
+
     next_display_time = datetime.utcnow() + timedelta(hours=9)
 
     # ✅ 次の問題のために選択変更履歴をリセット
@@ -266,7 +299,7 @@ def next_step(prev_level, user_answer, question_text, passage_text,
     return (
         state,
         feedback + "\n➡️ Loading next question…",
-        next_text, next_question, new_level,
+        next_text, next_question_block, new_level,
         None, "", True, next_display_time.isoformat(), state["question_count"] + 1, user_id, next_passage_id
     )