Update app.py

app.py

@@ -216,19 +216,64 @@ def next_page(pages_json, original_json, page_idx, pid, orig_lev):
         gr.update(interactive=idx==total-1, visible=idx==total-1)
     )
 
-def prev_page(pages_json, page_idx):
+def prev_page(pages_json, original_pages_json, current_page, total_pages, pid, orig_lev, session_state):
+    now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
+
+    entry = {
+        "user_id": session_state.get("user_id"),
+        "assigned_level": session_state.get("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)
-    idx = page_idx - 1
+    if not pages:
+        return ("", "", json.dumps([]), 0,
+                session_state,
+                gr.update(interactive=False, visible=False),
+                gr.update(interactive=False, visible=False),
+                gr.update(interactive=False, visible=False))
+
+    original_pages = json.loads(original_pages_json)
+    new_page = max(current_page - 1, 0)
+
+    # ★追加：戻る先が未生成なら生成する（nextと同じ）
+    if pages[new_page] is None:
+        pages[new_page] = rewrite_page_with_context(pid, new_page, original_pages, session_state.get("level"))
+
+    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": session_state.get("user_id"),
+        "assigned_level": session_state.get("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[idx],
-        "",
-        pages_json,
-        idx,
-        gr.update(interactive=idx>0, visible=idx>0),
-        gr.update(interactive=True, visible=True),
-        gr.update(interactive=False, visible=False)
+        pages[new_page],
+        f"{new_page+1} / {total_pages}",
+        json.dumps(pages, ensure_ascii=False),
+        new_page,
+        session_state,
+        prev_upd,
+        next_upd,
+        finish_upd
     )
 
+
 # ======================================================
 # UI
 # ======================================================
@@ -269,4 +314,23 @@ with gr.Blocks() as demo:
          prev_btn, next_btn, finish_btn]
     )
 
+    prev_btn.click(
+    fn=prev_page,
+    inputs=[
+        hidden_pages,
+        hidden_original_pages,   # ★文脈付きrewriteのために必要
+        hidden_page_index,
+        hidden_total_pages,
+        hidden_passage_id,
+        hidden_orig_lev,
+        session_state
+    ],
+    outputs=[
+        text_display, page_display,
+        hidden_pages, hidden_page_index,
+        session_state,
+        prev_btn, next_btn, finish_btn]
+    )
+
+
 demo.launch()