promptfoo 0.112.4 → 0.112.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/package.json +37 -32
- package/dist/src/app/assets/{index-CjtcgXub.js → index-CtILcypo.js} +125 -125
- package/dist/src/app/assets/{index.es-CTVmcuv3.js → index.es-D1K8VDHD.js} +1 -1
- package/dist/src/app/assets/{source-map-support-DcTymX4v.js → source-map-support-C0aSbjFf.js} +1 -1
- package/dist/src/app/assets/{sync-DT4gZaAv.js → sync-BE-MyvTb.js} +1 -1
- package/dist/src/app/index.html +1 -1
- package/dist/src/commands/eval.d.ts.map +1 -1
- package/dist/src/commands/eval.js +0 -5
- package/dist/src/commands/eval.js.map +1 -1
- package/dist/src/commands/init.d.ts.map +1 -1
- package/dist/src/commands/init.js +0 -2
- package/dist/src/commands/init.js.map +1 -1
- package/dist/src/commands/modelScan.d.ts.map +1 -1
- package/dist/src/commands/modelScan.js +0 -4
- package/dist/src/commands/modelScan.js.map +1 -1
- package/dist/src/commands/share.d.ts.map +1 -1
- package/dist/src/commands/share.js +0 -3
- package/dist/src/commands/share.js.map +1 -1
- package/dist/src/evaluator.d.ts.map +1 -1
- package/dist/src/evaluator.js +10 -1
- package/dist/src/evaluator.js.map +1 -1
- package/dist/src/fetch.d.ts +0 -1
- package/dist/src/fetch.d.ts.map +1 -1
- package/dist/src/fetch.js +17 -13
- package/dist/src/fetch.js.map +1 -1
- package/dist/src/main.d.ts +5 -1
- package/dist/src/main.d.ts.map +1 -1
- package/dist/src/main.js +31 -5
- package/dist/src/main.js.map +1 -1
- package/dist/src/providers/bedrock.d.ts +4 -3
- package/dist/src/providers/bedrock.d.ts.map +1 -1
- package/dist/src/providers/bedrock.js +109 -70
- package/dist/src/providers/bedrock.js.map +1 -1
- package/dist/src/providers/google/ai.studio.d.ts +10 -1
- package/dist/src/providers/google/ai.studio.d.ts.map +1 -1
- package/dist/src/providers/google/ai.studio.js +63 -1
- package/dist/src/providers/google/ai.studio.js.map +1 -1
- package/dist/src/providers/google/shared.d.ts.map +1 -1
- package/dist/src/providers/google/shared.js +14 -3
- package/dist/src/providers/google/shared.js.map +1 -1
- package/dist/src/providers/http.js +2 -2
- package/dist/src/providers/http.js.map +1 -1
- package/dist/src/providers/mcp/client.d.ts.map +1 -1
- package/dist/src/providers/mcp/client.js +7 -3
- package/dist/src/providers/mcp/client.js.map +1 -1
- package/dist/src/providers/sagemaker.d.ts +1 -5
- package/dist/src/providers/sagemaker.d.ts.map +1 -1
- package/dist/src/redteam/commands/generate.d.ts.map +1 -1
- package/dist/src/redteam/commands/generate.js +1 -6
- package/dist/src/redteam/commands/generate.js.map +1 -1
- package/dist/src/redteam/commands/poison.d.ts.map +1 -1
- package/dist/src/redteam/commands/poison.js +1 -5
- package/dist/src/redteam/commands/poison.js.map +1 -1
- package/dist/src/redteam/commands/run.d.ts.map +1 -1
- package/dist/src/redteam/commands/run.js +1 -39
- package/dist/src/redteam/commands/run.js.map +1 -1
- package/dist/src/redteam/constants.d.ts +3 -3
- package/dist/src/redteam/constants.d.ts.map +1 -1
- package/dist/src/redteam/constants.js +13 -13
- package/dist/src/redteam/constants.js.map +1 -1
- package/dist/src/redteam/plugins/index.d.ts.map +1 -1
- package/dist/src/redteam/plugins/index.js +5 -1
- package/dist/src/redteam/plugins/index.js.map +1 -1
- package/dist/src/redteam/plugins/pii.d.ts.map +1 -1
- package/dist/src/redteam/plugins/pii.js +5 -0
- package/dist/src/redteam/plugins/pii.js.map +1 -1
- package/dist/src/redteam/plugins/shellInjection.d.ts.map +1 -1
- package/dist/src/redteam/plugins/shellInjection.js +4 -2
- package/dist/src/redteam/plugins/shellInjection.js.map +1 -1
- package/dist/src/redteam/providers/crescendo/index.d.ts +1 -1
- package/dist/src/redteam/providers/crescendo/index.d.ts.map +1 -1
- package/dist/src/redteam/providers/crescendo/index.js +1 -1
- package/dist/src/redteam/providers/crescendo/index.js.map +1 -1
- package/dist/src/redteam/providers/iterative.d.ts.map +1 -1
- package/dist/src/redteam/providers/iterative.js +5 -2
- package/dist/src/redteam/providers/iterative.js.map +1 -1
- package/dist/src/redteam/providers/iterativeTree.d.ts +1 -1
- package/dist/src/redteam/providers/iterativeTree.d.ts.map +1 -1
- package/dist/src/redteam/providers/iterativeTree.js +3 -3
- package/dist/src/redteam/providers/iterativeTree.js.map +1 -1
- package/dist/src/redteam/providers/prompts.d.ts.map +1 -1
- package/dist/src/redteam/providers/prompts.js +20 -2
- package/dist/src/redteam/providers/prompts.js.map +1 -1
- package/dist/src/types/index.d.ts +65 -1150
- package/dist/src/types/index.d.ts.map +1 -1
- package/dist/src/types/shared.d.ts +3 -3
- package/dist/src/util/config/load.d.ts.map +1 -1
- package/dist/src/util/config/load.js +2 -1
- package/dist/src/util/config/load.js.map +1 -1
- package/dist/src/validators/providers.d.ts +3 -3
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +37 -32
package/dist/src/fetch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":";;;;;AAqCA,kCAWC;AAED,
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":"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"}
|
package/dist/src/main.d.ts
CHANGED
package/dist/src/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA+BpC;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,QA+B3D"}
|
package/dist/src/main.js
CHANGED
|
@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
34
34
|
};
|
|
35
35
|
})();
|
|
36
36
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
|
+
exports.addCommonOptionsRecursively = addCommonOptionsRecursively;
|
|
37
38
|
const commander_1 = require("commander");
|
|
38
39
|
const package_json_1 = require("../package.json");
|
|
39
40
|
const checkNodeVersion_1 = require("./checkNodeVersion");
|
|
@@ -62,7 +63,35 @@ const report_1 = require("./redteam/commands/report");
|
|
|
62
63
|
const run_1 = require("./redteam/commands/run");
|
|
63
64
|
const setup_1 = require("./redteam/commands/setup");
|
|
64
65
|
const updates_1 = require("./updates");
|
|
66
|
+
const util_1 = require("./util");
|
|
65
67
|
const default_1 = require("./util/config/default");
|
|
68
|
+
/**
|
|
69
|
+
* Adds verbose and env-file options to all commands recursively
|
|
70
|
+
*/
|
|
71
|
+
function addCommonOptionsRecursively(command) {
|
|
72
|
+
const hasVerboseOption = command.options.some((option) => option.short === '-v' || option.long === '--verbose');
|
|
73
|
+
if (!hasVerboseOption) {
|
|
74
|
+
command.option('-v, --verbose', 'Show debug logs', false);
|
|
75
|
+
}
|
|
76
|
+
const hasEnvFileOption = command.options.some((option) => option.long === '--env-file' || option.long === '--env-path');
|
|
77
|
+
if (!hasEnvFileOption) {
|
|
78
|
+
command.option('--env-file, --env-path <path>', 'Path to .env file');
|
|
79
|
+
}
|
|
80
|
+
command.hook('preAction', (thisCommand) => {
|
|
81
|
+
if (thisCommand.opts().verbose) {
|
|
82
|
+
(0, logger_1.setLogLevel)('debug');
|
|
83
|
+
logger_1.default.debug('Verbose mode enabled via --verbose flag');
|
|
84
|
+
}
|
|
85
|
+
const envPath = thisCommand.opts().envFile || thisCommand.opts().envPath;
|
|
86
|
+
if (envPath) {
|
|
87
|
+
(0, util_1.setupEnv)(envPath);
|
|
88
|
+
logger_1.default.debug(`Loading environment from ${envPath}`);
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
command.commands.forEach((subCommand) => {
|
|
92
|
+
addCommonOptionsRecursively(subCommand);
|
|
93
|
+
});
|
|
94
|
+
}
|
|
66
95
|
async function main() {
|
|
67
96
|
await (0, updates_1.checkForUpdates)();
|
|
68
97
|
await (0, migrate_1.runDbMigrations)();
|
|
@@ -77,7 +106,6 @@ async function main() {
|
|
|
77
106
|
program.help();
|
|
78
107
|
process.exitCode = 1;
|
|
79
108
|
});
|
|
80
|
-
program.option('-v, --verbose', 'Show debug logs', false);
|
|
81
109
|
// Main commands
|
|
82
110
|
(0, eval_1.evalCommand)(program, defaultConfig, defaultConfigPath);
|
|
83
111
|
(0, init_1.initCommand)(program);
|
|
@@ -107,11 +135,9 @@ async function main() {
|
|
|
107
135
|
(0, report_1.redteamReportCommand)(redteamBaseCommand);
|
|
108
136
|
(0, setup_1.redteamSetupCommand)(redteamBaseCommand);
|
|
109
137
|
(0, plugins_1.pluginsCommand)(redteamBaseCommand);
|
|
138
|
+
// Add common options to all commands recursively
|
|
139
|
+
addCommonOptionsRecursively(program);
|
|
110
140
|
program.parse();
|
|
111
|
-
const globalOpts = program.opts();
|
|
112
|
-
if (globalOpts.verbose) {
|
|
113
|
-
(0, logger_1.setLogLevel)('debug');
|
|
114
|
-
}
|
|
115
141
|
}
|
|
116
142
|
if (require.main === module) {
|
|
117
143
|
(0, checkNodeVersion_1.checkNodeVersion)();
|
package/dist/src/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import type { BedrockRuntime, Trace } from '@aws-sdk/client-bedrock-runtime';
|
|
2
2
|
import type { AwsCredentialIdentity, AwsCredentialIdentityProvider } from '@aws-sdk/types';
|
|
3
3
|
import type { EnvOverrides } from '../types/env';
|
|
4
|
-
import type { ApiEmbeddingProvider, ApiProvider, ProviderEmbeddingResponse, ProviderResponse } from '../types/providers';
|
|
4
|
+
import type { ApiEmbeddingProvider, ApiProvider, CallApiContextParams, ProviderEmbeddingResponse, ProviderResponse } from '../types/providers';
|
|
5
5
|
import type { TokenUsage } from '../types/shared';
|
|
6
|
+
export declare const coerceStrToNum: (value: string | number | undefined) => number | undefined;
|
|
6
7
|
interface BedrockOptions {
|
|
7
8
|
accessKeyId?: string;
|
|
8
9
|
profile?: string;
|
|
@@ -266,7 +267,7 @@ export interface BedrockDeepseekGenerationOptions extends BedrockOptions {
|
|
|
266
267
|
top_p?: number;
|
|
267
268
|
stop?: string[];
|
|
268
269
|
}
|
|
269
|
-
interface IBedrockModel {
|
|
270
|
+
export interface IBedrockModel {
|
|
270
271
|
params: (config: BedrockOptions, prompt: string, stop: string[], modelName?: string) => any;
|
|
271
272
|
output: (config: BedrockOptions, responseJson: any) => any;
|
|
272
273
|
tokenUsage?: (responseJson: any, promptText: string) => TokenUsage;
|
|
@@ -432,7 +433,7 @@ export declare abstract class AwsBedrockGenericProvider {
|
|
|
432
433
|
}
|
|
433
434
|
export declare class AwsBedrockCompletionProvider extends AwsBedrockGenericProvider implements ApiProvider {
|
|
434
435
|
static AWS_BEDROCK_COMPLETION_MODELS: string[];
|
|
435
|
-
callApi(prompt: string): Promise<ProviderResponse>;
|
|
436
|
+
callApi(prompt: string, context?: CallApiContextParams): Promise<ProviderResponse>;
|
|
436
437
|
}
|
|
437
438
|
export declare class AwsBedrockEmbeddingProvider extends AwsBedrockGenericProvider implements ApiEmbeddingProvider {
|
|
438
439
|
callApi(): Promise<ProviderEmbeddingResponse>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrock.d.ts","sourceRoot":"","sources":["../../../src/providers/bedrock.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bedrock.d.ts","sourceRoot":"","sources":["../../../src/providers/bedrock.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.AwsBedrockEmbeddingProvider = exports.AwsBedrockCompletionProvider = exports.AwsBedrockGenericProvider = exports.AWS_BEDROCK_MODELS = exports.BEDROCK_MODEL = exports.getLlamaModelHandler = exports.formatPromptLlama4 = exports.formatPromptLlama3Instruct = exports.formatPromptLlama2Chat = exports.LlamaVersion = void 0;
|
|
39
|
+
exports.AwsBedrockEmbeddingProvider = exports.AwsBedrockCompletionProvider = exports.AwsBedrockGenericProvider = exports.AWS_BEDROCK_MODELS = exports.BEDROCK_MODEL = exports.getLlamaModelHandler = exports.formatPromptLlama4 = exports.formatPromptLlama3Instruct = exports.formatPromptLlama2Chat = exports.LlamaVersion = exports.coerceStrToNum = void 0;
|
|
40
40
|
exports.parseValue = parseValue;
|
|
41
41
|
exports.addConfigParam = addConfigParam;
|
|
42
42
|
const sdk_1 = __importDefault(require("@anthropic-ai/sdk"));
|
|
@@ -49,6 +49,9 @@ const util_1 = require("../util");
|
|
|
49
49
|
const util_2 = require("./anthropic/util");
|
|
50
50
|
const bedrockUtil_1 = require("./bedrockUtil");
|
|
51
51
|
const shared_1 = require("./shared");
|
|
52
|
+
// Utility function to coerce string values to numbers
|
|
53
|
+
const coerceStrToNum = (value) => value === undefined ? undefined : typeof value === 'string' ? Number(value) : value;
|
|
54
|
+
exports.coerceStrToNum = coerceStrToNum;
|
|
52
55
|
function parseValue(value, defaultValue) {
|
|
53
56
|
if (typeof defaultValue === 'number') {
|
|
54
57
|
if (typeof value === 'string') {
|
|
@@ -179,12 +182,11 @@ const getLlamaModelHandler = (version) => {
|
|
|
179
182
|
},
|
|
180
183
|
output: (config, responseJson) => responseJson?.generation,
|
|
181
184
|
tokenUsage: (responseJson, promptText) => {
|
|
182
|
-
// Check for standard usage format
|
|
183
185
|
if (responseJson?.usage) {
|
|
184
186
|
return {
|
|
185
|
-
prompt: responseJson.usage.prompt_tokens,
|
|
186
|
-
completion: responseJson.usage.completion_tokens,
|
|
187
|
-
total: responseJson.usage.total_tokens,
|
|
187
|
+
prompt: (0, exports.coerceStrToNum)(responseJson.usage.prompt_tokens),
|
|
188
|
+
completion: (0, exports.coerceStrToNum)(responseJson.usage.completion_tokens),
|
|
189
|
+
total: (0, exports.coerceStrToNum)(responseJson.usage.total_tokens),
|
|
188
190
|
numRequests: 1,
|
|
189
191
|
};
|
|
190
192
|
}
|
|
@@ -192,10 +194,12 @@ const getLlamaModelHandler = (version) => {
|
|
|
192
194
|
const promptTokens = responseJson?.prompt_token_count;
|
|
193
195
|
const completionTokens = responseJson?.generation_token_count;
|
|
194
196
|
if (promptTokens !== undefined && completionTokens !== undefined) {
|
|
197
|
+
const promptTokensNum = (0, exports.coerceStrToNum)(promptTokens);
|
|
198
|
+
const completionTokensNum = (0, exports.coerceStrToNum)(completionTokens);
|
|
195
199
|
return {
|
|
196
|
-
prompt:
|
|
197
|
-
completion:
|
|
198
|
-
total:
|
|
200
|
+
prompt: promptTokensNum,
|
|
201
|
+
completion: completionTokensNum,
|
|
202
|
+
total: (promptTokensNum ?? 0) + (completionTokensNum ?? 0),
|
|
199
203
|
numRequests: 1,
|
|
200
204
|
};
|
|
201
205
|
}
|
|
@@ -234,9 +238,9 @@ exports.BEDROCK_MODEL = {
|
|
|
234
238
|
tokenUsage: (responseJson, promptText) => {
|
|
235
239
|
if (responseJson?.usage) {
|
|
236
240
|
return {
|
|
237
|
-
prompt: responseJson.usage.prompt_tokens,
|
|
238
|
-
completion: responseJson.usage.completion_tokens,
|
|
239
|
-
total: responseJson.usage.total_tokens,
|
|
241
|
+
prompt: (0, exports.coerceStrToNum)(responseJson.usage.prompt_tokens),
|
|
242
|
+
completion: (0, exports.coerceStrToNum)(responseJson.usage.completion_tokens),
|
|
243
|
+
total: (0, exports.coerceStrToNum)(responseJson.usage.total_tokens),
|
|
240
244
|
numRequests: 1,
|
|
241
245
|
};
|
|
242
246
|
}
|
|
@@ -305,9 +309,9 @@ exports.BEDROCK_MODEL = {
|
|
|
305
309
|
};
|
|
306
310
|
}
|
|
307
311
|
return {
|
|
308
|
-
prompt: usage.inputTokens,
|
|
309
|
-
completion: usage.outputTokens,
|
|
310
|
-
total: usage.totalTokens,
|
|
312
|
+
prompt: (0, exports.coerceStrToNum)(usage.inputTokens),
|
|
313
|
+
completion: (0, exports.coerceStrToNum)(usage.outputTokens),
|
|
314
|
+
total: (0, exports.coerceStrToNum)(usage.totalTokens),
|
|
311
315
|
numRequests: 1,
|
|
312
316
|
};
|
|
313
317
|
},
|
|
@@ -333,13 +337,21 @@ exports.BEDROCK_MODEL = {
|
|
|
333
337
|
};
|
|
334
338
|
}
|
|
335
339
|
const usage = responseJson.usage;
|
|
340
|
+
// Get input tokens
|
|
341
|
+
const inputTokens = usage.input_tokens || usage.prompt_tokens;
|
|
342
|
+
const inputTokensNum = (0, exports.coerceStrToNum)(inputTokens);
|
|
343
|
+
// Get output tokens
|
|
344
|
+
const outputTokens = usage.output_tokens || usage.completion_tokens;
|
|
345
|
+
const outputTokensNum = (0, exports.coerceStrToNum)(outputTokens);
|
|
346
|
+
// Get or calculate total tokens
|
|
347
|
+
let totalTokens = usage.totalTokens || usage.total_tokens;
|
|
348
|
+
if (totalTokens == null && inputTokensNum !== undefined && outputTokensNum !== undefined) {
|
|
349
|
+
totalTokens = inputTokensNum + outputTokensNum;
|
|
350
|
+
}
|
|
336
351
|
return {
|
|
337
|
-
prompt:
|
|
338
|
-
completion:
|
|
339
|
-
total:
|
|
340
|
-
usage.total_tokens ||
|
|
341
|
-
(usage.input_tokens || usage.prompt_tokens) +
|
|
342
|
-
(usage.output_tokens || usage.completion_tokens),
|
|
352
|
+
prompt: inputTokensNum,
|
|
353
|
+
completion: outputTokensNum,
|
|
354
|
+
total: (0, exports.coerceStrToNum)(totalTokens),
|
|
343
355
|
numRequests: 1,
|
|
344
356
|
};
|
|
345
357
|
},
|
|
@@ -417,13 +429,23 @@ exports.BEDROCK_MODEL = {
|
|
|
417
429
|
};
|
|
418
430
|
}
|
|
419
431
|
const usage = responseJson.usage;
|
|
432
|
+
// Get input tokens
|
|
433
|
+
const inputTokens = usage.input_tokens || usage.prompt_tokens;
|
|
434
|
+
const inputTokensNum = (0, exports.coerceStrToNum)(inputTokens);
|
|
435
|
+
// Get output tokens
|
|
436
|
+
const outputTokens = usage.output_tokens || usage.completion_tokens;
|
|
437
|
+
const outputTokensNum = (0, exports.coerceStrToNum)(outputTokens);
|
|
438
|
+
// Get or calculate total tokens
|
|
439
|
+
let totalTokens = usage.totalTokens || usage.total_tokens;
|
|
440
|
+
if ((totalTokens === null || totalTokens === undefined) &&
|
|
441
|
+
inputTokensNum !== undefined &&
|
|
442
|
+
outputTokensNum !== undefined) {
|
|
443
|
+
totalTokens = inputTokensNum + outputTokensNum;
|
|
444
|
+
}
|
|
420
445
|
return {
|
|
421
|
-
prompt:
|
|
422
|
-
completion:
|
|
423
|
-
total:
|
|
424
|
-
usage.total_tokens ||
|
|
425
|
-
(usage.input_tokens || usage.prompt_tokens) +
|
|
426
|
-
(usage.output_tokens || usage.completion_tokens),
|
|
446
|
+
prompt: inputTokensNum,
|
|
447
|
+
completion: outputTokensNum,
|
|
448
|
+
total: (0, exports.coerceStrToNum)(totalTokens),
|
|
427
449
|
numRequests: 1,
|
|
428
450
|
};
|
|
429
451
|
},
|
|
@@ -442,9 +464,9 @@ exports.BEDROCK_MODEL = {
|
|
|
442
464
|
// If token usage is provided by the API, use it
|
|
443
465
|
if (responseJson?.usage) {
|
|
444
466
|
return {
|
|
445
|
-
prompt: responseJson.usage.prompt_tokens,
|
|
446
|
-
completion: responseJson.usage.completion_tokens,
|
|
447
|
-
total: responseJson.usage.total_tokens,
|
|
467
|
+
prompt: (0, exports.coerceStrToNum)(responseJson.usage.prompt_tokens),
|
|
468
|
+
completion: (0, exports.coerceStrToNum)(responseJson.usage.completion_tokens),
|
|
469
|
+
total: (0, exports.coerceStrToNum)(responseJson.usage.total_tokens),
|
|
448
470
|
numRequests: 1,
|
|
449
471
|
};
|
|
450
472
|
}
|
|
@@ -481,11 +503,12 @@ exports.BEDROCK_MODEL = {
|
|
|
481
503
|
output: (config, responseJson) => responseJson?.generations[0]?.text,
|
|
482
504
|
tokenUsage: (responseJson, promptText) => {
|
|
483
505
|
if (responseJson?.meta?.billed_units) {
|
|
506
|
+
const inputTokens = (0, exports.coerceStrToNum)(responseJson.meta.billed_units.input_tokens);
|
|
507
|
+
const outputTokens = (0, exports.coerceStrToNum)(responseJson.meta.billed_units.output_tokens);
|
|
484
508
|
return {
|
|
485
|
-
prompt:
|
|
486
|
-
completion:
|
|
487
|
-
total:
|
|
488
|
-
responseJson.meta.billed_units.output_tokens,
|
|
509
|
+
prompt: inputTokens,
|
|
510
|
+
completion: outputTokens,
|
|
511
|
+
total: (inputTokens ?? 0) + (outputTokens ?? 0),
|
|
489
512
|
numRequests: 1,
|
|
490
513
|
};
|
|
491
514
|
}
|
|
@@ -533,11 +556,12 @@ exports.BEDROCK_MODEL = {
|
|
|
533
556
|
output: (config, responseJson) => responseJson?.text,
|
|
534
557
|
tokenUsage: (responseJson, promptText) => {
|
|
535
558
|
if (responseJson?.meta?.billed_units) {
|
|
559
|
+
const inputTokens = (0, exports.coerceStrToNum)(responseJson.meta.billed_units.input_tokens);
|
|
560
|
+
const outputTokens = (0, exports.coerceStrToNum)(responseJson.meta.billed_units.output_tokens);
|
|
536
561
|
return {
|
|
537
|
-
prompt:
|
|
538
|
-
completion:
|
|
539
|
-
total:
|
|
540
|
-
responseJson.meta.billed_units.output_tokens,
|
|
562
|
+
prompt: inputTokens,
|
|
563
|
+
completion: outputTokens,
|
|
564
|
+
total: (inputTokens ?? 0) + (outputTokens ?? 0),
|
|
541
565
|
numRequests: 1,
|
|
542
566
|
};
|
|
543
567
|
}
|
|
@@ -586,9 +610,9 @@ ${prompt}
|
|
|
586
610
|
tokenUsage: (responseJson, promptText) => {
|
|
587
611
|
if (responseJson?.usage) {
|
|
588
612
|
return {
|
|
589
|
-
prompt: responseJson.usage.prompt_tokens,
|
|
590
|
-
completion: responseJson.usage.completion_tokens,
|
|
591
|
-
total: responseJson.usage.total_tokens,
|
|
613
|
+
prompt: (0, exports.coerceStrToNum)(responseJson.usage.prompt_tokens),
|
|
614
|
+
completion: (0, exports.coerceStrToNum)(responseJson.usage.completion_tokens),
|
|
615
|
+
total: (0, exports.coerceStrToNum)(responseJson.usage.total_tokens),
|
|
592
616
|
numRequests: 1,
|
|
593
617
|
};
|
|
594
618
|
}
|
|
@@ -619,20 +643,25 @@ ${prompt}
|
|
|
619
643
|
tokenUsage: (responseJson, promptText) => {
|
|
620
644
|
if (responseJson?.usage) {
|
|
621
645
|
return {
|
|
622
|
-
prompt: responseJson.usage.prompt_tokens,
|
|
623
|
-
completion: responseJson.usage.completion_tokens,
|
|
624
|
-
total: responseJson.usage.total_tokens,
|
|
646
|
+
prompt: (0, exports.coerceStrToNum)(responseJson.usage.prompt_tokens),
|
|
647
|
+
completion: (0, exports.coerceStrToNum)(responseJson.usage.completion_tokens),
|
|
648
|
+
total: (0, exports.coerceStrToNum)(responseJson.usage.total_tokens),
|
|
625
649
|
numRequests: 1,
|
|
626
650
|
};
|
|
627
651
|
}
|
|
628
652
|
// Some models may return token information at the root level
|
|
629
653
|
if (responseJson?.prompt_tokens !== undefined &&
|
|
630
654
|
responseJson?.completion_tokens !== undefined) {
|
|
655
|
+
const promptTokens = (0, exports.coerceStrToNum)(responseJson.prompt_tokens);
|
|
656
|
+
const completionTokens = (0, exports.coerceStrToNum)(responseJson.completion_tokens);
|
|
657
|
+
let totalTokens = responseJson.total_tokens;
|
|
658
|
+
if (!totalTokens && promptTokens !== undefined && completionTokens !== undefined) {
|
|
659
|
+
totalTokens = promptTokens + completionTokens;
|
|
660
|
+
}
|
|
631
661
|
return {
|
|
632
|
-
prompt:
|
|
633
|
-
completion:
|
|
634
|
-
total:
|
|
635
|
-
responseJson.prompt_tokens + responseJson.completion_tokens,
|
|
662
|
+
prompt: promptTokens,
|
|
663
|
+
completion: completionTokens,
|
|
664
|
+
total: (promptTokens ?? 0) + (completionTokens ?? 0),
|
|
636
665
|
numRequests: 1,
|
|
637
666
|
};
|
|
638
667
|
}
|
|
@@ -664,21 +693,28 @@ ${prompt}
|
|
|
664
693
|
// Chat completion format (used by mistral-large-2407-v1:0)
|
|
665
694
|
if (responseJson?.prompt_tokens !== undefined &&
|
|
666
695
|
responseJson?.completion_tokens !== undefined) {
|
|
696
|
+
const promptTokens = (0, exports.coerceStrToNum)(responseJson.prompt_tokens);
|
|
697
|
+
const completionTokens = (0, exports.coerceStrToNum)(responseJson.completion_tokens);
|
|
667
698
|
return {
|
|
668
|
-
prompt:
|
|
669
|
-
completion:
|
|
670
|
-
total:
|
|
699
|
+
prompt: promptTokens,
|
|
700
|
+
completion: completionTokens,
|
|
701
|
+
total: (promptTokens ?? 0) + (completionTokens ?? 0),
|
|
671
702
|
numRequests: 1,
|
|
672
703
|
};
|
|
673
704
|
}
|
|
674
705
|
// Handle usage object format
|
|
675
706
|
if (responseJson?.usage?.prompt_tokens !== undefined &&
|
|
676
707
|
responseJson?.usage?.completion_tokens !== undefined) {
|
|
708
|
+
const promptTokens = (0, exports.coerceStrToNum)(responseJson.usage.prompt_tokens);
|
|
709
|
+
const completionTokens = (0, exports.coerceStrToNum)(responseJson.usage.completion_tokens);
|
|
710
|
+
let totalTokens = responseJson.usage.total_tokens;
|
|
711
|
+
if (!totalTokens && promptTokens !== undefined && completionTokens !== undefined) {
|
|
712
|
+
totalTokens = promptTokens + completionTokens;
|
|
713
|
+
}
|
|
677
714
|
return {
|
|
678
|
-
prompt:
|
|
679
|
-
completion:
|
|
680
|
-
total:
|
|
681
|
-
responseJson.usage.prompt_tokens + responseJson.usage.completion_tokens,
|
|
715
|
+
prompt: promptTokens,
|
|
716
|
+
completion: completionTokens,
|
|
717
|
+
total: (promptTokens ?? 0) + (completionTokens ?? 0),
|
|
682
718
|
numRequests: 1,
|
|
683
719
|
};
|
|
684
720
|
}
|
|
@@ -698,6 +734,7 @@ exports.AWS_BEDROCK_MODELS = {
|
|
|
698
734
|
'amazon.nova-lite-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
699
735
|
'amazon.nova-micro-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
700
736
|
'amazon.nova-pro-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
737
|
+
'amazon.nova-premier-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
701
738
|
'amazon.titan-text-express-v1': exports.BEDROCK_MODEL.TITAN_TEXT,
|
|
702
739
|
'amazon.titan-text-lite-v1': exports.BEDROCK_MODEL.TITAN_TEXT,
|
|
703
740
|
'amazon.titan-text-premier-v1:0': exports.BEDROCK_MODEL.TITAN_TEXT,
|
|
@@ -736,6 +773,7 @@ exports.AWS_BEDROCK_MODELS = {
|
|
|
736
773
|
'apac.amazon.nova-lite-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
737
774
|
'apac.amazon.nova-micro-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
738
775
|
'apac.amazon.nova-pro-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
776
|
+
'apac.amazon.nova-premier-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
739
777
|
'apac.anthropic.claude-3-5-sonnet-20240620-v1:0': exports.BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
740
778
|
'apac.anthropic.claude-3-haiku-20240307-v1:0': exports.BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
741
779
|
'apac.anthropic.claude-3-sonnet-20240229-v1:0': exports.BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
@@ -745,6 +783,7 @@ exports.AWS_BEDROCK_MODELS = {
|
|
|
745
783
|
'eu.amazon.nova-lite-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
746
784
|
'eu.amazon.nova-micro-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
747
785
|
'eu.amazon.nova-pro-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
786
|
+
'eu.amazon.nova-premier-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
748
787
|
'eu.anthropic.claude-3-5-sonnet-20240620-v1:0': exports.BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
749
788
|
'eu.anthropic.claude-3-haiku-20240307-v1:0': exports.BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
750
789
|
'eu.anthropic.claude-3-sonnet-20240229-v1:0': exports.BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
@@ -759,6 +798,7 @@ exports.AWS_BEDROCK_MODELS = {
|
|
|
759
798
|
'us.amazon.nova-lite-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
760
799
|
'us.amazon.nova-micro-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
761
800
|
'us.amazon.nova-pro-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
801
|
+
'us.amazon.nova-premier-v1:0': exports.BEDROCK_MODEL.AMAZON_NOVA,
|
|
762
802
|
'us.anthropic.claude-3-5-haiku-20241022-v1:0': exports.BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
763
803
|
'us.anthropic.claude-3-5-sonnet-20240620-v1:0': exports.BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
764
804
|
'us.anthropic.claude-3-5-sonnet-20241022-v2:0': exports.BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
@@ -906,7 +946,7 @@ class AwsBedrockGenericProvider {
|
|
|
906
946
|
}
|
|
907
947
|
exports.AwsBedrockGenericProvider = AwsBedrockGenericProvider;
|
|
908
948
|
class AwsBedrockCompletionProvider extends AwsBedrockGenericProvider {
|
|
909
|
-
async callApi(prompt) {
|
|
949
|
+
async callApi(prompt, context) {
|
|
910
950
|
let stop;
|
|
911
951
|
try {
|
|
912
952
|
stop = (0, envars_1.getEnvString)('AWS_BEDROCK_STOP') ? JSON.parse((0, envars_1.getEnvString)('AWS_BEDROCK_STOP')) : [];
|
|
@@ -919,7 +959,7 @@ class AwsBedrockCompletionProvider extends AwsBedrockGenericProvider {
|
|
|
919
959
|
logger_1.default.warn(`Unknown Amazon Bedrock model: ${this.modelName}. Assuming its API is Claude-like.`);
|
|
920
960
|
model = exports.BEDROCK_MODEL.CLAUDE_MESSAGES;
|
|
921
961
|
}
|
|
922
|
-
const params = model.params(this.config, prompt, stop, this.modelName);
|
|
962
|
+
const params = model.params({ ...this.config, ...context?.prompt.config }, prompt, stop, this.modelName);
|
|
923
963
|
logger_1.default.debug(`Calling Amazon Bedrock API: ${JSON.stringify(params)}`);
|
|
924
964
|
const cache = await (0, cache_1.getCache)();
|
|
925
965
|
const cacheKey = `bedrock:${this.modelName}:${JSON.stringify(params)}`;
|
|
@@ -982,29 +1022,28 @@ class AwsBedrockCompletionProvider extends AwsBedrockGenericProvider {
|
|
|
982
1022
|
logger_1.default.debug(`Token usage from model handler: ${JSON.stringify(tokenUsage)}`);
|
|
983
1023
|
}
|
|
984
1024
|
else {
|
|
985
|
-
//
|
|
986
|
-
logger_1.default.debug(`Extracting token usage from API response for ${this.modelName}`);
|
|
1025
|
+
// Get token counts, converting strings to numbers
|
|
987
1026
|
const promptTokens = output.usage?.inputTokens ??
|
|
988
|
-
output.usage?.prompt_tokens ??
|
|
989
1027
|
output.usage?.input_tokens ??
|
|
1028
|
+
output.usage?.prompt_tokens ??
|
|
990
1029
|
output.prompt_tokens ??
|
|
991
1030
|
output.prompt_token_count;
|
|
992
1031
|
const completionTokens = output.usage?.outputTokens ??
|
|
993
|
-
output.usage?.completion_tokens ??
|
|
994
1032
|
output.usage?.output_tokens ??
|
|
1033
|
+
output.usage?.completion_tokens ??
|
|
995
1034
|
output.completion_tokens ??
|
|
996
1035
|
output.generation_token_count;
|
|
997
|
-
const
|
|
998
|
-
|
|
999
|
-
|
|
1000
|
-
|
|
1001
|
-
|
|
1002
|
-
|
|
1003
|
-
|
|
1036
|
+
const promptTokensNum = (0, exports.coerceStrToNum)(promptTokens);
|
|
1037
|
+
const completionTokensNum = (0, exports.coerceStrToNum)(completionTokens);
|
|
1038
|
+
// Get total tokens from API or calculate it
|
|
1039
|
+
let totalTokens = output.usage?.totalTokens ?? output.usage?.total_tokens ?? output.total_tokens;
|
|
1040
|
+
if (!totalTokens && promptTokensNum !== undefined && completionTokensNum !== undefined) {
|
|
1041
|
+
totalTokens = promptTokensNum + completionTokensNum;
|
|
1042
|
+
}
|
|
1004
1043
|
tokenUsage = {
|
|
1005
|
-
|
|
1006
|
-
|
|
1007
|
-
|
|
1044
|
+
prompt: promptTokensNum,
|
|
1045
|
+
completion: completionTokensNum,
|
|
1046
|
+
total: (promptTokensNum ?? 0) + (completionTokensNum ?? 0),
|
|
1008
1047
|
numRequests: 1,
|
|
1009
1048
|
};
|
|
1010
1049
|
// If we couldn't extract any token counts but have a response, track usage for metrics
|