feat: billing verifications

apps/agent/pkg/clickhouse/schema/009_create_verifications_key_verifications_per_month_mv_v1.sql

@@ -1,6 +1,6 @@
 -- +goose up
 CREATE MATERIALIZED VIEW verifications.key_verifications_per_month_mv_v1
-TO verificatins.key_verifications_per_month_v1
+TO verifications.key_verifications_per_month_v1
 AS
 SELECT
   workspace_id,

apps/agent/pkg/clickhouse/schema/013_create_billing_billable_verifications_per_month_mv_v1.sql

@@ -0,0 +1,16 @@
+-- +goose up
+CREATE MATERIALIZED VIEW billing.billable_verifications_per_month_mv_v1
+TO billing.billable_verifications_per_month_v1
+AS
+SELECT
+  workspace_id,
+  count(*) AS count,
+  toYear(time) AS year,
+  toMonth(time) AS month
+FROM verifications.key_verifications_per_month_v1
+WHERE outcome = 'VALID'
+GROUP BY
+  workspace_id,
+  year,
+  month
+;

apps/dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/page.tsx

@@ -12,10 +12,10 @@ import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { Separator } from "@/components/ui/separator";
 import { getTenantId } from "@/lib/auth";
 import { getLastUsed } from "@/lib/clickhouse";
+import { getVerificationsPerDay, getVerificationsPerHour } from "@/lib/clickhouse";
 import { getLatestVerifications } from "@/lib/clickhouse/latest_verifications";
 import { and, db, eq, isNull, schema } from "@/lib/db";
 import { formatNumber } from "@/lib/fmt";
-import { getVerificationsPerDay, getVerificationsPerHour } from "@/lib/clickhouse";
 import { cn } from "@/lib/utils";
 import { BarChart, Minus } from "lucide-react";
 import ms from "ms";

apps/dashboard/app/(app)/apis/[apiId]/page.tsx

@@ -4,9 +4,9 @@ import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { Separator } from "@/components/ui/separator";
 import { getTenantId } from "@/lib/auth";
 import { getActiveKeysPerDay, getActiveKeysPerHour, getActiveKeysPerMonth } from "@/lib/clickhouse";
+import { getVerificationsPerDay, getVerificationsPerHour } from "@/lib/clickhouse";
 import { and, db, eq, isNull, schema, sql } from "@/lib/db";
 import { formatNumber } from "@/lib/fmt";
-import { getVerificationsPerDay, getVerificationsPerHour } from "@/lib/clickhouse";
 import { BarChart } from "lucide-react";
 import { redirect } from "next/navigation";
 import { type Interval, IntervalSelect } from "./select";

apps/dashboard/app/(app)/banner.tsx

@@ -1,6 +1,6 @@
 import { Banner } from "@/components/banner";
+import { getBillableVerifications } from "@/lib/clickhouse";
 import type { Workspace } from "@/lib/db";
-import { verifications } from "@/lib/tinybird";
 import { QUOTA } from "@unkey/billing";
 import ms from "ms";
 import Link from "next/link";
@@ -23,20 +23,18 @@ export const UsageBanner: React.FC<{ workspace: Workspace | undefined }> = async
   const fmt = new Intl.NumberFormat("en-US").format;
 
   if (workspace.plan === "free") {
-    const [usedVerifications] = await Promise.all([
-      verifications({
-        workspaceId: workspace.id,
-        year,
-        month,
-      }).then((res) => res.data.at(0)?.success ?? 0),
-    ]);
+    const billableVerifications = await getBillableVerifications({
+      workspaceId: workspace.id,
+      year,
+      month,
+    });
 
-    if (usedVerifications >= QUOTA.free.maxVerifications) {
+    if (billableVerifications >= QUOTA.free.maxVerifications) {
       return (
         <Banner variant="alert">
           <p className="text-xs text-center">
             You have exceeded your plan&apos;s monthly usage limit for verifications:{" "}
-            <strong>{fmt(usedVerifications)}</strong> /{" "}
+            <strong>{fmt(billableVerifications)}</strong> /{" "}
             <strong>{fmt(QUOTA.free.maxVerifications)}</strong>.{" "}
             <Link href="/settings/billing" className="underline">
               Upgrade your plan
@@ -58,8 +56,8 @@ export const UsageBanner: React.FC<{ workspace: Workspace | undefined }> = async
           {workspace.trialEnds.getTime() <= Date.now()
             ? "Your trial has expired."
             : `Your trial expires in ${ms(workspace.trialEnds.getTime() - Date.now(), {
-              long: true,
-            })}.`}{" "}
+                long: true,
+              })}.`}{" "}
           <Link href="/settings/billing" className="underline">
             Add a payment method
           </Link>

apps/dashboard/app/(app)/settings/billing/page.tsx

@@ -9,9 +9,10 @@ import {
 } from "@/components/ui/card";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { getTenantId } from "@/lib/auth";
+import { getBillableVerifications } from "@/lib/clickhouse";
 import { type Workspace, db } from "@/lib/db";
 import { stripeEnv } from "@/lib/env";
-import { ratelimits, verifications } from "@/lib/tinybird";
+import { ratelimits } from "@/lib/tinybird";
 import { cn } from "@/lib/utils";
 import { type BillingTier, QUOTA, calculateTieredPrices } from "@unkey/billing";
 import { Check, ExternalLink } from "lucide-react";
@@ -55,11 +56,11 @@ const FreeUsage: React.FC<{ workspace: Workspace }> = async ({ workspace }) => {
   const year = t.getUTCFullYear();
   const month = t.getUTCMonth() + 1;
 
-  const usedVerifications = await verifications({
+  const usedVerifications = await getBillableVerifications({
     workspaceId: workspace.id,
     year,
     month,
-  }).then((res) => res.data.at(0)?.success ?? 0);
+  });
 
   return (
     <Card>
@@ -184,11 +185,11 @@ const PaidUsage: React.FC<{ workspace: Workspace }> = async ({ workspace }) => {
   const month = startOfMonth.getUTCMonth() + 1;
 
   const [usedVerifications, usedRatelimits] = await Promise.all([
-    verifications({
+    getBillableVerifications({
       workspaceId: workspace.id,
       year,
       month,
-    }).then((res) => res.data.at(0)?.success ?? 0),
+    }),
     ratelimits({
       workspaceId: workspace.id,
       year,

apps/dashboard/lib/charts/sparkline.tsx

@@ -61,7 +61,7 @@ function SparkLineInner<T extends Datum>({
       startDate: dates[times.indexOf(Math.min(...times))],
       endDate: dates[times.indexOf(Math.max(...times))],
     };
-  }, data);
+  }, [data]);
 
   const { minY, maxY } = useMemo(() => {
     const values = series
@@ -73,7 +73,7 @@ function SparkLineInner<T extends Datum>({
       minY: Math.min(...values),
       maxY: Math.max(...values),
     };
-  }, [data, series, padding?.bottom, padding?.top]);
+  }, [data, series]);
 
   const { yScale, xScale } = useMemo(() => {
     const rangeY = maxY - minY;
@@ -89,7 +89,7 @@ function SparkLineInner<T extends Datum>({
         range: [0, width],
       }),
     };
-  }, [startDate, endDate, minY, maxY, height, width, margin]);
+  }, [startDate, endDate, minY, maxY, height, width]);
 
   const chartContext: ChartContextType<T> = {
     width,

apps/dashboard/lib/clickhouse/billing.ts

@@ -0,0 +1,36 @@
+import { z } from "zod";
+import { clickhouse } from "./client";
+
+// get the billable verifications for a workspace in a specific month.
+// month is not zero-indexed -> January = 1
+export async function getBillableVerifications(args: {
+  workspaceId: string;
+  year: number;
+  month: number;
+}): Promise<number> {
+  const query = clickhouse.query({
+    query: `
+    SELECT
+      sum(count) as count
+    FROM billing.billable_verifications_per_month_v1
+    WHERE workspace_id = {workspaceId: String}
+    AND year = {year: Int64}
+    AND month = {month: Int64}
+    GROUP BY workspace_id, year, month
+    `,
+    params: z.object({
+      workspaceId: z.string(),
+      year: z.number().int(),
+      month: z.number().int().min(1).max(12),
+    }),
+    schema: z.object({
+      count: z.number().int(),
+    }),
+  });
+
+  const res = await query(args);
+  if (!res) {
+    return 0;
+  }
+  return res.at(0)?.count ?? 0;
+}

apps/dashboard/lib/clickhouse/client.ts

@@ -1,5 +1,5 @@
-import { type Clickhouse, Client, Noop } from "@unkey/clickhouse-zod";
 import { env } from "@/lib/env";
+import { type Clickhouse, Client, Noop } from "@unkey/clickhouse-zod";
 
 const { CLICKHOUSE_URL } = env();
 

apps/dashboard/lib/clickhouse/index.ts

@@ -3,3 +3,4 @@ export * from "./latest_verifications";
 export * from "./active_keys";
 export * from "./last_used";
 export * from "./verifications";
+export * from "./billing";

apps/dashboard/lib/tinybird.ts

@@ -174,23 +174,23 @@ export type UnkeyAuditLog = {
   };
   resources: Array<{
     type:
-    | "key"
-    | "api"
-    | "workspace"
-    | "role"
-    | "permission"
-    | "keyAuth"
-    | "vercelBinding"
-    | "vercelIntegration"
-    | "ratelimitNamespace"
-    | "ratelimitOverride"
-    | "gateway"
-    | "llmGateway"
-    | "webhook"
-    | "reporter"
-    | "secret"
-    | "identity"
-    | "auditLogBucket";
+      | "key"
+      | "api"
+      | "workspace"
+      | "role"
+      | "permission"
+      | "keyAuth"
+      | "vercelBinding"
+      | "vercelIntegration"
+      | "ratelimitNamespace"
+      | "ratelimitOverride"
+      | "gateway"
+      | "llmGateway"
+      | "webhook"
+      | "reporter"
+      | "secret"
+      | "identity"
+      | "auditLogBucket";
 
     id: string;
     meta?: Record<string, string | number | boolean | null>;

internal/clickhouse-zod/src/client.ts

@@ -36,7 +36,7 @@ export class Client implements Clickhouse {
     return async (params: z.input<TIn>): Promise<z.output<TOut>[]> => {
       const res = await this.client.query({
         query: req.query,
-        query_params: req.params?.safeParse(params),
+        query_params: req.params?.parse(params),
         format: "JSONEachRow",
       });
       const rows = await res.json();

tools/migrate/auditlog-import.ts

@@ -1,14 +1,4 @@
-import {
-  type AuditLog,
-  type AuditLogTarget,
-  and,
-  asc,
-  eq,
-  gt,
-  isNotNull,
-  mysqlDrizzle,
-  schema,
-} from "@unkey/db";
+import type { AuditLog, AuditLogTarget } from "@unkey/db";
 import { mysqlDrizzle, schema } from "@unkey/db";
 import { newId } from "@unkey/id";
 import ms from "ms";