Merge pull request #694 from rajbos/rajbos/admin-token-usage-dashboard

feat(sharing-server): admin token usage dashboard

Author: rajbos

.github/workflows/sharing-server-deploy.yml

@@ -175,7 +175,11 @@ jobs:
             -backend-config="key=${{ needs.setup.outputs.state_key }}"
 
       - name: Reconcile custom domain Terraform state
-        if: steps.prereqs.outputs.configured == 'true' && vars.SHARING_CUSTOM_DOMAIN != ''
+        # Custom domains (and their managed certs) are only meaningful on stable, long-lived
+        # environments (production). Per-branch testing environments each get a unique ACA FQDN
+        # which already has Azure TLS — setting SHARING_CUSTOM_DOMAIN on the testing GitHub
+        # environment will be ignored here to prevent 60-minute cert provisioning on every PR.
+        if: steps.prereqs.outputs.configured == 'true' && vars.SHARING_CUSTOM_DOMAIN != '' && needs.setup.outputs.is_prod == 'true'
         working-directory: sharing-server/infra
         env:
           TF_VAR_resource_group_name:    ${{ vars.AZURE_RESOURCE_GROUP }}

sharing-server/infra/main.tf

@@ -191,6 +191,10 @@ resource "azurerm_container_app" "this" {
 
 # ── Custom domain + managed TLS certificate ───────────────────────────────────
 # Only created when var.custom_domain is set.
+# Intended for stable, long-lived environments (production) only.
+# Per-branch testing environments should leave var.custom_domain empty — they use
+# the ACA-generated FQDN (*.azurecontainerapps.io) which already has Azure TLS.
+# Provisioning a managed cert requires CNAME validation and can take up to 60 min.
 # DNS prerequisites (must exist before applying):
 #   CNAME  <subdomain>        → local.aca_fqdn
 #   TXT    asuid.<subdomain>  → azurerm_container_app_environment.this.custom_domain_verification_id

sharing-server/src/db.ts

@@ -14,6 +14,27 @@ export interface UserRow {
 	fluency_score_json: string | null;
 }
 
+export interface UserUsageSummary {
+	user_id: number;
+	github_login: string;
+	github_name: string | null;
+	avatar_url: string | null;
+	is_admin: number;
+	total_input: number;
+	total_output: number;
+	total_interactions: number;
+	days_active: number;
+	last_upload_day: string | null;
+}
+
+export interface AdminDailyRow {
+	day: string;
+	github_login: string;
+	input_tokens: number;
+	output_tokens: number;
+	interactions: number;
+}
+
 export interface UploadRow {
 	id: number;
 	user_id: number;
@@ -208,6 +229,7 @@ function initSchema(db: DatabaseSync): void {
 	db.exec(`
 		CREATE INDEX IF NOT EXISTS idx_uploads_user_day ON usage_uploads(user_id, day);
 		CREATE INDEX IF NOT EXISTS idx_uploads_dataset   ON usage_uploads(dataset_id, day);
+		CREATE INDEX IF NOT EXISTS idx_uploads_day       ON usage_uploads(day);
 	`);
 
 	// Add fluency_json column if it doesn't exist (migration for existing DBs)
@@ -358,3 +380,48 @@ export function closeDb(): void {
 		_db = undefined;
 	}
 }
+
+/**
+ * Per-user aggregate stats for the admin dashboard.
+ * LEFT JOIN ensures users with no uploads in the period still appear (with zeros).
+ * `last_upload_day` reflects their all-time last upload, not filtered to the period.
+ */
+export function getAdminUserSummaries(days: number): UserUsageSummary[] {
+	const cutoff = new Date();
+	cutoff.setUTCDate(cutoff.getUTCDate() - days);
+	const cutoffStr = cutoff.toISOString().slice(0, 10);
+	return getDb().prepare(`
+		SELECT
+			u.id                                                                       AS user_id,
+			u.github_login,
+			u.github_name,
+			u.avatar_url,
+			u.is_admin,
+			COALESCE(SUM(CASE WHEN uu.day >= ? THEN uu.input_tokens  ELSE 0 END), 0)  AS total_input,
+			COALESCE(SUM(CASE WHEN uu.day >= ? THEN uu.output_tokens ELSE 0 END), 0)  AS total_output,
+			COALESCE(SUM(CASE WHEN uu.day >= ? THEN uu.interactions  ELSE 0 END), 0)  AS total_interactions,
+			COUNT(DISTINCT CASE WHEN uu.day >= ? THEN uu.day END)                     AS days_active,
+			MAX(uu.day)                                                                AS last_upload_day
+		FROM users u
+		LEFT JOIN usage_uploads uu ON uu.user_id = u.id
+		GROUP BY u.id
+		ORDER BY total_input + total_output DESC
+	`).all(cutoffStr, cutoffStr, cutoffStr, cutoffStr) as unknown as UserUsageSummary[];
+}
+
+/** Daily per-user token totals for the admin trend chart. */
+export function getAdminDailyTotals(days: number): AdminDailyRow[] {
+	return getDb().prepare(`
+		SELECT
+			uu.day,
+			u.github_login,
+			SUM(uu.input_tokens)  AS input_tokens,
+			SUM(uu.output_tokens) AS output_tokens,
+			SUM(uu.interactions)  AS interactions
+		FROM usage_uploads uu
+		JOIN users u ON u.id = uu.user_id
+		WHERE uu.day >= date('now', '-' || ? || ' days')
+		GROUP BY uu.day, u.github_login
+		ORDER BY uu.day, u.github_login
+	`).all(days) as unknown as AdminDailyRow[];
+}