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.
70 lines
2.6 KiB
Python
70 lines
2.6 KiB
Python
"""Multiplex /p/<profile>/ routing for the api_server adapter.
|
|
|
|
Mirrors ``test_multiplex_http_routing.py`` (webhook): the default listener
|
|
owns the port, and secondary profiles are reached via a URL prefix when
|
|
``gateway.multiplex_profiles`` is on.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from gateway.config import GatewayConfig, PlatformConfig
|
|
from gateway.platforms.api_server import (
|
|
APIServerAdapter,
|
|
_PROFILE_REJECTED,
|
|
_api_request_profile,
|
|
)
|
|
|
|
|
|
def _make_adapter(multiplex: bool = True) -> APIServerAdapter:
|
|
cfg = PlatformConfig(enabled=True, extra={"host": "127.0.0.1", "port": 8642, "key": "test-key"})
|
|
adapter = APIServerAdapter(cfg)
|
|
|
|
class _Runner:
|
|
config = GatewayConfig(multiplex_profiles=multiplex)
|
|
|
|
adapter.gateway_runner = _Runner()
|
|
return adapter
|
|
|
|
|
|
class _FakeReq:
|
|
def __init__(self, profile=None):
|
|
self.match_info = {"profile": profile} if profile is not None else {}
|
|
|
|
|
|
class TestApiServerProfileResolution:
|
|
def test_no_prefix_returns_none(self):
|
|
adapter = _make_adapter(multiplex=True)
|
|
assert adapter._resolve_request_profile(_FakeReq(None)) is None
|
|
|
|
|
|
class TestApiServerRouteTable:
|
|
def test_route_table_includes_models_options_and_chat(self):
|
|
"""Model discovery and chat routes must survive profile multiplexing."""
|
|
adapter = _make_adapter(multiplex=True)
|
|
paths = {path for _method, path, _handler in adapter._http_route_table()}
|
|
assert "/v1/models" in paths
|
|
assert "/api/model/options" in paths
|
|
assert "/v1/chat/completions" in paths
|
|
assert "/api/sessions/{session_id}/model" in paths
|
|
# connect() mirrors every native path under /p/{profile}/…
|
|
mirrored = {f"/p/{{profile}}{path}" for path in paths}
|
|
assert "/p/{profile}/v1/models" in mirrored
|
|
assert "/p/{profile}/api/model/options" in mirrored
|
|
assert "/p/{profile}/v1/chat/completions" in mirrored
|
|
assert "/p/{profile}/api/sessions/{session_id}/model" in mirrored
|
|
|
|
|
|
class TestApiServerModelsUnderProfile:
|
|
def test_resolve_model_name_follows_active_profile(self, monkeypatch):
|
|
"""When the request is scoped to a named profile, advertise that name."""
|
|
adapter = _make_adapter(multiplex=True)
|
|
adapter._model_name = "hermes-agent"
|
|
monkeypatch.setattr(
|
|
"hermes_cli.profiles.get_active_profile_name",
|
|
lambda: "coder",
|
|
)
|
|
token_prof = _api_request_profile.set("coder")
|
|
try:
|
|
assert adapter._resolve_model_name("") == "coder"
|
|
finally:
|
|
_api_request_profile.reset(token_prof)
|