DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.
Python ai-agentsai-tutorclawbotcli-tooldeepresearchinteractive-learninglearningmulti-agent-systemsrag
fix(partners): release turn state after cancellation
dajiaohuangd63a040c1eb0
diff --git a/deeptutor/services/partners/manager.py b/deeptutor/services/partners/manager.pyindex e4879003f..b54beb219 100644--- a/deeptutor/services/partners/manager.py+++ b/deeptutor/services/partners/manager.py@@ -905,10 +905,14 @@ class PartnerManager:self._load_auto_start(partner_id, default=True) if preserve_auto_start else False)- for task in instance.tasks:+ tasks = [+ *instance.tasks,+ *(turn.task for turn in instance.live_turns.values() if turn.task is not None),+ ]+ for task in tasks:if not task.done():task.cancel()- for task in instance.tasks:+ for task in tasks:try:await asyncio.wait_for(asyncio.shield(task), timeout=5.0)except (asyncio.CancelledError, asyncio.TimeoutError):@@ -1319,6 +1323,15 @@ class PartnerManager:self._drive_web_turn(partner_id, session_key, content, media or [], turn),name=f"partner:{partner_id}:webturn",)++ def finish_cancelled(task: asyncio.Task) -> None:+ # A task cancelled before its first step never enters the+ # driver's try/except, but subscribers and its lease still need+ # the terminal notification.+ if task.cancelled() and not turn.done:+ turn.finish([{"type": "stopped"}])++ turn.task.add_done_callback(finish_cancelled)except Exception:turn.finish([])instance.live_turns.pop(session_key, None)diff --git a/tests/services/partners/test_turn_stop_cleanup.py b/tests/services/partners/test_turn_stop_cleanup.pynew file mode 100644index 000000000..75fb408a6--- /dev/null+++ b/tests/services/partners/test_turn_stop_cleanup.py@@ -0,0 +1,59 @@+"""Partner stop boundaries own their detached web and inbound turns."""++import asyncio++import pytest++from deeptutor.services.partners.manager import PartnerConfig, PartnerManager++[email protected]("queued", [True, False])+async def test_stop_partner_finishes_web_turn_and_releases_file_lease(+ partners_root, monkeypatch, queued+):+ manager = PartnerManager()+ manager.save_config("ada", PartnerConfig(name="Ada"))+ await manager.start_partner("ada")+ entered = asyncio.Event()++ async def pending_reply(*args, **kwargs):+ entered.set()+ await asyncio.Event().wait()++ monkeypatch.setattr(manager, "send_message", pending_reply)+ turn = manager.start_web_turn("ada", "web-test", "question")+ queue = turn.subscribe()+ try:+ if not queued:+ await asyncio.wait_for(entered.wait(), timeout=1)+ await manager.stop_partner("ada")+ assert turn.task.done()+ assert turn.done+ assert queue.get_nowait()["type"] == "stopped"+ assert not manager.web_session_is_busy("ada", "web-test")+ finally:+ turn.task.cancel()+ await asyncio.gather(turn.task, return_exceptions=True)+ if not turn.done:+ turn.finish([])+ await manager.stop_partner("ada")+++async def test_immediate_stop_web_turn_finishes_queued_task(partners_root):+ manager = PartnerManager()+ manager.save_config("ada", PartnerConfig(name="Ada"))+ await manager.start_partner("ada")+ turn = manager.start_web_turn("ada", "web-test", "question")+ queue = turn.subscribe()+ try:+ assert manager.stop_web_turn("ada", "web-test")+ await asyncio.gather(turn.task, return_exceptions=True)+ assert turn.done+ assert queue.get_nowait()["type"] == "stopped"+ assert not manager.web_session_is_busy("ada", "web-test")+ finally:+ if not turn.done:+ turn.finish([])+ await manager.stop_partner("ada")