promptfoo 0.73.0 → 0.73.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +15 -4
- package/dist/package.json +1 -1
- package/dist/src/commands/generate/redteam.d.ts.map +1 -1
- package/dist/src/commands/generate/redteam.js +10 -0
- package/dist/src/commands/generate/redteam.js.map +1 -1
- package/dist/src/commands/redteam.d.ts.map +1 -1
- package/dist/src/commands/redteam.js +24 -4
- package/dist/src/commands/redteam.js.map +1 -1
- package/dist/src/prompts/processors/yaml.d.ts.map +1 -1
- package/dist/src/prompts/processors/yaml.js +2 -8
- package/dist/src/prompts/processors/yaml.js.map +1 -1
- package/dist/src/providers/bedrock.d.ts +182 -0
- package/dist/src/providers/bedrock.d.ts.map +1 -1
- package/dist/src/providers/bedrock.js +37 -33
- package/dist/src/providers/bedrock.js.map +1 -1
- package/dist/src/redteam/index.d.ts.map +1 -1
- package/dist/src/redteam/index.js +0 -1
- package/dist/src/redteam/index.js.map +1 -1
- package/dist/src/redteam/purpose.d.ts.map +1 -1
- package/dist/src/redteam/purpose.js +10 -3
- package/dist/src/redteam/purpose.js.map +1 -1
- package/dist/src/web/nextui/404/index.html +1 -1
- package/dist/src/web/nextui/404.html +1 -1
- package/dist/src/web/nextui/_next/static/chunks/737-da96e7475cd51628.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/auth/login/{page-7247b17e8f179a46.js → page-6214330a95aad25c.js} +1 -1
- package/dist/src/web/nextui/_next/static/chunks/app/auth/signup/{page-8560afaf494f9882.js → page-9568bbad5c19d0c0.js} +1 -1
- package/dist/src/web/nextui/_next/static/chunks/app/datasets/page-b1cc3b59d0bc97eb.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/eval/[id]/not-found-ce320e6d1e6d1d23.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/eval/[id]/page-c7d540f6b584c1ad.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/eval/page-86b8e9b498011d89.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/{layout-15abf0d1049cb47c.js → layout-8c4345194197c406.js} +1 -1
- package/dist/src/web/nextui/_next/static/chunks/app/{page-122e9cfa52eb218a.js → page-0613739abb0e8dc3.js} +1 -1
- package/dist/src/web/nextui/_next/static/chunks/app/progress/{page-a62ca531a4bb4149.js → page-2d90754723eb1b96.js} +1 -1
- package/dist/src/web/nextui/_next/static/chunks/app/prompts/{page-10bb2e571670139c.js → page-302f44de5b590062.js} +1 -1
- package/dist/src/web/nextui/_next/static/chunks/app/report/{page-a8b83960f08e2bb2.js → page-53738967c111db11.js} +1 -1
- package/dist/src/web/nextui/_next/static/chunks/app/setup/{page-6ea3e180c3116fb2.js → page-412396ae32fb0ce9.js} +1 -1
- package/dist/src/web/nextui/_next/static/chunks/main-app-2984edea17efbc9d.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/{webpack-ee33d95b3e219985.js → webpack-4775581e8d774c8c.js} +1 -1
- package/dist/src/web/nextui/_next/static/css/4463e29e24d44845.css +1 -0
- package/dist/src/web/nextui/auth/login/index.html +1 -1
- package/dist/src/web/nextui/auth/login/index.txt +6 -6
- package/dist/src/web/nextui/auth/signup/index.html +1 -1
- package/dist/src/web/nextui/auth/signup/index.txt +6 -6
- package/dist/src/web/nextui/datasets/index.html +1 -1
- package/dist/src/web/nextui/datasets/index.txt +6 -6
- package/dist/src/web/nextui/eval/index.html +1 -1
- package/dist/src/web/nextui/eval/index.txt +6 -6
- package/dist/src/web/nextui/index.html +1 -1
- package/dist/src/web/nextui/index.txt +5 -5
- package/dist/src/web/nextui/progress/index.html +1 -1
- package/dist/src/web/nextui/progress/index.txt +6 -6
- package/dist/src/web/nextui/prompts/index.html +1 -1
- package/dist/src/web/nextui/prompts/index.txt +6 -6
- package/dist/src/web/nextui/report/index.html +1 -1
- package/dist/src/web/nextui/report/index.txt +6 -6
- package/dist/src/web/nextui/setup/index.html +1 -1
- package/dist/src/web/nextui/setup/index.txt +7 -7
- package/dist/test/prompts.processors.yaml.test.js +2 -11
- package/dist/test/prompts.processors.yaml.test.js.map +1 -1
- package/dist/test/prompts.test.js +2 -3
- package/dist/test/prompts.test.js.map +1 -1
- package/dist/test/providers.bedrock.test.js +65 -0
- package/dist/test/providers.bedrock.test.js.map +1 -1
- package/dist/test/redteam/purpose.test.js +1 -1
- package/dist/test/redteam/purpose.test.js.map +1 -1
- package/package.json +1 -1
- package/dist/src/web/nextui/_next/static/chunks/737-32d5472455807d7a.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/datasets/page-6e6ec3c778ccd110.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/eval/[id]/not-found-fe10d5df88bc44ef.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/eval/[id]/page-057e5eb83e0f614b.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/eval/page-88fa70fc5bf755bc.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/main-app-7a1376166cb8b72e.js +0 -1
- package/dist/src/web/nextui/_next/static/css/13f881e4290b6d59.css +0 -1
- /package/dist/src/web/nextui/_next/static/{L-tpppAe26U-euPv62afH → 85-O57Tjz2umr6t4Za4gW}/_buildManifest.js +0 -0
- /package/dist/src/web/nextui/_next/static/{L-tpppAe26U-euPv62afH → 85-O57Tjz2umr6t4Za4gW}/_ssgManifest.js +0 -0
package/README.md
CHANGED
|
@@ -6,13 +6,14 @@
|
|
|
6
6
|
|
|
7
7
|
[](https://discord.gg/gHPS9jjfbs)
|
|
8
8
|
|
|
9
|
-
`promptfoo` is a tool for testing and
|
|
9
|
+
`promptfoo` is a tool for testing, evaluating, and red-teaming LLM apps.
|
|
10
10
|
|
|
11
11
|
With promptfoo, you can:
|
|
12
12
|
|
|
13
13
|
- **Build reliable prompts, models, and RAGs** with benchmarks specific to your use-case
|
|
14
|
+
- **Secure your apps** with automated [red teaming](https://www.promptfoo.dev/docs/red-team/) and pentesting
|
|
14
15
|
- **Speed up evaluations** with caching, concurrency, and live reloading
|
|
15
|
-
- **Score outputs automatically** by defining [metrics](https://www.promptfoo.dev/docs/configuration/expected-outputs)
|
|
16
|
+
- **Score outputs automatically** by defining [metrics](https://www.promptfoo.dev/docs/configuration/expected-outputs)
|
|
16
17
|
- Use as a [CLI](https://www.promptfoo.dev/docs/usage/command-line), [library](https://www.promptfoo.dev/docs/usage/node-package), or in [CI/CD](https://www.promptfoo.dev/docs/integrations/github-action)
|
|
17
18
|
- Use OpenAI, Anthropic, Azure, Google, HuggingFace, open-source models like Llama, or integrate custom API providers for [any LLM API](https://www.promptfoo.dev/docs/providers)
|
|
18
19
|
|
|
@@ -54,7 +55,7 @@ As you collect more examples and establish a user feedback loop, continue to bui
|
|
|
54
55
|
|
|
55
56
|
<img width="772" alt="LLM ops" src="https://github.com/promptfoo/promptfoo/assets/310310/cf0461a7-2832-4362-9fbb-4ebd911d06ff">
|
|
56
57
|
|
|
57
|
-
## Usage
|
|
58
|
+
## Usage - evals
|
|
58
59
|
|
|
59
60
|
To get started, run this command:
|
|
60
61
|
|
|
@@ -62,7 +63,7 @@ To get started, run this command:
|
|
|
62
63
|
npx promptfoo@latest init
|
|
63
64
|
```
|
|
64
65
|
|
|
65
|
-
This will create
|
|
66
|
+
This will create a `promptfooconfig.yaml` placeholder in your current directory.
|
|
66
67
|
|
|
67
68
|
After editing the prompts and variables to your liking, run the eval command to kick off an evaluation:
|
|
68
69
|
|
|
@@ -70,6 +71,16 @@ After editing the prompts and variables to your liking, run the eval command to
|
|
|
70
71
|
npx promptfoo@latest eval
|
|
71
72
|
```
|
|
72
73
|
|
|
74
|
+
## Usage - red teaming/pentesting
|
|
75
|
+
|
|
76
|
+
Run this command:
|
|
77
|
+
|
|
78
|
+
```sh
|
|
79
|
+
npx promptfoo@latest redteam init
|
|
80
|
+
```
|
|
81
|
+
|
|
82
|
+
This will ask you questions about what types of vulnerabilities you want to find and walk you through running your first scan.
|
|
83
|
+
|
|
73
84
|
### Configuration
|
|
74
85
|
|
|
75
86
|
The YAML configuration format runs each prompt through a series of example inputs (aka "test case") and checks if they meet requirements (aka "assert").
|
package/dist/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redteam.d.ts","sourceRoot":"","sources":["../../../../src/commands/generate/redteam.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBpC,OAAO,EAEL,sBAAsB,EAGvB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAa,aAAa,EAAE,MAAM,aAAa,CAAC;AAGvD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"redteam.d.ts","sourceRoot":"","sources":["../../../../src/commands/generate/redteam.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBpC,OAAO,EAEL,sBAAsB,EAGvB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAa,aAAa,EAAE,MAAM,aAAa,CAAC;AAGvD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,sBAAsB,iBAiJtE;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,EACrC,iBAAiB,EAAE,MAAM,GAAG,SAAS,QA+FtC"}
|
|
@@ -77,6 +77,14 @@ async function doGenerateRedteam(options) {
|
|
|
77
77
|
numTestsExisting: (testSuite.tests || []).length,
|
|
78
78
|
});
|
|
79
79
|
await telemetry_1.default.send();
|
|
80
|
+
if (!process.env.OPENAI_API_KEY && !redteamConfig?.provider) {
|
|
81
|
+
logger_1.default.warn((0, dedent_1.default) `\n${chalk_1.default.bold('Warning: OPENAI_API_KEY environment variable is not set.')}
|
|
82
|
+
|
|
83
|
+
Please set this environment variable in order to generate tests.
|
|
84
|
+
|
|
85
|
+
For more info on configuring custom providers, see the documentation: https://www.promptfoo.dev/docs/red-team/configuration/\n
|
|
86
|
+
`);
|
|
87
|
+
}
|
|
80
88
|
let plugins = redteamConfig?.plugins ??
|
|
81
89
|
Array.from(constants_1.DEFAULT_PLUGINS).map((plugin) => ({
|
|
82
90
|
id: plugin,
|
|
@@ -142,6 +150,8 @@ async function doGenerateRedteam(options) {
|
|
|
142
150
|
else if (options.write && configPath) {
|
|
143
151
|
const existingConfig = js_yaml_1.default.load(fs.readFileSync(configPath, 'utf8'));
|
|
144
152
|
existingConfig.tests = [...(existingConfig.tests || []), ...redteamTests];
|
|
153
|
+
existingConfig.metadata = existingConfig.metadata || {};
|
|
154
|
+
existingConfig.metadata.redteam = true;
|
|
145
155
|
fs.writeFileSync(configPath, js_yaml_1.default.dump(existingConfig));
|
|
146
156
|
logger_1.default.info(`\nWrote ${redteamTests.length} new test cases to ${configPath}`);
|
|
147
157
|
logger_1.default.info('\n' + chalk_1.default.green(`Run ${chalk_1.default.bold('promptfoo eval')} to run the generated tests`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redteam.js","sourceRoot":"","sources":["../../../../src/commands/generate/redteam.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BA,
|
|
1
|
+
{"version":3,"file":"redteam.js","sourceRoot":"","sources":["../../../../src/commands/generate/redteam.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redteam.d.ts","sourceRoot":"","sources":["../../../src/commands/redteam.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkBpC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"redteam.d.ts","sourceRoot":"","sources":["../../../src/commands/redteam.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkBpC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,QAiP9C"}
|
|
@@ -84,7 +84,7 @@ function redteamCommand(program) {
|
|
|
84
84
|
if (previousConfigExists) {
|
|
85
85
|
promptChoices.push({ name: 'Use prompts from existing config', value: 'existing' });
|
|
86
86
|
}
|
|
87
|
-
// Question
|
|
87
|
+
// Question: Prompt
|
|
88
88
|
const promptChoice = await (0, rawlist_1.default)({
|
|
89
89
|
message: 'How would you like to specify the prompt?',
|
|
90
90
|
choices: promptChoices,
|
|
@@ -106,10 +106,10 @@ function redteamCommand(program) {
|
|
|
106
106
|
(0, tiny_invariant_1.default)(existingConfig?.prompts, 'No prompts found in existing configuration');
|
|
107
107
|
prompts = existingConfig?.prompts;
|
|
108
108
|
}
|
|
109
|
-
// Question
|
|
109
|
+
// Question: Provider
|
|
110
110
|
let provider;
|
|
111
111
|
const providerChoice = await (0, rawlist_1.default)({
|
|
112
|
-
message: 'Choose a provider:',
|
|
112
|
+
message: 'Choose a provider to target:',
|
|
113
113
|
choices: [
|
|
114
114
|
{ name: 'openai:gpt-3.5-turbo', value: 'openai:gpt-3.5-turbo' },
|
|
115
115
|
{ name: 'openai:gpt-4o-mini', value: 'openai:gpt-4o-mini' },
|
|
@@ -134,7 +134,27 @@ function redteamCommand(program) {
|
|
|
134
134
|
else {
|
|
135
135
|
provider = providerChoice;
|
|
136
136
|
}
|
|
137
|
-
// Question
|
|
137
|
+
// Question: OpenAI API key
|
|
138
|
+
if (!process.env.OPENAI_API_KEY) {
|
|
139
|
+
const apiKeyChoice = await (0, rawlist_1.default)({
|
|
140
|
+
message: 'An OpenAI API key is required to generate the adversarial dataset. How would you like to proceed?',
|
|
141
|
+
choices: [
|
|
142
|
+
{ name: 'Enter API key now (sets the environment variable)', value: 'enter' },
|
|
143
|
+
{ name: "I'll set it later", value: 'later' },
|
|
144
|
+
],
|
|
145
|
+
});
|
|
146
|
+
if (apiKeyChoice === 'enter') {
|
|
147
|
+
const apiKey = await (0, input_1.default)({
|
|
148
|
+
message: 'Enter your OpenAI API key:',
|
|
149
|
+
});
|
|
150
|
+
process.env.OPENAI_API_KEY = apiKey;
|
|
151
|
+
logger_1.default.info('OPENAI_API_KEY environment variable has been set for this session.');
|
|
152
|
+
}
|
|
153
|
+
else {
|
|
154
|
+
logger_1.default.warn('Remember to set the OPENAI_API_KEY environment variable before generating the dataset.');
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
// Question: Plugins
|
|
138
158
|
const pluginChoices = Array.from(constants_1.ALL_PLUGINS)
|
|
139
159
|
.sort()
|
|
140
160
|
.map((plugin) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redteam.js","sourceRoot":"","sources":["../../../src/commands/redteam.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyBA,
|
|
1
|
+
{"version":3,"file":"redteam.js","sourceRoot":"","sources":["../../../src/commands/redteam.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaml.d.ts","sourceRoot":"","sources":["../../../../src/prompts/processors/yaml.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"yaml.d.ts","sourceRoot":"","sources":["../../../../src/prompts/processors/yaml.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CASnF"}
|
|
@@ -22,13 +22,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
26
|
exports.processYamlFile = processYamlFile;
|
|
30
27
|
const fs = __importStar(require("fs"));
|
|
31
|
-
const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
32
28
|
/**
|
|
33
29
|
* Processes a YAML file to extract prompts.
|
|
34
30
|
* This function reads a YAML file, parses it, and maps each entry to a `Prompt` object.
|
|
@@ -40,13 +36,11 @@ const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
|
40
36
|
* @throws Will throw an error if the file cannot be read or parsed.
|
|
41
37
|
*/
|
|
42
38
|
function processYamlFile(filePath, prompt) {
|
|
39
|
+
// Yaml is parsed later - just pass it through.
|
|
43
40
|
const fileContents = fs.readFileSync(filePath, 'utf8');
|
|
44
|
-
const yamlContent = js_yaml_1.default.load(fileContents, {
|
|
45
|
-
json: true,
|
|
46
|
-
});
|
|
47
41
|
return [
|
|
48
42
|
{
|
|
49
|
-
raw:
|
|
43
|
+
raw: fileContents,
|
|
50
44
|
label: prompt.label || `${filePath}: ${fileContents}`,
|
|
51
45
|
},
|
|
52
46
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../../../src/prompts/processors/yaml.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../../../src/prompts/processors/yaml.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAaA,0CASC;AAtBD,uCAAyB;AAGzB;;;;;;;;;GASG;AACH,SAAgB,eAAe,CAAC,QAAgB,EAAE,MAAuB;IACvE,+CAA+C;IAC/C,MAAM,YAAY,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACvD,OAAO;QACL;YACE,GAAG,EAAE,YAAY;YACjB,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,GAAG,QAAQ,KAAK,YAAY,EAAE;SACtD;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -3,11 +3,146 @@ import type { ApiProvider, ApiEmbeddingProvider, EnvOverrides, ProviderResponse,
|
|
|
3
3
|
interface BedrockOptions {
|
|
4
4
|
region?: string;
|
|
5
5
|
}
|
|
6
|
+
interface TextGenerationOptions {
|
|
7
|
+
maxTokenCount?: number;
|
|
8
|
+
stopSequences?: Array<string>;
|
|
9
|
+
temperature?: number;
|
|
10
|
+
topP?: number;
|
|
11
|
+
}
|
|
12
|
+
interface BedrockTextGenerationOptions extends BedrockOptions {
|
|
13
|
+
textGenerationConfig?: TextGenerationOptions;
|
|
14
|
+
}
|
|
15
|
+
interface BedrockClaudeLegacyCompletionOptions extends BedrockOptions {
|
|
16
|
+
max_tokens_to_sample?: number;
|
|
17
|
+
temperature?: number;
|
|
18
|
+
top_p?: number;
|
|
19
|
+
top_k?: number;
|
|
20
|
+
}
|
|
21
|
+
export interface BedrockClaudeMessagesCompletionOptions extends BedrockOptions {
|
|
22
|
+
max_tokens?: number;
|
|
23
|
+
temperature?: number;
|
|
24
|
+
anthropic_version?: string;
|
|
25
|
+
tools?: {
|
|
26
|
+
name: string;
|
|
27
|
+
description: string;
|
|
28
|
+
input_schema: any;
|
|
29
|
+
}[];
|
|
30
|
+
tool_choice?: {
|
|
31
|
+
type: 'any' | 'auto' | 'tool';
|
|
32
|
+
name?: string;
|
|
33
|
+
};
|
|
34
|
+
}
|
|
6
35
|
interface BedrockLlamaGenerationOptions extends BedrockOptions {
|
|
7
36
|
temperature?: number;
|
|
8
37
|
top_p?: number;
|
|
9
38
|
max_gen_len?: number;
|
|
10
39
|
}
|
|
40
|
+
interface BedrockCohereCommandGenerationOptions extends BedrockOptions {
|
|
41
|
+
temperature?: number;
|
|
42
|
+
p?: number;
|
|
43
|
+
k?: number;
|
|
44
|
+
max_tokens?: number;
|
|
45
|
+
stop_sequences?: Array<string>;
|
|
46
|
+
return_likelihoods?: string;
|
|
47
|
+
stream?: boolean;
|
|
48
|
+
num_generations?: number;
|
|
49
|
+
logit_bias?: Record<string, number>;
|
|
50
|
+
truncate?: string;
|
|
51
|
+
}
|
|
52
|
+
interface BedrockCohereCommandRGenerationOptions extends BedrockOptions {
|
|
53
|
+
message?: string;
|
|
54
|
+
chat_history?: Array<{
|
|
55
|
+
role: 'USER' | 'CHATBOT';
|
|
56
|
+
message: string;
|
|
57
|
+
}>;
|
|
58
|
+
documents?: Array<{
|
|
59
|
+
title: string;
|
|
60
|
+
snippet: string;
|
|
61
|
+
}>;
|
|
62
|
+
search_queries_only?: boolean;
|
|
63
|
+
preamble?: string;
|
|
64
|
+
max_tokens?: number;
|
|
65
|
+
temperature?: number;
|
|
66
|
+
p?: number;
|
|
67
|
+
k?: number;
|
|
68
|
+
prompt_truncation?: string;
|
|
69
|
+
frequency_penalty?: number;
|
|
70
|
+
presence_penalty?: number;
|
|
71
|
+
seed?: number;
|
|
72
|
+
return_prompt?: boolean;
|
|
73
|
+
tools?: Array<{
|
|
74
|
+
name: string;
|
|
75
|
+
description: string;
|
|
76
|
+
parameter_definitions: Record<string, {
|
|
77
|
+
description: string;
|
|
78
|
+
type: string;
|
|
79
|
+
required: boolean;
|
|
80
|
+
}>;
|
|
81
|
+
}>;
|
|
82
|
+
tool_results?: Array<{
|
|
83
|
+
call: {
|
|
84
|
+
name: string;
|
|
85
|
+
parameters: Record<string, string>;
|
|
86
|
+
};
|
|
87
|
+
outputs: Array<{
|
|
88
|
+
text: string;
|
|
89
|
+
}>;
|
|
90
|
+
}>;
|
|
91
|
+
stop_sequences?: Array<string>;
|
|
92
|
+
raw_prompting?: boolean;
|
|
93
|
+
}
|
|
94
|
+
interface CohereCommandRRequestParams {
|
|
95
|
+
message: string;
|
|
96
|
+
chat_history: {
|
|
97
|
+
role: 'USER' | 'CHATBOT';
|
|
98
|
+
message: string;
|
|
99
|
+
}[];
|
|
100
|
+
documents?: {
|
|
101
|
+
title: string;
|
|
102
|
+
snippet: string;
|
|
103
|
+
}[];
|
|
104
|
+
search_queries_only?: boolean;
|
|
105
|
+
preamble?: string;
|
|
106
|
+
max_tokens?: number;
|
|
107
|
+
temperature?: number;
|
|
108
|
+
p?: number;
|
|
109
|
+
k?: number;
|
|
110
|
+
prompt_truncation?: string;
|
|
111
|
+
frequency_penalty?: number;
|
|
112
|
+
presence_penalty?: number;
|
|
113
|
+
seed?: number;
|
|
114
|
+
return_prompt?: boolean;
|
|
115
|
+
tools?: {
|
|
116
|
+
name: string;
|
|
117
|
+
description: string;
|
|
118
|
+
parameter_definitions: {
|
|
119
|
+
[parameterName: string]: {
|
|
120
|
+
description: string;
|
|
121
|
+
type: string;
|
|
122
|
+
required: boolean;
|
|
123
|
+
};
|
|
124
|
+
};
|
|
125
|
+
}[];
|
|
126
|
+
tool_results?: {
|
|
127
|
+
call: {
|
|
128
|
+
name: string;
|
|
129
|
+
parameters: {
|
|
130
|
+
[parameterName: string]: string;
|
|
131
|
+
};
|
|
132
|
+
};
|
|
133
|
+
outputs: {
|
|
134
|
+
text: string;
|
|
135
|
+
}[];
|
|
136
|
+
}[];
|
|
137
|
+
stop_sequences?: string[];
|
|
138
|
+
raw_prompting?: boolean;
|
|
139
|
+
}
|
|
140
|
+
interface BedrockMistralGenerationOptions extends BedrockOptions {
|
|
141
|
+
max_tokens?: number;
|
|
142
|
+
temperature?: number;
|
|
143
|
+
top_p?: number;
|
|
144
|
+
top_k?: number;
|
|
145
|
+
}
|
|
11
146
|
export declare function parseValue(value: string, defaultValue: any): string | number;
|
|
12
147
|
export declare function addConfigParam(params: any, key: string, configValue: any, envValue?: string | undefined, defaultValue?: any): void;
|
|
13
148
|
export declare enum LlamaVersion {
|
|
@@ -28,6 +163,53 @@ export declare const getLlamaModelHandler: (version: LlamaVersion) => {
|
|
|
28
163
|
};
|
|
29
164
|
output: (responseJson: any) => any;
|
|
30
165
|
};
|
|
166
|
+
export declare const BEDROCK_MODEL: {
|
|
167
|
+
CLAUDE_COMPLETION: {
|
|
168
|
+
params: (config: BedrockClaudeLegacyCompletionOptions, prompt: string, stop: string[]) => any;
|
|
169
|
+
output: (responseJson: any) => any;
|
|
170
|
+
};
|
|
171
|
+
CLAUDE_MESSAGES: {
|
|
172
|
+
params: (config: BedrockClaudeMessagesCompletionOptions, prompt: string) => any;
|
|
173
|
+
output: (responseJson: any) => string;
|
|
174
|
+
};
|
|
175
|
+
TITAN_TEXT: {
|
|
176
|
+
params: (config: BedrockTextGenerationOptions, prompt: string, stop: string[]) => {
|
|
177
|
+
inputText: string;
|
|
178
|
+
textGenerationConfig: any;
|
|
179
|
+
};
|
|
180
|
+
output: (responseJson: any) => any;
|
|
181
|
+
};
|
|
182
|
+
LLAMA2: {
|
|
183
|
+
params: (config: BedrockLlamaGenerationOptions, prompt: string) => {
|
|
184
|
+
prompt: string;
|
|
185
|
+
temperature?: number;
|
|
186
|
+
top_p?: number;
|
|
187
|
+
max_gen_len?: number;
|
|
188
|
+
};
|
|
189
|
+
output: (responseJson: any) => any;
|
|
190
|
+
};
|
|
191
|
+
LLAMA3: {
|
|
192
|
+
params: (config: BedrockLlamaGenerationOptions, prompt: string) => {
|
|
193
|
+
prompt: string;
|
|
194
|
+
temperature?: number;
|
|
195
|
+
top_p?: number;
|
|
196
|
+
max_gen_len?: number;
|
|
197
|
+
};
|
|
198
|
+
output: (responseJson: any) => any;
|
|
199
|
+
};
|
|
200
|
+
COHERE_COMMAND: {
|
|
201
|
+
params: (config: BedrockCohereCommandGenerationOptions, prompt: string, stop: string[]) => any;
|
|
202
|
+
output: (responseJson: any) => any;
|
|
203
|
+
};
|
|
204
|
+
COHERE_COMMAND_R: {
|
|
205
|
+
params: (config: BedrockCohereCommandRGenerationOptions, prompt: string, stop: string[]) => CohereCommandRRequestParams;
|
|
206
|
+
output: (responseJson: any) => any;
|
|
207
|
+
};
|
|
208
|
+
MISTRAL: {
|
|
209
|
+
params: (config: BedrockMistralGenerationOptions, prompt: string, stop: string[]) => any;
|
|
210
|
+
output: (responseJson: any) => any;
|
|
211
|
+
};
|
|
212
|
+
};
|
|
31
213
|
export declare abstract class AwsBedrockGenericProvider {
|
|
32
214
|
modelName: string;
|
|
33
215
|
env?: EnvOverrides;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrock.d.ts","sourceRoot":"","sources":["../../../src/providers/bedrock.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAItE,OAAO,KAAK,EACV,WAAW,EACX,oBAAoB,EACpB,YAAY,EACZ,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,UAAU,CAAC;AAIlB,UAAU,cAAc;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;
|
|
1
|
+
{"version":3,"file":"bedrock.d.ts","sourceRoot":"","sources":["../../../src/providers/bedrock.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.AwsBedrockEmbeddingProvider = exports.AwsBedrockCompletionProvider = exports.AwsBedrockGenericProvider = exports.getLlamaModelHandler = exports.formatPromptLlama2Chat = exports.LlamaVersion = void 0;
|
|
29
|
+
exports.AwsBedrockEmbeddingProvider = exports.AwsBedrockCompletionProvider = exports.AwsBedrockGenericProvider = exports.BEDROCK_MODEL = exports.getLlamaModelHandler = exports.formatPromptLlama2Chat = exports.LlamaVersion = void 0;
|
|
30
30
|
exports.parseValue = parseValue;
|
|
31
31
|
exports.addConfigParam = addConfigParam;
|
|
32
32
|
const sdk_1 = __importDefault(require("@anthropic-ai/sdk"));
|
|
@@ -132,7 +132,7 @@ const getLlamaModelHandler = (version) => {
|
|
|
132
132
|
};
|
|
133
133
|
};
|
|
134
134
|
exports.getLlamaModelHandler = getLlamaModelHandler;
|
|
135
|
-
|
|
135
|
+
exports.BEDROCK_MODEL = {
|
|
136
136
|
CLAUDE_COMPLETION: {
|
|
137
137
|
params: (config, prompt, stop) => {
|
|
138
138
|
const params = {
|
|
@@ -152,10 +152,14 @@ const BEDROCK_MODEL = {
|
|
|
152
152
|
addConfigParam(params, 'max_tokens', config?.max_tokens, process.env.AWS_BEDROCK_MAX_TOKENS, 1024);
|
|
153
153
|
addConfigParam(params, 'temperature', config?.temperature, undefined, 0);
|
|
154
154
|
addConfigParam(params, 'anthropic_version', config?.anthropic_version, undefined, 'bedrock-2023-05-31');
|
|
155
|
+
addConfigParam(params, 'tools', config?.tools, undefined, undefined);
|
|
156
|
+
addConfigParam(params, 'tool_choice', config?.tool_choice, undefined, undefined);
|
|
155
157
|
addConfigParam(params, 'system', system, undefined, undefined);
|
|
156
158
|
return params;
|
|
157
159
|
},
|
|
158
|
-
output: (responseJson) =>
|
|
160
|
+
output: (responseJson) => {
|
|
161
|
+
return (0, anthropic_1.outputFromMessage)(responseJson);
|
|
162
|
+
},
|
|
159
163
|
},
|
|
160
164
|
TITAN_TEXT: {
|
|
161
165
|
params: (config, prompt, stop) => {
|
|
@@ -234,29 +238,29 @@ const BEDROCK_MODEL = {
|
|
|
234
238
|
},
|
|
235
239
|
};
|
|
236
240
|
const AWS_BEDROCK_MODELS = {
|
|
237
|
-
'amazon.titan-text-express-v1': BEDROCK_MODEL.TITAN_TEXT,
|
|
238
|
-
'amazon.titan-text-lite-v1': BEDROCK_MODEL.TITAN_TEXT,
|
|
239
|
-
'amazon.titan-text-premier-v1:0': BEDROCK_MODEL.TITAN_TEXT,
|
|
240
|
-
'anthropic.claude-3-5-sonnet-20240620-v1:0': BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
241
|
-
'anthropic.claude-3-haiku-20240307-v1:0': BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
242
|
-
'anthropic.claude-3-opus-20240229-v1:0': BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
243
|
-
'anthropic.claude-3-sonnet-20240229-v1:0': BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
244
|
-
'anthropic.claude-instant-v1': BEDROCK_MODEL.CLAUDE_COMPLETION,
|
|
245
|
-
'anthropic.claude-v1': BEDROCK_MODEL.CLAUDE_COMPLETION,
|
|
246
|
-
'anthropic.claude-v2:1': BEDROCK_MODEL.CLAUDE_COMPLETION,
|
|
247
|
-
'anthropic.claude-v2': BEDROCK_MODEL.CLAUDE_COMPLETION,
|
|
248
|
-
'cohere.command-light-text-v14': BEDROCK_MODEL.COHERE_COMMAND,
|
|
249
|
-
'cohere.command-r-plus-v1:0': BEDROCK_MODEL.COHERE_COMMAND_R,
|
|
250
|
-
'cohere.command-r-v1:0': BEDROCK_MODEL.COHERE_COMMAND_R,
|
|
251
|
-
'cohere.command-text-v14': BEDROCK_MODEL.COHERE_COMMAND,
|
|
252
|
-
'meta.llama2-13b-chat-v1': BEDROCK_MODEL.LLAMA2,
|
|
253
|
-
'meta.llama2-70b-chat-v1': BEDROCK_MODEL.LLAMA2,
|
|
254
|
-
'meta.llama3-70b-instruct-v1:0': BEDROCK_MODEL.LLAMA3,
|
|
255
|
-
'meta.llama3-8b-instruct-v1:0': BEDROCK_MODEL.LLAMA3,
|
|
256
|
-
'mistral.mistral-7b-instruct-v0:2': BEDROCK_MODEL.MISTRAL,
|
|
257
|
-
'mistral.mistral-large-2402-v1:0': BEDROCK_MODEL.MISTRAL,
|
|
258
|
-
'mistral.mistral-small-2402-v1:0': BEDROCK_MODEL.MISTRAL,
|
|
259
|
-
'mistral.mixtral-8x7b-instruct-v0:1': BEDROCK_MODEL.MISTRAL,
|
|
241
|
+
'amazon.titan-text-express-v1': exports.BEDROCK_MODEL.TITAN_TEXT,
|
|
242
|
+
'amazon.titan-text-lite-v1': exports.BEDROCK_MODEL.TITAN_TEXT,
|
|
243
|
+
'amazon.titan-text-premier-v1:0': exports.BEDROCK_MODEL.TITAN_TEXT,
|
|
244
|
+
'anthropic.claude-3-5-sonnet-20240620-v1:0': exports.BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
245
|
+
'anthropic.claude-3-haiku-20240307-v1:0': exports.BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
246
|
+
'anthropic.claude-3-opus-20240229-v1:0': exports.BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
247
|
+
'anthropic.claude-3-sonnet-20240229-v1:0': exports.BEDROCK_MODEL.CLAUDE_MESSAGES,
|
|
248
|
+
'anthropic.claude-instant-v1': exports.BEDROCK_MODEL.CLAUDE_COMPLETION,
|
|
249
|
+
'anthropic.claude-v1': exports.BEDROCK_MODEL.CLAUDE_COMPLETION,
|
|
250
|
+
'anthropic.claude-v2:1': exports.BEDROCK_MODEL.CLAUDE_COMPLETION,
|
|
251
|
+
'anthropic.claude-v2': exports.BEDROCK_MODEL.CLAUDE_COMPLETION,
|
|
252
|
+
'cohere.command-light-text-v14': exports.BEDROCK_MODEL.COHERE_COMMAND,
|
|
253
|
+
'cohere.command-r-plus-v1:0': exports.BEDROCK_MODEL.COHERE_COMMAND_R,
|
|
254
|
+
'cohere.command-r-v1:0': exports.BEDROCK_MODEL.COHERE_COMMAND_R,
|
|
255
|
+
'cohere.command-text-v14': exports.BEDROCK_MODEL.COHERE_COMMAND,
|
|
256
|
+
'meta.llama2-13b-chat-v1': exports.BEDROCK_MODEL.LLAMA2,
|
|
257
|
+
'meta.llama2-70b-chat-v1': exports.BEDROCK_MODEL.LLAMA2,
|
|
258
|
+
'meta.llama3-70b-instruct-v1:0': exports.BEDROCK_MODEL.LLAMA3,
|
|
259
|
+
'meta.llama3-8b-instruct-v1:0': exports.BEDROCK_MODEL.LLAMA3,
|
|
260
|
+
'mistral.mistral-7b-instruct-v0:2': exports.BEDROCK_MODEL.MISTRAL,
|
|
261
|
+
'mistral.mistral-large-2402-v1:0': exports.BEDROCK_MODEL.MISTRAL,
|
|
262
|
+
'mistral.mistral-small-2402-v1:0': exports.BEDROCK_MODEL.MISTRAL,
|
|
263
|
+
'mistral.mixtral-8x7b-instruct-v0:1': exports.BEDROCK_MODEL.MISTRAL,
|
|
260
264
|
};
|
|
261
265
|
// See https://docs.aws.amazon.com/bedrock/latest/userguide/model-ids.html
|
|
262
266
|
function getHandlerForModel(modelName) {
|
|
@@ -265,22 +269,22 @@ function getHandlerForModel(modelName) {
|
|
|
265
269
|
return ret;
|
|
266
270
|
}
|
|
267
271
|
if (modelName.startsWith('anthropic.claude')) {
|
|
268
|
-
return BEDROCK_MODEL.CLAUDE_MESSAGES;
|
|
272
|
+
return exports.BEDROCK_MODEL.CLAUDE_MESSAGES;
|
|
269
273
|
}
|
|
270
274
|
if (modelName.startsWith('meta.llama2')) {
|
|
271
|
-
return BEDROCK_MODEL.LLAMA2;
|
|
275
|
+
return exports.BEDROCK_MODEL.LLAMA2;
|
|
272
276
|
}
|
|
273
277
|
if (modelName.startsWith('meta.llama3')) {
|
|
274
|
-
return BEDROCK_MODEL.LLAMA3;
|
|
278
|
+
return exports.BEDROCK_MODEL.LLAMA3;
|
|
275
279
|
}
|
|
276
280
|
if (modelName.startsWith('cohere.command-r')) {
|
|
277
|
-
return BEDROCK_MODEL.COHERE_COMMAND_R;
|
|
281
|
+
return exports.BEDROCK_MODEL.COHERE_COMMAND_R;
|
|
278
282
|
}
|
|
279
283
|
if (modelName.startsWith('cohere.command')) {
|
|
280
|
-
return BEDROCK_MODEL.COHERE_COMMAND;
|
|
284
|
+
return exports.BEDROCK_MODEL.COHERE_COMMAND;
|
|
281
285
|
}
|
|
282
286
|
if (modelName.startsWith('mistral.')) {
|
|
283
|
-
return BEDROCK_MODEL.MISTRAL;
|
|
287
|
+
return exports.BEDROCK_MODEL.MISTRAL;
|
|
284
288
|
}
|
|
285
289
|
throw new Error(`Unknown Amazon Bedrock model: ${modelName}`);
|
|
286
290
|
}
|
|
@@ -346,7 +350,7 @@ class AwsBedrockCompletionProvider extends AwsBedrockGenericProvider {
|
|
|
346
350
|
let model = getHandlerForModel(this.modelName);
|
|
347
351
|
if (!model) {
|
|
348
352
|
logger_1.default.warn(`Unknown Amazon Bedrock model: ${this.modelName}. Assuming its API is Claude-like.`);
|
|
349
|
-
model = BEDROCK_MODEL.CLAUDE_MESSAGES;
|
|
353
|
+
model = exports.BEDROCK_MODEL.CLAUDE_MESSAGES;
|
|
350
354
|
}
|
|
351
355
|
const params = model.params(this.config, prompt, stop);
|
|
352
356
|
logger_1.default.debug(`Calling Amazon Bedrock API: ${JSON.stringify(params)}`);
|