mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-21 10:22:18 +00:00
* feat(billing): nous_billing http client + BillingState core (phase 2b)
Phase 2b terminal-billing client foundation:
- hermes_cli/nous_billing.py: typed client for the 4 /api/billing/* endpoints
(state/charge/poll/auto-top-up). Raises typed errors (BillingScopeRequired,
BillingRateLimited, BillingAuthError) mapped from the live-verified contract;
fail-open is the caller's job. Idempotency-Key enforced client-side.
- agent/billing_view.py: surface-agnostic BillingState core + Decimal money
parsing (server emits decimal strings, not 2dp), fail-open builder,
idempotency-key gen, custom-amount validation.
- 51 unit tests (decimal parse/format, payload tiering, error->exception
matrix, fail-open, amount validation).
Plan: docs/plans/2026-06-13-001-phase-2b-terminal-billing-tui-plan.md
* feat(billing): billing:manage scope + lazy step-up re-auth (phase 2b)
- NOUS_BILLING_MANAGE_SCOPE constant.
- nous_token_has_billing_scope(): split-based scope check (no false-positive
substring match).
- step_up_nous_billing_scope(): re-runs the device flow requesting
billing:manage, reusing the held credential's portal/inference URLs + client_id
(so a preview stays a preview), persists like _login_nous but WITHOUT the model
picker. Returns True iff the minted token carries the scope (False when NAS
silently downscopes a non-admin / unticked grant).
Lazy step-up (plan D-A): normal login path unchanged; 403 insufficient_scope
from a billing call triggers this. 7 unit tests.
* feat(billing): billing JSON-RPC methods for the TUI (phase 2b)
billing.state / charge / charge_status / auto_reload / step_up in
tui_gateway/server.py. Return STRUCTURED success envelopes (result.ok +
result.error=<code>) rather than JSON-RPC-level errors, so the Ink rpc() promise
always resolves and the TUI branches on the typed billing error code
(insufficient_scope, rate_limited, no_payment_method, …) to render the right
affordance. Money serialized as decimal STRINGS + display strings. charge mints
+ echoes an idempotency_key for retry reuse. 16 unit tests.
* feat(billing): /billing CLI handler + command registry (phase 2b)
- CommandDef("billing", subcommands=buy|auto-reload|limit), added to
_SLACK_VIA_HERMES_ONLY so it routes via /hermes on Slack (keeps the 50-cap
parity test green, same as /credits).
- cli.py::_show_billing + screen helpers: all 5 screens (overview, buy→confirm→
poll, auto-reload, monthly-limit read-only). Reuses _prompt_text_input_modal /
_prompt_text_input (D-C). Non-interactive (_app is None) renders text + portal
deep-link, never prompts (R7). Decimal money end-to-end. 2s/5-min cancellable
poll loop; 429/503 = retry not failure; settled = ledger truth. Lazy step-up on
403 insufficient_scope. no_payment_method treated as mainline funnel-to-portal.
- 6 CLI tests; 156 command tests (incl. Slack/Telegram parity) green.
* feat(billing): /billing Ink TUI screens + tests (phase 2b)
- ui-tui/src/app/slash/commands/billing.ts: /billing TUI command covering all 5
screens — overview (text), buy <amt> → ConfirmReq → charge → non-blocking 2s/
5-min poll loop → settled/failed/timeout branches, auto-reload <below> <to> →
ConfirmReq → PATCH, limit (read-only). Reuses the existing ConfirmReq overlay
(D-C) — no bespoke component. Typed-error envelope branching: insufficient_scope
arms the lazy step-up confirm; no_payment_method/rate_limited/cap funnel to
portal. Client-side amount validation mirrors the server (bounds + 2dp).
- gatewayTypes.ts: Billing* response interfaces.
- registry.ts: register billingCommands.
- billingCommand.test.ts: 12 vitest cases (overview/gating/buy-confirm-poll-
settled/no_payment_method/step-up/limit/auto-reload/validation).
TUI build green; 12/12 vitest pass; slash tests pass once @hermes/ink is built.
* docs(billing): scrub private cross-repo references
NAS is a private repo — remove all references to it from the public PR:
- drop the cross-repo planning doc (planning scaffolding, not a deliverable;
the PR description documents the design)
- replace 'NAS' / 'PR #412 preview' mentions in code + test comments with
generic 'the server' / 'a preview deployment'
* docs(billing): scrub final NAS reference in step-up docstring
* docs(billing): drop dangling plan-doc refs
The phase-2b plan doc was removed in the cross-repo scrub (300afcc0b)
but two module docstrings still pointed at it. Drop the dead refs.
* feat(billing): interactive /billing overlay + step-up UX, portal-URL & token fixes
Adds the interactive /billing TUI overlay and hardens the terminal-billing
client across CLI and TUI.
- TUI: full /billing overlay state machine (overview to buy to confirm,
auto-reload, read-only monthly limit) reusing the existing confirm overlay.
- Step-up: surface the verification link in-transcript and open the browser
via the TUI's own opener (the device flow runs in the headless gateway, so a
printed URL was being dropped); run the step-up handler off the main loop and
emit the link as an out-of-band event so the gateway stays responsive.
- Step-up copy is scope-accurate ("Billing permission granted") and re-checks
/state so it never claims "enabled" when the org kill-switch is still off.
- Portal deep-links resolve to absolute URLs against the active portal base
(the server emits them relative) - fixes a bare "/billing?topup=open" link.
- Billing calls refresh an expired access token via the stored refresh token
instead of reporting a false "not logged in".
- Optimistic funnel: advise "set up a saved card on the portal" up front when
no card is on file (advisory, not a hard gate).
- Token resolution is cached briefly so the 2s charge poll loop stops
re-locking + re-reading the auth store on every tick; 401 re-resolves fresh.
- Remove the temporary demo-mode shims.
Validation: 87 Python billing tests, 88 TS tests (billing command + gateway
event handler), tsc clean, ink + ui-tui builds green.
* docs(billing): add /billing TUI screenshots for PR
* fix(cli): guard _last_invalidate on bare instances; update stale prompt-fallback test
The UI-invalidate throttle read self._last_invalidate unconditionally, which
raised AttributeError on HermesCLI instances built without __init__ (the
thread-safety test's object.__new__ shell). Guard the read with getattr.
The off-main-thread branch of _prompt_text_input was changed (#23185) to cancel
cleanly to None instead of falling back to a bare input() that would hang on the
slash-worker thread; the test still asserted the old direct-input fallback.
Update it to assert the current intended behavior: returns None, calls neither
run_in_terminal nor input(), and does not hang.
377 lines
12 KiB
Python
377 lines
12 KiB
Python
"""Unit tests for the Phase 2b terminal-billing core + HTTP client.
|
|
|
|
Covers:
|
|
- Decimal money parsing/formatting (server emits decimal strings, not 2dp).
|
|
- BillingState payload parsing (role tiering, presets, bounds, sub-structs).
|
|
- Error-code → typed-exception mapping (the live-verified contract matrix).
|
|
- Fail-open builder behavior.
|
|
- Idempotency key generation.
|
|
- Custom-amount validation against bounds + multipleOf 0.01.
|
|
|
|
No network: HTTP-layer tests drive _raise_for_error directly and monkeypatch the
|
|
request function for the builder.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from decimal import Decimal
|
|
|
|
import pytest
|
|
|
|
import agent.billing_view as bv
|
|
from agent.billing_view import (
|
|
AutoReload,
|
|
BillingState,
|
|
CardInfo,
|
|
MonthlyCap,
|
|
billing_state_from_payload,
|
|
build_billing_state,
|
|
format_money,
|
|
new_idempotency_key,
|
|
parse_money,
|
|
validate_charge_amount,
|
|
)
|
|
import hermes_cli.nous_billing as nb
|
|
from hermes_cli.nous_billing import (
|
|
BillingAuthError,
|
|
BillingError,
|
|
BillingRateLimited,
|
|
BillingScopeRequired,
|
|
_raise_for_error,
|
|
resolve_portal_base_url,
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Decimal money
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"raw,expected",
|
|
[
|
|
("142.5", Decimal("142.5")), # decimal string, NOT 2dp — the headline case
|
|
("100", Decimal("100")),
|
|
("10000", Decimal("10000")),
|
|
("0.01", Decimal("0.01")),
|
|
(250, Decimal("250")),
|
|
(" 50 ", Decimal("50")),
|
|
],
|
|
)
|
|
def test_parse_money_valid(raw, expected):
|
|
assert parse_money(raw) == expected
|
|
|
|
|
|
@pytest.mark.parametrize("raw", [None, "", "abc", "1.2.3", "$5", {}])
|
|
def test_parse_money_invalid_returns_none(raw):
|
|
assert parse_money(raw) is None
|
|
|
|
|
|
def test_parse_money_never_uses_binary_float():
|
|
# If a float ever sneaks through, we still get an exact decimal, not 0.1+0.2 junk.
|
|
assert parse_money(0.1) == Decimal("0.1")
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"value,expected",
|
|
[
|
|
(Decimal("142.5"), "$142.50"),
|
|
(Decimal("100"), "$100"),
|
|
(Decimal("0.01"), "$0.01"),
|
|
(Decimal("1000"), "$1000"),
|
|
(None, "—"),
|
|
],
|
|
)
|
|
def test_format_money(value, expected):
|
|
assert format_money(value) == expected
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# BillingState payload parsing
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _member_payload() -> dict:
|
|
return {
|
|
"org": {"id": "o1", "slug": "acme", "name": "Acme", "role": "MEMBER"},
|
|
"balanceUsd": "142.5",
|
|
"cliBillingEnabled": True,
|
|
"chargePresets": ["100", "250", "500"],
|
|
"bounds": {"minUsd": "10", "maxUsd": "10000"},
|
|
"card": None,
|
|
"monthlyCap": None,
|
|
"autoReload": None,
|
|
}
|
|
|
|
|
|
def _owner_payload() -> dict:
|
|
p = _member_payload()
|
|
p["org"]["role"] = "OWNER"
|
|
p["card"] = {"brand": "visa", "last4": "4242"}
|
|
p["monthlyCap"] = {
|
|
"limitUsd": "1000",
|
|
"spentThisMonthUsd": "180",
|
|
"isDefaultCeiling": True,
|
|
}
|
|
p["autoReload"] = {"enabled": True, "thresholdUsd": "20", "reloadToUsd": "100"}
|
|
return p
|
|
|
|
|
|
def test_state_member_tier_parse():
|
|
s = billing_state_from_payload(_member_payload())
|
|
assert s.logged_in
|
|
assert s.role == "MEMBER"
|
|
assert s.balance_usd == Decimal("142.5")
|
|
assert s.cli_billing_enabled is True
|
|
assert s.charge_presets == (Decimal("100"), Decimal("250"), Decimal("500"))
|
|
assert s.min_usd == Decimal("10") and s.max_usd == Decimal("10000")
|
|
assert s.card is None and s.monthly_cap is None and s.auto_reload is None
|
|
assert s.is_admin is False
|
|
assert s.can_charge is False # not admin
|
|
|
|
|
|
def test_state_owner_tier_parse():
|
|
s = billing_state_from_payload(_owner_payload())
|
|
assert s.is_admin is True
|
|
assert s.can_charge is True # admin + kill-switch on
|
|
assert s.card == CardInfo(brand="visa", last4="4242")
|
|
assert s.card is not None and s.card.masked == "visa ····4242"
|
|
assert s.monthly_cap == MonthlyCap(
|
|
limit_usd=Decimal("1000"),
|
|
spent_this_month_usd=Decimal("180"),
|
|
is_default_ceiling=True,
|
|
)
|
|
assert s.auto_reload == AutoReload(
|
|
enabled=True, threshold_usd=Decimal("20"), reload_to_usd=Decimal("100")
|
|
)
|
|
|
|
|
|
def test_state_can_charge_false_when_killswitch_off():
|
|
p = _owner_payload()
|
|
p["cliBillingEnabled"] = False
|
|
s = billing_state_from_payload(p)
|
|
assert s.is_admin is True
|
|
assert s.can_charge is False # kill-switch off gates the action
|
|
|
|
|
|
def test_state_handles_garbage_substructs():
|
|
p = _member_payload()
|
|
p["card"] = "not-a-dict"
|
|
p["monthlyCap"] = 42
|
|
p["chargePresets"] = ["100", "bad", "250"] # bad preset dropped, not crash
|
|
s = billing_state_from_payload(p)
|
|
assert s.card is None and s.monthly_cap is None
|
|
assert s.charge_presets == (Decimal("100"), Decimal("250"))
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Error-code → typed-exception mapping (live-verified contract)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class _Headers:
|
|
def __init__(self, d):
|
|
self._d = d
|
|
|
|
def get(self, k):
|
|
return self._d.get(k)
|
|
|
|
|
|
def test_401_maps_to_auth_error():
|
|
with pytest.raises(BillingAuthError) as ei:
|
|
_raise_for_error(401, {"error": "invalid_token"})
|
|
assert ei.value.status == 401
|
|
|
|
|
|
def test_403_insufficient_scope_maps_to_scope_required():
|
|
with pytest.raises(BillingScopeRequired) as ei:
|
|
_raise_for_error(403, {"error": "insufficient_scope", "portalUrl": "/billing"})
|
|
assert ei.value.error == "insufficient_scope"
|
|
# portalUrl is resolved to an absolute URL (relative-by-design from the server).
|
|
assert (ei.value.portal_url or "").startswith("http")
|
|
assert (ei.value.portal_url or "").endswith("/billing")
|
|
|
|
|
|
@pytest.mark.parametrize("status", [429, 503])
|
|
def test_rate_limited_maps_with_retry_after(status):
|
|
with pytest.raises(BillingRateLimited) as ei:
|
|
_raise_for_error(
|
|
status,
|
|
{"error": "rate_limited"},
|
|
_Headers({"Retry-After": "60"}),
|
|
)
|
|
assert ei.value.retry_after == 60
|
|
# Critically: a rate limit is NOT a generic BillingError-only — surfaces branch on type.
|
|
assert isinstance(ei.value, BillingRateLimited)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"error",
|
|
[
|
|
"no_payment_method",
|
|
"cli_billing_disabled",
|
|
"role_required",
|
|
"monthly_cap_exceeded",
|
|
"org_access_denied",
|
|
],
|
|
)
|
|
def test_other_403s_map_to_base_error_with_portal_url(error):
|
|
with pytest.raises(BillingError) as ei:
|
|
_raise_for_error(403, {"error": error, "portalUrl": "/billing?topup=open"})
|
|
# Not a scope/auth/rate subclass — the generic gate-denial path.
|
|
assert not isinstance(ei.value, (BillingScopeRequired, BillingAuthError, BillingRateLimited))
|
|
assert ei.value.error == error
|
|
# portalUrl resolved to an absolute deep-link (server sends it relative).
|
|
assert (ei.value.portal_url or "").startswith("http")
|
|
assert (ei.value.portal_url or "").endswith("/billing?topup=open")
|
|
|
|
|
|
def test_monthly_cap_exceeded_carries_remaining_in_payload():
|
|
with pytest.raises(BillingError) as ei:
|
|
_raise_for_error(
|
|
403,
|
|
{
|
|
"error": "monthly_cap_exceeded",
|
|
"remainingUsd": "12.50",
|
|
"isDefaultCeiling": True,
|
|
"portalUrl": "/billing",
|
|
},
|
|
)
|
|
assert ei.value.payload["remainingUsd"] == "12.50"
|
|
assert ei.value.payload["isDefaultCeiling"] is True
|
|
|
|
|
|
def test_400_amount_out_of_bounds_is_base_error():
|
|
with pytest.raises(BillingError) as ei:
|
|
_raise_for_error(400, {"error": "amount_out_of_bounds", "message": "too big"})
|
|
assert ei.value.status == 400
|
|
assert "too big" in str(ei.value)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# post_charge requires idempotency key (client-side guard)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_post_charge_requires_idempotency_key():
|
|
with pytest.raises(BillingError) as ei:
|
|
nb.post_charge(amount_usd=50, idempotency_key="")
|
|
assert ei.value.error == "idempotency_key_required"
|
|
|
|
|
|
def test_get_charge_status_requires_id():
|
|
with pytest.raises(BillingError) as ei:
|
|
nb.get_charge_status("")
|
|
assert ei.value.error == "invalid_charge_id"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Base-URL resolution precedence
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_portal_base_url_env_override(monkeypatch):
|
|
monkeypatch.setenv("HERMES_PORTAL_BASE_URL", "https://preview.example.com/")
|
|
assert resolve_portal_base_url() == "https://preview.example.com"
|
|
|
|
|
|
def test_portal_base_url_falls_back_to_state(monkeypatch):
|
|
monkeypatch.delenv("HERMES_PORTAL_BASE_URL", raising=False)
|
|
monkeypatch.delenv("NOUS_PORTAL_BASE_URL", raising=False)
|
|
assert (
|
|
resolve_portal_base_url({"portal_base_url": "https://stored.example.com/"})
|
|
== "https://stored.example.com"
|
|
)
|
|
|
|
|
|
def test_portal_base_url_default(monkeypatch):
|
|
monkeypatch.delenv("HERMES_PORTAL_BASE_URL", raising=False)
|
|
monkeypatch.delenv("NOUS_PORTAL_BASE_URL", raising=False)
|
|
assert resolve_portal_base_url() == nb.DEFAULT_PORTAL_BASE_URL
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Fail-open builder
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_build_billing_state_logged_out_on_auth_error(monkeypatch):
|
|
def _auth(*a, **kw):
|
|
raise BillingAuthError("nope", status=401)
|
|
|
|
monkeypatch.setattr(nb, "get_billing_state", _auth)
|
|
s = build_billing_state()
|
|
assert s.logged_in is False
|
|
assert s.error is None # cleanly logged out, not an error
|
|
|
|
|
|
def test_build_billing_state_fail_open_on_http_error(monkeypatch):
|
|
def _boom(*a, **kw):
|
|
raise BillingError("portal exploded", status=500)
|
|
|
|
monkeypatch.setattr(nb, "get_billing_state", _boom)
|
|
s = build_billing_state()
|
|
assert s.logged_in is False
|
|
assert "portal exploded" in (s.error or "")
|
|
|
|
|
|
def test_build_billing_state_parses_and_prefers_server_portal_url(monkeypatch):
|
|
payload = _owner_payload()
|
|
payload["portalUrl"] = "https://portal.example.com/billing?topup=open"
|
|
monkeypatch.setattr(nb, "get_billing_state", lambda *a, **kw: payload)
|
|
s = build_billing_state()
|
|
assert s.logged_in is True
|
|
assert s.portal_url == "https://portal.example.com/billing?topup=open"
|
|
assert s.balance_usd == Decimal("142.5")
|
|
|
|
|
|
def test_build_billing_state_builds_fallback_portal_url(monkeypatch):
|
|
payload = _member_payload() # no portalUrl key
|
|
monkeypatch.setattr(nb, "get_billing_state", lambda *a, **kw: payload)
|
|
monkeypatch.setattr(bv, "_fallback_portal_url", lambda base: "FALLBACK")
|
|
# resolve_portal_base_url is imported into bv via local import; patch nb's.
|
|
s = build_billing_state()
|
|
assert s.portal_url == "FALLBACK"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Idempotency
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_new_idempotency_key_unique_and_uuid_shaped():
|
|
a, b = new_idempotency_key(), new_idempotency_key()
|
|
assert a != b
|
|
assert len(a) == 36 and a.count("-") == 4
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Amount validation (Screen 3 custom input)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_validate_amount_ok():
|
|
v = validate_charge_amount("100", min_usd=Decimal("10"), max_usd=Decimal("10000"))
|
|
assert v.ok and v.amount == Decimal("100")
|
|
|
|
|
|
def test_validate_amount_strips_dollar_sign():
|
|
v = validate_charge_amount("$250", min_usd=Decimal("10"), max_usd=Decimal("10000"))
|
|
assert v.ok and v.amount == Decimal("250")
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"raw,err_substr",
|
|
[
|
|
("", "dollar amount"),
|
|
("0", "greater than"),
|
|
("-5", "greater than"),
|
|
("10.005", "cent"), # multipleOf 0.01 — sub-cent rejected
|
|
("5", "Minimum"), # below bounds.minUsd
|
|
("99999", "Maximum"), # above bounds.maxUsd
|
|
],
|
|
)
|
|
def test_validate_amount_rejections(raw, err_substr):
|
|
v = validate_charge_amount(raw, min_usd=Decimal("10"), max_usd=Decimal("10000"))
|
|
assert not v.ok
|
|
assert err_substr.lower() in (v.error or "").lower()
|