ab2f4602de
Breaks the two import cycles that forced Protocol stand-ins in the F821 sweep, so the two sites now name the real types. gateway/platforms/event.py (new leaf): MessageType, ProcessingOutcome, MessageEvent moved out of base.py verbatim. Their only dependency is gateway.session.SessionSource; base.py imported helpers.py at module level, so helpers could not name MessageEvent. Now TextBatchAggregator is typed by the real MessageEvent. 249 importers repointed (`from gateway.platforms.base import` -> `.event`, preserving each import's layout); gateway.platforms.__init__ re-exports from .event. The three revert-scheduled PLUGIN-COMPAT pointers that named these symbols (gateway.slash_commands → MessageType, dingtalk → MessageType, photon → ProcessingOutcome) and their COMPAT_MANIFEST rows now target gateway.platforms.event. Docs updated: ADDING_A_PLATFORM.md, adding-platform-adapters.md (en + zh-Hans). tools/mcp_tool_sampling.py: ElicitationHandler no longer holds a back-reference to its MCPServerTask (mcp_tool imports sampling, so the task type cannot be named there). It only ever read owner._pending_call_context, so it takes `call_context: Callable[[], Context | None]` and MCPServerTask passes `lambda: self._pending_call_context`. The consent call is one `functools.partial`, run directly or inside the captured Context. ty on the 11 touched production files vs origin/main: 0 new diagnostics, 14 resolved. (The one `source: SessionSource = None` diagnostic moves with the class; typing it Optional exposes ~60 unguarded call sites — separate follow-up.) Tests: tests/gateway + tests/plugins + tests/tools + touched files, 18,235 passed; the 31 failures reproduce identically on origin/main (macOS /private/tmp, systemd socket, long-path fixtures, live-service tests).
157 lines
5.3 KiB
Python
157 lines
5.3 KiB
Python
"""Regression tests for #56391.
|
|
|
|
When context compression is in flight (state.db compression lock held),
|
|
gateway ``busy_input_mode='interrupt'`` must demote to queue semantics so a
|
|
rapid message burst cannot start a follow-up turn against the pre-rotation
|
|
parent and fork orphaned compression siblings.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import sys
|
|
import threading
|
|
import time
|
|
import types
|
|
from types import SimpleNamespace
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
_tg = types.ModuleType("telegram")
|
|
_tg.constants = types.ModuleType("telegram.constants")
|
|
_ct = MagicMock()
|
|
_ct.SUPERGROUP = "supergroup"
|
|
_ct.GROUP = "group"
|
|
_ct.PRIVATE = "private"
|
|
_tg.constants.ChatType = _ct
|
|
sys.modules.setdefault("telegram", _tg)
|
|
sys.modules.setdefault("telegram.constants", _tg.constants)
|
|
sys.modules.setdefault("telegram.ext", types.ModuleType("telegram.ext"))
|
|
|
|
from gateway.platforms.base import (
|
|
SessionSource,
|
|
build_session_key,
|
|
)
|
|
from gateway.platforms.event import MessageEvent, MessageType
|
|
from gateway.run import GatewayRunner, _AGENT_PENDING_SENTINEL # noqa: E402
|
|
|
|
|
|
def _make_event(text: str = "hello", chat_id: str = "123") -> MessageEvent:
|
|
source = SessionSource(
|
|
platform=MagicMock(value="telegram"),
|
|
chat_id=chat_id,
|
|
chat_type="private",
|
|
user_id="user1",
|
|
)
|
|
return MessageEvent(
|
|
text=text,
|
|
message_type=MessageType.TEXT,
|
|
source=source,
|
|
message_id="msg1",
|
|
)
|
|
|
|
|
|
def _make_runner(*, session_id: str = "parent-session") -> GatewayRunner:
|
|
runner = object.__new__(GatewayRunner)
|
|
runner._running_agents = {}
|
|
runner._running_agents_ts = {}
|
|
runner._pending_messages = {}
|
|
runner._busy_ack_ts = {}
|
|
runner._draining = False
|
|
runner.adapters = {}
|
|
runner.config = MagicMock()
|
|
runner.hooks = MagicMock()
|
|
runner.hooks.emit = AsyncMock()
|
|
runner.pairing_store = MagicMock()
|
|
runner.pairing_store.is_approved.return_value = True
|
|
runner._is_user_authorized = lambda _source: True
|
|
runner._busy_input_mode = "interrupt"
|
|
session_key = build_session_key(_make_event().source)
|
|
entry = SimpleNamespace(session_key=session_key, session_id=session_id)
|
|
session_store = SimpleNamespace(
|
|
_lock=threading.Lock(),
|
|
_entries={session_key: entry},
|
|
switch_session=MagicMock(),
|
|
)
|
|
session_store._ensure_loaded_locked = lambda: None
|
|
runner.session_store = session_store
|
|
runner._session_db = MagicMock()
|
|
runner._session_db._db = MagicMock()
|
|
runner._session_db._db.get_compression_lock_holder.return_value = None
|
|
return runner
|
|
|
|
|
|
def _make_adapter() -> MagicMock:
|
|
adapter = MagicMock()
|
|
adapter._pending_messages = {}
|
|
adapter._send_with_retry = AsyncMock()
|
|
adapter.config = MagicMock()
|
|
adapter.config.extra = {}
|
|
adapter.platform = MagicMock(value="telegram")
|
|
return adapter
|
|
|
|
|
|
def _make_parent_no_subagents() -> MagicMock:
|
|
parent = MagicMock()
|
|
parent._active_children = []
|
|
parent._active_children_lock = threading.Lock()
|
|
parent.get_activity_summary.return_value = {
|
|
"api_call_count": 3,
|
|
"max_iterations": 60,
|
|
"current_tool": "terminal",
|
|
}
|
|
return parent
|
|
|
|
|
|
class TestSessionHasCompressionInFlight:
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_returns_true_when_lock_held(self) -> None:
|
|
runner = _make_runner()
|
|
sk = build_session_key(_make_event().source)
|
|
runner._session_db._db.get_compression_lock_holder.return_value = "holder-1"
|
|
assert await runner._session_has_compression_in_flight(sk) is True
|
|
|
|
|
|
class TestBusyHandlerDemotesInterruptForCompression:
|
|
@pytest.mark.asyncio
|
|
async def test_does_not_interrupt_when_compression_in_flight(self) -> None:
|
|
runner = _make_runner()
|
|
adapter = _make_adapter()
|
|
event = _make_event(text="follow up during compression")
|
|
sk = build_session_key(event.source)
|
|
parent = _make_parent_no_subagents()
|
|
runner._running_agents[sk] = parent
|
|
runner.adapters[event.source.platform] = adapter
|
|
runner._session_db._db.get_compression_lock_holder.return_value = "compressing"
|
|
|
|
handled = await runner._handle_active_session_busy_message(event, sk)
|
|
|
|
assert handled is True
|
|
parent.interrupt.assert_not_called()
|
|
assert adapter._pending_messages.get(sk) is event
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_ack_explains_compression_demotion(self) -> None:
|
|
runner = _make_runner()
|
|
adapter = _make_adapter()
|
|
event = _make_event(text="hi mid-compress")
|
|
sk = build_session_key(event.source)
|
|
parent = _make_parent_no_subagents()
|
|
runner._running_agents[sk] = parent
|
|
runner._running_agents_ts[sk] = time.time() - 120
|
|
runner.adapters[event.source.platform] = adapter
|
|
runner._session_db._db.get_compression_lock_holder.return_value = "compressing"
|
|
|
|
with patch("gateway.platforms.base.merge_pending_message_event"):
|
|
await runner._handle_active_session_busy_message(event, sk)
|
|
|
|
adapter._send_with_retry.assert_called_once()
|
|
content = adapter._send_with_retry.call_args.kwargs.get("content", "")
|
|
assert "Compressing context" in content
|
|
assert "queued" in content.lower()
|
|
assert "/stop" in content
|
|
assert "Interrupting" not in content
|
|
|
|
|