2026-03-31 01:04:07 -07:00
|
|
|
"""Regression tests for interactive setup provider/model persistence.
|
|
|
|
|
|
|
|
|
|
Since setup_model_provider delegates to select_provider_and_model()
|
|
|
|
|
from hermes_cli.main, these tests mock the delegation point and verify
|
|
|
|
|
that the setup wizard correctly syncs config from disk after the call.
|
|
|
|
|
"""
|
2026-03-11 22:47:08 +07:00
|
|
|
|
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
|
|
|
|
from hermes_cli.config import load_config, save_config, save_env_value
|
2026-03-31 09:29:43 +09:00
|
|
|
from hermes_cli.nous_subscription import NousFeatureState, NousSubscriptionFeatures
|
2026-03-14 10:37:45 -07:00
|
|
|
from hermes_cli.setup import _print_setup_summary, setup_model_provider
|
2026-03-11 22:47:08 +07:00
|
|
|
|
|
|
|
|
|
2026-03-17 04:01:37 -07:00
|
|
|
def _maybe_keep_current_tts(question, choices):
|
|
|
|
|
if question != "Select TTS provider:":
|
|
|
|
|
return None
|
|
|
|
|
assert choices[-1].startswith("Keep current (")
|
|
|
|
|
return len(choices) - 1
|
|
|
|
|
|
|
|
|
|
|
2026-03-11 22:47:08 +07:00
|
|
|
def _clear_provider_env(monkeypatch):
|
|
|
|
|
for key in (
|
|
|
|
|
"HERMES_INFERENCE_PROVIDER",
|
|
|
|
|
"OPENAI_BASE_URL",
|
|
|
|
|
"OPENAI_API_KEY",
|
|
|
|
|
"OPENROUTER_API_KEY",
|
2026-03-17 23:40:22 -07:00
|
|
|
"GITHUB_TOKEN",
|
|
|
|
|
"GH_TOKEN",
|
2026-03-11 22:47:08 +07:00
|
|
|
"GLM_API_KEY",
|
|
|
|
|
"KIMI_API_KEY",
|
|
|
|
|
"MINIMAX_API_KEY",
|
|
|
|
|
"MINIMAX_CN_API_KEY",
|
|
|
|
|
"ANTHROPIC_TOKEN",
|
|
|
|
|
"ANTHROPIC_API_KEY",
|
|
|
|
|
):
|
|
|
|
|
monkeypatch.delenv(key, raising=False)
|
|
|
|
|
|
|
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
def _stub_tts(monkeypatch):
|
|
|
|
|
monkeypatch.setattr("hermes_cli.setup.prompt_choice", lambda q, c, d=0: (
|
|
|
|
|
_maybe_keep_current_tts(q, c) if _maybe_keep_current_tts(q, c) is not None
|
|
|
|
|
else d
|
|
|
|
|
))
|
|
|
|
|
monkeypatch.setattr("hermes_cli.setup.prompt_yes_no", lambda *a, **kw: False)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _write_model_config(provider, base_url="", model_name="test-model"):
|
|
|
|
|
"""Simulate what a _model_flow_* function writes to disk."""
|
|
|
|
|
cfg = load_config()
|
|
|
|
|
m = cfg.get("model")
|
|
|
|
|
if not isinstance(m, dict):
|
|
|
|
|
m = {"default": m} if m else {}
|
|
|
|
|
cfg["model"] = m
|
|
|
|
|
m["provider"] = provider
|
|
|
|
|
if base_url:
|
|
|
|
|
m["base_url"] = base_url
|
|
|
|
|
else:
|
|
|
|
|
m.pop("base_url", None)
|
|
|
|
|
if model_name:
|
|
|
|
|
m["default"] = model_name
|
|
|
|
|
m.pop("api_mode", None)
|
|
|
|
|
save_config(cfg)
|
|
|
|
|
|
|
|
|
|
|
2026-05-08 20:54:55 +00:00
|
|
|
def _write_aux_config(task="compression", provider="gemini", model_name="gemini-2.5-flash"):
|
|
|
|
|
"""Simulate the aux picker writing a task override to disk."""
|
|
|
|
|
cfg = load_config()
|
|
|
|
|
aux = cfg.setdefault("auxiliary", {})
|
|
|
|
|
entry = aux.setdefault(task, {})
|
|
|
|
|
entry["provider"] = provider
|
|
|
|
|
entry["model"] = model_name
|
|
|
|
|
save_config(cfg)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_setup_model_provider_preserves_auxiliary_choices_written_by_picker(tmp_path, monkeypatch):
|
|
|
|
|
"""Aux choices made inside hermes setup must survive the wizard's final save."""
|
|
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
_clear_provider_env(monkeypatch)
|
|
|
|
|
|
|
|
|
|
config = load_config()
|
|
|
|
|
assert config["auxiliary"]["compression"]["provider"] == "auto"
|
|
|
|
|
|
|
|
|
|
def fake_select():
|
|
|
|
|
_write_aux_config("compression", "gemini", "gemini-2.5-flash")
|
|
|
|
|
|
|
|
|
|
monkeypatch.setattr("hermes_cli.main.select_provider_and_model", fake_select)
|
|
|
|
|
|
|
|
|
|
setup_model_provider(config, quick=True)
|
|
|
|
|
save_config(config) # mirrors run_setup_wizard(section="model") final save
|
|
|
|
|
|
|
|
|
|
reloaded = load_config()
|
|
|
|
|
compression = reloaded["auxiliary"]["compression"]
|
|
|
|
|
assert compression["provider"] == "gemini"
|
|
|
|
|
assert compression["model"] == "gemini-2.5-flash"
|
|
|
|
|
|
|
|
|
|
|
2026-03-11 22:47:08 +07:00
|
|
|
def test_setup_keep_current_custom_from_config_does_not_fall_through(tmp_path, monkeypatch):
|
|
|
|
|
"""Keep-current custom should not fall through to the generic model menu."""
|
|
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
_clear_provider_env(monkeypatch)
|
2026-03-31 01:04:07 -07:00
|
|
|
_stub_tts(monkeypatch)
|
|
|
|
|
|
|
|
|
|
# Pre-set custom provider
|
|
|
|
|
_write_model_config("custom", "http://localhost:8080/v1", "local-model")
|
2026-03-11 22:47:08 +07:00
|
|
|
|
|
|
|
|
config = load_config()
|
2026-03-31 01:04:07 -07:00
|
|
|
assert config["model"]["provider"] == "custom"
|
2026-03-11 22:47:08 +07:00
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
def fake_select():
|
|
|
|
|
pass # user chose "cancel" or "keep current"
|
2026-03-11 22:47:08 +07:00
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
monkeypatch.setattr("hermes_cli.main.select_provider_and_model", fake_select)
|
2026-03-11 22:47:08 +07:00
|
|
|
|
|
|
|
|
setup_model_provider(config)
|
|
|
|
|
save_config(config)
|
|
|
|
|
|
|
|
|
|
reloaded = load_config()
|
2026-03-31 01:04:07 -07:00
|
|
|
assert isinstance(reloaded["model"], dict)
|
2026-03-11 22:47:08 +07:00
|
|
|
assert reloaded["model"]["provider"] == "custom"
|
2026-03-31 01:04:07 -07:00
|
|
|
assert reloaded["model"]["base_url"] == "http://localhost:8080/v1"
|
2026-03-11 22:47:08 +07:00
|
|
|
|
|
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
def test_setup_keep_current_config_provider_uses_provider_specific_model_menu(
|
|
|
|
|
tmp_path, monkeypatch
|
|
|
|
|
):
|
|
|
|
|
"""Keeping current provider preserves the config on disk."""
|
2026-03-15 20:09:50 -07:00
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
_clear_provider_env(monkeypatch)
|
2026-03-31 01:04:07 -07:00
|
|
|
_stub_tts(monkeypatch)
|
2026-03-15 20:09:50 -07:00
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
_write_model_config("zai", "https://open.bigmodel.cn/api/paas/v4", "glm-5")
|
2026-03-11 22:47:08 +07:00
|
|
|
|
|
|
|
|
config = load_config()
|
|
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
def fake_select():
|
|
|
|
|
pass # keep current
|
2026-03-14 10:37:45 -07:00
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
monkeypatch.setattr("hermes_cli.main.select_provider_and_model", fake_select)
|
2026-03-14 10:37:45 -07:00
|
|
|
|
|
|
|
|
setup_model_provider(config)
|
2026-03-31 01:04:07 -07:00
|
|
|
save_config(config)
|
2026-03-14 10:37:45 -07:00
|
|
|
|
refactor: make config.yaml the single source of truth for endpoint URLs (#4165)
OPENAI_BASE_URL was written to .env AND config.yaml, creating a dual-source
confusion. Users (especially Docker) would see the URL in .env and assume
that's where all config lives, then wonder why LLM_MODEL in .env didn't work.
Changes:
- Remove all 27 save_env_value("OPENAI_BASE_URL", ...) calls across main.py,
setup.py, and tools_config.py
- Remove OPENAI_BASE_URL env var reading from runtime_provider.py, cli.py,
models.py, and gateway/run.py
- Remove LLM_MODEL/HERMES_MODEL env var reading from gateway/run.py and
auxiliary_client.py — config.yaml model.default is authoritative
- Vision base URL now saved to config.yaml auxiliary.vision.base_url
(both setup wizard and tools_config paths)
- Tests updated to set config values instead of env vars
Convention enforced: .env is for SECRETS only (API keys). All other
configuration (model names, base URLs, provider selection) lives
exclusively in config.yaml.
2026-03-30 22:02:53 -07:00
|
|
|
reloaded = load_config()
|
2026-03-31 01:04:07 -07:00
|
|
|
assert isinstance(reloaded["model"], dict)
|
|
|
|
|
assert reloaded["model"]["provider"] == "zai"
|
2026-03-11 22:47:08 +07:00
|
|
|
|
|
|
|
|
|
feat(auth): same-provider credential pools with rotation, custom endpoint support, and interactive CLI (#2647)
* feat(auth): add same-provider credential pools and rotation UX
Add same-provider credential pooling so Hermes can rotate across
multiple credentials for a single provider, recover from exhausted
credentials without jumping providers immediately, and configure
that behavior directly in hermes setup.
- agent/credential_pool.py: persisted per-provider credential pools
- hermes auth add/list/remove/reset CLI commands
- 429/402/401 recovery with pool rotation in run_agent.py
- Setup wizard integration for pool strategy configuration
- Auto-seeding from env vars and existing OAuth state
Co-authored-by: kshitijk4poor <82637225+kshitijk4poor@users.noreply.github.com>
Salvaged from PR #2647
* fix(tests): prevent pool auto-seeding from host env in credential pool tests
Tests for non-pool Anthropic paths and auth remove were failing when
host env vars (ANTHROPIC_API_KEY) or file-backed OAuth credentials
were present. The pool auto-seeding picked these up, causing unexpected
pool entries in tests.
- Mock _select_pool_entry in auxiliary_client OAuth flag tests
- Clear Anthropic env vars and mock _seed_from_singletons in auth remove test
* feat(auth): add thread safety, least_used strategy, and request counting
- Add threading.Lock to CredentialPool for gateway thread safety
(concurrent requests from multiple gateway sessions could race on
pool state mutations without this)
- Add 'least_used' rotation strategy that selects the credential
with the lowest request_count, distributing load more evenly
- Add request_count field to PooledCredential for usage tracking
- Add mark_used() method to increment per-credential request counts
- Wrap select(), mark_exhausted_and_rotate(), and try_refresh_current()
with lock acquisition
- Add tests: least_used selection, mark_used counting, concurrent
thread safety (4 threads × 20 selects with no corruption)
* feat(auth): add interactive mode for bare 'hermes auth' command
When 'hermes auth' is called without a subcommand, it now launches an
interactive wizard that:
1. Shows full credential pool status across all providers
2. Offers a menu: add, remove, reset cooldowns, set strategy
3. For OAuth-capable providers (anthropic, nous, openai-codex), the
add flow explicitly asks 'API key or OAuth login?' — making it
clear that both auth types are supported for the same provider
4. Strategy picker shows all 4 options (fill_first, round_robin,
least_used, random) with the current selection marked
5. Remove flow shows entries with indices for easy selection
The subcommand paths (hermes auth add/list/remove/reset) still work
exactly as before for scripted/non-interactive use.
* fix(tests): update runtime_provider tests for config.yaml source of truth (#4165)
Tests were using OPENAI_BASE_URL env var which is no longer consulted
after #4165. Updated to use model config (provider, base_url, api_key)
which is the new single source of truth for custom endpoint URLs.
* feat(auth): support custom endpoint credential pools keyed by provider name
Custom OpenAI-compatible endpoints all share provider='custom', making
the provider-keyed pool useless. Now pools for custom endpoints are
keyed by 'custom:<normalized_name>' where the name comes from the
custom_providers config list (auto-generated from URL hostname).
- Pool key format: 'custom:together.ai', 'custom:local-(localhost:8080)'
- load_pool('custom:name') seeds from custom_providers api_key AND
model.api_key when base_url matches
- hermes auth add/list now shows custom endpoints alongside registry
providers
- _resolve_openrouter_runtime and _resolve_named_custom_runtime check
pool before falling back to single config key
- 6 new tests covering custom pool keying, seeding, and listing
* docs: add Excalidraw diagram of full credential pool flow
Comprehensive architecture diagram showing:
- Credential sources (env vars, auth.json OAuth, config.yaml, CLI)
- Pool storage and auto-seeding
- Runtime resolution paths (registry, custom, OpenRouter)
- Error recovery (429 retry-then-rotate, 402 immediate, 401 refresh)
- CLI management commands and strategy configuration
Open at: https://excalidraw.com/#json=2Ycqhqpi6f12E_3ITyiwh,c7u9jSt5BwrmiVzHGbm87g
* fix(tests): update setup wizard pool tests for unified select_provider_and_model flow
The setup wizard now delegates to select_provider_and_model() instead
of using its own prompt_choice-based provider picker. Tests needed:
- Mock select_provider_and_model as no-op (provider pre-written to config)
- Call _stub_tts BEFORE custom prompt_choice mock (it overwrites it)
- Pre-write model.provider to config so the pool step is reached
* docs: add comprehensive credential pool documentation
- New page: website/docs/user-guide/features/credential-pools.md
Full guide covering quick start, CLI commands, rotation strategies,
error recovery, custom endpoint pools, auto-discovery, thread safety,
architecture, and storage format.
- Updated fallback-providers.md to reference credential pools as the
first layer of resilience (same-provider rotation before cross-provider)
- Added hermes auth to CLI commands reference with usage examples
- Added credential_pool_strategies to configuration guide
* chore: remove excalidraw diagram from repo (external link only)
* refactor: simplify credential pool code — extract helpers, collapse extras, dedup patterns
- _load_config_safe(): replace 4 identical try/except/import blocks
- _iter_custom_providers(): shared generator for custom provider iteration
- PooledCredential.extra dict: collapse 11 round-trip-only fields
(token_type, scope, client_id, portal_base_url, obtained_at,
expires_in, agent_key_id, agent_key_expires_in, agent_key_reused,
agent_key_obtained_at, tls) into a single extra dict with
__getattr__ for backward-compatible access
- _available_entries(): shared exhaustion-check between select and peek
- Dedup anthropic OAuth seeding (hermes_pkce + claude_code identical)
- SimpleNamespace replaces class _Args boilerplate in auth_commands
- _try_resolve_from_custom_pool(): shared pool-check in runtime_provider
Net -17 lines. All 383 targeted tests pass.
---------
Co-authored-by: kshitijk4poor <82637225+kshitijk4poor@users.noreply.github.com>
2026-03-31 03:10:01 -07:00
|
|
|
def test_setup_copilot_acp_skips_same_provider_pool_step(tmp_path, monkeypatch):
|
2026-03-17 23:40:22 -07:00
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
_clear_provider_env(monkeypatch)
|
|
|
|
|
|
|
|
|
|
config = load_config()
|
|
|
|
|
|
|
|
|
|
def fake_prompt_choice(question, choices, default=0):
|
|
|
|
|
if question == "Select your inference provider:":
|
feat(auth): same-provider credential pools with rotation, custom endpoint support, and interactive CLI (#2647)
* feat(auth): add same-provider credential pools and rotation UX
Add same-provider credential pooling so Hermes can rotate across
multiple credentials for a single provider, recover from exhausted
credentials without jumping providers immediately, and configure
that behavior directly in hermes setup.
- agent/credential_pool.py: persisted per-provider credential pools
- hermes auth add/list/remove/reset CLI commands
- 429/402/401 recovery with pool rotation in run_agent.py
- Setup wizard integration for pool strategy configuration
- Auto-seeding from env vars and existing OAuth state
Co-authored-by: kshitijk4poor <82637225+kshitijk4poor@users.noreply.github.com>
Salvaged from PR #2647
* fix(tests): prevent pool auto-seeding from host env in credential pool tests
Tests for non-pool Anthropic paths and auth remove were failing when
host env vars (ANTHROPIC_API_KEY) or file-backed OAuth credentials
were present. The pool auto-seeding picked these up, causing unexpected
pool entries in tests.
- Mock _select_pool_entry in auxiliary_client OAuth flag tests
- Clear Anthropic env vars and mock _seed_from_singletons in auth remove test
* feat(auth): add thread safety, least_used strategy, and request counting
- Add threading.Lock to CredentialPool for gateway thread safety
(concurrent requests from multiple gateway sessions could race on
pool state mutations without this)
- Add 'least_used' rotation strategy that selects the credential
with the lowest request_count, distributing load more evenly
- Add request_count field to PooledCredential for usage tracking
- Add mark_used() method to increment per-credential request counts
- Wrap select(), mark_exhausted_and_rotate(), and try_refresh_current()
with lock acquisition
- Add tests: least_used selection, mark_used counting, concurrent
thread safety (4 threads × 20 selects with no corruption)
* feat(auth): add interactive mode for bare 'hermes auth' command
When 'hermes auth' is called without a subcommand, it now launches an
interactive wizard that:
1. Shows full credential pool status across all providers
2. Offers a menu: add, remove, reset cooldowns, set strategy
3. For OAuth-capable providers (anthropic, nous, openai-codex), the
add flow explicitly asks 'API key or OAuth login?' — making it
clear that both auth types are supported for the same provider
4. Strategy picker shows all 4 options (fill_first, round_robin,
least_used, random) with the current selection marked
5. Remove flow shows entries with indices for easy selection
The subcommand paths (hermes auth add/list/remove/reset) still work
exactly as before for scripted/non-interactive use.
* fix(tests): update runtime_provider tests for config.yaml source of truth (#4165)
Tests were using OPENAI_BASE_URL env var which is no longer consulted
after #4165. Updated to use model config (provider, base_url, api_key)
which is the new single source of truth for custom endpoint URLs.
* feat(auth): support custom endpoint credential pools keyed by provider name
Custom OpenAI-compatible endpoints all share provider='custom', making
the provider-keyed pool useless. Now pools for custom endpoints are
keyed by 'custom:<normalized_name>' where the name comes from the
custom_providers config list (auto-generated from URL hostname).
- Pool key format: 'custom:together.ai', 'custom:local-(localhost:8080)'
- load_pool('custom:name') seeds from custom_providers api_key AND
model.api_key when base_url matches
- hermes auth add/list now shows custom endpoints alongside registry
providers
- _resolve_openrouter_runtime and _resolve_named_custom_runtime check
pool before falling back to single config key
- 6 new tests covering custom pool keying, seeding, and listing
* docs: add Excalidraw diagram of full credential pool flow
Comprehensive architecture diagram showing:
- Credential sources (env vars, auth.json OAuth, config.yaml, CLI)
- Pool storage and auto-seeding
- Runtime resolution paths (registry, custom, OpenRouter)
- Error recovery (429 retry-then-rotate, 402 immediate, 401 refresh)
- CLI management commands and strategy configuration
Open at: https://excalidraw.com/#json=2Ycqhqpi6f12E_3ITyiwh,c7u9jSt5BwrmiVzHGbm87g
* fix(tests): update setup wizard pool tests for unified select_provider_and_model flow
The setup wizard now delegates to select_provider_and_model() instead
of using its own prompt_choice-based provider picker. Tests needed:
- Mock select_provider_and_model as no-op (provider pre-written to config)
- Call _stub_tts BEFORE custom prompt_choice mock (it overwrites it)
- Pre-write model.provider to config so the pool step is reached
* docs: add comprehensive credential pool documentation
- New page: website/docs/user-guide/features/credential-pools.md
Full guide covering quick start, CLI commands, rotation strategies,
error recovery, custom endpoint pools, auto-discovery, thread safety,
architecture, and storage format.
- Updated fallback-providers.md to reference credential pools as the
first layer of resilience (same-provider rotation before cross-provider)
- Added hermes auth to CLI commands reference with usage examples
- Added credential_pool_strategies to configuration guide
* chore: remove excalidraw diagram from repo (external link only)
* refactor: simplify credential pool code — extract helpers, collapse extras, dedup patterns
- _load_config_safe(): replace 4 identical try/except/import blocks
- _iter_custom_providers(): shared generator for custom provider iteration
- PooledCredential.extra dict: collapse 11 round-trip-only fields
(token_type, scope, client_id, portal_base_url, obtained_at,
expires_in, agent_key_id, agent_key_expires_in, agent_key_reused,
agent_key_obtained_at, tls) into a single extra dict with
__getattr__ for backward-compatible access
- _available_entries(): shared exhaustion-check between select and peek
- Dedup anthropic OAuth seeding (hermes_pkce + claude_code identical)
- SimpleNamespace replaces class _Args boilerplate in auth_commands
- _try_resolve_from_custom_pool(): shared pool-check in runtime_provider
Net -17 lines. All 383 targeted tests pass.
---------
Co-authored-by: kshitijk4poor <82637225+kshitijk4poor@users.noreply.github.com>
2026-03-31 03:10:01 -07:00
|
|
|
return 15 # GitHub Copilot ACP
|
2026-03-17 23:40:22 -07:00
|
|
|
if question == "Select default model:":
|
feat(auth): same-provider credential pools with rotation, custom endpoint support, and interactive CLI (#2647)
* feat(auth): add same-provider credential pools and rotation UX
Add same-provider credential pooling so Hermes can rotate across
multiple credentials for a single provider, recover from exhausted
credentials without jumping providers immediately, and configure
that behavior directly in hermes setup.
- agent/credential_pool.py: persisted per-provider credential pools
- hermes auth add/list/remove/reset CLI commands
- 429/402/401 recovery with pool rotation in run_agent.py
- Setup wizard integration for pool strategy configuration
- Auto-seeding from env vars and existing OAuth state
Co-authored-by: kshitijk4poor <82637225+kshitijk4poor@users.noreply.github.com>
Salvaged from PR #2647
* fix(tests): prevent pool auto-seeding from host env in credential pool tests
Tests for non-pool Anthropic paths and auth remove were failing when
host env vars (ANTHROPIC_API_KEY) or file-backed OAuth credentials
were present. The pool auto-seeding picked these up, causing unexpected
pool entries in tests.
- Mock _select_pool_entry in auxiliary_client OAuth flag tests
- Clear Anthropic env vars and mock _seed_from_singletons in auth remove test
* feat(auth): add thread safety, least_used strategy, and request counting
- Add threading.Lock to CredentialPool for gateway thread safety
(concurrent requests from multiple gateway sessions could race on
pool state mutations without this)
- Add 'least_used' rotation strategy that selects the credential
with the lowest request_count, distributing load more evenly
- Add request_count field to PooledCredential for usage tracking
- Add mark_used() method to increment per-credential request counts
- Wrap select(), mark_exhausted_and_rotate(), and try_refresh_current()
with lock acquisition
- Add tests: least_used selection, mark_used counting, concurrent
thread safety (4 threads × 20 selects with no corruption)
* feat(auth): add interactive mode for bare 'hermes auth' command
When 'hermes auth' is called without a subcommand, it now launches an
interactive wizard that:
1. Shows full credential pool status across all providers
2. Offers a menu: add, remove, reset cooldowns, set strategy
3. For OAuth-capable providers (anthropic, nous, openai-codex), the
add flow explicitly asks 'API key or OAuth login?' — making it
clear that both auth types are supported for the same provider
4. Strategy picker shows all 4 options (fill_first, round_robin,
least_used, random) with the current selection marked
5. Remove flow shows entries with indices for easy selection
The subcommand paths (hermes auth add/list/remove/reset) still work
exactly as before for scripted/non-interactive use.
* fix(tests): update runtime_provider tests for config.yaml source of truth (#4165)
Tests were using OPENAI_BASE_URL env var which is no longer consulted
after #4165. Updated to use model config (provider, base_url, api_key)
which is the new single source of truth for custom endpoint URLs.
* feat(auth): support custom endpoint credential pools keyed by provider name
Custom OpenAI-compatible endpoints all share provider='custom', making
the provider-keyed pool useless. Now pools for custom endpoints are
keyed by 'custom:<normalized_name>' where the name comes from the
custom_providers config list (auto-generated from URL hostname).
- Pool key format: 'custom:together.ai', 'custom:local-(localhost:8080)'
- load_pool('custom:name') seeds from custom_providers api_key AND
model.api_key when base_url matches
- hermes auth add/list now shows custom endpoints alongside registry
providers
- _resolve_openrouter_runtime and _resolve_named_custom_runtime check
pool before falling back to single config key
- 6 new tests covering custom pool keying, seeding, and listing
* docs: add Excalidraw diagram of full credential pool flow
Comprehensive architecture diagram showing:
- Credential sources (env vars, auth.json OAuth, config.yaml, CLI)
- Pool storage and auto-seeding
- Runtime resolution paths (registry, custom, OpenRouter)
- Error recovery (429 retry-then-rotate, 402 immediate, 401 refresh)
- CLI management commands and strategy configuration
Open at: https://excalidraw.com/#json=2Ycqhqpi6f12E_3ITyiwh,c7u9jSt5BwrmiVzHGbm87g
* fix(tests): update setup wizard pool tests for unified select_provider_and_model flow
The setup wizard now delegates to select_provider_and_model() instead
of using its own prompt_choice-based provider picker. Tests needed:
- Mock select_provider_and_model as no-op (provider pre-written to config)
- Call _stub_tts BEFORE custom prompt_choice mock (it overwrites it)
- Pre-write model.provider to config so the pool step is reached
* docs: add comprehensive credential pool documentation
- New page: website/docs/user-guide/features/credential-pools.md
Full guide covering quick start, CLI commands, rotation strategies,
error recovery, custom endpoint pools, auto-discovery, thread safety,
architecture, and storage format.
- Updated fallback-providers.md to reference credential pools as the
first layer of resilience (same-provider rotation before cross-provider)
- Added hermes auth to CLI commands reference with usage examples
- Added credential_pool_strategies to configuration guide
* chore: remove excalidraw diagram from repo (external link only)
* refactor: simplify credential pool code — extract helpers, collapse extras, dedup patterns
- _load_config_safe(): replace 4 identical try/except/import blocks
- _iter_custom_providers(): shared generator for custom provider iteration
- PooledCredential.extra dict: collapse 11 round-trip-only fields
(token_type, scope, client_id, portal_base_url, obtained_at,
expires_in, agent_key_id, agent_key_expires_in, agent_key_reused,
agent_key_obtained_at, tls) into a single extra dict with
__getattr__ for backward-compatible access
- _available_entries(): shared exhaustion-check between select and peek
- Dedup anthropic OAuth seeding (hermes_pkce + claude_code identical)
- SimpleNamespace replaces class _Args boilerplate in auth_commands
- _try_resolve_from_custom_pool(): shared pool-check in runtime_provider
Net -17 lines. All 383 targeted tests pass.
---------
Co-authored-by: kshitijk4poor <82637225+kshitijk4poor@users.noreply.github.com>
2026-03-31 03:10:01 -07:00
|
|
|
return 0
|
2026-03-17 23:40:22 -07:00
|
|
|
if question == "Configure vision:":
|
|
|
|
|
return len(choices) - 1
|
|
|
|
|
tts_idx = _maybe_keep_current_tts(question, choices)
|
|
|
|
|
if tts_idx is not None:
|
|
|
|
|
return tts_idx
|
|
|
|
|
raise AssertionError(f"Unexpected prompt_choice call: {question}")
|
|
|
|
|
|
feat(auth): same-provider credential pools with rotation, custom endpoint support, and interactive CLI (#2647)
* feat(auth): add same-provider credential pools and rotation UX
Add same-provider credential pooling so Hermes can rotate across
multiple credentials for a single provider, recover from exhausted
credentials without jumping providers immediately, and configure
that behavior directly in hermes setup.
- agent/credential_pool.py: persisted per-provider credential pools
- hermes auth add/list/remove/reset CLI commands
- 429/402/401 recovery with pool rotation in run_agent.py
- Setup wizard integration for pool strategy configuration
- Auto-seeding from env vars and existing OAuth state
Co-authored-by: kshitijk4poor <82637225+kshitijk4poor@users.noreply.github.com>
Salvaged from PR #2647
* fix(tests): prevent pool auto-seeding from host env in credential pool tests
Tests for non-pool Anthropic paths and auth remove were failing when
host env vars (ANTHROPIC_API_KEY) or file-backed OAuth credentials
were present. The pool auto-seeding picked these up, causing unexpected
pool entries in tests.
- Mock _select_pool_entry in auxiliary_client OAuth flag tests
- Clear Anthropic env vars and mock _seed_from_singletons in auth remove test
* feat(auth): add thread safety, least_used strategy, and request counting
- Add threading.Lock to CredentialPool for gateway thread safety
(concurrent requests from multiple gateway sessions could race on
pool state mutations without this)
- Add 'least_used' rotation strategy that selects the credential
with the lowest request_count, distributing load more evenly
- Add request_count field to PooledCredential for usage tracking
- Add mark_used() method to increment per-credential request counts
- Wrap select(), mark_exhausted_and_rotate(), and try_refresh_current()
with lock acquisition
- Add tests: least_used selection, mark_used counting, concurrent
thread safety (4 threads × 20 selects with no corruption)
* feat(auth): add interactive mode for bare 'hermes auth' command
When 'hermes auth' is called without a subcommand, it now launches an
interactive wizard that:
1. Shows full credential pool status across all providers
2. Offers a menu: add, remove, reset cooldowns, set strategy
3. For OAuth-capable providers (anthropic, nous, openai-codex), the
add flow explicitly asks 'API key or OAuth login?' — making it
clear that both auth types are supported for the same provider
4. Strategy picker shows all 4 options (fill_first, round_robin,
least_used, random) with the current selection marked
5. Remove flow shows entries with indices for easy selection
The subcommand paths (hermes auth add/list/remove/reset) still work
exactly as before for scripted/non-interactive use.
* fix(tests): update runtime_provider tests for config.yaml source of truth (#4165)
Tests were using OPENAI_BASE_URL env var which is no longer consulted
after #4165. Updated to use model config (provider, base_url, api_key)
which is the new single source of truth for custom endpoint URLs.
* feat(auth): support custom endpoint credential pools keyed by provider name
Custom OpenAI-compatible endpoints all share provider='custom', making
the provider-keyed pool useless. Now pools for custom endpoints are
keyed by 'custom:<normalized_name>' where the name comes from the
custom_providers config list (auto-generated from URL hostname).
- Pool key format: 'custom:together.ai', 'custom:local-(localhost:8080)'
- load_pool('custom:name') seeds from custom_providers api_key AND
model.api_key when base_url matches
- hermes auth add/list now shows custom endpoints alongside registry
providers
- _resolve_openrouter_runtime and _resolve_named_custom_runtime check
pool before falling back to single config key
- 6 new tests covering custom pool keying, seeding, and listing
* docs: add Excalidraw diagram of full credential pool flow
Comprehensive architecture diagram showing:
- Credential sources (env vars, auth.json OAuth, config.yaml, CLI)
- Pool storage and auto-seeding
- Runtime resolution paths (registry, custom, OpenRouter)
- Error recovery (429 retry-then-rotate, 402 immediate, 401 refresh)
- CLI management commands and strategy configuration
Open at: https://excalidraw.com/#json=2Ycqhqpi6f12E_3ITyiwh,c7u9jSt5BwrmiVzHGbm87g
* fix(tests): update setup wizard pool tests for unified select_provider_and_model flow
The setup wizard now delegates to select_provider_and_model() instead
of using its own prompt_choice-based provider picker. Tests needed:
- Mock select_provider_and_model as no-op (provider pre-written to config)
- Call _stub_tts BEFORE custom prompt_choice mock (it overwrites it)
- Pre-write model.provider to config so the pool step is reached
* docs: add comprehensive credential pool documentation
- New page: website/docs/user-guide/features/credential-pools.md
Full guide covering quick start, CLI commands, rotation strategies,
error recovery, custom endpoint pools, auto-discovery, thread safety,
architecture, and storage format.
- Updated fallback-providers.md to reference credential pools as the
first layer of resilience (same-provider rotation before cross-provider)
- Added hermes auth to CLI commands reference with usage examples
- Added credential_pool_strategies to configuration guide
* chore: remove excalidraw diagram from repo (external link only)
* refactor: simplify credential pool code — extract helpers, collapse extras, dedup patterns
- _load_config_safe(): replace 4 identical try/except/import blocks
- _iter_custom_providers(): shared generator for custom provider iteration
- PooledCredential.extra dict: collapse 11 round-trip-only fields
(token_type, scope, client_id, portal_base_url, obtained_at,
expires_in, agent_key_id, agent_key_expires_in, agent_key_reused,
agent_key_obtained_at, tls) into a single extra dict with
__getattr__ for backward-compatible access
- _available_entries(): shared exhaustion-check between select and peek
- Dedup anthropic OAuth seeding (hermes_pkce + claude_code identical)
- SimpleNamespace replaces class _Args boilerplate in auth_commands
- _try_resolve_from_custom_pool(): shared pool-check in runtime_provider
Net -17 lines. All 383 targeted tests pass.
---------
Co-authored-by: kshitijk4poor <82637225+kshitijk4poor@users.noreply.github.com>
2026-03-31 03:10:01 -07:00
|
|
|
def fake_prompt_yes_no(question, default=True):
|
|
|
|
|
if question == "Add another credential for same-provider fallback?":
|
|
|
|
|
raise AssertionError("same-provider pool prompt should not appear for copilot-acp")
|
|
|
|
|
return False
|
2026-03-17 23:40:22 -07:00
|
|
|
|
|
|
|
|
monkeypatch.setattr("hermes_cli.setup.prompt_choice", fake_prompt_choice)
|
feat(auth): same-provider credential pools with rotation, custom endpoint support, and interactive CLI (#2647)
* feat(auth): add same-provider credential pools and rotation UX
Add same-provider credential pooling so Hermes can rotate across
multiple credentials for a single provider, recover from exhausted
credentials without jumping providers immediately, and configure
that behavior directly in hermes setup.
- agent/credential_pool.py: persisted per-provider credential pools
- hermes auth add/list/remove/reset CLI commands
- 429/402/401 recovery with pool rotation in run_agent.py
- Setup wizard integration for pool strategy configuration
- Auto-seeding from env vars and existing OAuth state
Co-authored-by: kshitijk4poor <82637225+kshitijk4poor@users.noreply.github.com>
Salvaged from PR #2647
* fix(tests): prevent pool auto-seeding from host env in credential pool tests
Tests for non-pool Anthropic paths and auth remove were failing when
host env vars (ANTHROPIC_API_KEY) or file-backed OAuth credentials
were present. The pool auto-seeding picked these up, causing unexpected
pool entries in tests.
- Mock _select_pool_entry in auxiliary_client OAuth flag tests
- Clear Anthropic env vars and mock _seed_from_singletons in auth remove test
* feat(auth): add thread safety, least_used strategy, and request counting
- Add threading.Lock to CredentialPool for gateway thread safety
(concurrent requests from multiple gateway sessions could race on
pool state mutations without this)
- Add 'least_used' rotation strategy that selects the credential
with the lowest request_count, distributing load more evenly
- Add request_count field to PooledCredential for usage tracking
- Add mark_used() method to increment per-credential request counts
- Wrap select(), mark_exhausted_and_rotate(), and try_refresh_current()
with lock acquisition
- Add tests: least_used selection, mark_used counting, concurrent
thread safety (4 threads × 20 selects with no corruption)
* feat(auth): add interactive mode for bare 'hermes auth' command
When 'hermes auth' is called without a subcommand, it now launches an
interactive wizard that:
1. Shows full credential pool status across all providers
2. Offers a menu: add, remove, reset cooldowns, set strategy
3. For OAuth-capable providers (anthropic, nous, openai-codex), the
add flow explicitly asks 'API key or OAuth login?' — making it
clear that both auth types are supported for the same provider
4. Strategy picker shows all 4 options (fill_first, round_robin,
least_used, random) with the current selection marked
5. Remove flow shows entries with indices for easy selection
The subcommand paths (hermes auth add/list/remove/reset) still work
exactly as before for scripted/non-interactive use.
* fix(tests): update runtime_provider tests for config.yaml source of truth (#4165)
Tests were using OPENAI_BASE_URL env var which is no longer consulted
after #4165. Updated to use model config (provider, base_url, api_key)
which is the new single source of truth for custom endpoint URLs.
* feat(auth): support custom endpoint credential pools keyed by provider name
Custom OpenAI-compatible endpoints all share provider='custom', making
the provider-keyed pool useless. Now pools for custom endpoints are
keyed by 'custom:<normalized_name>' where the name comes from the
custom_providers config list (auto-generated from URL hostname).
- Pool key format: 'custom:together.ai', 'custom:local-(localhost:8080)'
- load_pool('custom:name') seeds from custom_providers api_key AND
model.api_key when base_url matches
- hermes auth add/list now shows custom endpoints alongside registry
providers
- _resolve_openrouter_runtime and _resolve_named_custom_runtime check
pool before falling back to single config key
- 6 new tests covering custom pool keying, seeding, and listing
* docs: add Excalidraw diagram of full credential pool flow
Comprehensive architecture diagram showing:
- Credential sources (env vars, auth.json OAuth, config.yaml, CLI)
- Pool storage and auto-seeding
- Runtime resolution paths (registry, custom, OpenRouter)
- Error recovery (429 retry-then-rotate, 402 immediate, 401 refresh)
- CLI management commands and strategy configuration
Open at: https://excalidraw.com/#json=2Ycqhqpi6f12E_3ITyiwh,c7u9jSt5BwrmiVzHGbm87g
* fix(tests): update setup wizard pool tests for unified select_provider_and_model flow
The setup wizard now delegates to select_provider_and_model() instead
of using its own prompt_choice-based provider picker. Tests needed:
- Mock select_provider_and_model as no-op (provider pre-written to config)
- Call _stub_tts BEFORE custom prompt_choice mock (it overwrites it)
- Pre-write model.provider to config so the pool step is reached
* docs: add comprehensive credential pool documentation
- New page: website/docs/user-guide/features/credential-pools.md
Full guide covering quick start, CLI commands, rotation strategies,
error recovery, custom endpoint pools, auto-discovery, thread safety,
architecture, and storage format.
- Updated fallback-providers.md to reference credential pools as the
first layer of resilience (same-provider rotation before cross-provider)
- Added hermes auth to CLI commands reference with usage examples
- Added credential_pool_strategies to configuration guide
* chore: remove excalidraw diagram from repo (external link only)
* refactor: simplify credential pool code — extract helpers, collapse extras, dedup patterns
- _load_config_safe(): replace 4 identical try/except/import blocks
- _iter_custom_providers(): shared generator for custom provider iteration
- PooledCredential.extra dict: collapse 11 round-trip-only fields
(token_type, scope, client_id, portal_base_url, obtained_at,
expires_in, agent_key_id, agent_key_expires_in, agent_key_reused,
agent_key_obtained_at, tls) into a single extra dict with
__getattr__ for backward-compatible access
- _available_entries(): shared exhaustion-check between select and peek
- Dedup anthropic OAuth seeding (hermes_pkce + claude_code identical)
- SimpleNamespace replaces class _Args boilerplate in auth_commands
- _try_resolve_from_custom_pool(): shared pool-check in runtime_provider
Net -17 lines. All 383 targeted tests pass.
---------
Co-authored-by: kshitijk4poor <82637225+kshitijk4poor@users.noreply.github.com>
2026-03-31 03:10:01 -07:00
|
|
|
monkeypatch.setattr("hermes_cli.setup.prompt_yes_no", fake_prompt_yes_no)
|
|
|
|
|
monkeypatch.setattr("hermes_cli.setup.prompt", lambda *args, **kwargs: "")
|
2026-03-17 23:40:22 -07:00
|
|
|
monkeypatch.setattr("hermes_cli.auth.get_active_provider", lambda: None)
|
|
|
|
|
monkeypatch.setattr("agent.auxiliary_client.get_available_vision_backends", lambda: [])
|
|
|
|
|
|
feat(auth): same-provider credential pools with rotation, custom endpoint support, and interactive CLI (#2647)
* feat(auth): add same-provider credential pools and rotation UX
Add same-provider credential pooling so Hermes can rotate across
multiple credentials for a single provider, recover from exhausted
credentials without jumping providers immediately, and configure
that behavior directly in hermes setup.
- agent/credential_pool.py: persisted per-provider credential pools
- hermes auth add/list/remove/reset CLI commands
- 429/402/401 recovery with pool rotation in run_agent.py
- Setup wizard integration for pool strategy configuration
- Auto-seeding from env vars and existing OAuth state
Co-authored-by: kshitijk4poor <82637225+kshitijk4poor@users.noreply.github.com>
Salvaged from PR #2647
* fix(tests): prevent pool auto-seeding from host env in credential pool tests
Tests for non-pool Anthropic paths and auth remove were failing when
host env vars (ANTHROPIC_API_KEY) or file-backed OAuth credentials
were present. The pool auto-seeding picked these up, causing unexpected
pool entries in tests.
- Mock _select_pool_entry in auxiliary_client OAuth flag tests
- Clear Anthropic env vars and mock _seed_from_singletons in auth remove test
* feat(auth): add thread safety, least_used strategy, and request counting
- Add threading.Lock to CredentialPool for gateway thread safety
(concurrent requests from multiple gateway sessions could race on
pool state mutations without this)
- Add 'least_used' rotation strategy that selects the credential
with the lowest request_count, distributing load more evenly
- Add request_count field to PooledCredential for usage tracking
- Add mark_used() method to increment per-credential request counts
- Wrap select(), mark_exhausted_and_rotate(), and try_refresh_current()
with lock acquisition
- Add tests: least_used selection, mark_used counting, concurrent
thread safety (4 threads × 20 selects with no corruption)
* feat(auth): add interactive mode for bare 'hermes auth' command
When 'hermes auth' is called without a subcommand, it now launches an
interactive wizard that:
1. Shows full credential pool status across all providers
2. Offers a menu: add, remove, reset cooldowns, set strategy
3. For OAuth-capable providers (anthropic, nous, openai-codex), the
add flow explicitly asks 'API key or OAuth login?' — making it
clear that both auth types are supported for the same provider
4. Strategy picker shows all 4 options (fill_first, round_robin,
least_used, random) with the current selection marked
5. Remove flow shows entries with indices for easy selection
The subcommand paths (hermes auth add/list/remove/reset) still work
exactly as before for scripted/non-interactive use.
* fix(tests): update runtime_provider tests for config.yaml source of truth (#4165)
Tests were using OPENAI_BASE_URL env var which is no longer consulted
after #4165. Updated to use model config (provider, base_url, api_key)
which is the new single source of truth for custom endpoint URLs.
* feat(auth): support custom endpoint credential pools keyed by provider name
Custom OpenAI-compatible endpoints all share provider='custom', making
the provider-keyed pool useless. Now pools for custom endpoints are
keyed by 'custom:<normalized_name>' where the name comes from the
custom_providers config list (auto-generated from URL hostname).
- Pool key format: 'custom:together.ai', 'custom:local-(localhost:8080)'
- load_pool('custom:name') seeds from custom_providers api_key AND
model.api_key when base_url matches
- hermes auth add/list now shows custom endpoints alongside registry
providers
- _resolve_openrouter_runtime and _resolve_named_custom_runtime check
pool before falling back to single config key
- 6 new tests covering custom pool keying, seeding, and listing
* docs: add Excalidraw diagram of full credential pool flow
Comprehensive architecture diagram showing:
- Credential sources (env vars, auth.json OAuth, config.yaml, CLI)
- Pool storage and auto-seeding
- Runtime resolution paths (registry, custom, OpenRouter)
- Error recovery (429 retry-then-rotate, 402 immediate, 401 refresh)
- CLI management commands and strategy configuration
Open at: https://excalidraw.com/#json=2Ycqhqpi6f12E_3ITyiwh,c7u9jSt5BwrmiVzHGbm87g
* fix(tests): update setup wizard pool tests for unified select_provider_and_model flow
The setup wizard now delegates to select_provider_and_model() instead
of using its own prompt_choice-based provider picker. Tests needed:
- Mock select_provider_and_model as no-op (provider pre-written to config)
- Call _stub_tts BEFORE custom prompt_choice mock (it overwrites it)
- Pre-write model.provider to config so the pool step is reached
* docs: add comprehensive credential pool documentation
- New page: website/docs/user-guide/features/credential-pools.md
Full guide covering quick start, CLI commands, rotation strategies,
error recovery, custom endpoint pools, auto-discovery, thread safety,
architecture, and storage format.
- Updated fallback-providers.md to reference credential pools as the
first layer of resilience (same-provider rotation before cross-provider)
- Added hermes auth to CLI commands reference with usage examples
- Added credential_pool_strategies to configuration guide
* chore: remove excalidraw diagram from repo (external link only)
* refactor: simplify credential pool code — extract helpers, collapse extras, dedup patterns
- _load_config_safe(): replace 4 identical try/except/import blocks
- _iter_custom_providers(): shared generator for custom provider iteration
- PooledCredential.extra dict: collapse 11 round-trip-only fields
(token_type, scope, client_id, portal_base_url, obtained_at,
expires_in, agent_key_id, agent_key_expires_in, agent_key_reused,
agent_key_obtained_at, tls) into a single extra dict with
__getattr__ for backward-compatible access
- _available_entries(): shared exhaustion-check between select and peek
- Dedup anthropic OAuth seeding (hermes_pkce + claude_code identical)
- SimpleNamespace replaces class _Args boilerplate in auth_commands
- _try_resolve_from_custom_pool(): shared pool-check in runtime_provider
Net -17 lines. All 383 targeted tests pass.
---------
Co-authored-by: kshitijk4poor <82637225+kshitijk4poor@users.noreply.github.com>
2026-03-31 03:10:01 -07:00
|
|
|
setup_model_provider(config)
|
|
|
|
|
|
|
|
|
|
assert config.get("credential_pool_strategies", {}) == {}
|
|
|
|
|
|
|
|
|
|
|
2026-03-17 23:40:22 -07:00
|
|
|
def test_setup_copilot_uses_gh_auth_and_saves_provider(tmp_path, monkeypatch):
|
2026-03-31 01:04:07 -07:00
|
|
|
"""Copilot provider saves correctly through delegation."""
|
2026-03-17 23:40:22 -07:00
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
_clear_provider_env(monkeypatch)
|
2026-03-31 01:04:07 -07:00
|
|
|
_stub_tts(monkeypatch)
|
2026-03-17 23:40:22 -07:00
|
|
|
|
|
|
|
|
config = load_config()
|
|
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
def fake_select():
|
|
|
|
|
_write_model_config("copilot", "https://models.github.ai/inference/v1", "gpt-4o")
|
|
|
|
|
|
|
|
|
|
monkeypatch.setattr("hermes_cli.main.select_provider_and_model", fake_select)
|
2026-03-17 23:40:22 -07:00
|
|
|
|
|
|
|
|
setup_model_provider(config)
|
|
|
|
|
save_config(config)
|
|
|
|
|
|
|
|
|
|
reloaded = load_config()
|
2026-03-31 01:04:07 -07:00
|
|
|
assert isinstance(reloaded["model"], dict)
|
2026-03-17 23:40:22 -07:00
|
|
|
assert reloaded["model"]["provider"] == "copilot"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_setup_copilot_acp_uses_model_picker_and_saves_provider(tmp_path, monkeypatch):
|
2026-03-31 01:04:07 -07:00
|
|
|
"""Copilot ACP provider saves correctly through delegation."""
|
2026-03-17 23:40:22 -07:00
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
_clear_provider_env(monkeypatch)
|
2026-03-31 01:04:07 -07:00
|
|
|
_stub_tts(monkeypatch)
|
2026-03-17 23:40:22 -07:00
|
|
|
|
|
|
|
|
config = load_config()
|
|
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
def fake_select():
|
|
|
|
|
_write_model_config("copilot-acp", "", "claude-sonnet-4")
|
2026-03-17 23:40:22 -07:00
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
monkeypatch.setattr("hermes_cli.main.select_provider_and_model", fake_select)
|
2026-03-17 23:40:22 -07:00
|
|
|
|
|
|
|
|
setup_model_provider(config)
|
|
|
|
|
save_config(config)
|
|
|
|
|
|
|
|
|
|
reloaded = load_config()
|
2026-03-31 01:04:07 -07:00
|
|
|
assert isinstance(reloaded["model"], dict)
|
2026-03-17 23:40:22 -07:00
|
|
|
assert reloaded["model"]["provider"] == "copilot-acp"
|
|
|
|
|
|
|
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
def test_setup_switch_custom_to_codex_clears_custom_endpoint_and_updates_config(
|
|
|
|
|
tmp_path, monkeypatch
|
|
|
|
|
):
|
|
|
|
|
"""Switching from custom to codex updates config correctly."""
|
2026-03-11 22:47:08 +07:00
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
_clear_provider_env(monkeypatch)
|
2026-03-31 01:04:07 -07:00
|
|
|
_stub_tts(monkeypatch)
|
2026-03-11 22:47:08 +07:00
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
# Start with custom
|
|
|
|
|
_write_model_config("custom", "http://localhost:11434/v1", "qwen3.5:32b")
|
2026-03-11 22:47:08 +07:00
|
|
|
|
|
|
|
|
config = load_config()
|
2026-03-31 01:04:07 -07:00
|
|
|
assert config["model"]["provider"] == "custom"
|
2026-03-11 22:47:08 +07:00
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
def fake_select():
|
|
|
|
|
_write_model_config("openai-codex", "https://api.openai.com/v1", "gpt-4o")
|
2026-03-17 04:01:37 -07:00
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
monkeypatch.setattr("hermes_cli.main.select_provider_and_model", fake_select)
|
2026-03-11 22:47:08 +07:00
|
|
|
|
|
|
|
|
setup_model_provider(config)
|
|
|
|
|
save_config(config)
|
|
|
|
|
|
|
|
|
|
reloaded = load_config()
|
2026-03-31 01:04:07 -07:00
|
|
|
assert isinstance(reloaded["model"], dict)
|
2026-03-11 22:47:08 +07:00
|
|
|
assert reloaded["model"]["provider"] == "openai-codex"
|
2026-03-31 01:04:07 -07:00
|
|
|
assert reloaded["model"]["default"] == "gpt-4o"
|
2026-03-14 10:37:45 -07:00
|
|
|
|
|
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
def test_setup_switch_preserves_non_model_config(tmp_path, monkeypatch):
|
|
|
|
|
"""Provider switch preserves other config sections (terminal, display, etc.)."""
|
2026-03-14 10:37:45 -07:00
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
_clear_provider_env(monkeypatch)
|
2026-03-31 01:04:07 -07:00
|
|
|
_stub_tts(monkeypatch)
|
2026-03-14 10:37:45 -07:00
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
config = load_config()
|
|
|
|
|
config["terminal"]["timeout"] = 999
|
|
|
|
|
save_config(config)
|
2026-03-14 10:37:45 -07:00
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
config = load_config()
|
2026-03-14 21:14:20 -07:00
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
def fake_select():
|
|
|
|
|
_write_model_config("openrouter", model_name="gpt-4o")
|
2026-03-14 10:37:45 -07:00
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
monkeypatch.setattr("hermes_cli.main.select_provider_and_model", fake_select)
|
2026-03-14 10:37:45 -07:00
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
setup_model_provider(config)
|
|
|
|
|
save_config(config)
|
2026-03-14 21:14:20 -07:00
|
|
|
|
2026-03-31 01:04:07 -07:00
|
|
|
reloaded = load_config()
|
|
|
|
|
assert reloaded["terminal"]["timeout"] == 999
|
|
|
|
|
assert reloaded["model"]["provider"] == "openrouter"
|
2026-03-14 21:14:20 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_setup_summary_marks_anthropic_auth_as_vision_available(tmp_path, monkeypatch, capsys):
|
|
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
_clear_provider_env(monkeypatch)
|
|
|
|
|
monkeypatch.setenv("ANTHROPIC_API_KEY", "sk-ant-api03-key")
|
|
|
|
|
monkeypatch.setattr("shutil.which", lambda _name: None)
|
|
|
|
|
monkeypatch.setattr("agent.auxiliary_client.get_available_vision_backends", lambda: ["anthropic"])
|
|
|
|
|
|
|
|
|
|
_print_setup_summary(load_config(), tmp_path)
|
|
|
|
|
output = capsys.readouterr().out
|
|
|
|
|
|
|
|
|
|
assert "Vision (image analysis)" in output
|
|
|
|
|
assert "missing run 'hermes setup' to configure" not in output
|
2026-03-31 09:29:43 +09:00
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_setup_summary_shows_camofox_when_browser_feature_is_camofox(tmp_path, monkeypatch, capsys):
|
|
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
_clear_provider_env(monkeypatch)
|
|
|
|
|
monkeypatch.setattr(
|
|
|
|
|
"hermes_cli.setup.get_nous_subscription_features",
|
|
|
|
|
lambda config: NousSubscriptionFeatures(
|
|
|
|
|
subscribed=False,
|
|
|
|
|
nous_auth_present=False,
|
|
|
|
|
provider_is_nous=False,
|
|
|
|
|
features={
|
|
|
|
|
"web": NousFeatureState("web", "Web tools", True, False, False, False, False, True, ""),
|
|
|
|
|
"image_gen": NousFeatureState("image_gen", "Image generation", True, False, False, False, False, True, ""),
|
2026-05-29 18:23:37 +05:30
|
|
|
"video_gen": NousFeatureState("video_gen", "Video generation", False, False, False, False, False, False, ""),
|
2026-03-31 09:29:43 +09:00
|
|
|
"tts": NousFeatureState("tts", "OpenAI TTS", True, False, False, False, False, True, ""),
|
|
|
|
|
"browser": NousFeatureState("browser", "Browser automation", True, True, True, False, True, True, "Camofox"),
|
|
|
|
|
"modal": NousFeatureState("modal", "Modal execution", False, False, False, False, False, True, "local"),
|
|
|
|
|
},
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
monkeypatch.setattr("agent.auxiliary_client.get_available_vision_backends", lambda: [])
|
|
|
|
|
|
|
|
|
|
_print_setup_summary(load_config(), tmp_path)
|
|
|
|
|
output = capsys.readouterr().out
|
|
|
|
|
|
|
|
|
|
assert "Browser Automation (Camofox)" in output
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_setup_summary_does_not_mark_incomplete_browserbase_as_available(tmp_path, monkeypatch, capsys):
|
|
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
_clear_provider_env(monkeypatch)
|
|
|
|
|
monkeypatch.setenv("BROWSERBASE_API_KEY", "bb-key")
|
|
|
|
|
monkeypatch.setattr(
|
|
|
|
|
"hermes_cli.setup.get_nous_subscription_features",
|
|
|
|
|
lambda config: NousSubscriptionFeatures(
|
|
|
|
|
subscribed=False,
|
|
|
|
|
nous_auth_present=False,
|
|
|
|
|
provider_is_nous=False,
|
|
|
|
|
features={
|
|
|
|
|
"web": NousFeatureState("web", "Web tools", True, False, False, False, False, True, ""),
|
|
|
|
|
"image_gen": NousFeatureState("image_gen", "Image generation", True, False, False, False, False, True, ""),
|
2026-05-29 18:23:37 +05:30
|
|
|
"video_gen": NousFeatureState("video_gen", "Video generation", False, False, False, False, False, False, ""),
|
2026-03-31 09:29:43 +09:00
|
|
|
"tts": NousFeatureState("tts", "OpenAI TTS", True, False, False, False, False, True, ""),
|
|
|
|
|
"browser": NousFeatureState("browser", "Browser automation", True, False, False, False, False, True, "Browserbase"),
|
|
|
|
|
"modal": NousFeatureState("modal", "Modal execution", False, False, False, False, False, True, "local"),
|
|
|
|
|
},
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
monkeypatch.setattr("agent.auxiliary_client.get_available_vision_backends", lambda: [])
|
|
|
|
|
|
|
|
|
|
_print_setup_summary(load_config(), tmp_path)
|
|
|
|
|
output = capsys.readouterr().out
|
|
|
|
|
|
|
|
|
|
assert "Browser Automation (Browserbase)" not in output
|
|
|
|
|
assert "Browser Automation" in output
|
|
|
|
|
assert "BROWSERBASE_API_KEY/BROWSERBASE_PROJECT_ID" in output
|
2026-06-05 07:30:19 +03:00
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_setup_summary_local_browser_unavailable_without_chromium(
|
|
|
|
|
tmp_path, monkeypatch, capsys
|
|
|
|
|
):
|
|
|
|
|
"""End-to-end: agent-browser present but no Chromium in local mode must
|
|
|
|
|
render as unavailable with an install hint — not a false 'available'.
|
|
|
|
|
|
|
|
|
|
Unlike the mocked-feature tests above, this drives the real
|
|
|
|
|
``get_nous_subscription_features`` so the surface stays aligned with the
|
|
|
|
|
runtime gate in ``tools.browser_tool.check_browser_requirements``.
|
|
|
|
|
"""
|
|
|
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
|
|
|
_clear_provider_env(monkeypatch)
|
|
|
|
|
|
|
|
|
|
cfg = load_config()
|
|
|
|
|
browser_cfg = cfg.get("browser")
|
|
|
|
|
if not isinstance(browser_cfg, dict):
|
|
|
|
|
browser_cfg = {}
|
|
|
|
|
cfg["browser"] = browser_cfg
|
|
|
|
|
browser_cfg["cloud_provider"] = "local"
|
|
|
|
|
save_config(cfg)
|
|
|
|
|
|
|
|
|
|
# Only stub the readiness probes; the feature resolver itself is real.
|
|
|
|
|
monkeypatch.setattr("hermes_cli.nous_subscription._has_agent_browser", lambda: True)
|
|
|
|
|
monkeypatch.setattr(
|
|
|
|
|
"hermes_cli.nous_subscription.get_nous_portal_account_info",
|
|
|
|
|
lambda *a, **k: None,
|
|
|
|
|
)
|
|
|
|
|
monkeypatch.setattr("tools.browser_tool._chromium_installed", lambda: False)
|
|
|
|
|
monkeypatch.setattr("tools.browser_tool._using_lightpanda_engine", lambda: False)
|
|
|
|
|
monkeypatch.setattr(
|
|
|
|
|
"agent.auxiliary_client.get_available_vision_backends", lambda: []
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
_print_setup_summary(load_config(), tmp_path)
|
|
|
|
|
output = capsys.readouterr().out
|
|
|
|
|
|
|
|
|
|
assert "Browser Automation (Local browser)" not in output
|
|
|
|
|
assert "agent-browser install --with-deps" in output
|