aigetwey 1.3.0 → 1.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -0
- package/README.md +4 -2
- package/assets/screenshot.png +0 -0
- package/dashboard/src/app/layout.tsx +3 -2
- package/dashboard/src/components/LogTable.tsx +4 -1
- package/dashboard/src/lib/gateway.ts +1 -0
- package/dist/adapters/gemini.js +1 -0
- package/dist/adapters/gemini.js.map +1 -1
- package/dist/adapters/openai.js +13 -1
- package/dist/adapters/openai.js.map +1 -1
- package/dist/core/handler.js +7 -2
- package/dist/core/handler.js.map +1 -1
- package/dist/db.js +34 -9
- package/dist/db.js.map +1 -1
- package/dist/stream/anthropic-stream.js +7 -0
- package/dist/stream/anthropic-stream.js.map +1 -1
- package/dist/stream/gemini-stream.js +2 -1
- package/dist/stream/gemini-stream.js.map +1 -1
- package/dist/stream/openai-stream.js +8 -1
- package/dist/stream/openai-stream.js.map +1 -1
- package/package.json +1 -1
- package/src/adapters/gemini.ts +2 -0
- package/src/adapters/openai.ts +18 -1
- package/src/core/handler.ts +7 -2
- package/src/db.ts +36 -9
- package/src/stream/anthropic-stream.ts +10 -1
- package/src/stream/chunk.ts +2 -0
- package/src/stream/gemini-stream.ts +3 -2
- package/src/stream/openai-stream.ts +10 -1
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,28 @@ All notable changes to **aigetwey** are documented here.
|
|
|
5
5
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
|
|
6
6
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
7
7
|
|
|
8
|
+
## [1.3.2] — 2026-06-26
|
|
9
|
+
|
|
10
|
+
### Fixed
|
|
11
|
+
- **Cache & reasoning token accounting** — OpenAI cached tokens
|
|
12
|
+
(`prompt_tokens_details.cached_tokens`) on both the streaming and non-streaming
|
|
13
|
+
paths, plus reasoning tokens on the non-streaming path (OpenAI
|
|
14
|
+
`completion_tokens_details.reasoning_tokens`, Gemini `thoughtsTokenCount`), were
|
|
15
|
+
dropped from the usage log. They are now flattened into the canonical usage so
|
|
16
|
+
cache and reasoning are recorded consistently across streaming and non-streaming
|
|
17
|
+
for every provider. The `tokens_in`/`tokens_out` reading is unchanged.
|
|
18
|
+
|
|
19
|
+
## [1.3.1] — 2026-06-26
|
|
20
|
+
|
|
21
|
+
### Added
|
|
22
|
+
- **Granular cost calculation** — cost now uses separate per-1M rates for
|
|
23
|
+
non-cached input, cache-read, output, and reasoning tokens instead of a flat
|
|
24
|
+
input/output split. Models with extended thinking (Claude Sonnet 4, o1, Gemini
|
|
25
|
+
thinking) are now tracked accurately.
|
|
26
|
+
- **Reasoning token extraction** — extracts `reasoning_tokens` from Anthropic
|
|
27
|
+
(`thinking_tokens`), OpenAI (`completion_tokens_details.reasoning_tokens`), and
|
|
28
|
+
Gemini (`thoughtsTokenCount`); stored in the usage log for future display.
|
|
29
|
+
|
|
8
30
|
## [1.3.0] — 2026-06-26
|
|
9
31
|
|
|
10
32
|
### Added
|
package/README.md
CHANGED
|
@@ -41,7 +41,8 @@ See [CHANGELOG.md](./CHANGELOG.md) for release history.
|
|
|
41
41
|
self-renewing monthly allowance; an expired key is refused with `403`.
|
|
42
42
|
- **Budgets + cost** — scoped spend caps (global/provider/model/key) over rolling
|
|
43
43
|
`5h`/`24h`/`7day`/`30day` windows anchored to when each budget was created, with a
|
|
44
|
-
live reset countdown and SQLite-backed usage/cost tracking.
|
|
44
|
+
live reset countdown and SQLite-backed usage/cost tracking. Cost uses separate
|
|
45
|
+
rates for input, cached-read, output, and reasoning tokens. The Budgets page
|
|
45
46
|
splits **Overall** caps from a **Keys** view that shows every key's spend.
|
|
46
47
|
- **Dashboard** — providers, combos, usage, budgets, CLI tools, a live server
|
|
47
48
|
console, and a settings page with a per-model pricing editor.
|
|
@@ -209,7 +210,8 @@ npm run build # compile to dist/
|
|
|
209
210
|
bulanan yang isi ulang otomatis); key yang kedaluwarsa ditolak `403`.
|
|
210
211
|
- **Budget + biaya** — batas spend berskop (global/provider/model/key) atas jendela
|
|
211
212
|
rolling `5h`/`24h`/`7day`/`30day` yang di-anchor ke saat budget dibuat, dengan
|
|
212
|
-
hitung mundur reset dan pelacakan pemakaian/biaya berbasis SQLite.
|
|
213
|
+
hitung mundur reset dan pelacakan pemakaian/biaya berbasis SQLite. Biaya dihitung
|
|
214
|
+
per jenis token (input, cached-read, output, reasoning). Halaman Budgets
|
|
213
215
|
memisah cap **Overall** dari tampilan **Keys** (pemakaian tiap key).
|
|
214
216
|
- **Dashboard** — providers, combos, usage, budgets, CLI tools, server console
|
|
215
217
|
live, dan halaman settings dengan editor harga per-model.
|
package/assets/screenshot.png
CHANGED
|
Binary file
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Metadata } from "next";
|
|
2
|
+
import Script from "next/script";
|
|
2
3
|
import { Inter, JetBrains_Mono } from "next/font/google";
|
|
3
4
|
import { ThemeProvider } from "@/components/ThemeProvider";
|
|
4
5
|
import { ToastProvider } from "@/components/ToastProvider";
|
|
@@ -14,13 +15,13 @@ export const metadata: Metadata = {
|
|
|
14
15
|
|
|
15
16
|
export default function RootLayout({ children }: { children: React.ReactNode }) {
|
|
16
17
|
return (
|
|
17
|
-
<html lang="en" className={`dark ${inter.variable} ${jetbrainsMono.variable}`}>
|
|
18
|
+
<html lang="en" className={`dark ${inter.variable} ${jetbrainsMono.variable}`} suppressHydrationWarning>
|
|
18
19
|
<head>
|
|
19
20
|
<link
|
|
20
21
|
rel="stylesheet"
|
|
21
22
|
href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@24,400,0,0&display=block"
|
|
22
23
|
/>
|
|
23
|
-
<
|
|
24
|
+
<Script id="theme-init" strategy="beforeInteractive">{`try{var t=localStorage.getItem("theme");if(t==="light")document.documentElement.className=document.documentElement.className.replace("dark","light")}catch(e){}`}</Script>
|
|
24
25
|
</head>
|
|
25
26
|
<body><ThemeProvider><ToastProvider>{children}</ToastProvider></ThemeProvider></body>
|
|
26
27
|
</html>
|
|
@@ -195,7 +195,7 @@ export function LogTable({ logs: initial }: { logs: UsageLog[] }) {
|
|
|
195
195
|
{l.status}
|
|
196
196
|
</Badge>
|
|
197
197
|
</Td>
|
|
198
|
-
<Td muted title={fmt.time(l.ts)}>
|
|
198
|
+
<Td muted title={fmt.time(l.ts)} suppressHydrationWarning>
|
|
199
199
|
{fmt.ago(l.ts)} ago
|
|
200
200
|
</Td>
|
|
201
201
|
<Td className="text-text">{l.alias}</Td>
|
|
@@ -236,16 +236,19 @@ function Td({
|
|
|
236
236
|
right,
|
|
237
237
|
title,
|
|
238
238
|
className,
|
|
239
|
+
suppressHydrationWarning,
|
|
239
240
|
}: {
|
|
240
241
|
children: React.ReactNode;
|
|
241
242
|
muted?: boolean;
|
|
242
243
|
right?: boolean;
|
|
243
244
|
title?: string;
|
|
244
245
|
className?: string;
|
|
246
|
+
suppressHydrationWarning?: boolean;
|
|
245
247
|
}) {
|
|
246
248
|
return (
|
|
247
249
|
<td
|
|
248
250
|
title={title}
|
|
251
|
+
suppressHydrationWarning={suppressHydrationWarning}
|
|
249
252
|
className={`whitespace-nowrap px-4 py-2.5 tnum text-[12.5px] ${right ? "text-right" : "text-left"} ${
|
|
250
253
|
muted ? "text-text-muted" : "text-text"
|
|
251
254
|
}${className ? ` ${className}` : ""}`}
|
package/dist/adapters/gemini.js
CHANGED
|
@@ -216,6 +216,7 @@ export function responseToCanonical(resp) {
|
|
|
216
216
|
completion_tokens: u.candidatesTokenCount ?? 0,
|
|
217
217
|
total_tokens: (u.promptTokenCount ?? 0) + (u.candidatesTokenCount ?? 0),
|
|
218
218
|
cached_tokens: u.cachedContentTokenCount,
|
|
219
|
+
reasoning_tokens: u.thoughtsTokenCount,
|
|
219
220
|
}
|
|
220
221
|
: undefined,
|
|
221
222
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../src/adapters/gemini.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../src/adapters/gemini.ts"],"names":[],"mappings":"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"}
|
package/dist/adapters/openai.js
CHANGED
|
@@ -5,7 +5,19 @@ export function requestFromCanonical(req) {
|
|
|
5
5
|
return req;
|
|
6
6
|
}
|
|
7
7
|
export function responseToCanonical(resp) {
|
|
8
|
-
|
|
8
|
+
const r = resp;
|
|
9
|
+
// Flatten OpenAI usage detail fields into the canonical flat shape so non-stream
|
|
10
|
+
// requests also record cached/reasoning tokens.
|
|
11
|
+
const u = r?.usage;
|
|
12
|
+
if (u) {
|
|
13
|
+
if (u.cached_tokens === undefined && u.prompt_tokens_details?.cached_tokens !== undefined) {
|
|
14
|
+
u.cached_tokens = u.prompt_tokens_details.cached_tokens;
|
|
15
|
+
}
|
|
16
|
+
if (u.reasoning_tokens === undefined && u.completion_tokens_details?.reasoning_tokens !== undefined) {
|
|
17
|
+
u.reasoning_tokens = u.completion_tokens_details.reasoning_tokens;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
return r;
|
|
9
21
|
}
|
|
10
22
|
export function responseFromCanonical(resp) {
|
|
11
23
|
return resp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/adapters/openai.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,kBAAkB,CAAC,IAAa;IAC9C,OAAO,IAAwB,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAqB;IACxD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAa;IAC/C,
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/adapters/openai.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,kBAAkB,CAAC,IAAa;IAC9C,OAAO,IAAwB,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAqB;IACxD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAa;IAC/C,MAAM,CAAC,GAAG,IAAyB,CAAC;IACpC,iFAAiF;IACjF,gDAAgD;IAChD,MAAM,CAAC,GAAG,CAAC,EAAE,KAKA,CAAC;IACd,IAAI,CAAC,EAAE,CAAC;QACN,IAAI,CAAC,CAAC,aAAa,KAAK,SAAS,IAAI,CAAC,CAAC,qBAAqB,EAAE,aAAa,KAAK,SAAS,EAAE,CAAC;YAC1F,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,qBAAqB,CAAC,aAAa,CAAC;QAC1D,CAAC;QACD,IAAI,CAAC,CAAC,gBAAgB,KAAK,SAAS,IAAI,CAAC,CAAC,yBAAyB,EAAE,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACpG,CAAC,CAAC,gBAAgB,GAAG,CAAC,CAAC,yBAAyB,CAAC,gBAAgB,CAAC;QACpE,CAAC;IACH,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAuB;IAC3D,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/dist/core/handler.js
CHANGED
|
@@ -20,6 +20,8 @@ export class GatewayError extends Error {
|
|
|
20
20
|
function recordUsage(deps, route, usage, status, latencyMs, stream) {
|
|
21
21
|
const tokensIn = usage?.prompt_tokens ?? 0;
|
|
22
22
|
const tokensOut = usage?.completion_tokens ?? 0;
|
|
23
|
+
const reasoningTokens = usage?.reasoning_tokens ?? 0;
|
|
24
|
+
const cachedTokens = usage?.cached_tokens ?? 0;
|
|
23
25
|
if (!deps.db)
|
|
24
26
|
return;
|
|
25
27
|
// Cost: a combo/route may set explicit prices; otherwise fall back to the ported
|
|
@@ -27,14 +29,17 @@ function recordUsage(deps, route, usage, status, latencyMs, stream) {
|
|
|
27
29
|
const pricing = getPricingForModel(route.provider.id, route.model);
|
|
28
30
|
const priceIn = route.price_in ?? pricing?.input;
|
|
29
31
|
const priceOut = route.price_out ?? pricing?.output;
|
|
32
|
+
const priceCachedRead = pricing?.cached;
|
|
33
|
+
const priceReasoning = pricing?.reasoning;
|
|
30
34
|
deps.db.record({
|
|
31
35
|
alias: route.alias,
|
|
32
36
|
provider: route.provider.id,
|
|
33
37
|
model: route.model,
|
|
34
38
|
tokens_in: tokensIn,
|
|
35
39
|
tokens_out: tokensOut,
|
|
36
|
-
|
|
37
|
-
|
|
40
|
+
reasoning_tokens: reasoningTokens,
|
|
41
|
+
cached_tokens: cachedTokens,
|
|
42
|
+
cost: computeCost(tokensIn, tokensOut, priceIn, priceOut, priceReasoning, priceCachedRead, cachedTokens, reasoningTokens),
|
|
38
43
|
status,
|
|
39
44
|
latency_ms: latencyMs,
|
|
40
45
|
stream: stream ? 1 : 0,
|
package/dist/core/handler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/core/handler.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAgB,WAAW,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAuB,MAAM,kCAAkC,CAAC;AACrG,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAU7D,MAAM,OAAO,YAAa,SAAQ,KAAK;IAE1B;IACA;IAFX,YACW,MAAc,EACd,OAAgB;QAEzB,KAAK,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QAH9D,WAAM,GAAN,MAAM,CAAQ;QACd,YAAO,GAAP,OAAO,CAAS;IAG3B,CAAC;CACF;AAiBD,SAAS,WAAW,CAClB,IAAgB,EAChB,KAAoB,EACpB,KAAiC,EACjC,MAAc,EACd,SAAiB,EACjB,MAAe;IAEf,MAAM,QAAQ,GAAG,KAAK,EAAE,aAAa,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,KAAK,EAAE,iBAAiB,IAAI,CAAC,CAAC;IAChD,IAAI,CAAC,IAAI,CAAC,EAAE;QAAE,OAAO;IACrB,iFAAiF;IACjF,gFAAgF;IAChF,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACnE,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,IAAI,OAAO,EAAE,KAAK,CAAC;IACjD,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,IAAI,OAAO,EAAE,MAAM,CAAC;IACpD,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC;QACb,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE;QAC3B,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,SAAS,EAAE,QAAQ;QACnB,UAAU,EAAE,SAAS;QACrB,
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/core/handler.ts"],"names":[],"mappings":"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"}
|
package/dist/db.js
CHANGED
|
@@ -29,6 +29,7 @@ export class UsageDB {
|
|
|
29
29
|
model TEXT NOT NULL,
|
|
30
30
|
tokens_in INTEGER NOT NULL DEFAULT 0,
|
|
31
31
|
tokens_out INTEGER NOT NULL DEFAULT 0,
|
|
32
|
+
reasoning_tokens INTEGER NOT NULL DEFAULT 0,
|
|
32
33
|
cached_tokens INTEGER NOT NULL DEFAULT 0,
|
|
33
34
|
cost REAL NOT NULL DEFAULT 0,
|
|
34
35
|
status INTEGER NOT NULL,
|
|
@@ -59,10 +60,13 @@ export class UsageDB {
|
|
|
59
60
|
if (!cols.some((c) => String(c.name) === "client_key")) {
|
|
60
61
|
this.db.exec(`ALTER TABLE usage ADD COLUMN client_key TEXT NOT NULL DEFAULT ''`);
|
|
61
62
|
}
|
|
63
|
+
if (!cols.some((c) => String(c.name) === "reasoning_tokens")) {
|
|
64
|
+
this.db.exec(`ALTER TABLE usage ADD COLUMN reasoning_tokens INTEGER NOT NULL DEFAULT 0`);
|
|
65
|
+
}
|
|
62
66
|
this.now = now;
|
|
63
67
|
this.insertUsage = this.db.prepare(`
|
|
64
|
-
INSERT INTO usage (ts, alias, provider, model, tokens_in, tokens_out, cached_tokens, cost, status, latency_ms, stream, client_key)
|
|
65
|
-
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
68
|
+
INSERT INTO usage (ts, alias, provider, model, tokens_in, tokens_out, reasoning_tokens, cached_tokens, cost, status, latency_ms, stream, client_key)
|
|
69
|
+
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
66
70
|
`);
|
|
67
71
|
this.insertLog = this.db.prepare(`
|
|
68
72
|
INSERT INTO logs (ts, direction, provider, status, request_summary, response_summary)
|
|
@@ -70,7 +74,7 @@ export class UsageDB {
|
|
|
70
74
|
`);
|
|
71
75
|
}
|
|
72
76
|
record(row) {
|
|
73
|
-
this.insertUsage.run(row.ts ?? this.now(), row.alias, row.provider, row.model, row.tokens_in, row.tokens_out, row.cached_tokens, row.cost, row.status, row.latency_ms, row.stream, row.client_key ?? "");
|
|
77
|
+
this.insertUsage.run(row.ts ?? this.now(), row.alias, row.provider, row.model, row.tokens_in, row.tokens_out, row.reasoning_tokens ?? 0, row.cached_tokens, row.cost, row.status, row.latency_ms, row.stream, row.client_key ?? "");
|
|
74
78
|
}
|
|
75
79
|
log(row) {
|
|
76
80
|
this.insertLog.run(row.ts ?? this.now(), row.direction, row.provider, row.status, row.request_summary, row.response_summary);
|
|
@@ -175,7 +179,7 @@ export class UsageDB {
|
|
|
175
179
|
/** Most recent usage rows, newest first. For the dashboard logs page. */
|
|
176
180
|
recent(limit = 100) {
|
|
177
181
|
const rows = this.db
|
|
178
|
-
.prepare(`SELECT ts, alias, provider, model, tokens_in, tokens_out, cached_tokens,
|
|
182
|
+
.prepare(`SELECT ts, alias, provider, model, tokens_in, tokens_out, reasoning_tokens, cached_tokens,
|
|
179
183
|
cost, status, latency_ms, stream, client_key
|
|
180
184
|
FROM usage ORDER BY id DESC LIMIT ?`)
|
|
181
185
|
.all(Math.max(1, Math.min(limit, 1000)));
|
|
@@ -186,6 +190,7 @@ export class UsageDB {
|
|
|
186
190
|
model: String(r.model),
|
|
187
191
|
tokens_in: num(r.tokens_in),
|
|
188
192
|
tokens_out: num(r.tokens_out),
|
|
193
|
+
reasoning_tokens: num(r.reasoning_tokens),
|
|
189
194
|
cached_tokens: num(r.cached_tokens),
|
|
190
195
|
cost: num(r.cost),
|
|
191
196
|
status: num(r.status),
|
|
@@ -198,10 +203,30 @@ export class UsageDB {
|
|
|
198
203
|
this.db.close();
|
|
199
204
|
}
|
|
200
205
|
}
|
|
201
|
-
/** Compute USD cost from token counts and per-1M prices. */
|
|
202
|
-
export function computeCost(tokensIn, tokensOut, priceIn, priceOut) {
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
+
/** Compute USD cost from token counts and per-1M prices. Separate rates for input (non-cache), cache_read, output, reasoning. */
|
|
207
|
+
export function computeCost(tokensIn, tokensOut, priceIn, priceOut, priceReasoning, priceCachedRead, cachedTokens, reasoningTokens) {
|
|
208
|
+
let cost = 0;
|
|
209
|
+
// Non-cached input (input minus cache_read)
|
|
210
|
+
const nonCachedInput = Math.max(0, tokensIn - (cachedTokens ?? 0));
|
|
211
|
+
if (priceIn)
|
|
212
|
+
cost += (nonCachedInput / 1_000_000) * priceIn;
|
|
213
|
+
// Cached read — uses separate rate or falls back to input rate
|
|
214
|
+
if (cachedTokens && priceCachedRead) {
|
|
215
|
+
cost += (cachedTokens / 1_000_000) * priceCachedRead;
|
|
216
|
+
}
|
|
217
|
+
else if (cachedTokens && priceIn) {
|
|
218
|
+
cost += (cachedTokens / 1_000_000) * priceIn;
|
|
219
|
+
}
|
|
220
|
+
// Output completion
|
|
221
|
+
if (priceOut)
|
|
222
|
+
cost += (tokensOut / 1_000_000) * priceOut;
|
|
223
|
+
// Reasoning tokens — uses dedicated rate or falls back to output rate
|
|
224
|
+
if (reasoningTokens) {
|
|
225
|
+
if (priceReasoning)
|
|
226
|
+
cost += (reasoningTokens / 1_000_000) * priceReasoning;
|
|
227
|
+
else if (priceOut)
|
|
228
|
+
cost += (reasoningTokens / 1_000_000) * priceOut;
|
|
229
|
+
}
|
|
230
|
+
return cost;
|
|
206
231
|
}
|
|
207
232
|
//# sourceMappingURL=db.js.map
|
package/dist/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,2EAA2E;AAC3E,4EAA4E;AAC5E,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,aAAa,CAEpE,CAAC;
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ export async function* streamToCanonical(events) {
|
|
|
5
5
|
toolIndexByBlock: new Map(),
|
|
6
6
|
nextToolIndex: 0,
|
|
7
7
|
promptTokens: 0,
|
|
8
|
+
completionTokens: 0,
|
|
8
9
|
};
|
|
9
10
|
for await (const ev of events) {
|
|
10
11
|
const data = ev.data.trim();
|
|
@@ -26,14 +27,18 @@ export async function* streamToCanonical(events) {
|
|
|
26
27
|
const u = message?.usage;
|
|
27
28
|
if (u) {
|
|
28
29
|
state.promptTokens = u.input_tokens ?? 0;
|
|
30
|
+
state.completionTokens = u.output_tokens ?? 0;
|
|
31
|
+
state.reasoningTokens = u.thinking_tokens ?? 0;
|
|
29
32
|
state.cachedTokens = u.cache_read_input_tokens;
|
|
30
33
|
state.cacheCreationTokens = u.cache_creation_input_tokens;
|
|
31
34
|
}
|
|
32
35
|
const startChunk = baseChunk(state, { role: "assistant", content: "" }, null);
|
|
33
36
|
startChunk.usage = {
|
|
34
37
|
prompt_tokens: state.promptTokens,
|
|
38
|
+
completion_tokens: state.completionTokens,
|
|
35
39
|
cached_tokens: state.cachedTokens,
|
|
36
40
|
cache_creation_tokens: state.cacheCreationTokens,
|
|
41
|
+
reasoning_tokens: state.reasoningTokens,
|
|
37
42
|
};
|
|
38
43
|
yield startChunk;
|
|
39
44
|
break;
|
|
@@ -62,6 +67,7 @@ export async function* streamToCanonical(events) {
|
|
|
62
67
|
yield baseChunk(state, { content: delta.text ?? "" }, null);
|
|
63
68
|
}
|
|
64
69
|
else if (delta?.type === "thinking_delta") {
|
|
70
|
+
state.reasoningTokens = (state.reasoningTokens ?? 0) + 1;
|
|
65
71
|
yield baseChunk(state, { reasoning: delta.thinking ?? "" }, null);
|
|
66
72
|
}
|
|
67
73
|
else if (delta?.type === "input_json_delta") {
|
|
@@ -86,6 +92,7 @@ export async function* streamToCanonical(events) {
|
|
|
86
92
|
completion_tokens: usage?.output_tokens ?? 0,
|
|
87
93
|
cached_tokens: state.cachedTokens,
|
|
88
94
|
cache_creation_tokens: state.cacheCreationTokens,
|
|
95
|
+
reasoning_tokens: usage?.thinking_tokens ?? state.reasoningTokens ?? 0,
|
|
89
96
|
};
|
|
90
97
|
yield chunk;
|
|
91
98
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic-stream.js","sourceRoot":"","sources":["../../src/stream/anthropic-stream.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"anthropic-stream.js","sourceRoot":"","sources":["../../src/stream/anthropic-stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,7 +62,8 @@ export async function* streamToCanonical(events) {
|
|
|
62
62
|
chunk.usage = {
|
|
63
63
|
prompt_tokens: usageMetadata.promptTokenCount ?? 0,
|
|
64
64
|
completion_tokens: usageMetadata.candidatesTokenCount ?? 0,
|
|
65
|
-
cached_tokens: usageMetadata.cachedContentTokenCount,
|
|
65
|
+
cached_tokens: usageMetadata.cachedContentTokenCount ?? 0,
|
|
66
|
+
reasoning_tokens: usageMetadata.thoughtsTokenCount ?? 0,
|
|
66
67
|
};
|
|
67
68
|
}
|
|
68
69
|
yield chunk;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini-stream.js","sourceRoot":"","sources":["../../src/stream/gemini-stream.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"gemini-stream.js","sourceRoot":"","sources":["../../src/stream/gemini-stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,6 @@ export async function* streamToCanonical(events) {
|
|
|
16
16
|
/** Lift vendor reasoning fields into the canonical `delta.reasoning`. */
|
|
17
17
|
function normalize(chunk) {
|
|
18
18
|
for (const choice of chunk.choices ?? []) {
|
|
19
|
-
// a finish_reason chunk carries no `delta`; skip it (and any delta-less choice).
|
|
20
19
|
const d = choice.delta;
|
|
21
20
|
if (!d)
|
|
22
21
|
continue;
|
|
@@ -26,6 +25,14 @@ function normalize(chunk) {
|
|
|
26
25
|
d.reasoning = vendor;
|
|
27
26
|
}
|
|
28
27
|
}
|
|
28
|
+
// Extract reasoning_tokens from OpenAI response.usage.completion_tokens_details.reasoning_tokens
|
|
29
|
+
if (chunk.usage?.completion_tokens_details?.reasoning_tokens !== undefined) {
|
|
30
|
+
chunk.usage.reasoning_tokens = chunk.usage.completion_tokens_details.reasoning_tokens;
|
|
31
|
+
}
|
|
32
|
+
// Extract cached_tokens from OpenAI response.usage.prompt_tokens_details.cached_tokens
|
|
33
|
+
if (chunk.usage?.prompt_tokens_details?.cached_tokens !== undefined) {
|
|
34
|
+
chunk.usage.cached_tokens = chunk.usage.prompt_tokens_details.cached_tokens;
|
|
35
|
+
}
|
|
29
36
|
return chunk;
|
|
30
37
|
}
|
|
31
38
|
export async function* streamFromCanonical(chunks) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-stream.js","sourceRoot":"","sources":["../../src/stream/openai-stream.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,iBAAiB,CAAC,MAA+B;IACtE,IAAI,KAAK,EAAE,MAAM,EAAE,IAAI,MAAM,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,QAAQ;YAAE,SAAS;QACzC,IAAI,MAAe,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,MAAM,SAAS,CAAC,MAAwB,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC;AAED,yEAAyE;AACzE,SAAS,SAAS,CAAC,KAAqB;IACtC,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;QACzC,
|
|
1
|
+
{"version":3,"file":"openai-stream.js","sourceRoot":"","sources":["../../src/stream/openai-stream.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,iBAAiB,CAAC,MAA+B;IACtE,IAAI,KAAK,EAAE,MAAM,EAAE,IAAI,MAAM,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,QAAQ;YAAE,SAAS;QACzC,IAAI,MAAe,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,MAAM,SAAS,CAAC,MAAwB,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC;AAED,yEAAyE;AACzE,SAAS,SAAS,CAAC,KAAqB;IACtC,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;QACzC,MAAM,CAAC,GAAG,MAAM,CAAC,KAAuE,CAAC;QACzF,IAAI,CAAC,CAAC;YAAE,SAAS;QACjB,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,MAAM,GAAI,CAAC,CAAC,mBAAmB,CAAwB,IAAK,CAAC,CAAC,WAAW,CAAwB,CAAC;YACxG,IAAI,MAAM;gBAAE,CAAC,CAAC,SAAS,GAAG,MAAM,CAAC;QACnC,CAAC;IACH,CAAC;IAED,iGAAiG;IACjG,IAAI,KAAK,CAAC,KAAK,EAAE,yBAAyB,EAAE,gBAAgB,KAAK,SAAS,EAAE,CAAC;QAC3E,KAAK,CAAC,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC,KAAK,CAAC,yBAAyB,CAAC,gBAAgB,CAAC;IACxF,CAAC;IACD,uFAAuF;IACvF,IAAI,KAAK,CAAC,KAAK,EAAE,qBAAqB,EAAE,aAAa,KAAK,SAAS,EAAE,CAAC;QACpE,KAAK,CAAC,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC,aAAa,CAAC;IAC9E,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,mBAAmB,CAAC,MAAqC;IAC9E,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;IACxC,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AAC3B,CAAC"}
|
package/package.json
CHANGED
package/src/adapters/gemini.ts
CHANGED
|
@@ -67,6 +67,7 @@ interface GeminiResponse {
|
|
|
67
67
|
promptTokenCount?: number;
|
|
68
68
|
candidatesTokenCount?: number;
|
|
69
69
|
cachedContentTokenCount?: number;
|
|
70
|
+
thoughtsTokenCount?: number;
|
|
70
71
|
};
|
|
71
72
|
modelVersion?: string;
|
|
72
73
|
}
|
|
@@ -289,6 +290,7 @@ export function responseToCanonical(resp: unknown): CanonicalResponse {
|
|
|
289
290
|
completion_tokens: u.candidatesTokenCount ?? 0,
|
|
290
291
|
total_tokens: (u.promptTokenCount ?? 0) + (u.candidatesTokenCount ?? 0),
|
|
291
292
|
cached_tokens: u.cachedContentTokenCount,
|
|
293
|
+
reasoning_tokens: u.thoughtsTokenCount,
|
|
292
294
|
}
|
|
293
295
|
: undefined,
|
|
294
296
|
};
|
package/src/adapters/openai.ts
CHANGED
|
@@ -14,7 +14,24 @@ export function requestFromCanonical(req: CanonicalRequest): unknown {
|
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
export function responseToCanonical(resp: unknown): CanonicalResponse {
|
|
17
|
-
|
|
17
|
+
const r = resp as CanonicalResponse;
|
|
18
|
+
// Flatten OpenAI usage detail fields into the canonical flat shape so non-stream
|
|
19
|
+
// requests also record cached/reasoning tokens.
|
|
20
|
+
const u = r?.usage as
|
|
21
|
+
| (NonNullable<CanonicalResponse["usage"]> & {
|
|
22
|
+
prompt_tokens_details?: { cached_tokens?: number };
|
|
23
|
+
completion_tokens_details?: { reasoning_tokens?: number };
|
|
24
|
+
})
|
|
25
|
+
| undefined;
|
|
26
|
+
if (u) {
|
|
27
|
+
if (u.cached_tokens === undefined && u.prompt_tokens_details?.cached_tokens !== undefined) {
|
|
28
|
+
u.cached_tokens = u.prompt_tokens_details.cached_tokens;
|
|
29
|
+
}
|
|
30
|
+
if (u.reasoning_tokens === undefined && u.completion_tokens_details?.reasoning_tokens !== undefined) {
|
|
31
|
+
u.reasoning_tokens = u.completion_tokens_details.reasoning_tokens;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return r;
|
|
18
35
|
}
|
|
19
36
|
|
|
20
37
|
export function responseFromCanonical(resp: CanonicalResponse): unknown {
|
package/src/core/handler.ts
CHANGED
|
@@ -70,20 +70,25 @@ function recordUsage(
|
|
|
70
70
|
): void {
|
|
71
71
|
const tokensIn = usage?.prompt_tokens ?? 0;
|
|
72
72
|
const tokensOut = usage?.completion_tokens ?? 0;
|
|
73
|
+
const reasoningTokens = usage?.reasoning_tokens ?? 0;
|
|
74
|
+
const cachedTokens = usage?.cached_tokens ?? 0;
|
|
73
75
|
if (!deps.db) return;
|
|
74
76
|
// Cost: a combo/route may set explicit prices; otherwise fall back to the ported
|
|
75
77
|
// aigetwey pricing table so cost auto-resolves per model instead of showing $0.
|
|
76
78
|
const pricing = getPricingForModel(route.provider.id, route.model);
|
|
77
79
|
const priceIn = route.price_in ?? pricing?.input;
|
|
78
80
|
const priceOut = route.price_out ?? pricing?.output;
|
|
81
|
+
const priceCachedRead = pricing?.cached;
|
|
82
|
+
const priceReasoning = pricing?.reasoning;
|
|
79
83
|
deps.db.record({
|
|
80
84
|
alias: route.alias,
|
|
81
85
|
provider: route.provider.id,
|
|
82
86
|
model: route.model,
|
|
83
87
|
tokens_in: tokensIn,
|
|
84
88
|
tokens_out: tokensOut,
|
|
85
|
-
|
|
86
|
-
|
|
89
|
+
reasoning_tokens: reasoningTokens,
|
|
90
|
+
cached_tokens: cachedTokens,
|
|
91
|
+
cost: computeCost(tokensIn, tokensOut, priceIn, priceOut, priceReasoning, priceCachedRead, cachedTokens, reasoningTokens),
|
|
87
92
|
status,
|
|
88
93
|
latency_ms: latencyMs,
|
|
89
94
|
stream: stream ? 1 : 0,
|
package/src/db.ts
CHANGED
|
@@ -22,6 +22,7 @@ export interface UsageRow {
|
|
|
22
22
|
model: string;
|
|
23
23
|
tokens_in: number;
|
|
24
24
|
tokens_out: number;
|
|
25
|
+
reasoning_tokens: number;
|
|
25
26
|
cached_tokens: number;
|
|
26
27
|
cost: number;
|
|
27
28
|
status: number;
|
|
@@ -81,6 +82,7 @@ export class UsageDB {
|
|
|
81
82
|
model TEXT NOT NULL,
|
|
82
83
|
tokens_in INTEGER NOT NULL DEFAULT 0,
|
|
83
84
|
tokens_out INTEGER NOT NULL DEFAULT 0,
|
|
85
|
+
reasoning_tokens INTEGER NOT NULL DEFAULT 0,
|
|
84
86
|
cached_tokens INTEGER NOT NULL DEFAULT 0,
|
|
85
87
|
cost REAL NOT NULL DEFAULT 0,
|
|
86
88
|
status INTEGER NOT NULL,
|
|
@@ -111,10 +113,13 @@ export class UsageDB {
|
|
|
111
113
|
if (!cols.some((c) => String(c.name) === "client_key")) {
|
|
112
114
|
this.db.exec(`ALTER TABLE usage ADD COLUMN client_key TEXT NOT NULL DEFAULT ''`);
|
|
113
115
|
}
|
|
116
|
+
if (!cols.some((c) => String(c.name) === "reasoning_tokens")) {
|
|
117
|
+
this.db.exec(`ALTER TABLE usage ADD COLUMN reasoning_tokens INTEGER NOT NULL DEFAULT 0`);
|
|
118
|
+
}
|
|
114
119
|
this.now = now;
|
|
115
120
|
this.insertUsage = this.db.prepare(`
|
|
116
|
-
INSERT INTO usage (ts, alias, provider, model, tokens_in, tokens_out, cached_tokens, cost, status, latency_ms, stream, client_key)
|
|
117
|
-
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
121
|
+
INSERT INTO usage (ts, alias, provider, model, tokens_in, tokens_out, reasoning_tokens, cached_tokens, cost, status, latency_ms, stream, client_key)
|
|
122
|
+
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
118
123
|
`);
|
|
119
124
|
this.insertLog = this.db.prepare(`
|
|
120
125
|
INSERT INTO logs (ts, direction, provider, status, request_summary, response_summary)
|
|
@@ -122,7 +127,7 @@ export class UsageDB {
|
|
|
122
127
|
`);
|
|
123
128
|
}
|
|
124
129
|
|
|
125
|
-
record(row: Omit<UsageRow, "ts" | "client_key"> & { ts?: number; client_key?: string }): void {
|
|
130
|
+
record(row: Omit<UsageRow, "ts" | "client_key" | "reasoning_tokens"> & { ts?: number; client_key?: string; reasoning_tokens?: number }): void {
|
|
126
131
|
this.insertUsage.run(
|
|
127
132
|
row.ts ?? this.now(),
|
|
128
133
|
row.alias,
|
|
@@ -130,6 +135,7 @@ export class UsageDB {
|
|
|
130
135
|
row.model,
|
|
131
136
|
row.tokens_in,
|
|
132
137
|
row.tokens_out,
|
|
138
|
+
row.reasoning_tokens ?? 0,
|
|
133
139
|
row.cached_tokens,
|
|
134
140
|
row.cost,
|
|
135
141
|
row.status,
|
|
@@ -268,7 +274,7 @@ export class UsageDB {
|
|
|
268
274
|
recent(limit = 100): UsageRow[] {
|
|
269
275
|
const rows = this.db
|
|
270
276
|
.prepare(
|
|
271
|
-
`SELECT ts, alias, provider, model, tokens_in, tokens_out, cached_tokens,
|
|
277
|
+
`SELECT ts, alias, provider, model, tokens_in, tokens_out, reasoning_tokens, cached_tokens,
|
|
272
278
|
cost, status, latency_ms, stream, client_key
|
|
273
279
|
FROM usage ORDER BY id DESC LIMIT ?`,
|
|
274
280
|
)
|
|
@@ -280,6 +286,7 @@ export class UsageDB {
|
|
|
280
286
|
model: String(r.model),
|
|
281
287
|
tokens_in: num(r.tokens_in),
|
|
282
288
|
tokens_out: num(r.tokens_out),
|
|
289
|
+
reasoning_tokens: num(r.reasoning_tokens),
|
|
283
290
|
cached_tokens: num(r.cached_tokens),
|
|
284
291
|
cost: num(r.cost),
|
|
285
292
|
status: num(r.status),
|
|
@@ -294,9 +301,29 @@ export class UsageDB {
|
|
|
294
301
|
}
|
|
295
302
|
}
|
|
296
303
|
|
|
297
|
-
/** Compute USD cost from token counts and per-1M prices. */
|
|
298
|
-
export function computeCost(tokensIn: number, tokensOut: number, priceIn?: number, priceOut?: number): number {
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
304
|
+
/** Compute USD cost from token counts and per-1M prices. Separate rates for input (non-cache), cache_read, output, reasoning. */
|
|
305
|
+
export function computeCost(tokensIn: number, tokensOut: number, priceIn?: number, priceOut?: number, priceReasoning?: number, priceCachedRead?: number, cachedTokens?: number, reasoningTokens?: number): number {
|
|
306
|
+
let cost = 0;
|
|
307
|
+
|
|
308
|
+
// Non-cached input (input minus cache_read)
|
|
309
|
+
const nonCachedInput = Math.max(0, tokensIn - (cachedTokens ?? 0));
|
|
310
|
+
if (priceIn) cost += (nonCachedInput / 1_000_000) * priceIn;
|
|
311
|
+
|
|
312
|
+
// Cached read — uses separate rate or falls back to input rate
|
|
313
|
+
if (cachedTokens && priceCachedRead) {
|
|
314
|
+
cost += (cachedTokens / 1_000_000) * priceCachedRead;
|
|
315
|
+
} else if (cachedTokens && priceIn) {
|
|
316
|
+
cost += (cachedTokens / 1_000_000) * priceIn;
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
// Output completion
|
|
320
|
+
if (priceOut) cost += (tokensOut / 1_000_000) * priceOut;
|
|
321
|
+
|
|
322
|
+
// Reasoning tokens — uses dedicated rate or falls back to output rate
|
|
323
|
+
if (reasoningTokens) {
|
|
324
|
+
if (priceReasoning) cost += (reasoningTokens / 1_000_000) * priceReasoning;
|
|
325
|
+
else if (priceOut) cost += (reasoningTokens / 1_000_000) * priceOut;
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
return cost;
|
|
302
329
|
}
|
|
@@ -25,8 +25,10 @@ interface AnthStreamState {
|
|
|
25
25
|
toolIndexByBlock: Map<number, number>;
|
|
26
26
|
nextToolIndex: number;
|
|
27
27
|
promptTokens: number;
|
|
28
|
+
completionTokens: number;
|
|
28
29
|
cachedTokens?: number;
|
|
29
30
|
cacheCreationTokens?: number;
|
|
31
|
+
reasoningTokens?: number;
|
|
30
32
|
}
|
|
31
33
|
|
|
32
34
|
export async function* streamToCanonical(events: AsyncIterable<SSEEvent>): AsyncGenerator<CanonicalChunk> {
|
|
@@ -36,6 +38,7 @@ export async function* streamToCanonical(events: AsyncIterable<SSEEvent>): Async
|
|
|
36
38
|
toolIndexByBlock: new Map(),
|
|
37
39
|
nextToolIndex: 0,
|
|
38
40
|
promptTokens: 0,
|
|
41
|
+
completionTokens: 0,
|
|
39
42
|
};
|
|
40
43
|
|
|
41
44
|
for await (const ev of events) {
|
|
@@ -60,14 +63,18 @@ export async function* streamToCanonical(events: AsyncIterable<SSEEvent>): Async
|
|
|
60
63
|
const u = message?.usage;
|
|
61
64
|
if (u) {
|
|
62
65
|
state.promptTokens = u.input_tokens ?? 0;
|
|
66
|
+
state.completionTokens = u.output_tokens ?? 0;
|
|
67
|
+
state.reasoningTokens = u.thinking_tokens ?? 0;
|
|
63
68
|
state.cachedTokens = u.cache_read_input_tokens;
|
|
64
69
|
state.cacheCreationTokens = u.cache_creation_input_tokens;
|
|
65
70
|
}
|
|
66
71
|
const startChunk = baseChunk(state, { role: "assistant", content: "" }, null);
|
|
67
72
|
startChunk.usage = {
|
|
68
73
|
prompt_tokens: state.promptTokens,
|
|
74
|
+
completion_tokens: state.completionTokens,
|
|
69
75
|
cached_tokens: state.cachedTokens,
|
|
70
76
|
cache_creation_tokens: state.cacheCreationTokens,
|
|
77
|
+
reasoning_tokens: state.reasoningTokens,
|
|
71
78
|
};
|
|
72
79
|
yield startChunk;
|
|
73
80
|
break;
|
|
@@ -99,6 +106,7 @@ export async function* streamToCanonical(events: AsyncIterable<SSEEvent>): Async
|
|
|
99
106
|
if (delta?.type === "text_delta") {
|
|
100
107
|
yield baseChunk(state, { content: delta.text ?? "" }, null);
|
|
101
108
|
} else if (delta?.type === "thinking_delta") {
|
|
109
|
+
state.reasoningTokens = (state.reasoningTokens ?? 0) + 1;
|
|
102
110
|
yield baseChunk(state, { reasoning: delta.thinking ?? "" }, null);
|
|
103
111
|
} else if (delta?.type === "input_json_delta") {
|
|
104
112
|
const toolIndex = state.toolIndexByBlock.get(index);
|
|
@@ -115,7 +123,7 @@ export async function* streamToCanonical(events: AsyncIterable<SSEEvent>): Async
|
|
|
115
123
|
|
|
116
124
|
case "message_delta": {
|
|
117
125
|
const delta = msg.delta as { stop_reason?: string | null } | undefined;
|
|
118
|
-
const usage = msg.usage as { output_tokens?: number } | undefined;
|
|
126
|
+
const usage = msg.usage as { output_tokens?: number; thinking_tokens?: number } | undefined;
|
|
119
127
|
const finish = mapStopReason(delta?.stop_reason);
|
|
120
128
|
const chunk = baseChunk(state, {}, finish);
|
|
121
129
|
chunk.usage = {
|
|
@@ -123,6 +131,7 @@ export async function* streamToCanonical(events: AsyncIterable<SSEEvent>): Async
|
|
|
123
131
|
completion_tokens: usage?.output_tokens ?? 0,
|
|
124
132
|
cached_tokens: state.cachedTokens,
|
|
125
133
|
cache_creation_tokens: state.cacheCreationTokens,
|
|
134
|
+
reasoning_tokens: usage?.thinking_tokens ?? state.reasoningTokens ?? 0,
|
|
126
135
|
};
|
|
127
136
|
yield chunk;
|
|
128
137
|
break;
|
package/src/stream/chunk.ts
CHANGED
|
@@ -29,6 +29,8 @@ export interface CanonicalChunkUsage {
|
|
|
29
29
|
cached_tokens?: number;
|
|
30
30
|
cache_creation_tokens?: number;
|
|
31
31
|
reasoning_tokens?: number;
|
|
32
|
+
prompt_tokens_details?: { cached_tokens?: number };
|
|
33
|
+
completion_tokens_details?: { reasoning_tokens?: number };
|
|
32
34
|
}
|
|
33
35
|
|
|
34
36
|
export type ChunkFinishReason = "stop" | "length" | "tool_calls" | "content_filter" | null;
|
|
@@ -76,7 +76,7 @@ export async function* streamToCanonical(events: AsyncIterable<SSEEvent>): Async
|
|
|
76
76
|
}
|
|
77
77
|
|
|
78
78
|
const usageMetadata = msg.usageMetadata as
|
|
79
|
-
| { promptTokenCount?: number; candidatesTokenCount?: number; cachedContentTokenCount?: number }
|
|
79
|
+
| { promptTokenCount?: number; candidatesTokenCount?: number; cachedContentTokenCount?: number; thoughtsTokenCount?: number }
|
|
80
80
|
| undefined;
|
|
81
81
|
if (cand?.finishReason || usageMetadata) {
|
|
82
82
|
const chunk = base({}, mapFinish(cand?.finishReason));
|
|
@@ -84,7 +84,8 @@ export async function* streamToCanonical(events: AsyncIterable<SSEEvent>): Async
|
|
|
84
84
|
chunk.usage = {
|
|
85
85
|
prompt_tokens: usageMetadata.promptTokenCount ?? 0,
|
|
86
86
|
completion_tokens: usageMetadata.candidatesTokenCount ?? 0,
|
|
87
|
-
cached_tokens: usageMetadata.cachedContentTokenCount,
|
|
87
|
+
cached_tokens: usageMetadata.cachedContentTokenCount ?? 0,
|
|
88
|
+
reasoning_tokens: usageMetadata.thoughtsTokenCount ?? 0,
|
|
88
89
|
};
|
|
89
90
|
}
|
|
90
91
|
yield chunk;
|
|
@@ -24,7 +24,6 @@ export async function* streamToCanonical(events: AsyncIterable<SSEEvent>): Async
|
|
|
24
24
|
/** Lift vendor reasoning fields into the canonical `delta.reasoning`. */
|
|
25
25
|
function normalize(chunk: CanonicalChunk): CanonicalChunk {
|
|
26
26
|
for (const choice of chunk.choices ?? []) {
|
|
27
|
-
// a finish_reason chunk carries no `delta`; skip it (and any delta-less choice).
|
|
28
27
|
const d = choice.delta as (Record<string, unknown> & { reasoning?: string }) | undefined;
|
|
29
28
|
if (!d) continue;
|
|
30
29
|
if (d.reasoning === undefined) {
|
|
@@ -32,6 +31,16 @@ function normalize(chunk: CanonicalChunk): CanonicalChunk {
|
|
|
32
31
|
if (vendor) d.reasoning = vendor;
|
|
33
32
|
}
|
|
34
33
|
}
|
|
34
|
+
|
|
35
|
+
// Extract reasoning_tokens from OpenAI response.usage.completion_tokens_details.reasoning_tokens
|
|
36
|
+
if (chunk.usage?.completion_tokens_details?.reasoning_tokens !== undefined) {
|
|
37
|
+
chunk.usage.reasoning_tokens = chunk.usage.completion_tokens_details.reasoning_tokens;
|
|
38
|
+
}
|
|
39
|
+
// Extract cached_tokens from OpenAI response.usage.prompt_tokens_details.cached_tokens
|
|
40
|
+
if (chunk.usage?.prompt_tokens_details?.cached_tokens !== undefined) {
|
|
41
|
+
chunk.usage.cached_tokens = chunk.usage.prompt_tokens_details.cached_tokens;
|
|
42
|
+
}
|
|
43
|
+
|
|
35
44
|
return chunk;
|
|
36
45
|
}
|
|
37
46
|
|