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).
82 lines
2.6 KiB
Python
82 lines
2.6 KiB
Python
"""Regression coverage for profile-scoped gateway ``/model`` reads."""
|
|
|
|
from types import SimpleNamespace
|
|
|
|
import pytest
|
|
|
|
from gateway.config import Platform
|
|
from gateway.platforms.event import MessageEvent, MessageType
|
|
from gateway.run import GatewayRunner
|
|
from gateway.session import SessionSource
|
|
|
|
|
|
class _CapturingPickerAdapter:
|
|
def __init__(self):
|
|
self.kwargs = None
|
|
|
|
async def send_model_picker(self, **kwargs):
|
|
self.kwargs = kwargs
|
|
return SimpleNamespace(success=True)
|
|
|
|
|
|
def _make_event():
|
|
return MessageEvent(
|
|
text="/model",
|
|
message_type=MessageType.TEXT,
|
|
source=SessionSource(
|
|
platform=Platform.TELEGRAM,
|
|
chat_id="secondary-chat",
|
|
chat_type="group",
|
|
),
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_model_picker_reads_routed_profile_config(tmp_path, monkeypatch):
|
|
import gateway.run as gateway_run
|
|
|
|
default_home = tmp_path / "default"
|
|
secondary_home = tmp_path / "profiles" / "secondary"
|
|
default_home.mkdir()
|
|
secondary_home.mkdir(parents=True)
|
|
(default_home / "config.yaml").write_text(
|
|
"model:\n default: default-model\n provider: default-provider\n",
|
|
encoding="utf-8",
|
|
)
|
|
(secondary_home / "config.yaml").write_text(
|
|
"model:\n default: secondary-model\n provider: secondary-provider\n",
|
|
encoding="utf-8",
|
|
)
|
|
monkeypatch.setattr(gateway_run, "_hermes_home", default_home)
|
|
monkeypatch.setattr("agent.models_dev.fetch_models_dev", lambda: {})
|
|
monkeypatch.setattr(
|
|
"hermes_cli.model_switch_providers.list_picker_providers",
|
|
lambda **_kwargs: [
|
|
{
|
|
"slug": "secondary-provider",
|
|
"name": "Secondary Provider",
|
|
"is_current": True,
|
|
"models": ["secondary-model"],
|
|
"total_models": 1,
|
|
}
|
|
],
|
|
)
|
|
|
|
runner = object.__new__(GatewayRunner)
|
|
adapter = _CapturingPickerAdapter()
|
|
runner.adapters = {Platform.TELEGRAM: adapter}
|
|
runner.config = SimpleNamespace(multiplex_profiles=True)
|
|
runner._voice_mode = {}
|
|
runner._session_model_overrides = {}
|
|
runner._running_agents = {}
|
|
runner._resolve_profile_home_for_source = lambda _source: secondary_home
|
|
runner._thread_metadata_for_source = lambda *_args, **_kwargs: None
|
|
runner._reply_anchor_for_event = lambda *_args, **_kwargs: None
|
|
|
|
result = await runner._handle_model_command(_make_event())
|
|
|
|
assert result is None
|
|
assert adapter.kwargs is not None
|
|
assert adapter.kwargs["current_model"] == "secondary-model"
|
|
assert adapter.kwargs["current_provider"] == "secondary-provider"
|