improve report

Author: SamSaffron

assets/javascripts/discourse/components/ai-usage.gjs

@@ -51,29 +51,84 @@ export default class AiUsage extends Component {
     this.onFilterChange();
   }
 
+  normalizeTimeSeriesData(data) {
+    if (!data?.length) {
+      return [];
+    }
+
+    const startDate = moment(this.startDate).startOf("day");
+    const endDate = moment(this.endDate).endOf("day");
+    const normalized = [];
+
+    // Create a map of existing data points
+    const dataMap = new Map(
+      data.map((d) => [moment(d.period).format("YYYY-MM-DD"), d])
+    );
+
+    // Fill in all days
+    for (
+      let m = moment(startDate);
+      m.isSameOrBefore(endDate);
+      m.add(1, "days")
+    ) {
+      const dateKey = m.format("YYYY-MM-DD");
+      const existingData = dataMap.get(dateKey);
+
+      normalized.push(
+        existingData || {
+          period: m.format(),
+          total_tokens: 0,
+          total_cached_tokens: 0,
+          total_request_tokens: 0,
+          total_response_tokens: 0,
+        }
+      );
+    }
+
+    return normalized;
+  }
+
+  // Then modify the chartConfig getter to use this normalized data:
   get chartConfig() {
     if (!this.data?.data) {
       return;
     }
 
+    const normalizedData = this.normalizeTimeSeriesData(this.data.data);
+
     return {
-      type: "line",
+      type: "bar",
       data: {
-        labels: this.data.data.map((row) => row.period),
+        labels: normalizedData.map((row) => {
+          const date = moment(row.period);
+          return date.format("DD-MMM");
+        }),
         datasets: [
           {
-            label: "Tokens",
-            data: this.data.data.map((row) => row.total_tokens),
-            fill: false,
-            borderColor: "rgb(75, 192, 192)",
-            tension: 0.1,
+            label: "Response Tokens",
+            data: normalizedData.map((row) => row.total_response_tokens),
+            backgroundColor: "rgba(75, 192, 192, 0.8)",
+          },
+          {
+            label: "Request Tokens",
+            data: normalizedData.map((row) => row.total_request_tokens),
+            backgroundColor: "rgba(153, 102, 255, 0.8)",
+          },
+          {
+            label: "Cached Tokens",
+            data: normalizedData.map((row) => row.total_cached_tokens),
+            backgroundColor: "rgba(255, 159, 64, 0.8)",
           },
         ],
       },
       options: {
         responsive: true,
         scales: {
+          x: {
+            stacked: true,
+          },
           y: {
+            stacked: true,
             beginAtZero: true,
           },
         },

lib/completions/report.rb

@@ -28,35 +28,44 @@ def guess_period(period)
 
       def tokens_by_period(period = nil)
         period = guess_period(period)
-        base_query.group("DATE_TRUNC('#{period}', created_at)").select(
-          "DATE_TRUNC('#{period}', created_at) as period",
-          "SUM(request_tokens + response_tokens) as total_tokens",
-          "SUM(COALESCE(cached_tokens,0)) as total_cached_tokens",
-          "SUM(request_tokens) as total_request_tokens",
-          "SUM(response_tokens) as total_response_tokens",
-        )
+        base_query
+          .group("DATE_TRUNC('#{period}', created_at)")
+          .order("DATE_TRUNC('#{period}', created_at)")
+          .select(
+            "DATE_TRUNC('#{period}', created_at) as period",
+            "SUM(request_tokens + response_tokens) as total_tokens",
+            "SUM(COALESCE(cached_tokens,0)) as total_cached_tokens",
+            "SUM(request_tokens) as total_request_tokens",
+            "SUM(response_tokens) as total_response_tokens",
+          )
       end
 
       def feature_breakdown
-        base_query.group(:feature_name).select(
-          "feature_name",
-          "COUNT(*) as usage_count",
-          "SUM(request_tokens + response_tokens) as total_tokens",
-          "SUM(COALESCE(cached_tokens,0)) as total_cached_tokens",
-          "SUM(request_tokens) as total_request_tokens",
-          "SUM(response_tokens) as total_response_tokens",
-        )
+        base_query
+          .group(:feature_name)
+          .order("usage_count DESC")
+          .select(
+            "feature_name",
+            "COUNT(*) as usage_count",
+            "SUM(request_tokens + response_tokens) as total_tokens",
+            "SUM(COALESCE(cached_tokens,0)) as total_cached_tokens",
+            "SUM(request_tokens) as total_request_tokens",
+            "SUM(response_tokens) as total_response_tokens",
+          )
       end
 
       def model_breakdown
-        base_query.group(:language_model).select(
-          "language_model as llm",
-          "COUNT(*) as usage_count",
-          "SUM(request_tokens + response_tokens) as total_tokens",
-          "SUM(COALESCE(cached_tokens,0)) as total_cached_tokens",
-          "SUM(request_tokens) as total_request_tokens",
-          "SUM(response_tokens) as total_response_tokens",
-        )
+        base_query
+          .group(:language_model)
+          .order("usage_count DESC")
+          .select(
+            "language_model as llm",
+            "COUNT(*) as usage_count",
+            "SUM(request_tokens + response_tokens) as total_tokens",
+            "SUM(COALESCE(cached_tokens,0)) as total_cached_tokens",
+            "SUM(request_tokens) as total_request_tokens",
+            "SUM(response_tokens) as total_response_tokens",
+          )
       end
 
       def tokens_per_hour