Update app.py

app.py

@@ -1,200 +1,100 @@
-import os
-import re
-import json
-import glob
-import time
-import random
-import sqlite3
-import threading
-import tempfile
-import inspect
-from datetime import datetime, timedelta
-
 import gradio as gr
-import pandas as pd
 from openai import OpenAI
 from datasets import Dataset
+from datetime import datetime, timedelta
+import pandas as pd
+import time, os, random, tempfile, json, glob
 
-# =========================
-# Config
-# =========================
+# --- API / HF 設定 ---
 API_KEY = os.getenv("API_KEY")
-BASE_URL = os.getenv("BASE_URL", "https://openrouter.ai/api/v1")
-HF_TOKEN = os.getenv("HF_TOKEN")  # pushするなら必要
-DATASET_REPO = os.getenv("DATASET_REPO", "Toya0421/reading_exercise_logging")
-
-# pushを有効にするか（負荷テスト中は 0 推奨）
-ENABLE_HF_PUSH = os.getenv("ENABLE_HF_PUSH", "0") == "1"
-
-# push間隔（秒）
-PUSH_INTERVAL_SEC = int(os.getenv("PUSH_INTERVAL_SEC", "300"))  # 5分
-# push時に出すparquet一時ファイル名
-PARQUET_NAME = "data.parquet"
-
-LOG_DB = "reading_logs.sqlite"
-CACHE_DIR = "rewrite_cache"
-os.makedirs(CACHE_DIR, exist_ok=True)
+BASE_URL = "https://openrouter.ai/api/v1"
+HF_TOKEN = os.getenv("HF_TOKEN")
+DATASET_REPO = "Toya0421/reading_exercise_logging"
+LOG_FILE = "reading_logs.csv"
 
 client = OpenAI(base_url=BASE_URL, api_key=API_KEY)
 
-# passage_information.xlsx 読み込み
+# --- passage_information.xlsx 読み込み (Text# と flesch_score 使用) ---
 passage_info_df = pd.read_excel("passage_information.xlsx")
 
-# =========================
-# SQLite (WAL) for logs
-# =========================
-_db_lock = threading.Lock()
-_push_lock = threading.Lock()
-
-def init_db():
-    with _db_lock:
-        conn = sqlite3.connect(LOG_DB, check_same_thread=False)
-        conn.execute("PRAGMA journal_mode=WAL;")
-        conn.execute("""
-        CREATE TABLE IF NOT EXISTS logs (
-            id INTEGER PRIMARY KEY AUTOINCREMENT,
-            user_id TEXT,
-            assigned_level INTEGER,
-            passage_id INTEGER,
-            original_level REAL,
-            action_time TEXT,
-            action_type TEXT,
-            page_text TEXT
-        );
-        """)
-        conn.commit()
-        conn.close()
-
-init_db()
-
-def now_jst_iso():
-    return (datetime.utcnow() + timedelta(hours=9)).isoformat()
-
-def save_log(entry: dict):
-    # 1イベント=1INSERT（軽量）
-    with _db_lock:
-        conn = sqlite3.connect(LOG_DB, check_same_thread=False)
-        conn.execute("PRAGMA journal_mode=WAL;")
-        conn.execute("""
-            INSERT INTO logs(user_id, assigned_level, passage_id, original_level, action_time, action_type, page_text)
-            VALUES (?, ?, ?, ?, ?, ?, ?)
-        """, (
-            entry.get("user_id"),
-            entry.get("assigned_level"),
-            entry.get("passage_id"),
-            entry.get("original_level"),
-            entry.get("action_time"),
-            entry.get("action_type"),
-            entry.get("page_text"),
-        ))
-        conn.commit()
-        conn.close()
-
-def export_sqlite_to_parquet(parquet_path: str):
-    # DB全体を読み出してparquet化（pushは低頻度でOK）
-    with _db_lock:
-        conn = sqlite3.connect(LOG_DB, check_same_thread=False)
-        df = pd.read_sql_query("SELECT * FROM logs ORDER BY id ASC", conn)
-        conn.close()
-    df.to_parquet(parquet_path, index=False)
-
-def push_to_hub_if_enabled():
-    if not ENABLE_HF_PUSH:
-        return
-    if not HF_TOKEN:
-        print("[WARN] ENABLE_HF_PUSH=1 ですが HF_TOKEN がありません。pushをスキップします。")
-        return
-
-    # pushが重なると壊れるのでロック
-    if not _push_lock.acquire(blocking=False):
-        return
-    try:
-        tmp_dir = tempfile.mkdtemp()
-        parquet_path = os.path.join(tmp_dir, PARQUET_NAME)
-        export_sqlite_to_parquet(parquet_path)
-        dataset = Dataset.from_parquet(parquet_path)
-        dataset.push_to_hub(DATASET_REPO, token=HF_TOKEN)
-        print(f"[INFO] Pushed logs to hub: {DATASET_REPO} ({len(dataset)} rows)")
-    except Exception as e:
-        print(f"[ERROR] push_to_hub failed: {e}")
-    finally:
-        _push_lock.release()
-
-def start_periodic_pusher():
-    # Spacesはプロセスが1つとは限らないので、push頻度は低め推奨
-    if not ENABLE_HF_PUSH:
-        return
-
-    def loop():
-        while True:
-            time.sleep(PUSH_INTERVAL_SEC)
-            push_to_hub_if_enabled()
-
-    th = threading.Thread(target=loop, daemon=True)
-    th.start()
-
-start_periodic_pusher()
-
-# =========================
-# Passages
-# =========================
-def list_passage_ids():
-    files = glob.glob("passages/pg*.txt")
-    ids = []
-    for f in files:
-        name = os.path.basename(f)
-        num = name.replace("pg", "").replace(".txt", "")
-        if num.isdigit():
-            ids.append(int(num))
-    return sorted(ids)
+# --- 状態変数 ---
+used_passages = set()
+current_user_id = None
+current_level = None
 
-ALL_PASSAGE_IDS = list_passage_ids()
 
-def load_passage_file(text_id: int):
+# ======================================================
+#  新しい教材管理：passages フォルダからランダム選択
+# ======================================================
+
+def load_passage_file(text_id):
+    """
+    passages/pg{text_id}.txt を読み込み、内容を返す。
+    """
     path = f"passages/pg{text_id}.txt"
     if not os.path.exists(path):
         return None
     with open(path, "r", encoding="utf-8") as f:
         return f.read()
 
-def get_new_passage_random(used_passages_list):
-    # used_passages_list: list[int]
-    used = set(used_passages_list or [])
-    if not ALL_PASSAGE_IDS:
-        return None, None, None, []
+def get_new_passage_random():
+    """
+    passages フォルダからランダムに教材を選び（pg◯.txt）、
+    passage_information.xlsx の Text# の flesch_score を original_level として返す。
+    """
+    global used_passages
 
-    available = [pid for pid in ALL_PASSAGE_IDS if pid not in used]
+    # --- pg*.txt を取得 ---
+    files = glob.glob("passages/pg*.txt")
+    if not files:
+        return None, None, None
+
+    # --- ファイル名から Text# (整数) を抽出 ---
+    all_ids = []
+    for f in files:
+        name = os.path.basename(f)
+        num = name.replace("pg", "").replace(".txt", "")
+        if num.isdigit():
+            all_ids.append(int(num))
+
+    # --- 未使用の ID を優先 ---
+    available = [pid for pid in all_ids if pid not in used_passages]
     if not available:
-        used.clear()
-        available = list(ALL_PASSAGE_IDS)
+        used_passages.clear()
+        available = list(all_ids)
 
-    pid = random.choice(available)
-    used.add(pid)
+    # --- ランダムに選択 ---
+    text_id = random.choice(available)
+    used_passages.add(text_id)
 
-    text = load_passage_file(pid)
+    # --- テキスト読み込み ---
+    text = load_passage_file(text_id)
     if text is None:
-        return None, None, None, list(used)
-
-    row = passage_info_df[passage_info_df["Text#"] == pid]
-    orig_level = None if len(row) == 0 else row.iloc[0]["flesch_score"]
-    return pid, text, orig_level, list(used)
-
-# =========================
-# Rewrite (cached)
-# =========================
-def rewrite_cache_path(passage_id: int, level: int):
-    return os.path.join(CACHE_DIR, f"pg{passage_id}_lv{level}.json")
-
-def rewrite_level(text: str, target_level: int, passage_id: int):
-    cpath = rewrite_cache_path(passage_id, target_level)
-    if os.path.exists(cpath):
-        try:
-            with open(cpath, "r", encoding="utf-8") as f:
-                return json.load(f)["rewritten"]
-        except Exception:
-            pass
-
-    level_to_flesch = {1: 90, 2: 70, 3: 55, 4: 40, 5: 25}
+        return None, None, None
+
+    # --- Excel から original_level (flesch_score) を取得 ---
+    row = passage_info_df[passage_info_df["Text#"] == text_id]
+    if len(row) == 0:
+        orig_level = None
+    else:
+        orig_level = row.iloc[0]["flesch_score"]
+
+    return text_id, text, orig_level
+
+
+# ======================================================
+#  Rewrite
+# ======================================================
+
+def rewrite_level(text, target_level):
+    level_to_flesch = {
+        1: 90,
+        2: 70,
+        3: 55,
+        4: 40,
+        5: 25
+    }
+
     target_flesch = level_to_flesch[int(target_level)]
 
     prompt = f"""
@@ -202,9 +102,9 @@ Rewrite the following passage so it fits about {target_flesch} Flesch Reading Ea
 - Extract only the portions of the text that should be read as the main body,
 excluding the title, author name, source information, chapter number, annotations, and footers.
 - When outputting, make sure sections divided by chapters, etc., are clearly distinguishable by leaving a blank line between them.
-- Preserve the original meaning faithfully.
-- Do not add new information or remove essential information.
-- Output only the rewritten passage. Do not include explanations.
+- Preserve the original meaning faithfully. 
+- Do not add new information or remove essential information. 
+- Output only the rewritten passage. Do not include explanations. 
 {text}
 """
 
@@ -212,93 +112,135 @@ excluding the title, author name, source information, chapter number, annotation
         model="google/gemini-2.5-flash",
         messages=[{"role": "user", "content": prompt}],
         temperature=0.4,
-        max_tokens=5000,
+        max_tokens=5000
     )
-    rewritten = resp.choices[0].message.content.strip()
+    return resp.choices[0].message.content.strip()
 
-    try:
-        with open(cpath, "w", encoding="utf-8") as f:
-            json.dump({"rewritten": rewritten}, f, ensure_ascii=False)
-    except Exception:
-        pass
 
-    return rewritten
+import re
 
 def split_pages(text, max_words=300):
+    """
+    文単位でページを分割する。
+    - 文の途中でページを分割しない
+    - max_words の上限を超えないようにする
+    """
+    # 文に分割（. ? ! のあとに改行やスペースが続くパターン）
     sentences = re.split(r'(?<=[.!?])\s+', text.strip())
-    pages, current, wc = [], [], 0
-    for s in sentences:
-        w = s.split()
-        if wc + len(w) > max_words and current:
-            pages.append(" ".join(current))
-            current, wc = [s], len(w)
+    pages = []
+    current_page = []
+    current_word_count = 0
+
+    for sentence in sentences:
+        words = sentence.split()
+        sentence_len = len(words)
+
+        # 次の文を追加すると max_words を超える場合 → 新しいページを作る
+        if current_word_count + sentence_len > max_words:
+            if current_page:
+                pages.append(" ".join(current_page))
+            current_page = [sentence]
+            current_word_count = sentence_len
         else:
-            current.append(s)
-            wc += len(w)
-    if current:
-        pages.append(" ".join(current))
+            current_page.append(sentence)
+            current_word_count += sentence_len
+
+    # 最後のページを追加
+    if current_page:
+        pages.append(" ".join(current_page))
+
     return pages or [text]
 
-# =========================
-# Gradio handlers (stateful per user)
-# state = {"user_id": str|None, "level": int|None, "used_passages": list[int]}
-# =========================
-def start_test(student_id, level_input, state):
-    if state is None:
-        state = {"user_id": None, "level": None, "used_passages": []}
 
-    if not student_id or str(student_id).strip() == "":
-        return (
-            "", "", "[]", 0, 0, "", "", "",
-            gr.update(interactive=False, visible=False),
-            gr.update(interactive=False, visible=False),
-            gr.update(interactive=False, visible=False),
-            state
-        )
+# ======================================================
+#  Save Log
+# ======================================================
+
+def save_log(entry):
+    df = pd.DataFrame([entry])
+    if os.path.exists(LOG_FILE):
+        df.to_csv(LOG_FILE, mode="a", index=False, header=False)
+    else:
+        df.to_csv(LOG_FILE, index=False)
+
+    all_logs = pd.read_csv(LOG_FILE)
+    tmp_dir = tempfile.mkdtemp()
+    tmp_path = os.path.join(tmp_dir, "data.parquet")
+    all_logs.to_parquet(tmp_path)
+    dataset = Dataset.from_parquet(tmp_path)
+    dataset.push_to_hub(DATASET_REPO, token=HF_TOKEN)
 
-    state["user_id"] = str(student_id).strip()
-    state["level"] = int(level_input)
-    state["used_passages"] = []
 
-    save_log({
-        "user_id": state["user_id"],
-        "assigned_level": state["level"],
+# ======================================================
+#  Start
+# ======================================================
+
+def start_test(student_id, level_input):
+    global current_user_id, current_level, used_passages
+    used_passages = set()
+
+    action = "start_pushed"
+    now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
+
+    entry = {
+        "user_id": student_id,
+        "assigned_level": current_level,
         "passage_id": None,
         "original_level": None,
-        "action_time": now_jst_iso(),
-        "action_type": "start_pushed",
+        "action_time": now,
+        "action_type": action,
         "page_text": None
-    })
+    }
+    save_log(entry)
 
-    pid, text, orig_lev, used_list = get_new_passage_random(state["used_passages"])
-    state["used_passages"] = used_list
+    if not student_id or str(student_id).strip() == "":
+        return (
+            "", "", json.dumps([]), 0, "",
+            0, "", None, None,
+            gr.update(interactive=False, visible=False),
+            gr.update(interactive=False, visible=True),
+            gr.update(interactive=False, visible=False)
+        )
 
+    current_user_id = str(student_id).strip()
+    current_level = int(level_input)
+
+    pid, text, orig_lev = get_new_passage_random()
     if text is None:
         return (
-            "教材が見つかりません", "", "[]", 0, 0, "", "", "",
-            gr.update(interactive=False, visible=False),
+            "教材が見つかりません", "", json.dumps([]), 0, "",
+            0, "", None, None,
             gr.update(interactive=False, visible=False),
             gr.update(interactive=False, visible=False),
-            state
+            gr.update(interactive=False, visible=False)
         )
 
-    rewritten = rewrite_level(text, state["level"], pid)
+    rewritten = rewrite_level(text, current_level)
     pages = split_pages(rewritten)
     total = len(pages)
 
-    prev_upd = gr.update(interactive=False, visible=False)
-    next_upd = gr.update(interactive=(total > 1), visible=(total > 1))
-    finish_upd = gr.update(interactive=(total == 1), visible=(total == 1))
-
-    save_log({
-        "user_id": state["user_id"],
-        "assigned_level": state["level"],
+    if total == 1:
+        prev_upd = gr.update(interactive=False, visible=False)
+        next_upd = gr.update(interactive=False, visible=False)
+        finish_upd = gr.update(interactive=True, visible=True)
+    else:
+        prev_upd = gr.update(interactive=False, visible=False)
+        next_upd = gr.update(interactive=True, visible=True)
+        finish_upd = gr.update(interactive=False, visible=False)
+
+    page_num = 1
+    now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
+
+    entry = {
+        "user_id": current_user_id,
+        "assigned_level": current_level,
         "passage_id": pid,
         "original_level": orig_lev,
-        "action_time": now_jst_iso(),
-        "action_type": "page_displayed_1",
+        "action_time": now,
+        "action_type": f"page_displayed_{page_num}",
         "page_text": pages[0]
-    })
+    }
+    save_log(entry)
 
     return (
         pages[0],
@@ -306,147 +248,176 @@ def start_test(student_id, level_input, state):
         json.dumps(pages, ensure_ascii=False),
         0,
         total,
-        str(pid),
-        "" if orig_lev is None else str(orig_lev),
-        str(state["level"]),
-        prev_upd, next_upd, finish_upd,
-        state
+        pid,
+        orig_lev,
+        current_level,
+        prev_upd,
+        next_upd,
+        finish_upd
     )
 
-def next_page(pages_json, current_page, total_pages, pid, orig_lev, state):
-    pages = json.loads(pages_json) if pages_json else []
+
+# ======================================================
+#  Next / Prev / Finish（以下は元コードのまま）
+# ======================================================
+
+def next_page(pages_json, current_page, total_pages, pid, orig_lev):
+    now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
+
+    entry = {
+        "user_id": current_user_id,
+        "assigned_level": current_level,
+        "passage_id": pid,
+        "original_level": orig_lev,
+        "action_time": now,
+        "action_type": "next_pushed",
+        "page_text": None
+    }
+    save_log(entry)
+
+    pages = json.loads(pages_json)
     if not pages:
-        return ("", "", "[]", 0,
+        return ("", "", json.dumps([]), 0,
                 gr.update(interactive=False, visible=False),
                 gr.update(interactive=False, visible=False),
-                gr.update(interactive=False, visible=False),
-                state)
-
-    save_log({
-        "user_id": state.get("user_id"),
-        "assigned_level": state.get("level"),
-        "passage_id": int(pid),
-        "original_level": float(orig_lev) if orig_lev not in ("", None) else None,
-        "action_time": now_jst_iso(),
-        "action_type": "next_pushed",
-        "page_text": None
-    })
+                gr.update(interactive=False, visible=False))
 
-    total_pages = int(total_pages)
-    current_page = int(current_page)
     new_page = min(current_page + 1, total_pages - 1)
 
-    save_log({
-        "user_id": state.get("user_id"),
-        "assigned_level": state.get("level"),
-        "passage_id": int(pid),
-        "original_level": float(orig_lev) if orig_lev not in ("", None) else None,
-        "action_time": now_jst_iso(),
+    now2 = (datetime.utcnow() + timedelta(hours=9)).isoformat()
+    entry2 = {
+        "user_id": current_user_id,
+        "assigned_level": current_level,
+        "passage_id": pid,
+        "original_level": orig_lev,
+        "action_time": now2,
         "action_type": f"page_displayed_{new_page+1}",
         "page_text": pages[new_page]
-    })
+    }
+    save_log(entry2)
 
-    prev_upd = gr.update(interactive=(new_page > 0), visible=(new_page > 0))
-    next_visible = (new_page < total_pages - 1)
-    next_upd = gr.update(interactive=next_visible, visible=next_visible)
-    finish_upd = gr.update(interactive=(not next_visible), visible=(not next_visible))
+    if new_page == total_pages - 1:
+        return (
+            pages[new_page],
+            f"{new_page+1} / {total_pages}",
+            json.dumps(pages),
+            new_page,
+            gr.update(interactive=True, visible=True),
+            gr.update(interactive=False, visible=False),
+            gr.update(interactive=True, visible=True)
+        )
 
     return (
         pages[new_page],
         f"{new_page+1} / {total_pages}",
-        json.dumps(pages, ensure_ascii=False),
+        json.dumps(pages),
         new_page,
-        prev_upd, next_upd, finish_upd,
-        state
+        gr.update(interactive=(new_page > 0), visible=(new_page > 0)),
+        gr.update(interactive=True, visible=True),
+        gr.update(interactive=False, visible=False)
     )
 
-def prev_page(pages_json, current_page, total_pages, pid, orig_lev, state):
-    pages = json.loads(pages_json) if pages_json else []
+
+def prev_page(pages_json, current_page, total_pages, pid, orig_lev):
+    now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
+
+    entry = {
+        "user_id": current_user_id,
+        "assigned_level": current_level,
+        "passage_id": pid,
+        "original_level": orig_lev,
+        "action_time": now,
+        "action_type": "prev_pushed",
+        "page_text": None
+    }
+    save_log(entry)
+
+    pages = json.loads(pages_json)
     if not pages:
-        return ("", "", "[]", 0,
-                gr.update(interactive=False, visible=False),
+        return ("", "", json.dumps([]), 0,
                 gr.update(interactive=False, visible=False),
                 gr.update(interactive=False, visible=False),
-                state)
-
-    save_log({
-        "user_id": state.get("user_id"),
-        "assigned_level": state.get("level"),
-        "passage_id": int(pid),
-        "original_level": float(orig_lev) if orig_lev not in ("", None) else None,
-        "action_time": now_jst_iso(),
-        "action_type": "prev_pushed",
-        "page_text": None
-    })
+                gr.update(interactive=False, visible=False))
 
-    total_pages = int(total_pages)
-    current_page = int(current_page)
     new_page = max(current_page - 1, 0)
 
-    save_log({
-        "user_id": state.get("user_id"),
-        "assigned_level": state.get("level"),
-        "passage_id": int(pid),
-        "original_level": float(orig_lev) if orig_lev not in ("", None) else None,
-        "action_time": now_jst_iso(),
-        "action_type": f"page_displayed_{new_page+1}",
-        "page_text": pages[new_page]
-    })
-
     prev_upd = gr.update(interactive=(new_page > 0), visible=(new_page > 0))
     next_visible = (new_page < total_pages - 1)
     next_upd = gr.update(interactive=next_visible, visible=next_visible)
     finish_upd = gr.update(interactive=(not next_visible), visible=(not next_visible))
 
+    now2 = (datetime.utcnow() + timedelta(hours=9)).isoformat()
+    entry2 = {
+        "user_id": current_user_id,
+        "assigned_level": current_level,
+        "passage_id": pid,
+        "original_level": orig_lev,
+        "action_time": now2,
+        "action_type": f"page_displayed_{new_page+1}",
+        "page_text": pages[new_page]
+    }
+    save_log(entry2)
+
     return (
         pages[new_page],
         f"{new_page+1} / {total_pages}",
-        json.dumps(pages, ensure_ascii=False),
+        json.dumps(pages),
         new_page,
-        prev_upd, next_upd, finish_upd,
-        state
+        prev_upd,
+        next_upd,
+        finish_upd
     )
 
-def finish_or_retire(pages_json, current_page, pid, orig_lev, action, state):
-    save_log({
-        "user_id": state.get("user_id"),
-        "assigned_level": state.get("level"),
-        "passage_id": int(pid),
-        "original_level": float(orig_lev) if orig_lev not in ("", None) else None,
-        "action_time": now_jst_iso(),
+
+def finish_or_retire(pages_json, current_page, pid, orig_lev, action):
+    pages = json.loads(pages_json)
+    now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
+
+    entry = {
+        "user_id": current_user_id,
+        "assigned_level": current_level,
+        "passage_id": pid,
+        "original_level": orig_lev,
+        "action_time": now,
         "action_type": action,
         "page_text": None
-    })
-
-    new_pid, new_text, new_orig_lev, used_list = get_new_passage_random(state.get("used_passages", []))
-    state["used_passages"] = used_list
+    }
+    save_log(entry)
 
+    new_pid, new_text, new_orig_lev = get_new_passage_random()
     if new_text is None:
         return (
-            "教材がありません", "", "[]", 0, 0, "", "", "",
-            gr.update(interactive=False, visible=False),
+            "教材がありません", "", json.dumps([]), 0, "",
+            0, "", None, None,
             gr.update(interactive=False, visible=False),
             gr.update(interactive=False, visible=False),
-            state
+            gr.update(interactive=False, visible=False)
         )
 
-    rewritten = rewrite_level(new_text, state["level"], new_pid)
+    rewritten = rewrite_level(new_text, current_level)
     new_pages = split_pages(rewritten)
     total = len(new_pages)
 
-    prev_upd = gr.update(interactive=False, visible=False)
-    next_upd = gr.update(interactive=(total > 1), visible=(total > 1))
-    finish_upd = gr.update(interactive=(total == 1), visible=(total == 1))
-
-    save_log({
-        "user_id": state.get("user_id"),
-        "assigned_level": state.get("level"),
+    if total == 1:
+        prev_upd = gr.update(interactive=False, visible=False)
+        next_upd = gr.update(interactive=False, visible=False)
+        finish_upd = gr.update(interactive=True, visible=True)
+    else:
+        prev_upd = gr.update(interactive=False, visible=False)
+        next_upd = gr.update(interactive=True, visible=True)
+        finish_upd = gr.update(interactive=False, visible=False)
+
+    now2 = (datetime.utcnow() + timedelta(hours=9)).isoformat()
+    entry2 = {
+        "user_id": current_user_id,
+        "assigned_level": current_level,
         "passage_id": new_pid,
         "original_level": new_orig_lev,
-        "action_time": now_jst_iso(),
+        "action_time": now2,
         "action_type": "page_displayed_1",
         "page_text": new_pages[0]
-    })
+    }
+    save_log(entry2)
 
     return (
         new_pages[0],
@@ -454,67 +425,107 @@ def finish_or_retire(pages_json, current_page, pid, orig_lev, action, state):
         json.dumps(new_pages, ensure_ascii=False),
         0,
         total,
-        str(new_pid),
-        "" if new_orig_lev is None else str(new_orig_lev),
-        str(state["level"]),
-        prev_upd, next_upd, finish_upd,
-        state
+        new_pid,
+        new_orig_lev,
+        current_level,
+        prev_upd,
+        next_upd,
+        finish_upd
     )
 
-# =========================
-# Gradio queue/launch (version-safe)
-# =========================
-def safe_queue(blocks: gr.Blocks, concurrency: int = 8, max_size: int = 64):
-    sig = inspect.signature(blocks.queue)
-    kwargs = {}
-    # Gradioのバージョン差を吸収
-    if "default_concurrency_limit" in sig.parameters:
-        kwargs["default_concurrency_limit"] = concurrency
-    elif "concurrency_limit" in sig.parameters:
-        kwargs["concurrency_limit"] = concurrency
-    elif "concurrency_count" in sig.parameters:
-        kwargs["concurrency_count"] = concurrency
-    if "max_size" in sig.parameters:
-        kwargs["max_size"] = max_size
-    return blocks.queue(**kwargs)
-
-def safe_launch(blocks: gr.Blocks):
-    sig = inspect.signature(blocks.launch)
-    kwargs = {}
-    # Spacesだと server_name/server_port は不要なことが多いが、あっても問題ない
-    if "server_name" in sig.parameters:
-        kwargs["server_name"] = "0.0.0.0"
-    if "server_port" in sig.parameters and os.getenv("PORT"):
-        kwargs["server_port"] = int(os.getenv("PORT"))
-    # max_threadsがある版だけ付ける
-    if "max_threads" in sig.parameters:
-        kwargs["max_threads"] = 16
-    return blocks.launch(**kwargs)
-
-# =========================
-# UI
-# =========================
+
+# ======================================================
+#  UI
+# ======================================================
 custom_css = """
+/* ===============================
+   共通（両モード）
+   =============================== */
 .big-text {
     font-size: 22px !important;
     line-height: 1.8 !important;
     font-family: "Noto Sans", sans-serif !important;
 }
+/* 教材表示ボックス */
 .reading-area {
     padding: 20px !important;
     border-radius: 12px !important;
     border: 1px solid #ccc !important;
+    transition: background-color 0.2s ease, color 0.2s ease;
+}
+/* ===============================
+   ライトモード
+   =============================== */
+@media (prefers-color-scheme: light) {
+    body, .gradio-container {
+        background-color: #ffffff !important;
+        color: #222 !important;
+    }
+    .reading-area {
+        background-color: #fafafa !important;
+        color: #222 !important;
+        border-color: #ddd !important;
+    }
+    textarea, input, .gr-textbox textarea {
+        background-color: #ffffff !important;
+        color: #222 !important;
+        border: 1px solid #ccc !important;
+    }
+}
+/* ===============================
+   ダークモード
+   =============================== */
+@media (prefers-color-scheme: dark) {
+    body, .gradio-container {
+        background-color: #1e1e1e !important;
+        color: #e6e6e6 !important;
+    }
+    /* 教材の背景は黒すぎると読みにくいのでやや明るめのチャコール */
+    .reading-area {
+        background-color: #2a2a2a !important;
+        color: #f2f2f2 !important;
+        border-color: #444 !important;
+    }
+    textarea, input, .gr-textbox textarea {
+        background-color: #2c2c2c !important;
+        color: #f0f0f0 !important;
+        border: 1px solid #555 !important;
+    }
+    /* ボタンを見やすく */
+    button {
+        background-color: #3a3a3a !important;
+        color: #f0f0f0 !important;
+        border: 1px solid #555 !important;
+    }
+    button:hover {
+        background-color: #4a4a4a !important;
+    }
+    .gr-panel, .gr-box, .gr-group {
+        background-color: #272727 !important;
+        border-color: #444 !important;
+    }
 }
 """
 
+
 with gr.Blocks(css=custom_css) as demo:
     gr.Markdown("# 📚 Reading Exercise")
 
     student_id_input = gr.Textbox(label="学生番号（必須）")
-    level_input = gr.Dropdown(choices=[1,2,3,4,5], label="Reading Level", value=3)
+    level_input = gr.Dropdown(
+        choices=[1,2,3,4,5],
+        label="あなたの Reading Level（Level Testの結果を選択）",
+        value=3
+    )
+
     start_btn = gr.Button("スタート")
 
-    text_display = gr.Textbox(label="教材", lines=18, interactive=False, elem_classes=["big-text", "reading-area"])
+    text_display = gr.Textbox(
+        label="教材",
+        lines=18,
+        interactive=False,
+        elem_classes=["big-text", "reading-area"]
+    )
     page_display = gr.Textbox(label="進行状況", lines=1, interactive=False)
 
     hidden_pages = gr.Textbox(visible=False)
@@ -531,59 +542,71 @@ with gr.Blocks(css=custom_css) as demo:
 
     retire_btn = gr.Button("リタイア")
 
-    state = gr.State({"user_id": None, "level": None, "used_passages": []})
-
     start_btn.click(
         fn=start_test,
-        inputs=[student_id_input, level_input, state],
+        inputs=[student_id_input, level_input],
         outputs=[
             text_display, page_display,
             hidden_pages, hidden_page_index,
             hidden_total_pages, hidden_passage_id,
             hidden_orig_lev, hidden_assigned_lev,
-            prev_btn, next_btn, finish_btn,
-            state
-        ],
+            prev_btn, next_btn, finish_btn
+        ]
     )
 
     next_btn.click(
         fn=next_page,
-        inputs=[hidden_pages, hidden_page_index, hidden_total_pages, hidden_passage_id, hidden_orig_lev, state],
-        outputs=[text_display, page_display, hidden_pages, hidden_page_index, prev_btn, next_btn, finish_btn, state],
+        inputs=[
+            hidden_pages, hidden_page_index,
+            hidden_total_pages, hidden_passage_id,
+            hidden_orig_lev
+        ],
+        outputs=[
+            text_display, page_display,
+            hidden_pages, hidden_page_index,
+            prev_btn, next_btn, finish_btn
+        ]
     )
 
     prev_btn.click(
         fn=prev_page,
-        inputs=[hidden_pages, hidden_page_index, hidden_total_pages, hidden_passage_id, hidden_orig_lev, state],
-        outputs=[text_display, page_display, hidden_pages, hidden_page_index, prev_btn, next_btn, finish_btn, state],
+        inputs=[
+            hidden_pages, hidden_page_index,
+            hidden_total_pages, hidden_passage_id,
+            hidden_orig_lev
+        ],
+        outputs=[
+            text_display, page_display,
+            hidden_pages, hidden_page_index,
+            prev_btn, next_btn, finish_btn
+        ]
     )
 
     finish_btn.click(
-        fn=lambda p, i, pid, o, st: finish_or_retire(p, i, pid, o, "finished", st),
-        inputs=[hidden_pages, hidden_page_index, hidden_passage_id, hidden_orig_lev, state],
+        fn=lambda p, i, pid, o: finish_or_retire(p, i, pid, o, "finished"),
+        inputs=[hidden_pages, hidden_page_index, hidden_passage_id, hidden_orig_lev],
         outputs=[
             text_display, page_display,
             hidden_pages, hidden_page_index,
             hidden_total_pages, hidden_passage_id,
             hidden_orig_lev, hidden_assigned_lev,
-            prev_btn, next_btn, finish_btn,
-            state
-        ],
+            prev_btn, next_btn, finish_btn
+        ]
     )
 
     retire_btn.click(
-        fn=lambda p, i, pid, o, st: finish_or_retire(p, i, pid, o, "retire", st),
-        inputs=[hidden_pages, hidden_page_index, hidden_passage_id, hidden_orig_lev, state],
+        fn=lambda p, i, pid, o: finish_or_retire(p, i, pid, o, "retire"),
+        inputs=[
+            hidden_pages, hidden_page_index,
+            hidden_passage_id, hidden_orig_lev
+        ],
         outputs=[
             text_display, page_display,
             hidden_pages, hidden_page_index,
             hidden_total_pages, hidden_passage_id,
             hidden_orig_lev, hidden_assigned_lev,
-            prev_btn, next_btn, finish_btn,
-            state
-        ],
+            prev_btn, next_btn, finish_btn
+        ]
     )
 
-# queueはバージョン差があるので安全ラッパ
-safe_queue(demo, concurrency=8, max_size=64)
-safe_launch(demo)
+demo.launch()