Update app.py

app.py

@@ -45,6 +45,7 @@ LOG_COLUMNS = [
     "passage_id",
     "original_level",
     "flesch_score",     # ★追加：Group1=orig_lev, Group2=rewritten fre
+    "reading_order",    # ★追加：そのユーザーが何番目の教材を読んでいるか
     "action_time",
     "action_type",
     "page_text",
@@ -246,7 +247,6 @@ def extract_main_body_llm(text: str) -> str:
     """
     prompt = f"""
 Extract ONLY the main body text from the following passage.
-
 Rules:
 - Completely EXCLUDE titles, headings, chapter labels, author names, source information,
   footnotes, annotations, introductions, and any non-body content.
@@ -256,7 +256,6 @@ Rules:
 - Output only the extracted main body text.
 - Do not include explanations, comments, or metadata.
 - Do not include [TEXT START] and [TEXT END] in the output.
-
 [TEXT START]
 {text}
 [TEXT END]
@@ -395,6 +394,7 @@ def start_test(student_id, level_input, group_input, session_state):
             "passage_id": None,
             "original_level": None,
             "flesch_score": None,
+            "reading_order": 0,  # ★追加
             "action_time": now,
             "action_type": action,
             "page_text": None
@@ -431,6 +431,7 @@ def start_test(student_id, level_input, group_input, session_state):
         "passage_id": None,
         "original_level": None,
         "flesch_score": None,
+        "reading_order": 0,  # ★追加（教材未表示なので0）
         "action_time": now,
         "action_type": action,
         "page_text": None
@@ -484,6 +485,8 @@ 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)
 
+    reading_order = 1  # ★追加：このユーザーの最初の教材は1番目
+
     now2 = (datetime.utcnow() + timedelta(hours=9)).isoformat()
     save_log({
         "user_id": user_id,
@@ -492,6 +495,7 @@ def start_test(student_id, level_input, group_input, session_state):
         "passage_id": pid,
         "original_level": orig_lev,
         "flesch_score": measured_fre,   # ★追加
+        "reading_order": reading_order, # ★追加
         "action_time": now2,
         "action_type": "page_displayed_1",
         "page_text": pages[0]
@@ -501,7 +505,8 @@ def start_test(student_id, level_input, group_input, session_state):
         "user_id": user_id,
         "level": level,
         "group": group,
-        "used_passages": list(used_passages_set)
+        "used_passages": list(used_passages_set),
+        "reading_order": reading_order  # ★追加
     }
 
     return (
@@ -530,6 +535,7 @@ 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")
+    reading_order = session_state.get("reading_order", 1)  # ★追加
 
     now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
     save_log({
@@ -539,6 +545,7 @@ def next_page(pages_json, current_page, total_pages, pid, orig_lev, session_stat
         "passage_id": pid,
         "original_level": orig_lev,
         "flesch_score": "",  # ★列維持
+        "reading_order": reading_order,  # ★追加
         "action_time": now,
         "action_type": "next_pushed",
         "page_text": None
@@ -562,6 +569,7 @@ def next_page(pages_json, current_page, total_pages, pid, orig_lev, session_stat
         "passage_id": pid,
         "original_level": orig_lev,
         "flesch_score": "",  # ★列維持
+        "reading_order": reading_order,  # ★追加
         "action_time": now2,
         "action_type": f"page_displayed_{new_page+1}",
         "page_text": pages[new_page]
@@ -595,6 +603,7 @@ def prev_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")
+    reading_order = session_state.get("reading_order", 1)  # ★追加
 
     now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
     save_log({
@@ -604,6 +613,7 @@ def prev_page(pages_json, current_page, total_pages, pid, orig_lev, session_stat
         "passage_id": pid,
         "original_level": orig_lev,
         "flesch_score": "",  # ★列維持
+        "reading_order": reading_order,  # ★追加
         "action_time": now,
         "action_type": "prev_pushed",
         "page_text": None
@@ -632,6 +642,7 @@ def prev_page(pages_json, current_page, total_pages, pid, orig_lev, session_stat
         "passage_id": pid,
         "original_level": orig_lev,
         "flesch_score": "",  # ★列維持
+        "reading_order": reading_order,  # ★追加
         "action_time": now2,
         "action_type": f"page_displayed_{new_page+1}",
         "page_text": pages[new_page]
@@ -654,6 +665,7 @@ def finish_or_retire(pages_json, current_page, pid, orig_lev, action, session_st
     level = session_state.get("level")
     group = session_state.get("group")
     used_passages_set = set(session_state.get("used_passages", []))
+    reading_order = int(session_state.get("reading_order", 1))  # ★追加
 
     pages = json.loads(pages_json)
     now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
@@ -665,6 +677,7 @@ def finish_or_retire(pages_json, current_page, pid, orig_lev, action, session_st
         "passage_id": pid,
         "original_level": orig_lev,
         "flesch_score": "",  # ★列維持
+        "reading_order": reading_order,  # ★追加
         "action_time": now,
         "action_type": action,
         "page_text": None
@@ -708,6 +721,8 @@ def finish_or_retire(pages_json, current_page, pid, orig_lev, action, session_st
         next_upd = gr.update(interactive=True, visible=True)
         finish_upd = gr.update(interactive=False, visible=False)
 
+    new_reading_order = reading_order + 1  # ★追加：次の教材なので+1
+
     now2 = (datetime.utcnow() + timedelta(hours=9)).isoformat()
     save_log({
         "user_id": user_id,
@@ -716,6 +731,7 @@ def finish_or_retire(pages_json, current_page, pid, orig_lev, action, session_st
         "passage_id": new_pid,
         "original_level": new_orig_lev,
         "flesch_score": measured_fre,  # ★追加
+        "reading_order": new_reading_order,  # ★追加
         "action_time": now2,
         "action_type": "page_displayed_1",
         "page_text": new_pages[0]
@@ -725,7 +741,8 @@ def finish_or_retire(pages_json, current_page, pid, orig_lev, action, session_st
         "user_id": user_id,
         "level": level,
         "group": group,
-        "used_passages": list(used_passages_set)
+        "used_passages": list(used_passages_set),
+        "reading_order": new_reading_order  # ★追加
     }
 
     return (
@@ -901,7 +918,7 @@ custom_css = """
 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": []})
+    session_state = gr.State({"user_id": None, "level": None, "group": 2, "used_passages": [], "reading_order": 0})  # ★追加
 
     student_id_input = gr.Textbox(label="Student ID")