mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-25 17:18:11 +00:00
3638136e7e
A user who configured a provider only inside a MoA preset (advisor or
aggregator slot) has explicitly opted into that provider — the consent
gate (is_provider_explicitly_configured) now scans moa.reference_models,
moa.aggregator, and all moa.presets.* slots, so Claude Code OAuth pool
seeding and the auxiliary auto-fallback chain treat MoA-only Anthropic
users consistently with model.provider users.
Salvaged from PR #57778 (trimmed): the auxiliary_client fallback half of
the original PR was independently landed on main in ddd3a2d247 and is
dropped here; a secret-scrubber artifact in the gate test fixture is
restored to the real placeholder token.
231 lines
9 KiB
Python
231 lines
9 KiB
Python
"""Tests for is_provider_explicitly_configured()."""
|
|
|
|
import json
|
|
import pytest
|
|
|
|
|
|
def _write_config(tmp_path, config: dict) -> None:
|
|
hermes_home = tmp_path / "hermes"
|
|
hermes_home.mkdir(parents=True, exist_ok=True)
|
|
import yaml
|
|
(hermes_home / "config.yaml").write_text(yaml.dump(config))
|
|
|
|
|
|
def _write_auth_store(tmp_path, payload: dict) -> None:
|
|
hermes_home = tmp_path / "hermes"
|
|
hermes_home.mkdir(parents=True, exist_ok=True)
|
|
(hermes_home / "auth.json").write_text(json.dumps(payload, indent=2))
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _clean_anthropic_env(monkeypatch):
|
|
"""Strip Anthropic env vars so CI secrets don't leak into tests."""
|
|
for key in ("ANTHROPIC_API_KEY", "ANTHROPIC_TOKEN", "CLAUDE_CODE_OAUTH_TOKEN"):
|
|
monkeypatch.delenv(key, raising=False)
|
|
|
|
|
|
def test_returns_false_when_no_config(tmp_path, monkeypatch):
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hermes"))
|
|
(tmp_path / "hermes").mkdir(parents=True, exist_ok=True)
|
|
|
|
from hermes_cli.auth import is_provider_explicitly_configured
|
|
assert is_provider_explicitly_configured("anthropic") is False
|
|
|
|
|
|
def test_returns_true_when_active_provider_matches(tmp_path, monkeypatch):
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hermes"))
|
|
_write_auth_store(tmp_path, {
|
|
"version": 1,
|
|
"providers": {},
|
|
"active_provider": "anthropic",
|
|
})
|
|
|
|
from hermes_cli.auth import is_provider_explicitly_configured
|
|
assert is_provider_explicitly_configured("anthropic") is True
|
|
|
|
|
|
def test_returns_true_when_config_provider_matches(tmp_path, monkeypatch):
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hermes"))
|
|
_write_config(tmp_path, {"model": {"provider": "anthropic", "default": "claude-sonnet-4-6"}})
|
|
|
|
from hermes_cli.auth import is_provider_explicitly_configured
|
|
assert is_provider_explicitly_configured("anthropic") is True
|
|
|
|
|
|
def test_returns_false_when_config_provider_is_different(tmp_path, monkeypatch):
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hermes"))
|
|
_write_config(tmp_path, {"model": {"provider": "kimi-coding", "default": "kimi-k2"}})
|
|
_write_auth_store(tmp_path, {
|
|
"version": 1,
|
|
"providers": {},
|
|
"active_provider": None,
|
|
})
|
|
|
|
from hermes_cli.auth import is_provider_explicitly_configured
|
|
assert is_provider_explicitly_configured("anthropic") is False
|
|
|
|
|
|
def test_returns_true_when_anthropic_env_var_set(tmp_path, monkeypatch):
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hermes"))
|
|
monkeypatch.setenv("ANTHROPIC_API_KEY", "sk-ant-api03-realkey")
|
|
(tmp_path / "hermes").mkdir(parents=True, exist_ok=True)
|
|
|
|
from hermes_cli.auth import is_provider_explicitly_configured
|
|
assert is_provider_explicitly_configured("anthropic") is True
|
|
|
|
|
|
def test_claude_code_oauth_token_does_not_count_as_explicit(tmp_path, monkeypatch):
|
|
"""CLAUDE_CODE_OAUTH_TOKEN is set by Claude Code, not the user — must not gate."""
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hermes"))
|
|
monkeypatch.setenv("CLAUDE_CODE_OAUTH_TOKEN", "sk-ant-oat01-auto-token")
|
|
(tmp_path / "hermes").mkdir(parents=True, exist_ok=True)
|
|
|
|
from hermes_cli.auth import is_provider_explicitly_configured
|
|
assert is_provider_explicitly_configured("anthropic") is False
|
|
|
|
|
|
def test_ambient_pool_source_does_not_count_as_explicit(tmp_path, monkeypatch):
|
|
"""gh_cli-seeded Copilot pool entries are ambient, not explicit config (#56974)."""
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hermes"))
|
|
monkeypatch.delenv("COPILOT_GITHUB_TOKEN", raising=False)
|
|
monkeypatch.delenv("GH_TOKEN", raising=False)
|
|
monkeypatch.delenv("GITHUB_TOKEN", raising=False)
|
|
_write_auth_store(tmp_path, {
|
|
"version": 1,
|
|
"providers": {},
|
|
"active_provider": None,
|
|
"credential_pool": {
|
|
"copilot": [{
|
|
"id": "abc123",
|
|
"source": "gh_cli",
|
|
"auth_type": "api_key",
|
|
"access_token": "ghu_sometoken",
|
|
}],
|
|
},
|
|
})
|
|
|
|
from hermes_cli.auth import is_provider_explicitly_configured
|
|
assert is_provider_explicitly_configured("copilot") is False
|
|
|
|
|
|
def test_explicit_pool_source_counts_as_explicit(tmp_path, monkeypatch):
|
|
"""manual / device_code / PKCE pool entries reflect explicit Hermes flows."""
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hermes"))
|
|
_write_auth_store(tmp_path, {
|
|
"version": 1,
|
|
"providers": {},
|
|
"active_provider": None,
|
|
"credential_pool": {
|
|
"anthropic": [{
|
|
"id": "def456",
|
|
"source": "manual:key-1",
|
|
"auth_type": "api_key",
|
|
"access_token": "sk-ant-api03-key",
|
|
}],
|
|
},
|
|
})
|
|
|
|
from hermes_cli.auth import is_provider_explicitly_configured
|
|
assert is_provider_explicitly_configured("anthropic") is True
|
|
|
|
|
|
def test_returns_true_when_moa_reference_slot_uses_provider(tmp_path, monkeypatch):
|
|
"""MoA advisor slots are explicit provider selections for auth gating."""
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hermes"))
|
|
_write_config(tmp_path, {
|
|
"model": {"provider": "openai-codex", "default": "gpt-5.5"},
|
|
"moa": {
|
|
"presets": {
|
|
"default": {
|
|
"reference_models": [
|
|
{"provider": "anthropic", "model": "claude-opus-4-8"},
|
|
{"provider": "opencode-go", "model": "glm-5.2"},
|
|
],
|
|
"aggregator": {"provider": "openai-codex", "model": "gpt-5.5"},
|
|
}
|
|
}
|
|
},
|
|
})
|
|
_write_auth_store(tmp_path, {"version": 1, "providers": {}, "active_provider": "openai-codex"})
|
|
|
|
from hermes_cli.auth import is_provider_explicitly_configured
|
|
assert is_provider_explicitly_configured("anthropic") is True
|
|
|
|
|
|
def test_stale_env_pool_entry_does_not_count_when_var_unset(tmp_path, monkeypatch):
|
|
"""An env-seeded pool entry left in auth.json after the env var was removed
|
|
must not mark the provider configured (#55790): the picker showed removed
|
|
providers forever because the record existed even though no secret resolves."""
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hermes"))
|
|
monkeypatch.delenv("DEEPSEEK_API_KEY", raising=False)
|
|
_write_auth_store(tmp_path, {
|
|
"version": 1,
|
|
"providers": {},
|
|
"active_provider": None,
|
|
"credential_pool": {
|
|
"deepseek": [{
|
|
"id": "aaa111",
|
|
"source": "env:DEEPSEEK_API_KEY",
|
|
"auth_type": "api_key",
|
|
}],
|
|
},
|
|
})
|
|
|
|
from hermes_cli.auth import is_provider_explicitly_configured
|
|
assert is_provider_explicitly_configured("deepseek") is False
|
|
|
|
|
|
def test_env_pool_entry_counts_when_var_still_resolves(tmp_path, monkeypatch):
|
|
"""The same env-seeded pool entry IS explicit while the var still resolves."""
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hermes"))
|
|
monkeypatch.setenv("DEEPSEEK_API_KEY", "sk-deepseek-realkey-123456")
|
|
_write_auth_store(tmp_path, {
|
|
"version": 1,
|
|
"providers": {},
|
|
"active_provider": None,
|
|
"credential_pool": {
|
|
"deepseek": [{
|
|
"id": "aaa111",
|
|
"source": "env:DEEPSEEK_API_KEY",
|
|
"auth_type": "api_key",
|
|
}],
|
|
},
|
|
})
|
|
|
|
from hermes_cli.auth import is_provider_explicitly_configured
|
|
assert is_provider_explicitly_configured("deepseek") is True
|
|
|
|
|
|
def test_provider_not_in_registry_but_in_models_dev(tmp_path, monkeypatch):
|
|
"""Providers absent from PROVIDER_REGISTRY but present in the models.dev
|
|
catalog (e.g. openrouter) must still be detected via their env vars.
|
|
|
|
Regression: is_provider_explicitly_configured() only checked
|
|
PROVIDER_REGISTRY for env-var names, so providers that exist solely in
|
|
the models.dev catalog were never recognised as explicitly configured -
|
|
hiding them from the desktop model picker even when their API key was
|
|
set in .env.
|
|
"""
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hermes"))
|
|
monkeypatch.setenv("OPENROUTER_API_KEY", "sk-or-test-key-12345678")
|
|
monkeypatch.delenv("CLAUDE_CODE_OAUTH_TOKEN", raising=False)
|
|
(tmp_path / "hermes").mkdir(parents=True, exist_ok=True)
|
|
|
|
from hermes_cli.auth import is_provider_explicitly_configured
|
|
assert is_provider_explicitly_configured("openrouter") is True
|
|
|
|
|
|
def test_returns_true_when_moa_aggregator_uses_provider(tmp_path, monkeypatch):
|
|
"""MoA aggregator slots are explicit provider selections for auth gating."""
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path / "hermes"))
|
|
_write_config(tmp_path, {
|
|
"model": {"provider": "openai-codex", "default": "gpt-5.5"},
|
|
"moa": {
|
|
"reference_models": [{"provider": "opencode-go", "model": "glm-5.2"}],
|
|
"aggregator": {"provider": "anthropic", "model": "claude-opus-4-8"},
|
|
},
|
|
})
|
|
_write_auth_store(tmp_path, {"version": 1, "providers": {}, "active_provider": "openai-codex"})
|
|
|
|
from hermes_cli.auth import is_provider_explicitly_configured
|
|
assert is_provider_explicitly_configured("anthropic") is True
|