Skip to content

Revert "feat(usage): prioritize auto_model from metadata in usage queries" #2222

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

Merged
chrarnoldus merged 1 commit into from
Apr 9, 2026
Merged

Revert "feat(usage): prioritize auto_model from metadata in usage queries" #2222

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
20 changes: 4 additions & 16 deletions apps/web/src/app/api/profile/usage/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { NextResponse } from 'next/server';
import { getUserFromAuth } from '@/lib/user.server';
import { readDb } from '@/lib/drizzle';
import { timedUsageQuery } from '@/lib/usage-query';
import { microdollar_usage, microdollar_usage_metadata, auto_model } from '@kilocode/db/schema';
import { microdollar_usage } from '@kilocode/db/schema';
import { eq, sql, desc, isNull, and, gte } from 'drizzle-orm';
import { getDateThreshold, type Period } from '@/routers/user-router';

Expand All @@ -30,7 +30,7 @@ export async function GET(request: NextRequest) {
...(groupByModel && {
model: sql<
string | null
>`COALESCE(${auto_model.auto_model}, ${microdollar_usage.requested_model}, ${microdollar_usage.model})`,
>`COALESCE(${microdollar_usage.requested_model}, ${microdollar_usage.model})`,
}),
total_cost: sql<number>`SUM(${microdollar_usage.cost})::float`,
request_count: sql<number>`COUNT(*)::float`,
Expand All @@ -44,17 +44,13 @@ export async function GET(request: NextRequest) {
const groupByClause = [
sql`DATE(${microdollar_usage.created_at})`,
...(groupByModel
? [
sql`COALESCE(${auto_model.auto_model}, ${microdollar_usage.requested_model}, ${microdollar_usage.model})`,
]
? [sql`COALESCE(${microdollar_usage.requested_model}, ${microdollar_usage.model})`]
: []),
];
const orderByClause = [
desc(sql`DATE(${microdollar_usage.created_at})`),
...(groupByModel
? [
sql`COALESCE(${auto_model.auto_model}, ${microdollar_usage.requested_model}, ${microdollar_usage.model})`,
]
? [sql`COALESCE(${microdollar_usage.requested_model}, ${microdollar_usage.model})`]
: []),
];

Expand Down Expand Up @@ -85,14 +81,6 @@ export async function GET(request: NextRequest) {
tx
.select(selectFields)
.from(microdollar_usage)
.leftJoin(
microdollar_usage_metadata,
eq(microdollar_usage_metadata.id, microdollar_usage.id)
)
.leftJoin(
auto_model,
eq(auto_model.auto_model_id, microdollar_usage_metadata.auto_model_id)
)
.where(and(...conditions))
.groupBy(...groupByClause)
.orderBy(...orderByClause)
Expand Down
33 changes: 5 additions & 28 deletions apps/web/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 @@ -7,12 +7,7 @@ import {
} from '@/routers/organizations/utils';
import { readDb } from '@/lib/drizzle';
import { timedUsageQuery } from '@/lib/usage-query';
import {
microdollar_usage,
kilocode_users,
microdollar_usage_metadata,
auto_model,
} from '@kilocode/db/schema';
import { microdollar_usage, kilocode_users } from '@kilocode/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 @@ -175,7 +170,7 @@ export const organizationsUsageDetailsRouter = createTRPCRouter({
datetime: timeBucket.as('datetime'),
userName: kilocode_users.google_user_name,
userEmail: kilocode_users.google_user_email,
model: sql<string>`COALESCE(${auto_model.auto_model}, ${microdollar_usage.requested_model}, ${microdollar_usage.model})`,
model: sql<string>`COALESCE(${microdollar_usage.requested_model}, ${microdollar_usage.model})`,
provider: microdollar_usage.provider,
projectId: microdollar_usage.project_id,
costMicrodollars: sum(microdollar_usage.cost),
Expand All @@ -185,14 +180,6 @@ 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_metadata.id, microdollar_usage.id)
)
.leftJoin(
auto_model,
eq(auto_model.auto_model_id, microdollar_usage_metadata.auto_model_id)
)
.where(
and(
eq(microdollar_usage.organization_id, organizationId),
Expand All @@ -204,7 +191,7 @@ export const organizationsUsageDetailsRouter = createTRPCRouter({
timeBucket,
kilocode_users.google_user_name,
kilocode_users.google_user_email,
sql`COALESCE(${auto_model.auto_model}, ${microdollar_usage.requested_model}, ${microdollar_usage.model})`,
sql`COALESCE(${microdollar_usage.requested_model}, ${microdollar_usage.model})`,
microdollar_usage.provider,
microdollar_usage.project_id
)
Expand Down Expand Up @@ -334,7 +321,7 @@ export const organizationsUsageDetailsRouter = createTRPCRouter({
...(groupByModel && {
model: sql<
string | null
>`COALESCE(${auto_model.auto_model}, ${microdollar_usage.requested_model}, ${microdollar_usage.model})`,
>`COALESCE(${microdollar_usage.requested_model}, ${microdollar_usage.model})`,
}),
microdollarCost: sum(microdollar_usage.cost),
tokenCount: sum(
Expand All @@ -346,23 +333,13 @@ 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_metadata.id, microdollar_usage.id)
)
.leftJoin(
auto_model,
eq(auto_model.auto_model_id, microdollar_usage_metadata.auto_model_id)
)
.where(and(...whereConditions))
.groupBy(
sql`DATE(${microdollar_usage.created_at})`,
kilocode_users.google_user_name,
kilocode_users.google_user_email,
...(groupByModel
? [
sql`COALESCE(${auto_model.auto_model}, ${microdollar_usage.requested_model}, ${microdollar_usage.model})`,
]
? [sql`COALESCE(${microdollar_usage.requested_model}, ${microdollar_usage.model})`]
: [])
)
.orderBy(sql`DATE(${microdollar_usage.created_at}) DESC`)
Expand Down
Loading