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).
102 lines
3.1 KiB
Python
102 lines
3.1 KiB
Python
"""Tests for the ``/bundles`` gateway slash command handler.
|
|
|
|
Verifies that:
|
|
- ``_handle_bundles_command`` returns useful text when no bundles are
|
|
installed and when several are.
|
|
- Bundle dispatch in ``_handle_message`` rewrites ``event.text`` to the
|
|
combined skill content when the user types ``/<bundle-slug>``.
|
|
|
|
The actual ``/<bundle-slug>`` → combined-message build is tested in
|
|
``tests/agent/test_skill_bundles.py``; this file only checks the gateway
|
|
glue (handler wiring, dispatch ordering, event.text rewrite).
|
|
"""
|
|
|
|
import asyncio
|
|
from types import SimpleNamespace
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
|
|
import pytest
|
|
|
|
from gateway.config import GatewayConfig, Platform, PlatformConfig
|
|
from gateway.platforms.event import MessageEvent
|
|
from gateway.session import SessionSource
|
|
|
|
|
|
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) -> MessageEvent:
|
|
return MessageEvent(text=text, source=_make_source(), message_id="m1")
|
|
|
|
|
|
def _make_runner():
|
|
from gateway.run import GatewayRunner
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
runner.config = GatewayConfig(
|
|
platforms={Platform.TELEGRAM: PlatformConfig(enabled=True, token="***")}
|
|
)
|
|
adapter = MagicMock()
|
|
adapter.send = AsyncMock()
|
|
runner.adapters = {Platform.TELEGRAM: adapter}
|
|
runner.hooks = SimpleNamespace(
|
|
emit=AsyncMock(),
|
|
emit_collect=AsyncMock(return_value=[]),
|
|
loaded_hooks=False,
|
|
)
|
|
return runner
|
|
|
|
|
|
@pytest.fixture
|
|
def bundles_env(tmp_path, monkeypatch):
|
|
bundles_dir = tmp_path / "skill-bundles"
|
|
skills_dir = tmp_path / "skills"
|
|
skills_dir.mkdir()
|
|
monkeypatch.setenv("HERMES_BUNDLES_DIR", str(bundles_dir))
|
|
import tools.skills_tool as skills_tool_module
|
|
monkeypatch.setattr(skills_tool_module, "SKILLS_DIR", skills_dir)
|
|
import agent.skill_bundles as mod
|
|
mod._bundles_cache = {}
|
|
mod._bundles_cache_mtime = None
|
|
return bundles_dir, skills_dir
|
|
|
|
|
|
def _make_skill(skills_dir, name, body="content"):
|
|
sd = skills_dir / name
|
|
sd.mkdir(parents=True, exist_ok=True)
|
|
(sd / "SKILL.md").write_text(
|
|
f"---\nname: {name}\ndescription: desc {name}\n---\n\n# {name}\n\n{body}\n"
|
|
)
|
|
|
|
|
|
def _make_bundle(bundles_dir, slug, skills):
|
|
bundles_dir.mkdir(parents=True, exist_ok=True)
|
|
(bundles_dir / f"{slug}.yaml").write_text(
|
|
f"name: {slug}\nskills:\n" + "\n".join(f" - {s}" for s in skills) + "\n"
|
|
)
|
|
|
|
|
|
class TestHandleBundlesCommand:
|
|
def test_empty(self, bundles_env):
|
|
runner = _make_runner()
|
|
result = asyncio.run(runner._handle_bundles_command(_make_event("/bundles")))
|
|
assert "No skill bundles" in result
|
|
|
|
|
|
class TestBundleResolutionPriority:
|
|
"""Verify resolve_bundle_command_key picks bundles over skills."""
|
|
|
|
def test_bundle_resolves(self, bundles_env):
|
|
bundles_dir, _ = bundles_env
|
|
_make_bundle(bundles_dir, "research", ["alpha"])
|
|
from agent.skill_bundles import resolve_bundle_command_key
|
|
assert resolve_bundle_command_key("research") == "/research"
|
|
|