Update app.py

app.py

@@ -138,8 +138,6 @@ def get_new_passage_random(used_passages_set, target_level):
         if num.isdigit():
             all_ids.append(int(num))
 
-    # ★追加：excelのflesch_scoreでフィルタ（target_fleschより低いものだけ）
-    # passage_information.xlsx に該当行がないものは除外（スコア不明だと条件判定できないため）
     eligible_ids = []
     for pid in all_ids:
         row = passage_info_df[passage_info_df["Text#"] == pid]
@@ -187,16 +185,11 @@ def get_new_passage_random(used_passages_set, target_level):
 # ======================================================
 
 def extract_main_body(text: str) -> str:
-    """
-    書き換えは行わず、「本文っぽい部分」だけを軽量なヒューリスティックで抽出する。
-    （タイトル/著者/URL/出典/著作権/Project Gutenbergヘッダ・フッタ/注釈などを落とす）
-    """
     if not text:
         return ""
 
     lines = text.splitlines()
 
-    # ありがちなメタ情報/フッタ/ヘッダの除外パターン
     drop_patterns = [
         r"^\s*title\s*:\s*.*$",
         r"^\s*author\s*:\s*.*$",
@@ -208,21 +201,19 @@ def extract_main_body(text: str) -> str:
         r".*GUTENBERG.*",
         r"^\s*http[s]?://\S+.*$",
         r"^\s*www\.\S+.*$",
-        r"^\s*\[.*\]\s*$",           # 注釈っぽい行
-        r"^\s*\(\s*.*\s*\)\s*$",     # 注釈っぽい行
+        r"^\s*\[.*\]\s*$",
+        r"^\s*\(\s*.*\s*\)\s*$",
         r"^\s*end\s+of\s+.*$",
         r"^\s*\*{3}.*\*{3}\s*$",
     ]
     drop_re = re.compile("|".join(f"(?:{p})" for p in drop_patterns), re.IGNORECASE)
 
-    # まず明らかなメタ行を除外
     kept = []
     for ln in lines:
         if drop_re.match(ln.strip()):
             continue
         kept.append(ln)
 
-    # 先頭の「短いタイトル行」っぽいものを数行だけ落とす（本文が始まるまで）
     def is_title_like(s: str) -> bool:
         t = s.strip()
         if not t:
@@ -262,14 +253,7 @@ def extract_main_body(text: str) -> str:
 # ======================================================
 
 def rewrite_level(text, target_level):
-    level_to_flesch = {
-        1: 90,
-        2: 75,
-        3: 65,
-        4: 55,
-        5: 40
-    }
-
+    level_to_flesch = {1: 90, 2: 75, 3: 65, 4: 55, 5: 40}
     target_flesch = level_to_flesch[int(target_level)]
 
     prompt = f"""
@@ -277,9 +261,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}
 """
 
@@ -338,24 +322,24 @@ def start_test(student_id, level_input, group_input, session_state):
         save_log(entry)
 
         return (
-            "",                          # title_display
-            "",                          # text_display
-            "",                          # page_display
-            json.dumps([]),              # hidden_pages
-            0,                           # hidden_page_index
-            0,                           # hidden_total_pages
-            "",                          # hidden_passage_id
-            "",                          # hidden_orig_lev
-            None,                        # hidden_assigned_lev（level）
-            gr.update(interactive=False, visible=False),  # prev_btn
-            gr.update(interactive=False, visible=True),   # next_btn
-            gr.update(interactive=False, visible=False),  # finish_btn
+            "",
+            "",
+            "",
+            json.dumps([]),
+            0,
+            0,
+            "",
+            "",
+            None,
+            gr.update(interactive=False, visible=False),
+            gr.update(interactive=False, visible=True),
+            gr.update(interactive=False, visible=False),
             session_state
         )
 
     user_id = str(student_id).strip()
     level = int(level_input)
-    group = int(group_input)
+    group = int(group_input)  # ★group_inputは "1"/"2" でもOK
 
     used_passages_set = set()
 
@@ -371,19 +355,18 @@ def start_test(student_id, level_input, group_input, session_state):
     }
     save_log(entry)
 
-    # ★変更：target level を渡して「難しい教材のみ」から選ぶ
     pid, text, orig_lev, title, used_passages_set = get_new_passage_random(used_passages_set, level)
     if text is None:
         return (
-            "",                          # title_display
-            "教材が��つかりません",       # text_display
-            "",                          # page_display
-            json.dumps([]),              # hidden_pages
-            0,                           # hidden_page_index
-            0,                           # hidden_total_pages
-            "",                          # hidden_passage_id
-            "",                          # hidden_orig_lev
-            None,                        # hidden_assigned_lev（level）
+            "",
+            "教材が見つかりません",
+            "",
+            json.dumps([]),
+            0,
+            0,
+            "",
+            "",
+            None,
             gr.update(interactive=False, visible=False),
             gr.update(interactive=False, visible=False),
             gr.update(interactive=False, visible=False),
@@ -407,20 +390,17 @@ def start_test(student_id, level_input, group_input, session_state):
         next_upd = gr.update(interactive=True, visible=True)
         finish_upd = gr.update(interactive=False, visible=False)
 
-    page_num = 1
     now2 = (datetime.utcnow() + timedelta(hours=9)).isoformat()
-
-    entry2 = {
+    save_log({
         "user_id": user_id,
         "group": group,
         "assigned_level": level,
         "passage_id": pid,
         "original_level": orig_lev,
         "action_time": now2,
-        "action_type": f"page_displayed_{page_num}",
+        "action_type": "page_displayed_1",
         "page_text": pages[0]
-    }
-    save_log(entry2)
+    })
 
     session_state = {
         "user_id": user_id,
@@ -453,9 +433,9 @@ def next_page(pages_json, current_page, total_pages, pid, orig_lev, session_stat
     user_id = session_state.get("user_id")
     level = session_state.get("level")
     group = session_state.get("group")
-    
+
     now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
-    entry = {
+    save_log({
         "user_id": user_id,
         "group": group,
         "assigned_level": level,
@@ -464,8 +444,7 @@ def next_page(pages_json, current_page, total_pages, pid, orig_lev, session_stat
         "action_time": now,
         "action_type": "next_pushed",
         "page_text": None
-    }
-    save_log(entry)
+    })
 
     pages = json.loads(pages_json)
     if not pages:
@@ -478,7 +457,7 @@ def next_page(pages_json, current_page, total_pages, pid, orig_lev, session_stat
     new_page = min(current_page + 1, total_pages - 1)
 
     now2 = (datetime.utcnow() + timedelta(hours=9)).isoformat()
-    entry2 = {
+    save_log({
         "user_id": user_id,
         "group": group,
         "assigned_level": level,
@@ -487,8 +466,7 @@ def next_page(pages_json, current_page, total_pages, pid, orig_lev, session_stat
         "action_time": now2,
         "action_type": f"page_displayed_{new_page+1}",
         "page_text": pages[new_page]
-    }
-    save_log(entry2)
+    })
 
     if new_page == total_pages - 1:
         return (
@@ -519,7 +497,7 @@ def prev_page(pages_json, current_page, total_pages, pid, orig_lev, session_stat
     group = session_state.get("group")
 
     now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
-    entry = {
+    save_log({
         "user_id": user_id,
         "group": group,
         "assigned_level": level,
@@ -528,8 +506,7 @@ def prev_page(pages_json, current_page, total_pages, pid, orig_lev, session_stat
         "action_time": now,
         "action_type": "prev_pushed",
         "page_text": None
-    }
-    save_log(entry)
+    })
 
     pages = json.loads(pages_json)
     if not pages:
@@ -547,7 +524,7 @@ def prev_page(pages_json, current_page, total_pages, pid, orig_lev, session_stat
     finish_upd = gr.update(interactive=(not next_visible), visible=(not next_visible))
 
     now2 = (datetime.utcnow() + timedelta(hours=9)).isoformat()
-    entry2 = {
+    save_log({
         "user_id": user_id,
         "group": group,
         "assigned_level": level,
@@ -556,8 +533,7 @@ def prev_page(pages_json, current_page, total_pages, pid, orig_lev, session_stat
         "action_time": now2,
         "action_type": f"page_displayed_{new_page+1}",
         "page_text": pages[new_page]
-    }
-    save_log(entry2)
+    })
 
     return (
         pages[new_page],
@@ -579,7 +555,7 @@ def finish_or_retire(pages_json, current_page, pid, orig_lev, action, session_st
     pages = json.loads(pages_json)
     now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
 
-    entry = {
+    save_log({
         "user_id": user_id,
         "group": group,
         "assigned_level": level,
@@ -588,10 +564,8 @@ def finish_or_retire(pages_json, current_page, pid, orig_lev, action, session_st
         "action_time": now,
         "action_type": action,
         "page_text": None
-    }
-    save_log(entry)
+    })
 
-    # ★変更：target level を渡して「難しい教材のみ」から選ぶ
     new_pid, new_text, new_orig_lev, title, used_passages_set = get_new_passage_random(used_passages_set, level)
     if new_text is None:
         return (
@@ -621,7 +595,7 @@ def finish_or_retire(pages_json, current_page, pid, orig_lev, action, session_st
         finish_upd = gr.update(interactive=False, visible=False)
 
     now2 = (datetime.utcnow() + timedelta(hours=9)).isoformat()
-    entry2 = {
+    save_log({
         "user_id": user_id,
         "group": group,
         "assigned_level": level,
@@ -630,8 +604,7 @@ def finish_or_retire(pages_json, current_page, pid, orig_lev, action, session_st
         "action_time": now2,
         "action_type": "page_displayed_1",
         "page_text": new_pages[0]
-    }
-    save_log(entry2)
+    })
 
     session_state = {
         "user_id": user_id,
@@ -659,87 +632,8 @@ def finish_or_retire(pages_json, current_page, pid, orig_lev, action, session_st
 # ======================================================
 #  UI（タイトル表示を追加。それ以外は変更しない）
 #  ★追加：パスワード付きログCSVダウンロード
-#  ★改善：Edgeでも確実に「Group選択中」が分かるようJSでstyle直当て
+#  ★修正：JSは使わずCSSのみ（スタートが進まない問題を回避）
 # ======================================================
-
-# ★差し替え：Edgeでも確実に効くハイライトJS（style直書き）
-radio_js = r"""
-() => {
-  const root = document.getElementById("group_radio");
-  if (!root) return;
-
-  const getScheme = () => {
-    try {
-      return window.matchMedia && window.matchMedia("(prefers-color-scheme: dark)").matches
-        ? "dark" : "light";
-    } catch (e) {
-      return "light";
-    }
-  };
-
-  const clear = (labels) => {
-    labels.forEach(l => {
-      l.classList.remove("radio-selected");
-      l.style.background = "";
-      l.style.border = "";
-      l.style.boxShadow = "";
-      l.style.borderRadius = "";
-      l.style.padding = "";
-    });
-  };
-
-  const apply = (label) => {
-    const scheme = getScheme();
-    label.classList.add("radio-selected");
-
-    if (scheme === "dark") {
-      label.style.background = "#1f2937";
-      label.style.border = "2px solid #60a5fa";
-      label.style.boxShadow = "0 0 0 1px rgba(255,255,255,0.06) inset";
-    } else {
-      label.style.background = "#eef2ff";
-      label.style.border = "2px solid #4f46e5";
-      label.style.boxShadow = "0 0 0 1px rgba(0,0,0,0.04) inset";
-    }
-    label.style.borderRadius = "12px";
-    label.style.padding = "10px 12px";
-  };
-
-  const update = () => {
-    const labels = root.querySelectorAll("label");
-    if (!labels || labels.length === 0) return;
-
-    clear(labels);
-
-    const checked = root.querySelector('input[type="radio"]:checked');
-    if (!checked) return;
-
-    const label = checked.closest("label");
-    if (!label) return;
-
-    apply(label);
-  };
-
-  update();
-
-  root.addEventListener("change", update);
-  root.addEventListener("click", update);
-
-  let n = 0;
-  const t = setInterval(() => {
-    update();
-    n += 1;
-    if (n >= 15) clearInterval(t);
-  }, 200);
-
-  try {
-    const mq = window.matchMedia("(prefers-color-scheme: dark)");
-    mq.addEventListener?.("change", update);
-    mq.addListener?.(update);
-  } catch (e) {}
-};
-"""
-
 custom_css = """
 /* ===============================
    共通（両モード）
@@ -749,22 +643,18 @@ custom_css = """
     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;
 }
-
-/* ★追加：Radio / Dropdown などフォーム部品の可読性を安定させる（両モード共通） */
 .gradio-container label, .gradio-container .wrap label {
     color: inherit !important;
 }
 .gradio-container input[type="radio"],
 .gradio-container input[type="checkbox"] {
-    accent-color: #2563eb !important; /* 選択丸が見えにくい問題の対策 */
+    accent-color: #2563eb !important;
 }
 .gradio-container select {
     color: inherit !important;
@@ -778,38 +668,28 @@ custom_css = """
         background-color: #ffffff !important;
         color: #222 !important;
     }
-
-    /* ★追加：フォーム周り（Radio/Dropdown）の背景と境界を明るい環境で見やすく */
     .gr-panel, .gr-box, .gr-group {
         background-color: #ffffff !important;
         border-color: #ddd !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;
     }
-
-    /* ★追加：Dropdown(Select) をライトで見やすく */
     select, .gr-dropdown select {
         background-color: #ffffff !important;
         color: #222 !important;
         border: 1px solid #ccc !important;
     }
-
-    /* ★追加：Radioの選択肢テキストが薄くなるケースの対策 */
     .gr-radio label, .gr-radio .wrap label, .gr-radio span {
         color: #222 !important;
     }
-
-    /* ★追加：ライトモードでボタンが背景に溶ける場合の対策 */
     button {
         background-color: #f5f5f5 !important;
         color: #111 !important;
@@ -828,26 +708,21 @@ custom_css = """
         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;
     }
-
-    /* ★追加：Dropdown(Select) をダークで見やすく */
     select, .gr-dropdown select {
         background-color: #2c2c2c !important;
         color: #f0f0f0 !important;
         border: 1px solid #555 !important;
     }
-
     button {
         background-color: #3a3a3a !important;
         color: #f0f0f0 !important;
@@ -856,29 +731,18 @@ custom_css = """
     button:hover {
         background-color: #4a4a4a !important;
     }
-
     .gr-panel, .gr-box, .gr-group {
         background-color: #272727 !important;
         border-color: #444 !important;
     }
-
-    /* ★追加：Radioの選択肢が薄くなるケースの対策 */
     .gr-radio label, .gr-radio .wrap label, .gr-radio span {
         color: #e6e6e6 !important;
     }
 }
 
-/* ★追加：Radio行が細くてハイライトが目立たない問題の保険（Edge向け） */
-#group_radio label {
-  width: 100% !important;
-  box-sizing: border-box !important;
-}
-
 /* ===============================
-   ★追加：Group選択中を確実に見えるように（Edge対応）
+   ★Group選択：CSSのみで見やすく（EdgeでもOK）
    =============================== */
-
-/* ラジオ自体がOS/ブラウザ依存で薄くなるのを防ぐ */
 #group_radio input[type="radio"]{
   appearance: auto !important;
   -webkit-appearance: radio !important;
@@ -886,8 +750,6 @@ custom_css = """
   height: 18px !important;
   accent-color: #2563eb !important;
 }
-
-/* 各選択肢を行として見やすく */
 #group_radio label{
   width: 100% !important;
   box-sizing: border-box !important;
@@ -899,34 +761,22 @@ custom_css = """
   gap: 10px !important;
 }
 
-/* ✅ checked のとき “行全体” をハイライト
-   （DOM差に備えて :has / input+span / input~span を全部用意）
-*/
+/* :has が効く環境は行全体ハイライト */
 @media (prefers-color-scheme: light){
   #group_radio label:has(input[type="radio"]:checked){
     background: #eef2ff !important;
     border: 2px solid #4f46e5 !important;
   }
-  #group_radio input[type="radio"]:checked + span,
-  #group_radio input[type="radio"]:checked ~ span{
-    font-weight: 700 !important;
-  }
 }
-
 @media (prefers-color-scheme: dark){
   #group_radio label:has(input[type="radio"]:checked){
     background: #1f2937 !important;
     border: 2px solid #60a5fa !important;
   }
-  #group_radio input[type="radio"]:checked + span,
-  #group_radio input[type="radio"]:checked ~ span{
-    font-weight: 700 !important;
-  }
 }
-
 """
 
-with gr.Blocks(css=custom_css, js=radio_js) as demo:
+with gr.Blocks(css=custom_css) as demo:
     gr.Markdown("# 📚 Reading Exercise")
 
     session_state = gr.State({"user_id": None, "level": None, "group": 2, "used_passages": []})
@@ -934,10 +784,10 @@ with gr.Blocks(css=custom_css, js=radio_js) as demo:
     student_id_input = gr.Textbox(label="学生番号（必須）")
 
     group_input = gr.Radio(
-        choices=[("Group 1", "1"), ("Group 2", "2")],
+        choices=[("Group 1", "1"), ("Group 2", "2")],  # ★表示問題回避のため文字列
         label="実験グループを選択",
         value="2",
-        elem_id="group_radio"  # ★追加：Edgeでも確実に狙うため
+        elem_id="group_radio"
     )
 
     level_input = gr.Dropdown(
@@ -1048,7 +898,6 @@ with gr.Blocks(css=custom_css, js=radio_js) as demo:
         ]
     )
 
-    # ★追加：ログCSVダウンロード（パスワード必須）
     gr.Markdown("## 🔐 管理者用：ログCSVダウンロード（パスワード必須）")
     admin_password = gr.Textbox(label="Password", type="password")
     download_btn = gr.Button("ログCSVを生成してダウンロード")