kshitijk4poor
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).
104 lines
3.8 KiB
Python
104 lines
3.8 KiB
Python
"""Smoke tests for gateway /busy command dispatch."""
|
|
|
|
import pytest
|
|
|
|
import gateway.run as gateway_run
|
|
from gateway.config import Platform
|
|
from gateway.platforms.base import EphemeralReply
|
|
from gateway.platforms.event import MessageEvent
|
|
from gateway.session import SessionSource
|
|
|
|
|
|
def _make_runner(busy_mode="interrupt"):
|
|
"""Create a GatewayRunner with known busy mode."""
|
|
runner = object.__new__(gateway_run.GatewayRunner)
|
|
runner.session_store = None
|
|
runner.config = None
|
|
runner._busy_input_mode = busy_mode
|
|
return runner
|
|
|
|
|
|
def _make_event(text: str, chat_id: str = "chat-test") -> MessageEvent:
|
|
source = SessionSource(
|
|
platform=Platform.TELEGRAM,
|
|
user_id=f"user-{chat_id}",
|
|
chat_id=chat_id,
|
|
user_name="tester",
|
|
chat_type="dm",
|
|
)
|
|
return MessageEvent(text=text, source=source)
|
|
|
|
|
|
class TestBusyCommand:
|
|
"""Test /busy command dispatch without config persistence."""
|
|
|
|
@pytest.mark.asyncio
|
|
@pytest.mark.parametrize(
|
|
("command", "busy_mode"),
|
|
[("/busy status", "queue"), ("/busy", "steer")],
|
|
)
|
|
async def test_status_returns_current_mode(self, command, busy_mode):
|
|
"""Bare /busy and /busy status show the current busy mode."""
|
|
runner = _make_runner(busy_mode=busy_mode)
|
|
event = _make_event(command)
|
|
result = await runner._handle_busy_command(event)
|
|
reply_text = str(result).lower()
|
|
assert busy_mode in reply_text
|
|
assert "busy" in reply_text
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_busy_invalid_arg(self):
|
|
"""/busy with invalid arg returns error."""
|
|
runner = _make_runner()
|
|
event = _make_event("/busy bananas")
|
|
result = await runner._handle_busy_command(event)
|
|
assert "unknown" in str(result).lower()
|
|
|
|
class TestBusyCommandPersistence:
|
|
"""Test /busy persistence with mocked save_config_value."""
|
|
|
|
@pytest.mark.asyncio
|
|
@pytest.mark.parametrize(
|
|
("initial_mode", "new_mode"),
|
|
[
|
|
("interrupt", "queue"),
|
|
("queue", "steer"),
|
|
("queue", "interrupt"),
|
|
],
|
|
)
|
|
async def test_set_mode_persists(self, monkeypatch, initial_mode, new_mode):
|
|
"""Each supported /busy mode is saved and applied."""
|
|
runner = _make_runner(busy_mode=initial_mode)
|
|
runner._busy_text_mode = "interrupt"
|
|
monkeypatch.setattr("cli.save_config_value", lambda k, v: True)
|
|
# The handler re-derives _busy_text_mode from the saved config;
|
|
# emulate the write that the mocked save_config_value skipped.
|
|
monkeypatch.setattr(
|
|
gateway_run,
|
|
"_load_gateway_runtime_config",
|
|
lambda: {"display": {"busy_input_mode": new_mode}},
|
|
)
|
|
monkeypatch.delenv("HERMES_GATEWAY_BUSY_TEXT_MODE", raising=False)
|
|
monkeypatch.delenv("HERMES_GATEWAY_BUSY_INPUT_MODE", raising=False)
|
|
event = _make_event(f"/busy {new_mode}")
|
|
result = await runner._handle_busy_command(event)
|
|
assert new_mode in str(result).lower()
|
|
assert runner._busy_input_mode == new_mode
|
|
# busy_input_mode is the source of truth for the text mode: /busy
|
|
# queue must stop live text messages from interrupting (#97932).
|
|
assert runner._busy_text_mode == (
|
|
"queue" if new_mode == "queue" else "interrupt"
|
|
)
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_save_failure_preserves_mode(self, monkeypatch):
|
|
"""When save_config_value returns False, mode is unchanged."""
|
|
runner = _make_runner(busy_mode="steer")
|
|
monkeypatch.setattr(
|
|
"cli.save_config_value", lambda k, v: False
|
|
)
|
|
event = _make_event("/busy queue")
|
|
result = await runner._handle_busy_command(event)
|
|
assert "unchanged" in str(result).lower()
|
|
assert runner._busy_input_mode == "steer"
|