39975613b1
Second, deeper pass over tools/gateway/hermes_cli plus first pass over the trees wave 1 missed (acp, acp_adapter, skills, computer_use, docker, dashboard, conformance, monitoring, secret_sources, hermes_state, providers). Same rubric as wave 1 (AGENTS.md test policy); security, alternation/caching invariants, issue-number regressions, and E2E kept. Real test-quality fixes found and rooted out along the way: - tests/tools/test_command_guards.py made real auxiliary-LLM HTTPS calls (DEFAULT_CONFIG smart-approval leaked in) — pinned approval mode=manual via autouse fixture: 17.4s → 0.4s. - test_model_switch_custom_providers.py / test_user_providers_model_switch.py silently probed live provider catalogs (~2s/test) — stubbed cached_provider_model_ids/provider_model_ids/fetch_api_models. - test_telegram_noise_filter.py: 15-platform copy-paste matrix over shared gateway.run logic → 3 representative platforms (55s → 3.9s). - test_gateway_shutdown.py: stop()'s 5s interrupt-deadline loop spun on MagicMock agents — interrupt.side_effect now clears _running_agents (22s → 1.0s). - test_gateway_inactivity_timeout.py poll-harness timings shrunk 3-5x (24s → 1.1s); test_mcp_stability.py backoff/SIGTERM-grace sleeps patched (15.4s → 2.5s); test_async_delegation.py negative-drain wait 5s → 0.5s. - test_telegram_init_deadline.py: loop-block margin restored to 1.0s with rationale comment — the watchdog-dump assertion needs the loop blocked well past deadline+grace under parallel load (flaked once in the 40-worker verification run at a 0.2s margin). Verification: full hermetic suite via scripts/run_tests.sh — 2,438 files, 21,718 tests passed, 0 failed, 293.9s wall. Suite totals vs original baseline: 46,820 → 19,757 test functions (−57.8%), wall 583.5s → 293.9s (−50%), subprocess CPU 13,564s → 11,623s.
157 lines
5.2 KiB
Python
157 lines
5.2 KiB
Python
"""Tests for per-channel model and system prompt overrides (Fixes #1955)."""
|
|
|
|
from unittest.mock import patch
|
|
|
|
import pytest
|
|
|
|
from gateway.config import (
|
|
ChannelOverride,
|
|
GatewayConfig,
|
|
Platform,
|
|
PlatformConfig,
|
|
)
|
|
from gateway.run import _get_channel_override, GatewayRunner
|
|
from gateway.session import SessionSource
|
|
|
|
|
|
class TestGetChannelOverride:
|
|
|
|
|
|
def test_no_override_when_channel_not_in_overrides(self):
|
|
config = GatewayConfig(
|
|
platforms={
|
|
Platform.DISCORD: PlatformConfig(
|
|
enabled=True,
|
|
channel_overrides={
|
|
"999": ChannelOverride(model="openrouter/healer-alpha"),
|
|
},
|
|
),
|
|
},
|
|
)
|
|
assert _get_channel_override(config, Platform.DISCORD, "123") is None
|
|
|
|
def test_returns_override_when_channel_matches(self):
|
|
ov = ChannelOverride(
|
|
model="openrouter/healer-alpha",
|
|
provider="openrouter",
|
|
system_prompt="You are a summarizer.",
|
|
)
|
|
config = GatewayConfig(
|
|
platforms={
|
|
Platform.DISCORD: PlatformConfig(
|
|
enabled=True,
|
|
channel_overrides={"1234567890": ov},
|
|
),
|
|
},
|
|
)
|
|
result = _get_channel_override(config, Platform.DISCORD, "1234567890")
|
|
assert result is not None
|
|
assert result.model == "openrouter/healer-alpha"
|
|
assert result.provider == "openrouter"
|
|
assert result.system_prompt == "You are a summarizer."
|
|
|
|
|
|
def test_thread_id_lookup_when_chat_id_misses(self):
|
|
config = GatewayConfig(
|
|
platforms={
|
|
Platform.DISCORD: PlatformConfig(
|
|
enabled=True,
|
|
channel_overrides={
|
|
"thread_99": ChannelOverride(model="topic-model"),
|
|
},
|
|
),
|
|
},
|
|
)
|
|
result = _get_channel_override(
|
|
config, Platform.DISCORD, "parent_chan", thread_id="thread_99"
|
|
)
|
|
assert result is not None
|
|
assert result.model == "topic-model"
|
|
|
|
|
|
class TestResolveModelForChannel:
|
|
def test_uses_channel_override_when_present(self):
|
|
config = GatewayConfig(
|
|
platforms={
|
|
Platform.DISCORD: PlatformConfig(
|
|
enabled=True,
|
|
channel_overrides={
|
|
"chan_1": ChannelOverride(model="anthropic/claude-opus-4.6"),
|
|
},
|
|
),
|
|
},
|
|
)
|
|
runner = object.__new__(GatewayRunner)
|
|
runner.config = config
|
|
model = runner._resolve_model_for_channel(Platform.DISCORD, "chan_1")
|
|
assert model == "anthropic/claude-opus-4.6"
|
|
|
|
|
|
class TestGetSystemPromptForChannel:
|
|
def test_uses_channel_override_when_present(self):
|
|
config = GatewayConfig(
|
|
platforms={
|
|
Platform.DISCORD: PlatformConfig(
|
|
enabled=True,
|
|
channel_overrides={
|
|
"chan_1": ChannelOverride(system_prompt="You are a coding assistant."),
|
|
},
|
|
),
|
|
},
|
|
)
|
|
runner = object.__new__(GatewayRunner)
|
|
runner.config = config
|
|
runner._ephemeral_system_prompt = "Global prompt"
|
|
prompt = runner._get_system_prompt_for_channel(Platform.DISCORD, "chan_1")
|
|
assert prompt == "You are a coding assistant."
|
|
|
|
|
|
class TestResolveSessionAgentRuntimePriority:
|
|
"""Model/runtime priority: session /model → channel_overrides → global."""
|
|
|
|
def test_channel_override_beats_global(self):
|
|
runner = object.__new__(GatewayRunner)
|
|
runner._session_model_overrides = {}
|
|
runner.config = GatewayConfig(
|
|
platforms={
|
|
Platform.DISCORD: PlatformConfig(
|
|
enabled=True,
|
|
channel_overrides={
|
|
"chan_1": ChannelOverride(
|
|
model="channel/model",
|
|
provider="openrouter",
|
|
),
|
|
},
|
|
),
|
|
},
|
|
)
|
|
source = SessionSource(
|
|
platform=Platform.DISCORD,
|
|
chat_id="chan_1",
|
|
user_id="u1",
|
|
)
|
|
with patch("gateway.run._resolve_gateway_model", return_value="global/model"), \
|
|
patch("gateway.run._resolve_runtime_agent_kwargs", return_value={
|
|
"provider": "anthropic",
|
|
"api_key": "k",
|
|
"base_url": "https://api.anthropic.com",
|
|
"api_mode": "chat_completions",
|
|
}), \
|
|
patch(
|
|
"gateway.run._resolve_runtime_agent_kwargs_for_provider",
|
|
return_value={
|
|
"provider": "openrouter",
|
|
"api_key": "k2",
|
|
"base_url": "https://openrouter.ai/api/v1",
|
|
"api_mode": "chat_completions",
|
|
},
|
|
):
|
|
model, runtime = runner._resolve_session_agent_runtime(
|
|
source=source,
|
|
user_config={"model": {"default": "global/model"}},
|
|
)
|
|
assert model == "channel/model"
|
|
assert runtime["provider"] == "openrouter"
|
|
|
|
|