promptfoo 0.91.3 → 0.92.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/drizzle/0006_harsh_caretaker.sql +42 -0
- package/dist/drizzle/0007_cloudy_wong.sql +1 -0
- package/dist/drizzle/meta/0006_snapshot.json +721 -0
- package/dist/drizzle/meta/0007_snapshot.json +723 -0
- package/dist/drizzle/meta/_journal.json +14 -0
- package/dist/package.json +10 -8
- package/dist/src/app/assets/{index-C6z1nbLN.js → index-BpjzEMiv.js} +243 -241
- package/dist/src/app/assets/{index.es-oqbvfIxR.js → index.es-ihzvEu35.js} +1 -1
- package/dist/src/app/assets/{sync-D2s75VlC.js → sync-BosjlpGJ.js} +1 -1
- package/dist/src/app/index.html +3 -3
- package/dist/src/assertions.js +2 -2
- package/dist/src/assertions.js.map +1 -1
- package/dist/src/commands/cache.d.ts.map +1 -1
- package/dist/src/commands/cache.js +0 -2
- package/dist/src/commands/cache.js.map +1 -1
- package/dist/src/commands/eval.d.ts.map +1 -1
- package/dist/src/commands/eval.js +19 -16
- package/dist/src/commands/eval.js.map +1 -1
- package/dist/src/commands/export.d.ts.map +1 -1
- package/dist/src/commands/export.js +8 -31
- package/dist/src/commands/export.js.map +1 -1
- package/dist/src/commands/import.d.ts.map +1 -1
- package/dist/src/commands/import.js +52 -13
- package/dist/src/commands/import.js.map +1 -1
- package/dist/src/commands/list.d.ts.map +1 -1
- package/dist/src/commands/list.js +35 -7
- package/dist/src/commands/list.js.map +1 -1
- package/dist/src/commands/share.d.ts +2 -2
- package/dist/src/commands/share.d.ts.map +1 -1
- package/dist/src/commands/share.js +12 -13
- package/dist/src/commands/share.js.map +1 -1
- package/dist/src/commands/show.d.ts.map +1 -1
- package/dist/src/commands/show.js +10 -6
- package/dist/src/commands/show.js.map +1 -1
- package/dist/src/constants.d.ts +1 -0
- package/dist/src/constants.d.ts.map +1 -1
- package/dist/src/constants.js +2 -1
- package/dist/src/constants.js.map +1 -1
- package/dist/src/database/index.js +1 -1
- package/dist/src/database/index.js.map +1 -1
- package/dist/src/database/tables.d.ts +609 -11
- package/dist/src/database/tables.d.ts.map +1 -1
- package/dist/src/database/tables.js +111 -52
- package/dist/src/database/tables.js.map +1 -1
- package/dist/src/database/types.d.ts +3 -3
- package/dist/src/database/types.d.ts.map +1 -1
- package/dist/src/evaluator.d.ts +3 -2
- package/dist/src/evaluator.d.ts.map +1 -1
- package/dist/src/evaluator.js +75 -104
- package/dist/src/evaluator.js.map +1 -1
- package/dist/src/evaluatorHelpers.d.ts.map +1 -1
- package/dist/src/evaluatorHelpers.js +2 -1
- package/dist/src/evaluatorHelpers.js.map +1 -1
- package/dist/src/index.d.ts +2 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +18 -10
- package/dist/src/index.js.map +1 -1
- package/dist/src/models/eval.d.ts +95 -0
- package/dist/src/models/eval.d.ts.map +1 -0
- package/dist/src/models/eval.js +390 -0
- package/dist/src/models/eval.js.map +1 -0
- package/dist/src/models/evalResult.d.ts +50 -0
- package/dist/src/models/evalResult.d.ts.map +1 -0
- package/dist/src/models/evalResult.js +122 -0
- package/dist/src/models/evalResult.js.map +1 -0
- package/dist/src/models/provider.d.ts +9 -0
- package/dist/src/models/provider.d.ts.map +1 -0
- package/dist/src/models/provider.js +47 -0
- package/dist/src/models/provider.js.map +1 -0
- package/dist/src/prompts/index.d.ts.map +1 -1
- package/dist/src/prompts/index.js +2 -1
- package/dist/src/prompts/index.js.map +1 -1
- package/dist/src/prompts/utils.d.ts +1 -0
- package/dist/src/prompts/utils.d.ts.map +1 -1
- package/dist/src/prompts/utils.js +7 -0
- package/dist/src/prompts/utils.js.map +1 -1
- package/dist/src/providers/fal.d.ts +2 -2
- package/dist/src/providers/fal.d.ts.map +1 -1
- package/dist/src/providers/fal.js +2 -1
- package/dist/src/providers/fal.js.map +1 -1
- package/dist/src/providers/http.js +2 -2
- package/dist/src/providers/http.js.map +1 -1
- package/dist/src/providers/palm.d.ts +4 -3
- package/dist/src/providers/palm.d.ts.map +1 -1
- package/dist/src/providers/palm.js +13 -3
- package/dist/src/providers/palm.js.map +1 -1
- package/dist/src/providers.js +5 -5
- package/dist/src/providers.js.map +1 -1
- package/dist/src/redteam/eval/excessive-agency/llm_rubric-20240617.json +10 -0
- package/dist/src/redteam/eval/excessive-agency/llm_rubric-20240618.json +10 -0
- package/dist/src/redteam/eval/harmful/llm_rubric-20240723.json +10 -0
- package/dist/src/redteam/eval/harmful/llm_rubric-20240724.json +10 -0
- package/dist/src/server/server.d.ts +1 -0
- package/dist/src/server/server.d.ts.map +1 -1
- package/dist/src/server/server.js +70 -31
- package/dist/src/server/server.js.map +1 -1
- package/dist/src/share.d.ts +2 -2
- package/dist/src/share.d.ts.map +1 -1
- package/dist/src/share.js +93 -34
- package/dist/src/share.js.map +1 -1
- package/dist/src/table.d.ts +2 -2
- package/dist/src/table.d.ts.map +1 -1
- package/dist/src/table.js +3 -3
- package/dist/src/table.js.map +1 -1
- package/dist/src/types/index.d.ts +163 -11
- package/dist/src/types/index.d.ts.map +1 -1
- package/dist/src/types/index.js +21 -1
- package/dist/src/types/index.js.map +1 -1
- package/dist/src/util/config/load.d.ts.map +1 -1
- package/dist/src/util/config/load.js +2 -1
- package/dist/src/util/config/load.js.map +1 -1
- package/dist/src/util/config/manage.d.ts.map +1 -1
- package/dist/src/util/config/manage.js.map +1 -1
- package/dist/src/util/convertEvalResultsToTable.d.ts +16 -0
- package/dist/src/util/convertEvalResultsToTable.d.ts.map +1 -0
- package/dist/src/util/convertEvalResultsToTable.js +136 -0
- package/dist/src/util/convertEvalResultsToTable.js.map +1 -0
- package/dist/src/util/createHash.d.ts +1 -0
- package/dist/src/util/createHash.d.ts.map +1 -1
- package/dist/src/util/createHash.js +9 -0
- package/dist/src/util/createHash.js.map +1 -1
- package/dist/src/util/file.d.ts +8 -0
- package/dist/src/util/file.d.ts.map +1 -0
- package/dist/src/util/file.js +13 -0
- package/dist/src/util/file.js.map +1 -0
- package/dist/src/util/index.d.ts +9 -14
- package/dist/src/util/index.d.ts.map +1 -1
- package/dist/src/util/index.js +132 -268
- package/dist/src/util/index.js.map +1 -1
- package/dist/src/util/time.d.ts +2 -0
- package/dist/src/util/time.d.ts.map +1 -0
- package/dist/src/util/time.js +7 -0
- package/dist/src/util/time.js.map +1 -0
- package/dist/src/util/transform.js +2 -2
- package/dist/src/util/transform.js.map +1 -1
- package/dist/src/validators/providers.d.ts +6 -0
- package/dist/src/validators/providers.d.ts.map +1 -1
- package/dist/src/validators/providers.js +1 -0
- package/dist/src/validators/providers.js.map +1 -1
- package/dist/src/validators/redteam.d.ts +6 -0
- package/dist/src/validators/redteam.d.ts.map +1 -1
- package/dist/test/commands/eval/filterFailingTests.test.js +24 -2
- package/dist/test/commands/eval/filterFailingTests.test.js.map +1 -1
- package/dist/test/evaluator.test.js +152 -74
- package/dist/test/evaluator.test.js.map +1 -1
- package/dist/test/factories/data/eval/database_records.d.ts +142 -0
- package/dist/test/factories/data/eval/database_records.d.ts.map +1 -0
- package/dist/test/factories/data/eval/database_records.js +251 -0
- package/dist/test/factories/data/eval/database_records.js.map +1 -0
- package/dist/test/factories/evalFactory.d.ts +768 -0
- package/dist/test/factories/evalFactory.d.ts.map +1 -0
- package/dist/test/factories/evalFactory.js +121 -0
- package/dist/test/factories/evalFactory.js.map +1 -0
- package/dist/test/index.test.js +20 -35
- package/dist/test/index.test.js.map +1 -1
- package/dist/test/models/eval.test.d.ts +2 -0
- package/dist/test/models/eval.test.d.ts.map +1 -0
- package/dist/test/models/eval.test.js +34 -0
- package/dist/test/models/eval.test.js.map +1 -0
- package/dist/test/providers.test.js +3 -3
- package/dist/test/providers.test.js.map +1 -1
- package/dist/test/server/share.test.d.ts +2 -0
- package/dist/test/server/share.test.d.ts.map +1 -0
- package/dist/test/server/share.test.js +36 -0
- package/dist/test/server/share.test.js.map +1 -0
- package/dist/test/server/v3evalToShare.json +507 -0
- package/dist/test/server/v4evalToShare.json +421 -0
- package/dist/test/types.test.js +56 -3
- package/dist/test/types.test.js.map +1 -1
- package/dist/test/util.file.test.d.ts +2 -0
- package/dist/test/util.file.test.d.ts.map +1 -0
- package/dist/test/util.file.test.js +32 -0
- package/dist/test/util.file.test.js.map +1 -0
- package/dist/test/util.listPrevious.test.d.ts +2 -0
- package/dist/test/util.listPrevious.test.d.ts.map +1 -0
- package/dist/test/util.listPrevious.test.js +37 -0
- package/dist/test/util.listPrevious.test.js.map +1 -0
- package/dist/test/util.test.js +38 -311
- package/dist/test/util.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -0
- package/package.json +10 -8
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const crypto_1 = require("crypto");
|
|
4
|
+
const drizzle_orm_1 = require("drizzle-orm");
|
|
5
|
+
const database_1 = require("../database");
|
|
6
|
+
const tables_1 = require("../database/tables");
|
|
7
|
+
const utils_1 = require("../prompts/utils");
|
|
8
|
+
const time_1 = require("../util/time");
|
|
9
|
+
class EvalResult {
|
|
10
|
+
static async createFromEvaluateResult(evalId, result, testCase, opts) {
|
|
11
|
+
const persist = opts?.persist == null ? true : opts.persist;
|
|
12
|
+
const { prompt, error, score, latencyMs, success, provider, gradingResult, namedScores, cost } = result;
|
|
13
|
+
const args = {
|
|
14
|
+
id: (0, crypto_1.randomUUID)(),
|
|
15
|
+
evalId,
|
|
16
|
+
testCase,
|
|
17
|
+
promptIdx: result.promptIdx,
|
|
18
|
+
testIdx: result.testIdx,
|
|
19
|
+
prompt,
|
|
20
|
+
promptId: (0, utils_1.hashPrompt)(prompt),
|
|
21
|
+
error: error?.toString(),
|
|
22
|
+
success,
|
|
23
|
+
score: score == null ? 0 : score,
|
|
24
|
+
response: result.response || null,
|
|
25
|
+
gradingResult: gradingResult || null,
|
|
26
|
+
namedScores,
|
|
27
|
+
provider,
|
|
28
|
+
latencyMs,
|
|
29
|
+
cost,
|
|
30
|
+
};
|
|
31
|
+
if (persist) {
|
|
32
|
+
const db = (0, database_1.getDb)();
|
|
33
|
+
const dbResult = await db.insert(tables_1.evalResultsTable).values(args).returning();
|
|
34
|
+
return new EvalResult({ ...dbResult[0], persisted: true });
|
|
35
|
+
}
|
|
36
|
+
return new EvalResult(args);
|
|
37
|
+
}
|
|
38
|
+
static async createManyFromEvaluateResult(results, evalId) {
|
|
39
|
+
const db = (0, database_1.getDb)();
|
|
40
|
+
const returnResults = [];
|
|
41
|
+
await db.transaction(async (tx) => {
|
|
42
|
+
for (const result of results) {
|
|
43
|
+
const dbResult = await tx
|
|
44
|
+
.insert(tables_1.evalResultsTable)
|
|
45
|
+
.values({ ...result, evalId, id: (0, crypto_1.randomUUID)() })
|
|
46
|
+
.returning();
|
|
47
|
+
returnResults.push(new EvalResult({ ...dbResult[0], persisted: true }));
|
|
48
|
+
}
|
|
49
|
+
});
|
|
50
|
+
return returnResults;
|
|
51
|
+
}
|
|
52
|
+
static async findById(id) {
|
|
53
|
+
const db = (0, database_1.getDb)();
|
|
54
|
+
const result = await db.select().from(tables_1.evalResultsTable).where((0, drizzle_orm_1.eq)(tables_1.evalResultsTable.id, id));
|
|
55
|
+
return result.length > 0 ? new EvalResult({ ...result[0], persisted: true }) : null;
|
|
56
|
+
}
|
|
57
|
+
static async findManyByEvalId(evalId) {
|
|
58
|
+
const db = (0, database_1.getDb)();
|
|
59
|
+
const results = await db
|
|
60
|
+
.select()
|
|
61
|
+
.from(tables_1.evalResultsTable)
|
|
62
|
+
.where((0, drizzle_orm_1.eq)(tables_1.evalResultsTable.evalId, evalId));
|
|
63
|
+
return results.map((result) => new EvalResult({ ...result, persisted: true }));
|
|
64
|
+
}
|
|
65
|
+
constructor(opts) {
|
|
66
|
+
this.id = opts.id;
|
|
67
|
+
this.evalId = opts.evalId;
|
|
68
|
+
this.promptIdx = opts.promptIdx;
|
|
69
|
+
this.testIdx = opts.testIdx;
|
|
70
|
+
this.testCase = opts.testCase;
|
|
71
|
+
this.prompt = opts.prompt;
|
|
72
|
+
this.promptId = opts.promptId || (0, utils_1.hashPrompt)(opts.prompt);
|
|
73
|
+
this.error = opts.error;
|
|
74
|
+
this.score = opts.score;
|
|
75
|
+
this.success = opts.success;
|
|
76
|
+
this.response = opts.response;
|
|
77
|
+
this.gradingResult = opts.gradingResult;
|
|
78
|
+
this.namedScores = opts.namedScores || {};
|
|
79
|
+
this.provider = opts.provider;
|
|
80
|
+
this.latencyMs = opts.latencyMs || 0;
|
|
81
|
+
this.cost = opts.cost || 0;
|
|
82
|
+
this.persisted = opts.persisted || false;
|
|
83
|
+
}
|
|
84
|
+
async save() {
|
|
85
|
+
const db = (0, database_1.getDb)();
|
|
86
|
+
//check if this exists in the db
|
|
87
|
+
if (this.persisted) {
|
|
88
|
+
await db
|
|
89
|
+
.update(tables_1.evalResultsTable)
|
|
90
|
+
.set({ ...this, updatedAt: (0, time_1.getCurrentTimestamp)() })
|
|
91
|
+
.where((0, drizzle_orm_1.eq)(tables_1.evalResultsTable.id, this.id));
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
const result = await db.insert(tables_1.evalResultsTable).values(this).returning();
|
|
95
|
+
this.id = result[0].id;
|
|
96
|
+
this.persisted = true;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
toEvaluateResult() {
|
|
100
|
+
return {
|
|
101
|
+
cost: this.cost,
|
|
102
|
+
description: this.description || undefined,
|
|
103
|
+
error: this.error || undefined,
|
|
104
|
+
gradingResult: this.gradingResult,
|
|
105
|
+
id: this.id,
|
|
106
|
+
latencyMs: this.latencyMs,
|
|
107
|
+
namedScores: this.namedScores,
|
|
108
|
+
prompt: this.prompt,
|
|
109
|
+
promptId: this.promptId,
|
|
110
|
+
promptIdx: this.promptIdx,
|
|
111
|
+
provider: { id: this.provider.id, label: this.provider.label },
|
|
112
|
+
response: this.response || undefined,
|
|
113
|
+
score: this.score,
|
|
114
|
+
success: this.success,
|
|
115
|
+
testCase: this.testCase,
|
|
116
|
+
testIdx: this.testIdx,
|
|
117
|
+
vars: this.testCase.vars || {},
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
exports.default = EvalResult;
|
|
122
|
+
//# sourceMappingURL=evalResult.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"evalResult.js","sourceRoot":"","sources":["../../../src/models/evalResult.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { ApiProvider } from '../types';
|
|
2
|
+
export default class Provider {
|
|
3
|
+
id: string;
|
|
4
|
+
providerId: string;
|
|
5
|
+
config: Record<string, any>;
|
|
6
|
+
static createMultiple(providers: ApiProvider[]): Promise<Provider[]>;
|
|
7
|
+
constructor(id: string, providerId: string, config: Record<string, any>);
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=provider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../src/models/provider.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAO5C,MAAM,CAAC,OAAO,OAAO,QAAQ;IA8BlB,EAAE,EAAE,MAAM;IACV,UAAU,EAAE,MAAM;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;WA/BvB,cAAc,CAAC,SAAS,EAAE,WAAW,EAAE;gBA6B3C,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAMrC"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const drizzle_orm_1 = require("drizzle-orm");
|
|
4
|
+
const database_1 = require("../database");
|
|
5
|
+
const tables_1 = require("../database/tables");
|
|
6
|
+
const createHash_1 = require("../util/createHash");
|
|
7
|
+
function getProviderId(provider) {
|
|
8
|
+
return (0, createHash_1.sha256)(provider.id() + JSON.stringify(provider.config));
|
|
9
|
+
}
|
|
10
|
+
class Provider {
|
|
11
|
+
static async createMultiple(providers) {
|
|
12
|
+
const db = (0, database_1.getDb)();
|
|
13
|
+
const ret = [];
|
|
14
|
+
for (const provider of providers) {
|
|
15
|
+
const id = getProviderId(provider);
|
|
16
|
+
let providerResult;
|
|
17
|
+
let results = await db.select().from(tables_1.providers).where((0, drizzle_orm_1.eq)(tables_1.providers.id, id));
|
|
18
|
+
if (results.length > 0) {
|
|
19
|
+
providerResult = results[0];
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
results = await db
|
|
23
|
+
.insert(tables_1.providers)
|
|
24
|
+
.values({
|
|
25
|
+
id,
|
|
26
|
+
providerId: provider.id(),
|
|
27
|
+
config: provider.config || {},
|
|
28
|
+
})
|
|
29
|
+
.onConflictDoNothing()
|
|
30
|
+
.returning();
|
|
31
|
+
providerResult = results[0];
|
|
32
|
+
}
|
|
33
|
+
ret.push(new Provider(providerResult.id, providerResult.providerId, providerResult.config));
|
|
34
|
+
}
|
|
35
|
+
return ret;
|
|
36
|
+
}
|
|
37
|
+
constructor(id, providerId, config) {
|
|
38
|
+
this.id = id;
|
|
39
|
+
this.providerId = providerId;
|
|
40
|
+
this.config = config;
|
|
41
|
+
this.id = id;
|
|
42
|
+
this.providerId = providerId;
|
|
43
|
+
this.config = config;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
exports.default = Provider;
|
|
47
|
+
//# sourceMappingURL=provider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/models/provider.ts"],"names":[],"mappings":";;AAAA,6CAAiC;AACjC,0CAAoC;AACpC,+CAAgE;AAEhE,mDAA4C;AAE5C,SAAS,aAAa,CAAC,QAAqB;IAC1C,OAAO,IAAA,mBAAM,EAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,MAAqB,QAAQ;IAC3B,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,SAAwB;QAClD,MAAM,EAAE,GAAG,IAAA,gBAAK,GAAE,CAAC;QACnB,MAAM,GAAG,GAAe,EAAE,CAAC;QAE3B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,MAAM,EAAE,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;YACnC,IAAI,cAA+E,CAAC;YACpF,IAAI,OAAO,GAAG,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,kBAAa,CAAC,CAAC,KAAK,CAAC,IAAA,gBAAE,EAAC,kBAAa,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;YACpF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,MAAM,EAAE;qBACf,MAAM,CAAC,kBAAa,CAAC;qBACrB,MAAM,CAAC;oBACN,EAAE;oBACF,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE;oBACzB,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,EAAE;iBAC9B,CAAC;qBACD,mBAAmB,EAAE;qBACrB,SAAS,EAAE,CAAC;gBACf,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC9B,CAAC;YACD,GAAG,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,cAAc,CAAC,UAAU,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9F,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAED,YACS,EAAU,EACV,UAAkB,EAClB,MAA2B;QAF3B,OAAE,GAAF,EAAE,CAAQ;QACV,eAAU,GAAV,UAAU,CAAQ;QAClB,WAAM,GAAN,MAAM,CAAqB;QAElC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF;AAtCD,2BAsCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/prompts/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,aAAa,EACb,MAAM,EAEN,SAAS,EAEV,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/prompts/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,aAAa,EACb,MAAM,EAEN,SAAS,EAEV,MAAM,UAAU,CAAC;AAalB,cAAc,WAAW,CAAC;AAE1B;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC,EACjD,aAAa,EAAE,MAAM,EAAE,GACtB,SAAS,CAAC,mBAAmB,CAAC,CA4ChC;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EACvB,QAAQ,GAAE,MAAW,EACrB,iBAAiB,GAAE,MAAU,GAC5B,OAAO,CAAC,MAAM,EAAE,CAAC,CA2EnB;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,iBAAiB,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjF,QAAQ,GAAE,MAAW,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CAYnB"}
|
|
@@ -24,6 +24,7 @@ const glob_1 = require("glob");
|
|
|
24
24
|
const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
|
|
25
25
|
const logger_1 = __importDefault(require("../logger"));
|
|
26
26
|
const util_1 = require("../util");
|
|
27
|
+
const file_1 = require("../util/file");
|
|
27
28
|
const javascript_1 = require("./processors/javascript");
|
|
28
29
|
const json_1 = require("./processors/json");
|
|
29
30
|
const jsonl_1 = require("./processors/jsonl");
|
|
@@ -117,7 +118,7 @@ async function processPrompt(prompt, basePath = '', maxRecursionDepth = 1) {
|
|
|
117
118
|
if (extension === '.jsonl') {
|
|
118
119
|
return (0, jsonl_1.processJsonlFile)(filePath, prompt);
|
|
119
120
|
}
|
|
120
|
-
if (extension && (0,
|
|
121
|
+
if (extension && (0, file_1.isJavascriptFile)(extension)) {
|
|
121
122
|
return (0, javascript_1.processJsFile)(filePath, prompt, functionName);
|
|
122
123
|
}
|
|
123
124
|
if (extension === '.md') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/prompts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/prompts/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,4 +12,5 @@ export declare function maybeFilePath(str: string): boolean;
|
|
|
12
12
|
* @throws If the input is invalid or empty.
|
|
13
13
|
*/
|
|
14
14
|
export declare function normalizeInput(promptPathOrGlobs: string | (string | Partial<Prompt>)[] | Record<string, string>): Partial<Prompt>[];
|
|
15
|
+
export declare function hashPrompt(prompt: Prompt): string;
|
|
15
16
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/prompts/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/prompts/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIvC;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAuBlD;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,iBAAiB,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAChF,OAAO,CAAC,MAAM,CAAC,EAAE,CA2CnB;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAIjD"}
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.maybeFilePath = maybeFilePath;
|
|
4
4
|
exports.normalizeInput = normalizeInput;
|
|
5
|
+
exports.hashPrompt = hashPrompt;
|
|
6
|
+
const createHash_1 = require("../util/createHash");
|
|
5
7
|
const constants_1 = require("./constants");
|
|
6
8
|
/**
|
|
7
9
|
* Determines if a string is a valid file path.
|
|
@@ -75,4 +77,9 @@ function normalizeInput(promptPathOrGlobs) {
|
|
|
75
77
|
// numbers, booleans, etc
|
|
76
78
|
throw new Error(`Invalid input prompt: ${JSON.stringify(promptPathOrGlobs)}`);
|
|
77
79
|
}
|
|
80
|
+
function hashPrompt(prompt) {
|
|
81
|
+
return prompt.id || prompt.label
|
|
82
|
+
? (0, createHash_1.sha256)(prompt.label)
|
|
83
|
+
: (0, createHash_1.sha256)(typeof prompt.raw === 'object' ? JSON.stringify(prompt.raw) : prompt.raw);
|
|
84
|
+
}
|
|
78
85
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/prompts/utils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/prompts/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ApiProvider, EnvOverrides, ProviderResponse } from '../types';
|
|
1
|
+
import type { ApiProvider, CallApiContextParams, EnvOverrides, ProviderResponse } from '../types';
|
|
2
2
|
type FalProviderOptions = {
|
|
3
3
|
apiKey?: string;
|
|
4
4
|
};
|
|
@@ -15,7 +15,7 @@ declare class FalProvider<Input = any> implements ApiProvider {
|
|
|
15
15
|
});
|
|
16
16
|
id(): string;
|
|
17
17
|
toString(): string;
|
|
18
|
-
callApi(prompt: string): Promise<ProviderResponse>;
|
|
18
|
+
callApi(prompt: string, context?: CallApiContextParams): Promise<ProviderResponse>;
|
|
19
19
|
runInference<Result = any>(input: Input): Promise<Result>;
|
|
20
20
|
}
|
|
21
21
|
type FalImageGenerationOptions = FalProviderOptions & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fal.d.ts","sourceRoot":"","sources":["../../../src/providers/fal.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"fal.d.ts","sourceRoot":"","sources":["../../../src/providers/fal.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,oBAAoB,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAElG,KAAK,kBAAkB,GAAG;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,cAAM,WAAW,CAAC,KAAK,GAAG,GAAG,CAAE,YAAW,WAAW;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,EAAE,KAAK,CAAC;gBAGX,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,kBAAkB,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IAchF,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIZ,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA+ClF,YAAY,CAAC,MAAM,GAAG,GAAG,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;CAMhE;AAED,KAAK,yBAAyB,GAAG,kBAAkB,GAAG;IACpD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE;QACX,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAAC;AAEF,KAAK,uBAAuB,GAAG,yBAAyB,GAAG;IACzD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,qBAAa,0BAA2B,SAAQ,WAAW,CAAC,uBAAuB,CAAC;gBAEhF,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,yBAAyB,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IAKvF,QAAQ,IAAI,MAAM;IAIZ,YAAY,CAAC,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC;IAYpF,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM;CAa/C"}
|
|
@@ -49,7 +49,7 @@ class FalProvider {
|
|
|
49
49
|
toString() {
|
|
50
50
|
return `[fal.ai Inference Provider ${this.modelName}]`;
|
|
51
51
|
}
|
|
52
|
-
async callApi(prompt) {
|
|
52
|
+
async callApi(prompt, context) {
|
|
53
53
|
if (!this.apiKey) {
|
|
54
54
|
throw new Error('fal.ai API key is not set. Set the FAL_KEY environment variable or or add `apiKey` to the provider config.');
|
|
55
55
|
}
|
|
@@ -59,6 +59,7 @@ class FalProvider {
|
|
|
59
59
|
const input = {
|
|
60
60
|
prompt,
|
|
61
61
|
...this.input,
|
|
62
|
+
...(context?.prompt?.config ?? {}),
|
|
62
63
|
};
|
|
63
64
|
const cacheKey = `fal:${this.modelName}:${JSON.stringify(input)}`;
|
|
64
65
|
if ((0, cache_1.isCacheEnabled)()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fal.js","sourceRoot":"","sources":["../../../src/providers/fal.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAiD;AAEjD,4DAA+B;AAC/B,oCAAoD;AACpD,sCAAyC;AACzC,uDAA+B;AAO/B,MAAM,WAAW;IAOf,YACE,SAAkB,EAClB,SAAiB,EACjB,UAA4E,EAAE;QAE9E,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;QACpC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QAElC,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC3B,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,GAAG,EAAE,OAAO,IAAI,IAAA,qBAAY,EAAC,SAAS,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK,GAAG,KAAc,CAAC;IAC9B,CAAC;IAED,EAAE;QACA,OAAO,OAAO,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;IACnD,CAAC;IAED,QAAQ;QACN,OAAO,8BAA8B,IAAI,CAAC,SAAS,GAAG,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc;
|
|
1
|
+
{"version":3,"file":"fal.js","sourceRoot":"","sources":["../../../src/providers/fal.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ const cliState_1 = __importDefault(require("../cliState"));
|
|
|
14
14
|
const esm_1 = require("../esm");
|
|
15
15
|
const logger_1 = __importDefault(require("../logger"));
|
|
16
16
|
const util_1 = require("../util");
|
|
17
|
-
const
|
|
17
|
+
const file_1 = require("../util/file");
|
|
18
18
|
const json_1 = require("../util/json");
|
|
19
19
|
const templates_1 = require("../util/templates");
|
|
20
20
|
const shared_1 = require("./shared");
|
|
@@ -31,7 +31,7 @@ async function createResponseParser(parser) {
|
|
|
31
31
|
let functionName;
|
|
32
32
|
if (filename.includes(':')) {
|
|
33
33
|
const splits = filename.split(':');
|
|
34
|
-
if (splits[0] && (0,
|
|
34
|
+
if (splits[0] && (0, file_1.isJavascriptFile)(splits[0])) {
|
|
35
35
|
[filename, functionName] = splits;
|
|
36
36
|
}
|
|
37
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/providers/http.ts"],"names":[],"mappings":";;;;;;AA+BA,oDAoCC;AAED,kCA8BC;AAnGD,oDAA2B;AAC3B,gDAAwB;AACxB,oEAAuC;AACvC,oCAA0C;AAC1C,2DAAmC;AACnC,gCAAsC;AACtC,uDAA+B;AAO/B,kCAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/providers/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ApiProvider, EnvOverrides, ProviderResponse } from '../types';
|
|
1
|
+
import type { ApiProvider, EnvOverrides, ProviderResponse, CallApiContextParams } from '../types';
|
|
2
2
|
interface PalmCompletionOptions {
|
|
3
3
|
apiKey?: string;
|
|
4
4
|
apiHost?: string;
|
|
@@ -12,6 +12,7 @@ interface PalmCompletionOptions {
|
|
|
12
12
|
topP?: number;
|
|
13
13
|
topK?: number;
|
|
14
14
|
generationConfig?: Record<string, any>;
|
|
15
|
+
responseSchema?: string;
|
|
15
16
|
}
|
|
16
17
|
declare class PalmGenericProvider implements ApiProvider {
|
|
17
18
|
modelName: string;
|
|
@@ -35,8 +36,8 @@ export declare class PalmChatProvider extends PalmGenericProvider {
|
|
|
35
36
|
id?: string;
|
|
36
37
|
env?: EnvOverrides;
|
|
37
38
|
});
|
|
38
|
-
callApi(prompt: string): Promise<ProviderResponse>;
|
|
39
|
-
callGemini(prompt: string): Promise<ProviderResponse>;
|
|
39
|
+
callApi(prompt: string, context?: CallApiContextParams): Promise<ProviderResponse>;
|
|
40
|
+
callGemini(prompt: string, context?: CallApiContextParams): Promise<ProviderResponse>;
|
|
40
41
|
}
|
|
41
42
|
export {};
|
|
42
43
|
//# sourceMappingURL=palm.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"palm.d.ts","sourceRoot":"","sources":["../../../src/providers/palm.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"palm.d.ts","sourceRoot":"","sources":["../../../src/providers/palm.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAMlG,UAAU,qBAAqB;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC7D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACvC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,cAAM,mBAAoB,YAAW,WAAW;IAC9C,SAAS,EAAE,MAAM,CAAC;IAElB,MAAM,EAAE,qBAAqB,CAAC;IAC9B,GAAG,CAAC,EAAE,YAAY,CAAC;gBAGjB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,qBAAqB,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IASnF,EAAE,IAAI,MAAM;IAIZ,QAAQ,IAAI,MAAM;IAIlB,UAAU,IAAI,MAAM,GAAG,SAAS;IAWhC,SAAS,IAAI,MAAM,GAAG,SAAS;IAWzB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAGzD;AAED,qBAAa,gBAAiB,SAAQ,mBAAmB;IACvD,MAAM,CAAC,WAAW,WAAyD;gBAGzE,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,qBAAqB,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,YAAY,CAAA;KAAO;IAQ7E,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAoElF,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAqF5F"}
|
|
@@ -7,6 +7,7 @@ exports.PalmChatProvider = void 0;
|
|
|
7
7
|
const cache_1 = require("../cache");
|
|
8
8
|
const envars_1 = require("../envars");
|
|
9
9
|
const logger_1 = __importDefault(require("../logger"));
|
|
10
|
+
const util_1 = require("../util");
|
|
10
11
|
const shared_1 = require("./shared");
|
|
11
12
|
const DEFAULT_API_HOST = 'generativelanguage.googleapis.com';
|
|
12
13
|
class PalmGenericProvider {
|
|
@@ -50,13 +51,13 @@ class PalmChatProvider extends PalmGenericProvider {
|
|
|
50
51
|
}
|
|
51
52
|
super(modelName, options);
|
|
52
53
|
}
|
|
53
|
-
async callApi(prompt) {
|
|
54
|
+
async callApi(prompt, context) {
|
|
54
55
|
if (!this.getApiKey()) {
|
|
55
56
|
throw new Error('Google API key is not set. Set the GOOGLE_API_KEY environment variable or add `apiKey` to the provider config.');
|
|
56
57
|
}
|
|
57
58
|
const isGemini = this.modelName.startsWith('gemini');
|
|
58
59
|
if (isGemini) {
|
|
59
|
-
return this.callGemini(prompt);
|
|
60
|
+
return this.callGemini(prompt, context);
|
|
60
61
|
}
|
|
61
62
|
// https://developers.generativeai.google/tutorials/curl_quickstart
|
|
62
63
|
// https://ai.google.dev/api/rest/v1beta/models/generateMessage
|
|
@@ -104,7 +105,7 @@ class PalmChatProvider extends PalmGenericProvider {
|
|
|
104
105
|
};
|
|
105
106
|
}
|
|
106
107
|
}
|
|
107
|
-
async callGemini(prompt) {
|
|
108
|
+
async callGemini(prompt, context) {
|
|
108
109
|
const contents = (0, shared_1.parseChatPrompt)(prompt, [{ parts: [{ text: prompt }] }]);
|
|
109
110
|
const body = {
|
|
110
111
|
contents,
|
|
@@ -118,6 +119,15 @@ class PalmChatProvider extends PalmGenericProvider {
|
|
|
118
119
|
},
|
|
119
120
|
safetySettings: this.config.safetySettings,
|
|
120
121
|
};
|
|
122
|
+
if (this.config.responseSchema) {
|
|
123
|
+
// If the `response_schema` has already been set by the client.
|
|
124
|
+
if (body.generationConfig.response_schema) {
|
|
125
|
+
throw new Error('`responseSchema` provided but `generationConfig.response_schema` already set.');
|
|
126
|
+
}
|
|
127
|
+
const schema = (0, util_1.maybeLoadFromExternalFile)((0, util_1.renderVarsInObject)(this.config.responseSchema, context?.vars));
|
|
128
|
+
body.generationConfig.response_schema = schema;
|
|
129
|
+
body.generationConfig.response_mime_type = 'application/json';
|
|
130
|
+
}
|
|
121
131
|
logger_1.default.debug(`Calling Google API: ${JSON.stringify(body)}`);
|
|
122
132
|
let data;
|
|
123
133
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"palm.js","sourceRoot":"","sources":["../../../src/providers/palm.ts"],"names":[],"mappings":";;;;;;AAAA,oCAA0C;AAC1C,sCAAyC;AACzC,uDAA+B;AAE/B,qCAA+D;AAE/D,MAAM,gBAAgB,GAAG,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"palm.js","sourceRoot":"","sources":["../../../src/providers/palm.ts"],"names":[],"mappings":";;;;;;AAAA,oCAA0C;AAC1C,sCAAyC;AACzC,uDAA+B;AAE/B,kCAAwE;AACxE,qCAA+D;AAE/D,MAAM,gBAAgB,GAAG,mCAAmC,CAAC;AAe7D,MAAM,mBAAmB;IAMvB,YACE,SAAiB,EACjB,UAA+E,EAAE;QAEjF,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;QACpC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;IACpC,CAAC;IAED,EAAE;QACA,OAAO,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;IAClC,CAAC;IAED,QAAQ;QACN,OAAO,8BAA8B,IAAI,CAAC,SAAS,GAAG,CAAC;IACzD,CAAC;IAED,UAAU;QACR,OAAO,CACL,IAAI,CAAC,MAAM,CAAC,OAAO;YACnB,IAAI,CAAC,GAAG,EAAE,eAAe;YACzB,IAAI,CAAC,GAAG,EAAE,aAAa;YACvB,IAAA,qBAAY,EAAC,iBAAiB,CAAC;YAC/B,IAAA,qBAAY,EAAC,eAAe,CAAC;YAC7B,gBAAgB,CACjB,CAAC;IACJ,CAAC;IAED,SAAS;QACP,OAAO,CACL,IAAI,CAAC,MAAM,CAAC,MAAM;YAClB,IAAI,CAAC,GAAG,EAAE,cAAc;YACxB,IAAI,CAAC,GAAG,EAAE,YAAY;YACtB,IAAA,qBAAY,EAAC,gBAAgB,CAAC;YAC9B,IAAA,qBAAY,EAAC,cAAc,CAAC,CAC7B,CAAC;IACJ,CAAC;IAED,wDAAwD;IACxD,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;CACF;AAED,MAAa,gBAAiB,SAAQ,mBAAmB;IAGvD,YACE,SAAiB,EACjB,UAA+E,EAAE;QAEjF,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YACtD,gBAAM,CAAC,IAAI,CAAC,oCAAoC,SAAS,EAAE,CAAC,CAAC;QAC/D,CAAC;QACD,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAAc,EAAE,OAA8B;QAC1D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CACb,gHAAgH,CACjH,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACrD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;QAED,mEAAmE;QACnE,+DAA+D;QAC/D,MAAM,QAAQ,GAAG,IAAA,wBAAe,EAAC,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAChE,MAAM,IAAI,GAAG;YACX,MAAM,EAAE,EAAE,QAAQ,EAAE;YACpB,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACtB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YAEtB,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;YAC1C,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;YACxC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;SAC7C,CAAC;QACF,gBAAM,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE5D,IAAI,IAAI,CAAC;QACT,IAAI,CAAC;YACH,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,IAAA,sBAAc,EAC/B,WAAW,IAAI,CAAC,UAAU,EAAE,mBAC1B,IAAI,CAAC,SACP,wBAAwB,IAAI,CAAC,SAAS,EAAE,EAAE,EAC1C;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC3B,EACD,2BAAkB,CACnB,CAAmB,CAAC,CAAC;QACxB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,KAAK,EAAE,mBAAmB,MAAM,CAAC,GAAG,CAAC,EAAE;aACxC,CAAC;QACJ,CAAC;QAED,gBAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE/D,IAAI,CAAC,IAAI,EAAE,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtD,OAAO;gBACL,KAAK,EAAE,+CAA+C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;aAC7E,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC1C,OAAO;gBACL,MAAM;aACP,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,KAAK,EAAE,uBAAuB,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;aACrE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,OAA8B;QAC7D,MAAM,QAAQ,GAAG,IAAA,wBAAe,EAAC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1E,MAAM,IAAI,GAAwB;YAChC,QAAQ;YACR,gBAAgB,EAAE;gBAChB,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;gBACpC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;gBACxC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe;gBAC5C,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB;aAChC;YACD,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;SAC3C,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YAC/B,+DAA+D;YAC/D,IAAI,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,CAAC;gBAC1C,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;YACJ,CAAC;YAED,MAAM,MAAM,GAAG,IAAA,gCAAyB,EACtC,IAAA,yBAAkB,EAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,CAC9D,CAAC;YAEF,IAAI,CAAC,gBAAgB,CAAC,eAAe,GAAG,MAAM,CAAC;YAC/C,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAChE,CAAC;QAED,gBAAM,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE5D,IAAI,IAAI,CAAC;QACT,IAAI,CAAC;YACH,sDAAsD;YACtD,kDAAkD;YAClD,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,IAAA,sBAAc,EAC/B,WAAW,IAAI,CAAC,UAAU,EAAE,kBAC1B,IAAI,CAAC,SACP,wBAAwB,IAAI,CAAC,SAAS,EAAE,EAAE,EAC1C;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC3B,EACD,2BAAkB,CACnB,CAQA,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,KAAK,EAAE,mBAAmB,MAAM,CAAC,GAAG,CAAC,EAAE;aACxC,CAAC;QACJ,CAAC;QAED,gBAAM,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE/D,IAAI,CAAC,IAAI,EAAE,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtD,OAAO;gBACL,KAAK,EAAE,+CAA+C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;aAC7E,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAExE,IAAI,CAAC;YACH,OAAO;gBACL,MAAM,EAAE,KAAK;aACd,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,KAAK,EAAE,uBAAuB,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;aACrE,CAAC;QACJ,CAAC;IACH,CAAC;;AArKH,4CAsKC;AArKQ,4BAAW,GAAG,CAAC,gBAAgB,EAAE,YAAY,EAAE,mBAAmB,CAAC,CAAC"}
|
package/dist/src/providers.js
CHANGED
|
@@ -69,7 +69,7 @@ const crescendo_1 = __importDefault(require("./redteam/providers/crescendo"));
|
|
|
69
69
|
const iterative_1 = __importDefault(require("./redteam/providers/iterative"));
|
|
70
70
|
const iterativeImage_1 = __importDefault(require("./redteam/providers/iterativeImage"));
|
|
71
71
|
const iterativeTree_1 = __importDefault(require("./redteam/providers/iterativeTree"));
|
|
72
|
-
const
|
|
72
|
+
const file_1 = require("./util/file");
|
|
73
73
|
const templates_1 = require("./util/templates");
|
|
74
74
|
// FIXME(ian): Make loadApiProvider handle all the different provider types (string, ProviderOptions, ApiProvider, etc), rather than the callers.
|
|
75
75
|
async function loadApiProvider(providerPath, context = {}) {
|
|
@@ -446,7 +446,7 @@ async function loadApiProvider(providerPath, context = {}) {
|
|
|
446
446
|
: providerPath.split(':').slice(1).join(':');
|
|
447
447
|
ret = new golangCompletion_1.GolangProvider(scriptPath, providerOptions);
|
|
448
448
|
}
|
|
449
|
-
else if ((0,
|
|
449
|
+
else if ((0, file_1.isJavascriptFile)(providerPath)) {
|
|
450
450
|
if (providerPath.startsWith('file://')) {
|
|
451
451
|
providerPath = providerPath.slice('file://'.length);
|
|
452
452
|
}
|
|
@@ -459,11 +459,11 @@ async function loadApiProvider(providerPath, context = {}) {
|
|
|
459
459
|
}
|
|
460
460
|
else {
|
|
461
461
|
logger_1.default.error((0, dedent_1.default) `
|
|
462
|
-
Could not identify provider: ${chalk_1.default.bold(providerPath)}.
|
|
463
|
-
|
|
462
|
+
Could not identify provider: ${chalk_1.default.bold(providerPath)}.
|
|
463
|
+
|
|
464
464
|
${chalk_1.default.white((0, dedent_1.default) `
|
|
465
465
|
Please check your configuration and ensure the provider is correctly specified.
|
|
466
|
-
|
|
466
|
+
|
|
467
467
|
For more information on supported providers, visit: `)} ${chalk_1.default.cyan('https://promptfoo.dev/docs/providers/')}
|
|
468
468
|
`);
|
|
469
469
|
process.exit(1);
|