mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-30 11:52:04 +00:00
The generic live+curated merge (commit630b438) seeded the merged list from live results, demoting curated-only models below live ones. That regressed #46309, which deliberately surfaces the newest curated model (kimi-k2.7-code) FIRST in the native picker even when the live /models listing lags. Restore curated-first ordering: curated entries lead (in catalog order), live-only entries are appended for discovery. This keeps the #46850 fix (zai glm-5.2 now appears) without the kimi regression. Also switch the validate_requested_model curated fallback (commitee7b8a4) from provider_model_ids() — which triggers a second, uncached live /models fetch with its own 8s timeout and may resolve different credentials than the api_key/base_url just probed — to the pure-catalog helper _model_in_provider_catalog(). Membership is checked against the shipped catalog only, with no extra network call. Tests: restore the curated-first assertion in test_kimi_coding_live_catalog_does_not_hide_curated_k2_7_code; update the new merge tests to curated-first semantics; de-circularize the validation fallback tests to patch _PROVIDER_MODELS (the real source) instead of mocking the function under test.
199 lines
8.4 KiB
Python
199 lines
8.4 KiB
Python
"""Tests for live+curated merge in the generic profile-based provider path.
|
|
|
|
Guards the fix for #46850: when a provider's live /v1/models endpoint
|
|
returns a stale or incomplete list, the static curated models from
|
|
``_PROVIDER_MODELS`` must still appear in the merged result.
|
|
"""
|
|
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from hermes_cli.models import _PROVIDER_MODELS, provider_model_ids
|
|
|
|
|
|
class TestGenericProviderLiveCuratedMerge:
|
|
"""provider_model_ids merges live + curated for generic api_key providers."""
|
|
|
|
def _make_profile(self, models=None):
|
|
"""Create a minimal mock provider profile."""
|
|
p = MagicMock()
|
|
p.auth_type = "api_key"
|
|
p.base_url = "https://api.example.com/v1"
|
|
p.fetch_models.return_value = models
|
|
p.fallback_models = None
|
|
return p
|
|
|
|
def test_live_models_merged_with_curated(self):
|
|
"""Curated models come first; live-only models are appended."""
|
|
live = ["glm-5.2", "glm-5.1", "glm-5"]
|
|
curated = _PROVIDER_MODELS["zai"] # includes glm-5.1, glm-5, glm-4.5, etc.
|
|
profile = self._make_profile(live)
|
|
|
|
with (
|
|
patch("providers.get_provider_profile", return_value=profile),
|
|
patch("hermes_cli.auth.resolve_api_key_provider_credentials", return_value={"api_key": "k", "base_url": ""}),
|
|
):
|
|
result = provider_model_ids("zai")
|
|
|
|
# Curated entries first, in catalog order (keeps newest curated models
|
|
# like glm-5.2 at the top of the picker — see #46309).
|
|
assert result[: len(curated)] == list(curated)
|
|
assert result[0] == "glm-5.2"
|
|
# Models present in both live and curated are not duplicated.
|
|
assert result.count("glm-5.2") == 1
|
|
assert result.count("glm-5.1") == 1
|
|
# Curated-only entries are part of the result (e.g. glm-4.5).
|
|
result_lower = [m.lower() for m in result]
|
|
assert "glm-4.5" in result_lower
|
|
assert "glm-4.5-flash" in result_lower
|
|
|
|
def test_no_duplicate_models(self):
|
|
"""Models appearing in both live and curated are not duplicated."""
|
|
live = ["glm-5.1", "glm-5"]
|
|
curated = ["glm-5.1", "glm-5", "glm-4.5"]
|
|
profile = self._make_profile(live)
|
|
|
|
with (
|
|
patch("providers.get_provider_profile", return_value=profile),
|
|
patch("hermes_cli.auth.resolve_api_key_provider_credentials", return_value={"api_key": "k", "base_url": ""}),
|
|
patch.dict("hermes_cli.models._PROVIDER_MODELS", {"zai": curated}),
|
|
):
|
|
result = provider_model_ids("zai")
|
|
|
|
assert result.count("glm-5.1") == 1
|
|
assert result.count("glm-5") == 1
|
|
assert result == ["glm-5.1", "glm-5", "glm-4.5"]
|
|
|
|
def test_case_insensitive_dedup(self):
|
|
"""Dedup is case-insensitive but preserves first occurrence casing."""
|
|
live = ["GLM-5.1", "glm-5"]
|
|
curated = ["glm-5.1", "GLM-5", "glm-4.5"]
|
|
profile = self._make_profile(live)
|
|
|
|
with (
|
|
patch("providers.get_provider_profile", return_value=profile),
|
|
patch("hermes_cli.auth.resolve_api_key_provider_credentials", return_value={"api_key": "k", "base_url": ""}),
|
|
patch.dict("hermes_cli.models._PROVIDER_MODELS", {"zai": curated}),
|
|
):
|
|
result = provider_model_ids("zai")
|
|
|
|
# Curated-first: curated casing wins for models present in both.
|
|
assert result == ["glm-5.1", "GLM-5", "glm-4.5"]
|
|
|
|
def test_empty_curated_returns_live_only(self):
|
|
"""When no curated list exists, live is returned as-is."""
|
|
live = ["model-a", "model-b"]
|
|
profile = self._make_profile(live)
|
|
|
|
with (
|
|
patch("providers.get_provider_profile", return_value=profile),
|
|
patch("hermes_cli.auth.resolve_api_key_provider_credentials", return_value={"api_key": "k", "base_url": ""}),
|
|
patch.dict("hermes_cli.models._PROVIDER_MODELS", {"zai": []}),
|
|
):
|
|
result = provider_model_ids("zai")
|
|
|
|
assert result == ["model-a", "model-b"]
|
|
|
|
def test_live_empty_falls_back_to_curated(self):
|
|
"""When live returns nothing, curated static list is used.
|
|
|
|
ZAI is in _MODELS_DEV_PREFERRED so the fallback path merges with
|
|
models.dev. We mock _merge_with_models_dev to isolate the test.
|
|
"""
|
|
curated = ["glm-5.1", "glm-5", "glm-4.5"]
|
|
profile = self._make_profile([])
|
|
|
|
with (
|
|
patch("providers.get_provider_profile", return_value=profile),
|
|
patch("hermes_cli.auth.resolve_api_key_provider_credentials", return_value={"api_key": "k", "base_url": ""}),
|
|
patch.dict("hermes_cli.models._PROVIDER_MODELS", {"zai": curated}),
|
|
patch("hermes_cli.models._merge_with_models_dev", return_value=curated),
|
|
):
|
|
result = provider_model_ids("zai")
|
|
|
|
assert result == curated
|
|
|
|
|
|
class TestValidateRequestedModelCuratedFallback:
|
|
"""validate_requested_model falls back to curated catalog when live API omits model."""
|
|
|
|
def test_model_in_curated_but_not_live_is_accepted(self):
|
|
"""When live /v1/models omits a model that exists in the curated
|
|
catalog, validate_requested_model should accept it with a note.
|
|
|
|
Patches the real ``_PROVIDER_MODELS`` source (not the function under
|
|
test) so the curated-catalog fallback is genuinely exercised.
|
|
"""
|
|
from hermes_cli.models import validate_requested_model
|
|
|
|
# Live API returns only glm-5.1, but curated has glm-5.2
|
|
live_models = ["glm-5.1"]
|
|
curated = ["glm-5.2", "glm-5.1", "glm-5", "glm-4.5"]
|
|
|
|
with (
|
|
patch("hermes_cli.models.fetch_api_models", return_value=live_models),
|
|
patch.dict("hermes_cli.models._PROVIDER_MODELS", {"zai": curated}),
|
|
):
|
|
result = validate_requested_model("glm-5.2", "zai", api_key="dummy")
|
|
|
|
assert result["accepted"] is True
|
|
assert result["recognized"] is True
|
|
assert result["message"] is not None
|
|
assert "curated catalog" in result["message"]
|
|
|
|
def test_model_not_in_curated_nor_live_is_rejected(self):
|
|
"""When a model is in neither live nor curated, it should be rejected."""
|
|
from hermes_cli.models import validate_requested_model
|
|
|
|
live_models = ["glm-5.1"]
|
|
curated = ["glm-5.1", "glm-5", "glm-4.5"]
|
|
|
|
with (
|
|
patch("hermes_cli.models.fetch_api_models", return_value=live_models),
|
|
patch.dict("hermes_cli.models._PROVIDER_MODELS", {"zai": curated}),
|
|
):
|
|
result = validate_requested_model("nonexistent-model", "zai", api_key="dummy")
|
|
|
|
assert result["accepted"] is False
|
|
|
|
def test_model_in_live_is_accepted_without_curated_check(self):
|
|
"""When the model is in the live API, it should be accepted directly."""
|
|
from hermes_cli.models import validate_requested_model
|
|
|
|
live_models = ["glm-5.1", "glm-5"]
|
|
|
|
with patch("hermes_cli.models.fetch_api_models", return_value=live_models):
|
|
result = validate_requested_model("glm-5.1", "zai", api_key="dummy")
|
|
|
|
assert result["accepted"] is True
|
|
assert result["recognized"] is True
|
|
assert result["message"] is None
|
|
|
|
def test_curated_fallback_is_scoped_to_the_current_provider(self):
|
|
"""The curated fallback must not leak models across providers.
|
|
|
|
A model that lives in some OTHER provider's catalog (or only on an
|
|
aggregator like OpenRouter) must still be rejected when the current
|
|
provider neither lists it live nor ships it in its OWN curated
|
|
catalog. The fallback keys on ``_provider_keys(normalized)``, so
|
|
catalog membership is checked per-provider, never globally.
|
|
"""
|
|
from hermes_cli.models import validate_requested_model
|
|
|
|
# `some-other-model` is known to a DIFFERENT provider, not to zai.
|
|
# zai's live listing also omits it. It must be rejected.
|
|
live_models = ["glm-5.1"]
|
|
|
|
with (
|
|
patch("hermes_cli.models.fetch_api_models", return_value=live_models),
|
|
patch.dict(
|
|
"hermes_cli.models._PROVIDER_MODELS",
|
|
{"zai": ["glm-5.2", "glm-5.1"], "openrouter": ["some-other-model"]},
|
|
),
|
|
):
|
|
result = validate_requested_model("some-other-model", "zai", api_key="dummy")
|
|
|
|
assert result["accepted"] is False, (
|
|
"A model only present in another provider's catalog must not be "
|
|
"accepted on this provider via the curated fallback."
|
|
)
|
|
|