veryfront 0.1.957 → 0.1.959
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/esm/cli/commands/eval/command.d.ts +1 -0
- package/esm/cli/commands/eval/command.d.ts.map +1 -1
- package/esm/cli/commands/eval/command.js +33 -1
- package/esm/deno.js +1 -1
- package/esm/extensions/ext-llm-anthropic/src/anthropic-provider.d.ts.map +1 -1
- package/esm/extensions/ext-llm-anthropic/src/anthropic-stream.d.ts +1 -8
- package/esm/extensions/ext-llm-anthropic/src/anthropic-stream.d.ts.map +1 -1
- package/esm/extensions/ext-llm-anthropic/src/anthropic-stream.js +24 -0
- package/esm/src/provider/runtime-loader/provider-usage.d.ts +7 -0
- package/esm/src/provider/runtime-loader/provider-usage.d.ts.map +1 -1
- package/esm/src/provider/runtime-loader/provider-usage.js +14 -0
- package/esm/src/utils/version-constant.d.ts +1 -1
- package/esm/src/utils/version-constant.js +1 -1
- package/package.json +1 -1
|
@@ -56,6 +56,7 @@ type EvalRuntimeAuthConfig = Pick<VeryfrontConfig, "projectSlug" | "fs"> & {
|
|
|
56
56
|
projectSlug?: string;
|
|
57
57
|
};
|
|
58
58
|
export declare function hydrateEvalRuntimeAuth(projectDir: string, config: EvalRuntimeAuthConfig | null | undefined): Promise<import("../../shared/runtime-auth.js").RuntimeAuthContext>;
|
|
59
|
+
export declare function normalizeUsage(response: AgentResponse): {};
|
|
59
60
|
export declare function normalizeToolCalls(response: AgentResponse): EvalToolCall[];
|
|
60
61
|
type EvalModelComparisonConfig = {
|
|
61
62
|
baselineModel: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/eval/command.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/eval/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -339,12 +339,44 @@ export async function hydrateEvalRuntimeAuth(projectDir, config) {
|
|
|
339
339
|
projectSlug: resolveEvalRuntimeProjectSlug(config),
|
|
340
340
|
});
|
|
341
341
|
}
|
|
342
|
-
function normalizeUsage(response) {
|
|
342
|
+
export function normalizeUsage(response) {
|
|
343
343
|
return response.usage
|
|
344
344
|
? {
|
|
345
345
|
inputTokens: response.usage.promptTokens,
|
|
346
346
|
outputTokens: response.usage.completionTokens,
|
|
347
347
|
totalTokens: response.usage.totalTokens,
|
|
348
|
+
...(response.usage.cachedInputTokens !== undefined
|
|
349
|
+
? { cachedInputTokens: response.usage.cachedInputTokens }
|
|
350
|
+
: {}),
|
|
351
|
+
...(response.usage.cacheCreationInputTokens !== undefined
|
|
352
|
+
? { cacheCreationInputTokens: response.usage.cacheCreationInputTokens }
|
|
353
|
+
: {}),
|
|
354
|
+
...(response.usage.cacheReadInputTokens !== undefined
|
|
355
|
+
? { cacheReadInputTokens: response.usage.cacheReadInputTokens }
|
|
356
|
+
: {}),
|
|
357
|
+
...(response.usage.reasoningTokens !== undefined
|
|
358
|
+
? { reasoningTokens: response.usage.reasoningTokens }
|
|
359
|
+
: {}),
|
|
360
|
+
...(response.usage.billableInputTokens !== undefined
|
|
361
|
+
? { billableInputTokens: response.usage.billableInputTokens }
|
|
362
|
+
: {}),
|
|
363
|
+
...(response.usage.billableOutputTokens !== undefined
|
|
364
|
+
? { billableOutputTokens: response.usage.billableOutputTokens }
|
|
365
|
+
: {}),
|
|
366
|
+
...(response.usage.costUsd !== undefined ? { costUsd: response.usage.costUsd } : {}),
|
|
367
|
+
...(response.usage.providerCostUsd !== undefined
|
|
368
|
+
? { providerCostUsd: response.usage.providerCostUsd }
|
|
369
|
+
: {}),
|
|
370
|
+
...(response.usage.veryfrontChargeUsd !== undefined
|
|
371
|
+
? { veryfrontChargeUsd: response.usage.veryfrontChargeUsd }
|
|
372
|
+
: {}),
|
|
373
|
+
...(response.usage.costCredits !== undefined
|
|
374
|
+
? { costCredits: response.usage.costCredits }
|
|
375
|
+
: {}),
|
|
376
|
+
...(response.usage.costSource !== undefined ? { costSource: response.usage.costSource } : {}),
|
|
377
|
+
...(response.usage.usageCaptureStatus !== undefined
|
|
378
|
+
? { usageCaptureStatus: response.usage.usageCaptureStatus }
|
|
379
|
+
: {}),
|
|
348
380
|
}
|
|
349
381
|
: {};
|
|
350
382
|
}
|
package/esm/deno.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic-provider.d.ts","sourceRoot":"","sources":["../../../../src/extensions/ext-llm-anthropic/src/anthropic-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"anthropic-provider.d.ts","sourceRoot":"","sources":["../../../../src/extensions/ext-llm-anthropic/src/anthropic-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAE3F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EACL,kBAAkB,EAIlB,aAAa,EACb,UAAU,EACV,iBAAiB,EACjB,aAAa,EACb,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,EACtB,oBAAoB,EAKpB,+BAA+B,EAC/B,8BAA8B,EAC/B,MAAM,uCAAuC,CAAC;AAW/C,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,UAAU,EACV,iBAAiB,EACjB,aAAa,EACb,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,EACtB,oBAAoB,EACpB,+BAA+B,EAC/B,8BAA8B,GAC/B,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACjC;AA4KD,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,MAAM,GACd,YAAY,CAyEd;AAED,qBAAa,iBAAkB,YAAW,WAAW;IACnD,QAAQ,CAAC,EAAE,eAAe;IAE1B,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,YAAY;CAYtE"}
|
|
@@ -1,15 +1,8 @@
|
|
|
1
|
-
type RuntimeUsage
|
|
2
|
-
inputTokens?: number;
|
|
3
|
-
outputTokens?: number;
|
|
4
|
-
totalTokens?: number;
|
|
5
|
-
cacheCreationInputTokens?: number;
|
|
6
|
-
cacheReadInputTokens?: number;
|
|
7
|
-
};
|
|
1
|
+
import type { RuntimeUsage } from "../../../src/provider/shared/index.js";
|
|
8
2
|
export declare function normalizeAnthropicFinishReason(raw: unknown): string | {
|
|
9
3
|
unified: string;
|
|
10
4
|
raw: string;
|
|
11
5
|
} | null;
|
|
12
6
|
export declare function extractAnthropicUsage(payload: unknown): RuntimeUsage | undefined;
|
|
13
7
|
export declare function streamAnthropicCompatibleParts(stream: ReadableStream<Uint8Array>): AsyncIterable<unknown>;
|
|
14
|
-
export {};
|
|
15
8
|
//# sourceMappingURL=anthropic-stream.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic-stream.d.ts","sourceRoot":"","sources":["../../../../src/extensions/ext-llm-anthropic/src/anthropic-stream.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"anthropic-stream.d.ts","sourceRoot":"","sources":["../../../../src/extensions/ext-llm-anthropic/src/anthropic-stream.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAyB1E,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,OAAO,GACX,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAgBlD;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,GAAG,SAAS,CA8ChF;AAED,wBAAuB,8BAA8B,CACnD,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GACjC,aAAa,CAAC,OAAO,CAAC,CA6QxB"}
|
|
@@ -31,6 +31,9 @@ export function extractAnthropicUsage(payload) {
|
|
|
31
31
|
const outputTokens = usage.output_tokens;
|
|
32
32
|
const cacheCreationInputTokens = usage.cache_creation_input_tokens;
|
|
33
33
|
const cacheReadInputTokens = usage.cache_read_input_tokens;
|
|
34
|
+
const veryfront = readRecord(usage.veryfront);
|
|
35
|
+
const costSource = veryfront?.cost_source;
|
|
36
|
+
const usageCaptureStatus = veryfront?.usage_capture_status;
|
|
34
37
|
return {
|
|
35
38
|
inputTokens: typeof inputTokens === "number" ? inputTokens : undefined,
|
|
36
39
|
outputTokens: typeof outputTokens === "number" ? outputTokens : undefined,
|
|
@@ -40,6 +43,27 @@ export function extractAnthropicUsage(payload) {
|
|
|
40
43
|
: undefined,
|
|
41
44
|
...(typeof cacheCreationInputTokens === "number" ? { cacheCreationInputTokens } : {}),
|
|
42
45
|
...(typeof cacheReadInputTokens === "number" ? { cacheReadInputTokens } : {}),
|
|
46
|
+
...(typeof veryfront?.billable_input_tokens === "number"
|
|
47
|
+
? { billableInputTokens: veryfront.billable_input_tokens }
|
|
48
|
+
: {}),
|
|
49
|
+
...(typeof veryfront?.billable_output_tokens === "number"
|
|
50
|
+
? { billableOutputTokens: veryfront.billable_output_tokens }
|
|
51
|
+
: {}),
|
|
52
|
+
...(typeof veryfront?.provider_cost_usd === "number"
|
|
53
|
+
? { providerCostUsd: veryfront.provider_cost_usd }
|
|
54
|
+
: {}),
|
|
55
|
+
...(typeof veryfront?.veryfront_charge_usd === "number"
|
|
56
|
+
? { veryfrontChargeUsd: veryfront.veryfront_charge_usd }
|
|
57
|
+
: {}),
|
|
58
|
+
...(typeof veryfront?.cost_credits === "number" ? { costCredits: veryfront.cost_credits } : {}),
|
|
59
|
+
...(costSource === "gateway" || costSource === "missing" || costSource === "partial"
|
|
60
|
+
? { costSource }
|
|
61
|
+
: {}),
|
|
62
|
+
...(usageCaptureStatus === "complete" ||
|
|
63
|
+
usageCaptureStatus === "missing" ||
|
|
64
|
+
usageCaptureStatus === "partial"
|
|
65
|
+
? { usageCaptureStatus }
|
|
66
|
+
: {}),
|
|
43
67
|
};
|
|
44
68
|
}
|
|
45
69
|
export async function* streamAnthropicCompatibleParts(stream) {
|
|
@@ -6,6 +6,13 @@ export type RuntimeUsage = {
|
|
|
6
6
|
cacheCreationInputTokens?: number;
|
|
7
7
|
cacheReadInputTokens?: number;
|
|
8
8
|
reasoningTokens?: number;
|
|
9
|
+
billableInputTokens?: number;
|
|
10
|
+
billableOutputTokens?: number;
|
|
11
|
+
providerCostUsd?: number;
|
|
12
|
+
veryfrontChargeUsd?: number;
|
|
13
|
+
costCredits?: number;
|
|
14
|
+
costSource?: "gateway" | "missing" | "partial";
|
|
15
|
+
usageCaptureStatus?: "complete" | "partial" | "missing";
|
|
9
16
|
};
|
|
10
17
|
export declare function extractAnthropicUsage(payload: unknown): RuntimeUsage | undefined;
|
|
11
18
|
export declare function extractGoogleUsage(payload: unknown): RuntimeUsage | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-usage.d.ts","sourceRoot":"","sources":["../../../../src/src/provider/runtime-loader/provider-usage.ts"],"names":[],"mappings":"AAEA,6CAA6C;AAC7C,MAAM,MAAM,YAAY,GAAG;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"provider-usage.d.ts","sourceRoot":"","sources":["../../../../src/src/provider/runtime-loader/provider-usage.ts"],"names":[],"mappings":"AAEA,6CAA6C;AAC7C,MAAM,MAAM,YAAY,GAAG;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IAC/C,kBAAkB,CAAC,EAAE,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;CACzD,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,GAAG,SAAS,CAsBhF;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,GAAG,SAAS,CAsB7E;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,GAAG,SAAS,CAsB7E;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,GAAG,SAAS,CA2BtF;AAED,qCAAqC;AACrC,wBAAgB,UAAU,CACxB,OAAO,EAAE,YAAY,GAAG,SAAS,EACjC,IAAI,EAAE,YAAY,GAAG,SAAS,GAC7B,YAAY,GAAG,SAAS,CAkD1B"}
|
|
@@ -109,6 +109,13 @@ export function mergeUsage(current, next) {
|
|
|
109
109
|
current.cacheCreationInputTokens;
|
|
110
110
|
const cacheReadInputTokens = next.cacheReadInputTokens ?? current.cacheReadInputTokens;
|
|
111
111
|
const reasoningTokens = next.reasoningTokens ?? current.reasoningTokens;
|
|
112
|
+
const billableInputTokens = next.billableInputTokens ?? current.billableInputTokens;
|
|
113
|
+
const billableOutputTokens = next.billableOutputTokens ?? current.billableOutputTokens;
|
|
114
|
+
const providerCostUsd = next.providerCostUsd ?? current.providerCostUsd;
|
|
115
|
+
const veryfrontChargeUsd = next.veryfrontChargeUsd ?? current.veryfrontChargeUsd;
|
|
116
|
+
const costCredits = next.costCredits ?? current.costCredits;
|
|
117
|
+
const costSource = next.costSource ?? current.costSource;
|
|
118
|
+
const usageCaptureStatus = next.usageCaptureStatus ?? current.usageCaptureStatus;
|
|
112
119
|
// Prefer the provider-reported total (latest non-undefined wins, matching the
|
|
113
120
|
// ?? semantics used for input/output above). Providers like Gemini 2.5
|
|
114
121
|
// thinking models and OpenAI reasoning models report a total that exceeds
|
|
@@ -127,5 +134,12 @@ export function mergeUsage(current, next) {
|
|
|
127
134
|
...(cacheCreationInputTokens !== undefined ? { cacheCreationInputTokens } : {}),
|
|
128
135
|
...(cacheReadInputTokens !== undefined ? { cacheReadInputTokens } : {}),
|
|
129
136
|
...(reasoningTokens !== undefined ? { reasoningTokens } : {}),
|
|
137
|
+
...(billableInputTokens !== undefined ? { billableInputTokens } : {}),
|
|
138
|
+
...(billableOutputTokens !== undefined ? { billableOutputTokens } : {}),
|
|
139
|
+
...(providerCostUsd !== undefined ? { providerCostUsd } : {}),
|
|
140
|
+
...(veryfrontChargeUsd !== undefined ? { veryfrontChargeUsd } : {}),
|
|
141
|
+
...(costCredits !== undefined ? { costCredits } : {}),
|
|
142
|
+
...(costSource !== undefined ? { costSource } : {}),
|
|
143
|
+
...(usageCaptureStatus !== undefined ? { usageCaptureStatus } : {}),
|
|
130
144
|
};
|
|
131
145
|
}
|