mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-31 19:16:29 +00:00
Second, deeper pass over tools/gateway/hermes_cli plus first pass over the trees wave 1 missed (acp, acp_adapter, skills, computer_use, docker, dashboard, conformance, monitoring, secret_sources, hermes_state, providers). Same rubric as wave 1 (AGENTS.md test policy); security, alternation/caching invariants, issue-number regressions, and E2E kept. Real test-quality fixes found and rooted out along the way: - tests/tools/test_command_guards.py made real auxiliary-LLM HTTPS calls (DEFAULT_CONFIG smart-approval leaked in) — pinned approval mode=manual via autouse fixture: 17.4s → 0.4s. - test_model_switch_custom_providers.py / test_user_providers_model_switch.py silently probed live provider catalogs (~2s/test) — stubbed cached_provider_model_ids/provider_model_ids/fetch_api_models. - test_telegram_noise_filter.py: 15-platform copy-paste matrix over shared gateway.run logic → 3 representative platforms (55s → 3.9s). - test_gateway_shutdown.py: stop()'s 5s interrupt-deadline loop spun on MagicMock agents — interrupt.side_effect now clears _running_agents (22s → 1.0s). - test_gateway_inactivity_timeout.py poll-harness timings shrunk 3-5x (24s → 1.1s); test_mcp_stability.py backoff/SIGTERM-grace sleeps patched (15.4s → 2.5s); test_async_delegation.py negative-drain wait 5s → 0.5s. - test_telegram_init_deadline.py: loop-block margin restored to 1.0s with rationale comment — the watchdog-dump assertion needs the loop blocked well past deadline+grace under parallel load (flaked once in the 40-worker verification run at a 0.2s margin). Verification: full hermetic suite via scripts/run_tests.sh — 2,438 files, 21,718 tests passed, 0 failed, 293.9s wall. Suite totals vs original baseline: 46,820 → 19,757 test functions (−57.8%), wall 583.5s → 293.9s (−50%), subprocess CPU 13,564s → 11,623s.
267 lines
7.9 KiB
Python
267 lines
7.9 KiB
Python
"""Tests for normalized Nous Portal account entitlement helpers."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import base64
|
|
import json
|
|
import time
|
|
from typing import Any
|
|
|
|
import pytest
|
|
|
|
from hermes_cli.nous_account import (
|
|
NousPaidServiceAccessInfo,
|
|
NousPortalAccountInfo,
|
|
format_nous_portal_entitlement_message,
|
|
get_nous_portal_account_info,
|
|
nous_portal_topup_url,
|
|
reset_nous_portal_account_info_cache,
|
|
)
|
|
|
|
|
|
def _jwt(claims: dict[str, Any]) -> str:
|
|
def _part(payload: dict[str, Any]) -> str:
|
|
raw = json.dumps(payload, separators=(",", ":")).encode()
|
|
return base64.urlsafe_b64encode(raw).decode().rstrip("=")
|
|
|
|
return f"{_part({'alg': 'none', 'typ': 'JWT'})}.{_part(claims)}.sig"
|
|
|
|
|
|
def _state(token: str) -> dict[str, Any]:
|
|
return {
|
|
"access_token": token,
|
|
"portal_base_url": "https://portal.example.test",
|
|
"client_id": "hermes-cli",
|
|
}
|
|
|
|
|
|
def _account_payload(
|
|
*,
|
|
allowed: bool,
|
|
subscription: dict[str, Any] | None,
|
|
subscription_credits: float,
|
|
purchased_credits: float,
|
|
) -> dict[str, Any]:
|
|
return {
|
|
"user": {
|
|
"email": "alice@example.test",
|
|
"privy_did": "did:privy:alice",
|
|
},
|
|
"organisation": {
|
|
"id": "org_123",
|
|
},
|
|
"subscription": subscription,
|
|
"purchased_credits_remaining": purchased_credits,
|
|
"paid_service_access": {
|
|
"allowed": allowed,
|
|
"paid_access": allowed,
|
|
"reason": "usable_credits" if allowed else "no_usable_credits",
|
|
"organisation_id": "org_123",
|
|
"effective_at_ms": 123456789,
|
|
"has_active_subscription": subscription is not None,
|
|
"active_subscription_is_paid": bool(
|
|
subscription and subscription.get("monthly_charge", 0) > 0
|
|
),
|
|
"subscription_tier": subscription.get("tier") if subscription else None,
|
|
"subscription_monthly_charge": (
|
|
subscription.get("monthly_charge") if subscription else None
|
|
),
|
|
"subscription_credits_remaining": subscription_credits,
|
|
"purchased_credits_remaining": purchased_credits,
|
|
"total_usable_credits": subscription_credits + purchased_credits,
|
|
},
|
|
}
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _reset_cache():
|
|
reset_nous_portal_account_info_cache()
|
|
yield
|
|
reset_nous_portal_account_info_cache()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
("payload", "expected_paid"),
|
|
[
|
|
(
|
|
_account_payload(
|
|
allowed=True,
|
|
subscription={
|
|
"plan": "Tier 2",
|
|
"tier": 2,
|
|
"monthly_charge": 20,
|
|
"current_period_end": "2026-05-01T00:00:00.000Z",
|
|
"credits_remaining": 12.25,
|
|
"rollover_credits": 3.5,
|
|
},
|
|
subscription_credits=12.25,
|
|
purchased_credits=7.75,
|
|
),
|
|
True,
|
|
),
|
|
(
|
|
_account_payload(
|
|
allowed=False,
|
|
subscription={
|
|
"plan": "Tier 2",
|
|
"tier": 2,
|
|
"monthly_charge": 20,
|
|
"current_period_end": "2026-05-01T00:00:00.000Z",
|
|
"credits_remaining": 0,
|
|
"rollover_credits": 0,
|
|
},
|
|
subscription_credits=0,
|
|
purchased_credits=0,
|
|
),
|
|
False,
|
|
),
|
|
(
|
|
_account_payload(
|
|
allowed=True,
|
|
subscription=None,
|
|
subscription_credits=0,
|
|
purchased_credits=7.75,
|
|
),
|
|
True,
|
|
),
|
|
(
|
|
_account_payload(
|
|
allowed=False,
|
|
subscription=None,
|
|
subscription_credits=0,
|
|
purchased_credits=0,
|
|
),
|
|
False,
|
|
),
|
|
],
|
|
)
|
|
def test_fresh_account_payload_normalization(monkeypatch, payload, expected_paid):
|
|
token = _jwt({"sub": "user_123", "org_id": "org_123", "exp": int(time.time()) + 900})
|
|
monkeypatch.setattr("hermes_cli.auth.get_provider_auth_state", lambda provider: _state(token))
|
|
monkeypatch.setattr("hermes_cli.auth.resolve_nous_access_token", lambda: "fresh-token")
|
|
monkeypatch.setattr("hermes_cli.nous_account._fetch_nous_account_info", lambda *a, **kw: payload)
|
|
|
|
info = get_nous_portal_account_info(force_fresh=True)
|
|
|
|
assert isinstance(info, NousPortalAccountInfo)
|
|
assert info.source == "account_api"
|
|
assert info.fresh is True
|
|
assert info.email == "alice@example.test"
|
|
assert info.privy_did == "did:privy:alice"
|
|
assert info.org_id == "org_123"
|
|
assert info.paid_service_access is expected_paid
|
|
assert info.is_paid is expected_paid
|
|
assert info.is_free_tier is (not expected_paid)
|
|
|
|
|
|
def test_no_oauth_token_reports_inference_key_present(monkeypatch):
|
|
monkeypatch.setattr("hermes_cli.auth.get_provider_auth_state", lambda provider: {})
|
|
|
|
class _Entry:
|
|
label = "manual-nous"
|
|
access_token = ""
|
|
agent_key = "opaque-runtime-key"
|
|
agent_key_expires_at = "2099-01-01T00:00:00+00:00"
|
|
expires_at = None
|
|
inference_base_url = "https://inference.example.test/v1"
|
|
base_url = "https://inference.example.test/v1"
|
|
priority = 0
|
|
|
|
@property
|
|
def runtime_api_key(self):
|
|
return self.agent_key
|
|
|
|
@property
|
|
def runtime_base_url(self):
|
|
return self.inference_base_url
|
|
|
|
class _Pool:
|
|
def has_credentials(self):
|
|
return True
|
|
|
|
def entries(self):
|
|
return [_Entry()]
|
|
|
|
monkeypatch.setattr("agent.credential_pool.load_pool", lambda provider: _Pool())
|
|
|
|
info = get_nous_portal_account_info()
|
|
|
|
assert info.logged_in is False
|
|
assert info.source == "inference_key"
|
|
assert info.inference_credential_present is True
|
|
assert info.credential_source == "pool:manual-nous"
|
|
assert info.paid_service_access is None
|
|
|
|
|
|
def test_pool_oauth_entry_force_fresh_uses_account_api(monkeypatch):
|
|
token = _jwt(
|
|
{
|
|
"sub": "user_123",
|
|
"org_id": "org_123",
|
|
"exp": int(time.time()) + 900,
|
|
"paid_access": False,
|
|
}
|
|
)
|
|
payload = _account_payload(
|
|
allowed=True,
|
|
subscription=None,
|
|
subscription_credits=0,
|
|
purchased_credits=3,
|
|
)
|
|
monkeypatch.setattr("hermes_cli.auth.get_provider_auth_state", lambda provider: {})
|
|
monkeypatch.setattr("hermes_cli.nous_account._fetch_nous_account_info", lambda *a, **kw: payload)
|
|
|
|
class _Entry:
|
|
label = "dashboard device_code"
|
|
auth_type = "oauth"
|
|
access_token = token
|
|
refresh_token = "refresh-token"
|
|
agent_key = "opaque-runtime-key"
|
|
agent_key_expires_at = "2099-01-01T00:00:00+00:00"
|
|
expires_at = "2099-01-01T00:00:00+00:00"
|
|
portal_base_url = "https://portal.example.test"
|
|
inference_base_url = "https://inference.example.test/v1"
|
|
base_url = "https://inference.example.test/v1"
|
|
priority = 0
|
|
|
|
@property
|
|
def runtime_api_key(self):
|
|
return self.agent_key
|
|
|
|
@property
|
|
def runtime_base_url(self):
|
|
return self.inference_base_url
|
|
|
|
class _Pool:
|
|
def has_credentials(self):
|
|
return True
|
|
|
|
def entries(self):
|
|
return [_Entry()]
|
|
|
|
monkeypatch.setattr("agent.credential_pool.load_pool", lambda provider: _Pool())
|
|
|
|
info = get_nous_portal_account_info(force_fresh=True)
|
|
|
|
assert info.logged_in is True
|
|
assert info.source == "account_api"
|
|
assert info.fresh is True
|
|
assert info.paid_service_access is True
|
|
assert info.credential_source == "pool:dashboard device_code"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# ── org slug/name parsing + top-up URL builder ──────────────────────────────
|
|
|
|
|
|
|
|
|
|
|
|
|