Update app.py

app.py

@@ -14,23 +14,20 @@ LOG_FILE = "reading_logs.csv"
 
 client = OpenAI(base_url=BASE_URL, api_key=API_KEY)
 
-# --- passage.csv 読み込み（columns: passage_id, genre, text, original_lexile_score）---
+# --- passage.csv 読み込み ---
 passages_df = pd.read_csv("passage.csv")
 
-genres = [
-    "Literature","Science＆Technology","History","Social Science＆Society",
-    "Arts＆Culture","Religion＆Philosophy","Lifestyle＆Hobbies",
-    "Health＆Medicine","Education＆Reference"
-]
-
 # --- 状態変数 ---
 used_passages = set()
 current_user_id = None
-current_genre = None
 current_lexile = None
 action_log = []  # ページ操作ログ
 
-# --- ヘルパー関数 ---
+
+# ============================
+# ヘルパー
+# ============================
+
 def rewrite_to_lexile(text, target_lexile):
     prompt = f"""
 Rewrite the following passage so it fits about {target_lexile} Lexile.
@@ -38,7 +35,6 @@ Rewrite the following passage so it fits about {target_lexile} Lexile.
 - Avoid figurative language
 - Use simple syntax
 - Output only the rewritten passage
-
 {text}
 """
     resp = client.chat.completions.create(
@@ -49,33 +45,31 @@ Rewrite the following passage so it fits about {target_lexile} Lexile.
     )
     return resp.choices[0].message.content.strip()
 
+
 def split_pages(text, words=120):
     w = text.split()
     pages = [" ".join(w[i:i+words]) for i in range(0, len(w), words)]
     return pages if pages else [text]
 
-def get_new_passage(same_genre=True):
-    """同ジャンル or 別ジャンルでランダムに passage を返す (passage_id, text, original_lexile)"""
-    global used_passages, current_genre
-    if same_genre:
-        df = passages_df[passages_df["genre"] == current_genre]
-    else:
-        df = passages_df[passages_df["genre"] != current_genre]
 
-    if df.empty:
-        return None, None, None
+def get_new_passage_random():
+    """ジャンル関係なくランダムに取得"""
+    global used_passages
+    df = passages_df
 
     available = [pid for pid in df["passage_id"].unique() if pid not in used_passages]
     if not available:
-        # 使い切ったら既読クリアして再利用
         used_passages.clear()
         available = list(df["passage_id"].unique())
 
     pid = random.choice(available)
     row = df[df["passage_id"] == pid].iloc[0]
+
     used_passages.add(pid)
+
     return pid, row["text"], row.get("original_lexile_score", None)
 
+
 def save_log(entry):
     df = pd.DataFrame([entry])
     if os.path.exists(LOG_FILE):
@@ -90,40 +84,33 @@ def save_log(entry):
     dataset = Dataset.from_parquet(tmp_path)
     dataset.push_to_hub(DATASET_REPO, token=HF_TOKEN)
 
+
 # ============================
-# Gradio コールバック関数
+# コールバック
 # ============================
 
-def start_test(student_id, genre, lexile_input):
-    """開始：学生番号・Reading Levelの入力は必須"""
-    global current_user_id, current_genre, current_lexile, used_passages, action_log
+def start_test(student_id, lexile_input):
+    """開始：ジャンル選択なし版"""
+    global current_user_id, current_lexile, used_passages, action_log
     used_passages = set()
     action_log = []
 
     if not student_id or str(student_id).strip() == "":
-        # テキストとページ表示だけ空で返し、ボタンはすべて disabled
         return (
-            "",  # text_display
-            "",  # page_display
-            json.dumps([]),  # hidden_pages
-            0,  # hidden_page_index
-            "",  # start_time
-            0,  # total_pages
-            "", None, None,  # pid, orig_lex, assigned_lex
-            gr.update(interactive=False),  # prev_btn update
-            gr.update(interactive=False),  # next_btn update
-            gr.update(interactive=False)   # finish_btn update
+            "", "", json.dumps([]), 0, "",
+            0, "", None, None,
+            gr.update(interactive=False), gr.update(interactive=False), "次へ ▶"
         )
 
     current_user_id = str(student_id).strip()
-    current_genre = genre
     current_lexile = int(lexile_input)
 
-    pid, text, orig_lex = get_new_passage(same_genre=True)
+    pid, text, orig_lex = get_new_passage_random()
     if text is None:
         return (
-            "教材が見つかりません", "", json.dumps([]), 0, "", 0, "", None, None,
-            gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=False)
+            "教材が見つかりません", "", json.dumps([]), 0, "",
+            0, "", None, None,
+            gr.update(interactive=False), gr.update(interactive=False), "次へ ▶"
         )
 
     rewritten = rewrite_to_lexile(text, current_lexile)
@@ -131,76 +118,81 @@ def start_test(student_id, genre, lexile_input):
     start_time = (datetime.utcnow() + timedelta(hours=9)).isoformat()
     total = len(pages)
 
-    # ボタン状態（最初は prev 無効、 next 有効 if pages>1、 finish 有効 only if single page）
     prev_upd = gr.update(interactive=False)
-    next_upd = gr.update(interactive=(total > 1))
-    finish_upd = gr.update(interactive=(0 == total - 1))  # True if only 1 page
+    next_upd = gr.update(interactive=True)
+
+    next_label = "読み終えた" if total == 1 else "次へ ▶"
 
     return (
-        pages[0],  # text_display
-        f"1 / {total}",  # page_display
-        json.dumps(pages, ensure_ascii=False),  # hidden_pages
-        0,  # hidden_page_index
-        start_time,  # hidden_start_time
-        total,  # hidden_total_pages
-        pid,  # hidden_passage_id
-        orig_lex,  # hidden_orig_lex
-        current_lexile,  # hidden_assigned_lex
+        pages[0],
+        f"1 / {total}",
+        json.dumps(pages, ensure_ascii=False),
+        0,
+        start_time,
+        total,
+        pid,
+        orig_lex,
+        current_lexile,
         prev_upd,
         next_upd,
-        finish_upd
+        next_label
     )
 
-def next_page(pages_json, current_page, total_pages):
+
+def next_page(pages_json, current_page, total_pages, pid, orig_lex, start_time):
     pages = json.loads(pages_json)
-    if not pages:
-        return "", "", json.dumps([]), 0, gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=False)
-    # advance safely
     new_page = min(current_page + 1, total_pages - 1)
+
+    # 最終ページ → 自動で finish
+    if new_page == total_pages - 1:
+        return finish_or_retire(
+            pages_json, current_page, pid, orig_lex, start_time, "finished"
+        )
+
+    # 通常のページ移動
     if new_page != current_page:
         action_log.append({"action": "next", "time": (datetime.utcnow() + timedelta(hours=9)).isoformat()})
-    finish_enabled = (new_page == total_pages - 1)
+
     prev_enabled = (new_page > 0)
-    next_enabled = (new_page < total_pages - 1)
+
     return (
         pages[new_page],
         f"{new_page+1} / {total_pages}",
-        json.dumps(pages, ensure_ascii=False),
+        json.dumps(pages),
         new_page,
         gr.update(interactive=prev_enabled),
-        gr.update(interactive=next_enabled),
-        gr.update(interactive=finish_enabled)
+        gr.update(interactive=True),
+        "次へ ▶"
     )
 
+
 def prev_page(pages_json, current_page, total_pages):
     pages = json.loads(pages_json)
-    if not pages:
-        return "", "", json.dumps([]), 0, gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=False)
     new_page = max(current_page - 1, 0)
+
     if new_page != current_page:
         action_log.append({"action": "prev", "time": (datetime.utcnow() + timedelta(hours=9)).isoformat()})
-    finish_enabled = (new_page == total_pages - 1)
+
     prev_enabled = (new_page > 0)
-    next_enabled = (new_page < total_pages - 1)
+    next_label = "読み終えた" if new_page == total_pages - 1 else "次へ ▶"
+
     return (
         pages[new_page],
         f"{new_page+1} / {total_pages}",
-        json.dumps(pages, ensure_ascii=False),
+        json.dumps(pages),
         new_page,
         gr.update(interactive=prev_enabled),
-        gr.update(interactive=next_enabled),
-        gr.update(interactive=finish_enabled)
+        gr.update(interactive=True),
+        next_label
     )
 
+
 def finish_or_retire(pages_json, current_page, pid, orig_lex, start_time, action):
-    """action == 'finished' or 'retire'"""
     pages = json.loads(pages_json)
     now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
 
-    # ログ
     entry = {
         "user_id": current_user_id,
-        "genre": current_genre,
         "assigned_lexile": current_lexile,
         "passage_id": pid,
         "original_lexile": orig_lex,
@@ -209,27 +201,15 @@ def finish_or_retire(pages_json, current_page, pid, orig_lex, start_time, action
         "actions": json.dumps(action_log, ensure_ascii=False),
         "result": action
     }
-    save_log(entry=entry) if 'save_log' in globals() else save_log_local(entry)
-
-    # 次教材を取得
-    if action == "finished":
-        new_pid, new_text, new_orig_lex = get_new_passage(same_genre=True)
-    else:
-        new_pid, new_text, new_orig_lex = get_new_passage(same_genre=False)
+    save_log(entry)
 
+    # 新しい教材取得
+    new_pid, new_text, new_orig_lex = get_new_passage_random()
     if new_text is None:
-        # 全部終わった or 該当なし
         return (
-            "教材がありません",  # text_display
-            "",  # page_display
-            json.dumps([]),  # hidden_pages
-            0,  # page_index
-            "",  # start_time
-            0,  # total_pages
-            "", None, None,  # pid, orig_lex, assigned_lex
-            gr.update(interactive=False),
-            gr.update(interactive=False),
-            gr.update(interactive=False)
+            "教材がありません", "", json.dumps([]), 0, "",
+            0, "", None, None,
+            gr.update(interactive=False), gr.update(interactive=False), "次へ ▶"
         )
 
     rewritten = rewrite_to_lexile(new_text, current_lexile)
@@ -237,12 +217,11 @@ def finish_or_retire(pages_json, current_page, pid, orig_lex, start_time, action
     new_start = (datetime.utcnow() + timedelta(hours=9)).isoformat()
     total = len(new_pages)
 
-    # reset action log for new passage
     action_log.clear()
 
     prev_upd = gr.update(interactive=False)
-    next_upd = gr.update(interactive=(total > 1))
-    finish_upd = gr.update(interactive=(0 == total - 1))
+    next_upd = gr.update(interactive=True)
+    next_label = "読み終えた" if total == 1 else "次へ ▶"
 
     return (
         new_pages[0],
@@ -254,26 +233,21 @@ def finish_or_retire(pages_json, current_page, pid, orig_lex, start_time, action
         new_pid,
         new_orig_lex,
         current_lexile,
-        prev_upd, next_upd, finish_upd
+        prev_upd,
+        next_upd,
+        next_label
     )
 
-# fallback local saver if earlier definitions differ
-def save_log_local(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)
 
 # ============================
-# UI 部分（Lexile 入力は復活）
+# UI
 # ============================
+
 with gr.Blocks() as demo:
-    gr.Markdown("# 📚 Reading Exercise")
+    gr.Markdown("# 📚 Reading Exercise（ジャンル選択なし版）")
 
     student_id_input = gr.Textbox(label="学生番号（必須）")
     lexile_input = gr.Number(label="あなたの Reading Level（例: 3）", precision=0)
-    genre_input = gr.Dropdown(choices=genres, label="ジャンル（1つ選択）")
 
     start_btn = gr.Button("スタート")
 
@@ -289,70 +263,67 @@ with gr.Blocks() as demo:
     hidden_orig_lex = gr.Textbox(visible=False)
     hidden_assigned_lex = gr.Textbox(visible=False)
 
-    # buttons row (always visible)
     with gr.Row():
         prev_btn = gr.Button("◀ 前へ", interactive=False)
         next_btn = gr.Button("次へ ▶", interactive=False)
-        
-    finish_btn = gr.Button("読み終えた", interactive=False)
+
     retire_btn = gr.Button("リタイア")
 
-    # Start click
+    # Start
     start_btn.click(
         fn=start_test,
-        inputs=[student_id_input, genre_input, lexile_input],
+        inputs=[student_id_input, lexile_input],
         outputs=[
             text_display, page_display,
             hidden_pages, hidden_page_index,
-            hidden_start_time, hidden_total_pages, hidden_passage_id,
-            hidden_orig_lex, hidden_assigned_lex,
-            prev_btn, next_btn, finish_btn
+            hidden_start_time, hidden_total_pages,
+            hidden_passage_id, hidden_orig_lex, hidden_assigned_lex,
+            prev_btn, next_btn, next_btn
         ]
     )
 
-    # Next / Prev click
+    # Next
     next_btn.click(
         fn=next_page,
-        inputs=[hidden_pages, hidden_page_index, hidden_total_pages],
+        inputs=[
+            hidden_pages, hidden_page_index,
+            hidden_total_pages, hidden_passage_id,
+            hidden_orig_lex, hidden_start_time
+        ],
         outputs=[
             text_display, page_display,
             hidden_pages, hidden_page_index,
-            prev_btn, next_btn, finish_btn
+            prev_btn, next_btn, next_btn
         ]
     )
 
+    # Prev
     prev_btn.click(
         fn=prev_page,
         inputs=[hidden_pages, hidden_page_index, hidden_total_pages],
         outputs=[
             text_display, page_display,
             hidden_pages, hidden_page_index,
-            prev_btn, next_btn, finish_btn
-        ]
-    )
-
-    # Finish / Retire click
-    finish_btn.click(
-        fn=lambda p, i, pid, o, st: finish_or_retire(p, i, pid, o, st, "finished"),
-        inputs=[hidden_pages, hidden_page_index, hidden_passage_id, hidden_orig_lex, hidden_start_time],
-        outputs=[
-            text_display, page_display,
-            hidden_pages, hidden_page_index,
-            hidden_start_time, hidden_total_pages, hidden_passage_id,
-            hidden_orig_lex, hidden_assigned_lex,
-            prev_btn, next_btn, finish_btn
+            prev_btn, next_btn, next_btn
         ]
     )
 
+    # Retire
     retire_btn.click(
-        fn=lambda p, i, pid, o, st: finish_or_retire(p, i, pid, o, st, "retire"),
-        inputs=[hidden_pages, hidden_page_index, hidden_passage_id, hidden_orig_lex, hidden_start_time],
+        fn=lambda p, i, pid, o, st: finish_or_retire(
+            p, i, pid, o, st, "retire"
+        ),
+        inputs=[
+            hidden_pages, hidden_page_index,
+            hidden_passage_id, hidden_orig_lex,
+            hidden_start_time
+        ],
         outputs=[
             text_display, page_display,
             hidden_pages, hidden_page_index,
-            hidden_start_time, hidden_total_pages, hidden_passage_id,
-            hidden_orig_lex, hidden_assigned_lex,
-            prev_btn, next_btn, finish_btn
+            hidden_start_time, hidden_total_pages,
+            hidden_passage_id, hidden_orig_lex,
+            hidden_assigned_lex, prev_btn, next_btn, next_btn
         ]
     )