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).
71 lines
2.5 KiB
Python
71 lines
2.5 KiB
Python
import pytest
|
|
from unittest.mock import AsyncMock
|
|
|
|
from gateway.config import GatewayConfig, Platform, PlatformConfig
|
|
from gateway.platforms.base import SendResult
|
|
from gateway.platforms.event import MessageEvent, MessageType
|
|
from gateway.run import (
|
|
GatewayRunner,
|
|
_is_slack_ignored_channel,
|
|
_slack_ignored_channels_from_gateway_config,
|
|
)
|
|
from gateway.session import SessionSource
|
|
|
|
|
|
def _config_with_slack_extra(extra=None):
|
|
return GatewayConfig(
|
|
platforms={
|
|
Platform.SLACK: PlatformConfig(enabled=True, extra=extra or {}),
|
|
}
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_runner_drops_slack_ignored_channel_before_auth_hooks_and_sessions(monkeypatch):
|
|
runner = object.__new__(GatewayRunner)
|
|
runner.config = _config_with_slack_extra({"ignored_channels": "C_PRD"})
|
|
runner._startup_restore_in_progress = False
|
|
|
|
# If the guard regresses, _handle_message will proceed into hooks/auth/session
|
|
# setup and one of these sentinels will fail the test.
|
|
runner.session_store = object()
|
|
monkeypatch.setattr(
|
|
"hermes_cli.plugins.invoke_hook",
|
|
lambda *args, **kwargs: (_ for _ in ()).throw(AssertionError("hook should not run")),
|
|
)
|
|
runner._is_user_authorized = lambda source: (_ for _ in ()).throw(AssertionError("auth should not run"))
|
|
|
|
event = MessageEvent(
|
|
text="<@U_BOT> review this PRD",
|
|
message_type=MessageType.TEXT,
|
|
source=SessionSource(
|
|
platform=Platform.SLACK,
|
|
user_id="U_USER",
|
|
user_name="shubham",
|
|
chat_id="C_PRD",
|
|
chat_type="group",
|
|
),
|
|
)
|
|
|
|
assert await runner._handle_message(event) is None
|
|
|
|
|
|
def test_slack_ignored_channels_env_bridge_fallback(monkeypatch):
|
|
"""SLACK_IGNORED_CHANNELS (set by the plugin's YAML→env bridge) is
|
|
honored when PlatformConfig.extra carries no ignored_channels (#46925)."""
|
|
monkeypatch.setenv("SLACK_IGNORED_CHANNELS", "C_ENV1, C_ENV2")
|
|
config = _config_with_slack_extra({})
|
|
|
|
assert _slack_ignored_channels_from_gateway_config(config) == {"C_ENV1", "C_ENV2"}
|
|
assert _is_slack_ignored_channel(config, "C_ENV1")
|
|
assert not _is_slack_ignored_channel(config, "C_OTHER")
|
|
|
|
|
|
def test_slack_ignored_channels_extra_wins_over_env(monkeypatch):
|
|
"""Explicit PlatformConfig.extra config takes precedence over the env
|
|
bridge fallback."""
|
|
monkeypatch.setenv("SLACK_IGNORED_CHANNELS", "C_ENV")
|
|
config = _config_with_slack_extra({"ignored_channels": ["C_CFG"]})
|
|
|
|
assert _slack_ignored_channels_from_gateway_config(config) == {"C_CFG"}
|