Update app.py

app.py

@@ -96,7 +96,6 @@ class RFTMemoryStore:
         )
         """)
 
-        # FTS index
         cur.execute("""
         CREATE VIRTUAL TABLE IF NOT EXISTS events_fts USING fts5(
             event_id,
@@ -133,6 +132,34 @@ class RFTMemoryStore:
         os.makedirs(d, exist_ok=True)
         return d
 
+    def get_events(self, session_id: str, limit: int = 400) -> List[Dict[str, Any]]:
+        con = sqlite3.connect(self.db_path)
+        cur = con.cursor()
+        cur.execute("""
+            SELECT event_id, seq, ts_ms, role, text, digest, prev_hash, chain_hash, collapse
+            FROM events
+            WHERE session_id=?
+            ORDER BY seq ASC
+            LIMIT ?
+        """, (session_id, int(limit)))
+        rows = cur.fetchall()
+        con.close()
+
+        out = []
+        for r in rows:
+            out.append({
+                "event_id": r[0],
+                "seq": int(r[1] or 0),
+                "ts_ms": r[2],
+                "role": r[3],
+                "text": r[4],
+                "digest": r[5],
+                "prev_hash": r[6],
+                "chain_hash": r[7],
+                "collapse": float(r[8] or 0.0),
+            })
+        return out
+
     def collapse_score(self, session_id: str, role: str, text: str) -> float:
         role_w = {"user": 1.0, "tool": 0.9, "assistant": 0.6}.get(role, 0.7)
         tokens = set(t.lower() for t in re.findall(r"[A-Za-z0-9_]+", text or ""))
@@ -206,7 +233,7 @@ class RFTMemoryStore:
             f.flush()
             os.fsync(f.fileno())
 
-        # Update indexes
+        # Index update
         con = sqlite3.connect(self.db_path)
         cur = con.cursor()
         cur.execute("""
@@ -219,34 +246,6 @@ class RFTMemoryStore:
 
         return rec
 
-    def get_events(self, session_id: str, limit: int = 400) -> List[Dict[str, Any]]:
-        con = sqlite3.connect(self.db_path)
-        cur = con.cursor()
-        cur.execute("""
-            SELECT event_id, seq, ts_ms, role, text, digest, prev_hash, chain_hash, collapse
-            FROM events
-            WHERE session_id=?
-            ORDER BY seq ASC
-            LIMIT ?
-        """, (session_id, int(limit)))
-        rows = cur.fetchall()
-        con.close()
-
-        out = []
-        for r in rows:
-            out.append({
-                "event_id": r[0],
-                "seq": int(r[1] or 0),
-                "ts_ms": r[2],
-                "role": r[3],
-                "text": r[4],
-                "digest": r[5],
-                "prev_hash": r[6],
-                "chain_hash": r[7],
-                "collapse": float(r[8] or 0.0),
-            })
-        return out
-
     def search_lexical(self, session_id: str, query: str, k: int = 8) -> List[RetrievalHit]:
         match = safe_fts_match(query)
 
@@ -284,7 +283,7 @@ class RFTMemoryStore:
                 "event_id": h.event_id,
                 "seq": h.seq,
                 "role": h.role,
-                "text": h.text,
+                "content": h.text,
                 "score": h.score,
                 "digest": h.digest,
                 "chain_hash": h.chain_hash
@@ -360,8 +359,8 @@ GUIDED_DEMO_STEPS = [
     "What city did I say?",
     "My favourite drink is Coke Zero now. This overrides earlier.",
     "What’s my favourite drink?",
-    "Search for 'Nova' and show the matching memory line.",
-    "Search for 'Coke' and show the matching memory line.",
+    "Search for Nova and show the matching memory line.",
+    "Search for Coke and show the matching memory line.",
 ]
 
 HOW_TO_MD = """
@@ -396,6 +395,7 @@ def new_session_id() -> str:
 
 
 def events_to_messages(events: List[Dict[str, Any]]) -> List[Dict[str, str]]:
+    # Gradio expects: [{"role": "...", "content": "..."}, ...]
     msgs = []
     for e in events:
         if e["role"] in ("user", "assistant"):
@@ -455,20 +455,19 @@ def chat_turn(session_id: str, user_msg: str, retrieval_k: int):
     retrieved_view = "\n".join([f"{h.score:.4f} | {h.role} | {h.text}" for h in hits]) if hits else "(none)"
     messages = events_to_messages(events)
 
-    return session_id, messages, retrieved_view, ledger, receipt_path
+    # IMPORTANT: return receipt_path twice so File can download it
+    return session_id, messages, retrieved_view, ledger, receipt_path, receipt_path
 
 
 def run_guided_demo(session_id: str, retrieval_k: int):
     if not session_id:
         session_id = new_session_id()
 
-    last_receipt = ""
-    last_retrieved = ""
-    last_ledger = ""
+    last = (session_id, [], "", "", "", None)
     for step in GUIDED_DEMO_STEPS:
-        session_id, messages, last_retrieved, last_ledger, last_receipt = chat_turn(session_id, step, retrieval_k)
-
-    return session_id, messages, last_retrieved, last_ledger, last_receipt
+        last = chat_turn(session_id, step, retrieval_k)
+        session_id = last[0]
+    return last
 
 
 def manual_search(session_id: str, query: str, k: int) -> str:
@@ -501,7 +500,7 @@ def verify_uploaded_receipt(file_obj) -> str:
 
 def reset_session():
     sid = new_session_id()
-    return sid, [], "", "", None
+    return sid, [], "", "", "", None
 
 
 def fill_example(selected: str) -> str:
@@ -519,7 +518,8 @@ with gr.Blocks(title="RFT Memory Receipt Engine") as demo:
 
     with gr.Tabs():
         with gr.Tab("Chat"):
-            chatbot = gr.Chatbot(label="Conversation", height=320, type="messages")
+            # DO NOT pass type=... (your Gradio doesn't accept it)
+            chatbot = gr.Chatbot(label="Conversation", height=320)
 
             with gr.Row():
                 example_pick = gr.Dropdown(label="Example prompts", choices=EXAMPLE_PROMPTS, value=EXAMPLE_PROMPTS[0])
@@ -539,14 +539,14 @@ with gr.Blocks(title="RFT Memory Receipt Engine") as demo:
             send.click(
                 chat_turn,
                 inputs=[session_id, user_msg, retrieval_k],
-                outputs=[session_id, chatbot, retrieved_out, ledger_out, receipt_path],
-            ).then(lambda p: p, inputs=[receipt_path], outputs=[receipt_file])
+                outputs=[session_id, chatbot, retrieved_out, ledger_out, receipt_path, receipt_file],
+            )
 
         with gr.Tab("Guided Demo"):
             gr.Markdown("Runs a scripted set of messages to show storage, recall, overrides, search, and receipts.")
             run_demo_btn = gr.Button("Run Guided Demo", variant="primary")
 
-            demo_chatbot = gr.Chatbot(label="Demo conversation", height=320, type="messages")
+            demo_chatbot = gr.Chatbot(label="Demo conversation", height=320)
             demo_retrieved = gr.Textbox(label="Last retrieved memory slices", lines=8)
             demo_ledger = gr.Textbox(label="Ledger after demo", lines=14)
             demo_receipt_path = gr.Textbox(label="Last demo receipt path (server)", lines=1)
@@ -555,8 +555,8 @@ with gr.Blocks(title="RFT Memory Receipt Engine") as demo:
             run_demo_btn.click(
                 run_guided_demo,
                 inputs=[session_id, retrieval_k],
-                outputs=[session_id, demo_chatbot, demo_retrieved, demo_ledger, demo_receipt_path],
-            ).then(lambda p: p, inputs=[demo_receipt_path], outputs=[demo_receipt_file])
+                outputs=[session_id, demo_chatbot, demo_retrieved, demo_ledger, demo_receipt_path, demo_receipt_file],
+            )
 
         with gr.Tab("Manual Search"):
             q = gr.Textbox(label="Search query", placeholder="Type keywords…")
@@ -576,7 +576,7 @@ with gr.Blocks(title="RFT Memory Receipt Engine") as demo:
     new_sess_btn.click(
         reset_session,
         inputs=[],
-        outputs=[session_id, chatbot, retrieved_out, ledger_out, receipt_file],
+        outputs=[session_id, chatbot, retrieved_out, ledger_out, receipt_path, receipt_file],
     )
 
 demo.launch()