@trazum/core 2.7.4 → 2.7.5
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/dist/anthropic-cost.d.ts +22 -5
- package/dist/anthropic-cost.d.ts.map +1 -1
- package/dist/anthropic-cost.js +33 -10
- package/dist/anthropic-cost.js.map +1 -1
- package/dist/anthropic-usage.d.ts +7 -1
- package/dist/anthropic-usage.d.ts.map +1 -1
- package/dist/anthropic-usage.js +17 -1
- package/dist/anthropic-usage.js.map +1 -1
- package/dist/billing.d.ts +10 -0
- package/dist/billing.d.ts.map +1 -1
- package/dist/billing.js +14 -0
- package/dist/billing.js.map +1 -1
- package/dist/claude-code.d.ts +4 -0
- package/dist/claude-code.d.ts.map +1 -1
- package/dist/claude-code.js +14 -1
- package/dist/claude-code.js.map +1 -1
- package/dist/connector.d.ts +19 -1
- package/dist/connector.d.ts.map +1 -1
- package/dist/connector.js +34 -2
- package/dist/connector.js.map +1 -1
- package/dist/csv.d.ts +1 -1
- package/dist/csv.d.ts.map +1 -1
- package/dist/csv.js +11 -0
- package/dist/csv.js.map +1 -1
- package/dist/gateway.d.ts +2 -0
- package/dist/gateway.d.ts.map +1 -1
- package/dist/gateway.js +16 -0
- package/dist/gateway.js.map +1 -1
- package/dist/pricing-overlay.d.ts +1 -1
- package/dist/pricing-overlay.d.ts.map +1 -1
- package/dist/pricing-overlay.js +11 -0
- package/dist/pricing-overlay.js.map +1 -1
- package/dist/pricing.d.ts.map +1 -1
- package/dist/pricing.js +38 -0
- package/dist/pricing.js.map +1 -1
- package/dist/receipt.d.ts +38 -4
- package/dist/receipt.d.ts.map +1 -1
- package/dist/receipt.js +19 -1
- package/dist/receipt.js.map +1 -1
- package/dist/repeats.d.ts.map +1 -1
- package/dist/repeats.js +3 -2
- package/dist/repeats.js.map +1 -1
- package/dist/rollup.d.ts.map +1 -1
- package/dist/rollup.js +4 -0
- package/dist/rollup.js.map +1 -1
- package/dist/session-cost.d.ts.map +1 -1
- package/dist/session-cost.js +4 -2
- package/dist/session-cost.js.map +1 -1
- package/dist/store.d.ts +5 -0
- package/dist/store.d.ts.map +1 -1
- package/dist/store.js +4 -0
- package/dist/store.js.map +1 -1
- package/dist/truncation-retry.d.ts.map +1 -1
- package/dist/truncation-retry.js +3 -2
- package/dist/truncation-retry.js.map +1 -1
- package/dist/types.d.ts +13 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/usage.d.ts +34 -0
- package/dist/usage.d.ts.map +1 -1
- package/dist/usage.js +34 -3
- package/dist/usage.js.map +1 -1
- package/package.json +1 -1
- package/src/anthropic-cost.ts +46 -12
- package/src/anthropic-usage.ts +24 -2
- package/src/billing.ts +15 -0
- package/src/claude-code.ts +16 -1
- package/src/connector.ts +56 -3
- package/src/csv.ts +11 -0
- package/src/gateway.ts +16 -0
- package/src/pricing-overlay.ts +15 -0
- package/src/pricing.ts +39 -0
- package/src/receipt.ts +53 -6
- package/src/repeats.ts +3 -2
- package/src/rollup.ts +4 -0
- package/src/session-cost.ts +4 -2
- package/src/store.ts +9 -0
- package/src/truncation-retry.ts +3 -2
- package/src/types.ts +13 -0
- package/src/usage.ts +68 -3
package/dist/anthropic-cost.d.ts
CHANGED
|
@@ -39,10 +39,15 @@
|
|
|
39
39
|
* `group_by[]=description`:
|
|
40
40
|
*
|
|
41
41
|
* - **`cost_type` other than `tokens`** — web search, code execution, session
|
|
42
|
-
* usage. Trazum prices
|
|
43
|
-
*
|
|
44
|
-
*
|
|
45
|
-
*
|
|
42
|
+
* usage. Trazum prices web searches (since 2.7.5) and none of the rest, so
|
|
43
|
+
* what is set against this charge is the receipt's own `webSearchUsd`, and
|
|
44
|
+
* the difference between the two is billed money Trazum never claimed to
|
|
45
|
+
* cover. Named rather than blamed.
|
|
46
|
+
* - **`service_tier: "batch"`** — billed at the batch tier, which Trazum
|
|
47
|
+
* prices at each model's batch rate since 2.7.4. Set against the receipt's
|
|
48
|
+
* own `batchUsd`, not taken out whole: taking out the provider's whole
|
|
49
|
+
* batch charge when Trazum's figure already holds its own batch calls
|
|
50
|
+
* understated the remainder by exactly those calls.
|
|
46
51
|
*
|
|
47
52
|
* What is left after both is the **remainder**, and it is the only figure here
|
|
48
53
|
* worth arguing about: the same standard-tier tokens, priced two ways, or
|
|
@@ -108,9 +113,19 @@ export interface Reconciliation {
|
|
|
108
113
|
billedUsd: number;
|
|
109
114
|
/** Billed minus computed. Positive means the provider charged more. */
|
|
110
115
|
differenceUsd: number;
|
|
111
|
-
/**
|
|
116
|
+
/** What the provider billed for something other than tokens, and at the batch tier. */
|
|
112
117
|
notTokensUsd: number;
|
|
113
118
|
batchUsd: number;
|
|
119
|
+
/**
|
|
120
|
+
* What Trazum's own figure holds of each: web searches, and calls priced at
|
|
121
|
+
* the batch rate. `null` when the receipt does not say, which is every
|
|
122
|
+
* receipt before 2.7.5; the comparison then reads them as zero and says so
|
|
123
|
+
* (`computedSplitKnown`).
|
|
124
|
+
*/
|
|
125
|
+
computedWebSearchUsd: number | null;
|
|
126
|
+
computedBatchUsd: number | null;
|
|
127
|
+
/** Whether the receipt said what its batch calls and searches cost. */
|
|
128
|
+
computedSplitKnown: boolean;
|
|
114
129
|
/**
|
|
115
130
|
* What neither figure explains: the same standard-tier tokens priced two
|
|
116
131
|
* ways, or usage the log never saw. The only number here worth arguing
|
|
@@ -162,6 +177,8 @@ export declare function reconcile(computed: {
|
|
|
162
177
|
usd: number;
|
|
163
178
|
fromMs: number;
|
|
164
179
|
toMs: number;
|
|
180
|
+
batchUsd?: number;
|
|
181
|
+
webSearchUsd?: number;
|
|
165
182
|
}, billed: BilledReading): Reconciliation;
|
|
166
183
|
/**
|
|
167
184
|
* Whether this text is a cost report rather than some other JSON.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic-cost.d.ts","sourceRoot":"","sources":["../src/anthropic-cost.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"anthropic-cost.d.ts","sourceRoot":"","sources":["../src/anthropic-cost.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4DG;AAEH;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,mDAAmD;IACnD,GAAG,EAAE,MAAM,CAAC;IACZ,6EAA6E;IAC7E,YAAY,EAAE,MAAM,CAAC;IACrB,4EAA4E;IAC5E,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,cAAc,EAAE,OAAO,CAAC;IACxB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB,4EAA4E;IAC5E,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAChD,yEAAyE;IACzE,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,wDAAwD;AACxD,MAAM,WAAW,oBAAqB,SAAQ,aAAa;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,yEAAyE;IACzE,gBAAgB,EAAE,MAAM,CAAC;IACzB,4EAA4E;IAC5E,SAAS,EAAE,OAAO,CAAC;IACnB,wDAAwD;IACxD,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,uEAAuE;IACvE,aAAa,EAAE,MAAM,CAAC;IACtB,uFAAuF;IACvF,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,uEAAuE;IACvE,kBAAkB,EAAE,OAAO,CAAC;IAC5B;;;;OAIG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB,4EAA4E;IAC5E,YAAY,EAAE,OAAO,CAAC;IACtB,6EAA6E;IAC7E,cAAc,EAAE,OAAO,CAAC;IACxB,yDAAyD;IACzD,OAAO,EACH;QAAE,MAAM,EAAE,kBAAkB,CAAA;KAAE,GAC9B;QAAE,MAAM,EAAE,oBAAoB,CAAC;QAAC,QAAQ,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,MAAM,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,GACtH;QAAE,MAAM,EAAE,gBAAgB,CAAC;QAAC,UAAU,EAAE,MAAM,EAAE,CAAA;KAAE,GAClD,IAAI,CAAC;CACV;AAOD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,CA4FtE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,EACjG,MAAM,EAAE,aAAa,GACpB,cAAc,CA0DhB;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,SAAO,GAAG,OAAO,CAIhF"}
|
package/dist/anthropic-cost.js
CHANGED
|
@@ -39,10 +39,15 @@
|
|
|
39
39
|
* `group_by[]=description`:
|
|
40
40
|
*
|
|
41
41
|
* - **`cost_type` other than `tokens`** — web search, code execution, session
|
|
42
|
-
* usage. Trazum prices
|
|
43
|
-
*
|
|
44
|
-
*
|
|
45
|
-
*
|
|
42
|
+
* usage. Trazum prices web searches (since 2.7.5) and none of the rest, so
|
|
43
|
+
* what is set against this charge is the receipt's own `webSearchUsd`, and
|
|
44
|
+
* the difference between the two is billed money Trazum never claimed to
|
|
45
|
+
* cover. Named rather than blamed.
|
|
46
|
+
* - **`service_tier: "batch"`** — billed at the batch tier, which Trazum
|
|
47
|
+
* prices at each model's batch rate since 2.7.4. Set against the receipt's
|
|
48
|
+
* own `batchUsd`, not taken out whole: taking out the provider's whole
|
|
49
|
+
* batch charge when Trazum's figure already holds its own batch calls
|
|
50
|
+
* understated the remainder by exactly those calls.
|
|
46
51
|
*
|
|
47
52
|
* What is left after both is the **remainder**, and it is the only figure here
|
|
48
53
|
* worth arguing about: the same standard-tier tokens, priced two ways, or
|
|
@@ -169,12 +174,18 @@ export function anthropicCostReport(text) {
|
|
|
169
174
|
* missing money nobody would see was missing.
|
|
170
175
|
*/
|
|
171
176
|
export function reconcile(computed, billed) {
|
|
177
|
+
const known = (value) => typeof value === 'number' && Number.isFinite(value) ? value : null;
|
|
178
|
+
const computedBatchUsd = known(computed.batchUsd);
|
|
179
|
+
const computedWebSearchUsd = known(computed.webSearchUsd);
|
|
172
180
|
const bare = {
|
|
173
181
|
computedUsd: computed.usd,
|
|
174
182
|
billedUsd: billed.usd,
|
|
175
183
|
differenceUsd: billed.usd - computed.usd,
|
|
176
184
|
notTokensUsd: billed.notTokensUsd,
|
|
177
185
|
batchUsd: billed.batchUsd,
|
|
186
|
+
computedWebSearchUsd,
|
|
187
|
+
computedBatchUsd,
|
|
188
|
+
computedSplitKnown: computedBatchUsd !== null && computedWebSearchUsd !== null,
|
|
178
189
|
remainderUsd: 0,
|
|
179
190
|
attributable: billed.described,
|
|
180
191
|
batchSeparable: billed.batchSeparable,
|
|
@@ -195,15 +206,27 @@ export function reconcile(computed, billed) {
|
|
|
195
206
|
};
|
|
196
207
|
}
|
|
197
208
|
/*
|
|
198
|
-
The remainder is what is left when the report's own explanations
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
209
|
+
The remainder is what is left when each of the report's own explanations
|
|
210
|
+
is set against what Trazum computed for the same thing and the two
|
|
211
|
+
differences are taken out: billed non-token charges against computed
|
|
212
|
+
searches, billed batch against computed batch. What remains is the
|
|
213
|
+
standard-tier tokens, billed against computed. It is deliberately not
|
|
214
|
+
clamped at zero. A negative one is a real answer -- Trazum priced more
|
|
215
|
+
than the provider charged -- and reporting it as zero would hide a stale
|
|
216
|
+
rate in exactly the direction that costs somebody money.
|
|
203
217
|
*/
|
|
218
|
+
/*
|
|
219
|
+
A category is set off only where the report can name it. A report that
|
|
220
|
+
cannot say which lines were batch (OpenAI's, or one not grouped by
|
|
221
|
+
description) has its batch charge inside its total like Trazum's figure
|
|
222
|
+
has its batch calls, and taking out Trazum's side alone would move the
|
|
223
|
+
remainder by exactly those calls. The same for non-token charges.
|
|
224
|
+
*/
|
|
225
|
+
const nonTokens = billed.described ? billed.notTokensUsd - (computedWebSearchUsd ?? 0) : 0;
|
|
226
|
+
const batch = billed.batchSeparable ? billed.batchUsd - (computedBatchUsd ?? 0) : 0;
|
|
204
227
|
return {
|
|
205
228
|
...bare,
|
|
206
|
-
remainderUsd: bare.differenceUsd -
|
|
229
|
+
remainderUsd: bare.differenceUsd - nonTokens - batch,
|
|
207
230
|
refusal: null,
|
|
208
231
|
};
|
|
209
232
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic-cost.js","sourceRoot":"","sources":["../src/anthropic-cost.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"anthropic-cost.js","sourceRoot":"","sources":["../src/anthropic-cost.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4DG;AAsFH,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAkC,EAAE,CAClE,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;IAClE,CAAC,CAAE,KAAiC;IACpC,CAAC,CAAC,IAAI,CAAC;AAEX;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,MAAM,KAAK,GAAyB;QAClC,GAAG,EAAE,CAAC;QACN,YAAY,EAAE,CAAC;QACf,QAAQ,EAAE,CAAC;QACX,cAAc,EAAE,KAAK;QACrB,SAAS,EAAE,KAAK;QAChB,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,CAAC;QACV,IAAI,EAAE,CAAC;QACP,eAAe,EAAE,EAAE;QACnB,gBAAgB,EAAE,CAAC;QACnB,SAAS,EAAE,KAAK;QAChB,WAAW,EAAE,KAAK;KACnB,CAAC;IAEF,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;IACzC,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;IAE3F;sEACkE;IAClE,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,IAAI,MAAM,GAAkB,IAAI,CAAC;IACjC,IAAI,IAAI,GAAkB,IAAI,CAAC;IAC/B,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAE1C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC/B,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ;YAAE,SAAS;QACxE,OAAO,IAAI,CAAC,CAAC;QAEb,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC5C,MAAM,EAAE,GAAG,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;QAC5F,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,MAAM,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACpF,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAAE,IAAI,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAExE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;YAAE,SAAS;QAC7C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,MAAM,KAAK,IAAI;gBAAE,SAAS;YAC9B,IAAI,IAAI,CAAC,CAAC;YAEV;wDAC4C;YAC5C,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;gBACrE,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACvC,CAAC;YAED,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;YACtF,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC7B,gBAAgB,IAAI,CAAC,CAAC;gBACtB,SAAS;YACX,CAAC;YACD,KAAK,IAAI,MAAM,CAAC;YAEhB,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;gBACzC,SAAS,GAAG,IAAI,CAAC;gBACjB,IAAI,MAAM,CAAC,SAAS,KAAK,QAAQ;oBAAE,cAAc,IAAI,MAAM,CAAC;YAC9D,CAAC;YACD,IAAI,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;gBAC5C,SAAS,GAAG,IAAI,CAAC;gBACjB,IAAI,MAAM,CAAC,YAAY,KAAK,OAAO;oBAAE,UAAU,IAAI,MAAM,CAAC;YAC5D,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,GAAG,EAAE,KAAK,GAAG,GAAG;QAChB,YAAY,EAAE,cAAc,GAAG,GAAG;QAClC,QAAQ,EAAE,UAAU,GAAG,GAAG;QAC1B,cAAc,EAAE,SAAS;QACzB,SAAS;QACT,MAAM,EAAE,MAAM,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;QAClE,OAAO;QACP,IAAI;QACJ,eAAe,EAAE,CAAC,GAAG,eAAe,CAAC;QACrC,gBAAgB;QAChB,SAAS,EAAE,MAAM,CAAC,QAAQ,KAAK,IAAI;QACnC,WAAW,EAAE,KAAK;KACnB,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,SAAS,CACvB,QAAiG,EACjG,MAAqB;IAErB,MAAM,KAAK,GAAG,CAAC,KAAyB,EAAiB,EAAE,CACzD,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACrE,MAAM,gBAAgB,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClD,MAAM,oBAAoB,GAAG,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC1D,MAAM,IAAI,GAAG;QACX,WAAW,EAAE,QAAQ,CAAC,GAAG;QACzB,SAAS,EAAE,MAAM,CAAC,GAAG;QACrB,aAAa,EAAE,MAAM,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG;QACxC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,oBAAoB;QACpB,gBAAgB;QAChB,kBAAkB,EAAE,gBAAgB,KAAK,IAAI,IAAI,oBAAoB,KAAK,IAAI;QAC9E,YAAY,EAAE,CAAC;QACf,YAAY,EAAE,MAAM,CAAC,SAAS;QAC9B,cAAc,EAAE,MAAM,CAAC,cAAc;KACtC,CAAC;IAEF,IAAI,MAAM,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtC,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC;IAChG,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,EAAE,CAAC;IACxF,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;QACjF,OAAO;YACL,GAAG,IAAI;YACP,OAAO,EAAE;gBACP,MAAM,EAAE,oBAAoB;gBAC5B,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE;gBAC1D,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB;SACF,CAAC;IACJ,CAAC;IAED;;;;;;;;;MASE;IACF;;;;;;MAME;IACF,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,GAAG,CAAC,oBAAoB,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3F,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,GAAG,CAAC,gBAAgB,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpF,OAAO;QACL,GAAG,IAAI;QACP,YAAY,EAAE,IAAI,CAAC,aAAa,GAAG,SAAS,GAAG,KAAK;QACpD,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAY,EAAE,WAAW,GAAG,IAAI;IACrE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IACxC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7E,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AACvE,CAAC"}
|
|
@@ -208,8 +208,14 @@ export interface AnthropicUsageConversion {
|
|
|
208
208
|
* a geography. Read as global, because nothing on the row says otherwise, and said.
|
|
209
209
|
*/
|
|
210
210
|
geoUnknownMultiplied: number;
|
|
211
|
-
/**
|
|
211
|
+
/**
|
|
212
|
+
* Web searches carried onto the rows they ran on, as
|
|
213
|
+
* `usage.server_tool_use.web_search_requests`, and billed at the model's
|
|
214
|
+
* per-search fee: $10 per 1,000 on every Claude model, on top of the tokens.
|
|
215
|
+
*/
|
|
212
216
|
webSearchRequests: number;
|
|
217
|
+
/** Web searches on rows left out above (a tier or speed with no rate, no model): in no bill. */
|
|
218
|
+
webSearchLeftOut: number;
|
|
213
219
|
/** `has_more`: this is one page and the bill from it is understated. */
|
|
214
220
|
truncated: boolean;
|
|
215
221
|
/** Records whose label came from a workspace rule rather than `--label`. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic-usage.d.ts","sourceRoot":"","sources":["../src/anthropic-usage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsHG;AAGH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD;;;;;;GAMG;AACH,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,yEAAyE;AACzE,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,QAAQ,EAAE,IAAI,CAAC;IACf,KAAK,EAAE;QACL,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;QACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,cAAc,CAAC,EAAE;YACf,yBAAyB,EAAE,MAAM,CAAC;YAClC,yBAAyB,EAAE,MAAM,CAAC;SACnC,CAAC;QACF,4FAA4F;QAC5F,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,sEAAsE;QACtE,aAAa,CAAC,EAAE,IAAI,CAAC;QACrB,oFAAoF;QACpF,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,oBAAoB,EAAE,CAAC;IAChC,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,mCAAmC;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,2DAA2D;IAC3D,YAAY,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB,oFAAoF;IACpF,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;;;;OAQG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB,kFAAkF;IAClF,QAAQ,EAAE,MAAM,CAAC;IACjB,oFAAoF;IACpF,YAAY,EAAE,MAAM,CAAC;IACrB,iEAAiE;IACjE,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,iDAAiD;IACjD,UAAU,EAAE,OAAO,CAAC;IACpB;;;OAGG;IACH,uBAAuB,EAAE,MAAM,CAAC;IAChC,6FAA6F;IAC7F,UAAU,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,+DAA+D;IAC/D,QAAQ,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,oBAAoB,EAAE,MAAM,CAAC;IAC7B
|
|
1
|
+
{"version":3,"file":"anthropic-usage.d.ts","sourceRoot":"","sources":["../src/anthropic-usage.ts"],"names":[],"mappings":"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"}
|
package/dist/anthropic-usage.js
CHANGED
|
@@ -145,6 +145,7 @@ export function anthropicUsageRecords(text, options = {}) {
|
|
|
145
145
|
geoNamed: false,
|
|
146
146
|
geoUnknownMultiplied: 0,
|
|
147
147
|
webSearchRequests: 0,
|
|
148
|
+
webSearchLeftOut: 0,
|
|
148
149
|
truncated: false,
|
|
149
150
|
labelledByWorkspace: 0,
|
|
150
151
|
unruledWorkspace: 0,
|
|
@@ -200,6 +201,7 @@ export function anthropicUsageRecords(text, options = {}) {
|
|
|
200
201
|
let batchRows = 0;
|
|
201
202
|
let tierNamed = false;
|
|
202
203
|
let webSearchRequests = 0;
|
|
204
|
+
let webSearchSeen = 0;
|
|
203
205
|
for (const entry of report.data) {
|
|
204
206
|
if (typeof entry !== 'object' || entry === null)
|
|
205
207
|
continue;
|
|
@@ -213,8 +215,14 @@ export function anthropicUsageRecords(text, options = {}) {
|
|
|
213
215
|
if (typeof found !== 'object' || found === null)
|
|
214
216
|
continue;
|
|
215
217
|
const result = found;
|
|
218
|
+
/*
|
|
219
|
+
Counted here, before any refusal below, so that searches on a row that
|
|
220
|
+
is then left out are said as left out rather than lost: what reaches a
|
|
221
|
+
record is billed, and the difference is named.
|
|
222
|
+
*/
|
|
216
223
|
const tool = result.server_tool_use;
|
|
217
|
-
|
|
224
|
+
const searches = count(tool?.web_search_requests);
|
|
225
|
+
webSearchSeen += searches;
|
|
218
226
|
let batchRow = false;
|
|
219
227
|
if (typeof result.service_tier === 'string') {
|
|
220
228
|
tierNamed = true;
|
|
@@ -314,8 +322,15 @@ export function anthropicUsageRecords(text, options = {}) {
|
|
|
314
322
|
...(fast ? { speed: 'fast' } : {}),
|
|
315
323
|
...(usOnly ? { inference_geo: 'us' } : {}),
|
|
316
324
|
...(batchRow ? { service_tier: 'batch' } : {}),
|
|
325
|
+
/*
|
|
326
|
+
Billed per search on top of the tokens, at the same fee on the
|
|
327
|
+
Batch API and whatever the speed or geography: the row's searches
|
|
328
|
+
ride on the row and `profileUsage` prices them off the model.
|
|
329
|
+
*/
|
|
330
|
+
...(searches > 0 ? { server_tool_use: { web_search_requests: searches } } : {}),
|
|
317
331
|
},
|
|
318
332
|
});
|
|
333
|
+
webSearchRequests += searches;
|
|
319
334
|
rows += 1;
|
|
320
335
|
if (batchRow)
|
|
321
336
|
batchRows += 1;
|
|
@@ -347,6 +362,7 @@ export function anthropicUsageRecords(text, options = {}) {
|
|
|
347
362
|
geoNamed,
|
|
348
363
|
geoUnknownMultiplied,
|
|
349
364
|
webSearchRequests,
|
|
365
|
+
webSearchLeftOut: webSearchSeen - webSearchRequests,
|
|
350
366
|
truncated: report.has_more === true,
|
|
351
367
|
labelledByWorkspace,
|
|
352
368
|
unruledWorkspace,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic-usage.js","sourceRoot":"","sources":["../src/anthropic-usage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsHG;AAEH,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"anthropic-usage.js","sourceRoot":"","sources":["../src/anthropic-usage.ts"],"names":[],"mappings":"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"}
|
package/dist/billing.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { PromptSize } from './pricing.js';
|
|
2
|
+
import type { ModelPricing } from './types.js';
|
|
2
3
|
import type { UsageRecord } from './usage.js';
|
|
3
4
|
/**
|
|
4
5
|
* The instant a record was billed at: its own clock, or `on` when it has none.
|
|
@@ -17,4 +18,13 @@ export declare function billedAt(record: UsageRecord, on: Date): Date;
|
|
|
17
18
|
* requests says only that no request in it was larger than the whole row.
|
|
18
19
|
*/
|
|
19
20
|
export declare function promptSizeOf(record: UsageRecord): PromptSize;
|
|
21
|
+
/**
|
|
22
|
+
* What a record's web searches cost: per search, at the row's fee, flat.
|
|
23
|
+
*
|
|
24
|
+
* Here beside `billedAt` and `promptSizeOf` for the same reason they are: the
|
|
25
|
+
* total and every tracker under it price a call, and a finding that costs a
|
|
26
|
+
* call without its searches disagrees with the bill it sits under. Zero for a
|
|
27
|
+
* row with no fee, whose searches the total names as unpriced instead.
|
|
28
|
+
*/
|
|
29
|
+
export declare function webSearchUsdOf(record: UsageRecord, model: ModelPricing): number;
|
|
20
30
|
//# sourceMappingURL=billing.d.ts.map
|
package/dist/billing.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.d.ts","sourceRoot":"","sources":["../src/billing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAY9C;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,EAAE,IAAI,GAAG,IAAI,CAE5D;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAU5D"}
|
|
1
|
+
{"version":3,"file":"billing.d.ts","sourceRoot":"","sources":["../src/billing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAY9C;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,EAAE,IAAI,GAAG,IAAI,CAE5D;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAU5D;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,GAAG,MAAM,CAI/E"}
|
package/dist/billing.js
CHANGED
|
@@ -35,4 +35,18 @@ export function promptSizeOf(record) {
|
|
|
35
35
|
};
|
|
36
36
|
return record.requests === undefined ? { inputTokens: prompt, ...how } : { inputTokensAtMost: prompt, ...how };
|
|
37
37
|
}
|
|
38
|
+
/**
|
|
39
|
+
* What a record's web searches cost: per search, at the row's fee, flat.
|
|
40
|
+
*
|
|
41
|
+
* Here beside `billedAt` and `promptSizeOf` for the same reason they are: the
|
|
42
|
+
* total and every tracker under it price a call, and a finding that costs a
|
|
43
|
+
* call without its searches disagrees with the bill it sits under. Zero for a
|
|
44
|
+
* row with no fee, whose searches the total names as unpriced instead.
|
|
45
|
+
*/
|
|
46
|
+
export function webSearchUsdOf(record, model) {
|
|
47
|
+
const searches = record.webSearchRequests ?? 0;
|
|
48
|
+
if (searches <= 0 || model.webSearchPerThousandUsd === undefined)
|
|
49
|
+
return 0;
|
|
50
|
+
return (searches / 1_000) * model.webSearchPerThousandUsd;
|
|
51
|
+
}
|
|
38
52
|
//# sourceMappingURL=billing.js.map
|
package/dist/billing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../src/billing.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"billing.js","sourceRoot":"","sources":["../src/billing.ts"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH;;;;;;;GAOG;AACH,MAAM,UAAU,QAAQ,CAAC,MAAmB,EAAE,EAAQ;IACpD,OAAO,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACvD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAAC,MAAmB;IAC9C,MAAM,MAAM,GACV,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAC;IACtG,MAAM,GAAG,GAAG;QACV,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QAC9D,GAAG,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;QAChF,GAAG,CAAC,MAAM,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC;QACnF,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAClD,CAAC;IACF,OAAO,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,MAAM,EAAE,GAAG,GAAG,EAAE,CAAC;AACjH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAAC,MAAmB,EAAE,KAAmB;IACrE,MAAM,QAAQ,GAAG,MAAM,CAAC,iBAAiB,IAAI,CAAC,CAAC;IAC/C,IAAI,QAAQ,IAAI,CAAC,IAAI,KAAK,CAAC,uBAAuB,KAAK,SAAS;QAAE,OAAO,CAAC,CAAC;IAC3E,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,GAAG,KAAK,CAAC,uBAAuB,CAAC;AAC5D,CAAC"}
|
package/dist/claude-code.d.ts
CHANGED
|
@@ -79,6 +79,10 @@ export interface ClaudeCodeRecord {
|
|
|
79
79
|
speed?: string;
|
|
80
80
|
/** The response's `usage.inference_geo`, kept because US-only inference bills 1.1x on Claude 4.6 and later. */
|
|
81
81
|
inference_geo?: string;
|
|
82
|
+
/** The searches the call ran, kept because each is billed at $10 per 1,000 on top of the tokens. */
|
|
83
|
+
server_tool_use?: {
|
|
84
|
+
web_search_requests: number;
|
|
85
|
+
};
|
|
82
86
|
};
|
|
83
87
|
}
|
|
84
88
|
export interface ClaudeCodeConversion {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.d.ts","sourceRoot":"","sources":["../src/claude-code.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,WAAW,QAAQ;IACvB,wDAAwD;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED,yEAAyE;AACzE,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;;;;OAQG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE;QACL,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;QACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,2BAA2B,CAAC,EAAE,MAAM,CAAC;QACrC,cAAc,CAAC,EAAE;YAAE,yBAAyB,CAAC,EAAE,MAAM,CAAC;YAAC,yBAAyB,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAC5F,4FAA4F;QAC5F,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,+GAA+G;QAC/G,aAAa,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"claude-code.d.ts","sourceRoot":"","sources":["../src/claude-code.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,WAAW,QAAQ;IACvB,wDAAwD;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED,yEAAyE;AACzE,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;;;;OAQG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE;QACL,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,CAAC;QACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,2BAA2B,CAAC,EAAE,MAAM,CAAC;QACrC,cAAc,CAAC,EAAE;YAAE,yBAAyB,CAAC,EAAE,MAAM,CAAC;YAAC,yBAAyB,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;QAC5F,4FAA4F;QAC5F,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,+GAA+G;QAC/G,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,oGAAoG;QACpG,eAAe,CAAC,EAAE;YAAE,mBAAmB,EAAE,MAAM,CAAA;SAAE,CAAC;KACnD,CAAC;CACH;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,mEAAmE;IACnE,SAAS,EAAE,MAAM,CAAC;IAClB,0EAA0E;IAC1E,WAAW,EAAE,MAAM,CAAC;IACpB,iFAAiF;IACjF,UAAU,EAAE,MAAM,CAAC;IACnB,+CAA+C;IAC/C,WAAW,EAAE,MAAM,CAAC;IACpB,+DAA+D;IAC/D,qBAAqB,EAAE,MAAM,CAAC;IAC9B;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;;;;;;OAOG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,MAAM,EAAE;QACN,gFAAgF;QAChF,IAAI,EAAE,MAAM,CAAC;QACb,yDAAyD;QACzD,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAgCD,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,QAAQ,EAAE,CAAA;CAAO,GACjE,oBAAoB,CAyLtB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,SAAM,GAAG,OAAO,CAkBhF"}
|
package/dist/claude-code.js
CHANGED
|
@@ -162,6 +162,18 @@ export function claudeCodeRecords(text, options = {}) {
|
|
|
162
162
|
...(typeof usage.inference_geo === 'string' && usage.inference_geo !== ''
|
|
163
163
|
? { inference_geo: usage.inference_geo }
|
|
164
164
|
: {}),
|
|
165
|
+
/*
|
|
166
|
+
* And the searches: Claude Code's web search is the API's server-side
|
|
167
|
+
* tool, billed at $10 per 1,000 searches on top of the tokens it
|
|
168
|
+
* reads, and the response counts them in
|
|
169
|
+
* `usage.server_tool_use.web_search_requests`. Rebuilding the usage
|
|
170
|
+
* without it billed every searching session as if it had searched
|
|
171
|
+
* for nothing. Only the count crosses; what was searched for is in
|
|
172
|
+
* the content, which never does.
|
|
173
|
+
*/
|
|
174
|
+
...((asCount(asObject(usage.server_tool_use)?.web_search_requests) ?? 0) > 0
|
|
175
|
+
? { server_tool_use: { web_search_requests: asCount(asObject(usage.server_tool_use)?.web_search_requests) } }
|
|
176
|
+
: {}),
|
|
165
177
|
},
|
|
166
178
|
};
|
|
167
179
|
const requestId = typeof entry.requestId === 'string' ? entry.requestId : null;
|
|
@@ -195,7 +207,8 @@ export function claudeCodeRecords(text, options = {}) {
|
|
|
195
207
|
const grewOnly = record.usage.input_tokens >= before.input_tokens &&
|
|
196
208
|
record.usage.output_tokens >= before.output_tokens &&
|
|
197
209
|
(record.usage.cache_read_input_tokens ?? 0) >= (before.cache_read_input_tokens ?? 0) &&
|
|
198
|
-
(record.usage.cache_creation_input_tokens ?? 0) >= (before.cache_creation_input_tokens ?? 0)
|
|
210
|
+
(record.usage.cache_creation_input_tokens ?? 0) >= (before.cache_creation_input_tokens ?? 0) &&
|
|
211
|
+
(record.usage.server_tool_use?.web_search_requests ?? 0) >= (before.server_tool_use?.web_search_requests ?? 0);
|
|
199
212
|
if (grewOnly)
|
|
200
213
|
out.streamed += 1;
|
|
201
214
|
else
|
package/dist/claude-code.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../src/claude-code.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;
|
|
1
|
+
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../src/claude-code.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AA6HH,uEAAuE;AACvE,MAAM,eAAe,GAAG,aAAa,CAAC;AAEtC,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAkC,EAAE,CAClE,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;IAClE,CAAC,CAAE,KAAiC;IACpC,CAAC,CAAC,IAAI,CAAC;AAEX,MAAM,OAAO,GAAG,CAAC,KAAc,EAAsB,EAAE,CACrD,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AAExF,+EAA+E;AAC/E;;;;;;;GAOG;AACH,MAAM,WAAW,GAAG,CAAC,GAAY,EAAE,KAA0B,EAAsB,EAAE;IACnF,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,SAAS,CAAC;IAC5D,IAAI,IAA0B,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;YAAE,SAAS;QAC3C,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,IAAI,GAAG,IAAI,CAAC;IACjF,CAAC;IACD,OAAO,IAAI,EAAE,KAAK,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,UAAU,iBAAiB,CAC/B,IAAY,EACZ,OAAO,GAAyD,EAAE;IAElE,MAAM,GAAG,GAAyB;QAChC,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,CAAC;QACZ,WAAW,EAAE,CAAC;QACd,UAAU,EAAE,CAAC;QACb,WAAW,EAAE,CAAC;QACd,qBAAqB,EAAE,CAAC;QACxB,QAAQ,EAAE,CAAC;QACX,aAAa,EAAE,CAAC;QAChB,SAAS,EAAE,CAAC;QACZ,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE;KAChC,CAAC;IACF,iFAAiF;IACjF,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC5C,uFAAuF;IACvF,MAAM,SAAS,GAAG,IAAI,GAAG,EAAqC,CAAC;IAE/D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE;YAAE,SAAS;QACjC,IAAI,GAAY,CAAC;QACjB,IAAI,CAAC;YACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;QAAC,MAAM,CAAC;YACP,GAAG,CAAC,WAAW,IAAI,CAAC,CAAC;YACrB,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACjD,GAAG,CAAC,UAAU,IAAI,CAAC,CAAC;YACpB,SAAS;QACX,CAAC;QACD,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;QAC3D,MAAM,UAAU,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;QACtE,MAAM,KAAK,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACzE,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAC/F,GAAG,CAAC,qBAAqB,IAAI,CAAC,CAAC;YAC/B,SAAS;QACX,CAAC;QACD;;;;;;;;WAQG;QACH,IAAI,KAAK,KAAK,eAAe,EAAE,CAAC;YAC9B,GAAG,CAAC,SAAS,IAAI,CAAC,CAAC;YACnB,SAAS;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAChD,MAAM,MAAM,GAAqB;YAC/B,KAAK;YACL,EAAE,EAAE,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;YAC9D,OAAO,EAAE,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;YACnE,GAAG,CAAC,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3F;;;;;cAKE;YACF,GAAG,CAAC,CAAC,GAAuB,EAAE;gBAC5B,MAAM,MAAM,GACV,OAAO,CAAC,UAAU,KAAK,SAAS;oBAC9B,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;gBACjD,MAAM,KAAK,GAAG,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC;gBACtC,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;YAC9C,CAAC,CAAC,EAAE,CAAC;YACL,KAAK,EAAE;gBACL,YAAY,EAAE,KAAK;gBACnB,aAAa,EAAE,MAAM;gBACrB,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,KAAK,SAAS;oBACtD,CAAC,CAAC,EAAE,uBAAuB,EAAE,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAAE;oBACrE,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,2BAA2B,CAAC,KAAK,SAAS;oBAC1D,CAAC,CAAC,EAAE,2BAA2B,EAAE,OAAO,CAAC,KAAK,CAAC,2BAA2B,CAAC,EAAE;oBAC7E,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,CAAC,QAAQ,KAAK,IAAI;oBACnB,CAAC,CAAC;wBACE,cAAc,EAAE;4BACd,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAC,KAAK,SAAS;gCAC3D,CAAC,CAAC,EAAE,yBAAyB,EAAE,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAAE;gCAC5E,CAAC,CAAC,EAAE,CAAC;4BACP,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAC,KAAK,SAAS;gCAC3D,CAAC,CAAC,EAAE,yBAAyB,EAAE,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAAE;gCAC5E,CAAC,CAAC,EAAE,CAAC;yBACR;qBACF;oBACH,CAAC,CAAC,EAAE,CAAC;gBACP;;;;mBAIG;gBACH,GAAG,CAAC,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxF;;;;;mBAKG;gBACH,GAAG,CAAC,OAAO,KAAK,CAAC,aAAa,KAAK,QAAQ,IAAI,KAAK,CAAC,aAAa,KAAK,EAAE;oBACvE,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE;oBACxC,CAAC,CAAC,EAAE,CAAC;gBACP;;;;;;;;mBAQG;gBACH,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC;oBAC1E,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,mBAAmB,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,mBAAmB,CAAE,EAAE,EAAE;oBAC9G,CAAC,CAAC,EAAE,CAAC;aACR;SACF,CAAC;QAEF,MAAM,SAAS,GAAG,OAAO,KAAK,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;QAC/E,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACvB,uEAAuE;YACvE,6DAA6D;YAC7D,GAAG,CAAC,WAAW,IAAI,CAAC,CAAC;YACrB,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzB,GAAG,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAC9D,SAAS;QACX,CAAC;QACD,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,oEAAoE;YACpE,+DAA+D;YAC/D,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC7C,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YACvC,GAAG,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAC1D,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzB,SAAS;QACX,CAAC;QACD,mEAAmE;QACnE,iEAAiE;QACjE,sEAAsE;QACtE,sEAAsE;QACtE,qEAAqE;QACrE,sDAAsD;QACtD,GAAG,CAAC,SAAS,IAAI,CAAC,CAAC;QACnB,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;QACzC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5D,MAAM,QAAQ,GACZ,MAAM,CAAC,KAAK,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY;gBAChD,MAAM,CAAC,KAAK,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa;gBAClD,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,uBAAuB,IAAI,CAAC,CAAC;gBACpF,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,2BAA2B,IAAI,CAAC,CAAC;gBAC5F,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,mBAAmB,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,mBAAmB,IAAI,CAAC,CAAC,CAAC;YACjH,IAAI,QAAQ;gBAAE,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC;;gBAC3B,GAAG,CAAC,aAAa,IAAI,CAAC,CAAC;YAC5B,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;QACD,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IACxC,CAAC;IAED;;;;;;;;;OASG;IACH,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,GAAG,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IAC9E,IAAI,IAAI,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACxC,GAAG,CAAC,MAAM,GAAG,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;IACpF,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,6BAA6B,CAAC,IAAY,EAAE,KAAK,GAAG,GAAG;IACrE,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACpC,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE;YAAE,SAAS;QACjC,IAAI,IAAI,IAAI,KAAK;YAAE,MAAM;QACzB,IAAI,IAAI,CAAC,CAAC;QACV,IAAI,GAAY,CAAC;QACjB,IAAI,CAAC;YACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;YAAE,SAAS;QAC3D,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,OAAO,KAAK,IAAI,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;IACxE,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/dist/connector.d.ts
CHANGED
|
@@ -98,6 +98,12 @@ export interface UsageBucket {
|
|
|
98
98
|
/** False when the provider reported writes without saying which TTL. */
|
|
99
99
|
writeTtlKnown: boolean;
|
|
100
100
|
outputTokens: number;
|
|
101
|
+
/**
|
|
102
|
+
* Web searches the bucket's requests ran, billed per search on top of the
|
|
103
|
+
* tokens: Anthropic's `server_tool_use.web_search_requests`. Absent is none,
|
|
104
|
+
* which is also what a pull stored before 2.7.5 reads as.
|
|
105
|
+
*/
|
|
106
|
+
webSearchRequests?: number;
|
|
101
107
|
/** Whatever the provider grouped by beyond the model — workspace, key, tier. */
|
|
102
108
|
group: Record<string, string>;
|
|
103
109
|
}
|
|
@@ -111,7 +117,9 @@ export interface UsageBucket {
|
|
|
111
117
|
export interface PullGap {
|
|
112
118
|
kind: 'rate-limited' | 'retention-boundary' | 'cursor-expired' | 'page-limit' | 'unreadable-entry' | 'unreadable-field'
|
|
113
119
|
/** Usage at a tier no catalogue rate prices, left out and named. */
|
|
114
|
-
| 'unpriced-tier'
|
|
120
|
+
| 'unpriced-tier'
|
|
121
|
+
/** Web searches on a model whose row publishes no per-search fee, left out and named. */
|
|
122
|
+
| 'unpriced-web-search';
|
|
115
123
|
detail: string;
|
|
116
124
|
}
|
|
117
125
|
export interface ConnectorPull {
|
|
@@ -175,6 +183,13 @@ export interface BucketedSlice {
|
|
|
175
183
|
tierCeilingBuckets: number;
|
|
176
184
|
tierCeilingUsd: number;
|
|
177
185
|
tierFloorUsd: number;
|
|
186
|
+
/**
|
|
187
|
+
* Web searches, billed per search at the model's fee, flat: the Batch API,
|
|
188
|
+
* fast mode and US-only inference move token rates, not this. Part of
|
|
189
|
+
* `totalUsd`.
|
|
190
|
+
*/
|
|
191
|
+
webSearchRequests: number;
|
|
192
|
+
webSearchUsd: number;
|
|
178
193
|
}
|
|
179
194
|
export interface BucketedReport {
|
|
180
195
|
schemaVersion: 1;
|
|
@@ -192,6 +207,9 @@ export interface BucketedReport {
|
|
|
192
207
|
cacheReadTokens: number;
|
|
193
208
|
cacheWriteTokens: number;
|
|
194
209
|
outputTokens: number;
|
|
210
|
+
/** Web searches billed, and what they came to: already inside `totalUsd`. */
|
|
211
|
+
webSearchRequests: number;
|
|
212
|
+
webSearchUsd: number;
|
|
195
213
|
};
|
|
196
214
|
byModel: BucketedSlice[];
|
|
197
215
|
/** Spend per UTC day, oldest first — the shape a total hides. */
|
package/dist/connector.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../src/connector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAGH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAMrD;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG,UAAU,GAAG,UAAU,CAAC;AAE3D;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB;AAoCD,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,oBAAoB,CAAC;IAClC;;;;;;;OAOG;IACH,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,2EAA2E;IAC3E,OAAO,EAAE,MAAM,CAAC;IAChB,qEAAqE;IACrE,gBAAgB,EAAE,OAAO,CAAC;IAC1B,0CAA0C;IAC1C,WAAW,EAAE,SAAS,kBAAkB,EAAE,CAAC;IAC3C,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,UAAU,EAAE,SAAS,mBAAmB,EA4BpD,CAAC;AAEF,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,mBAAmB,GAAG,IAAI,CAEnE;AAMD;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,6EAA6E;IAC7E,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,wEAAwE;IACxE,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,gFAAgF;IAChF,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED;;;;;;GAMG;AACH,MAAM,WAAW,OAAO;IACtB,IAAI,EACA,cAAc,GACd,oBAAoB,GACpB,gBAAgB,GAChB,YAAY,GACZ,kBAAkB,GAClB,kBAAkB;IACpB,oEAAoE;OAClE,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../src/connector.ts"],"names":[],"mappings":"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"}
|
package/dist/connector.js
CHANGED
|
@@ -131,6 +131,9 @@ function collect(buckets) {
|
|
|
131
131
|
seen.cacheWrite5mTokens += bucket.cacheWrite5mTokens;
|
|
132
132
|
seen.cacheWrite1hTokens += bucket.cacheWrite1hTokens;
|
|
133
133
|
seen.outputTokens += bucket.outputTokens;
|
|
134
|
+
if ((bucket.webSearchRequests ?? 0) > 0) {
|
|
135
|
+
seen.webSearchRequests = (seen.webSearchRequests ?? 0) + bucket.webSearchRequests;
|
|
136
|
+
}
|
|
134
137
|
seen.writeTtlKnown = seen.writeTtlKnown && bucket.writeTtlKnown;
|
|
135
138
|
// A count merged with an absent count is still absent: adding a number to
|
|
136
139
|
// "unknown" produces a number that describes only part of the traffic.
|
|
@@ -193,6 +196,8 @@ export function normalizeAnthropicUsage(payload) {
|
|
|
193
196
|
const write1h = num(creation.ephemeral_1h_input_tokens) ?? 0;
|
|
194
197
|
const flatWrite = num(r.cache_creation_input_tokens) ?? 0;
|
|
195
198
|
const ttlKnown = !(flatWrite > 0 && write5m === 0 && write1h === 0);
|
|
199
|
+
/* Billed per search, $10 per 1,000 on Claude: the one count here that is not tokens. */
|
|
200
|
+
const searches = num(r.server_tool_use?.web_search_requests) ?? 0;
|
|
196
201
|
buckets.push({
|
|
197
202
|
fromMs,
|
|
198
203
|
toMs,
|
|
@@ -205,6 +210,7 @@ export function normalizeAnthropicUsage(payload) {
|
|
|
205
210
|
cacheWrite1hTokens: ttlKnown ? write1h : 0,
|
|
206
211
|
writeTtlKnown: ttlKnown,
|
|
207
212
|
outputTokens: num(r.output_tokens) ?? 0,
|
|
213
|
+
...(searches > 0 ? { webSearchRequests: searches } : {}),
|
|
208
214
|
group: groupOf(r, ['workspace_id', 'api_key_id', 'service_tier', 'context_window', 'speed', 'inference_geo']),
|
|
209
215
|
});
|
|
210
216
|
}
|
|
@@ -338,6 +344,8 @@ options) {
|
|
|
338
344
|
+ bucket.outputTokens;
|
|
339
345
|
leftOut.set(key, seen);
|
|
340
346
|
};
|
|
347
|
+
/* Searches on a model with no per-search fee, per model, so the gap names it. */
|
|
348
|
+
const searchesLeftOut = new Map();
|
|
341
349
|
for (const bucket of pull.buckets) {
|
|
342
350
|
const model = catalogue.byId.get(bucket.model);
|
|
343
351
|
if (model === undefined) {
|
|
@@ -422,6 +430,17 @@ options) {
|
|
|
422
430
|
const ifAssumed1h = bucket.writeTtlKnown
|
|
423
431
|
? cacheWriteUsd
|
|
424
432
|
: per(writeTokens, inputPerMTok * rates.cacheWrite1h);
|
|
433
|
+
/*
|
|
434
|
+
* Searches at the row's fee, flat, read off the model and not out of
|
|
435
|
+
* `effectivePricing`: none of the multipliers `how` carries reaches a
|
|
436
|
+
* search. A model with no fee leaves them out, named below.
|
|
437
|
+
*/
|
|
438
|
+
const searches = bucket.webSearchRequests ?? 0;
|
|
439
|
+
const fee = model.webSearchPerThousandUsd;
|
|
440
|
+
const searchUsd = searches > 0 && fee !== undefined ? (searches / 1_000) * fee : 0;
|
|
441
|
+
if (searches > 0 && fee === undefined) {
|
|
442
|
+
searchesLeftOut.set(bucket.model, (searchesLeftOut.get(bucket.model) ?? 0) + searches);
|
|
443
|
+
}
|
|
425
444
|
const slice = slices.get(bucket.model) ?? {
|
|
426
445
|
model: bucket.model,
|
|
427
446
|
calls: bucket.calls === null ? null : 0,
|
|
@@ -440,6 +459,8 @@ options) {
|
|
|
440
459
|
tierCeilingBuckets: 0,
|
|
441
460
|
tierCeilingUsd: 0,
|
|
442
461
|
tierFloorUsd: 0,
|
|
462
|
+
webSearchRequests: 0,
|
|
463
|
+
webSearchUsd: 0,
|
|
443
464
|
};
|
|
444
465
|
slice.calls = slice.calls === null || bucket.calls === null ? null : slice.calls + bucket.calls;
|
|
445
466
|
slice.inputTokens += bucket.inputTokens;
|
|
@@ -450,7 +471,11 @@ options) {
|
|
|
450
471
|
slice.cacheReadUsd += cacheReadUsd;
|
|
451
472
|
slice.cacheWriteUsd += cacheWriteUsd;
|
|
452
473
|
slice.outputUsd += outputUsd;
|
|
453
|
-
slice.totalUsd += inputUsd + cacheReadUsd + cacheWriteUsd + outputUsd;
|
|
474
|
+
slice.totalUsd += inputUsd + cacheReadUsd + cacheWriteUsd + outputUsd + searchUsd;
|
|
475
|
+
if (fee !== undefined) {
|
|
476
|
+
slice.webSearchRequests += searches;
|
|
477
|
+
slice.webSearchUsd += searchUsd;
|
|
478
|
+
}
|
|
454
479
|
slice.cachedTokensAtInputRateUsd += atInputRate;
|
|
455
480
|
slice.cacheWriteUsdIfAssumed1h += ifAssumed1h;
|
|
456
481
|
slice.writeTtlKnown = slice.writeTtlKnown && bucket.writeTtlKnown;
|
|
@@ -462,7 +487,7 @@ options) {
|
|
|
462
487
|
slices.set(bucket.model, slice);
|
|
463
488
|
const day = new Date(bucket.fromMs).toISOString().slice(0, 10);
|
|
464
489
|
const entry = days.get(day) ?? { usd: 0, calls: bucket.calls === null ? null : 0 };
|
|
465
|
-
entry.usd += inputUsd + cacheReadUsd + cacheWriteUsd + outputUsd;
|
|
490
|
+
entry.usd += inputUsd + cacheReadUsd + cacheWriteUsd + outputUsd + searchUsd;
|
|
466
491
|
entry.calls = entry.calls === null || bucket.calls === null ? null : entry.calls + bucket.calls;
|
|
467
492
|
days.set(day, entry);
|
|
468
493
|
}
|
|
@@ -480,6 +505,8 @@ options) {
|
|
|
480
505
|
cacheReadTokens: byModel.reduce((sum, s) => sum + s.cacheReadTokens, 0),
|
|
481
506
|
cacheWriteTokens: byModel.reduce((sum, s) => sum + s.cacheWriteTokens, 0),
|
|
482
507
|
outputTokens: byModel.reduce((sum, s) => sum + s.outputTokens, 0),
|
|
508
|
+
webSearchRequests: byModel.reduce((sum, s) => sum + s.webSearchRequests, 0),
|
|
509
|
+
webSearchUsd: byModel.reduce((sum, s) => sum + s.webSearchUsd, 0),
|
|
483
510
|
},
|
|
484
511
|
byModel,
|
|
485
512
|
byDay: [...days.entries()]
|
|
@@ -495,6 +522,11 @@ options) {
|
|
|
495
522
|
detail: `${left.buckets} row(s) of ${left.model} ran at ${left.tier}, which no catalogue rate here is the rate for, `
|
|
496
523
|
+ `and ${left.tokens.toLocaleString('en-US')} token(s) were left out rather than priced at the standard rate`,
|
|
497
524
|
})),
|
|
525
|
+
...[...searchesLeftOut.entries()].map(([model, searches]) => ({
|
|
526
|
+
kind: 'unpriced-web-search',
|
|
527
|
+
detail: `${searches.toLocaleString('en-US')} web search(es) on ${model}, whose row publishes no per-search fee, `
|
|
528
|
+
+ 'were left out rather than billed at another provider\'s',
|
|
529
|
+
})),
|
|
498
530
|
],
|
|
499
531
|
unavailable: pull.unavailable,
|
|
500
532
|
};
|