Skip to content

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

Merge commit '6cf793bd868ba5ecbe64722936d4be8fab5a01df' into fix/turn-admission-lease

dajiaohuang8ef659c4ce1a
diff --cc deeptutor/services/session/turns/request_preparer.py
index 38660d0ff,1124a8fca..928a5137e
--- a/deeptutor/services/session/turns/request_preparer.py
+++ b/deeptutor/services/session/turns/request_preparer.py
@@@ -549,6 -605,22 +605,12 @@@ class TurnRequestPreparer
],
}
payload = {**payload, "llm_selection": llm_selection}
+ if linked_task_ids is not None:
+ from deeptutor.services.task_board import LinkTasks, get_task_board_store
+ from deeptutor.services.workspace.context import current_workspace_id
+
+ task_links = LinkTasks(workspace_id=current_workspace_id(), task_ids=linked_task_ids)
+ await asyncio.to_thread(get_task_board_store().link_tasks, session["id"], task_links)
- 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.
@@@ -663,21 -733,21 +723,31 @@@
"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)
+ submission_kwargs = {}
+ if (
+ payload.get("client_submission_id")
+ and payload.get("persist_user_message", True)
+ and not payload.get("regenerate")
+ and callable(getattr(self.store, "reserve_submission", None))
+ ):
+ submission_kwargs["submission_id"] = payload["client_submission_id"]
if lease is None:
- turn = await self.store.create_turn(session["id"], capability=capability)
+ turn = await self.store.create_turn(
+ session["id"], capability=capability, **submission_kwargs
+ )
else:
turn = await self.store.begin_turn(
session["id"],