163 lines
4.6 KiB
Python
Raw Normal View History

Fix circular import, primary-admin NULL trap, and add gateway quota reset Restores a working import graph and closes two data-correctness bugs, plus adds a reset for the AI gateway's rolling 24h spend. Circular import: database/__init__ -> engagement -> content -> utils -> database made the package unimportable. get_project_devlog moves out of database/engagement.py into content.py, where enrich_items already lives. Primary administrator: _can_hold_primary_admin read is_active with bool(row.get("is_active")), so an admin row whose is_active column is SQL NULL (any row predating the column) was treated as deactivated and skipped. Every other site defaults an unknown is_active to active; this one now does too. Profile JSON: xp_next_level and xp_progress_pct were computed but only put on the top-level context, never on profile_user, so they serialised as null even though UserOut declares them and the API docs document them as embedded there. Gateway quota reset: a cap previously lifted only with the passage of time. quota.reset upserts a watermark row into gateway_quota_resets, scoped by the same three nullable dimensions as a quota rule, and spent_24h sums from max(24h cutoff, watermark). No ledger row is deleted, so the cost analytics on /admin/ai-usage stay intact. Reaches every surface: POST /admin/gateway/quota-resets, a per-rule Reset spend button, the Devii tool gateway_quota_reset (confirm-gated), devplace gateway quota reset, and the API docs. Admin's Reset all quotas now stamps a global gateway watermark too, which is what a caller stuck on "AI gateway daily quota exceeded" needed. Startup: _backfill_gamification swept every xp=0 user on every boot in every worker and could never converge, since a user with no content earns no XP. It now intersects pending users with _milestone_candidates(). db.tables is a live reflection, so it is hoisted out of the loops that probed it per row. Docker: the dependency layer now depends on pyproject.toml only, so a source edit no longer reinstalls every dependency and re-downloads Chromium. Adds start_interval so the healthcheck probes during the start period, and a docker-reload target, since docker-up does not restart an unchanged container. Adds events.md, the audit event catalogue that README, CLAUDE.md, the quiz docs and the tooling all referenced but which never existed: 288 keys across 28 categories, including the families built from a variable at the call site. Test fixes: both devlog helpers dated post 0 as the newest while the tests assumed post 2 was; a profile login posted username= to a form that takes email=; a devlog assertion matched six buttons under strict mode; and the primary-admin tests seeded founders newer than the back-dated fixture admin, so they only passed without the api tier. Full suite: 2989 passed, 1 skipped.
2026-07-27 11:17:48 +02:00
# retoor <retoor@molodetz.nl>
from datetime import datetime, timezone
import requests
from devplacepy.database import get_table, refresh_snapshot
from devplacepy.services.openai_gateway.usage import GATEWAY_LEDGER
from devplacepy.utils import generate_uid
from tests.api.admin.gateway.index import (
JSON_gateway,
admin_session,
member_key,
)
from tests.conftest import BASE_URL
RESETS_URL = f"{BASE_URL}/admin/gateway/quota-resets"
_counter = [0]
def _owner():
_counter[0] += 1
return f"gwquota{_counter[0]}-{generate_uid()}"
def _burn(owner_id, app_reference, cost):
refresh_snapshot()
get_table(GATEWAY_LEDGER).insert(
{
"uid": generate_uid(),
"owner_kind": "user",
"owner_id": owner_id,
"app_reference": app_reference,
"cost_usd": cost,
"created_at": datetime.now(timezone.utc).isoformat(),
}
)
refresh_snapshot()
def _spent(owner_id, app_reference):
from devplacepy.services.openai_gateway import quota
refresh_snapshot()
quota._QUOTA_CACHE.clear()
return quota.spent_24h("user", owner_id, app_reference)
def test_quota_reset_requires_admin(seeded_db):
assert (
requests.post(RESETS_URL, headers=JSON_gateway, allow_redirects=False).status_code
== 401
)
key = member_key()
assert (
requests.post(
RESETS_URL,
headers={**JSON_gateway, "X-API-KEY": key},
json={},
allow_redirects=False,
).status_code
== 403
)
def test_admin_can_reset_a_scoped_spend(seeded_db):
owner = _owner()
_burn(owner, "appa", 2.5)
assert _spent(owner, "appa") == 2.5
response = admin_session(seeded_db).post(
RESETS_URL,
json={"owner_kind": "user", "owner_id": owner, "app_reference": "appa"},
)
assert response.status_code == 200
assert response.json()["ok"] is True
assert _spent(owner, "appa") == 0.0
def test_the_reset_response_echoes_the_scope(seeded_db):
owner = _owner()
_burn(owner, "appa", 1.0)
payload = admin_session(seeded_db).post(
RESETS_URL,
json={"owner_kind": "user", "owner_id": owner, "app_reference": "appa"},
).json()["reset"]
assert payload["owner_kind"] == "user"
assert payload["owner_id"] == owner
assert payload["app_reference"] == "appa"
assert payload["reset_at"]
def test_a_reset_leaves_another_caller_capped(seeded_db):
first, second = _owner(), _owner()
_burn(first, "appa", 2.0)
_burn(second, "appa", 2.0)
admin_session(seeded_db).post(
RESETS_URL,
json={"owner_kind": "user", "owner_id": first, "app_reference": "appa"},
)
assert _spent(first, "appa") == 0.0
assert _spent(second, "appa") == 2.0
def test_a_reset_keeps_the_usage_history(seeded_db):
owner = _owner()
_burn(owner, "appa", 2.0)
before = get_table(GATEWAY_LEDGER).count(owner_id=owner)
admin_session(seeded_db).post(
RESETS_URL,
json={"owner_kind": "user", "owner_id": owner, "app_reference": "appa"},
)
refresh_snapshot()
assert get_table(GATEWAY_LEDGER).count(owner_id=owner) == before
def test_an_unscoped_reset_clears_every_caller(seeded_db):
owner = _owner()
_burn(owner, "appa", 2.0)
assert admin_session(seeded_db).post(RESETS_URL, json={}).status_code == 200
assert _spent(owner, "appa") == 0.0
def test_an_unknown_owner_kind_is_rejected(seeded_db):
response = admin_session(seeded_db).post(RESETS_URL, json={"owner_kind": "wizard"})
assert response.status_code == 400
assert response.json()["ok"] is False
def test_a_malformed_app_reference_is_rejected(seeded_db):
response = admin_session(seeded_db).post(
RESETS_URL, json={"app_reference": "not a valid app!"}
)
assert response.status_code == 400
def test_the_reset_is_audited(seeded_db):
owner = _owner()
_burn(owner, "appa", 1.0)
admin = admin_session(seeded_db)
admin.post(
RESETS_URL,
json={"owner_kind": "user", "owner_id": owner, "app_reference": "appa"},
)
refresh_snapshot()
entries = admin.get(
f"{BASE_URL}/admin/audit-log",
headers=JSON_gateway,
params={"event_key": "gateway.quota.reset"},
).json()["entries"]
assert any(entry.get("target_type") == "gateway_quota" for entry in entries)
def test_spend_recorded_after_a_reset_counts_again(seeded_db):
owner = _owner()
_burn(owner, "appa", 2.0)
admin_session(seeded_db).post(
RESETS_URL,
json={"owner_kind": "user", "owner_id": owner, "app_reference": "appa"},
)
_burn(owner, "appa", 0.5)
assert _spent(owner, "appa") == 0.5