allowances: payment-driven renewal anchored to the member's join day
Replaces the payment-date re-anchoring that let Open Collective's common billing day move a member's renewal and skip a cycle ([redacted member reference]: [redacted timeline]. - Reconcile against OC orders directly on the sweep's schedule: a live recurring contribution (ACTIVE/PROCESSING) renews; otherwise one reminder email, then deactivation only after PAYMENT_GRACE_DAYS. - Anchor each member's reset to their join day (members.anchor_day), not the payment date; the webhook now only confirms the cycle. - Decision log (allowance_log) records renewed/reminded/deactivated with the payment evidence. - Report-only by default (ALLOWANCE_POLICY=report); deactivation gated separately by ALLOWANCE_DEACTIVATE=off. - POST /admin/allowance?mode=report|send.
This commit is contained in:
1 parent
5da1981823
commit
ccce643b39
2 files changed
+470
-2
No files matched your search
@@ -47,6 +47,9 @@ LibreChat ──→ Member Portal ──→ LiteLLM ──→ backend
|
||||
| `LITELLM_MASTER_KEY` | LiteLLM master key |
|
||||
| `OPENCOLLECTIVE_WEBHOOK_SECRET` | Optional webhook signature secret |
|
||||
| `PORTAL_KEK` | **Required.** Base64-encoded 32-byte key-encryption key. Member chat keys (`members.key_token`) are stored AES-256-GCM-encrypted at rest (`enc1:` prefix) and decrypted in memory only when served (dashboard, LibreChat key feed, LiteLLM management). Generate with `python3 -c "import base64,os;print(base64.b64encode(os.urandom(32)).decode())"`. If unset, the portal runs but refuses to encrypt new keys, keeps legacy plaintext, and logs CRITICAL. Rotating it requires re-encrypting every row (decrypt with the old key, encrypt with the new). |
|
||||
| `ALLOWANCE_POLICY` | `report` (default) \| `on`. `report` computes every allowance decision and changes nothing; `on` performs renewals and sends the one reminder. Deactivation is gated separately by `ALLOWANCE_DEACTIVATE`. |
|
||||
| `ALLOWANCE_DEACTIVATE` | `off` (default) \| `on`. When `on`, a member who was reminded and is still unpaid after the grace window is moved to the inactive group. **Defaults off so renewals/reminders can run before anyone loses access.** |
|
||||
| `PAYMENT_GRACE_DAYS` | Days after the single reminder before an unpaid member is deactivated (default `7`). |
|
||||
|
||||
## Tier budgets
|
||||
|
||||
@@ -99,7 +102,8 @@ Three jobs run inside the container via `CloudronManifest.json` → `addons.sche
|
||||
`/admin/sweep` (auth: `X-Admin-Token` = `WEBHOOK_TOKEN`) to reconcile members
|
||||
against the live Open Collective list: provisions missed signups, deactivates
|
||||
lapsed members, syncs Loomio + Matrix. Idempotent; a missed webhook
|
||||
self-heals within 24 hours.
|
||||
self-heals within 24 hours. The same sweep also runs the payment-driven
|
||||
allowance reconciliation (below).
|
||||
- **rag_refresh** (nightly 3:30am) — `rag_refresh.py` pulls this repo's
|
||||
sibling docs from the Gitea raw API (public, no credentials), uploads changed
|
||||
files to Open WebUI (`OWUI_API_KEY`), attaches them to the shared knowledge
|
||||
@@ -119,6 +123,32 @@ Verify after any manifest change: the deploy log must show
|
||||
`setupAddons: ... scheduler ...` listing all three tasks, and each script must
|
||||
succeed when run manually inside the container.
|
||||
|
||||
### Allowance renewal (payment-driven, join-day anchored)
|
||||
|
||||
Each member has a monthly allowance (`MEMBER_BUDGET`, currently $15). The
|
||||
allowance renews on the day of the month the member *joined*, never on the day
|
||||
Open Collective happened to charge them — OC aligns every member's charge onto
|
||||
the collective's common billing day, so anchoring to the payment date let an
|
||||
early charge move the boundary and skip a cycle entirely. The join day is stored
|
||||
per member (`members.anchor_day`) and the reset is pinned there.
|
||||
|
||||
Whether the allowance renews is decided by asking Open Collective directly, on
|
||||
the sweep's own schedule (not inferred from webhook delivery): a member with a
|
||||
live recurring contribution (order status `ACTIVE` or `PROCESSING` — a payment
|
||||
in flight is not a missed payment) renews; a member with no live recurring
|
||||
contribution gets **one** reminder email, and is deactivated only after
|
||||
`PAYMENT_GRACE_DAYS`. One-time payments are not an allowance cycle — they top up
|
||||
the non-expiring credit balance and are untouched here. There are no annual
|
||||
contributors (verified 2026-11-04: 104 orders, 87 MONTHLY, 17 ONETIME, zero
|
||||
annual), so only the monthly case is implemented.
|
||||
|
||||
Every decision (renewed / reminded / deactivated, plus the payment date or its
|
||||
absence) is written to `allowance_log` and answerable from that record. Run
|
||||
`POST /admin/allowance?mode=report` (X-Admin-Token) for a no-op report that
|
||||
changes nothing; `mode=send` performs renewals and sends the reminder and
|
||||
requires `ALLOWANCE_POLICY=on`. Deactivation additionally requires
|
||||
`ALLOWANCE_DEACTIVATE=on`.
|
||||
|
||||
### Energy & carbon metrics
|
||||
|
||||
The daily snapshot also computes energy (Wh) and carbon (gCO₂e) from output tokens,
|
||||
|
||||
Reference in new issue
Block a user