Skip to content

Same agent Smaller bill. The tools and infrastructure to get more work from your AI. Fewer tokens. Less compute. Lower cost.

feat: added multiple stats for the dashboard page (#67)

Aman Agarwal254b2183ee5c
diff --git a/src/client/.eslintrc.json b/src/client/.eslintrc.json
index bffb357a..09937b6b 100644
--- a/src/client/.eslintrc.json
+++ b/src/client/.eslintrc.json
@@ -1,3 +1,6 @@
{
- "extends": "next/core-web-vitals"
+ "extends": "next/core-web-vitals",
+ "rules": {
+ "react-hooks/exhaustive-deps": "off"
+ }
}
diff --git a/src/client/prisma/schema.prisma b/src/client/prisma/schema.prisma
index 7d7df389..5b8ed400 100644
--- a/src/client/prisma/schema.prisma
+++ b/src/client/prisma/schema.prisma
@@ -1,5 +1,6 @@
generator client {
provider = "prisma-client-js"
+ binaryTargets = ["native", "linux-arm64-openssl-3.0.x"]
}
datasource db {
diff --git a/src/client/src/app/(playground)/dashboard/models-categories.tsx b/src/client/src/app/(playground)/dashboard/data-charts.tsx
similarity index 78%
rename from src/client/src/app/(playground)/dashboard/models-categories.tsx
rename to src/client/src/app/(playground)/dashboard/data-charts.tsx
index 26009221..0d3c9447 100644
--- a/src/client/src/app/(playground)/dashboard/models-categories.tsx
+++ b/src/client/src/app/(playground)/dashboard/data-charts.tsx
@@ -1,4 +1,4 @@
-import { memo, useCallback, useEffect, useState } from "react";
+import { memo, useCallback, useEffect } from "react";
import { useFilter } from "../filter-context";
import Card from "@/components/common/card";
import { DonutChart } from "@tremor/react";
@@ -72,16 +72,9 @@ const PieChartCard = memo(
PieChartCard.displayName = "PieChartCard";
-export default function ModelsCategories() {
+export default function DataCharts() {
return (
<div className="flex w-full gap-6">
- <PieChartCard
- categoryKey="model_count"
- containerClass="rounded-lg w-full"
- heading="Top Models"
- indexKey="model"
- url="/api/metrics/model/top"
- />
<PieChartCard
categoryKey="count"
containerClass="rounded-lg w-full"
@@ -89,6 +82,27 @@ export default function ModelsCategories() {
indexKey="category"
url="/api/metrics/category"
/>
+ <PieChartCard
+ categoryKey="count"
+ containerClass="rounded-lg w-full"
+ heading="Generation by provider"
+ indexKey="provider"
+ url="/api/metrics/endpoint"
+ />
+ <PieChartCard
+ categoryKey="cost"
+ containerClass="rounded-lg w-full"
+ heading="Cost by Environment"
+ indexKey="environment"
+ url="/api/metrics/cost/environment"
+ />
+ <PieChartCard
+ categoryKey="cost"
+ containerClass="rounded-lg w-full"
+ heading="Cost by application"
+ indexKey="applicationname"
+ url="/api/metrics/cost/application"
+ />
</div>
);
}
diff --git a/src/client/src/app/(playground)/dashboard/number-stats.tsx b/src/client/src/app/(playground)/dashboard/number-stats.tsx
index 62877b9c..35029126 100644
--- a/src/client/src/app/(playground)/dashboard/number-stats.tsx
+++ b/src/client/src/app/(playground)/dashboard/number-stats.tsx
@@ -1,61 +1,4 @@
-import { useFilter } from "../filter-context";
-import { memo, useCallback, useEffect } from "react";
-import { round } from "lodash";
-import Card from "@/components/common/card";
-import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
-
-type StatCardProps = {
- containerClass?: string;
- dataKey: string;
- heading: string;
- textPrefix?: string;
- textSuffix?: string;
- url: string;
-};
-
-const StatCard = memo(
- ({
- containerClass = "",
- dataKey,
- heading,
- textPrefix = "",
- textSuffix = "",
- url,
- }: StatCardProps) => {
- const [filter] = useFilter();
- const { data, isFetched, isLoading, fireRequest } = useFetchWrapper();
-
- const fetchData = useCallback(async () => {
- fireRequest({
- body: JSON.stringify({
- timeLimit: filter.timeLimit,
- }),
- requestType: "POST",
- url,
- responseDataKey: "data[0]",
- });
- }, [filter, url]);
-
- useEffect(() => {
- if (filter.timeLimit.start && filter.timeLimit.end) fetchData();
- }, [filter, fetchData]);
-
- return (
- <Card
- containerClass={containerClass}
- heading={heading}
- isLoading={isLoading || !isFetched}
- text={`${textPrefix}${round(
- (data as Record<any, any>)?.[dataKey] || 0,
- 4
- )}${textSuffix}`}
- textClass="text-primary"
- />
- );
- }
-);
-
-StatCard.displayName = "StatCard";
+import StatCard from "@/components/(playground)/stat-card";
function NumberStats() {
return (
@@ -73,17 +16,26 @@ function NumberStats() {
textSuffix="s"
url="/api/metrics/request/duration/average"
/>
+ <StatCard
+ containerClass="rounded-r-lg w-full"
+ dataKey="total_tokens"
+ extraParams={{ type: "total" }}
+ heading="Avg tokens per request"
+ url="/api/metrics/token/request/average"
+ />
<StatCard
containerClass="border-r-0 w-full"
dataKey="total_usage_cost"
heading="Total costs"
+ roundTo={7}
textPrefix="$"
url="/api/metrics/cost/total"
/>
<StatCard
containerClass="rounded-r-lg w-full"
dataKey="average_usage_cost"
- heading="Average cost per request"
+ heading="Avg cost per request"
+ roundTo={7}
textPrefix="$"
url="/api/metrics/cost/request/average"
/>
diff --git a/src/client/src/app/(playground)/dashboard/page.tsx b/src/client/src/app/(playground)/dashboard/page.tsx
index 3f164652..6d421c72 100644
--- a/src/client/src/app/(playground)/dashboard/page.tsx
+++ b/src/client/src/app/(playground)/dashboard/page.tsx
@@ -1,8 +1,9 @@
"use client";
import Filter from "../filter";
-import ModelsCategories from "./models-categories";
+import DataCharts from "./data-charts";
import NumberStats from "./number-stats";
import RequestsPerTime from "./requests-per-time";
+import TokenCharts from "./token-charts";
export default function PlaygroundPage() {
return (
@@ -12,7 +13,8 @@ export default function PlaygroundPage() {
<NumberStats />
<div className="flex flex-col gap-6">
<RequestsPerTime />
- <ModelsCategories />
+ <DataCharts />
+ <TokenCharts />
</div>
</div>
</>
diff --git a/src/client/src/app/(playground)/dashboard/requests-per-time.tsx b/src/client/src/app/(playground)/dashboard/requests-per-time.tsx
index 969b6d24..099d0d83 100644
--- a/src/client/src/app/(playground)/dashboard/requests-per-time.tsx
+++ b/src/client/src/app/(playground)/dashboard/requests-per-time.tsx
@@ -23,9 +23,12 @@ export default function RequestsPerTime() {
}, [filter, fetchData]);
return (
- <Card heading="Requests per time" containerClass="rounded-lg">
+ <Card
+ containerClass="rounded-lg w-full h-full h-64"
+ heading="Requests per time"
+ >
<LineChart
- className="mt-6"
+ className="h-40"
connectNulls
data={isLoading || !isFetched ? [] : (data as any[]) || []}
index="request_time"
diff --git a/src/client/src/app/(playground)/dashboard/token-charts.tsx b/src/client/src/app/(playground)/dashboard/token-charts.tsx
new file mode 100644
index 00000000..6c0c1d55
--- /dev/null
+++ b/src/client/src/app/(playground)/dashboard/token-charts.tsx
@@ -0,0 +1,173 @@
+import StatCard from "@/components/(playground)/stat-card";
+import { AreaChart, BarList, LineChart } from "@tremor/react";
+import { useCallback, useEffect } from "react";
+import { useFilter } from "../filter-context";
+import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
+import Card from "@/components/common/card";
+
+function TopModels() {
+ const [filter] = useFilter();
+ const { data, fireRequest, isFetched, isLoading } = useFetchWrapper();
+
+ const fetchData = useCallback(async () => {
+ fireRequest({
+ body: JSON.stringify({
+ timeLimit: filter.timeLimit,
+ }),
+ requestType: "POST",
+ url: "/api/metrics/model/top",
+ responseDataKey: "data",
+ });
+ }, [filter]);
+
+ useEffect(() => {
+ if (filter.timeLimit.start && filter.timeLimit.end) fetchData();
+ }, [filter, fetchData]);
+
+ const updatedData = ((data as any[]) || []).map((item) => ({
+ name: item.model,
+ value: item.model_count,
+ target: item.total,
+ }));
+
+ return (
+ <Card containerClass="rounded-l-lg w-1/2 h-full" heading="Top models">
+ {isLoading || !isFetched ? (
+ <div className="flex w-full items-center justify-center h-40">
+ Loading...
+ </div>
+ ) : updatedData.length === 0 ? (
+ <div className="flex w-full items-center justify-center h-40">
+ No data available
+ </div>
+ ) : (
+ <BarList
+ data={isLoading || !isFetched ? [] : updatedData}
+ className="h-40"
+ />
+ )}
+ </Card>
+ );
+}
+
+function ModelsPerTime() {
+ const [filter] = useFilter();
+ const { data, fireRequest, isFetched, isLoading } = useFetchWrapper();
+ const fetchData = useCallback(async () => {
+ fireRequest({
+ body: JSON.stringify({
+ timeLimit: filter.timeLimit,
+ }),
+ requestType: "POST",
+ url: "/api/metrics/model/time",
+ responseDataKey: "data",
+ });
+ }, [filter]);
+
+ useEffect(() => {
+ if (filter.timeLimit.start && filter.timeLimit.end) fetchData();
+ }, [filter, fetchData]);
+
+ const models: Set<string> = new Set();
+
+ const updatedDataWithType = (((data || []) as any[]) || []).map((item) => {
+ models.add(item.model);
+ return {
+ request_time: item.request_time,
+ [item.model]: item.model_count,
+ };
+ });
+
+ return (
+ <Card
+ containerClass="rounded-r-lg w-full h-full border-l-0"
+ heading="Models per time"
+ >
+ <LineChart
+ className="h-40"
+ data={isLoading || !isFetched ? [] : updatedDataWithType}
+ index="request_time"
+ categories={Array.from(models)}
+ noDataText={
+ isLoading || !isFetched ? "Loading ..." : "No data available"
+ }
+ />
+ </Card>
+ );
+}
+
+function TokensPerTime() {
+ const [filter] = useFilter();
+ const { data, fireRequest, isFetched, isLoading } = useFetchWrapper();
+ const fetchData = useCallback(async () => {
+ fireRequest({
+ body: JSON.stringify({
+ timeLimit: filter.timeLimit,
+ }),
+ requestType: "POST",
+ url: "/api/metrics/token/time",
+ responseDataKey: "data",
+ });
+ }, [filter]);
+
+ useEffect(() => {
+ if (filter.timeLimit.start && filter.timeLimit.end) fetchData();
+ }, [filter, fetchData]);
+
+ const updatedDataWithType = ((data || []) as any[]) || [];
+
+ return (
+ <Card
+ containerClass="rounded-r-lg w-full h-full border-l-0"
+ heading="Tokens usage"
+ >
+ <AreaChart
+ className="h-4/5"
+ data={isLoading || !isFetched ? [] : updatedDataWithType}
+ index="request_time"
+ categories={["totaltokens", "prompttokens", "completiontokens"]}
+ colors={["emerald", "green", "blue"]}
+ yAxisWidth={40}
+ noDataText={
+ isLoading || !isFetched ? "Loading ..." : "No data available"
+ }
+ />
+ </Card>
+ );
+}
+
+function TokenCharts() {
+ return (
+ <div className="flex flex-col w-full gap-4">
+ <div className="flex mb-4 w-full">
+ <div className="flex flex-col w-1/4">
+ <StatCard
+ containerClass="rounded-tl-lg border-b-0 w-full text-xs"
+ dataKey="total_tokens"
+ extraParams={{ type: "prompt" }}
+ heading="Avg prompt tokens / request"
+ loadingClass="h-8 w-12"
+ textClass="text-2xl"
+ url="/api/metrics/token/request/average"
+ />
+ <StatCard
+ containerClass="rounded-bl-lg w-full text-xs"
+ dataKey="total_tokens"
+ extraParams={{ type: "completion" }}
+ heading="Avg completion tokens / request"
+ loadingClass="h-8 w-12"
+ textClass="text-2xl"
+ url="/api/metrics/token/request/average"
+ />
+ </div>
+ <TokensPerTime />
+ </div>
+ <div className="flex mb-4 w-full">
+ <TopModels />
+ <ModelsPerTime />
+ </div>
+ </div>
+ );
+}
+
+export default TokenCharts;
diff --git a/src/client/src/app/api/metrics/cost/application/route.ts b/src/client/src/app/api/metrics/cost/application/route.ts
new file mode 100644
index 00000000..2e3fbd71
--- /dev/null
+++ b/src/client/src/app/api/metrics/cost/application/route.ts
@@ -0,0 +1,31 @@
+import { DokuParams } from "@/lib/doku/common";
+import { getCostByApplication } from "@/lib/doku/cost";
+import {
+ validateMetricsRequest,
+ validateMetricsRequestType,
+} from "@/utils/doku";
+
+export async function POST(request: Request) {
+ const formData = await request.json();
+ const timeLimit = formData.timeLimit;
+
+ const params: DokuParams = {
+ timeLimit: {
+ start: timeLimit.start,
+ end: timeLimit.end,
+ },
+ };
+
+ const validationParam = validateMetricsRequest(
+ params,
+ validateMetricsRequestType.COST_BY_APPLICATION
+ );
+
+ if (!validationParam.success)
+ return Response.json(validationParam.err, {
+ status: 400,
+ });
+
+ const res: any = await getCostByApplication(params);
+ return Response.json(res);
+}
diff --git a/src/client/src/app/api/metrics/cost/environment/route.ts b/src/client/src/app/api/metrics/cost/environment/route.ts
new file mode 100644
index 00000000..03874ac2
--- /dev/null
+++ b/src/client/src/app/api/metrics/cost/environment/route.ts
@@ -0,0 +1,31 @@
+import { DokuParams } from "@/lib/doku/common";
+import { getCostByEnvironment } from "@/lib/doku/cost";
+import {
+ validateMetricsRequest,
+ validateMetricsRequestType,
+} from "@/utils/doku";
+
+export async function POST(request: Request) {
+ const formData = await request.json();
+ const timeLimit = formData.timeLimit;
+
+ const params: DokuParams = {
+ timeLimit: {
+ start: timeLimit.start,
+ end: timeLimit.end,
+ },
+ };
+
+ const validationParam = validateMetricsRequest(
+ params,
+ validateMetricsRequestType.COST_BY_ENVIRONMENT
+ );
+
+ if (!validationParam.success)
+ return Response.json(validationParam.err, {
+ status: 400,
+ });
+
+ const res: any = await getCostByEnvironment(params);
+ return Response.json(res);
+}
diff --git a/src/client/src/app/api/metrics/endpoint/route.ts b/src/client/src/app/api/metrics/endpoint/route.ts
new file mode 100644
index 00000000..0da78ae6
--- /dev/null
+++ b/src/client/src/app/api/metrics/endpoint/route.ts
@@ -0,0 +1,31 @@
+import { DokuParams } from "@/lib/doku/common";
+import {
+ validateMetricsRequest,
+ validateMetricsRequestType,
+} from "@/utils/doku";
+import { getResultGenerationByEndpoint } from "@/lib/doku/endpoint";
+
+export async function POST(request: Request) {
+ const formData = await request.json();
+ const timeLimit = formData.timeLimit;
+
+ const params: DokuParams = {
+ timeLimit: {
+ start: timeLimit.start,
+ end: timeLimit.end,
+ },
+ };
+
+ const validationParam = validateMetricsRequest(
+ params,
+ validateMetricsRequestType.GENERATION_BY_ENDPOINT
+ );
+
+ if (!validationParam.success)
+ return Response.json(validationParam.err, {
+ status: 400,
+ });
+
+ const res: any = await getResultGenerationByEndpoint(params);
+ return Response.json(res);
+}
diff --git a/src/client/src/app/api/metrics/model/time/route.ts b/src/client/src/app/api/metrics/model/time/route.ts
new file mode 100644
index 00000000..8bbb9623
--- /dev/null
+++ b/src/client/src/app/api/metrics/model/time/route.ts
@@ -0,0 +1,31 @@
+import { DokuParams } from "@/lib/doku/common";
+import { getModelsPerTime } from "@/lib/doku/model";
+import {
+ validateMetricsRequest,
+ validateMetricsRequestType,
+} from "@/utils/doku";
+
+export async function POST(request: Request) {
+ const formData = await request.json();
+ const timeLimit = formData.timeLimit;
+
+ const params: DokuParams = {
+ timeLimit: {
+ start: timeLimit.start,
+ end: timeLimit.end,
+ },
+ };
+
+ const validationParam = validateMetricsRequest(
+ params,
+ validateMetricsRequestType.MODEL_PER_TIME
+ );
+
+ if (!validationParam.success)
+ return Response.json(validationParam.err, {
+ status: 400,
+ });
+
+ const res: any = await getModelsPerTime(params);
+ return Response.json(res);
+}
diff --git a/src/client/src/app/api/metrics/token/request/average/route.ts b/src/client/src/app/api/metrics/token/request/average/route.ts
new file mode 100644
index 00000000..7c564e2b
--- /dev/null
+++ b/src/client/src/app/api/metrics/token/request/average/route.ts
@@ -0,0 +1,31 @@
+import { type TokenParams, getAverageTokensPerRequest } from "@/lib/doku/token";
+import {
+ validateMetricsRequest,
+ validateMetricsRequestType,
+} from "@/utils/doku";
+
+export async function POST(request: Request) {
+ const formData = await request.json();
+ const timeLimit = formData.timeLimit;
+
+ const params: TokenParams = {
+ timeLimit: {
+ start: timeLimit.start,
+ end: timeLimit.end,
+ },
+ type: formData.type,
+ };
+
+ const validationParam = validateMetricsRequest(
+ params,
+ validateMetricsRequestType.AVERAGE_REQUEST_TOKEN
+ );
+
+ if (!validationParam.success)
+ return Response.json(validationParam.err, {
+ status: 400,
+ });
+
+ const res: any = await getAverageTokensPerRequest(params);
+ return Response.json(res);
+}
diff --git a/src/client/src/app/api/metrics/token/time/route.ts b/src/client/src/app/api/metrics/token/time/route.ts
new file mode 100644
index 00000000..2bf13956
--- /dev/null
+++ b/src/client/src/app/api/metrics/token/time/route.ts
@@ -0,0 +1,31 @@
+import { DokuParams } from "@/lib/doku/common";
+import { getTokensPerTime } from "@/lib/doku/token";
+import {
+ validateMetricsRequest,
+ validateMetricsRequestType,
+} from "@/utils/doku";
+
+export async function POST(request: Request) {
+ const formData = await request.json();
+ const timeLimit = formData.timeLimit;
+
+ const params: DokuParams = {
+ timeLimit: {
+ start: timeLimit.start,
+ end: timeLimit.end,
+ },
+ };
+
+ const validationParam = validateMetricsRequest(
+ params,
+ validateMetricsRequestType.TOKENS_PER_TIME
+ );
+
+ if (!validationParam.success)
+ return Response.json(validationParam.err, {
+ status: 400,
+ });
+
+ const res: any = await getTokensPerTime(params);
+ return Response.json(res);
+}
diff --git a/src/client/src/components/(playground)/stat-card.tsx b/src/client/src/components/(playground)/stat-card.tsx
new file mode 100644
index 00000000..23fe0ae2
--- /dev/null
+++ b/src/client/src/components/(playground)/stat-card.tsx
@@ -0,0 +1,62 @@
+import { useFilter } from "@/app/(playground)/filter-context";
+import useFetchWrapper from "@/utils/hooks/useFetchWrapper";
+import { memo, useCallback, useEffect } from "react";
+import Card, { CardProps } from "../common/card";
+import { round } from "lodash";
+
+type StatCardProps = Partial<CardProps> & {
+ dataKey: string;
+ extraParams?: Record<any, any>;
+ roundTo?: number;
+ textPrefix?: string;
+ textSuffix?: string;
+ url: string;
+};
+
+const StatCard = memo(
+ ({
+ dataKey,
+ extraParams = {},
+ roundTo = 4,
+ textClass = "",
+ textPrefix = "",
+ textSuffix = "",
+ url,
+ ...rest
+ }: StatCardProps) => {
+ const [filter] = useFilter();
+ const { data, isFetched, isLoading, fireRequest } = useFetchWrapper();
+
+ const fetchData = useCallback(async () => {
+ fireRequest({
+ body: JSON.stringify({
+ timeLimit: filter.timeLimit,
+ ...extraParams,
+ }),
+ requestType: "POST",
+ url,
+ responseDataKey: "data[0]",
+ });
+ }, [filter, url]);
+
+ useEffect(() => {
+ if (filter.timeLimit.start && filter.timeLimit.end) fetchData();
+ }, [filter, fetchData]);
+
+ return (
+ <Card
+ isLoading={isLoading || !isFetched}
+ text={`${textPrefix}${round(
+ (data as Record<any, any>)?.[dataKey] || 0,
+ roundTo
+ )}${textSuffix}`}
+ textClass={`text-primary ${textClass}`}
+ {...rest}
+ />
+ );
+ }
+);
+
+StatCard.displayName = "StatCard";
+
+export default StatCard;
diff --git a/src/client/src/components/common/card.tsx b/src/client/src/components/common/card.tsx
index 066f2e41..b3b3fe04 100644
--- a/src/client/src/components/common/card.tsx
+++ b/src/client/src/components/common/card.tsx
@@ -1,33 +1,51 @@
-import { ReactNode } from "react";
+import { ReactNode, forwardRef } from "react";
-type CardProps = {
+export type CardProps = {
children?: ReactNode;
containerClass?: string;
- heading: string;
+ heading?: string;
isLoading?: boolean;
+ loadingClass?: string;
text?: string;
textClass?: string;
};
-export default function Card({
- children = null,
- containerClass = "",
- heading,
- isLoading,
- text,
- textClass = "",
-}: CardProps) {
+export default forwardRef(function Card(
+ {
+ children = null,
+ containerClass = "",
+ heading,
+ isLoading,
+ loadingClass = "h-9 w-12",
+ text,
+ textClass = "",
+ }: CardProps,
+ ref: any
+) {
return (
<div
- className={`border border-secondary relative text-left text-tertiary p-6 ${containerClass}`}
+ className={`border border-secondary relative text-left text-tertiary p-6 text-sm ${containerClass}`}
+ ref={ref}
>
- <p className="text-sm mb-4">{heading}</p>
+ {heading && <h3 className="mb-2 font-medium">{heading}</h3>}
{!!isLoading ? (
- <div className="animate-pulse h-9 w-12 bg-secondary/[0.9] rounded-full" />
+ <div
+ className={`animate-pulse bg-secondary/[0.9] rounded-full ${loadingClass}`}
+ />
) : (
- text && <p className={`font-semibold text-3xl ${textClass}`}>{text}</p>
+ text && (
+ <p
+ className={`font-semibold ${
+ textClass.match(/text-(xs|sm|base|lg|xl|[2-9]xl)/)
+ ? ""
+ : "text-3xl"
+ } ${textClass}`}
+ >
+ {text}
+ </p>
+ )
)}
{children}
</div>
);
-}
+});
diff --git a/src/client/src/lib/doku/cost.ts b/src/client/src/lib/doku/cost.ts
index 83d971dc..273f0573 100644
--- a/src/client/src/lib/doku/cost.ts
+++ b/src/client/src/lib/doku/cost.ts
@@ -21,3 +21,33 @@ export async function getAverageCost(params: DokuParams) {
return dataCollector(query);
}
+
+export async function getCostByApplication(params: DokuParams) {
+ const { start, end } = params.timeLimit;
+
+ const query = `
+ SELECT
+ DISTINCT applicationname as applicationname,
+ CAST(ROUND(SUM(usagecost)::numeric, 7) AS FLOAT) AS cost,
+ SUM(usagecost) * 100.0 / SUM(usagecost) AS percentage
+ FROM ${TABLE_NAME}
+ WHERE time >= '${start}' AND time <= '${end}'
+ GROUP BY applicationname`;
+
+ return dataCollector(query);
+}
+
+export async function getCostByEnvironment(params: DokuParams) {
+ const { start, end } = params.timeLimit;
+
+ const query = `
+ SELECT
+ DISTINCT environment as environment,
+ CAST(ROUND(SUM(usagecost)::numeric, 7) AS FLOAT) AS cost,
+ SUM(usagecost) * 100.0 / SUM(usagecost) AS percentage
+ FROM ${TABLE_NAME}
+ WHERE time >= '${start}' AND time <= '${end}'
+ GROUP BY environment`;
+
+ return dataCollector(query);
+}
diff --git a/src/client/src/lib/doku/endpoint.ts b/src/client/src/lib/doku/endpoint.ts
new file mode 100644
index 00000000..12f60086
--- /dev/null
+++ b/src/client/src/lib/doku/endpoint.ts
@@ -0,0 +1,16 @@
+import { DokuParams, TABLE_NAME, dataCollector } from "./common";
+
+export async function getResultGenerationByEndpoint(params: DokuParams) {
+ const { start, end } = params.timeLimit;
+
+ const query = `
+ SELECT
+ SUBSTRING(endpoint FROM '^[^.]+') AS provider,
+ CAST(COUNT(*) AS INTEGER) AS count,
+ ROUND(100.0 * COUNT(*) / SUM(COUNT(*)) OVER(), 2) AS percentage
+ FROM ${TABLE_NAME}
+ WHERE time >= '${start}' AND time <= '${end}'
+ GROUP BY provider`;
+
+ return dataCollector(query);
+}
diff --git a/src/client/src/lib/doku/model.ts b/src/client/src/lib/doku/model.ts
index 11190fcc..a004bd72 100644
--- a/src/client/src/lib/doku/model.ts
+++ b/src/client/src/lib/doku/model.ts
@@ -1,3 +1,4 @@
+import { differenceInDays, differenceInYears } from "date-fns";
import { DokuParams, TABLE_NAME, dataCollector } from "./common";
export type ModelDokuParams = DokuParams & {
@@ -8,7 +9,7 @@ export async function getTopModels(params: ModelDokuParams) {
const { start, end } = params.timeLimit;
const query = `
- SELECT model, CAST(COUNT(model) AS INTEGER) AS model_count
+ SELECT model, CAST(COUNT(model) AS INTEGER) AS model_count, CAST(COUNT(*) AS INTEGER) AS total
FROM ${TABLE_NAME}
WHERE time >= '${start}' AND time <= '${end}'
GROUP BY model
@@ -17,3 +18,24 @@ export async function getTopModels(params: ModelDokuParams) {
return dataCollector(query);
}
+
+export async function getModelsPerTime(params: DokuParams) {
+ const { start, end } = params.timeLimit;
+ let dateTrunc = "day";
+ if (differenceInYears(end, start) >= 1) {
+ dateTrunc = "month";
+ } else if (differenceInDays(end, start) <= 1) {
+ dateTrunc = "hour";
+ }
+
+ const query = `SELECT
+ DISTINCT model AS model,
+ CAST(COUNT(*) AS INTEGER) AS model_count,
+ TO_CHAR(DATE_TRUNC('${dateTrunc}', time), 'YY/MM/DD HH24:MI') AS request_time
+ FROM ${TABLE_NAME}
+ WHERE time >= '${start}' AND time <= '${end}'
+ GROUP BY model, request_time
+ ORDER BY request_time`;
+
+ return dataCollector(query);
+}
diff --git a/src/client/src/lib/doku/request.ts b/src/client/src/lib/doku/request.ts
index 3d0ea5f3..4ec12fb4 100644
--- a/src/client/src/lib/doku/request.ts
+++ b/src/client/src/lib/doku/request.ts
@@ -18,7 +18,7 @@ export async function getRequestPerTime(params: DokuParams) {
const query = `SELECT
CAST(COUNT(endpoint) AS INTEGER) AS total,
- TO_CHAR(DATE_TRUNC('${dateTrunc}', time), 'YYYY-MM-DD"T"HH24:MI:SS"Z"') AS request_time
+ TO_CHAR(DATE_TRUNC('${dateTrunc}', time), 'YY/MM/DD HH24:MI') AS request_time
FROM ${TABLE_NAME}
WHERE time >= '${start}' AND time <= '${end}'
GROUP BY request_time
diff --git a/src/client/src/lib/doku/token.ts b/src/client/src/lib/doku/token.ts
new file mode 100644
index 00000000..48531933
--- /dev/null
+++ b/src/client/src/lib/doku/token.ts
@@ -0,0 +1,47 @@
+import { differenceInDays, differenceInYears } from "date-fns";
+import { DokuParams, TABLE_NAME, dataCollector } from "./common";
+
+export type TOKEN_TYPE = "total" | "prompt" | "completion";
+
+export type TokenParams = DokuParams & {
+ type: TOKEN_TYPE;
+};
+
+export async function getAverageTokensPerRequest(params: TokenParams) {
+ const { start, end } = params.timeLimit;
+
+ const query = `SELECT
+ CAST(AVG(${
+ params.type === "total"
+ ? "totaltokens"
+ : params.type === "prompt"
+ ? "prompttokens"
+ : "completiontokens"
+ }) AS DECIMAL) AS total_tokens
+ FROM ${TABLE_NAME}
+ WHERE time >= '${start}' AND time <= '${end}'`;
+
+ return dataCollector(query);
+}
+
+export async function getTokensPerTime(params: DokuParams) {
+ const { start, end } = params.timeLimit;
+ let dateTrunc = "day";
+ if (differenceInYears(end, start) >= 1) {
+ dateTrunc = "month";
+ } else if (differenceInDays(end, start) <= 1) {
+ dateTrunc = "hour";
+ }
+
+ const query = `SELECT
+ CAST(SUM(totaltokens) AS INTEGER) AS totaltokens,
+ CAST(SUM(prompttokens) AS INTEGER) AS prompttokens,
+ CAST(SUM(completiontokens) AS INTEGER) AS completiontokens,
+ TO_CHAR(DATE_TRUNC('${dateTrunc}', time), 'YY/MM/DD HH24:MI') AS request_time
+ FROM ${TABLE_NAME}
+ WHERE time >= '${start}' AND time <= '${end}'
+ GROUP BY request_time
+ ORDER BY request_time`;
+
+ return dataCollector(query);
+}
diff --git a/src/client/src/utils/doku.ts b/src/client/src/utils/doku.ts
index 393404f3..d7b131b0 100644
--- a/src/client/src/utils/doku.ts
+++ b/src/client/src/utils/doku.ts
@@ -9,10 +9,18 @@ export const validateMetricsRequestType = {
// Cost
TOTAL_COST: "TOTAL_COST",
AVERAGE_REQUEST_COST: "AVERAGE_REQUEST_COST",
+ COST_BY_APPLICATION: "COST_BY_APPLICATION",
+ COST_BY_ENVIRONMENT: "COST_BY_ENVIRONMENT",
// Model
TOP_MODELS: "TOP_MODELS",
+ MODEL_PER_TIME: "MODEL_PER_TIME",
// Category
GENERATION_BY_CATEGORY: "GENERATION_BY_CATEGORY",
+ // Token
+ AVERAGE_REQUEST_TOKEN: "AVERAGE_REQUEST_TOKEN",
+ TOKENS_PER_TIME: "TOKENS_PER_TIME",
+ // Endpoint
+ GENERATION_BY_ENDPOINT: "GENERATION_BY_ENDPOINT",
};
export const validateMetricsRequest = (
@@ -42,6 +50,8 @@ export const validateMetricsRequest = (
// Cost
case validateMetricsRequestType.TOTAL_COST:
case validateMetricsRequestType.AVERAGE_REQUEST_COST:
+ case validateMetricsRequestType.COST_BY_APPLICATION:
+ case validateMetricsRequestType.COST_BY_ENVIRONMENT:
if (!params.timeLimit?.start || !params.timeLimit?.end) {
return {
success: false,
@@ -64,6 +74,14 @@ export const validateMetricsRequest = (
};
}
break;
+ case validateMetricsRequestType.MODEL_PER_TIME:
+ if (!params.timeLimit?.start || !params.timeLimit?.end) {
+ return {
+ success: false,
+ err: "Start date or End date missing!",
+ };
+ }
+ break;
// Category
case validateMetricsRequestType.GENERATION_BY_CATEGORY:
if (!params.timeLimit?.start || !params.timeLimit?.end) {
@@ -73,6 +91,38 @@ export const validateMetricsRequest = (
};
}
break;
+ // Token
+ case validateMetricsRequestType.AVERAGE_REQUEST_TOKEN:
+ if (!params.timeLimit?.start || !params.timeLimit?.end) {
+ return {
+ success: false,
+ err: "Start date or End date missing!",
+ };
+ }
+ if (!params.type) {
+ return {
+ success: false,
+ err: "Type of token for the request is missing!",
+ };
+ }
+ break;
+ case validateMetricsRequestType.TOKENS_PER_TIME:
+ if (!params.timeLimit?.start || !params.timeLimit?.end) {
+ return {
+ success: false,
+ err: "Start date or End date missing!",
+ };
+ }
+ break;
+ // Endpoint
+ case validateMetricsRequestType.GENERATION_BY_ENDPOINT:
+ if (!params.timeLimit?.start || !params.timeLimit?.end) {
+ return {
+ success: false,
+ err: "Start date or End date missing!",
+ };
+ }
+ break;
default:
break;
}