mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-29 06:31:32 +00:00
66827f8947
Remove unused imports (F401) and duplicate/shadowed import redefinitions (F811) across the codebase using ruff's safe autofixes. No behavioral changes -- imports only. - ~1400 safe autofixes applied across 644 files (net -1072 lines) - __init__.py re-exports preserved (excluded from F401 removal so public re-export surfaces stay intact) - Re-exports that are imported or monkeypatched by tests but look unused in their defining module are kept with explicit # noqa: F401 (gateway/run.py load_dotenv; run_agent re-exports from agent.message_sanitization, agent.context_compressor, agent.retry_utils, agent.prompt_builder, agent.process_bootstrap, agent.codex_responses_adapter) - Unsafe F841 (unused-variable) fixes deliberately skipped -- those can change behavior when the RHS has side effects - ruff lints remain disabled in pyproject.toml (only PLW1514 is selected); this is a one-time cleanup, not a config change Verification: - python -m compileall: clean - pytest --collect-only: all 27161 tests collect (zero import errors) - core entry points import clean (run_agent, model_tools, cli, toolsets, hermes_state, batch_runner, gateway) - static scan: every name any test imports directly from an edited module still resolves
100 lines
4.5 KiB
Python
100 lines
4.5 KiB
Python
"""Test that overlay providers with mismatched models.dev keys resolve correctly.
|
|
|
|
HERMES_OVERLAYS keys may be models.dev IDs (e.g. "github-copilot") while
|
|
_PROVIDER_MODELS and config.yaml use Hermes IDs ("copilot"). The slug
|
|
resolution in list_authenticated_providers() Section 2 must bridge this gap.
|
|
|
|
Covers: #5223, #6492
|
|
"""
|
|
|
|
import os
|
|
from unittest.mock import patch
|
|
|
|
|
|
from hermes_cli.model_switch import list_authenticated_providers
|
|
|
|
|
|
# -- Copilot slug resolution (env var path) ----------------------------------
|
|
|
|
@patch.dict(os.environ, {"COPILOT_GITHUB_TOKEN": "fake-ghu"}, clear=False)
|
|
def test_copilot_uses_hermes_slug():
|
|
"""github-copilot overlay should resolve to slug='copilot' with curated models."""
|
|
providers = list_authenticated_providers(current_provider="copilot")
|
|
|
|
copilot = next((p for p in providers if p["slug"] == "copilot"), None)
|
|
assert copilot is not None, "copilot should appear when COPILOT_GITHUB_TOKEN is set"
|
|
assert copilot["total_models"] > 0, "copilot should have curated models"
|
|
assert copilot["is_current"] is True
|
|
|
|
# Must NOT appear under the models.dev key
|
|
gh_copilot = next((p for p in providers if p["slug"] == "github-copilot"), None)
|
|
assert gh_copilot is None, "github-copilot slug should not appear (resolved to copilot)"
|
|
|
|
|
|
@patch.dict(os.environ, {"COPILOT_GITHUB_TOKEN": "fake-ghu"}, clear=False)
|
|
def test_copilot_no_duplicate_entries():
|
|
"""Copilot must appear only once — not as both 'copilot' (section 1) and 'github-copilot' (section 2)."""
|
|
providers = list_authenticated_providers(current_provider="copilot")
|
|
|
|
copilot_slugs = [p["slug"] for p in providers if "copilot" in p["slug"]]
|
|
# Should have at most one copilot entry (may also have copilot-acp if creds exist)
|
|
copilot_main = [s for s in copilot_slugs if s == "copilot"]
|
|
assert len(copilot_main) == 1, f"Expected exactly one 'copilot' entry, got {copilot_main}"
|
|
|
|
|
|
# -- kimi-for-coding alias in auth.py ----------------------------------------
|
|
|
|
def test_kimi_for_coding_alias():
|
|
"""resolve_provider('kimi-for-coding') should return 'kimi-coding'."""
|
|
from hermes_cli.auth import resolve_provider
|
|
|
|
result = resolve_provider("kimi-for-coding")
|
|
assert result == "kimi-coding"
|
|
|
|
|
|
# -- Generic slug mismatch providers -----------------------------------------
|
|
|
|
@patch.dict(os.environ, {"KIMI_API_KEY": "fake-key"}, clear=False)
|
|
def test_kimi_for_coding_overlay_uses_hermes_slug():
|
|
"""kimi-for-coding overlay should resolve to slug='kimi-coding'."""
|
|
providers = list_authenticated_providers(current_provider="kimi-coding")
|
|
|
|
kimi = next((p for p in providers if p["slug"] == "kimi-coding"), None)
|
|
assert kimi is not None, "kimi-coding should appear when KIMI_API_KEY is set"
|
|
assert kimi["is_current"] is True
|
|
|
|
# Must NOT appear under the models.dev key
|
|
kimi_mdev = next((p for p in providers if p["slug"] == "kimi-for-coding"), None)
|
|
assert kimi_mdev is None, "kimi-for-coding slug should not appear (resolved to kimi-coding)"
|
|
|
|
|
|
@patch.dict(os.environ, {"KILOCODE_API_KEY": "fake-key"}, clear=False)
|
|
def test_kilo_overlay_uses_hermes_slug():
|
|
"""kilo overlay should resolve to slug='kilocode'."""
|
|
providers = list_authenticated_providers(current_provider="kilocode")
|
|
|
|
kilo = next((p for p in providers if p["slug"] == "kilocode"), None)
|
|
assert kilo is not None, "kilocode should appear when KILOCODE_API_KEY is set"
|
|
assert kilo["is_current"] is True
|
|
|
|
kilo_mdev = next((p for p in providers if p["slug"] == "kilo"), None)
|
|
assert kilo_mdev is None, "kilo slug should not appear (resolved to kilocode)"
|
|
|
|
|
|
|
|
def test_mapped_provider_credential_pool_visibility(monkeypatch):
|
|
"""Mapped providers should appear when credentials live only in auth-store credential_pool."""
|
|
monkeypatch.setattr("agent.models_dev.fetch_models_dev", lambda: {"google-ai-studio": {"env": ["GEMINI_API_KEY"]}})
|
|
monkeypatch.setattr("agent.models_dev.PROVIDER_TO_MODELS_DEV", {"gemini": "google-ai-studio"})
|
|
monkeypatch.setattr(
|
|
"hermes_cli.auth._load_auth_store",
|
|
lambda: {"providers": {}, "credential_pool": {"gemini": {"token": "fake"}}},
|
|
)
|
|
monkeypatch.delenv("GEMINI_API_KEY", raising=False)
|
|
|
|
providers = list_authenticated_providers(current_provider="gemini")
|
|
|
|
gemini = next((p for p in providers if p["slug"] == "gemini"), None)
|
|
assert gemini is not None, "gemini should appear when auth-store credential_pool has creds"
|
|
assert gemini["is_current"] is True
|
|
assert gemini["total_models"] > 0
|