mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-28 23:11:37 +08:00
Follow-up to cherry-picked PR #15920: - agent/credential_pool.py: hoist 'from hermes_cli.config import get_env_value' to module top instead of inline try/except in each seed site (3 sites). No import cycle — hermes_cli/config.py doesn't depend on agent.credential_pool. - hermes_cli/auth.py: same hoist for the _resolve_api_key_provider_secret loop. - tests/tools/test_credential_pool_env_fallback.py: replace smoke-only tests with real .env file I/O. Each test writes a temp ~/.hermes/.env, verifies _seed_from_env / _resolve_api_key_provider_secret read from it, and asserts the full priority chain: os.environ > .env > credential_pool. Uses 'deepseek' as the test provider since 'openai' isn't in PROVIDER_REGISTRY and _seed_from_env's generic path requires a real pconfig lookup.
211 lines
8.5 KiB
Python
211 lines
8.5 KiB
Python
"""Tests for credential_pool .env fallback and auth credential_pool lookup.
|
|
|
|
Covers the fix from #15914 / PR #15920:
|
|
- _seed_from_env reads API keys from ~/.hermes/.env when not in os.environ
|
|
- _resolve_api_key_provider_secret falls back to credential_pool when env vars are empty
|
|
- env vars take priority over .env file (handled by get_env_value itself)
|
|
- env vars take priority over credential pool (fallback only kicks in when env is empty)
|
|
"""
|
|
|
|
import os
|
|
from pathlib import Path
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
|
|
|
|
def _make_pconfig(provider_id="deepseek", env_vars=None):
|
|
"""Create a minimal ProviderConfig for testing.
|
|
|
|
Default provider_id is 'deepseek' because it's a real api_key provider
|
|
in PROVIDER_REGISTRY (needed for _seed_from_env's generic path).
|
|
"""
|
|
from hermes_cli.auth import ProviderConfig
|
|
return ProviderConfig(
|
|
id=provider_id,
|
|
name=provider_id.title(),
|
|
auth_type="api_key",
|
|
api_key_env_vars=tuple(env_vars or [f"{provider_id.upper()}_API_KEY"]),
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def isolated_hermes_home(tmp_path, monkeypatch):
|
|
"""Point HERMES_HOME at a temp dir and clear known API key env vars.
|
|
|
|
Also invalidates any cached get_env_value state by patching Path.home().
|
|
"""
|
|
home = tmp_path / ".hermes"
|
|
home.mkdir()
|
|
monkeypatch.setattr(Path, "home", lambda: tmp_path)
|
|
monkeypatch.setenv("HERMES_HOME", str(home))
|
|
|
|
# Clear all known API key env vars so get_env_value falls through to .env
|
|
for key in [
|
|
"OPENAI_API_KEY", "ANTHROPIC_API_KEY", "OPENROUTER_API_KEY",
|
|
"ZAI_API_KEY", "DEEPSEEK_API_KEY", "ANTHROPIC_TOKEN",
|
|
"CLAUDE_CODE_OAUTH_TOKEN", "OPENAI_BASE_URL",
|
|
]:
|
|
monkeypatch.delenv(key, raising=False)
|
|
|
|
return home
|
|
|
|
|
|
def _write_env_file(home: Path, **kwargs) -> None:
|
|
"""Write key=value pairs to ~/.hermes/.env."""
|
|
lines = [f"{k}={v}" for k, v in kwargs.items()]
|
|
(home / ".env").write_text("\n".join(lines) + "\n")
|
|
|
|
|
|
class TestCredentialPoolSeedsFromDotEnv:
|
|
"""_seed_from_env must read keys from ~/.hermes/.env, not just os.environ.
|
|
|
|
This is the load-bearing behaviour for the fix: when a user adds a key to
|
|
.env mid-session or via a non-CLI entry point that doesn't run
|
|
load_hermes_dotenv, the credential pool must still discover it.
|
|
"""
|
|
|
|
def test_deepseek_key_from_dotenv_only(self, isolated_hermes_home):
|
|
"""Key in .env but not os.environ → _seed_from_env adds a pool entry."""
|
|
_write_env_file(isolated_hermes_home, DEEPSEEK_API_KEY="sk-dotenv-only-12345")
|
|
assert "DEEPSEEK_API_KEY" not in os.environ
|
|
|
|
from agent.credential_pool import _seed_from_env
|
|
entries = []
|
|
changed, active_sources = _seed_from_env("deepseek", entries)
|
|
|
|
assert changed is True
|
|
assert "env:DEEPSEEK_API_KEY" in active_sources
|
|
assert any(
|
|
e.access_token == "sk-dotenv-only-12345"
|
|
and e.source == "env:DEEPSEEK_API_KEY"
|
|
for e in entries
|
|
), f"Expected seeded entry with dotenv key, got: {[(e.source, e.access_token) for e in entries]}"
|
|
|
|
def test_openrouter_key_from_dotenv_only(self, isolated_hermes_home):
|
|
"""OpenRouter path has its own branch — verify it also reads .env."""
|
|
_write_env_file(isolated_hermes_home, OPENROUTER_API_KEY="sk-or-dotenv-abc")
|
|
assert "OPENROUTER_API_KEY" not in os.environ
|
|
|
|
from agent.credential_pool import _seed_from_env
|
|
entries = []
|
|
changed, active_sources = _seed_from_env("openrouter", entries)
|
|
|
|
assert changed is True
|
|
assert "env:OPENROUTER_API_KEY" in active_sources
|
|
assert any(
|
|
e.access_token == "sk-or-dotenv-abc" for e in entries
|
|
)
|
|
|
|
def test_empty_dotenv_no_entries(self, isolated_hermes_home):
|
|
"""No .env file, no env vars → no entries seeded (and no crash)."""
|
|
from agent.credential_pool import _seed_from_env
|
|
entries = []
|
|
changed, active_sources = _seed_from_env("deepseek", entries)
|
|
assert changed is False
|
|
assert active_sources == set()
|
|
assert entries == []
|
|
|
|
def test_os_environ_still_wins_over_dotenv(self, isolated_hermes_home, monkeypatch):
|
|
"""get_env_value checks os.environ first — verify seeding picks that up."""
|
|
_write_env_file(isolated_hermes_home, DEEPSEEK_API_KEY="sk-dotenv-stale")
|
|
monkeypatch.setenv("DEEPSEEK_API_KEY", "sk-env-fresh-xyz")
|
|
|
|
from agent.credential_pool import _seed_from_env
|
|
entries = []
|
|
changed, _ = _seed_from_env("deepseek", entries)
|
|
|
|
assert changed is True
|
|
seeded = [e for e in entries if e.source == "env:DEEPSEEK_API_KEY"]
|
|
assert len(seeded) == 1
|
|
assert seeded[0].access_token == "sk-env-fresh-xyz"
|
|
|
|
|
|
class TestAuthResolvesFromDotEnv:
|
|
"""_resolve_api_key_provider_secret must also read from ~/.hermes/.env."""
|
|
|
|
def test_key_from_dotenv_only(self, isolated_hermes_home):
|
|
"""Key in .env but not os.environ → _resolve returns it with the env var source."""
|
|
_write_env_file(isolated_hermes_home, DEEPSEEK_API_KEY="sk-dotenv-resolve-789")
|
|
assert "DEEPSEEK_API_KEY" not in os.environ
|
|
|
|
from hermes_cli.auth import _resolve_api_key_provider_secret
|
|
key, source = _resolve_api_key_provider_secret(
|
|
provider_id="deepseek",
|
|
pconfig=_make_pconfig(),
|
|
)
|
|
assert key == "sk-dotenv-resolve-789"
|
|
assert source == "DEEPSEEK_API_KEY"
|
|
|
|
|
|
class TestAuthCredentialPoolFallback:
|
|
"""_resolve_api_key_provider_secret falls back to credential pool when env + dotenv are empty."""
|
|
|
|
def test_credential_pool_fallback_structure(self, isolated_hermes_home):
|
|
"""Empty env + empty .env → auth falls back to credential pool."""
|
|
mock_entry = MagicMock()
|
|
mock_entry.access_token = "test-pool-key-12345"
|
|
mock_entry.runtime_api_key = ""
|
|
|
|
mock_pool = MagicMock()
|
|
mock_pool.has_credentials.return_value = True
|
|
mock_pool.peek.return_value = mock_entry
|
|
|
|
from hermes_cli.auth import _resolve_api_key_provider_secret
|
|
with patch("agent.credential_pool.load_pool", return_value=mock_pool):
|
|
key, source = _resolve_api_key_provider_secret(
|
|
provider_id="deepseek",
|
|
pconfig=_make_pconfig(),
|
|
)
|
|
assert "test-pool-key-12345" in key
|
|
assert "credential_pool" in source
|
|
|
|
def test_credential_pool_empty_returns_empty(self, isolated_hermes_home):
|
|
"""Empty env + empty .env + empty pool → empty string."""
|
|
mock_pool = MagicMock()
|
|
mock_pool.has_credentials.return_value = False
|
|
|
|
from hermes_cli.auth import _resolve_api_key_provider_secret
|
|
with patch("agent.credential_pool.load_pool", return_value=mock_pool):
|
|
key, source = _resolve_api_key_provider_secret(
|
|
provider_id="deepseek",
|
|
pconfig=_make_pconfig(),
|
|
)
|
|
assert key == ""
|
|
|
|
def test_env_var_takes_priority_over_pool(self, isolated_hermes_home, monkeypatch):
|
|
"""os.environ key wins — credential pool is NEVER consulted."""
|
|
monkeypatch.setenv("DEEPSEEK_API_KEY", "sk-env-key-first-abc123")
|
|
|
|
mock_pool = MagicMock()
|
|
mock_pool.has_credentials.return_value = True
|
|
|
|
from hermes_cli.auth import _resolve_api_key_provider_secret
|
|
with patch("agent.credential_pool.load_pool", return_value=mock_pool) as mp:
|
|
key, source = _resolve_api_key_provider_secret(
|
|
provider_id="deepseek",
|
|
pconfig=_make_pconfig(),
|
|
)
|
|
assert key == "sk-env-key-first-abc123"
|
|
assert source == "DEEPSEEK_API_KEY"
|
|
# Pool should not even have been loaded — env var satisfied the request first
|
|
mp.assert_not_called()
|
|
|
|
def test_dotenv_takes_priority_over_pool(self, isolated_hermes_home):
|
|
"""Key in .env beats credential pool — pool only fires when both env sources are empty."""
|
|
_write_env_file(isolated_hermes_home, DEEPSEEK_API_KEY="sk-dotenv-priority-xyz")
|
|
assert "DEEPSEEK_API_KEY" not in os.environ
|
|
|
|
mock_pool = MagicMock()
|
|
mock_pool.has_credentials.return_value = True
|
|
|
|
from hermes_cli.auth import _resolve_api_key_provider_secret
|
|
with patch("agent.credential_pool.load_pool", return_value=mock_pool) as mp:
|
|
key, source = _resolve_api_key_provider_secret(
|
|
provider_id="deepseek",
|
|
pconfig=_make_pconfig(),
|
|
)
|
|
assert key == "sk-dotenv-priority-xyz"
|
|
assert source == "DEEPSEEK_API_KEY"
|
|
mp.assert_not_called()
|