Skip to content

DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.

fix(chat): delete paired messages by branch ancestry

Bingxi Zhao (Frank)2046f7188887
diff --git a/deeptutor/services/session/sqlite_store.py b/deeptutor/services/session/sqlite_store.py
index bf2ca4e8e..60401b334 100644
--- a/deeptutor/services/session/sqlite_store.py
+++ b/deeptutor/services/session/sqlite_store.py
@@ -2139,7 +2139,7 @@ class SQLiteSessionStore:
with self._connect() as conn:
msg = conn.execute(
"""
- SELECT id, session_id, role, attachments_json, metadata_json, created_at
+ SELECT id, session_id, role, attachments_json, metadata_json, created_at, parent_message_id
FROM messages
WHERE id = ?
""",
@@ -2158,9 +2158,9 @@ class SQLiteSessionStore:
if role == "user":
paired_msg = conn.execute(
"""
- SELECT id, session_id, role, attachments_json, metadata_json, created_at
+ SELECT id, session_id, role, attachments_json, metadata_json, created_at, parent_message_id
FROM messages
- WHERE session_id = ? AND role = 'assistant' AND id > ?
+ WHERE session_id = ? AND role = 'assistant' AND parent_message_id = ?
ORDER BY id ASC
LIMIT 1
""",
@@ -2169,13 +2169,13 @@ class SQLiteSessionStore:
elif role == "assistant":
paired_msg = conn.execute(
"""
- SELECT id, session_id, role, attachments_json, metadata_json, created_at
+ SELECT id, session_id, role, attachments_json, metadata_json, created_at, parent_message_id
FROM messages
- WHERE session_id = ? AND role = 'user' AND id < ?
+ WHERE session_id = ? AND role = 'user' AND id = ?
ORDER BY id DESC
LIMIT 1
""",
- (session_id, int(message_id)),
+ (session_id, msg["parent_message_id"]),
).fetchone()
user_msg = msg if role == "user" else paired_msg
@@ -2242,6 +2242,21 @@ class SQLiteSessionStore:
"was_active": True,
}
+ if role == "assistant" and paired_msg is not None:
+ # Regenerated answers share their question with sibling answers.
+ # Deleting one branch must keep the question those siblings use.
+ sibling = conn.execute(
+ """
+ SELECT 1 FROM messages
+ WHERE session_id = ? AND role = 'assistant'
+ AND parent_message_id = ? AND id != ?
+ LIMIT 1
+ """,
+ (session_id, paired_msg["id"], int(message_id)),
+ ).fetchone()
+ if sibling is not None:
+ paired_msg = None
+
attachment_ids: list[str] = []
for m in [msg, paired_msg]:
if m is not None:
diff --git a/tests/services/session/test_sqlite_store.py b/tests/services/session/test_sqlite_store.py
index 245ae5af6..7c3e00149 100644
--- a/tests/services/session/test_sqlite_store.py
+++ b/tests/services/session/test_sqlite_store.py
@@ -1021,6 +1021,57 @@ def test_delete_regenerated_assistant_message_resolves_its_own_turn(
assert asyncio.run(store.get_turn(t1["id"])) is not None
assert asyncio.run(store.get_turn(t2["id"])) is not None
assert asyncio.run(store.get_turn(t3["id"])) is None
+ remaining = asyncio.run(store.get_messages(sid))
+ assert [m["content"] for m in remaining] == ["q1", "a1", "q2", "a2"]
+ assert remaining[1]["parent_message_id"] == u1
+ assert remaining[3]["parent_message_id"] == u2
+
+
+def test_delete_unanswered_user_does_not_pair_with_another_branch(
+ store: SQLiteSessionStore,
+) -> None:
+ sid = asyncio.run(store.create_session())["id"]
+ t1 = asyncio.run(store.begin_turn(sid, capability="chat"))
+ u1 = asyncio.run(store.add_message(sid, "user", "unanswered", metadata={"turn_id": t1["id"]}))
+ asyncio.run(store.transition_turn(t1["id"], "failed", expected_status="running"))
+ u2 = asyncio.run(store.add_message(sid, "user", "other question", parent_message_id=None))
+ a2 = asyncio.run(store.add_message(sid, "assistant", "other answer", parent_message_id=u2))
+
+ result = asyncio.run(store.delete_turn_by_message(sid, u1))
+
+ assert result["deleted"] is True
+ assert [m["id"] for m in asyncio.run(store.get_messages(sid))] == [u2, a2]
+
+
+def test_delete_regenerated_answer_leaves_parked_turn_and_shared_question(
+ store: SQLiteSessionStore,
+) -> None:
+ sid = asyncio.run(store.create_session())["id"]
+ t1 = asyncio.run(store.begin_turn(sid, capability="chat"))
+ u1 = asyncio.run(store.add_message(sid, "user", "q1", metadata={"turn_id": t1["id"]}))
+ a1 = asyncio.run(store.add_message(sid, "assistant", "a1", parent_message_id=u1))
+ asyncio.run(store.link_turn_message(t1["id"], a1))
+ asyncio.run(store.transition_turn(t1["id"], "completed", expected_status="running"))
+ regenerated_turn = asyncio.run(store.begin_turn(sid, capability="chat"))
+ regenerated = asyncio.run(
+ store.add_message(sid, "assistant", "regenerated", parent_message_id=u1)
+ )
+ asyncio.run(store.link_turn_message(regenerated_turn["id"], regenerated))
+ asyncio.run(
+ store.transition_turn(regenerated_turn["id"], "completed", expected_status="running")
+ )
+ waiting = asyncio.run(store.begin_turn(sid, capability="ask_questions"))
+ asyncio.run(store.add_message(sid, "user", "q2", metadata={"turn_id": waiting["id"]}))
+ asyncio.run(store.transition_turn(waiting["id"], "waiting_input", expected_status="running"))
+
+ result = asyncio.run(store.delete_turn_by_message(sid, regenerated))
+
+ assert result["deleted"] is True
+ assert [m["content"] for m in asyncio.run(store.get_messages(sid))] == ["q1", "a1", "q2"]
+ assert asyncio.run(store.get_turn(t1["id"])) is not None
+ parked = asyncio.run(store.get_turn(waiting["id"]))
+ assert parked is not None
+ assert parked["status"] == "waiting_input"
def test_delete_legacy_message_uses_ordering_fallback(store: SQLiteSessionStore) -> None: