Skip to content

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

fix(turns): release admission leases after preparation failures

dajiaohuang489b399cd4f8
diff --git a/deeptutor/services/session/turns/request_preparer.py b/deeptutor/services/session/turns/request_preparer.py
index 13965dc67..38660d0ff 100644
--- a/deeptutor/services/session/turns/request_preparer.py
+++ b/deeptutor/services/session/turns/request_preparer.py
@@ -549,16 +549,6 @@ class TurnRequestPreparer:
],
}
payload = {**payload, "llm_selection": llm_selection}
- lease = None
- if self.coordinator is not None:
- turn_id = f"turn_{int(time.time() * 1000)}_{uuid.uuid4().hex[:10]}"
- lease = await self.coordinator.acquire_turn(
- turn_id,
- f"{self._coordination_scope}:{session['id']}",
- self.owner_id,
- )
- if lease is None:
- raise RuntimeError("Session already has an active or recovering turn")
preference_update: dict[str, Any] = {
# Auto-routing is a one-turn execution choice; keep the durable
# preference on what the caller explicitly selected.
@@ -673,9 +663,19 @@ class TurnRequestPreparer:
"reading_material_id": "",
}
)
- if not payload.get("preserve_session_preferences"):
- await self.store.update_session_preferences(session["id"], preference_update)
+ lease = None
+ if self.coordinator is not None:
+ turn_id = f"turn_{int(time.time() * 1000)}_{uuid.uuid4().hex[:10]}"
+ lease = await self.coordinator.acquire_turn(
+ turn_id,
+ f"{self._coordination_scope}:{session['id']}",
+ self.owner_id,
+ )
+ if lease is None:
+ raise RuntimeError("Session already has an active or recovering turn")
try:
+ if not payload.get("preserve_session_preferences"):
+ await self.store.update_session_preferences(session["id"], preference_update)
if lease is None:
turn = await self.store.create_turn(session["id"], capability=capability)
else:
diff --git a/tests/services/session/test_turn_admission_lease.py b/tests/services/session/test_turn_admission_lease.py
new file mode 100644
index 000000000..02c1f4cf1
--- /dev/null
+++ b/tests/services/session/test_turn_admission_lease.py
@@ -0,0 +1,54 @@
+"""Rejected admissions must leave the session free for another request."""
+
+from __future__ import annotations
+
+import pytest
+
+from deeptutor.runtime.coordination.memory import MemoryCoordinator
+from deeptutor.services.session.sqlite_store import SQLiteSessionStore
+from deeptutor.services.session.turn_runtime import TurnRuntimeManager
+
+
[email protected]("failure", ["selection", "preferences", "begin"])
+async def test_rejected_admission_releases_coordinator_lease(tmp_path, monkeypatch, failure):
+ """Validate rejection using a real store and the production coordinator."""
+ store = SQLiteSessionStore(tmp_path / "admission.db")
+ coordinator = MemoryCoordinator()
+ runtime = TurnRuntimeManager(store, coordinator=coordinator, owner_id="worker")
+ session = await store.create_session()
+ payload = {
+ "type": "start_turn",
+ "session_id": session["id"],
+ "capability": "chat",
+ "content": "hello",
+ "tools": [],
+ "knowledge_bases": [],
+ "attachments": [],
+ "language": "en",
+ "config": {},
+ }
+ if failure == "selection":
+ payload["config"] = {"selection_tutor_context": {"selected_text": " "}}
+ expected = "requires selected text"
+ else:
+
+ async def reject(*args, **kwargs):
+ raise RuntimeError("admission storage failure")
+
+ method = "update_session_preferences" if failure == "preferences" else "begin_turn"
+ monkeypatch.setattr(store, method, reject)
+ expected = "admission storage failure"
+ try:
+ for _ in range(2):
+ with pytest.raises(RuntimeError, match=expected):
+ await runtime.start_turn(payload)
+ assert await store.get_active_turn(session["id"]) is None
+ lease = await coordinator.acquire_turn(
+ "probe", f"{runtime._coordination_scope}:{session['id']}", "probe-worker"
+ )
+ assert lease is not None
+ assert await coordinator.release_turn(lease)
+ finally:
+ await runtime.close()
+ await coordinator.close()