promptfoo 0.101.2 → 0.102.0
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 +1 -0
- package/dist/package.json +1 -1
- package/dist/src/app/assets/index-CnmwEP7J.js +857 -0
- package/dist/src/app/assets/{index-CRUXRgeT.css → index-Du5kx2S7.css} +1 -1
- package/dist/src/app/assets/{index.es-DkWVRNuq.js → index.es-D50MgA-h.js} +1 -1
- package/dist/src/app/assets/{sync-DRb-_5lp.js → sync-CWcEX9ys.js} +1 -1
- package/dist/src/app/index.html +2 -2
- package/dist/src/cliState.d.ts +1 -0
- package/dist/src/cliState.d.ts.map +1 -1
- package/dist/src/cliState.js.map +1 -1
- package/dist/src/commands/eval.d.ts +2 -1
- package/dist/src/commands/eval.d.ts.map +1 -1
- package/dist/src/commands/eval.js +10 -5
- package/dist/src/commands/eval.js.map +1 -1
- package/dist/src/evaluator.d.ts.map +1 -1
- package/dist/src/evaluator.js +42 -5
- package/dist/src/evaluator.js.map +1 -1
- package/dist/src/logger.d.ts +2 -0
- package/dist/src/logger.d.ts.map +1 -1
- package/dist/src/logger.js +14 -4
- package/dist/src/logger.js.map +1 -1
- package/dist/src/redteam/commands/generate.d.ts +1 -1
- package/dist/src/redteam/commands/generate.d.ts.map +1 -1
- package/dist/src/redteam/commands/generate.js +17 -10
- package/dist/src/redteam/commands/generate.js.map +1 -1
- package/dist/src/redteam/commands/run.d.ts.map +1 -1
- package/dist/src/redteam/commands/run.js +3 -49
- 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 +2 -2
- package/dist/src/redteam/constants.js.map +1 -1
- package/dist/src/redteam/index.d.ts +1 -1
- package/dist/src/redteam/index.d.ts.map +1 -1
- package/dist/src/redteam/index.js +54 -6
- package/dist/src/redteam/index.js.map +1 -1
- package/dist/src/redteam/plugins/harmful/graders.js +1 -1
- package/dist/src/redteam/plugins/intent.d.ts.map +1 -1
- package/dist/src/redteam/plugins/intent.js +2 -1
- package/dist/src/redteam/plugins/intent.js.map +1 -1
- package/dist/src/redteam/remoteGeneration.d.ts +5 -0
- package/dist/src/redteam/remoteGeneration.d.ts.map +1 -1
- package/dist/src/redteam/remoteGeneration.js +26 -0
- package/dist/src/redteam/remoteGeneration.js.map +1 -1
- package/dist/src/redteam/shared.d.ts +3 -3
- package/dist/src/redteam/shared.d.ts.map +1 -1
- package/dist/src/redteam/shared.js +106 -13
- package/dist/src/redteam/shared.js.map +1 -1
- package/dist/src/redteam/sharedFrontend.d.ts +4 -0
- package/dist/src/redteam/sharedFrontend.d.ts.map +1 -0
- package/dist/src/redteam/sharedFrontend.js +18 -0
- package/dist/src/redteam/sharedFrontend.js.map +1 -0
- package/dist/src/redteam/types.d.ts +18 -0
- package/dist/src/redteam/types.d.ts.map +1 -1
- package/dist/src/server/routes/eval.d.ts +2 -0
- package/dist/src/server/routes/eval.d.ts.map +1 -1
- package/dist/src/server/routes/eval.js +26 -8
- package/dist/src/server/routes/eval.js.map +1 -1
- package/dist/src/server/routes/redteam.d.ts.map +1 -1
- package/dist/src/server/routes/redteam.js +107 -0
- package/dist/src/server/routes/redteam.js.map +1 -1
- package/dist/src/server/server.d.ts +0 -5
- package/dist/src/server/server.d.ts.map +1 -1
- package/dist/src/server/server.js +4 -56
- package/dist/src/server/server.js.map +1 -1
- package/dist/src/types/index.d.ts +6 -2
- package/dist/src/types/index.d.ts.map +1 -1
- package/dist/src/types/index.js.map +1 -1
- package/dist/src/util/apiHealth.d.ts +11 -0
- package/dist/src/util/apiHealth.d.ts.map +1 -0
- package/dist/src/util/apiHealth.js +59 -0
- package/dist/src/util/apiHealth.js.map +1 -0
- package/dist/src/util/config/manage.d.ts +1 -1
- package/dist/src/util/config/manage.d.ts.map +1 -1
- package/dist/src/util/config/manage.js +2 -1
- package/dist/src/util/config/manage.js.map +1 -1
- package/dist/test/redteam/commands/generate.test.js +26 -2
- package/dist/test/redteam/commands/generate.test.js.map +1 -1
- package/dist/test/redteam/index.test.js +77 -0
- package/dist/test/redteam/index.test.js.map +1 -1
- package/dist/test/redteam/remoteGeneration.test.js +70 -0
- package/dist/test/redteam/remoteGeneration.test.js.map +1 -1
- package/dist/test/redteam/validators.test.js +13 -13
- package/dist/test/redteam/validators.test.js.map +1 -1
- package/dist/test/server/server.test.js +40 -111
- package/dist/test/server/server.test.js.map +1 -1
- package/dist/test/util/apiHealth.test.d.ts +2 -0
- package/dist/test/util/apiHealth.test.d.ts.map +1 -0
- package/dist/test/util/apiHealth.test.js +89 -0
- package/dist/test/util/apiHealth.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/src/app/assets/index-BTdK1U9T.js +0 -817
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getRiskCategorySeverityMap = getRiskCategorySeverityMap;
|
|
4
|
+
// This file is imported by the frontend and shouldn't use native dependencies.
|
|
5
|
+
const constants_1 = require("./constants");
|
|
6
|
+
function getRiskCategorySeverityMap(plugins) {
|
|
7
|
+
const overrides = plugins?.reduce((acc, plugin) => {
|
|
8
|
+
if (plugin.severity) {
|
|
9
|
+
acc[plugin.id] = plugin.severity;
|
|
10
|
+
}
|
|
11
|
+
return acc;
|
|
12
|
+
}, {}) || {};
|
|
13
|
+
return {
|
|
14
|
+
...constants_1.riskCategorySeverityMap,
|
|
15
|
+
...overrides,
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=sharedFrontend.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sharedFrontend.js","sourceRoot":"","sources":["../../../src/redteam/sharedFrontend.ts"],"names":[],"mappings":";;AAIA,gEAkBC;AAtBD,+EAA+E;AAC/E,2CAAkF;AAGlF,SAAgB,0BAA0B,CACxC,OAA+B;IAE/B,MAAM,SAAS,GACb,OAAO,EAAE,MAAM,CACb,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;QACd,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,GAAG,CAAC,MAAM,CAAC,EAAY,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC;QAC7C,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAA8B,CAC/B,IAAI,EAAE,CAAC;IAEV,OAAO;QACL,GAAG,mCAAuB;QAC1B,GAAG,SAAS;KACb,CAAC;AACJ,CAAC"}
|
|
@@ -61,6 +61,7 @@ export interface RedteamCliGenerateOptions extends CommonOptions {
|
|
|
61
61
|
write: boolean;
|
|
62
62
|
inRedteamRun?: boolean;
|
|
63
63
|
verbose?: boolean;
|
|
64
|
+
abortSignal?: AbortSignal;
|
|
64
65
|
}
|
|
65
66
|
export interface RedteamFileConfig extends CommonOptions {
|
|
66
67
|
entities?: string[];
|
|
@@ -77,7 +78,24 @@ export interface SynthesizeOptions extends CommonOptions {
|
|
|
77
78
|
})[];
|
|
78
79
|
prompts: [string, ...string[]];
|
|
79
80
|
strategies: RedteamStrategyObject[];
|
|
81
|
+
abortSignal?: AbortSignal;
|
|
80
82
|
}
|
|
81
83
|
export type RedteamAssertionTypes = `promptfoo:redteam:${string}`;
|
|
84
|
+
export interface RedteamRunOptions {
|
|
85
|
+
config?: string;
|
|
86
|
+
output?: string;
|
|
87
|
+
cache?: boolean;
|
|
88
|
+
envPath?: string;
|
|
89
|
+
maxConcurrency?: number;
|
|
90
|
+
delay?: number;
|
|
91
|
+
remote?: boolean;
|
|
92
|
+
force?: boolean;
|
|
93
|
+
filterProviders?: string;
|
|
94
|
+
filterTargets?: string;
|
|
95
|
+
verbose?: boolean;
|
|
96
|
+
liveRedteamConfig?: any;
|
|
97
|
+
logCallback?: (message: string) => void;
|
|
98
|
+
abortSignal?: AbortSignal;
|
|
99
|
+
}
|
|
82
100
|
export {};
|
|
83
101
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/redteam/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGpD,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAC1D,MAAM,MAAM,YAAY,GAAG,mBAAmB,GAAG;IAC/C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,CAAC,EAAE;QACf,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,OAAO,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE,CAAC;IACJ,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AACF,MAAM,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAEjD,KAAK,kBAAkB,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAEF,KAAK,YAAY,GAAG;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAGF,MAAM,MAAM,mBAAmB,GAAG,kBAAkB,GAClD,YAAY,GAAG;IACb,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AACJ,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,mBAAmB,CAAC;AAEzD,MAAM,MAAM,qBAAqB,GAAG,kBAAkB,GAAG;IACvD,MAAM,CAAC,EAAE,cAAc,GAAG;QACxB,OAAO,CAAC,EAAE,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;CACH,CAAC;AACF,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,qBAAqB,CAAC;AAE7D,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,WAAW,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,YAAY,CAAC;CACvB;AAGD,KAAK,aAAa,GAAG;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,WAAW,CAAC;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,yBAA0B,SAAQ,aAAa;IAC9D,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/redteam/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eval.d.ts","sourceRoot":"","sources":["../../../../src/server/routes/eval.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"eval.d.ts","sourceRoot":"","sources":["../../../../src/server/routes/eval.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAIV,GAAG,EAEJ,MAAM,aAAa,CAAC;AASrB,eAAO,MAAM,UAAU,4CAAW,CAAC;AAGnC,eAAO,MAAM,QAAQ,kBAAyB,CAAC"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.evalRouter = void 0;
|
|
6
|
+
exports.evalJobs = exports.evalRouter = void 0;
|
|
7
7
|
const express_1 = require("express");
|
|
8
8
|
const uuid_1 = require("uuid");
|
|
9
9
|
const zod_1 = require("zod");
|
|
@@ -18,11 +18,18 @@ const invariant_1 = __importDefault(require("../../util/invariant"));
|
|
|
18
18
|
const apiSchemas_1 = require("../apiSchemas");
|
|
19
19
|
exports.evalRouter = (0, express_1.Router)();
|
|
20
20
|
// Running jobs
|
|
21
|
-
|
|
21
|
+
exports.evalJobs = new Map();
|
|
22
22
|
exports.evalRouter.post('/job', (req, res) => {
|
|
23
23
|
const { evaluateOptions, ...testSuite } = req.body;
|
|
24
24
|
const id = (0, uuid_1.v4)();
|
|
25
|
-
evalJobs.set(id, {
|
|
25
|
+
exports.evalJobs.set(id, {
|
|
26
|
+
evalId: null,
|
|
27
|
+
status: 'in-progress',
|
|
28
|
+
progress: 0,
|
|
29
|
+
total: 0,
|
|
30
|
+
result: null,
|
|
31
|
+
logs: [],
|
|
32
|
+
});
|
|
26
33
|
index_1.default
|
|
27
34
|
.evaluate(Object.assign({}, testSuite, {
|
|
28
35
|
writeLatestResults: true,
|
|
@@ -30,7 +37,7 @@ exports.evalRouter.post('/job', (req, res) => {
|
|
|
30
37
|
}), Object.assign({}, evaluateOptions, {
|
|
31
38
|
eventSource: 'web',
|
|
32
39
|
progressCallback: (progress, total) => {
|
|
33
|
-
const job = evalJobs.get(id);
|
|
40
|
+
const job = exports.evalJobs.get(id);
|
|
34
41
|
(0, invariant_1.default)(job, 'Job not found');
|
|
35
42
|
job.progress = progress;
|
|
36
43
|
job.total = total;
|
|
@@ -38,26 +45,37 @@ exports.evalRouter.post('/job', (req, res) => {
|
|
|
38
45
|
},
|
|
39
46
|
}))
|
|
40
47
|
.then(async (result) => {
|
|
41
|
-
const job = evalJobs.get(id);
|
|
48
|
+
const job = exports.evalJobs.get(id);
|
|
42
49
|
(0, invariant_1.default)(job, 'Job not found');
|
|
43
50
|
job.status = 'complete';
|
|
44
51
|
job.result = await result.toEvaluateSummary();
|
|
52
|
+
job.evalId = result.id;
|
|
45
53
|
console.log(`[${id}] Complete`);
|
|
46
54
|
});
|
|
47
55
|
res.json({ id });
|
|
48
56
|
});
|
|
49
57
|
exports.evalRouter.get('/job/:id', (req, res) => {
|
|
50
58
|
const id = req.params.id;
|
|
51
|
-
const job = evalJobs.get(id);
|
|
59
|
+
const job = exports.evalJobs.get(id);
|
|
52
60
|
if (!job) {
|
|
53
61
|
res.status(404).json({ error: 'Job not found' });
|
|
54
62
|
return;
|
|
55
63
|
}
|
|
56
64
|
if (job.status === 'complete') {
|
|
57
|
-
res.json({
|
|
65
|
+
res.json({
|
|
66
|
+
status: 'complete',
|
|
67
|
+
result: job.result,
|
|
68
|
+
evalId: job.evalId,
|
|
69
|
+
logs: job.logs,
|
|
70
|
+
});
|
|
58
71
|
}
|
|
59
72
|
else {
|
|
60
|
-
res.json({
|
|
73
|
+
res.json({
|
|
74
|
+
status: 'in-progress',
|
|
75
|
+
progress: job.progress,
|
|
76
|
+
total: job.total,
|
|
77
|
+
logs: job.logs,
|
|
78
|
+
});
|
|
61
79
|
}
|
|
62
80
|
});
|
|
63
81
|
exports.evalRouter.patch('/:id', (req, res) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eval.js","sourceRoot":"","sources":["../../../../src/server/routes/eval.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAiC;AAEjC,+BAAoC;AACpC,6BAAwB;AACxB,+DAAoD;AACpD,0DAAyE;AAQzE,wDAAoC;AACpC,0DAAkC;AAClC,6DAAqC;AACrC,yEAAiD;AACjD,qCAA8E;AAC9E,qEAA6C;AAC7C,8CAA2C;AAE9B,QAAA,UAAU,GAAG,IAAA,gBAAM,GAAE,CAAC;AAEnC,eAAe;
|
|
1
|
+
{"version":3,"file":"eval.js","sourceRoot":"","sources":["../../../../src/server/routes/eval.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redteam.d.ts","sourceRoot":"","sources":["../../../../src/server/routes/redteam.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"redteam.d.ts","sourceRoot":"","sources":["../../../../src/server/routes/redteam.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,aAAa,4CAAW,CAAC"}
|
|
@@ -5,9 +5,110 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.redteamRouter = void 0;
|
|
7
7
|
const express_1 = require("express");
|
|
8
|
+
const uuid_1 = require("uuid");
|
|
9
|
+
const cliState_1 = __importDefault(require("../../cliState"));
|
|
8
10
|
const logger_1 = __importDefault(require("../../logger"));
|
|
9
11
|
const remoteGeneration_1 = require("../../redteam/remoteGeneration");
|
|
12
|
+
const shared_1 = require("../../redteam/shared");
|
|
13
|
+
const eval_1 = require("./eval");
|
|
10
14
|
exports.redteamRouter = (0, express_1.Router)();
|
|
15
|
+
// Track the current running job
|
|
16
|
+
let currentJobId = null;
|
|
17
|
+
let currentAbortController = null;
|
|
18
|
+
exports.redteamRouter.post('/run', async (req, res) => {
|
|
19
|
+
// If there's a current job running, abort it
|
|
20
|
+
if (currentJobId) {
|
|
21
|
+
if (currentAbortController) {
|
|
22
|
+
currentAbortController.abort();
|
|
23
|
+
}
|
|
24
|
+
const existingJob = eval_1.evalJobs.get(currentJobId);
|
|
25
|
+
if (existingJob) {
|
|
26
|
+
existingJob.status = 'error';
|
|
27
|
+
existingJob.logs.push('Job cancelled - new job started');
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
const { config, force, verbose } = req.body;
|
|
31
|
+
const id = (0, uuid_1.v4)();
|
|
32
|
+
currentJobId = id;
|
|
33
|
+
currentAbortController = new AbortController();
|
|
34
|
+
// Initialize job status with empty logs array
|
|
35
|
+
eval_1.evalJobs.set(id, {
|
|
36
|
+
evalId: null,
|
|
37
|
+
status: 'in-progress',
|
|
38
|
+
progress: 0,
|
|
39
|
+
total: 0,
|
|
40
|
+
result: null,
|
|
41
|
+
logs: [],
|
|
42
|
+
});
|
|
43
|
+
// Set web UI mode
|
|
44
|
+
cliState_1.default.webUI = true;
|
|
45
|
+
// Run redteam in background
|
|
46
|
+
(0, shared_1.doRedteamRun)({
|
|
47
|
+
liveRedteamConfig: config,
|
|
48
|
+
force,
|
|
49
|
+
verbose,
|
|
50
|
+
logCallback: (message) => {
|
|
51
|
+
if (currentJobId === id) {
|
|
52
|
+
const job = eval_1.evalJobs.get(id);
|
|
53
|
+
if (job) {
|
|
54
|
+
job.logs.push(message);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
},
|
|
58
|
+
abortSignal: currentAbortController.signal,
|
|
59
|
+
})
|
|
60
|
+
.then(async (evalResult) => {
|
|
61
|
+
const summary = evalResult ? await evalResult.toEvaluateSummary() : null;
|
|
62
|
+
const job = eval_1.evalJobs.get(id);
|
|
63
|
+
if (job && currentJobId === id) {
|
|
64
|
+
job.status = 'complete';
|
|
65
|
+
job.result = summary;
|
|
66
|
+
job.evalId = evalResult?.id ?? null;
|
|
67
|
+
}
|
|
68
|
+
if (currentJobId === id) {
|
|
69
|
+
cliState_1.default.webUI = false;
|
|
70
|
+
currentJobId = null;
|
|
71
|
+
currentAbortController = null;
|
|
72
|
+
}
|
|
73
|
+
})
|
|
74
|
+
.catch((error) => {
|
|
75
|
+
console.error('Error running redteam:', error);
|
|
76
|
+
const job = eval_1.evalJobs.get(id);
|
|
77
|
+
if (job && currentJobId === id) {
|
|
78
|
+
job.status = 'error';
|
|
79
|
+
job.logs.push(`Error: ${error.message}`);
|
|
80
|
+
}
|
|
81
|
+
if (currentJobId === id) {
|
|
82
|
+
cliState_1.default.webUI = false;
|
|
83
|
+
currentJobId = null;
|
|
84
|
+
currentAbortController = null;
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
res.json({ id });
|
|
88
|
+
});
|
|
89
|
+
exports.redteamRouter.post('/cancel', async (req, res) => {
|
|
90
|
+
if (!currentJobId) {
|
|
91
|
+
res.status(400).json({ error: 'No job currently running' });
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
const jobId = currentJobId;
|
|
95
|
+
if (currentAbortController) {
|
|
96
|
+
currentAbortController.abort();
|
|
97
|
+
}
|
|
98
|
+
const job = eval_1.evalJobs.get(jobId);
|
|
99
|
+
if (job) {
|
|
100
|
+
job.status = 'error';
|
|
101
|
+
job.logs.push('Job cancelled by user');
|
|
102
|
+
}
|
|
103
|
+
// Clear state
|
|
104
|
+
cliState_1.default.webUI = false;
|
|
105
|
+
currentJobId = null;
|
|
106
|
+
currentAbortController = null;
|
|
107
|
+
// Wait a moment to ensure cleanup
|
|
108
|
+
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
109
|
+
res.json({ message: 'Job cancelled' });
|
|
110
|
+
});
|
|
111
|
+
// NOTE: This comes last, so the other routes take precedence
|
|
11
112
|
exports.redteamRouter.post('/:task', async (req, res) => {
|
|
12
113
|
const { task } = req.params;
|
|
13
114
|
const cloudFunctionUrl = (0, remoteGeneration_1.getRemoteGenerationUrl)();
|
|
@@ -41,4 +142,10 @@ exports.redteamRouter.post('/:task', async (req, res) => {
|
|
|
41
142
|
res.status(500).json({ error: `Failed to process ${task} task` });
|
|
42
143
|
}
|
|
43
144
|
});
|
|
145
|
+
exports.redteamRouter.get('/status', async (req, res) => {
|
|
146
|
+
res.json({
|
|
147
|
+
hasRunningJob: currentJobId !== null,
|
|
148
|
+
jobId: currentJobId,
|
|
149
|
+
});
|
|
150
|
+
});
|
|
44
151
|
//# sourceMappingURL=redteam.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redteam.js","sourceRoot":"","sources":["../../../../src/server/routes/redteam.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAiC;AAEjC,0DAAkC;AAClC,qEAAwE;
|
|
1
|
+
{"version":3,"file":"redteam.js","sourceRoot":"","sources":["../../../../src/server/routes/redteam.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,4 @@
|
|
|
1
1
|
import { BrowserBehavior } from '../util/server';
|
|
2
|
-
export declare function checkRemoteHealth(apiUrl: string): Promise<{
|
|
3
|
-
status: 'OK' | 'ERROR' | 'DISABLED';
|
|
4
|
-
message: string;
|
|
5
|
-
}>;
|
|
6
|
-
export declare function getRemoteHealthUrl(): string | null;
|
|
7
2
|
export declare function createApp(): import("express-serve-static-core").Express;
|
|
8
3
|
export declare function startServer(port?: number, browserBehavior?: BrowserBehavior, filterDescription?: string): void;
|
|
9
4
|
//# sourceMappingURL=server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"AAmCA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAWjD,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"AAmCA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAWjD,wBAAgB,SAAS,gDAgJxB;AAED,wBAAgB,WAAW,CACzB,IAAI,SAAe,EACnB,eAAe,kBAAsB,EACrC,iBAAiB,CAAC,EAAE,MAAM,QAoD3B"}
|
|
@@ -3,8 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.checkRemoteHealth = checkRemoteHealth;
|
|
7
|
-
exports.getRemoteHealthUrl = getRemoteHealthUrl;
|
|
8
6
|
exports.createApp = createApp;
|
|
9
7
|
exports.startServer = startServer;
|
|
10
8
|
const compression_1 = __importDefault(require("compression"));
|
|
@@ -20,16 +18,16 @@ const zod_validation_error_1 = require("zod-validation-error");
|
|
|
20
18
|
const share_1 = require("../commands/share");
|
|
21
19
|
const constants_1 = require("../constants");
|
|
22
20
|
const database_1 = require("../database");
|
|
23
|
-
const envars_1 = require("../envars");
|
|
24
21
|
const esm_1 = require("../esm");
|
|
25
|
-
const cloud_1 = require("../globalConfig/cloud");
|
|
26
22
|
const logger_1 = __importDefault(require("../logger"));
|
|
27
23
|
const migrate_1 = require("../migrate");
|
|
28
24
|
const eval_1 = __importDefault(require("../models/eval"));
|
|
25
|
+
const remoteGeneration_1 = require("../redteam/remoteGeneration");
|
|
29
26
|
const telemetry_1 = __importDefault(require("../telemetry"));
|
|
30
27
|
const telemetry_2 = require("../telemetry");
|
|
31
28
|
const testCases_1 = require("../testCases");
|
|
32
29
|
const util_1 = require("../util");
|
|
30
|
+
const apiHealth_1 = require("../util/apiHealth");
|
|
33
31
|
const invariant_1 = __importDefault(require("../util/invariant"));
|
|
34
32
|
const server_1 = require("../util/server");
|
|
35
33
|
const server_2 = require("../util/server");
|
|
@@ -40,56 +38,6 @@ const redteam_1 = require("./routes/redteam");
|
|
|
40
38
|
const user_1 = require("./routes/user");
|
|
41
39
|
// Prompts cache
|
|
42
40
|
let allPrompts = null;
|
|
43
|
-
async function checkRemoteHealth(apiUrl) {
|
|
44
|
-
try {
|
|
45
|
-
const response = await fetch(apiUrl, {
|
|
46
|
-
signal: AbortSignal.timeout(1000),
|
|
47
|
-
headers: {
|
|
48
|
-
'User-Agent': `promptfoo/${constants_1.VERSION}`,
|
|
49
|
-
'Content-Type': 'application/json',
|
|
50
|
-
},
|
|
51
|
-
});
|
|
52
|
-
if (!response.ok) {
|
|
53
|
-
return {
|
|
54
|
-
status: 'ERROR',
|
|
55
|
-
message: `Failed to connect to ${apiUrl} (Status ${response.status}: ${response.statusText})`,
|
|
56
|
-
};
|
|
57
|
-
}
|
|
58
|
-
const data = await response.json();
|
|
59
|
-
if (data.status === 'OK') {
|
|
60
|
-
const cloudConfig = new cloud_1.CloudConfig();
|
|
61
|
-
return {
|
|
62
|
-
status: 'OK',
|
|
63
|
-
message: `Cloud API is healthy${cloudConfig.isEnabled() ? ' (using custom endpoint)' : ''}`,
|
|
64
|
-
};
|
|
65
|
-
}
|
|
66
|
-
return {
|
|
67
|
-
status: 'ERROR',
|
|
68
|
-
message: `${apiUrl} responded with an error status.\nTry visiting ${apiUrl} in your web browser to check if it's accessible`,
|
|
69
|
-
};
|
|
70
|
-
}
|
|
71
|
-
catch (error) {
|
|
72
|
-
const message = error instanceof Error ? error.message : 'Unknown error';
|
|
73
|
-
return {
|
|
74
|
-
status: 'ERROR',
|
|
75
|
-
message: `Failed to connect to ${apiUrl}: ${message}\nTry visiting ${apiUrl} in your web browser to check if it's accessible`,
|
|
76
|
-
};
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
function getRemoteHealthUrl() {
|
|
80
|
-
if ((0, envars_1.getEnvBool)('PROMPTFOO_DISABLE_REDTEAM_REMOTE_GENERATION')) {
|
|
81
|
-
return null;
|
|
82
|
-
}
|
|
83
|
-
const envUrl = (0, envars_1.getEnvString)('PROMPTFOO_REMOTE_GENERATION_URL');
|
|
84
|
-
if (envUrl) {
|
|
85
|
-
return envUrl.replace(/\/task$/, '/health');
|
|
86
|
-
}
|
|
87
|
-
const cloudConfig = new cloud_1.CloudConfig();
|
|
88
|
-
if (cloudConfig.isEnabled()) {
|
|
89
|
-
return cloudConfig.getApiHost() + '/health';
|
|
90
|
-
}
|
|
91
|
-
return 'https://api.promptfoo.app/health';
|
|
92
|
-
}
|
|
93
41
|
function createApp() {
|
|
94
42
|
const app = (0, express_1.default)();
|
|
95
43
|
const staticDir = node_path_1.default.join((0, esm_1.getDirectory)(), 'app');
|
|
@@ -101,7 +49,7 @@ function createApp() {
|
|
|
101
49
|
res.status(200).json({ status: 'OK', version: constants_1.VERSION });
|
|
102
50
|
});
|
|
103
51
|
app.get('/api/remote-health', async (req, res) => {
|
|
104
|
-
const apiUrl = getRemoteHealthUrl();
|
|
52
|
+
const apiUrl = (0, remoteGeneration_1.getRemoteHealthUrl)();
|
|
105
53
|
if (apiUrl === null) {
|
|
106
54
|
res.json({
|
|
107
55
|
status: 'DISABLED',
|
|
@@ -109,7 +57,7 @@ function createApp() {
|
|
|
109
57
|
});
|
|
110
58
|
return;
|
|
111
59
|
}
|
|
112
|
-
const result = await checkRemoteHealth(apiUrl);
|
|
60
|
+
const result = await (0, apiHealth_1.checkRemoteHealth)(apiUrl);
|
|
113
61
|
res.json(result);
|
|
114
62
|
});
|
|
115
63
|
app.get('/api/results', async (req, res) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":";;;;;AA8CA,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -240,7 +240,9 @@ declare const EvaluateOptionsSchema: z.ZodObject<{
|
|
|
240
240
|
progressCallback?: ((args_0: number, args_1: number, args_2: number, args_3: RunEvalOptions) => void) | undefined;
|
|
241
241
|
showProgressBar?: boolean | undefined;
|
|
242
242
|
}>;
|
|
243
|
-
export type EvaluateOptions = z.infer<typeof EvaluateOptionsSchema
|
|
243
|
+
export type EvaluateOptions = z.infer<typeof EvaluateOptionsSchema> & {
|
|
244
|
+
abortSignal?: AbortSignal;
|
|
245
|
+
};
|
|
244
246
|
declare const PromptMetricsSchema: z.ZodObject<{
|
|
245
247
|
score: z.ZodNumber;
|
|
246
248
|
testPassCount: z.ZodNumber;
|
|
@@ -33409,10 +33411,12 @@ export interface OutputFile {
|
|
|
33409
33411
|
shareableUrl: string | null;
|
|
33410
33412
|
}
|
|
33411
33413
|
export interface Job {
|
|
33412
|
-
|
|
33414
|
+
evalId: string | null;
|
|
33415
|
+
status: 'in-progress' | 'complete' | 'error';
|
|
33413
33416
|
progress: number;
|
|
33414
33417
|
total: number;
|
|
33415
33418
|
result: EvaluateSummaryV3 | EvaluateSummaryV2 | null;
|
|
33419
|
+
logs: string[];
|
|
33416
33420
|
}
|
|
33417
33421
|
export declare const OutputFileExtension: z.ZodEnum<["csv", "html", "json", "jsonl", "txt", "yaml", "yml"]>;
|
|
33418
33422
|
export type OutputFileExtension = z.infer<typeof OutputFileExtension>;
|