promptfoo 0.60.0 → 0.62.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 +12 -1
- package/dist/package.json +21 -13
- package/dist/src/__mocks__/esm.js.map +1 -1
- package/dist/src/assertions/AssertionsResult.js.map +1 -1
- package/dist/src/assertions/validateAssertions.js.map +1 -1
- package/dist/src/assertions.d.ts +2 -1
- package/dist/src/assertions.d.ts.map +1 -1
- package/dist/src/assertions.js +28 -2
- 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/delete.js.map +1 -1
- package/dist/src/commands/eval/filterFailingTests.d.ts +1 -1
- package/dist/src/commands/eval/filterFailingTests.d.ts.map +1 -1
- package/dist/src/commands/eval/filterFailingTests.js.map +1 -1
- package/dist/src/commands/eval/filterTests.d.ts +1 -1
- package/dist/src/commands/eval/filterTests.d.ts.map +1 -1
- package/dist/src/commands/eval/filterTests.js.map +1 -1
- package/dist/src/commands/export.d.ts.map +1 -1
- package/dist/src/commands/export.js.map +1 -1
- package/dist/src/commands/import.js.map +1 -1
- package/dist/src/commands/show.d.ts.map +1 -1
- package/dist/src/commands/show.js.map +1 -1
- package/dist/src/csv.js.map +1 -1
- package/dist/src/database.js +2 -2
- package/dist/src/database.js.map +1 -1
- package/dist/src/esm.js.map +1 -1
- package/dist/src/evaluator.d.ts.map +1 -1
- package/dist/src/evaluator.js +4 -0
- package/dist/src/evaluator.js.map +1 -1
- package/dist/src/feedback.js.map +1 -1
- package/dist/src/fetch.js.map +1 -1
- package/dist/src/googleSheets.js.map +1 -1
- package/dist/src/index.d.ts +1 -0
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +8 -6
- package/dist/src/index.js.map +1 -1
- package/dist/src/integrations/langfuse.js.map +1 -1
- package/dist/src/integrations/portkey.js.map +1 -1
- package/dist/src/logger.js.map +1 -1
- package/dist/src/main.js +33 -4
- package/dist/src/main.js.map +1 -1
- package/dist/src/matchers.d.ts +14 -3
- package/dist/src/matchers.d.ts.map +1 -1
- package/dist/src/matchers.js +40 -1
- package/dist/src/matchers.js.map +1 -1
- package/dist/src/migrate.js.map +1 -1
- package/dist/src/prompts.d.ts.map +1 -1
- package/dist/src/prompts.js.map +1 -1
- package/dist/src/providers/anthropic.d.ts +1 -0
- package/dist/src/providers/anthropic.d.ts.map +1 -1
- package/dist/src/providers/anthropic.js +5 -3
- package/dist/src/providers/anthropic.js.map +1 -1
- package/dist/src/providers/azureopenai.d.ts.map +1 -1
- package/dist/src/providers/azureopenai.js +3 -1
- package/dist/src/providers/azureopenai.js.map +1 -1
- package/dist/src/providers/azureopenaiUtil.js.map +1 -1
- package/dist/src/providers/bam.js.map +1 -1
- package/dist/src/providers/bedrock.d.ts.map +1 -1
- package/dist/src/providers/bedrock.js +1 -0
- package/dist/src/providers/bedrock.js.map +1 -1
- package/dist/src/providers/cloudflare-ai.d.ts +103 -0
- package/dist/src/providers/cloudflare-ai.d.ts.map +1 -0
- package/dist/src/providers/cloudflare-ai.js +224 -0
- package/dist/src/providers/cloudflare-ai.js.map +1 -0
- package/dist/src/providers/cohere.js.map +1 -1
- package/dist/src/providers/defaults.d.ts +2 -0
- package/dist/src/providers/defaults.d.ts.map +1 -1
- package/dist/src/providers/defaults.js +3 -1
- package/dist/src/providers/defaults.js.map +1 -1
- package/dist/src/providers/http.d.ts +11 -0
- package/dist/src/providers/http.d.ts.map +1 -0
- package/dist/src/providers/http.js +64 -0
- package/dist/src/providers/http.js.map +1 -0
- package/dist/src/providers/huggingface.js.map +1 -1
- package/dist/src/providers/llama.js.map +1 -1
- package/dist/src/providers/localai.js.map +1 -1
- package/dist/src/providers/mistral.d.ts.map +1 -1
- package/dist/src/providers/mistral.js +7 -0
- package/dist/src/providers/mistral.js.map +1 -1
- package/dist/src/providers/ollama.js.map +1 -1
- package/dist/src/providers/openai.d.ts +11 -1
- package/dist/src/providers/openai.d.ts.map +1 -1
- package/dist/src/providers/openai.js +99 -16
- package/dist/src/providers/openai.js.map +1 -1
- package/dist/src/providers/openaiUtil.js.map +1 -1
- package/dist/src/providers/palm.js.map +1 -1
- package/dist/src/providers/portkey.d.ts +6 -0
- package/dist/src/providers/portkey.d.ts.map +1 -0
- package/dist/src/providers/portkey.js +49 -0
- package/dist/src/providers/portkey.js.map +1 -0
- package/dist/src/providers/promptfoo.d.ts.map +1 -1
- package/dist/src/providers/promptfoo.js.map +1 -1
- package/dist/src/providers/pythonCompletion.d.ts +4 -1
- package/dist/src/providers/pythonCompletion.d.ts.map +1 -1
- package/dist/src/providers/pythonCompletion.js +47 -13
- package/dist/src/providers/pythonCompletion.js.map +1 -1
- package/dist/src/providers/replicate.d.ts +5 -1
- package/dist/src/providers/replicate.d.ts.map +1 -1
- package/dist/src/providers/replicate.js +91 -1
- package/dist/src/providers/replicate.js.map +1 -1
- package/dist/src/providers/scriptCompletion.js.map +1 -1
- package/dist/src/providers/shared.js.map +1 -1
- package/dist/src/providers/vertex.d.ts +38 -0
- package/dist/src/providers/vertex.d.ts.map +1 -1
- package/dist/src/providers/vertex.js +5 -1
- package/dist/src/providers/vertex.js.map +1 -1
- package/dist/src/providers/vertexUtil.js.map +1 -1
- package/dist/src/providers/webhook.js.map +1 -1
- package/dist/src/providers.d.ts.map +1 -1
- package/dist/src/providers.js +49 -7
- package/dist/src/providers.js.map +1 -1
- package/dist/src/python/wrapper.d.ts.map +1 -1
- package/dist/src/python/wrapper.js +1 -1
- package/dist/src/python/wrapper.js.map +1 -1
- package/dist/src/redteam/getHarmfulTests.d.ts +5 -2
- package/dist/src/redteam/getHarmfulTests.d.ts.map +1 -1
- package/dist/src/redteam/getHarmfulTests.js +61 -30
- package/dist/src/redteam/getHarmfulTests.js.map +1 -1
- package/dist/src/redteam/getPiiTests.d.ts +12 -0
- package/dist/src/redteam/getPiiTests.d.ts.map +1 -0
- package/dist/src/redteam/getPiiTests.js +172 -0
- package/dist/src/redteam/getPiiTests.js.map +1 -0
- package/dist/src/redteam/index.d.ts.map +1 -1
- package/dist/src/redteam/index.js +56 -83
- package/dist/src/redteam/index.js.map +1 -1
- package/dist/src/redteam/iterative.d.ts.map +1 -1
- package/dist/src/redteam/iterative.js.map +1 -1
- package/dist/src/share.js.map +1 -1
- package/dist/src/suggestions.js.map +1 -1
- package/dist/src/table.d.ts.map +1 -1
- package/dist/src/table.js +2 -3
- package/dist/src/table.js.map +1 -1
- package/dist/src/telemetry.js.map +1 -1
- package/dist/src/testCases.js.map +1 -1
- package/dist/src/types.d.ts +28 -5
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/types.js.map +1 -1
- package/dist/src/updates.js.map +1 -1
- package/dist/src/util.d.ts +3 -3
- package/dist/src/util.d.ts.map +1 -1
- package/dist/src/util.js +21 -10
- package/dist/src/util.js.map +1 -1
- package/dist/src/web/nextui/404/index.html +1 -1
- package/dist/src/web/nextui/404.html +1 -1
- package/dist/src/web/nextui/_next/static/V1EPwyedIFJ7fl1xp1-qq/_buildManifest.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/106-1dceaa80df396865.js +44 -0
- package/dist/src/web/nextui/_next/static/chunks/107-ffb99760e0fb68f2.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/189-b6f910f4b701335b.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/1a53ab81-6d64be52a06b7c39.js +6 -0
- package/dist/src/web/nextui/_next/static/chunks/215-63edfe1b1ae625e4.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/226-023620d1bff22d99.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/{339-501c32916b785ef1.js → 235-5dedba2497d889c9.js} +1 -1
- package/dist/src/web/nextui/_next/static/chunks/249-d4e0e50561ef8185.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/278.60b6d47e5a936f0b.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/339-132502fa6d7b24c7.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/383-e19d78b51fa58f1b.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/525-014890ddea6714cf.js +32 -0
- package/dist/src/web/nextui/_next/static/chunks/629-2358b4dcbf84d053.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/631-efb1476abf72c1ff.js +6 -0
- package/dist/src/web/nextui/_next/static/chunks/635-d64ddf71d262749b.js +97 -0
- package/dist/src/web/nextui/_next/static/chunks/690-618c46a7158870af.js +6 -0
- package/dist/src/web/nextui/_next/static/chunks/730-9147ccb0626b2f6b.js +25 -0
- package/dist/src/web/nextui/_next/static/chunks/733-3e9ca9d39ddcb04c.js +8 -0
- package/dist/src/web/nextui/_next/static/chunks/770-fdb322f705e07d72.js +2 -0
- package/dist/src/web/nextui/_next/static/chunks/887.b3cb35585a6859bd.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/auth/login/page-4c3e963c95f17d0d.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/auth/signup/page-e5ee780ad914444b.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/datasets/page-b661c8d02af86f57.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/eval/[id]/not-found-07e0dc7d48d31372.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/eval/[id]/page-b654fa5327065d04.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/eval/page-dc583966b824a0ac.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/{layout-0afd14c99b2fc9eb.js → layout-844906ca58c0d644.js} +1 -1
- package/dist/src/web/nextui/_next/static/chunks/app/page-4226f7bf0849864a.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/progress/page-5a4a4149e2361872.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/prompts/page-c5878f6e2cbee318.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/app/setup/page-bab30b8e8c1e30f8.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/{fd9d1056-a95b789c94c05ff6.js → b6261da7-08dd8cb380ab7859.js} +2 -2
- package/dist/src/web/nextui/_next/static/chunks/{framework-8883d1e9be70c3da.js → framework-b292a8c542627b4d.js} +4 -4
- package/dist/src/web/nextui/_next/static/chunks/main-850014bd889b28b2.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/main-app-9a21304a7d2c7cca.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/pages/_app-19a521e9841c5ed8.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/pages/_error-d23f5e48cbe51f4e.js +1 -0
- package/dist/src/web/nextui/_next/static/chunks/webpack-0a139c96915bebb5.js +1 -0
- package/dist/src/web/nextui/_next/static/css/0e96bc835813e9d5.css +1 -0
- package/dist/src/web/nextui/_next/static/css/962981c6b98dedf4.css +1 -0
- package/dist/src/web/nextui/auth/login/index.html +1 -1
- package/dist/src/web/nextui/auth/login/index.txt +5 -5
- package/dist/src/web/nextui/auth/signup/index.html +1 -1
- package/dist/src/web/nextui/auth/signup/index.txt +5 -5
- package/dist/src/web/nextui/datasets/index.html +1 -1
- package/dist/src/web/nextui/datasets/index.txt +5 -5
- package/dist/src/web/nextui/eval/index.html +1 -1
- package/dist/src/web/nextui/eval/index.txt +7 -7
- package/dist/src/web/nextui/index.html +1 -1
- package/dist/src/web/nextui/index.txt +4 -4
- package/dist/src/web/nextui/progress/index.html +1 -1
- package/dist/src/web/nextui/progress/index.txt +5 -5
- package/dist/src/web/nextui/prompts/index.html +1 -1
- package/dist/src/web/nextui/prompts/index.txt +5 -5
- package/dist/src/web/nextui/setup/index.html +2 -2
- package/dist/src/web/nextui/setup/index.txt +6 -6
- package/dist/src/web/server.d.ts.map +1 -1
- package/dist/src/web/server.js +3 -3
- package/dist/src/web/server.js.map +1 -1
- package/package.json +21 -13
- package/dist/src/web/nextui/_next/static/chunks/113-1056b5f87446395e.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/133-1318f46ed801a49d.js +0 -6
- package/dist/src/web/nextui/_next/static/chunks/21-b6c126c8ac7d9c5e.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/261-1bc0898df259d0fd.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/414-51e6cdc7aba4bb24.js +0 -2
- package/dist/src/web/nextui/_next/static/chunks/547-00556ed98de9671b.js +0 -89
- package/dist/src/web/nextui/_next/static/chunks/596-f3a131b7c336dd5d.js +0 -25
- package/dist/src/web/nextui/_next/static/chunks/602-fce79bd3bd7891e9.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/680-aa07f4d4d0312894.js +0 -7
- package/dist/src/web/nextui/_next/static/chunks/712-13fab020a2ea9e39.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/72-202cb66305c1995a.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/772-d8e765a0f4a182cd.js +0 -32
- package/dist/src/web/nextui/_next/static/chunks/864-406abb9f68cff6a3.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/921-ea4bddb5c25058ea.js +0 -44
- package/dist/src/web/nextui/_next/static/chunks/922.b293c6bd1040dbd7.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/946-740c3c4d7e8acaf7.js +0 -8
- package/dist/src/web/nextui/_next/static/chunks/975-41f6ad20b4031b30.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/auth/login/page-2daaaf4e1f6912b3.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/auth/signup/page-23ca04075bd65316.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/datasets/page-f93e740e9cc7a725.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/eval/[id]/not-found-366629541fd598e9.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/eval/[id]/page-cf43e2e1a57168e1.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/eval/page-21ed48ee7bd48001.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/page-ceb22f8e1a2af9dc.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/progress/page-1129b810645defc6.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/prompts/page-eb6647787729eb01.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/app/setup/page-c570b50989e9a7c2.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/ca377847-26b462611379a4f7.js +0 -6
- package/dist/src/web/nextui/_next/static/chunks/main-app-581ccf0003955b21.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/main-b311752d7554d977.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/pages/_app-52924524f99094ab.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/pages/_error-c92d5c4bb2b49926.js +0 -1
- package/dist/src/web/nextui/_next/static/chunks/webpack-6db4c95c90cd16a8.js +0 -1
- package/dist/src/web/nextui/_next/static/css/012e7480208170b3.css +0 -1
- package/dist/src/web/nextui/_next/static/css/d6087a68d5b5af7c.css +0 -1
- package/dist/src/web/nextui/_next/static/sgLuj_rAi90HuvQkVG1UC/_buildManifest.js +0 -1
- /package/dist/src/web/nextui/_next/static/{sgLuj_rAi90HuvQkVG1UC → V1EPwyedIFJ7fl1xp1-qq}/_ssgManifest.js +0 -0
|
@@ -20,32 +20,57 @@ class PythonProvider {
|
|
|
20
20
|
id() {
|
|
21
21
|
return `python:${this.scriptPath}`;
|
|
22
22
|
}
|
|
23
|
-
async
|
|
23
|
+
async executePythonScript(prompt, context, apiType) {
|
|
24
24
|
const absPath = path_1.default.resolve(path_1.default.join(this.options?.config.basePath || '', this.scriptPath));
|
|
25
25
|
logger_1.default.debug(`Computing file hash for script ${absPath}`);
|
|
26
26
|
const fileHash = (0, util_1.sha256)(fs_1.default.readFileSync(absPath, 'utf-8'));
|
|
27
|
-
const cacheKey = `python:${this.scriptPath}:${fileHash}:${prompt}:${JSON.stringify(this.options)}`;
|
|
27
|
+
const cacheKey = `python:${this.scriptPath}:${apiType}:${fileHash}:${prompt}:${JSON.stringify(this.options)}`;
|
|
28
28
|
const cache = await (0, cache_1.getCache)();
|
|
29
29
|
let cachedResult;
|
|
30
30
|
if ((0, cache_1.isCacheEnabled)()) {
|
|
31
31
|
cachedResult = (await cache.get(cacheKey));
|
|
32
32
|
}
|
|
33
33
|
if (cachedResult) {
|
|
34
|
-
logger_1.default.debug(`Returning cached result for script ${absPath}`);
|
|
34
|
+
logger_1.default.debug(`Returning cached ${apiType} result for script ${absPath}`);
|
|
35
35
|
return JSON.parse(cachedResult);
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
38
|
+
if (context) {
|
|
39
|
+
// These are not useful in Python
|
|
40
|
+
delete context.fetchWithCache;
|
|
41
|
+
delete context.getCache;
|
|
42
|
+
delete context.logger;
|
|
43
|
+
}
|
|
44
|
+
const args = apiType === 'call_api' ? [prompt, this.options, context] : [prompt, this.options];
|
|
43
45
|
logger_1.default.debug(`Running python script ${absPath} with scriptPath ${this.scriptPath} and args: ${args.join('\n')}`);
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
46
|
+
let result;
|
|
47
|
+
switch (apiType) {
|
|
48
|
+
case 'call_api':
|
|
49
|
+
result = (await (0, wrapper_1.runPython)(absPath, apiType, args, {
|
|
50
|
+
pythonExecutable: this.config.pythonExecutable,
|
|
51
|
+
}));
|
|
52
|
+
if (!('output' in result) && !('error' in result)) {
|
|
53
|
+
throw new Error(`The Python script \`${apiType}\` function must return a dict with an \`output\` string/object or \`error\` string, instead got: ${JSON.stringify(result)}`);
|
|
54
|
+
}
|
|
55
|
+
break;
|
|
56
|
+
case 'call_embedding_api':
|
|
57
|
+
result = (await (0, wrapper_1.runPython)(absPath, apiType, args, {
|
|
58
|
+
pythonExecutable: this.config.pythonExecutable,
|
|
59
|
+
}));
|
|
60
|
+
if (!('embedding' in result) && !('error' in result)) {
|
|
61
|
+
throw new Error(`The Python script \`${apiType}\` function must return a dict with an \`embedding\` array or \`error\` string, instead got ${JSON.stringify(result)}`);
|
|
62
|
+
}
|
|
63
|
+
break;
|
|
64
|
+
case 'call_classification_api':
|
|
65
|
+
result = (await (0, wrapper_1.runPython)(absPath, apiType, args, {
|
|
66
|
+
pythonExecutable: this.config.pythonExecutable,
|
|
67
|
+
}));
|
|
68
|
+
if (!('classification' in result) && !('error' in result)) {
|
|
69
|
+
throw new Error(`The Python script \`${apiType}\` function must return a dict with a \`classification\` object or \`error\` string, instead of ${JSON.stringify(result)}`);
|
|
70
|
+
}
|
|
71
|
+
break;
|
|
72
|
+
default:
|
|
73
|
+
throw new Error(`Unsupported apiType: ${apiType}`);
|
|
49
74
|
}
|
|
50
75
|
if ((0, cache_1.isCacheEnabled)() && !('error' in result)) {
|
|
51
76
|
await cache.set(cacheKey, JSON.stringify(result));
|
|
@@ -53,6 +78,15 @@ class PythonProvider {
|
|
|
53
78
|
return result;
|
|
54
79
|
}
|
|
55
80
|
}
|
|
81
|
+
async callApi(prompt, context) {
|
|
82
|
+
return this.executePythonScript(prompt, context, 'call_api');
|
|
83
|
+
}
|
|
84
|
+
async callEmbeddingApi(prompt) {
|
|
85
|
+
return this.executePythonScript(prompt, undefined, 'call_embedding_api');
|
|
86
|
+
}
|
|
87
|
+
async callClassificationApi(prompt) {
|
|
88
|
+
return this.executePythonScript(prompt, undefined, 'call_classification_api');
|
|
89
|
+
}
|
|
56
90
|
}
|
|
57
91
|
exports.PythonProvider = PythonProvider;
|
|
58
92
|
//# sourceMappingURL=pythonCompletion.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pythonCompletion.js","sourceRoot":"","sources":["../../../src/providers/pythonCompletion.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,4CAAoB;AAEpB,uDAA+B;AAC/B,oCAAoD;AACpD,+CAA8C;AAC9C,kCAAiC;
|
|
1
|
+
{"version":3,"file":"pythonCompletion.js","sourceRoot":"","sources":["../../../src/providers/pythonCompletion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ApiProvider, EnvOverrides, ProviderResponse } from '../types.js';
|
|
1
|
+
import type { ApiModerationProvider, ApiProvider, EnvOverrides, ProviderModerationResponse, ProviderResponse } from '../types.js';
|
|
2
2
|
interface ReplicateCompletionOptions {
|
|
3
3
|
apiKey?: string;
|
|
4
4
|
temperature?: number;
|
|
@@ -31,5 +31,9 @@ export declare class ReplicateProvider implements ApiProvider {
|
|
|
31
31
|
toString(): string;
|
|
32
32
|
callApi(prompt: string): Promise<ProviderResponse>;
|
|
33
33
|
}
|
|
34
|
+
export declare class ReplicateModerationProvider extends ReplicateProvider implements ApiModerationProvider {
|
|
35
|
+
callModerationApi(prompt: string, assistant: string): Promise<ProviderModerationResponse>;
|
|
36
|
+
}
|
|
37
|
+
export declare const DefaultModerationProvider: ReplicateModerationProvider;
|
|
34
38
|
export {};
|
|
35
39
|
//# sourceMappingURL=replicate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replicate.d.ts","sourceRoot":"","sources":["../../../src/providers/replicate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"replicate.d.ts","sourceRoot":"","sources":["../../../src/providers/replicate.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,qBAAqB,EACrB,WAAW,EACX,YAAY,EAEZ,0BAA0B,EAC1B,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAErB,UAAU,0BAA0B;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IAGF,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,qBAAa,iBAAkB,YAAW,WAAW;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,EAAE,0BAA0B,CAAC;gBAGjC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,0BAA0B,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IAcxF,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIZ,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CA6GzD;AAgBD,qBAAa,2BACX,SAAQ,iBACR,YAAW,qBAAqB;IAE1B,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC;CAgFhG;AAED,eAAO,MAAM,yBAAyB,6BAErC,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.ReplicateProvider = void 0;
|
|
6
|
+
exports.DefaultModerationProvider = exports.ReplicateModerationProvider = exports.ReplicateProvider = void 0;
|
|
7
7
|
const replicate_1 = __importDefault(require("replicate"));
|
|
8
8
|
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
9
9
|
const logger_1 = __importDefault(require("../logger"));
|
|
@@ -125,4 +125,94 @@ class ReplicateProvider {
|
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
127
|
exports.ReplicateProvider = ReplicateProvider;
|
|
128
|
+
const LLAMAGUARD_DESCRIPTIONS = {
|
|
129
|
+
S1: 'Violent Crimes',
|
|
130
|
+
S2: 'Non-Violent Crimes',
|
|
131
|
+
S3: 'Sex-Related Crimes',
|
|
132
|
+
S4: 'Child Sexual Exploitation',
|
|
133
|
+
S5: 'Specialized Advice',
|
|
134
|
+
S6: 'Privacy',
|
|
135
|
+
S7: 'Intellectual Property',
|
|
136
|
+
S8: 'Indiscriminate Weapons',
|
|
137
|
+
S9: 'Hate',
|
|
138
|
+
S10: 'Suicide & Self-Harm',
|
|
139
|
+
S11: 'Sexual Content',
|
|
140
|
+
};
|
|
141
|
+
class ReplicateModerationProvider extends ReplicateProvider {
|
|
142
|
+
async callModerationApi(prompt, assistant) {
|
|
143
|
+
if (!this.apiKey) {
|
|
144
|
+
throw new Error('Replicate API key is not set. Set the REPLICATE_API_TOKEN environment variable or or add `apiKey` to the provider config.');
|
|
145
|
+
}
|
|
146
|
+
let cache;
|
|
147
|
+
let cacheKey;
|
|
148
|
+
if ((0, cache_1.isCacheEnabled)()) {
|
|
149
|
+
cache = await (0, cache_1.getCache)();
|
|
150
|
+
cacheKey = `replicate:${this.modelName}:${JSON.stringify(this.config)}:${prompt}:${assistant}`;
|
|
151
|
+
// Try to get the cached response
|
|
152
|
+
const cachedResponse = await cache.get(cacheKey);
|
|
153
|
+
if (cachedResponse) {
|
|
154
|
+
logger_1.default.debug(`Returning cached response for ${prompt}: ${cachedResponse}`);
|
|
155
|
+
return JSON.parse(cachedResponse);
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
const replicate = new replicate_1.default({
|
|
159
|
+
auth: this.apiKey,
|
|
160
|
+
fetch: node_fetch_1.default,
|
|
161
|
+
});
|
|
162
|
+
logger_1.default.debug(`Calling Replicate moderation API: prompt [${prompt}] assistant [${assistant}]`);
|
|
163
|
+
let output;
|
|
164
|
+
try {
|
|
165
|
+
const data = {
|
|
166
|
+
input: {
|
|
167
|
+
prompt,
|
|
168
|
+
assistant,
|
|
169
|
+
},
|
|
170
|
+
};
|
|
171
|
+
const resp = await replicate.run(this.modelName, data);
|
|
172
|
+
// Replicate SDK seems to be mis-typed for this type of model.
|
|
173
|
+
output = resp;
|
|
174
|
+
}
|
|
175
|
+
catch (err) {
|
|
176
|
+
return {
|
|
177
|
+
error: `API call error: ${String(err)}`,
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
logger_1.default.debug(`\tReplicate moderation API response: ${JSON.stringify(output)}`);
|
|
181
|
+
try {
|
|
182
|
+
if (!output) {
|
|
183
|
+
throw new Error('API response error: no output');
|
|
184
|
+
}
|
|
185
|
+
const [safeString, codes] = output.split('\n');
|
|
186
|
+
const saveCache = async () => {
|
|
187
|
+
if (cache && cacheKey) {
|
|
188
|
+
await cache.set(cacheKey, JSON.stringify(output));
|
|
189
|
+
}
|
|
190
|
+
};
|
|
191
|
+
const flags = [];
|
|
192
|
+
if (safeString === 'safe') {
|
|
193
|
+
await saveCache();
|
|
194
|
+
}
|
|
195
|
+
else {
|
|
196
|
+
const splits = codes.split(',');
|
|
197
|
+
for (const code of splits) {
|
|
198
|
+
if (LLAMAGUARD_DESCRIPTIONS[code]) {
|
|
199
|
+
flags.push({
|
|
200
|
+
code,
|
|
201
|
+
description: `${LLAMAGUARD_DESCRIPTIONS[code]} (${code})`,
|
|
202
|
+
confidence: 1,
|
|
203
|
+
});
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
return { flags };
|
|
208
|
+
}
|
|
209
|
+
catch (err) {
|
|
210
|
+
return {
|
|
211
|
+
error: `API response error: ${String(err)}: ${JSON.stringify(output)}`,
|
|
212
|
+
};
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
exports.ReplicateModerationProvider = ReplicateModerationProvider;
|
|
217
|
+
exports.DefaultModerationProvider = new ReplicateModerationProvider('meta/meta-llama-guard-2-8b:b063023ee937f28e922982abdbf97b041ffe34ad3b35a53d33e1d74bb19b36c4');
|
|
128
218
|
//# sourceMappingURL=replicate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replicate.js","sourceRoot":"","sources":["../../../src/providers/replicate.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAElC,4DAA+B;AAC/B,uDAA+B;AAC/B,oCAAoD;
|
|
1
|
+
{"version":3,"file":"replicate.js","sourceRoot":"","sources":["../../../src/providers/replicate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scriptCompletion.js","sourceRoot":"","sources":["../../../src/providers/scriptCompletion.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAyC;AAEzC,oEAAuC;AAEvC,uDAA+B;AAC/B,oCAAoD;AACpD,kCAA4C;AAS5C,MAAM,WAAW,GAAG,wCAAwC,CAAC;AAE7D,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;AACvC,CAAC;AAED,MAAa,wBAAwB;IACnC,YAAoB,UAAkB,EAAU,OAAyB;QAArD,eAAU,GAAV,UAAU,CAAQ;QAAU,YAAO,GAAP,OAAO,CAAkB;IAAG,CAAC;IAE7E,EAAE;QACA,OAAO,QAAQ,IAAI,CAAC,UAAU,EAAE,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc,EAAE,OAA8B;QAC1D,MAAM,QAAQ,GAAG,QAAQ,IAAI,CAAC,UAAU,IAAI,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACrF,MAAM,KAAK,GAAG,MAAM,IAAA,gBAAQ,GAAE,CAAC;QAC/B,IAAI,YAAY,CAAC;QAEjB,IAAI,IAAA,sBAAc,GAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"scriptCompletion.js","sourceRoot":"","sources":["../../../src/providers/scriptCompletion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/providers/shared.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA2B;AAEd,QAAA,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB;IAC9D,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,EAAE,CAAC;IAC9C,CAAC,CAAC,MAAO,CAAC;AAEZ,SAAgB,eAAe,CAAI,MAAc,EAAE,YAAe;IAChE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/providers/shared.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA2B;AAEd,QAAA,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB;IAC9D,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,EAAE,CAAC;IAC9C,CAAC,CAAC,MAAO,CAAC;AAEZ,SAAgB,eAAe,CAAI,MAAc,EAAE,YAAe;IAChE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,oDAAoD;YACpD,OAAO,iBAAI,CAAC,IAAI,CAAC,MAAM,CAAM,CAAC;QAChC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,sDAAsD,GAAG,OAAO,MAAM,EAAE,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,WAAW;YACX,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAM,CAAC;QACjC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IACE,OAAO,CAAC,GAAG,CAAC,8BAA8B;gBAC1C,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC;gBAC7B,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,EAC7B,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,sDAAsD,GAAG,OAAO,MAAM,EAAE,CAAC,CAAC;YAC5F,CAAC;YACD,0CAA0C;YAC1C,OAAO,YAAY,CAAC;QACtB,CAAC;IACH,CAAC;AACH,CAAC;AAzBD,0CAyBC;AAED,SAAgB,WAAW,CAAC,GAAW;IACrC,OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AACnG,CAAC;AAFD,kCAEC"}
|
|
@@ -31,6 +31,44 @@ interface VertexCompletionOptions {
|
|
|
31
31
|
topP?: number;
|
|
32
32
|
topK?: number;
|
|
33
33
|
};
|
|
34
|
+
toolConfig?: {
|
|
35
|
+
functionCallingConfig?: {
|
|
36
|
+
mode?: 'MODE_UNSPECIFIED' | 'AUTO' | 'ANY' | 'NONE';
|
|
37
|
+
allowedFunctionNames?: string[];
|
|
38
|
+
};
|
|
39
|
+
};
|
|
40
|
+
systemInstruction?: Content;
|
|
41
|
+
}
|
|
42
|
+
interface Content {
|
|
43
|
+
parts: Part[];
|
|
44
|
+
role?: string;
|
|
45
|
+
}
|
|
46
|
+
interface Part {
|
|
47
|
+
text?: string;
|
|
48
|
+
inlineData?: Blob;
|
|
49
|
+
functionCall?: FunctionCall;
|
|
50
|
+
functionResponse?: FunctionResponse;
|
|
51
|
+
fileData?: FileData;
|
|
52
|
+
}
|
|
53
|
+
interface Blob {
|
|
54
|
+
mimeType: string;
|
|
55
|
+
data: string;
|
|
56
|
+
}
|
|
57
|
+
interface FunctionCall {
|
|
58
|
+
name: string;
|
|
59
|
+
args?: {
|
|
60
|
+
[key: string]: any;
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
interface FunctionResponse {
|
|
64
|
+
name: string;
|
|
65
|
+
response: {
|
|
66
|
+
[key: string]: any;
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
interface FileData {
|
|
70
|
+
mimeType?: string;
|
|
71
|
+
fileUri: string;
|
|
34
72
|
}
|
|
35
73
|
declare class VertexGenericProvider implements ApiProvider {
|
|
36
74
|
modelName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vertex.d.ts","sourceRoot":"","sources":["../../../src/providers/vertex.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"vertex.d.ts","sourceRoot":"","sources":["../../../src/providers/vertex.ts"],"names":[],"mappings":"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"}
|
|
@@ -132,7 +132,11 @@ class VertexChatProvider extends VertexGenericProvider {
|
|
|
132
132
|
topK: this.config.topK,
|
|
133
133
|
...this.config.generationConfig,
|
|
134
134
|
},
|
|
135
|
-
safetySettings: this.config.safetySettings,
|
|
135
|
+
...(this.config.safetySettings ? { safetySettings: this.config.safetySettings } : {}),
|
|
136
|
+
...(this.config.toolConfig ? { toolConfig: this.config.toolConfig } : {}),
|
|
137
|
+
...(this.config.systemInstruction
|
|
138
|
+
? { systemInstruction: this.config.systemInstruction }
|
|
139
|
+
: {}),
|
|
136
140
|
};
|
|
137
141
|
logger_1.default.debug(`Preparing to call Google Vertex API (Gemini) with body: ${JSON.stringify(body)}`);
|
|
138
142
|
const cache = await (0, cache_1.getCache)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vertex.js","sourceRoot":"","sources":["../../../src/providers/vertex.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAA+B;
|
|
1
|
+
{"version":3,"file":"vertex.js","sourceRoot":"","sources":["../../../src/providers/vertex.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vertexUtil.js","sourceRoot":"","sources":["../../../src/providers/vertexUtil.ts"],"names":[],"mappings":";;;AAwEA,SAAgB,yBAAyB,CAAC,QAAa;IACrD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"vertexUtil.js","sourceRoot":"","sources":["../../../src/providers/vertexUtil.ts"],"names":[],"mappings":";;;AAwEA,SAAgB,yBAAyB,CAAC,QAAa;IACrD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACvE,4EAA4E;QAC5E,QAAQ,GAAG;YACT,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;aACpD;SACF,CAAC;QACF,OAAO,GAAG,IAAI,CAAC;IACjB,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AAC/B,CAAC;AAbD,8DAaC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../src/providers/webhook.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+B;AAC/B,oCAA0C;AAE1C,qCAA8C;AAI9C,MAAa,eAAe;IAI1B,YAAY,UAAkB,EAAE,UAA4C,EAAE;QAC5E,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,EAAE;QACA,OAAO,WAAW,IAAI,CAAC,UAAU,EAAE,CAAC;IACtC,CAAC;IAED,QAAQ;QACN,OAAO,qBAAqB,IAAI,CAAC,UAAU,GAAG,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,MAAM,MAAM,GAAwC;YAClD,MAAM;SACP,CAAC;QACF,IAAI,IAAI,CAAC,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../../src/providers/webhook.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+B;AAC/B,oCAA0C;AAE1C,qCAA8C;AAI9C,MAAa,eAAe;IAI1B,YAAY,UAAkB,EAAE,UAA4C,EAAE;QAC5E,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,EAAE;QACA,OAAO,WAAW,IAAI,CAAC,UAAU,EAAE,CAAC;IACtC,CAAC;IAED,QAAQ;QACN,OAAO,qBAAqB,IAAI,CAAC,UAAU,GAAG,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,MAAM,MAAM,GAAwC;YAClD,MAAM;SACP,CAAC;QACF,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC9B,CAAC;QAED,gBAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,CAAC,UAAU,iBAAiB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC3F,IAAI,QAAQ,CAAC;QACb,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,IAAA,sBAAc,EAC7B,IAAI,CAAC,UAAU,EACf;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;aAC7B,EACD,2BAAkB,EAClB,MAAM,CACP,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,KAAK,EAAE,uBAAuB,MAAM,CAAC,GAAG,CAAC,EAAE;aAC5C,CAAC;QACJ,CAAC;QACD,gBAAM,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAErE,IAAI,QAAQ,CAAC,IAAI,IAAI,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC9D,OAAO;gBACL,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM;aAC7B,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO;gBACL,KAAK,EAAE,uDAAuD,IAAI,CAAC,SAAS,CAC1E,QAAQ,CAAC,IAAI,CACd,EAAE;aACJ,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AA7DD,0CA6DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/providers.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,uBAAuB,EACvB,wBAAwB,EACxB,4BAA4B,
|
|
1
|
+
{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/providers.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,uBAAuB,EACvB,wBAAwB,EACxB,4BAA4B,EAI7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,2BAA2B,EAA6B,MAAM,uBAAuB,CAAC;AAC/F,OAAO,EAA+B,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACvF,OAAO,EACL,yBAAyB,EACzB,mBAAmB,EAEpB,MAAM,qBAAqB,CAAC;AA6B7B,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAKxE,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EAEf,eAAe,EAChB,MAAM,SAAS,CAAC;AAEjB,wBAAsB,gBAAgB,CACpC,aAAa,EAAE,eAAe,CAAC,WAAW,CAAC,EAC3C,OAAO,GAAE;IACP,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,YAAY,CAAC;CACf,GACL,OAAO,CAAC,WAAW,EAAE,CAAC,CAuCxB;AAGD,wBAAsB,eAAe,CACnC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;IACP,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,YAAY,CAAC;CACf,GACL,OAAO,CAAC,WAAW,CAAC,CAgRtB;;;;;;;;;;;;;AAED,wBAWE"}
|
package/dist/src/providers.js
CHANGED
|
@@ -48,7 +48,10 @@ const huggingface_1 = require("./providers/huggingface");
|
|
|
48
48
|
const bedrock_1 = require("./providers/bedrock");
|
|
49
49
|
const pythonCompletion_1 = require("./providers/pythonCompletion");
|
|
50
50
|
const cohere_1 = require("./providers/cohere");
|
|
51
|
+
const CloudflareAiProviders = __importStar(require("./providers/cloudflare-ai"));
|
|
51
52
|
const bam_1 = require("./providers/bam");
|
|
53
|
+
const portkey_1 = require("./providers/portkey");
|
|
54
|
+
const http_1 = require("./providers/http");
|
|
52
55
|
const esm_1 = require("./esm");
|
|
53
56
|
async function loadApiProviders(providerPaths, options = {}) {
|
|
54
57
|
const { basePath, env } = options;
|
|
@@ -70,7 +73,7 @@ async function loadApiProviders(providerPaths, options = {}) {
|
|
|
70
73
|
}
|
|
71
74
|
else if (typeof provider === 'function') {
|
|
72
75
|
return {
|
|
73
|
-
id: () => `custom-function-${idx}`,
|
|
76
|
+
id: provider.label ? () => provider.label : () => `custom-function-${idx}`,
|
|
74
77
|
callApi: provider,
|
|
75
78
|
};
|
|
76
79
|
}
|
|
@@ -107,7 +110,8 @@ async function loadApiProvider(providerPath, context = {}) {
|
|
|
107
110
|
env,
|
|
108
111
|
};
|
|
109
112
|
let ret;
|
|
110
|
-
if (providerPath.startsWith('file://') &&
|
|
113
|
+
if (providerPath.startsWith('file://') &&
|
|
114
|
+
(providerPath.endsWith('.yaml') || providerPath.endsWith('.yml'))) {
|
|
111
115
|
const filePath = providerPath.slice('file://'.length);
|
|
112
116
|
const yamlContent = js_yaml_1.default.load(fs_1.default.readFileSync(filePath, 'utf8'));
|
|
113
117
|
(0, tiny_invariant_1.default)(yamlContent, `Provider config ${filePath} is undefined`);
|
|
@@ -139,10 +143,13 @@ async function loadApiProvider(providerPath, context = {}) {
|
|
|
139
143
|
ret = new openai_1.OpenAiChatCompletionProvider(modelName || 'gpt-3.5-turbo', providerOptions);
|
|
140
144
|
}
|
|
141
145
|
else if (modelType === 'embedding' || modelType === 'embeddings') {
|
|
142
|
-
ret = new openai_1.OpenAiEmbeddingProvider(modelName || 'text-embedding-
|
|
146
|
+
ret = new openai_1.OpenAiEmbeddingProvider(modelName || 'text-embedding-3-large', providerOptions);
|
|
143
147
|
}
|
|
144
148
|
else if (modelType === 'completion') {
|
|
145
|
-
ret = new openai_1.OpenAiCompletionProvider(modelName || '
|
|
149
|
+
ret = new openai_1.OpenAiCompletionProvider(modelName || 'gpt-3.5-turbo-instruct', providerOptions);
|
|
150
|
+
}
|
|
151
|
+
else if (modelType === 'moderation') {
|
|
152
|
+
ret = new openai_1.OpenAiModerationProvider(modelName || 'text-moderation-latest', providerOptions);
|
|
146
153
|
}
|
|
147
154
|
else if (openai_1.OpenAiChatCompletionProvider.OPENAI_CHAT_MODEL_NAMES.includes(modelType)) {
|
|
148
155
|
ret = new openai_1.OpenAiChatCompletionProvider(modelType, providerOptions);
|
|
@@ -193,6 +200,11 @@ async function loadApiProvider(providerPath, context = {}) {
|
|
|
193
200
|
},
|
|
194
201
|
});
|
|
195
202
|
}
|
|
203
|
+
else if (providerPath.startsWith('portkey:')) {
|
|
204
|
+
const splits = providerPath.split(':');
|
|
205
|
+
const modelName = splits.slice(1).join(':');
|
|
206
|
+
ret = new portkey_1.PortkeyChatCompletionProvider(modelName, providerOptions);
|
|
207
|
+
}
|
|
196
208
|
else if (providerPath.startsWith('anthropic:')) {
|
|
197
209
|
const splits = providerPath.split(':');
|
|
198
210
|
const modelType = splits[1];
|
|
@@ -252,8 +264,15 @@ async function loadApiProvider(providerPath, context = {}) {
|
|
|
252
264
|
}
|
|
253
265
|
else if (providerPath.startsWith('replicate:')) {
|
|
254
266
|
const splits = providerPath.split(':');
|
|
255
|
-
const
|
|
256
|
-
|
|
267
|
+
const modelType = splits[1];
|
|
268
|
+
const modelName = splits.slice(2).join(':');
|
|
269
|
+
if (modelType === 'moderation') {
|
|
270
|
+
ret = new replicate_1.ReplicateModerationProvider(modelName, providerOptions);
|
|
271
|
+
}
|
|
272
|
+
else {
|
|
273
|
+
// By default, there is no model type.
|
|
274
|
+
ret = new replicate_1.ReplicateProvider(modelType + ':' + modelName, providerOptions);
|
|
275
|
+
}
|
|
257
276
|
}
|
|
258
277
|
else if (providerPath.startsWith('bam:')) {
|
|
259
278
|
const splits = providerPath.split(':');
|
|
@@ -266,6 +285,24 @@ async function loadApiProvider(providerPath, context = {}) {
|
|
|
266
285
|
throw new Error(`Invalid BAM provider: ${providerPath}. Use one of the following providers: bam:chat:<model name>`);
|
|
267
286
|
}
|
|
268
287
|
}
|
|
288
|
+
else if (providerPath.startsWith('cloudflare-ai:')) {
|
|
289
|
+
// Load Cloudflare AI
|
|
290
|
+
const splits = providerPath.split(':');
|
|
291
|
+
const modelType = splits[1];
|
|
292
|
+
const deploymentName = splits[2];
|
|
293
|
+
if (modelType === 'chat') {
|
|
294
|
+
ret = new CloudflareAiProviders.CloudflareAiChatCompletionProvider(deploymentName, providerOptions);
|
|
295
|
+
}
|
|
296
|
+
else if (modelType === 'embedding' || modelType === 'embeddings') {
|
|
297
|
+
ret = new CloudflareAiProviders.CloudflareAiEmbeddingProvider(deploymentName, providerOptions);
|
|
298
|
+
}
|
|
299
|
+
else if (modelType === 'completion') {
|
|
300
|
+
ret = new CloudflareAiProviders.CloudflareAiCompletionProvider(deploymentName, providerOptions);
|
|
301
|
+
}
|
|
302
|
+
else {
|
|
303
|
+
throw new Error(`Unknown Cloudflare AI model type: ${modelType}. Use one of the following providers: cloudflare-ai:chat:<model name>, cloudflare-ai:completion:<model name>, cloudflare-ai:embedding:`);
|
|
304
|
+
}
|
|
305
|
+
}
|
|
269
306
|
else if (providerPath.startsWith('webhook:')) {
|
|
270
307
|
const webhookUrl = providerPath.substring('webhook:'.length);
|
|
271
308
|
ret = new webhook_1.WebhookProvider(webhookUrl, providerOptions);
|
|
@@ -329,8 +366,12 @@ async function loadApiProvider(providerPath, context = {}) {
|
|
|
329
366
|
ret = new localai_1.LocalAiChatProvider(modelType, providerOptions);
|
|
330
367
|
}
|
|
331
368
|
}
|
|
369
|
+
else if (providerPath.startsWith('http:') || providerPath.startsWith('https:')) {
|
|
370
|
+
ret = new http_1.HttpProvider(providerPath, providerOptions);
|
|
371
|
+
}
|
|
332
372
|
else if (providerPath === 'promptfoo:redteam:iterative') {
|
|
333
|
-
const RedteamIterativeProvider = (await Promise.resolve(`${path_1.default.join(__dirname, './redteam/iterative')}`).then(s => __importStar(require(s))))
|
|
373
|
+
const RedteamIterativeProvider = (await Promise.resolve(`${path_1.default.join(__dirname, './redteam/iterative')}`).then(s => __importStar(require(s))))
|
|
374
|
+
.default;
|
|
334
375
|
ret = new RedteamIterativeProvider(providerOptions);
|
|
335
376
|
}
|
|
336
377
|
else {
|
|
@@ -341,6 +382,7 @@ async function loadApiProvider(providerPath, context = {}) {
|
|
|
341
382
|
const modulePath = path_1.default.join(basePath || process.cwd(), providerPath);
|
|
342
383
|
const CustomApiProvider = await (0, esm_1.importModule)(modulePath);
|
|
343
384
|
ret = new CustomApiProvider(options);
|
|
385
|
+
ret.label = ret.label || options.label;
|
|
344
386
|
}
|
|
345
387
|
ret.transform = options.transform;
|
|
346
388
|
ret.delay = options.delay;
|