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.
67 lines
2.9 KiB
Python
67 lines
2.9 KiB
Python
"""Regression tests for ``_normalize_main_model_assignment`` (POST /api/model/set).
|
|
|
|
Named custom providers are represented as ``custom:<name>`` slugs everywhere
|
|
else in the codebase (``runtime_provider.py``, ``model_switch.py``), but
|
|
``_KNOWN_PROVIDER_NAMES`` only lists the bare ``"custom"`` bucket. Before this
|
|
fix, persisting a main-slot assignment for a named custom provider (e.g. a
|
|
LiteLLM proxy fronting Ollama, registered as ``custom:litellm``) together with
|
|
a slash-bearing model id (``ollama/glm-5.2``) was indistinguishable from the
|
|
"vendor prefix posing as a provider" analytics-fallback case, and got silently
|
|
rewritten to ``provider: openrouter`` in ``config.yaml`` -- reassigning the
|
|
provider entirely, not just mangling the model id.
|
|
|
|
A properly *configured* ``custom:<name>`` provider is now resolved earlier,
|
|
via ``resolve_custom_provider`` against ``custom_providers``/``providers`` in
|
|
config -- that's the primary, intended path and isn't this module's concern
|
|
to re-test. What's tested here is the fallback safety net for when that
|
|
resolution comes up empty (typo, config drift, entry removed) -- a
|
|
``custom:<name>`` slug must still not be misread as a stray analytics vendor
|
|
prefix and reassigned to openrouter, even though it isn't in
|
|
``_KNOWN_PROVIDER_NAMES`` either.
|
|
"""
|
|
|
|
from unittest.mock import patch
|
|
|
|
from hermes_cli.web_server import _normalize_main_model_assignment
|
|
|
|
|
|
def _no_custom_providers_configured():
|
|
"""Patch load_config so resolve_user_provider/resolve_custom_provider
|
|
both come up empty, forcing execution into the fallback path under
|
|
test -- independent of whatever config.yaml happens to be on disk."""
|
|
return patch("hermes_cli.web_server.load_config", return_value={})
|
|
|
|
|
|
class TestUnresolvedNamedCustomProviderIsNotTreatedAsStrayVendorPrefix:
|
|
"""Covers the case where ``resolve_custom_provider`` finds no match --
|
|
e.g. ``custom:litellm`` was configured once, then the entry was renamed
|
|
or dropped from ``custom_providers``, but old sessions/config still
|
|
reference the old slug.
|
|
"""
|
|
|
|
def test_unresolved_named_custom_provider_slug_is_preserved(self):
|
|
with _no_custom_providers_configured():
|
|
assert _normalize_main_model_assignment("custom:litellm", "ollama/glm-5.2") == (
|
|
"custom:litellm",
|
|
"ollama/glm-5.2",
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class TestStrayVendorPrefixFallbackStillWorks:
|
|
"""The original bug this function fixes: an analytics row with no
|
|
``billing_provider`` falls back to the model's vendor prefix as the
|
|
"provider" (e.g. ``provider="anthropic"`` from
|
|
``modelVendor("anthropic/claude-opus-4.6")``). That must still resolve
|
|
to the native provider with its model normalized -- unaffected by the
|
|
``custom:`` exclusion above.
|
|
"""
|
|
|
|
def test_known_native_provider_still_normalizes_model(self):
|
|
assert _normalize_main_model_assignment(
|
|
"anthropic", "anthropic/claude-opus-4.6"
|
|
) == ("anthropic", "claude-opus-4-6")
|