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).
93 lines
3.1 KiB
Python
93 lines
3.1 KiB
Python
"""Tests for gateway /compress <focus> — focus topic on the gateway side."""
|
|
|
|
from datetime import datetime
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
from gateway.config import GatewayConfig, Platform, PlatformConfig
|
|
from gateway.platforms.event import MessageEvent
|
|
from gateway.session import SessionEntry, SessionSource, build_session_key
|
|
|
|
|
|
def _make_source() -> SessionSource:
|
|
return SessionSource(
|
|
platform=Platform.TELEGRAM,
|
|
user_id="u1",
|
|
chat_id="c1",
|
|
user_name="tester",
|
|
chat_type="dm",
|
|
)
|
|
|
|
|
|
def _make_event(text: str = "/compress") -> MessageEvent:
|
|
return MessageEvent(text=text, source=_make_source(), message_id="m1")
|
|
|
|
|
|
def _make_history() -> list[dict[str, str]]:
|
|
return [
|
|
{"role": "user", "content": "one"},
|
|
{"role": "assistant", "content": "two"},
|
|
{"role": "user", "content": "three"},
|
|
{"role": "assistant", "content": "four"},
|
|
]
|
|
|
|
|
|
def _make_runner(history: list[dict[str, str]]):
|
|
from gateway.run import GatewayRunner
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
runner.config = GatewayConfig(
|
|
platforms={Platform.TELEGRAM: PlatformConfig(enabled=True, token="***")}
|
|
)
|
|
session_entry = SessionEntry(
|
|
session_key=build_session_key(_make_source()),
|
|
session_id="sess-1",
|
|
created_at=datetime.now(),
|
|
updated_at=datetime.now(),
|
|
platform=Platform.TELEGRAM,
|
|
chat_type="dm",
|
|
)
|
|
runner.session_store = MagicMock()
|
|
runner.session_store.get_or_create_session.return_value = session_entry
|
|
runner.session_store.load_transcript.return_value = history
|
|
runner.session_store.rewrite_transcript = MagicMock()
|
|
runner.session_store.update_session = MagicMock()
|
|
runner.session_store._save = MagicMock()
|
|
runner._session_db = None
|
|
return runner
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_compress_focus_topic_passed_to_agent():
|
|
"""Focus topic from /compress <focus> is passed through to _compress_context."""
|
|
history = _make_history()
|
|
compressed = [history[0], history[-1]]
|
|
runner = _make_runner(history)
|
|
agent_instance = MagicMock()
|
|
agent_instance.context_compressor.has_content_to_compress.return_value = True
|
|
agent_instance.session_id = "sess-1"
|
|
agent_instance._compress_context.return_value = (compressed, "")
|
|
agent_instance._compression_skipped_due_to_lock = False
|
|
|
|
def _estimate(messages):
|
|
return 100
|
|
|
|
with (
|
|
patch("gateway.run._resolve_runtime_agent_kwargs", return_value={"api_key": "***"}),
|
|
patch("gateway.run._resolve_gateway_model", return_value="test-model"),
|
|
patch("run_agent.AIAgent", return_value=agent_instance),
|
|
patch("agent.model_metadata.estimate_messages_tokens_rough", side_effect=_estimate),
|
|
):
|
|
result = await runner._handle_compress_command(_make_event("/compress database schema"))
|
|
|
|
# Verify focus_topic was passed
|
|
agent_instance._compress_context.assert_called_once()
|
|
call_kwargs = agent_instance._compress_context.call_args
|
|
assert call_kwargs.kwargs.get("focus_topic") == "database schema"
|
|
|
|
# Verify focus is mentioned in response
|
|
assert 'Focus: "database schema"' in result
|
|
|
|
|