promptfoo 0.89.4 → 0.90.1
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 +15 -13
- package/dist/src/app/assets/{index-BPzLW4I1.js → index-BeOib0z5.js} +115 -115
- package/dist/src/app/assets/{index.es-D-gLDYqw.js → index.es-CzfKCJRL.js} +1 -1
- package/dist/src/app/assets/{sync-jrQhr-Ko.js → sync-Bosy7BPC.js} +1 -1
- package/dist/src/app/index.html +1 -1
- package/dist/src/assertions.d.ts.map +1 -1
- package/dist/src/assertions.js +1 -0
- package/dist/src/assertions.js.map +1 -1
- package/dist/src/cache.js +2 -2
- package/dist/src/cache.js.map +1 -1
- package/dist/src/commands/auth.d.ts +3 -0
- package/dist/src/commands/auth.d.ts.map +1 -0
- package/dist/src/commands/auth.js +86 -0
- package/dist/src/commands/auth.js.map +1 -0
- package/dist/src/commands/config.js +1 -1
- package/dist/src/commands/config.js.map +1 -1
- package/dist/src/commands/eval.d.ts.map +1 -1
- package/dist/src/commands/eval.js +25 -12
- package/dist/src/commands/eval.js.map +1 -1
- package/dist/src/commands/generate/dataset.d.ts.map +1 -1
- package/dist/src/commands/generate/dataset.js +2 -2
- package/dist/src/commands/generate/dataset.js.map +1 -1
- package/dist/src/commands/init.js +1 -1
- package/dist/src/commands/init.js.map +1 -1
- package/dist/src/commands/share.d.ts.map +1 -1
- package/dist/src/commands/share.js +18 -8
- package/dist/src/commands/share.js.map +1 -1
- package/dist/src/commands/view.js +2 -2
- package/dist/src/commands/view.js.map +1 -1
- package/dist/src/configTypes.d.ts +5 -1
- package/dist/src/configTypes.d.ts.map +1 -1
- package/dist/src/constants.d.ts +1 -1
- package/dist/src/constants.d.ts.map +1 -1
- package/dist/src/constants.js +2 -1
- package/dist/src/constants.js.map +1 -1
- package/dist/src/csv.d.ts.map +1 -1
- package/dist/src/csv.js +3 -2
- package/dist/src/csv.js.map +1 -1
- package/dist/src/database/index.js +3 -3
- package/dist/src/database/index.js.map +1 -1
- package/dist/src/database/tables.d.ts +10 -0
- package/dist/src/database/tables.d.ts.map +1 -1
- package/dist/src/envars.d.ts +18 -0
- package/dist/src/envars.d.ts.map +1 -1
- package/dist/src/envars.js.map +1 -1
- package/dist/src/globalConfig/accounts.d.ts.map +1 -0
- package/dist/src/{accounts.js → globalConfig/accounts.js} +2 -2
- package/dist/src/globalConfig/accounts.js.map +1 -0
- package/dist/src/globalConfig/cloud.d.ts +17 -0
- package/dist/src/globalConfig/cloud.d.ts.map +1 -0
- package/dist/src/globalConfig/cloud.js +82 -0
- package/dist/src/globalConfig/cloud.js.map +1 -0
- package/dist/src/{globalConfig.d.ts → globalConfig/globalConfig.d.ts} +1 -3
- package/dist/src/globalConfig/globalConfig.d.ts.map +1 -0
- package/dist/src/{globalConfig.js → globalConfig/globalConfig.js} +13 -36
- package/dist/src/globalConfig/globalConfig.js.map +1 -0
- package/dist/src/main.d.ts +1 -5
- package/dist/src/main.d.ts.map +1 -1
- package/dist/src/main.js +15 -31
- package/dist/src/main.js.map +1 -1
- package/dist/src/onboarding.d.ts.map +1 -1
- package/dist/src/onboarding.js +5 -3
- package/dist/src/onboarding.js.map +1 -1
- package/dist/src/providers/bedrock.d.ts +15 -0
- package/dist/src/providers/bedrock.d.ts.map +1 -1
- package/dist/src/providers/bedrock.js +53 -20
- package/dist/src/providers/bedrock.js.map +1 -1
- package/dist/src/providers/http.d.ts +3 -1
- package/dist/src/providers/http.d.ts.map +1 -1
- package/dist/src/providers/http.js +61 -6
- package/dist/src/providers/http.js.map +1 -1
- package/dist/src/providers.d.ts.map +1 -1
- package/dist/src/providers.js +8 -2
- package/dist/src/providers.js.map +1 -1
- package/dist/src/redteam/commands/generate.d.ts.map +1 -1
- package/dist/src/redteam/commands/generate.js +9 -7
- package/dist/src/redteam/commands/generate.js.map +1 -1
- package/dist/src/redteam/commands/init.d.ts.map +1 -1
- package/dist/src/redteam/commands/init.js +17 -23
- package/dist/src/redteam/commands/init.js.map +1 -1
- package/dist/src/redteam/plugins/crossSessionLeak.d.ts.map +1 -1
- package/dist/src/redteam/plugins/crossSessionLeak.js +2 -0
- package/dist/src/redteam/plugins/crossSessionLeak.js.map +1 -1
- package/dist/src/redteam/providers/iterative.d.ts.map +1 -1
- package/dist/src/redteam/providers/iterative.js +0 -1
- package/dist/src/redteam/providers/iterative.js.map +1 -1
- package/dist/src/redteam/providers/iterativeImage.d.ts.map +1 -1
- package/dist/src/redteam/providers/iterativeImage.js +0 -1
- package/dist/src/redteam/providers/iterativeImage.js.map +1 -1
- package/dist/src/share.d.ts.map +1 -1
- package/dist/src/share.js +35 -16
- package/dist/src/share.js.map +1 -1
- package/dist/src/telemetry.d.ts +0 -1
- package/dist/src/telemetry.d.ts.map +1 -1
- package/dist/src/telemetry.js +0 -7
- package/dist/src/telemetry.js.map +1 -1
- package/dist/src/types/index.d.ts +308 -0
- package/dist/src/types/index.d.ts.map +1 -1
- package/dist/src/types/index.js +3 -0
- package/dist/src/types/index.js.map +1 -1
- package/dist/src/util/config/default.d.ts +14 -0
- package/dist/src/util/config/default.d.ts.map +1 -0
- package/dist/src/util/config/default.js +36 -0
- package/dist/src/util/config/default.js.map +1 -0
- package/dist/src/{config.d.ts → util/config/load.d.ts} +3 -3
- package/dist/src/util/config/load.d.ts.map +1 -0
- package/dist/src/{config.js → util/config/load.js} +18 -17
- package/dist/src/util/config/load.js.map +1 -0
- package/dist/src/util/{config.d.ts → config/manage.d.ts} +2 -2
- package/dist/src/util/config/manage.d.ts.map +1 -0
- package/dist/src/util/{config.js → config/manage.js} +3 -3
- package/dist/src/util/config/manage.js.map +1 -0
- package/dist/src/util/index.d.ts +4 -0
- package/dist/src/util/index.d.ts.map +1 -1
- package/dist/src/util/index.js +8 -8
- package/dist/src/util/index.js.map +1 -1
- package/dist/test/account.test.js +5 -4
- package/dist/test/account.test.js.map +1 -1
- package/dist/test/assertions.test.js +37 -0
- package/dist/test/assertions.test.js.map +1 -1
- package/dist/test/csv.test.js +21 -0
- package/dist/test/csv.test.js.map +1 -1
- package/dist/test/globalConfig.test.js +5 -26
- package/dist/test/globalConfig.test.js.map +1 -1
- package/dist/test/providers.bedrock.test.js +46 -0
- package/dist/test/providers.bedrock.test.js.map +1 -1
- package/dist/test/providers.http.test.js +100 -5
- package/dist/test/providers.http.test.js.map +1 -1
- package/dist/test/providers.pythonCompletion.test.js +21 -0
- package/dist/test/providers.pythonCompletion.test.js.map +1 -1
- package/dist/test/providers.test.js +25 -0
- package/dist/test/providers.test.js.map +1 -1
- package/dist/test/redteam/commands/generate.test.js +9 -9
- package/dist/test/redteam/commands/generate.test.js.map +1 -1
- package/dist/test/redteam/extraction/entities.test.js +4 -1
- package/dist/test/redteam/extraction/entities.test.js.map +1 -1
- package/dist/test/redteam/extraction/purpose.test.js +4 -1
- package/dist/test/redteam/extraction/purpose.test.js.map +1 -1
- package/dist/test/redteam/extraction/util.test.js +3 -0
- package/dist/test/redteam/extraction/util.test.js.map +1 -1
- package/dist/test/telemetry.test.js +0 -3
- package/dist/test/telemetry.test.js.map +1 -1
- package/dist/test/util.config.default.test.d.ts +2 -0
- package/dist/test/util.config.default.test.d.ts.map +1 -0
- package/dist/test/util.config.default.test.js +62 -0
- package/dist/test/util.config.default.test.js.map +1 -0
- package/dist/test/util.config.load.test.ts.d.ts +2 -0
- package/dist/test/util.config.load.test.ts.d.ts.map +1 -0
- package/dist/test/{config.test.js → util.config.load.test.ts.js} +75 -28
- package/dist/test/util.config.load.test.ts.js.map +1 -0
- package/dist/test/util.config.main.test.d.ts +2 -0
- package/dist/test/util.config.main.test.d.ts.map +1 -0
- package/dist/test/{util.config.test.js → util.config.main.test.js} +16 -16
- package/dist/test/util.config.main.test.js.map +1 -0
- package/package.json +15 -13
- package/dist/src/accounts.d.ts.map +0 -1
- package/dist/src/accounts.js.map +0 -1
- package/dist/src/config.d.ts.map +0 -1
- package/dist/src/config.js.map +0 -1
- package/dist/src/globalConfig.d.ts.map +0 -1
- package/dist/src/globalConfig.js.map +0 -1
- package/dist/src/util/config.d.ts.map +0 -1
- package/dist/src/util/config.js.map +0 -1
- package/dist/test/config.test.d.ts +0 -2
- package/dist/test/config.test.d.ts.map +0 -1
- package/dist/test/config.test.js.map +0 -1
- package/dist/test/main.test.d.ts +0 -2
- package/dist/test/main.test.d.ts.map +0 -1
- package/dist/test/main.test.js +0 -49
- package/dist/test/main.test.js.map +0 -1
- package/dist/test/util.config.test.d.ts +0 -2
- package/dist/test/util.config.test.d.ts.map +0 -1
- package/dist/test/util.config.test.js.map +0 -1
- /package/dist/src/{accounts.d.ts → globalConfig/accounts.d.ts} +0 -0
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.authCommand = authCommand;
|
|
7
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
8
|
+
const readline_1 = __importDefault(require("readline"));
|
|
9
|
+
const fetch_1 = require("../fetch");
|
|
10
|
+
const accounts_1 = require("../globalConfig/accounts");
|
|
11
|
+
const cloud_1 = require("../globalConfig/cloud");
|
|
12
|
+
const logger_1 = __importDefault(require("../logger"));
|
|
13
|
+
const telemetry_1 = __importDefault(require("../telemetry"));
|
|
14
|
+
async function promptForInput(question) {
|
|
15
|
+
const rl = readline_1.default.createInterface({
|
|
16
|
+
input: process.stdin,
|
|
17
|
+
output: process.stdout,
|
|
18
|
+
});
|
|
19
|
+
try {
|
|
20
|
+
return await new Promise((resolve) => {
|
|
21
|
+
rl.question(question, (answer) => {
|
|
22
|
+
resolve(answer.trim());
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
finally {
|
|
27
|
+
rl.close();
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
async function promptForToken() {
|
|
31
|
+
return promptForInput('Please enter your API token: ');
|
|
32
|
+
}
|
|
33
|
+
async function promptForEmail() {
|
|
34
|
+
return promptForInput('Please enter your email: ');
|
|
35
|
+
}
|
|
36
|
+
function authCommand(program) {
|
|
37
|
+
const authCommand = program.command('auth').description('Manage authentication');
|
|
38
|
+
authCommand
|
|
39
|
+
.command('login')
|
|
40
|
+
.description('Login')
|
|
41
|
+
.option('-o, --org <orgId>', 'The organization id to login to.')
|
|
42
|
+
.option('-h,--host <host>', 'The host of the promptfoo instance. This needs to be the url of the API if different from the app url.')
|
|
43
|
+
.action(async (cmdObj) => {
|
|
44
|
+
try {
|
|
45
|
+
const email = await promptForEmail();
|
|
46
|
+
// Send login request
|
|
47
|
+
const apiHost = cmdObj.host || cloud_1.cloudConfig.getApiHost();
|
|
48
|
+
const loginResponse = await (0, fetch_1.fetchWithProxy)(`${apiHost}/users/login?fromCLI=true`, {
|
|
49
|
+
method: 'POST',
|
|
50
|
+
headers: {
|
|
51
|
+
'Content-Type': 'application/json',
|
|
52
|
+
},
|
|
53
|
+
body: JSON.stringify({ email, organizationId: cmdObj.orgId }),
|
|
54
|
+
});
|
|
55
|
+
if (!loginResponse.ok) {
|
|
56
|
+
throw new Error('Failed to send login request: ' + loginResponse.statusText);
|
|
57
|
+
}
|
|
58
|
+
logger_1.default.info(chalk_1.default.green(`A login link has been sent to ${email}. Click the link to login and then copy your authentication token.`));
|
|
59
|
+
logger_1.default.info(chalk_1.default.yellow("If you did not get an email it's because the user does not exist or your not part of the the organization specified."));
|
|
60
|
+
// Prompt for token
|
|
61
|
+
const token = await promptForToken();
|
|
62
|
+
await cloud_1.cloudConfig.validateAndSetApiToken(token, apiHost);
|
|
63
|
+
// Store token in global config
|
|
64
|
+
(0, accounts_1.setUserEmail)(email);
|
|
65
|
+
telemetry_1.default.record('command_used', {
|
|
66
|
+
name: 'auth login',
|
|
67
|
+
});
|
|
68
|
+
await telemetry_1.default.send();
|
|
69
|
+
process.exit(0);
|
|
70
|
+
}
|
|
71
|
+
catch (error) {
|
|
72
|
+
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
73
|
+
logger_1.default.error(`Authentication failed: ${errorMessage}`);
|
|
74
|
+
process.exit(1);
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
authCommand
|
|
78
|
+
.command('logout')
|
|
79
|
+
.description('Logout')
|
|
80
|
+
.action(async () => {
|
|
81
|
+
await cloud_1.cloudConfig.delete();
|
|
82
|
+
logger_1.default.info(chalk_1.default.green('Successfully logged out'));
|
|
83
|
+
process.exit(0);
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
//# sourceMappingURL=auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/commands/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.configCommand = configCommand;
|
|
7
|
-
const accounts_1 = require("../accounts");
|
|
7
|
+
const accounts_1 = require("../globalConfig/accounts");
|
|
8
8
|
const logger_1 = __importDefault(require("../logger"));
|
|
9
9
|
const telemetry_1 = __importDefault(require("../telemetry"));
|
|
10
10
|
function configCommand(program) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/commands/config.ts"],"names":[],"mappings":";;;;;AAKA,sCAsCC;AA1CD,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/commands/config.ts"],"names":[],"mappings":";;;;;AAKA,sCAsCC;AA1CD,uDAAsE;AACtE,uDAA+B;AAC/B,6DAAqC;AAErC,SAAgB,aAAa,CAAC,OAAgB;IAC5C,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,6BAA6B,CAAC,CAAC;IAC3F,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,6BAA6B,CAAC,CAAC;IAC3F,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,6BAA6B,CAAC,CAAC;IAE3F,UAAU;SACP,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,gBAAgB,CAAC;SAC7B,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,KAAK,GAAG,IAAA,uBAAY,GAAE,CAAC;QAC7B,IAAI,KAAK,EAAE,CAAC;YACV,gBAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;aAAM,CAAC;YACN,gBAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC/B,CAAC;QACD,mBAAS,CAAC,MAAM,CAAC,cAAc,EAAE;YAC/B,IAAI,EAAE,YAAY;YAClB,SAAS,EAAE,OAAO;SACnB,CAAC,CAAC;QACH,MAAM,mBAAS,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;IAEL,UAAU;SACP,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CAAC,gBAAgB,CAAC;SAC7B,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,EAAE;QAC9B,IAAA,uBAAY,EAAC,KAAK,CAAC,CAAC;QACpB,IAAI,KAAK,EAAE,CAAC;YACV,gBAAM,CAAC,IAAI,CAAC,gBAAgB,KAAK,EAAE,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,gBAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC9B,CAAC;QACD,mBAAS,CAAC,MAAM,CAAC,cAAc,EAAE;YAC/B,IAAI,EAAE,YAAY;YAClB,SAAS,EAAE,OAAO;SACnB,CAAC,CAAC;QACH,MAAM,mBAAS,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eval.d.ts","sourceRoot":"","sources":["../../../src/commands/eval.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAczC,OAAO,KAAK,EACV,kBAAkB,EAClB,eAAe,EAGf,aAAa,EACd,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"eval.d.ts","sourceRoot":"","sources":["../../../src/commands/eval.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAczC,OAAO,KAAK,EACV,kBAAkB,EAClB,eAAe,EAGf,aAAa,EACd,MAAM,UAAU,CAAC;AAelB,wBAAsB,MAAM,CAC1B,MAAM,EAAE,kBAAkB,GAAG,OAAO,EACpC,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,EACrC,iBAAiB,EAAE,MAAM,GAAG,SAAS,EACrC,eAAe,EAAE,eAAe,iBAuQjC;AAED,wBAAgB,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,EACrC,iBAAiB,EAAE,MAAM,GAAG,SAAS,QAsKtC"}
|
|
@@ -31,11 +31,11 @@ exports.evalCommand = evalCommand;
|
|
|
31
31
|
const chalk_1 = __importDefault(require("chalk"));
|
|
32
32
|
const chokidar_1 = __importDefault(require("chokidar"));
|
|
33
33
|
const dedent_1 = __importDefault(require("dedent"));
|
|
34
|
+
const fs_1 = __importDefault(require("fs"));
|
|
34
35
|
const path = __importStar(require("path"));
|
|
35
36
|
const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
|
|
36
37
|
const cache_1 = require("../cache");
|
|
37
38
|
const cliState_1 = __importDefault(require("../cliState"));
|
|
38
|
-
const config_1 = require("../config");
|
|
39
39
|
const envars_1 = require("../envars");
|
|
40
40
|
const evaluator_1 = require("../evaluator");
|
|
41
41
|
const logger_1 = __importStar(require("../logger"));
|
|
@@ -46,6 +46,8 @@ const telemetry_1 = __importDefault(require("../telemetry"));
|
|
|
46
46
|
const types_1 = require("../types");
|
|
47
47
|
const util_1 = require("../util");
|
|
48
48
|
const util_2 = require("../util");
|
|
49
|
+
const default_1 = require("../util/config/default");
|
|
50
|
+
const load_1 = require("../util/config/load");
|
|
49
51
|
const filterProviders_1 = require("./eval/filterProviders");
|
|
50
52
|
const filterTests_1 = require("./eval/filterTests");
|
|
51
53
|
async function doEval(cmdObj, defaultConfig, defaultConfigPath, evaluateOptions) {
|
|
@@ -70,7 +72,7 @@ async function doEval(cmdObj, defaultConfig, defaultConfigPath, evaluateOptions)
|
|
|
70
72
|
logger_1.default.info('Cache is disabled.');
|
|
71
73
|
(0, cache_1.disableCache)();
|
|
72
74
|
}
|
|
73
|
-
({ config, testSuite, basePath: _basePath } = await (0,
|
|
75
|
+
({ config, testSuite, basePath: _basePath } = await (0, load_1.resolveConfigs)(cmdObj, defaultConfig));
|
|
74
76
|
let maxConcurrency = Number.parseInt(cmdObj.maxConcurrency || '', 10);
|
|
75
77
|
const delay = Number.parseInt(cmdObj.delay || '', 0);
|
|
76
78
|
if (delay > 0) {
|
|
@@ -152,15 +154,10 @@ async function doEval(cmdObj, defaultConfig, defaultConfigPath, evaluateOptions)
|
|
|
152
154
|
evalId = await (0, util_2.writeResultsToDatabase)(summary, config);
|
|
153
155
|
}
|
|
154
156
|
const { outputPath } = config;
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
}
|
|
160
|
-
else if (Array.isArray(outputPath)) {
|
|
161
|
-
await (0, util_2.writeMultipleOutputs)(outputPath, evalId, summary, config, shareableUrl);
|
|
162
|
-
}
|
|
163
|
-
logger_1.default.info(chalk_1.default.yellow(`Writing output to ${outputPath}`));
|
|
157
|
+
const paths = (Array.isArray(outputPath) ? outputPath : [outputPath]).filter((p) => typeof p === 'string' && p.length > 0);
|
|
158
|
+
if (paths.length) {
|
|
159
|
+
await (0, util_2.writeMultipleOutputs)(paths, evalId, summary, config, shareableUrl);
|
|
160
|
+
logger_1.default.info(chalk_1.default.yellow(`Writing output to ${paths.join(', ')}`));
|
|
164
161
|
}
|
|
165
162
|
(0, util_2.printBorder)();
|
|
166
163
|
if (cmdObj.write) {
|
|
@@ -323,7 +320,7 @@ function evalCommand(program, defaultConfig, defaultConfigPath) {
|
|
|
323
320
|
.option('--description <description>', 'Description of the eval run')
|
|
324
321
|
.option('--interactive-providers', 'Run providers interactively, one at a time', defaultConfig?.evaluateOptions?.interactiveProviders)
|
|
325
322
|
.option('--remote', 'Force remote inference wherever possible (used for red teams)', false)
|
|
326
|
-
.action((opts) => {
|
|
323
|
+
.action(async (opts) => {
|
|
327
324
|
if (opts.interactiveProviders) {
|
|
328
325
|
logger_1.default.warn(chalk_1.default.yellow((0, dedent_1.default) `
|
|
329
326
|
Warning: The --interactive-providers option has been removed.
|
|
@@ -340,6 +337,22 @@ function evalCommand(program, defaultConfig, defaultConfigPath) {
|
|
|
340
337
|
const { data: extension } = types_1.OutputFileExtension.safeParse(maybeFilePath.split('.').pop()?.toLowerCase());
|
|
341
338
|
(0, tiny_invariant_1.default)(extension, `Unsupported output file format: ${maybeFilePath}. Please use one of: ${types_1.OutputFileExtension.options.join(', ')}.`);
|
|
342
339
|
}
|
|
340
|
+
if (opts.config !== undefined) {
|
|
341
|
+
const configPaths = Array.isArray(opts.config) ? opts.config : [opts.config];
|
|
342
|
+
for (const configPath of configPaths) {
|
|
343
|
+
if (fs_1.default.existsSync(configPath) && fs_1.default.statSync(configPath).isDirectory()) {
|
|
344
|
+
const { defaultConfig: dirConfig, defaultConfigPath: newConfigPath } = await (0, default_1.loadDefaultConfig)(['redteam', 'promptfooconfig'], configPath);
|
|
345
|
+
if (newConfigPath) {
|
|
346
|
+
opts.config = opts.config.filter((path) => path !== configPath);
|
|
347
|
+
opts.config.push(newConfigPath);
|
|
348
|
+
defaultConfig = { ...defaultConfig, ...dirConfig };
|
|
349
|
+
}
|
|
350
|
+
else {
|
|
351
|
+
logger_1.default.warn(`No configuration file found in directory: ${configPath}`);
|
|
352
|
+
}
|
|
353
|
+
}
|
|
354
|
+
}
|
|
355
|
+
}
|
|
343
356
|
doEval(opts, defaultConfig, defaultConfigPath, evaluateOptions);
|
|
344
357
|
});
|
|
345
358
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eval.js","sourceRoot":"","sources":["../../../src/commands/eval.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"eval.js","sourceRoot":"","sources":["../../../src/commands/eval.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataset.d.ts","sourceRoot":"","sources":["../../../../src/commands/generate/dataset.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"dataset.d.ts","sourceRoot":"","sources":["../../../../src/commands/generate/dataset.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOzC,OAAO,KAAK,EAAa,aAAa,EAAE,MAAM,aAAa,CAAC;AA6F5D,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,EACrC,iBAAiB,EAAE,MAAM,GAAG,SAAS,QAqBtC"}
|
|
@@ -31,11 +31,11 @@ const chalk_1 = __importDefault(require("chalk"));
|
|
|
31
31
|
const fs = __importStar(require("fs"));
|
|
32
32
|
const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
33
33
|
const cache_1 = require("../../cache");
|
|
34
|
-
const config_1 = require("../../config");
|
|
35
34
|
const logger_1 = __importDefault(require("../../logger"));
|
|
36
35
|
const telemetry_1 = __importDefault(require("../../telemetry"));
|
|
37
36
|
const testCases_1 = require("../../testCases");
|
|
38
37
|
const util_1 = require("../../util");
|
|
38
|
+
const load_1 = require("../../util/config/load");
|
|
39
39
|
async function doGenerateDataset(options) {
|
|
40
40
|
(0, util_1.setupEnv)(options.envFile);
|
|
41
41
|
if (!options.cache) {
|
|
@@ -45,7 +45,7 @@ async function doGenerateDataset(options) {
|
|
|
45
45
|
let testSuite;
|
|
46
46
|
const configPath = options.config || options.defaultConfigPath;
|
|
47
47
|
if (configPath) {
|
|
48
|
-
const resolved = await (0,
|
|
48
|
+
const resolved = await (0, load_1.resolveConfigs)({
|
|
49
49
|
config: [configPath],
|
|
50
50
|
}, options.defaultConfig);
|
|
51
51
|
testSuite = resolved.testSuite;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataset.js","sourceRoot":"","sources":["../../../../src/commands/generate/dataset.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqGA,wDAwBC;AA7HD,kDAA0B;AAE1B,uCAAyB;AACzB,sDAA2B;AAC3B,uCAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"dataset.js","sourceRoot":"","sources":["../../../../src/commands/generate/dataset.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ function initCommand(program) {
|
|
|
12
12
|
program
|
|
13
13
|
.command('init [directory]')
|
|
14
14
|
.description('Initialize project with dummy files')
|
|
15
|
-
.option('--no-interactive', '
|
|
15
|
+
.option('--no-interactive', 'Do not run in interactive mode')
|
|
16
16
|
.action(async (directory, cmdObj) => {
|
|
17
17
|
telemetry_1.default.record('command_used', {
|
|
18
18
|
name: 'init - started',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init.ts"],"names":[],"mappings":";;;;;AAMA,kCA6BC;AAnCD,gEAAwC;AAExC,uDAA+B;AAC/B,8CAAkD;AAClD,6DAAqC;AAErC,SAAgB,WAAW,CAAC,OAAgB;IAC1C,OAAO;SACJ,OAAO,CAAC,kBAAkB,CAAC;SAC3B,WAAW,CAAC,qCAAqC,CAAC;SAClD,MAAM,CAAC,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init.ts"],"names":[],"mappings":";;;;;AAMA,kCA6BC;AAnCD,gEAAwC;AAExC,uDAA+B;AAC/B,8CAAkD;AAClD,6DAAqC;AAErC,SAAgB,WAAW,CAAC,OAAgB;IAC1C,OAAO;SACJ,OAAO,CAAC,kBAAkB,CAAC;SAC3B,WAAW,CAAC,qCAAqC,CAAC;SAClD,MAAM,CAAC,kBAAkB,EAAE,gCAAgC,CAAC;SAC5D,MAAM,CAAC,KAAK,EAAE,SAAwB,EAAE,MAAgC,EAAE,EAAE;QAC3E,mBAAS,CAAC,MAAM,CAAC,cAAc,EAAE;YAC/B,IAAI,EAAE,gBAAgB;SACvB,CAAC,CAAC;QAEH,IAAI,SAAS,KAAK,SAAS,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YAClD,MAAM,UAAU,GAAG,MAAM,IAAA,iBAAO,EAAC;gBAC/B,OAAO,EACL,mGAAmG;gBACrG,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YACH,IAAI,UAAU,EAAE,CAAC;gBACf,gBAAM,CAAC,IAAI,CAAC,0EAA0E,CAAC,CAAC;gBACxF,OAAO;YACT,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAiB,EAAC,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;QACvE,mBAAS,CAAC,MAAM,CAAC,cAAc,EAAE;YAC/B,GAAG,OAAO;YACV,IAAI,EAAE,MAAM;SACb,CAAC,CAAC;QACH,MAAM,mBAAS,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../../src/commands/share.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../../src/commands/share.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAG5C,wBAAsB,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,0BAI5E;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,QAwE5C"}
|
|
@@ -9,6 +9,7 @@ const chalk_1 = __importDefault(require("chalk"));
|
|
|
9
9
|
const readline_1 = __importDefault(require("readline"));
|
|
10
10
|
const url_1 = require("url");
|
|
11
11
|
const envars_1 = require("../envars");
|
|
12
|
+
const cloud_1 = require("../globalConfig/cloud");
|
|
12
13
|
const logger_1 = __importDefault(require("../logger"));
|
|
13
14
|
const share_1 = require("../share");
|
|
14
15
|
const telemetry_1 = __importDefault(require("../telemetry"));
|
|
@@ -21,7 +22,7 @@ async function createPublicUrl(results, showAuth) {
|
|
|
21
22
|
function shareCommand(program) {
|
|
22
23
|
program
|
|
23
24
|
.command('share [evalId]')
|
|
24
|
-
.description('Create a shareable URL of an eval (defaults to most recent)')
|
|
25
|
+
.description('Create a shareable URL of an eval (defaults to most recent)' + '\n\n')
|
|
25
26
|
.option('-y, --yes', 'Skip confirmation')
|
|
26
27
|
.option('--env-file, --env-path <path>', 'Path to .env file')
|
|
27
28
|
.option('--show-auth', 'Show username/password authentication information in the URL if exists', false)
|
|
@@ -56,14 +57,23 @@ function shareCommand(program) {
|
|
|
56
57
|
});
|
|
57
58
|
const baseUrl = (0, envars_1.getEnvString)('PROMPTFOO_SHARING_APP_BASE_URL');
|
|
58
59
|
const hostname = baseUrl ? new url_1.URL(baseUrl).hostname : 'app.promptfoo.dev';
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
reader.close();
|
|
62
|
-
process.exit(1);
|
|
63
|
-
}
|
|
64
|
-
reader.close();
|
|
60
|
+
if (cloud_1.cloudConfig.isEnabled()) {
|
|
61
|
+
logger_1.default.info(`Sharing eval to ${cloud_1.cloudConfig.getAppUrl()}`);
|
|
65
62
|
await createPublicUrl(results, cmdObj.showAuth);
|
|
66
|
-
|
|
63
|
+
process.exit(0);
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
reader.question(`Create a private shareable URL of your eval on ${hostname}?\n\nTo proceed, please confirm [Y/n] `, async function (answer) {
|
|
67
|
+
if (answer.toLowerCase() !== 'yes' &&
|
|
68
|
+
answer.toLowerCase() !== 'y' &&
|
|
69
|
+
answer !== '') {
|
|
70
|
+
reader.close();
|
|
71
|
+
process.exit(1);
|
|
72
|
+
}
|
|
73
|
+
reader.close();
|
|
74
|
+
await createPublicUrl(results, cmdObj.showAuth);
|
|
75
|
+
});
|
|
76
|
+
}
|
|
67
77
|
}
|
|
68
78
|
});
|
|
69
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"share.js","sourceRoot":"","sources":["../../../src/commands/share.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"share.js","sourceRoot":"","sources":["../../../src/commands/share.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ exports.viewCommand = viewCommand;
|
|
|
7
7
|
const server_1 = require("../server/server");
|
|
8
8
|
const telemetry_1 = __importDefault(require("../telemetry"));
|
|
9
9
|
const util_1 = require("../util");
|
|
10
|
-
const
|
|
10
|
+
const manage_1 = require("../util/config/manage");
|
|
11
11
|
function viewCommand(program) {
|
|
12
12
|
program
|
|
13
13
|
.command('view [directory]')
|
|
@@ -24,7 +24,7 @@ function viewCommand(program) {
|
|
|
24
24
|
});
|
|
25
25
|
await telemetry_1.default.send();
|
|
26
26
|
if (directory) {
|
|
27
|
-
(0,
|
|
27
|
+
(0, manage_1.setConfigDirectoryPath)(directory);
|
|
28
28
|
}
|
|
29
29
|
// Block indefinitely on server
|
|
30
30
|
const browserBehavior = cmdObj.yes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../src/commands/view.ts"],"names":[],"mappings":";;;;;AAMA,kCAuCC;AA5CD,6CAAgE;AAChE,6DAAqC;AACrC,kCAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../src/commands/view.ts"],"names":[],"mappings":";;;;;AAMA,kCAuCC;AA5CD,6CAAgE;AAChE,6DAAqC;AACrC,kCAAmC;AACnC,kDAA+D;AAE/D,SAAgB,WAAW,CAAC,OAAgB;IAC1C,OAAO;SACJ,OAAO,CAAC,kBAAkB,CAAC;SAC3B,WAAW,CAAC,kBAAkB,CAAC;SAC/B,MAAM,CAAC,qBAAqB,EAAE,aAAa,EAAE,OAAO,CAAC;SACrD,MAAM,CAAC,WAAW,EAAE,yCAAyC,CAAC;SAC9D,MAAM,CAAC,UAAU,EAAE,2CAA2C,CAAC;SAC/D,MAAM,CAAC,gCAAgC,EAAE,mDAAmD,CAAC;SAC7F,MAAM,CAAC,+BAA+B,EAAE,mBAAmB,CAAC;SAC5D,MAAM,CACL,KAAK,EACH,SAA6B,EAC7B,MAOW,EACX,EAAE;QACF,IAAA,eAAQ,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACzB,mBAAS,CAAC,MAAM,CAAC,cAAc,EAAE;YAC/B,IAAI,EAAE,MAAM;SACb,CAAC,CAAC;QACH,MAAM,mBAAS,CAAC,IAAI,EAAE,CAAC;QAEvB,IAAI,SAAS,EAAE,CAAC;YACd,IAAA,+BAAsB,EAAC,SAAS,CAAC,CAAC;QACpC,CAAC;QACD,+BAA+B;QAC/B,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG;YAChC,CAAC,CAAC,wBAAe,CAAC,IAAI;YACtB,CAAC,CAAC,MAAM,CAAC,EAAE;gBACT,CAAC,CAAC,wBAAe,CAAC,IAAI;gBACtB,CAAC,CAAC,wBAAe,CAAC,GAAG,CAAC;QAC1B,MAAM,IAAA,oBAAW,EAAC,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC5E,CAAC,CACF,CAAC;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configTypes.d.ts","sourceRoot":"","sources":["../../src/configTypes.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,
|
|
1
|
+
{"version":3,"file":"configTypes.d.ts","sourceRoot":"","sources":["../../src/configTypes.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,CAAC,EAAE;QACN,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH"}
|
package/dist/src/constants.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export declare const VERSION: string;
|
|
2
2
|
export declare const SHARE_API_BASE_URL: string;
|
|
3
|
-
export declare const DEFAULT_SHARE_VIEW_BASE_URL
|
|
3
|
+
export declare const DEFAULT_SHARE_VIEW_BASE_URL: string;
|
|
4
4
|
export declare const SHARE_VIEW_BASE_URL: string;
|
|
5
5
|
export declare const TERMINAL_MAX_WIDTH: number;
|
|
6
6
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,OAAO,QAAsB,CAAC;AAK3C,eAAO,MAAM,kBAAkB,QAKF,CAAC;AAE9B,eAAO,MAAM,2BAA2B,QAGvC,CAAC;AAGF,eAAO,MAAM,mBAAmB,QAGH,CAAC;AAG9B,eAAO,MAAM,kBAAkB,QACkE,CAAC"}
|
package/dist/src/constants.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.TERMINAL_MAX_WIDTH = exports.SHARE_VIEW_BASE_URL = exports.DEFAULT_SHARE_VIEW_BASE_URL = exports.SHARE_API_BASE_URL = exports.VERSION = void 0;
|
|
7
7
|
const package_json_1 = __importDefault(require("../package.json"));
|
|
8
|
+
const envars_1 = require("./envars");
|
|
8
9
|
exports.VERSION = package_json_1.default.version;
|
|
9
10
|
// We use process.env in this file because it's imported by the next.js server as well.
|
|
10
11
|
// This is used for sharing evals.
|
|
@@ -14,7 +15,7 @@ process.env.NEXT_PUBLIC_PROMPTFOO_REMOTE_API_BASE_URL ||
|
|
|
14
15
|
process.env.NEXT_PUBLIC_PROMPTFOO_BASE_URL ||
|
|
15
16
|
process.env.PROMPTFOO_REMOTE_API_BASE_URL ||
|
|
16
17
|
`https://api.promptfoo.dev`;
|
|
17
|
-
exports.DEFAULT_SHARE_VIEW_BASE_URL = `https://app.promptfoo.dev
|
|
18
|
+
exports.DEFAULT_SHARE_VIEW_BASE_URL = (0, envars_1.getEnvString)('PROMPTFOO_SHARING_APP_BASE_URL', `https://app.promptfoo.dev`);
|
|
18
19
|
// This is used for creating shared eval links.
|
|
19
20
|
exports.SHARE_VIEW_BASE_URL = process.env.NEXT_PUBLIC_PROMPTFOO_BASE_URL ||
|
|
20
21
|
process.env.PROMPTFOO_REMOTE_APP_BASE_URL ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;;;;AAAA,mEAA0C;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;;;;AAAA,mEAA0C;AAC1C,qCAAwC;AAE3B,QAAA,OAAO,GAAG,sBAAW,CAAC,OAAO,CAAC;AAE3C,uFAAuF;AAEvF,kCAAkC;AACrB,QAAA,kBAAkB;AAC7B,iDAAiD;AACjD,OAAO,CAAC,GAAG,CAAC,yCAAyC;IACrD,OAAO,CAAC,GAAG,CAAC,8BAA8B;IAC1C,OAAO,CAAC,GAAG,CAAC,6BAA6B;IACzC,2BAA2B,CAAC;AAEjB,QAAA,2BAA2B,GAAG,IAAA,qBAAY,EACrD,gCAAgC,EAChC,2BAA2B,CAC5B,CAAC;AAEF,+CAA+C;AAClC,QAAA,mBAAmB,GAC9B,OAAO,CAAC,GAAG,CAAC,8BAA8B;IAC1C,OAAO,CAAC,GAAG,CAAC,6BAA6B;IACzC,mCAA2B,CAAC;AAE9B,sCAAsC;AACzB,QAAA,kBAAkB,GAC7B,OAAO,EAAE,MAAM,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC"}
|
package/dist/src/csv.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csv.d.ts","sourceRoot":"","sources":["../../src/csv.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,EAAE,QAAQ,EAAsB,MAAM,SAAS,CAAC;AAW9F,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"csv.d.ts","sourceRoot":"","sources":["../../src/csv.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,EAAE,QAAQ,EAAsB,MAAM,SAAS,CAAC;AAW9F,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAwG/D;AAID,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CA+DxD"}
|
package/dist/src/csv.js
CHANGED
|
@@ -40,8 +40,9 @@ function assertionFromString(expected) {
|
|
|
40
40
|
value: expected.slice(expected.startsWith('grade:') ? 6 : 11),
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
|
-
if (expected.startsWith('python:')
|
|
44
|
-
|
|
43
|
+
if (expected.startsWith('python:') ||
|
|
44
|
+
(expected.startsWith('file://') && (expected.endsWith('.py') || expected.includes('.py:')))) {
|
|
45
|
+
const sliceLength = expected.startsWith('python:') ? 'python:'.length : 'file://'.length;
|
|
45
46
|
const functionBody = expected.slice(sliceLength).trim();
|
|
46
47
|
return {
|
|
47
48
|
type: 'python',
|
package/dist/src/csv.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csv.js","sourceRoot":"","sources":["../../src/csv.ts"],"names":[],"mappings":";;;;;AAaA,
|
|
1
|
+
{"version":3,"file":"csv.js","sourceRoot":"","sources":["../../src/csv.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,13 +32,13 @@ exports.getDb = getDb;
|
|
|
32
32
|
const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
|
|
33
33
|
const better_sqlite3_2 = require("drizzle-orm/better-sqlite3");
|
|
34
34
|
const path = __importStar(require("path"));
|
|
35
|
-
const
|
|
35
|
+
const manage_1 = require("../util/config/manage");
|
|
36
36
|
let dbInstance = null;
|
|
37
37
|
function getDbPath() {
|
|
38
|
-
return path.resolve((0,
|
|
38
|
+
return path.resolve((0, manage_1.getConfigDirectoryPath)(true /* createIfNotExists */), 'promptfoo.db');
|
|
39
39
|
}
|
|
40
40
|
function getDbSignalPath() {
|
|
41
|
-
return path.resolve((0,
|
|
41
|
+
return path.resolve((0, manage_1.getConfigDirectoryPath)(true /* createIfNotExists */), 'evalLastWritten');
|
|
42
42
|
}
|
|
43
43
|
function getDb() {
|
|
44
44
|
if (!dbInstance) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/database/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,8BAEC;AAED,0CAEC;AAED,sBAMC;AArBD,oEAAsC;AACtC,+DAAqD;AACrD,2CAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/database/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,8BAEC;AAED,0CAEC;AAED,sBAMC;AArBD,oEAAsC;AACtC,+DAAqD;AACrD,2CAA6B;AAC7B,kDAA+D;AAE/D,IAAI,UAAU,GAAsC,IAAI,CAAC;AAEzD,SAAgB,SAAS;IACvB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAA,+BAAsB,EAAC,IAAI,CAAC,uBAAuB,CAAC,EAAE,cAAc,CAAC,CAAC;AAC5F,CAAC;AAED,SAAgB,eAAe;IAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAA,+BAAsB,EAAC,IAAI,CAAC,uBAAuB,CAAC,EAAE,iBAAiB,CAAC,CAAC;AAC/F,CAAC;AAED,SAAgB,KAAK;IACnB,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,IAAI,wBAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;QACzC,UAAU,GAAG,IAAA,wBAAO,EAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}
|