forked from retoor/devplacepy
retoor
571a0485c5
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.
146 lines
5.6 KiB
Python
146 lines
5.6 KiB
Python
# retoor <retoor@molodetz.nl>
|
|
|
|
import sys
|
|
|
|
from devplacepy.cli._shared import _audit_cli
|
|
|
|
|
|
def cmd_gateway_quota_list(args):
|
|
from devplacepy.services.openai_gateway import quota
|
|
|
|
rules = quota.quota_rule_store.list()
|
|
if not rules:
|
|
print("No quota rules. Every caller is capped by the global defaults on /admin/services/openai.")
|
|
return
|
|
for rule in rules:
|
|
spent = quota.spent_24h(rule["owner_kind"], rule["owner_id"], rule["app_reference"])
|
|
scope = ", ".join(
|
|
f"{key}={rule[key]}" for key in ("owner_kind", "owner_id", "app_reference") if rule[key]
|
|
) or "(no dimensions - invalid)"
|
|
limit = "unlimited" if rule["limit_usd"] == 0 else f"${rule['limit_usd']:.2f}/24h"
|
|
active = "active" if rule["is_active"] else "inactive"
|
|
label = f" - {rule['label']}" if rule["label"] else ""
|
|
print(f"{rule['uid']} [{scope}] {limit} spent=${spent:.4f} {active}{label}")
|
|
|
|
|
|
def cmd_gateway_quota_set(args):
|
|
from pydantic import ValidationError
|
|
from devplacepy.services.openai_gateway import quota
|
|
|
|
try:
|
|
payload = quota.QuotaRuleIn(
|
|
owner_kind=args.owner_kind,
|
|
owner_id=args.owner_id,
|
|
app_reference=args.app_reference,
|
|
limit_usd=args.limit_usd,
|
|
is_active=not args.inactive,
|
|
label=args.label or "",
|
|
)
|
|
except ValidationError as exc:
|
|
print(f"Invalid rule: {exc.errors()[0].get('msg', exc)}")
|
|
sys.exit(1)
|
|
saved = quota.quota_rule_store.set(payload, uid=args.uid, created_by="cli")
|
|
_audit_cli(
|
|
"gateway.quota_rule.update",
|
|
f"CLI saved gateway quota rule {saved['uid']}",
|
|
metadata={
|
|
"owner_kind": saved["owner_kind"],
|
|
"owner_id": saved["owner_id"],
|
|
"app_reference": saved["app_reference"],
|
|
"limit_usd": saved["limit_usd"],
|
|
},
|
|
target_type="gateway_quota_rule",
|
|
target_uid=saved["uid"],
|
|
)
|
|
print(f"Saved quota rule {saved['uid']}")
|
|
|
|
|
|
def cmd_gateway_quota_delete(args):
|
|
from devplacepy.services.openai_gateway import quota
|
|
|
|
if not quota.quota_rule_store.remove(args.uid):
|
|
print(f"Quota rule '{args.uid}' not found")
|
|
sys.exit(1)
|
|
_audit_cli(
|
|
"gateway.quota_rule.delete",
|
|
f"CLI deleted gateway quota rule {args.uid}",
|
|
target_type="gateway_quota_rule",
|
|
target_uid=args.uid,
|
|
)
|
|
print(f"Deleted quota rule {args.uid}")
|
|
|
|
|
|
def cmd_gateway_quota_reset(args):
|
|
from devplacepy.services.openai_gateway import quota
|
|
|
|
try:
|
|
payload = quota.QuotaResetIn(
|
|
owner_kind=args.owner_kind,
|
|
owner_id=args.owner_id,
|
|
app_reference=args.app_reference,
|
|
)
|
|
except Exception as exc:
|
|
print(f"Error: {exc}")
|
|
sys.exit(1)
|
|
scope = quota.reset(payload, created_by="cli")
|
|
label = quota.scope_label(scope, fallback="every caller")
|
|
_audit_cli(
|
|
"gateway.quota.reset",
|
|
f"CLI reset the gateway 24h spend for {label}",
|
|
target_type="gateway_quota",
|
|
target_uid=scope["uid"],
|
|
metadata={
|
|
"owner_kind": scope["owner_kind"],
|
|
"owner_id": scope["owner_id"],
|
|
"app_reference": scope["app_reference"],
|
|
"reset_at": scope["reset_at"],
|
|
},
|
|
)
|
|
print(f"Reset the rolling 24h spend for {label}")
|
|
|
|
|
|
def register_gateway(subparsers):
|
|
gateway = subparsers.add_parser("gateway", help="AI gateway management")
|
|
gateway_sub = gateway.add_subparsers(title="action", dest="action")
|
|
|
|
quota = gateway_sub.add_parser("quota", help="Manage rolling-24h AI gateway quota rules")
|
|
quota_sub = quota.add_subparsers(title="sub-action", dest="sub_action")
|
|
|
|
quota_list = quota_sub.add_parser("list", help="List all quota rules and their current 24h spend")
|
|
quota_list.set_defaults(func=cmd_gateway_quota_list)
|
|
|
|
quota_set = quota_sub.add_parser(
|
|
"set", help="Create or update a quota rule (scope by role/user/app, any combination)"
|
|
)
|
|
quota_set.add_argument("--uid", help="Existing rule uid to update; omit to create a new rule")
|
|
quota_set.add_argument(
|
|
"--owner-kind",
|
|
choices=("internal", "key", "user", "admin", "anonymous"),
|
|
help="Role to scope by. Omit for any role",
|
|
)
|
|
quota_set.add_argument("--owner-id", help="Specific user uid to scope by. Omit for any caller")
|
|
quota_set.add_argument("--app-reference", help="App label to scope by. Omit for any app")
|
|
quota_set.add_argument(
|
|
"--limit-usd", type=float, required=True, help="Rolling 24h USD cap (0 = unlimited)"
|
|
)
|
|
quota_set.add_argument("--label", help="Optional admin-facing note")
|
|
quota_set.add_argument("--inactive", action="store_true", help="Create the rule disabled")
|
|
quota_set.set_defaults(func=cmd_gateway_quota_set)
|
|
|
|
quota_delete = quota_sub.add_parser("delete", help="Delete a quota rule by uid")
|
|
quota_delete.add_argument("uid", help="Quota rule uid")
|
|
quota_delete.set_defaults(func=cmd_gateway_quota_delete)
|
|
|
|
quota_reset = quota_sub.add_parser(
|
|
"reset",
|
|
help="Clear the rolling-24h spend so a capped caller can call again (keeps the usage history)",
|
|
)
|
|
quota_reset.add_argument(
|
|
"--owner-kind",
|
|
choices=("internal", "key", "user", "admin", "anonymous"),
|
|
help="Role to scope by. Omit to reset every role",
|
|
)
|
|
quota_reset.add_argument("--owner-id", help="Specific user uid to scope by. Omit for every caller")
|
|
quota_reset.add_argument("--app-reference", help="App label to scope by. Omit for every app")
|
|
quota_reset.set_defaults(func=cmd_gateway_quota_reset)
|