2466684db5
/model <name> on provider A, where the name is only known to provider B
(static catalog or OpenRouter), switched the session to B even when B had
no key: an immediate 401 for most vendors, and for OpenRouter — whose
runtime resolves with an EMPTY key instead of raising — a silent switch
onto a metered aggregator. The dashboard's flat Model field had two more
copies of the same guess ("vendor/model on a native provider" → openrouter).
detect_provider_for_model() now walks its ladder as candidates and skips any
target without credentials (env/.env key, auth-store login, or a usable
credential pool entry). Exceptions: the user NAMED the provider (/model nous)
or there is no current provider yet ("auto") — then the guess is handed back
so the credential step fails loudly instead of silently ignoring input. A
vendor/ prefix naming a provider declared in `providers:` is a selection, not
a guess, and always routes. The dashboard fallbacks apply the same gate.
Tests that pinned "switch to OpenRouter/vendor with no key" now grant the
credential they assumed; two new invariants cover the gate.
52 lines
2.5 KiB
Python
52 lines
2.5 KiB
Python
"""Auto-detection must never hand the user a provider they hold no credentials for.
|
|
|
|
Regression for the "accidental provider" class: ``/model <name>`` on provider A, where the name is
|
|
only known to provider B (static catalog or OpenRouter), used to switch the session to B even when
|
|
B had no key — an immediate 401 for most vendors, and for OpenRouter (whose runtime resolves with an
|
|
empty key instead of raising) a silent switch onto a metered aggregator.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from hermes_cli import models
|
|
|
|
|
|
@pytest.fixture
|
|
def no_live_catalog(monkeypatch):
|
|
monkeypatch.setattr(models, "cached_provider_model_ids", lambda provider, **_: [])
|
|
monkeypatch.setattr(models, "_find_openrouter_slug", lambda name: f"vendor/{name}")
|
|
|
|
|
|
@pytest.fixture
|
|
def authed(monkeypatch):
|
|
"""Pin which providers count as authenticated; everything else has no credentials."""
|
|
from hermes_cli import models_detect
|
|
|
|
granted: set[str] = set()
|
|
monkeypatch.setattr(models_detect, "provider_has_credentials", lambda p: p in granted)
|
|
return granted
|
|
|
|
|
|
class TestNoCredentialsNoSwitch:
|
|
def test_openrouter_only_model_stays_when_no_openrouter_key(self, no_live_catalog, authed):
|
|
assert models.detect_provider_for_model("some-model-only-openrouter-has", "deepseek") is None
|
|
|
|
def test_openrouter_remap_allowed_with_key(self, no_live_catalog, authed):
|
|
authed.add("openrouter")
|
|
assert models.detect_provider_for_model("some-model-only-openrouter-has", "deepseek") == (
|
|
"openrouter", "vendor/some-model-only-openrouter-has")
|
|
|
|
def test_static_vendor_match_requires_that_vendors_credentials(self, no_live_catalog, authed, monkeypatch):
|
|
monkeypatch.setattr(models, "detect_static_provider_for_model", lambda n, c: ("anthropic", n))
|
|
assert models.detect_provider_for_model("claude-something", "deepseek") is None
|
|
authed.add("anthropic")
|
|
assert models.detect_provider_for_model("claude-something", "deepseek") == ("anthropic", "claude-something")
|
|
|
|
def test_explicitly_named_provider_is_not_gated(self, no_live_catalog, authed, monkeypatch):
|
|
"""``/model nous`` names the provider: hand it back so the credential step can prompt/fail
|
|
loudly instead of silently ignoring the request."""
|
|
monkeypatch.setattr(models, "detect_static_provider_for_model", lambda n, c: ("nous", "hermes-4-405b"))
|
|
assert models.detect_provider_for_model("nous", "deepseek") == ("nous", "hermes-4-405b")
|