d10bb2ab6f
`scripts/run_tests.sh tests/<dir>/` is how a change gets its regression
coverage run, so a test filed under the wrong directory is a test nobody
runs when that code changes. Two kinds of drift had accumulated.
Parallel directories for one source package, folded into the mirror:
tests/acp -> tests/acp_adapter (its __init__/conftest move with it)
tests/cli -> tests/hermes_cli (prompt_toolkit fixture merged into
hermes_cli/conftest.py)
tests/run_agent -> tests/agent (backoff fixture becomes
agent/conftest.py)
tests/relay -> tests/gateway/relay
tests/state -> tests/hermes_state
246 loose files at tests/ root, routed by the package they import/patch:
hermes_cli, hermes_state, agent, gateway, tools, plugins, tui_gateway, cron.
Installer and desktop-update script tests go to tests/scripts/{install,
desktop_update}/. 43 tests of root-level modules (batch_runner, utils,
hermes_constants, packaging) stay at the root.
Filenames drop their issue numbers (95 files: test_89315_x.py -> test_x.py);
the number stays in the module docstring where it has context.
Collisions: test_cli_skin_integration.py existed in both tests/ and tests/cli
with different subsets — merged into one (10 tests, all kept);
run_agent/test_pre_compress_memory_context.py -> agent/..._handoff.py;
tests/test_account_usage.py -> agent/test_account_usage_fetch.py;
tests/test_web_server.py -> hermes_cli/test_web_server_ws_ping.py.
Deleted: test_minisweagent_path.py (empty since PR #2804),
test_model_picker_scroll.py (tested a private copy of the logic, imported
nothing), test_process_loop_event_loop_warning.py (asserted asyncio behaviour,
imported nothing from Hermes).
Repo-root path arithmetic (Path(__file__).parents[N], dirname chains) is
bumped for the 202 files that changed depth and verified by evaluating every
such expression against the new location. classify_changes' desktop-updater
lane prefix, tests-os.yml's ignore glob and every in-tree path comment follow
the moves. tests/test_tests_tree_layout.py keeps the tree from drifting back.
204 lines
6.5 KiB
Python
204 lines
6.5 KiB
Python
from datetime import datetime, timezone
|
|
|
|
from agent.account_usage import (
|
|
AccountUsageSnapshot,
|
|
AccountUsageWindow,
|
|
fetch_account_usage,
|
|
render_account_usage_lines,
|
|
)
|
|
|
|
|
|
class _Response:
|
|
def __init__(self, payload, status_code=200):
|
|
self._payload = payload
|
|
self.status_code = status_code
|
|
|
|
def raise_for_status(self):
|
|
if self.status_code >= 400:
|
|
raise RuntimeError(f"HTTP {self.status_code}")
|
|
|
|
def json(self):
|
|
return self._payload
|
|
|
|
|
|
class _Client:
|
|
def __init__(self, payload):
|
|
self._payload = payload
|
|
|
|
def __enter__(self):
|
|
return self
|
|
|
|
def __exit__(self, exc_type, exc, tb):
|
|
return False
|
|
|
|
def get(self, url, headers=None):
|
|
return _Response(self._payload)
|
|
|
|
|
|
class _RoutingClient:
|
|
def __init__(self, payloads):
|
|
self._payloads = payloads
|
|
|
|
def __enter__(self):
|
|
return self
|
|
|
|
def __exit__(self, exc_type, exc, tb):
|
|
return False
|
|
|
|
def get(self, url, headers=None):
|
|
return _Response(self._payloads[url])
|
|
|
|
|
|
def test_fetch_account_usage_codex(monkeypatch):
|
|
monkeypatch.setattr(
|
|
"agent.account_usage.resolve_codex_runtime_credentials",
|
|
lambda refresh_if_expiring=True: {
|
|
"provider": "openai-codex",
|
|
"base_url": "https://chatgpt.com/backend-api/codex",
|
|
"api_key": "access-token",
|
|
},
|
|
)
|
|
monkeypatch.setattr(
|
|
"agent.account_usage._read_codex_tokens",
|
|
lambda: {"tokens": {"account_id": "acct_123"}},
|
|
)
|
|
monkeypatch.setattr(
|
|
"agent.account_usage.httpx.Client",
|
|
lambda timeout=15.0: _Client(
|
|
{
|
|
"plan_type": "pro",
|
|
"rate_limit": {
|
|
"primary_window": {
|
|
"used_percent": 15,
|
|
"reset_at": 1_900_000_000,
|
|
"limit_window_seconds": 18000,
|
|
},
|
|
"secondary_window": {
|
|
"used_percent": 40,
|
|
"reset_at": 1_900_500_000,
|
|
"limit_window_seconds": 604800,
|
|
},
|
|
},
|
|
"credits": {"has_credits": True, "balance": 12.5},
|
|
}
|
|
),
|
|
)
|
|
|
|
snapshot = fetch_account_usage("openai-codex")
|
|
|
|
assert snapshot is not None
|
|
assert snapshot.plan == "Pro"
|
|
assert len(snapshot.windows) == 2
|
|
assert snapshot.windows[0].label == "Session"
|
|
assert snapshot.windows[0].used_percent == 15.0
|
|
assert snapshot.windows[0].reset_at == datetime.fromtimestamp(1_900_000_000, tz=timezone.utc)
|
|
assert "Credits balance: $12.50" in snapshot.details
|
|
|
|
|
|
def test_render_account_usage_lines_includes_reset_and_provider():
|
|
snapshot = AccountUsageSnapshot(
|
|
provider="openai-codex",
|
|
source="usage_api",
|
|
fetched_at=datetime.now(timezone.utc),
|
|
plan="Pro",
|
|
windows=(
|
|
AccountUsageWindow(
|
|
label="Session",
|
|
used_percent=25,
|
|
reset_at=datetime.now(timezone.utc),
|
|
),
|
|
),
|
|
details=("Credits balance: $9.99",),
|
|
)
|
|
lines = render_account_usage_lines(snapshot)
|
|
|
|
assert lines[0] == "📈 Account limits"
|
|
assert "openai-codex (Pro)" in lines[1]
|
|
assert "Session: 75% remaining (25% used)" in lines[2]
|
|
assert "Credits balance: $9.99" in lines[3]
|
|
|
|
|
|
def test_fetch_account_usage_openrouter_uses_limit_remaining_and_ignores_deprecated_rate_limit(monkeypatch):
|
|
monkeypatch.setattr(
|
|
"agent.account_usage.resolve_runtime_provider",
|
|
lambda requested, explicit_base_url=None, explicit_api_key=None: {
|
|
"provider": "openrouter",
|
|
"base_url": "https://openrouter.ai/api/v1",
|
|
"api_key": "sk-test",
|
|
},
|
|
)
|
|
monkeypatch.setattr(
|
|
"agent.account_usage.httpx.Client",
|
|
lambda timeout=10.0: _RoutingClient(
|
|
{
|
|
"https://openrouter.ai/api/v1/credits": {
|
|
"data": {"total_credits": 300.0, "total_usage": 10.92}
|
|
},
|
|
"https://openrouter.ai/api/v1/key": {
|
|
"data": {
|
|
"limit": 100.0,
|
|
"limit_remaining": 70.0,
|
|
"limit_reset": "monthly",
|
|
"usage": 12.5,
|
|
"usage_daily": 0.5,
|
|
"usage_weekly": 2.0,
|
|
"usage_monthly": 8.0,
|
|
"rate_limit": {"requests": -1, "interval": "10s"},
|
|
}
|
|
},
|
|
}
|
|
),
|
|
)
|
|
|
|
snapshot = fetch_account_usage("openrouter")
|
|
|
|
assert snapshot is not None
|
|
assert snapshot.windows == (
|
|
AccountUsageWindow(
|
|
label="API key quota",
|
|
used_percent=30.0,
|
|
detail="$70.00 of $100.00 remaining • resets monthly",
|
|
),
|
|
)
|
|
assert "Credits balance: $289.08" in snapshot.details
|
|
assert "API key usage: $12.50 total • $0.50 today • $2.00 this week • $8.00 this month" in snapshot.details
|
|
assert all("-1 requests / 10s" not in line for line in render_account_usage_lines(snapshot))
|
|
|
|
|
|
def test_fetch_account_usage_openrouter_omits_quota_window_when_key_has_no_limit(monkeypatch):
|
|
monkeypatch.setattr(
|
|
"agent.account_usage.resolve_runtime_provider",
|
|
lambda requested, explicit_base_url=None, explicit_api_key=None: {
|
|
"provider": "openrouter",
|
|
"base_url": "https://openrouter.ai/api/v1",
|
|
"api_key": "sk-test",
|
|
},
|
|
)
|
|
monkeypatch.setattr(
|
|
"agent.account_usage.httpx.Client",
|
|
lambda timeout=10.0: _RoutingClient(
|
|
{
|
|
"https://openrouter.ai/api/v1/credits": {
|
|
"data": {"total_credits": 100.0, "total_usage": 25.5}
|
|
},
|
|
"https://openrouter.ai/api/v1/key": {
|
|
"data": {
|
|
"limit": None,
|
|
"limit_remaining": None,
|
|
"usage": 25.5,
|
|
"usage_daily": 1.25,
|
|
"usage_weekly": 4.5,
|
|
"usage_monthly": 18.0,
|
|
}
|
|
},
|
|
}
|
|
),
|
|
)
|
|
|
|
snapshot = fetch_account_usage("openrouter")
|
|
|
|
assert snapshot is not None
|
|
assert snapshot.windows == ()
|
|
assert "Credits balance: $74.50" in snapshot.details
|
|
assert "API key usage: $25.50 total • $1.25 today • $4.50 this week • $18.00 this month" in snapshot.details
|