promptfoo 0.100.4 → 0.100.6
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 +13 -14
- package/dist/src/app/assets/{index-BQ5_IXki.js → index-DilfRyVV.js} +250 -250
- package/dist/src/app/assets/{index.es-D5Pwj_C4.js → index.es-BlWn08uT.js} +1 -1
- package/dist/src/app/assets/{sync-OQfXnPYr.js → sync-Bi0uUoUZ.js} +1 -1
- package/dist/src/app/index.html +1 -1
- package/dist/src/assertions/answerRelevance.d.ts.map +1 -1
- package/dist/src/assertions/answerRelevance.js +3 -3
- package/dist/src/assertions/answerRelevance.js.map +1 -1
- package/dist/src/assertions/bleu.d.ts +10 -0
- package/dist/src/assertions/bleu.d.ts.map +1 -1
- package/dist/src/assertions/bleu.js +2 -12
- package/dist/src/assertions/bleu.js.map +1 -1
- package/dist/src/assertions/classifier.d.ts.map +1 -1
- package/dist/src/assertions/classifier.js +2 -2
- package/dist/src/assertions/classifier.js.map +1 -1
- package/dist/src/assertions/contains.d.ts.map +1 -1
- package/dist/src/assertions/contains.js +13 -13
- package/dist/src/assertions/contains.js.map +1 -1
- package/dist/src/assertions/contextFaithfulness.d.ts.map +1 -1
- package/dist/src/assertions/contextFaithfulness.js +5 -5
- package/dist/src/assertions/contextFaithfulness.js.map +1 -1
- package/dist/src/assertions/contextRecall.d.ts.map +1 -1
- package/dist/src/assertions/contextRecall.js +3 -3
- package/dist/src/assertions/contextRecall.js.map +1 -1
- package/dist/src/assertions/contextRelevance.d.ts.map +1 -1
- package/dist/src/assertions/contextRelevance.js +4 -4
- package/dist/src/assertions/contextRelevance.js.map +1 -1
- package/dist/src/assertions/factuality.d.ts.map +1 -1
- package/dist/src/assertions/factuality.js +4 -4
- package/dist/src/assertions/factuality.js.map +1 -1
- package/dist/src/assertions/index.d.ts.map +1 -1
- package/dist/src/assertions/index.js +3 -3
- package/dist/src/assertions/index.js.map +1 -1
- package/dist/src/assertions/javascript.d.ts.map +1 -1
- package/dist/src/assertions/javascript.js +3 -3
- package/dist/src/assertions/javascript.js.map +1 -1
- package/dist/src/assertions/json.d.ts.map +1 -1
- package/dist/src/assertions/json.js +3 -3
- package/dist/src/assertions/json.js.map +1 -1
- package/dist/src/assertions/levenshtein.d.ts.map +1 -1
- package/dist/src/assertions/levenshtein.js +2 -2
- package/dist/src/assertions/levenshtein.js.map +1 -1
- package/dist/src/assertions/llmRubric.d.ts.map +1 -1
- package/dist/src/assertions/llmRubric.js +2 -2
- package/dist/src/assertions/llmRubric.js.map +1 -1
- package/dist/src/assertions/modelGradedClosedQa.d.ts.map +1 -1
- package/dist/src/assertions/modelGradedClosedQa.js +4 -4
- package/dist/src/assertions/modelGradedClosedQa.js.map +1 -1
- package/dist/src/assertions/moderation.d.ts.map +1 -1
- package/dist/src/assertions/moderation.js +3 -3
- package/dist/src/assertions/moderation.js.map +1 -1
- package/dist/src/assertions/python.d.ts.map +1 -1
- package/dist/src/assertions/python.js +2 -2
- package/dist/src/assertions/python.js.map +1 -1
- package/dist/src/assertions/redteam.d.ts.map +1 -1
- package/dist/src/assertions/redteam.js +3 -3
- package/dist/src/assertions/redteam.js.map +1 -1
- package/dist/src/assertions/regex.d.ts.map +1 -1
- package/dist/src/assertions/regex.js +3 -3
- package/dist/src/assertions/regex.js.map +1 -1
- package/dist/src/assertions/rouge.d.ts.map +1 -1
- package/dist/src/assertions/rouge.js +2 -2
- package/dist/src/assertions/rouge.js.map +1 -1
- package/dist/src/assertions/similar.d.ts.map +1 -1
- package/dist/src/assertions/similar.js +2 -2
- package/dist/src/assertions/similar.js.map +1 -1
- package/dist/src/assertions/startsWith.d.ts.map +1 -1
- package/dist/src/assertions/startsWith.js +3 -3
- package/dist/src/assertions/startsWith.js.map +1 -1
- package/dist/src/assertions/webhook.d.ts.map +1 -1
- package/dist/src/assertions/webhook.js +3 -3
- package/dist/src/assertions/webhook.js.map +1 -1
- package/dist/src/commands/eval.d.ts.map +1 -1
- package/dist/src/commands/eval.js +2 -2
- package/dist/src/commands/eval.js.map +1 -1
- package/dist/src/commands/share.d.ts.map +1 -1
- package/dist/src/commands/share.js +2 -2
- package/dist/src/commands/share.js.map +1 -1
- package/dist/src/commands/show.js +2 -2
- package/dist/src/commands/show.js.map +1 -1
- package/dist/src/evaluator.d.ts.map +1 -1
- package/dist/src/evaluator.js +12 -16
- package/dist/src/evaluator.js.map +1 -1
- package/dist/src/evaluatorHelpers.d.ts.map +1 -1
- package/dist/src/evaluatorHelpers.js +3 -3
- package/dist/src/evaluatorHelpers.js.map +1 -1
- package/dist/src/fetch.js +3 -3
- package/dist/src/fetch.js.map +1 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +2 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/integrations/portkey.js +2 -2
- package/dist/src/integrations/portkey.js.map +1 -1
- package/dist/src/matchers.d.ts.map +1 -1
- package/dist/src/matchers.js +35 -25
- package/dist/src/matchers.js.map +1 -1
- package/dist/src/models/eval.d.ts.map +1 -1
- package/dist/src/models/eval.js +8 -8
- package/dist/src/models/eval.js.map +1 -1
- package/dist/src/prompts/index.d.ts.map +1 -1
- package/dist/src/prompts/index.js +3 -3
- package/dist/src/prompts/index.js.map +1 -1
- package/dist/src/prompts/processors/javascript.d.ts.map +1 -1
- package/dist/src/prompts/processors/javascript.js +2 -2
- package/dist/src/prompts/processors/javascript.js.map +1 -1
- package/dist/src/prompts/processors/python.d.ts.map +1 -1
- package/dist/src/prompts/processors/python.js +3 -3
- package/dist/src/prompts/processors/python.js.map +1 -1
- package/dist/src/prompts/processors/string.d.ts.map +1 -1
- package/dist/src/prompts/processors/string.js +2 -2
- package/dist/src/prompts/processors/string.js.map +1 -1
- package/dist/src/prompts/processors/yaml.d.ts.map +1 -1
- package/dist/src/prompts/processors/yaml.js +0 -1
- package/dist/src/prompts/processors/yaml.js.map +1 -1
- package/dist/src/providers/azure.d.ts.map +1 -1
- package/dist/src/providers/azure.js +6 -6
- package/dist/src/providers/azure.js.map +1 -1
- package/dist/src/providers/bedrock.d.ts.map +1 -1
- package/dist/src/providers/bedrock.js +20 -9
- package/dist/src/providers/bedrock.js.map +1 -1
- package/dist/src/providers/browser.d.ts.map +1 -1
- package/dist/src/providers/browser.js +9 -9
- package/dist/src/providers/browser.js.map +1 -1
- package/dist/src/providers/cloudflare-ai.d.ts.map +1 -1
- package/dist/src/providers/cloudflare-ai.js +4 -4
- package/dist/src/providers/cloudflare-ai.js.map +1 -1
- package/dist/src/providers/defaults.d.ts +5 -0
- package/dist/src/providers/defaults.d.ts.map +1 -1
- package/dist/src/providers/defaults.js +44 -16
- package/dist/src/providers/defaults.js.map +1 -1
- package/dist/src/providers/http.d.ts +36 -13
- package/dist/src/providers/http.d.ts.map +1 -1
- package/dist/src/providers/http.js +25 -14
- package/dist/src/providers/http.js.map +1 -1
- package/dist/src/providers/scriptCompletion.d.ts.map +1 -1
- package/dist/src/providers/scriptCompletion.js +2 -2
- package/dist/src/providers/scriptCompletion.js.map +1 -1
- package/dist/src/providers/sequence.d.ts.map +1 -1
- package/dist/src/providers/sequence.js +3 -3
- package/dist/src/providers/sequence.js.map +1 -1
- package/dist/src/providers/simulatedUser.d.ts.map +1 -1
- package/dist/src/providers/simulatedUser.js +2 -2
- package/dist/src/providers/simulatedUser.js.map +1 -1
- package/dist/src/providers/watsonx.d.ts.map +1 -1
- package/dist/src/providers/watsonx.js +3 -3
- package/dist/src/providers/watsonx.js.map +1 -1
- package/dist/src/providers/websocket.d.ts.map +1 -1
- package/dist/src/providers/websocket.js +2 -2
- package/dist/src/providers/websocket.js.map +1 -1
- package/dist/src/providers/xai.d.ts.map +1 -1
- package/dist/src/providers/xai.js +2 -2
- package/dist/src/providers/xai.js.map +1 -1
- package/dist/src/providers.d.ts.map +1 -1
- package/dist/src/providers.js +3 -3
- 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 +2 -2
- package/dist/src/redteam/commands/generate.js.map +1 -1
- package/dist/src/redteam/constants.d.ts +1 -0
- package/dist/src/redteam/constants.d.ts.map +1 -1
- package/dist/src/redteam/constants.js +9 -1
- package/dist/src/redteam/constants.js.map +1 -1
- package/dist/src/redteam/extraction/purpose.d.ts.map +1 -1
- package/dist/src/redteam/extraction/purpose.js +11 -5
- package/dist/src/redteam/extraction/purpose.js.map +1 -1
- package/dist/src/redteam/extraction/util.d.ts.map +1 -1
- package/dist/src/redteam/extraction/util.js +2 -2
- package/dist/src/redteam/extraction/util.js.map +1 -1
- package/dist/src/redteam/index.d.ts.map +1 -1
- package/dist/src/redteam/index.js +3 -3
- package/dist/src/redteam/index.js.map +1 -1
- package/dist/src/redteam/plugins/base.d.ts.map +1 -1
- package/dist/src/redteam/plugins/base.js +5 -5
- package/dist/src/redteam/plugins/base.js.map +1 -1
- package/dist/src/redteam/plugins/crossSessionLeak.js +1 -1
- package/dist/src/redteam/plugins/crossSessionLeak.js.map +1 -1
- package/dist/src/redteam/plugins/harmful/aligned.d.ts.map +1 -1
- package/dist/src/redteam/plugins/harmful/aligned.js +2 -2
- package/dist/src/redteam/plugins/harmful/aligned.js.map +1 -1
- package/dist/src/redteam/plugins/index.d.ts.map +1 -1
- package/dist/src/redteam/plugins/index.js +6 -6
- package/dist/src/redteam/plugins/index.js.map +1 -1
- package/dist/src/redteam/plugins/indirectPromptInjection.d.ts.map +1 -1
- package/dist/src/redteam/plugins/indirectPromptInjection.js +2 -2
- package/dist/src/redteam/plugins/indirectPromptInjection.js.map +1 -1
- package/dist/src/redteam/plugins/intent.d.ts.map +1 -1
- package/dist/src/redteam/plugins/intent.js +3 -3
- package/dist/src/redteam/plugins/intent.js.map +1 -1
- package/dist/src/redteam/plugins/policy.d.ts.map +1 -1
- package/dist/src/redteam/plugins/policy.js +2 -2
- package/dist/src/redteam/plugins/policy.js.map +1 -1
- package/dist/src/redteam/plugins/promptExtraction.d.ts.map +1 -1
- package/dist/src/redteam/plugins/promptExtraction.js +2 -2
- package/dist/src/redteam/plugins/promptExtraction.js.map +1 -1
- package/dist/src/redteam/providers/crescendo/index.d.ts.map +1 -1
- package/dist/src/redteam/providers/crescendo/index.js +31 -16
- package/dist/src/redteam/providers/crescendo/index.js.map +1 -1
- package/dist/src/redteam/providers/goat.d.ts.map +1 -1
- package/dist/src/redteam/providers/goat.js +18 -7
- package/dist/src/redteam/providers/goat.js.map +1 -1
- package/dist/src/redteam/providers/iterative.d.ts.map +1 -1
- package/dist/src/redteam/providers/iterative.js +18 -9
- 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 +8 -8
- package/dist/src/redteam/providers/iterativeImage.js.map +1 -1
- package/dist/src/redteam/providers/iterativeTree.d.ts.map +1 -1
- package/dist/src/redteam/providers/iterativeTree.js +19 -10
- package/dist/src/redteam/providers/iterativeTree.js.map +1 -1
- package/dist/src/redteam/providers/shared.d.ts +13 -5
- package/dist/src/redteam/providers/shared.d.ts.map +1 -1
- package/dist/src/redteam/providers/shared.js +31 -3
- package/dist/src/redteam/providers/shared.js.map +1 -1
- package/dist/src/redteam/strategies/citation.d.ts.map +1 -1
- package/dist/src/redteam/strategies/citation.js +2 -2
- package/dist/src/redteam/strategies/citation.js.map +1 -1
- package/dist/src/redteam/strategies/mathPrompt.d.ts.map +1 -1
- package/dist/src/redteam/strategies/mathPrompt.js +6 -3
- package/dist/src/redteam/strategies/mathPrompt.js.map +1 -1
- package/dist/src/redteam/strategies/multilingual.d.ts.map +1 -1
- package/dist/src/redteam/strategies/multilingual.js +16 -6
- package/dist/src/redteam/strategies/multilingual.js.map +1 -1
- package/dist/src/redteam/strategies/singleTurnComposite.d.ts.map +1 -1
- package/dist/src/redteam/strategies/singleTurnComposite.js +8 -2
- package/dist/src/redteam/strategies/singleTurnComposite.js.map +1 -1
- package/dist/src/server/routes/configs.js +8 -2
- package/dist/src/server/routes/configs.js.map +1 -1
- package/dist/src/server/routes/eval.js +9 -6
- package/dist/src/server/routes/eval.js.map +1 -1
- package/dist/src/server/routes/providers.d.ts.map +1 -1
- package/dist/src/server/routes/providers.js +16 -13
- package/dist/src/server/routes/providers.js.map +1 -1
- package/dist/src/server/server.js +2 -2
- package/dist/src/server/server.js.map +1 -1
- package/dist/src/share.d.ts.map +1 -1
- package/dist/src/share.js +2 -2
- package/dist/src/share.js.map +1 -1
- package/dist/src/testCases.d.ts.map +1 -1
- package/dist/src/testCases.js +9 -5
- package/dist/src/testCases.js.map +1 -1
- package/dist/src/util/config/load.d.ts.map +1 -1
- package/dist/src/util/config/load.js +9 -9
- package/dist/src/util/config/load.js.map +1 -1
- package/dist/src/util/convertEvalResultsToTable.d.ts.map +1 -1
- package/dist/src/util/convertEvalResultsToTable.js +4 -4
- package/dist/src/util/convertEvalResultsToTable.js.map +1 -1
- package/dist/src/util/index.d.ts.map +1 -1
- package/dist/src/util/index.js +7 -7
- package/dist/src/util/index.js.map +1 -1
- package/dist/src/util/invariant.d.ts +15 -0
- package/dist/src/util/invariant.d.ts.map +1 -0
- package/dist/src/util/invariant.js +26 -0
- package/dist/src/util/invariant.js.map +1 -0
- package/dist/src/util/json.js +2 -2
- package/dist/src/util/json.js.map +1 -1
- package/dist/test/evaluator.test.js +103 -0
- package/dist/test/evaluator.test.js.map +1 -1
- package/dist/test/matchers.test.js +52 -0
- package/dist/test/matchers.test.js.map +1 -1
- package/dist/test/prompts/processors/javascript.test.js +2 -2
- package/dist/test/prompts/processors/javascript.test.js.map +1 -1
- package/dist/test/providers/http.test.js +241 -9
- package/dist/test/providers/http.test.js.map +1 -1
- package/dist/test/redteam/extraction/entities.test.js +6 -0
- package/dist/test/redteam/extraction/entities.test.js.map +1 -1
- package/dist/test/redteam/extraction/purpose.test.js +6 -0
- package/dist/test/redteam/extraction/purpose.test.js.map +1 -1
- package/dist/test/redteam/extraction/util.test.js +21 -0
- package/dist/test/redteam/extraction/util.test.js.map +1 -1
- package/dist/test/redteam/providers/shared.test.js +243 -72
- package/dist/test/redteam/providers/shared.test.js.map +1 -1
- package/dist/test/redteam/strategies/multilingual.test.js +11 -7
- package/dist/test/redteam/strategies/multilingual.test.js.map +1 -1
- package/dist/test/server/eval.test.js +9 -9
- package/dist/test/server/eval.test.js.map +1 -1
- package/dist/test/server/providers.test.js +55 -26
- package/dist/test/server/providers.test.js.map +1 -1
- package/dist/test/testCases.test.js +32 -0
- package/dist/test/testCases.test.js.map +1 -1
- package/dist/test/util/invariant.test.d.ts +2 -0
- package/dist/test/util/invariant.test.d.ts.map +1 -0
- package/dist/test/util/invariant.test.js +36 -0
- package/dist/test/util/invariant.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +13 -14
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"citation.d.ts","sourceRoot":"","sources":["../../../../src/redteam/strategies/citation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"citation.d.ts","sourceRoot":"","sources":["../../../../src/redteam/strategies/citation.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAmG5C,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,QAAQ,EAAE,EACrB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,QAAQ,EAAE,CAAC,CAWrB"}
|
|
@@ -7,10 +7,10 @@ exports.addCitationTestCases = addCitationTestCases;
|
|
|
7
7
|
const async_1 = __importDefault(require("async"));
|
|
8
8
|
const cli_progress_1 = require("cli-progress");
|
|
9
9
|
const dedent_1 = __importDefault(require("dedent"));
|
|
10
|
-
const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
|
|
11
10
|
const cache_1 = require("../../cache");
|
|
12
11
|
const logger_1 = __importDefault(require("../../logger"));
|
|
13
12
|
const shared_1 = require("../../providers/shared");
|
|
13
|
+
const invariant_1 = __importDefault(require("../../util/invariant"));
|
|
14
14
|
const remoteGeneration_1 = require("../remoteGeneration");
|
|
15
15
|
async function generateCitations(testCases, injectVar, config) {
|
|
16
16
|
let progressBar;
|
|
@@ -25,7 +25,7 @@ async function generateCitations(testCases, injectVar, config) {
|
|
|
25
25
|
progressBar.start(testCases.length, 0);
|
|
26
26
|
}
|
|
27
27
|
await async_1.default.forEachOfLimit(testCases, concurrency, async (testCase, index) => {
|
|
28
|
-
(0,
|
|
28
|
+
(0, invariant_1.default)(testCase.vars, `Citation: testCase.vars is required, but got ${JSON.stringify(testCase)}`);
|
|
29
29
|
const payload = {
|
|
30
30
|
task: 'citation',
|
|
31
31
|
testCases: [testCase],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"citation.js","sourceRoot":"","sources":["../../../../src/redteam/strategies/citation.ts"],"names":[],"mappings":";;;;;AAyGA,oDAeC;AAxHD,kDAA0B;AAC1B,+CAAkD;AAClD,oDAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"citation.js","sourceRoot":"","sources":["../../../../src/redteam/strategies/citation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mathPrompt.d.ts","sourceRoot":"","sources":["../../../../src/redteam/strategies/mathPrompt.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mathPrompt.d.ts","sourceRoot":"","sources":["../../../../src/redteam/strategies/mathPrompt.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAa5C,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,QAAQ,EAAE,EACrB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,OAAO,CAAC,QAAQ,EAAE,CAAC,CAmErB;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAyBrF;AAED,wBAAsB,aAAa,CACjC,SAAS,EAAE,QAAQ,EAAE,EACrB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,OAAO,CAAC,QAAQ,EAAE,CAAC,CA4DrB"}
|
|
@@ -9,10 +9,10 @@ exports.addMathPrompt = addMathPrompt;
|
|
|
9
9
|
const async_1 = __importDefault(require("async"));
|
|
10
10
|
const cli_progress_1 = require("cli-progress");
|
|
11
11
|
const dedent_1 = __importDefault(require("dedent"));
|
|
12
|
-
const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
|
|
13
12
|
const cache_1 = require("../../cache");
|
|
14
13
|
const logger_1 = __importDefault(require("../../logger"));
|
|
15
14
|
const shared_1 = require("../../providers/shared");
|
|
15
|
+
const invariant_1 = __importDefault(require("../../util/invariant"));
|
|
16
16
|
const shared_2 = require("../providers/shared");
|
|
17
17
|
const remoteGeneration_1 = require("../remoteGeneration");
|
|
18
18
|
const DEFAULT_MATH_CONCEPTS = ['set theory', 'group theory', 'abstract algebra'];
|
|
@@ -74,7 +74,10 @@ async function generateMathPrompt(testCases, injectVar, config) {
|
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
76
|
async function encodeMathPrompt(text, concept) {
|
|
77
|
-
const redteamProvider = await
|
|
77
|
+
const redteamProvider = await shared_2.redteamProviderManager.getProvider({
|
|
78
|
+
jsonOnly: true,
|
|
79
|
+
preferSmallModel: true,
|
|
80
|
+
});
|
|
78
81
|
const examplePrompt = EXAMPLES[Math.floor(Math.random() * EXAMPLES.length)];
|
|
79
82
|
const result = await redteamProvider.callApi((0, dedent_1.default) `Encode the following text using ${concept} concepts, following the style of the example below. Respond with a JSON object containing {encodedPrompt: string}.
|
|
80
83
|
|
|
@@ -97,7 +100,7 @@ async function addMathPrompt(testCases, injectVar, config) {
|
|
|
97
100
|
}
|
|
98
101
|
}
|
|
99
102
|
const mathConcepts = config.mathConcepts || DEFAULT_MATH_CONCEPTS;
|
|
100
|
-
(0,
|
|
103
|
+
(0, invariant_1.default)(Array.isArray(mathConcepts), 'MathPrompt strategy: `mathConcepts` must be an array of strings');
|
|
101
104
|
const encodedTestCases = [];
|
|
102
105
|
const totalOperations = testCases.length * mathConcepts.length;
|
|
103
106
|
let progressBar;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mathPrompt.js","sourceRoot":"","sources":["../../../../src/redteam/strategies/mathPrompt.ts"],"names":[],"mappings":";;;;;AAmBA,gDAuEC;AAED,
|
|
1
|
+
{"version":3,"file":"mathPrompt.js","sourceRoot":"","sources":["../../../../src/redteam/strategies/mathPrompt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multilingual.d.ts","sourceRoot":"","sources":["../../../../src/redteam/strategies/multilingual.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"multilingual.d.ts","sourceRoot":"","sources":["../../../../src/redteam/strategies/multilingual.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAK5C,eAAO,MAAM,iBAAiB,UAAqB,CAAC;AAEpD,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,QAAQ,EAAE,EACrB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,OAAO,CAAC,QAAQ,EAAE,CAAC,CAmErB;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAoB3E;AAED,wBAAsB,eAAe,CACnC,SAAS,EAAE,QAAQ,EAAE,EACrB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,OAAO,CAAC,QAAQ,EAAE,CAAC,CAsErB"}
|
|
@@ -10,10 +10,11 @@ exports.addMultilingual = addMultilingual;
|
|
|
10
10
|
const async_1 = __importDefault(require("async"));
|
|
11
11
|
const cli_progress_1 = require("cli-progress");
|
|
12
12
|
const dedent_1 = __importDefault(require("dedent"));
|
|
13
|
-
const
|
|
13
|
+
const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
14
14
|
const cache_1 = require("../../cache");
|
|
15
15
|
const logger_1 = __importDefault(require("../../logger"));
|
|
16
16
|
const shared_1 = require("../../providers/shared");
|
|
17
|
+
const invariant_1 = __importDefault(require("../../util/invariant"));
|
|
17
18
|
const shared_2 = require("../providers/shared");
|
|
18
19
|
const remoteGeneration_1 = require("../remoteGeneration");
|
|
19
20
|
exports.DEFAULT_LANGUAGES = ['bn', 'sw', 'jv']; // Bengali, Swahili, Javanese
|
|
@@ -70,13 +71,22 @@ async function generateMultilingual(testCases, injectVar, config) {
|
|
|
70
71
|
}
|
|
71
72
|
}
|
|
72
73
|
async function translate(text, lang) {
|
|
73
|
-
const redteamProvider = await
|
|
74
|
-
|
|
74
|
+
const redteamProvider = await shared_2.redteamProviderManager.getProvider({
|
|
75
|
+
jsonOnly: true,
|
|
76
|
+
preferSmallModel: true,
|
|
77
|
+
});
|
|
78
|
+
const result = await redteamProvider.callApi((0, dedent_1.default) `Translate the <Text> below to language '${lang}'. Respond with JSON object containing {translation: string}, , do not put it in markdown
|
|
75
79
|
|
|
76
80
|
<Text>
|
|
77
81
|
${text}
|
|
78
82
|
</Text>`);
|
|
79
|
-
|
|
83
|
+
try {
|
|
84
|
+
return js_yaml_1.default.load(result.output).translation;
|
|
85
|
+
}
|
|
86
|
+
catch (error) {
|
|
87
|
+
logger_1.default.error(`[translate] Error parsing translation result: ${error} Provider Output: ${JSON.stringify(result.output, null, 2)}`);
|
|
88
|
+
throw error;
|
|
89
|
+
}
|
|
80
90
|
}
|
|
81
91
|
async function addMultilingual(testCases, injectVar, config) {
|
|
82
92
|
if ((0, remoteGeneration_1.shouldGenerateRemote)()) {
|
|
@@ -86,7 +96,7 @@ async function addMultilingual(testCases, injectVar, config) {
|
|
|
86
96
|
}
|
|
87
97
|
}
|
|
88
98
|
const languages = config.languages || exports.DEFAULT_LANGUAGES;
|
|
89
|
-
(0,
|
|
99
|
+
(0, invariant_1.default)(Array.isArray(languages), 'multilingual strategy: `languages` must be an array of strings');
|
|
90
100
|
const translatedTestCases = [];
|
|
91
101
|
const totalOperations = testCases.length * languages.length;
|
|
92
102
|
let progressBar;
|
|
@@ -98,7 +108,7 @@ async function addMultilingual(testCases, injectVar, config) {
|
|
|
98
108
|
progressBar.start(totalOperations, 0);
|
|
99
109
|
}
|
|
100
110
|
for (const testCase of testCases) {
|
|
101
|
-
(0,
|
|
111
|
+
(0, invariant_1.default)(testCase.vars, `Multilingual: testCase.vars is required, but got ${JSON.stringify(testCase)}`);
|
|
102
112
|
const originalText = String(testCase.vars[injectVar]);
|
|
103
113
|
for (const lang of languages) {
|
|
104
114
|
const translatedText = await translate(originalText, lang);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multilingual.js","sourceRoot":"","sources":["../../../../src/redteam/strategies/multilingual.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"multilingual.js","sourceRoot":"","sources":["../../../../src/redteam/strategies/multilingual.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleTurnComposite.d.ts","sourceRoot":"","sources":["../../../../src/redteam/strategies/singleTurnComposite.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"singleTurnComposite.d.ts","sourceRoot":"","sources":["../../../../src/redteam/strategies/singleTurnComposite.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAsG5C,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,QAAQ,EAAE,EACrB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,QAAQ,EAAE,CAAC,CAWrB"}
|
|
@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.addCompositeTestCases = addCompositeTestCases;
|
|
7
7
|
const async_1 = __importDefault(require("async"));
|
|
8
8
|
const cli_progress_1 = require("cli-progress");
|
|
9
|
-
const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
|
|
10
9
|
const cache_1 = require("../../cache");
|
|
11
10
|
const logger_1 = __importDefault(require("../../logger"));
|
|
12
11
|
const shared_1 = require("../../providers/shared");
|
|
12
|
+
const invariant_1 = __importDefault(require("../../util/invariant"));
|
|
13
13
|
const remoteGeneration_1 = require("../remoteGeneration");
|
|
14
14
|
async function generateCompositePrompts(testCases, injectVar, config) {
|
|
15
15
|
let progressBar;
|
|
@@ -24,7 +24,8 @@ async function generateCompositePrompts(testCases, injectVar, config) {
|
|
|
24
24
|
progressBar.start(testCases.length, 0);
|
|
25
25
|
}
|
|
26
26
|
await async_1.default.forEachOfLimit(testCases, concurrency, async (testCase, index) => {
|
|
27
|
-
|
|
27
|
+
logger_1.default.debug(`[Composite] Processing test case: ${JSON.stringify(testCase)}`);
|
|
28
|
+
(0, invariant_1.default)(testCase.vars, `Composite: testCase.vars is required, but got ${JSON.stringify(testCase)}`);
|
|
28
29
|
const payload = {
|
|
29
30
|
task: 'jailbreak:composite',
|
|
30
31
|
prompt: testCase.vars[injectVar],
|
|
@@ -39,6 +40,11 @@ async function generateCompositePrompts(testCases, injectVar, config) {
|
|
|
39
40
|
body: JSON.stringify(payload),
|
|
40
41
|
}, shared_1.REQUEST_TIMEOUT_MS);
|
|
41
42
|
logger_1.default.debug(`Got composite jailbreak generation result for case ${Number(index) + 1}: ${JSON.stringify(data)}`);
|
|
43
|
+
if (data.error) {
|
|
44
|
+
logger_1.default.error(`[jailbreak:composite] Error in composite generation: ${data.error}}`);
|
|
45
|
+
logger_1.default.debug(`[jailbreak:composite] Response: ${JSON.stringify(data)}`);
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
42
48
|
const compositeTestCases = data.modifiedPrompts.map((modifiedPrompt) => ({
|
|
43
49
|
...testCase,
|
|
44
50
|
vars: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleTurnComposite.js","sourceRoot":"","sources":["../../../../src/redteam/strategies/singleTurnComposite.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"singleTurnComposite.js","sourceRoot":"","sources":["../../../../src/redteam/strategies/singleTurnComposite.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,14 +42,20 @@ exports.configsRouter.post('/', async (req, res) => {
|
|
|
42
42
|
try {
|
|
43
43
|
const { name, type, config } = req.body;
|
|
44
44
|
const id = (0, uuid_1.v4)();
|
|
45
|
-
await db
|
|
45
|
+
const [result] = await db
|
|
46
|
+
.insert(tables_1.configsTable)
|
|
47
|
+
.values({
|
|
46
48
|
id,
|
|
47
49
|
name,
|
|
48
50
|
type,
|
|
49
51
|
config,
|
|
52
|
+
})
|
|
53
|
+
.returning({
|
|
54
|
+
id: tables_1.configsTable.id,
|
|
55
|
+
createdAt: tables_1.configsTable.createdAt,
|
|
50
56
|
});
|
|
51
57
|
logger_1.default.info(`Saved config ${id} of type ${type}`);
|
|
52
|
-
res.json(
|
|
58
|
+
res.json(result);
|
|
53
59
|
}
|
|
54
60
|
catch (error) {
|
|
55
61
|
logger_1.default.error('Error saving config:', error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configs.js","sourceRoot":"","sources":["../../../../src/server/routes/configs.ts"],"names":[],"mappings":";;;;;;AAAA,6CAAsC;AACtC,qCAAiC;AAEjC,+BAAoC;AACpC,6CAAuC;AACvC,kDAAqD;AACrD,0DAAkC;AAErB,QAAA,aAAa,GAAG,IAAA,gBAAM,GAAE,CAAC;AAEtC,qBAAa,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAiB,EAAE;IAC1E,MAAM,EAAE,GAAG,MAAM,IAAA,gBAAK,GAAE,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,IAAc,CAAC;QACtC,MAAM,KAAK,GAAG,EAAE;aACb,MAAM,CAAC;YACN,EAAE,EAAE,qBAAY,CAAC,EAAE;YACnB,IAAI,EAAE,qBAAY,CAAC,IAAI;YACvB,SAAS,EAAE,qBAAY,CAAC,SAAS;YACjC,SAAS,EAAE,qBAAY,CAAC,SAAS;YACjC,IAAI,EAAE,qBAAY,CAAC,IAAI;SACxB,CAAC;aACD,IAAI,CAAC,qBAAY,CAAC;aAClB,OAAO,CAAC,qBAAY,CAAC,SAAS,CAAC,CAAC;QAEnC,IAAI,IAAI,EAAE,CAAC;YACT,KAAK,CAAC,KAAK,CAAC,IAAA,gBAAE,EAAC,qBAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC;QAC5B,gBAAM,CAAC,IAAI,CAAC,UAAU,OAAO,CAAC,MAAM,WAAW,IAAI,CAAC,CAAC,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAEjF,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACxB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,gBAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;QAC/C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC,CAAC;IAC7D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,qBAAa,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAiB,EAAE;IAC3E,MAAM,EAAE,GAAG,MAAM,IAAA,gBAAK,GAAE,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACxC,MAAM,EAAE,GAAG,IAAA,SAAM,GAAE,CAAC;QAEpB,MAAM,
|
|
1
|
+
{"version":3,"file":"configs.js","sourceRoot":"","sources":["../../../../src/server/routes/configs.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.evalRouter = void 0;
|
|
7
7
|
const express_1 = require("express");
|
|
8
|
-
const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
|
|
9
8
|
const uuid_1 = require("uuid");
|
|
10
9
|
const zod_1 = require("zod");
|
|
11
10
|
const zod_validation_error_1 = require("zod-validation-error");
|
|
@@ -15,6 +14,7 @@ const logger_1 = __importDefault(require("../../logger"));
|
|
|
15
14
|
const eval_1 = __importDefault(require("../../models/eval"));
|
|
16
15
|
const evalResult_1 = __importDefault(require("../../models/evalResult"));
|
|
17
16
|
const util_1 = require("../../util");
|
|
17
|
+
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
|
|
@@ -31,7 +31,7 @@ exports.evalRouter.post('/job', (req, res) => {
|
|
|
31
31
|
eventSource: 'web',
|
|
32
32
|
progressCallback: (progress, total) => {
|
|
33
33
|
const job = evalJobs.get(id);
|
|
34
|
-
(0,
|
|
34
|
+
(0, invariant_1.default)(job, 'Job not found');
|
|
35
35
|
job.progress = progress;
|
|
36
36
|
job.total = total;
|
|
37
37
|
console.log(`[${id}] ${progress}/${total}`);
|
|
@@ -39,7 +39,7 @@ exports.evalRouter.post('/job', (req, res) => {
|
|
|
39
39
|
}))
|
|
40
40
|
.then(async (result) => {
|
|
41
41
|
const job = evalJobs.get(id);
|
|
42
|
-
(0,
|
|
42
|
+
(0, invariant_1.default)(job, 'Job not found');
|
|
43
43
|
job.status = 'complete';
|
|
44
44
|
job.result = await result.toEvaluateSummary();
|
|
45
45
|
console.log(`[${id}] Complete`);
|
|
@@ -113,9 +113,9 @@ exports.evalRouter.post('/:evalId/results/:id/rating', async (req, res) => {
|
|
|
113
113
|
const { id } = req.params;
|
|
114
114
|
const gradingResult = req.body;
|
|
115
115
|
const result = await evalResult_1.default.findById(id);
|
|
116
|
-
(0,
|
|
116
|
+
(0, invariant_1.default)(result, 'Result not found');
|
|
117
117
|
const eval_ = await eval_1.default.findById(result.evalId);
|
|
118
|
-
(0,
|
|
118
|
+
(0, invariant_1.default)(eval_, 'Eval not found');
|
|
119
119
|
// Capture the current state before we change it
|
|
120
120
|
const hasExistingManualOverride = Boolean(result.gradingResult?.componentResults?.some((r) => r.assertion?.type === 'human'));
|
|
121
121
|
const successChanged = result.success !== gradingResult.pass;
|
|
@@ -126,7 +126,7 @@ exports.evalRouter.post('/:evalId/results/:id/rating', async (req, res) => {
|
|
|
126
126
|
result.score = gradingResult.score;
|
|
127
127
|
// Update the prompt metrics
|
|
128
128
|
const prompt = eval_.prompts[result.promptIdx];
|
|
129
|
-
(0,
|
|
129
|
+
(0, invariant_1.default)(prompt, 'Prompt not found');
|
|
130
130
|
if (!prompt.metrics) {
|
|
131
131
|
logger_1.default.error(`[${id}] This is not normal. Prompt metrics not found for prompt ${result.promptIdx}`);
|
|
132
132
|
res.status(400).json({ error: 'Prompt metrics not found' });
|
|
@@ -185,6 +185,9 @@ exports.evalRouter.post('/', async (req, res) => {
|
|
|
185
185
|
createdAt: new Date(incEval.createdAt),
|
|
186
186
|
results: incEval.results,
|
|
187
187
|
});
|
|
188
|
+
if (incEval.prompts) {
|
|
189
|
+
eval_.addPrompts(incEval.prompts);
|
|
190
|
+
}
|
|
188
191
|
logger_1.default.debug(`[POST /api/eval] Eval created with ID: ${eval_.id}`);
|
|
189
192
|
logger_1.default.debug(`[POST /api/eval] Saved ${incEval.results.length} results to eval ${eval_.id}`);
|
|
190
193
|
res.json({ id: eval_.id });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eval.js","sourceRoot":"","sources":["../../../../src/server/routes/eval.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAiC;AAEjC
|
|
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":"providers.d.ts","sourceRoot":"","sources":["../../../../src/server/routes/providers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../../../src/server/routes/providers.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,eAAe,4CAAW,CAAC"}
|
|
@@ -5,36 +5,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.providersRouter = void 0;
|
|
7
7
|
const express_1 = require("express");
|
|
8
|
+
const zod_validation_error_1 = require("zod-validation-error");
|
|
8
9
|
const logger_1 = __importDefault(require("../../logger"));
|
|
9
|
-
const providers_1 = require("../../providers");
|
|
10
10
|
const http_1 = require("../../providers/http");
|
|
11
|
-
const
|
|
11
|
+
const invariant_1 = __importDefault(require("../../util/invariant"));
|
|
12
|
+
const providers_1 = require("../../validators/providers");
|
|
12
13
|
exports.providersRouter = (0, express_1.Router)();
|
|
13
14
|
exports.providersRouter.post('/test', async (req, res) => {
|
|
14
15
|
const body = req.body;
|
|
15
|
-
let
|
|
16
|
+
let providerOptions;
|
|
16
17
|
try {
|
|
17
|
-
|
|
18
|
+
providerOptions = providers_1.ProviderOptionsSchema.parse(body);
|
|
18
19
|
}
|
|
19
20
|
catch (e) {
|
|
20
|
-
res.status(400).json({ error: e.
|
|
21
|
+
res.status(400).json({ error: (0, zod_validation_error_1.fromZodError)(e).toString() });
|
|
21
22
|
return;
|
|
22
23
|
}
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
res.status(400).json({ error:
|
|
24
|
+
let config;
|
|
25
|
+
try {
|
|
26
|
+
config = http_1.HttpProviderConfigSchema.parse(providerOptions.config);
|
|
27
|
+
}
|
|
28
|
+
catch (e) {
|
|
29
|
+
res.status(400).json({ error: (0, zod_validation_error_1.fromZodError)(e).toString() });
|
|
29
30
|
return;
|
|
30
31
|
}
|
|
32
|
+
(0, invariant_1.default)(config.url, 'url is required');
|
|
33
|
+
const loadedProvider = new http_1.HttpProvider(config.url, providerOptions);
|
|
31
34
|
// Call the provider with the test prompt
|
|
32
35
|
const result = await loadedProvider.callApi('Hello, world!', {
|
|
33
36
|
debug: true,
|
|
34
37
|
prompt: { raw: 'Hello, world!', label: 'Hello, world!' },
|
|
35
38
|
vars: {},
|
|
36
39
|
});
|
|
37
|
-
logger_1.default.debug(`[POST /providers/test] result from API provider ${JSON.stringify({ result,
|
|
40
|
+
logger_1.default.debug(`[POST /providers/test] result from API provider ${JSON.stringify({ result, providerOptions })}`);
|
|
38
41
|
const HOST = process.env.PROMPTFOO_CLOUD_API_URL || 'https://api.promptfoo.app';
|
|
39
42
|
try {
|
|
40
43
|
// Call the the agent helper to evaluate the results of the provider
|
|
@@ -44,7 +47,7 @@ exports.providersRouter.post('/test', async (req, res) => {
|
|
|
44
47
|
'Content-Type': 'application/json',
|
|
45
48
|
},
|
|
46
49
|
body: JSON.stringify({
|
|
47
|
-
config:
|
|
50
|
+
config: providerOptions,
|
|
48
51
|
providerResponse: result.raw,
|
|
49
52
|
parsedResponse: result.output,
|
|
50
53
|
error: result.error,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../../../src/server/routes/providers.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAiC;
|
|
1
|
+
{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../../../src/server/routes/providers.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,6 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
14
14
|
const node_http_1 = __importDefault(require("node:http"));
|
|
15
15
|
const node_path_1 = __importDefault(require("node:path"));
|
|
16
16
|
const socket_io_1 = require("socket.io");
|
|
17
|
-
const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
|
|
18
17
|
const zod_validation_error_1 = require("zod-validation-error");
|
|
19
18
|
const share_1 = require("../commands/share");
|
|
20
19
|
const constants_1 = require("../constants");
|
|
@@ -27,6 +26,7 @@ const telemetry_1 = __importDefault(require("../telemetry"));
|
|
|
27
26
|
const telemetry_2 = require("../telemetry");
|
|
28
27
|
const testCases_1 = require("../testCases");
|
|
29
28
|
const util_1 = require("../util");
|
|
29
|
+
const invariant_1 = __importDefault(require("../util/invariant"));
|
|
30
30
|
const server_1 = require("../util/server");
|
|
31
31
|
const server_2 = require("../util/server");
|
|
32
32
|
const configs_1 = require("./routes/configs");
|
|
@@ -101,7 +101,7 @@ function createApp() {
|
|
|
101
101
|
return;
|
|
102
102
|
}
|
|
103
103
|
const eval_ = await eval_1.default.findById(id);
|
|
104
|
-
(0,
|
|
104
|
+
(0, invariant_1.default)(eval_, 'Eval not found');
|
|
105
105
|
const url = await (0, share_1.createPublicUrl)(eval_, true);
|
|
106
106
|
res.json({ url });
|
|
107
107
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":";;;;;AA4CA,8BAiIC;AAED,kCAuDC;AAtOD,8DAAsC;AACtC,gDAAwB;AACxB,wDAAgC;AAChC,oDAA4B;AAE5B,sDAA8B;AAE9B,4CAAoB;AACpB,0DAA6B;AAC7B,0DAA6B;AAC7B,yCAAqD;AACrD
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"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"}
|
package/dist/src/share.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../src/share.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../src/share.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AA0CtC;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAU1D;AAED,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,IAAI,EAChB,QAAQ,GAAE,OAAe,GACxB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAqHxB"}
|
package/dist/src/share.js
CHANGED
|
@@ -7,7 +7,6 @@ exports.stripAuthFromUrl = stripAuthFromUrl;
|
|
|
7
7
|
exports.createShareableUrl = createShareableUrl;
|
|
8
8
|
const input_1 = __importDefault(require("@inquirer/input"));
|
|
9
9
|
const chalk_1 = __importDefault(require("chalk"));
|
|
10
|
-
const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
|
|
11
10
|
const url_1 = require("url");
|
|
12
11
|
const constants_1 = require("./constants");
|
|
13
12
|
const envars_1 = require("./envars");
|
|
@@ -16,6 +15,7 @@ const accounts_1 = require("./globalConfig/accounts");
|
|
|
16
15
|
const accounts_2 = require("./globalConfig/accounts");
|
|
17
16
|
const cloud_1 = require("./globalConfig/cloud");
|
|
18
17
|
const logger_1 = __importDefault(require("./logger"));
|
|
18
|
+
const invariant_1 = __importDefault(require("./util/invariant"));
|
|
19
19
|
async function targetHostCanUseNewResults(apiHost) {
|
|
20
20
|
const response = await (0, fetch_1.fetchWithProxy)(`${apiHost}/health`, {
|
|
21
21
|
method: 'GET',
|
|
@@ -93,7 +93,7 @@ async function createShareableUrl(evalRecord, showAuth = false) {
|
|
|
93
93
|
apiBaseUrl = cloud_1.cloudConfig.getApiHost();
|
|
94
94
|
url = `${apiBaseUrl}/results`;
|
|
95
95
|
const loggedInEmail = (0, accounts_2.getUserEmail)();
|
|
96
|
-
(0,
|
|
96
|
+
(0, invariant_1.default)(loggedInEmail, 'User email is not set');
|
|
97
97
|
const evalAuthor = evalRecord.author;
|
|
98
98
|
if (evalAuthor !== loggedInEmail) {
|
|
99
99
|
logger_1.default.warn(`Warning: Changing eval author from ${evalAuthor} to logged-in user ${loggedInEmail}`);
|