Working version 6.2

src/app/api/usage/route.ts

@@ -1,107 +1,84 @@
 import { NextRequest, NextResponse } from "next/server";
-import { auth } from "@/lib/auth";
-import { getTeamInfo, getTeamSpendLogs } from "@/lib/litellm";
-
-// Pricing constants (CHF)
-const INPUT_RATE = 3; // CHF per MTok
-const OUTPUT_RATE = 15; // CHF per MTok
+import { getSessionUser } from "@/lib/session";
+import { getTeamInfo, getTeamSpendLogsV2 } from "@/lib/litellm";
 
 export async function GET(req: NextRequest) {
-  const session = await auth();
-  if (!session?.user) {
+  const user = await getSessionUser();
+  if (!user)
     return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-  }
 
-  const { orgId } = session.user as any;
-  if (!orgId) {
-    return NextResponse.json(
-      { error: "No org context" },
-      { status: 400 }
-    );
-  }
+  const teamId = req.nextUrl.searchParams.get("teamId");
+  if (!teamId)
+    return NextResponse.json({ error: "teamId required" }, { status: 400 });
 
-  // The LiteLLM team_id maps to the tenant name, which is derived from orgId
-  // Convention: team_id = "pieced-{orgId}" or looked up from the tenant CR
-  const searchParams = req.nextUrl.searchParams;
-  const teamId = searchParams.get("teamId");
+  // Month param: YYYY-MM, defaults to current month
+  const now = new Date();
+  const monthParam = req.nextUrl.searchParams.get("month")
+    || `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}`;
 
-  if (!teamId) {
-    return NextResponse.json(
-      { error: "teamId query param required" },
-      { status: 400 }
-    );
-  }
+  const [year, month] = monthParam.split("-").map(Number);
+  const startDate = new Date(year, month - 1, 1);
+  const endDate = new Date(year, month, 0); // last day of month
+
+  const startStr = startDate.toISOString().split("T")[0];
+  const endStr = endDate.toISOString().split("T")[0];
 
   try {
-    // Current period info
     const teamInfo = await getTeamInfo(teamId);
 
-    // Historical spend logs (last 30 days)
-    const endDate = new Date();
-    const startDate = new Date();
-    startDate.setDate(startDate.getDate() - 30);
+    // Fetch all pages
+    const allRequests: any[] = [];
+    let page = 1;
+    while (true) {
+      const result = await getTeamSpendLogsV2(teamId, startStr, endStr, page, 100);
+      allRequests.push(...(result.data || []));
+      if (page >= (result.total_pages || 1)) break;
+      page++;
+    }
 
-    const spendLogs = await getTeamSpendLogs(
-      teamId,
-      startDate.toISOString().split("T")[0],
-      endDate.toISOString().split("T")[0]
-    );
+    // Aggregate by day
+    const byDay: Record<string, { inputTokens: number; outputTokens: number; spend: number }> = {};
+    for (const r of allRequests) {
+      const day = (r.startTime || r.endTime || "").slice(0, 10);
+      if (!day) continue;
+      if (!byDay[day]) byDay[day] = { inputTokens: 0, outputTokens: 0, spend: 0 };
+      byDay[day].inputTokens += r.prompt_tokens || 0;
+      byDay[day].outputTokens += r.completion_tokens || 0;
+      byDay[day].spend += r.spend || 0;
+    }
 
-    // Calculate CHF costs from token counts
-    const dailyUsage = (spendLogs || []).map((day: any) => ({
-      date: day.date || day.day,
-      inputTokens: day.prompt_tokens || 0,
-      outputTokens: day.completion_tokens || 0,
-      inputCostCHF:
-        ((day.prompt_tokens || 0) / 1_000_000) * INPUT_RATE,
-      outputCostCHF:
-        ((day.completion_tokens || 0) / 1_000_000) * OUTPUT_RATE,
-      totalCostCHF:
-        ((day.prompt_tokens || 0) / 1_000_000) * INPUT_RATE +
-        ((day.completion_tokens || 0) / 1_000_000) * OUTPUT_RATE,
-    }));
+    const dailyUsage = Object.entries(byDay)
+      .sort(([a], [b]) => a.localeCompare(b))
+      .map(([date, d]) => ({ date, ...d }));
 
-    // Totals for current period
-    const totalInputTokens = dailyUsage.reduce(
-      (s: number, d: any) => s + d.inputTokens,
-      0
-    );
-    const totalOutputTokens = dailyUsage.reduce(
-      (s: number, d: any) => s + d.outputTokens,
-      0
-    );
-    const totalCostCHF = dailyUsage.reduce(
-      (s: number, d: any) => s + d.totalCostCHF,
-      0
-    );
+    const totalInput = allRequests.reduce((s, r) => s + (r.prompt_tokens || 0), 0);
+    const totalOutput = allRequests.reduce((s, r) => s + (r.completion_tokens || 0), 0);
+    const totalSpend = allRequests.reduce((s, r) => s + (r.spend || 0), 0);
 
     return NextResponse.json({
       teamId,
+      month: monthParam,
       currentPeriod: {
-        inputTokens: totalInputTokens,
-        outputTokens: totalOutputTokens,
-        inputCostCHF: (totalInputTokens / 1_000_000) * INPUT_RATE,
-        outputCostCHF: (totalOutputTokens / 1_000_000) * OUTPUT_RATE,
-        totalCostCHF,
+        inputTokens: totalInput,
+        outputTokens: totalOutput,
+        totalSpend,
+        requestCount: allRequests.length,
       },
       budget: {
-        maxBudget: teamInfo?.max_budget ?? null,
-        spend: teamInfo?.spend ?? 0,
-        remaining: teamInfo?.max_budget
-          ? teamInfo.max_budget - (teamInfo.spend ?? 0)
+        maxBudget: teamInfo?.team_info?.max_budget ?? null,
+        spend: teamInfo?.team_info?.spend ?? 0,
+        remaining: teamInfo?.team_info?.max_budget
+          ? teamInfo.team_info.max_budget - (teamInfo.team_info.spend ?? 0)
           : null,
       },
       rateLimits: {
-        rpm: teamInfo?.rpm_limit ?? null,
-        tpm: teamInfo?.tpm_limit ?? null,
+        rpm: teamInfo?.team_info?.rpm_limit ?? null,
+        tpm: teamInfo?.team_info?.tpm_limit ?? null,
       },
       dailyUsage,
     });
-  } catch (err: any) {
-    console.error("Usage fetch error:", err.message);
-    return NextResponse.json(
-      { error: "Failed to fetch usage data" },
-      { status: 500 }
-    );
+  } catch (e: any) {
+    console.error("Usage fetch error:", e.message);
+    return NextResponse.json({ error: "Failed to fetch usage" }, { status: 500 });
   }
-}
+}