Skip to content

Add feature column to microdollar usage API responses #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kiloconnect wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add feature column to microdollar usage API responses #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/lib/organizations/organization-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ export type UsageDetailByDay = Array<{
email: string;
};
model?: string;
feature?: string;
microdollarCost: string | null;
tokenCount: number;
inputTokens: number;
Expand Down
48 changes: 40 additions & 8 deletions src/routers/organizations/organization-usage-details-router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ import {
organizationMemberProcedure,
} from '@/routers/organizations/utils';
import { db } from '@/lib/drizzle';
import { microdollar_usage, kilocode_users } from '@/db/schema';
import {
microdollar_usage,
kilocode_users,
microdollar_usage_metadata,
feature,
} from '@/db/schema';
import { eq, sum, count, sql, and, gte, lte } from 'drizzle-orm';
import * as z from 'zod';
import { AUTOCOMPLETE_MODEL } from '@/lib/constants';
Expand Down Expand Up @@ -44,6 +49,7 @@ const UsageTimeseriesOutputSchema = z.object({
model: z.string(),
provider: z.string(),
projectId: z.string().nullable(),
feature: z.string().nullable(),
costMicrodollars: z.number(),
inputTokenCount: z.number(),
outputTokenCount: z.number(),
Expand All @@ -61,6 +67,7 @@ const UsageDetailsResponseSchema = z.object({
email: z.string(),
}),
model: z.string().optional(),
feature: z.string().optional(),
microdollarCost: z.string().nullable(),
tokenCount: z.number(),
inputTokens: z.number(),
Expand Down Expand Up @@ -163,13 +170,19 @@ export const organizationsUsageDetailsRouter = createTRPCRouter({
model: microdollar_usage.model,
provider: microdollar_usage.provider,
projectId: microdollar_usage.project_id,
feature: feature.feature,
costMicrodollars: sum(microdollar_usage.cost),
inputTokenCount: sum(microdollar_usage.input_tokens),
outputTokenCount: sum(microdollar_usage.output_tokens),
requestCount: count(microdollar_usage.id),
})
.from(microdollar_usage)
.innerJoin(kilocode_users, eq(kilocode_users.id, microdollar_usage.kilo_user_id))
.leftJoin(
microdollar_usage_metadata,
eq(microdollar_usage.id, microdollar_usage_metadata.id)
)
.leftJoin(feature, eq(microdollar_usage_metadata.feature_id, feature.feature_id))
.where(
and(
eq(microdollar_usage.organization_id, organizationId),
Expand All @@ -183,26 +196,35 @@ export const organizationsUsageDetailsRouter = createTRPCRouter({
kilocode_users.google_user_email,
microdollar_usage.model,
microdollar_usage.provider,
microdollar_usage.project_id
microdollar_usage.project_id,
feature.feature
)
.orderBy(timeBucket);

// Fill in 0's for missing data
// TODO surely there's a better way to do this
// Get all unique combinations of user/model/provider/projectId from the data
// Get all unique combinations of user/model/provider/projectId/feature from the data
const uniqueCombinations = new Map<
string,
{ name: string; email: string; model: string; provider: string; projectId: string | null }
{
name: string;
email: string;
model: string;
provider: string;
projectId: string | null;
feature: string | null;
}
>();
usageData.forEach(row => {
const key = `${row.userEmail}|${row.model}|${row.provider}|${row.projectId || 'null'}`;
const key = `${row.userEmail}|${row.model}|${row.provider}|${row.projectId || 'null'}|${row.feature || 'null'}`;
if (!uniqueCombinations.has(key)) {
uniqueCombinations.set(key, {
name: row.userName || 'Unknown',
email: row.userEmail || 'unknown@example.com',
model: row.model || 'Unknown',
provider: row.provider || 'Unknown',
projectId: row.projectId || null,
feature: row.feature || null,
});
}
});
Expand Down Expand Up @@ -232,7 +254,7 @@ export const organizationsUsageDetailsRouter = createTRPCRouter({
// Create a map of existing data for quick lookup
const dataMap = new Map<string, (typeof usageData)[0]>();
usageData.forEach(row => {
const key = `${new Date(row.datetime).toISOString()}|${row.userEmail}|${row.model}|${row.provider}|${row.projectId || 'null'}`;
const key = `${new Date(row.datetime).toISOString()}|${row.userEmail}|${row.model}|${row.provider}|${row.projectId || 'null'}|${row.feature || 'null'}`;
dataMap.set(key, row);
});

Expand All @@ -244,6 +266,7 @@ export const organizationsUsageDetailsRouter = createTRPCRouter({
model: string;
provider: string;
projectId: string | null;
feature: string | null;
costMicrodollars: number;
inputTokenCount: number;
outputTokenCount: number;
Expand All @@ -253,7 +276,7 @@ export const organizationsUsageDetailsRouter = createTRPCRouter({
allTimeBuckets.forEach(bucket => {
const bucketISO = bucket.toISOString();
uniqueCombinations.forEach(combo => {
const key = `${bucketISO}|${combo.email}|${combo.model}|${combo.provider}|${combo.projectId || 'null'}`;
const key = `${bucketISO}|${combo.email}|${combo.model}|${combo.provider}|${combo.projectId || 'null'}|${combo.feature || 'null'}`;
const existingData = dataMap.get(key);

timeseries.push({
Expand All @@ -263,6 +286,7 @@ export const organizationsUsageDetailsRouter = createTRPCRouter({
model: combo.model,
provider: combo.provider,
projectId: combo.projectId,
feature: combo.feature,
costMicrodollars: existingData
? Number.parseInt(existingData.costMicrodollars?.toString() || '0')
: 0,
Expand Down Expand Up @@ -299,6 +323,7 @@ export const organizationsUsageDetailsRouter = createTRPCRouter({
userName: kilocode_users.google_user_name,
userEmail: kilocode_users.google_user_email,
...(groupByModel && { model: microdollar_usage.model }),
feature: feature.feature,
microdollarCost: sum(microdollar_usage.cost),
tokenCount: sum(
sql`${microdollar_usage.input_tokens} + ${microdollar_usage.output_tokens} + ${microdollar_usage.cache_write_tokens} + ${microdollar_usage.cache_hit_tokens}`
Expand All @@ -309,12 +334,18 @@ export const organizationsUsageDetailsRouter = createTRPCRouter({
})
.from(microdollar_usage)
.innerJoin(kilocode_users, eq(kilocode_users.id, microdollar_usage.kilo_user_id))
.leftJoin(
microdollar_usage_metadata,
eq(microdollar_usage.id, microdollar_usage_metadata.id)
)
.leftJoin(feature, eq(microdollar_usage_metadata.feature_id, feature.feature_id))
.where(and(...whereConditions))
.groupBy(
sql`DATE(${microdollar_usage.created_at})`,
kilocode_users.google_user_name,
kilocode_users.google_user_email,
...(groupByModel ? [microdollar_usage.model] : [])
...(groupByModel ? [microdollar_usage.model] : []),
feature.feature
Copy link
Contributor Author

@kiloconnect kiloconnect bot Feb 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[WARNING]: Unconditional feature.feature in GROUP BY is a behavioral change

feature.feature is always included in the GROUP BY here, unlike model which is conditional on groupByModel. This means the get endpoint will now return more granular rows — previously one row per date/user (or date/user/model), now split further by feature. Existing consumers that aggregate or display these results may see unexpected changes (e.g., multiple rows where there used to be one).

Consider either:

  1. Making this conditional via a groupByFeature input flag (consistent with groupByModel), or
  2. Confirming that all consumers of this endpoint are prepared for the increased row count.

)
.orderBy(sql`DATE(${microdollar_usage.created_at}) DESC`);

Expand All @@ -325,6 +356,7 @@ export const organizationsUsageDetailsRouter = createTRPCRouter({
email: row.userEmail,
},
...(groupByModel && { model: 'model' in row ? row.model || undefined : undefined }),
feature: row.feature || undefined,
microdollarCost: row.microdollarCost?.toString() || null,
tokenCount: Number(row.tokenCount) || 0,
inputTokens: Number(row.inputTokens) || 0,
Expand Down