Skip to content

Commit b69271d

Browse files
committed
feat(web): Insights shows thread token usage and estimated cost by turn
1 parent d16f806 commit b69271d

12 files changed

Lines changed: 976 additions & 48 deletions

File tree

‎apps/server/src/auth/RpcAuthorization.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ export const RPC_REQUIRED_SCOPES = {
110110
[WS_METHODS.serverRetryResourceTelemetry]: AuthDiagnosticsReadScope,
111111
[WS_METHODS.serverGetUsageSummary]: AuthDiagnosticsReadScope,
112112
[WS_METHODS.serverRefreshUsageRates]: AuthDiagnosticsReadScope,
113+
// Thread Insights prices token totals already visible on the projection.
114+
[WS_METHODS.serverPriceUsage]: AuthOrchestrationReadScope,
113115
[WS_METHODS.serverSignalProcess]: AuthEnvironmentMaintainScope,
114116
[WS_METHODS.serverReportClientActivity]: AuthOrchestrationReadScope,
115117
[WS_METHODS.scheduledTasksSubscribe]: AuthOrchestrationReadScope,

‎apps/server/src/observability/RpcInstrumentation.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ const RPC_AGGREGATES = {
8787
[WS_METHODS.serverPrepareTriage]: "server",
8888
[WS_METHODS.serverGetUsageSummary]: "server",
8989
[WS_METHODS.serverRefreshUsageRates]: "server",
90+
[WS_METHODS.serverPriceUsage]: "server",
9091
[WS_METHODS.serverSignalProcess]: "server",
9192
[WS_METHODS.serverReportClientActivity]: "server",
9293
[WS_METHODS.scheduledTasksSubscribe]: "scheduledTasks",

‎apps/server/src/usage/UsageService.test.ts‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2491,6 +2491,58 @@ describe("UsageService", () => {
24912491
}).pipe(Effect.scoped),
24922492
);
24932493

2494+
it.live("prices turn totals with overrides and aliases for Insights", () =>
2495+
Effect.gen(function* () {
2496+
const { settings, home } = yield* setup;
2497+
yield* Effect.gen(function* () {
2498+
const settingsService = yield* ServerSettings.ServerSettingsService;
2499+
yield* settingsService.updateSettings({
2500+
usagePriceOverrides: {
2501+
"priced-model": {
2502+
inputCostPerMillionTokens: 1_000_000,
2503+
outputCostPerMillionTokens: 2_000_000,
2504+
},
2505+
},
2506+
usageModelAliases: { "alias-model": "priced-model" },
2507+
});
2508+
const service = yield* UsageService.make;
2509+
const result = yield* service.priceUsage({
2510+
items: [
2511+
{
2512+
id: "priced",
2513+
model: "alias-model",
2514+
totals: {
2515+
uncachedInputTokens: 1,
2516+
cachedInputTokens: 0,
2517+
cacheCreationTokens: 0,
2518+
outputTokens: 1,
2519+
reasoningTokens: 0,
2520+
},
2521+
},
2522+
{
2523+
id: "unknown",
2524+
model: "unknown-model",
2525+
totals: {
2526+
uncachedInputTokens: 1,
2527+
cachedInputTokens: 0,
2528+
cacheCreationTokens: 0,
2529+
outputTokens: 0,
2530+
reasoningTokens: 0,
2531+
},
2532+
},
2533+
],
2534+
});
2535+
assert.deepStrictEqual(result.items, [
2536+
{ id: "priced", costUsd: 3, costSource: "modelPriced" },
2537+
{ id: "unknown", costUsd: 0, costSource: "unpriced" },
2538+
]);
2539+
}).pipe(
2540+
Effect.scoped,
2541+
Effect.provide(layerService({ prefix: "usage-service-price-usage-test", home, settings })),
2542+
);
2543+
}).pipe(Effect.scoped),
2544+
);
2545+
24942546
it.live(
24952547
"retains Codex reconciliation and partial coverage through persisted restart, append and repair",
24962548
() =>

‎apps/server/src/usage/UsageService.ts‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import {
55
type ServerSettings as ServerSettingsValue,
66
type UsageProviderKind,
77
type UsageSource,
8+
type UsagePriceInput,
9+
type UsagePriceResult,
810
type UsagePricing,
911
type UsageSummary,
1012
type UsageSummaryInput,
@@ -40,7 +42,12 @@ import type {
4042
UsageRecord,
4143
} from "@t3tools/provider-core/server/usage";
4244
import { canonicalModelFilter, resolveModelAliases, UsageAggregator } from "./usageAggregation.ts";
43-
import { createOverrideRateTable, parseRateTable, type RateTable } from "./usagePricing.ts";
45+
import {
46+
createOverrideRateTable,
47+
parseRateTable,
48+
priceUsage,
49+
type RateTable,
50+
} from "./usagePricing.ts";
4451
import {
4552
listTranscriptFiles,
4653
readDirectoryVolumeId,
@@ -144,6 +151,7 @@ export class UsageService extends Context.Service<
144151
{
145152
readonly readSummary: (input: UsageSummaryInput) => Effect.Effect<UsageSummary, UsageReadError>;
146153
readonly refreshRates: Effect.Effect<UsagePricing>;
154+
readonly priceUsage: (input: UsagePriceInput) => Effect.Effect<UsagePriceResult>;
147155
}
148156
>()("t3/usage/UsageService") {}
149157

@@ -935,7 +943,35 @@ export const make = Effect.gen(function* () {
935943
return yield* Deferred.await(deferred);
936944
});
937945

938-
return { readSummary, refreshRates, awaitPersisted } as const;
946+
const priceUsageItems = Effect.fn("UsageService.priceUsage")(function* (input: UsagePriceInput) {
947+
const settings = yield* readSettings;
948+
yield* ensureRates(false);
949+
const overrides = createOverrideRateTable(settings.usagePriceOverrides);
950+
const aliases = resolveModelAliases(settings.usageModelAliases);
951+
return {
952+
items: input.items.map((item) => {
953+
const model = aliases.get(item.model) ?? item.model;
954+
const priced = priceUsage(
955+
rates,
956+
{
957+
model,
958+
totals: item.totals,
959+
speed: "standard",
960+
reportedCostUsd: null,
961+
},
962+
overrides,
963+
);
964+
return {
965+
id: item.id,
966+
costUsd: priced.costUsd,
967+
costSource: priced.costSource,
968+
};
969+
}),
970+
pricing: pricing(),
971+
} satisfies UsagePriceResult;
972+
});
973+
974+
return { readSummary, refreshRates, priceUsage: priceUsageItems, awaitPersisted } as const;
939975
});
940976

941977
export const layer = Layer.effect(UsageService, make);

‎apps/server/src/ws.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2673,6 +2673,7 @@ export const layerWsRpc = (
26732673
resourceTelemetry.readHistory(input),
26742674
[WS_METHODS.serverGetUsageSummary]: (input) => usage.readSummary(input),
26752675
[WS_METHODS.serverRefreshUsageRates]: (_input) => usage.refreshRates,
2676+
[WS_METHODS.serverPriceUsage]: (input) => usage.priceUsage(input),
26762677
[WS_METHODS.serverRetryResourceTelemetry]: (_input) => resourceTelemetry.retry,
26772678
[WS_METHODS.serverCheckOtlpEndpoint]: (input) => otlpEndpointCheck.check(input),
26782679
[WS_METHODS.serverPrepareTriage]: (input) => triage.prepare(input),

0 commit comments

Comments
 (0)