Skip to content

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

fix(session): keep current preferences when resending saved turn

Bingxi Zhao (Frank)0ec3c1644faf
diff --git a/deeptutor/core/turn_request.py b/deeptutor/core/turn_request.py
index a34afd2bb..fc5f91ad2 100644
--- a/deeptutor/core/turn_request.py
+++ b/deeptutor/core/turn_request.py
@@ -169,6 +169,9 @@ class TurnRequest(BaseModel):
course_id: str | None = None
persist_user_message: bool = True
regenerate: bool = False
+ # A saved failed-turn Resend repeats the old request without changing the
+ # conversation's current settings for future turns.
+ preserve_session_preferences: bool = False
# SQLite message rowids are integers; PocketBase message record ids are
# opaque strings. Preserve either form in the SESSION event for clients.
regenerated_from_message_id: int | str | None = None
diff --git a/deeptutor/services/session/turns/request_preparer.py b/deeptutor/services/session/turns/request_preparer.py
index 9b8494a7a..617e452cd 100644
--- a/deeptutor/services/session/turns/request_preparer.py
+++ b/deeptutor/services/session/turns/request_preparer.py
@@ -637,7 +637,8 @@ class TurnRequestPreparer:
"reading_material_id": "",
}
)
- await self.store.update_session_preferences(session["id"], preference_update)
+ if not payload.get("preserve_session_preferences"):
+ await self.store.update_session_preferences(session["id"], preference_update)
try:
if lease is None:
turn = await self.store.create_turn(session["id"], capability=capability)
@@ -990,6 +991,7 @@ class TurnRequestPreparer:
payload["llm_selection"] = llm_selection
if replay_snapshot:
+ payload["preserve_session_preferences"] = True
# The ordinary Regenerate path intentionally uses current session
# preferences for many fields. Resend instead repeats the failed
# message's saved request. Keys absent from an older snapshot keep
diff --git a/tests/services/session/test_regenerate.py b/tests/services/session/test_regenerate.py
index 343d6f2ad..87761d62a 100644
--- a/tests/services/session/test_regenerate.py
+++ b/tests/services/session/test_regenerate.py
@@ -322,6 +322,7 @@ class TestRegenerateLastTurn:
payload = recorder.calls[0]
assert "replay_snapshot" not in payload
if not replay_snapshot:
+ assert "preserve_session_preferences" not in payload
assert payload["capability"] == "chat"
assert payload["tools"] == ["brainstorm"]
assert payload["knowledge_bases"] == ["new-kb"]
@@ -331,6 +332,7 @@ class TestRegenerateLastTurn:
return
assert payload["capability"] == "deep_solve"
+ assert payload["preserve_session_preferences"] is True
assert payload["tools"] == ["web_search"]
assert payload["knowledge_bases"] == ["old-kb"]
assert payload["language"] == "zh"
@@ -533,7 +535,7 @@ class TestRegenerateLastTurn:
budget=0,
)
- responses = iter(["original answer", "regenerated answer"])
+ responses = iter(["original answer", "regenerated answer", "resent answer"])
class FakeOrchestrator:
async def handle(self, _context):
@@ -609,6 +611,17 @@ class TestRegenerateLastTurn:
# Memory refresh count must not increase on regenerate.
assert len(refresh_calls) == first_turn_refresh_count
+ # Resend replays the saved request, but a setting changed since that
+ # request must remain the conversation setting for later turns.
+ await store.update_session_preferences(sid, {"language": "zh"})
+ _, resend_turn = await runtime.regenerate_last_turn(
+ sid, overrides={"replay_snapshot": True}
+ )
+ async for _ in runtime.subscribe_turn(resend_turn["id"], after_seq=0):
+ pass
+ assert (await store.get_session(sid))["preferences"]["language"] == "zh"
+ assert (await store.get_messages(sid))[-1]["content"] == "resent answer"
+
def test_overrides_take_precedence(self, store: SQLiteSessionStore) -> None:
sid, _, _ = _seed_session(store)
runtime = TurnRuntimeManager(store=store)