promptfoo 0.91.0 → 0.91.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/package.json +1 -1
- package/dist/src/cache.d.ts +4 -3
- package/dist/src/cache.d.ts.map +1 -1
- package/dist/src/cache.js.map +1 -1
- package/dist/src/main.js +2 -1
- package/dist/src/main.js.map +1 -1
- package/dist/src/python/wrapper.py +5 -1
- package/dist/src/types/providers.d.ts +3 -2
- package/dist/src/types/providers.d.ts.map +1 -1
- package/dist/src/types/providers.js.map +1 -1
- package/dist/src/util/config/default.d.ts +10 -2
- package/dist/src/util/config/default.d.ts.map +1 -1
- package/dist/src/util/config/default.js +18 -5
- package/dist/src/util/config/default.js.map +1 -1
- package/dist/test/util.config.default.test.js +93 -11
- package/dist/test/util.config.default.test.js.map +1 -1
- package/package.json +1 -1
package/dist/package.json
CHANGED
package/dist/src/cache.d.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import cacheManager from 'cache-manager';
|
|
2
2
|
import type { RequestInfo, RequestInit } from 'node-fetch';
|
|
3
3
|
export declare function getCache(): cacheManager.Cache;
|
|
4
|
-
export
|
|
5
|
-
data:
|
|
4
|
+
export type FetchWithCacheResult<T> = {
|
|
5
|
+
data: T;
|
|
6
6
|
cached: boolean;
|
|
7
|
-
}
|
|
7
|
+
};
|
|
8
|
+
export declare function fetchWithCache<T = any>(url: RequestInfo, options: RequestInit | undefined, timeout: number, format?: 'json' | 'text', bust?: boolean): Promise<FetchWithCacheResult<T>>;
|
|
8
9
|
export declare function enableCache(): void;
|
|
9
10
|
export declare function disableCache(): void;
|
|
10
11
|
export declare function clearCache(): Promise<void>;
|
package/dist/src/cache.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAC;AAIzC,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAc3D,wBAAgB,QAAQ,uBAuBvB;AAED,wBAAsB,cAAc,
|
|
1
|
+
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAC;AAIzC,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAc3D,wBAAgB,QAAQ,uBAuBvB;AAED,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI;IACpC,IAAI,EAAE,CAAC,CAAC;IACR,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,wBAAsB,cAAc,CAAC,CAAC,GAAG,GAAG,EAC1C,GAAG,EAAE,WAAW,EAChB,OAAO,EAAE,WAAW,YAAK,EACzB,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,GAAG,MAAe,EAChC,IAAI,GAAE,OAAe,GACpB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CA2DlC;AAED,wBAAgB,WAAW,SAE1B;AAED,wBAAgB,YAAY,SAE3B;AAED,wBAAsB,UAAU,kBAE/B;AAED,wBAAgB,cAAc,YAE7B"}
|
package/dist/src/cache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":";;;;;AAkBA,4BAuBC;
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":"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"}
|
package/dist/src/main.js
CHANGED
|
@@ -51,8 +51,9 @@ async function main() {
|
|
|
51
51
|
(0, show_1.showCommand)(program);
|
|
52
52
|
(0, dataset_1.generateDatasetCommand)(generateCommand, defaultConfig, defaultConfigPath);
|
|
53
53
|
(0, generate_1.redteamGenerateCommand)(generateCommand, 'redteam', defaultConfig, defaultConfigPath);
|
|
54
|
+
const { defaultConfig: redteamConfig, defaultConfigPath: redteamConfigPath } = await (0, default_1.loadDefaultConfig)(undefined, 'redteam');
|
|
54
55
|
(0, init_2.initCommand)(redteamBaseCommand);
|
|
55
|
-
(0, eval_1.evalCommand)(redteamBaseCommand, defaultConfig, defaultConfigPath);
|
|
56
|
+
(0, eval_1.evalCommand)(redteamBaseCommand, redteamConfig ?? defaultConfig, redteamConfigPath ?? defaultConfigPath);
|
|
56
57
|
(0, generate_1.redteamGenerateCommand)(redteamBaseCommand, 'generate', defaultConfig, defaultConfigPath);
|
|
57
58
|
(0, run_1.redteamRunCommand)(redteamBaseCommand);
|
|
58
59
|
(0, report_1.redteamReportCommand)(redteamBaseCommand);
|
package/dist/src/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";;;AACA,yCAAoC;AACpC,kDAA0C;AAC1C,yDAAsD;AACtD,0CAA8C;AAC9C,4CAAgD;AAChD,8CAAkD;AAClD,8CAAkD;AAClD,0CAA8C;AAC9C,8CAAkD;AAClD,kDAAsD;AACtD,yDAAqE;AACrE,8CAAkD;AAClD,0CAA8C;AAC9C,0CAA8C;AAC9C,4CAAgD;AAChD,0CAA8C;AAC9C,0CAA8C;AAC9C,uCAA4C;AAC5C,0DAAqE;AACrE,kDAA4E;AAC5E,wDAAqF;AACrF,sDAAiE;AACjE,gDAA2D;AAC3D,uCAA4C;AAC5C,mDAA0D;AAE1D,KAAK,UAAU,IAAI;IACjB,MAAM,IAAA,yBAAe,GAAE,CAAC;IACxB,MAAM,IAAA,yBAAe,GAAE,CAAC;IAExB,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,2BAAiB,GAAE,CAAC;IAEvE,MAAM,OAAO,GAAG,IAAI,mBAAO,CAAC,WAAW,CAAC,CAAC;IACzC,OAAO,CAAC,OAAO,CAAC,sBAAO,CAAC,CAAC;IAEzB,gBAAgB;IAChB,IAAA,kBAAW,EAAC,OAAO,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;IACvD,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC;IACrB,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC;IACrB,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,2BAA2B,CAAC,CAAC;IAC/F,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;IAEtB,qBAAqB;IACrB,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC;IACrB,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;IACtB,IAAA,sBAAa,EAAC,OAAO,CAAC,CAAC;IACvB,IAAA,sBAAa,EAAC,OAAO,CAAC,CAAC;IACvB,IAAA,sBAAa,EAAC,OAAO,CAAC,CAAC;IACvB,IAAA,0BAAe,EAAC,OAAO,CAAC,CAAC;IACzB,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC;IAC3F,IAAA,sBAAa,EAAC,OAAO,CAAC,CAAC;IACvB,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC;IACrB,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC;IAErB,IAAA,gCAAsB,EAAC,eAAe,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;IAC1E,IAAA,iCAAsB,EAAC,eAAe,EAAE,SAAS,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;IAErF,IAAA,kBAAkB,EAAC,kBAAkB,CAAC,CAAC;IACvC,IAAA,kBAAW,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";;;AACA,yCAAoC;AACpC,kDAA0C;AAC1C,yDAAsD;AACtD,0CAA8C;AAC9C,4CAAgD;AAChD,8CAAkD;AAClD,8CAAkD;AAClD,0CAA8C;AAC9C,8CAAkD;AAClD,kDAAsD;AACtD,yDAAqE;AACrE,8CAAkD;AAClD,0CAA8C;AAC9C,0CAA8C;AAC9C,4CAAgD;AAChD,0CAA8C;AAC9C,0CAA8C;AAC9C,uCAA4C;AAC5C,0DAAqE;AACrE,kDAA4E;AAC5E,wDAAqF;AACrF,sDAAiE;AACjE,gDAA2D;AAC3D,uCAA4C;AAC5C,mDAA0D;AAE1D,KAAK,UAAU,IAAI;IACjB,MAAM,IAAA,yBAAe,GAAE,CAAC;IACxB,MAAM,IAAA,yBAAe,GAAE,CAAC;IAExB,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,2BAAiB,GAAE,CAAC;IAEvE,MAAM,OAAO,GAAG,IAAI,mBAAO,CAAC,WAAW,CAAC,CAAC;IACzC,OAAO,CAAC,OAAO,CAAC,sBAAO,CAAC,CAAC;IAEzB,gBAAgB;IAChB,IAAA,kBAAW,EAAC,OAAO,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;IACvD,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC;IACrB,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC;IACrB,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,2BAA2B,CAAC,CAAC;IAC/F,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;IAEtB,qBAAqB;IACrB,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC;IACrB,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;IACtB,IAAA,sBAAa,EAAC,OAAO,CAAC,CAAC;IACvB,IAAA,sBAAa,EAAC,OAAO,CAAC,CAAC;IACvB,IAAA,sBAAa,EAAC,OAAO,CAAC,CAAC;IACvB,IAAA,0BAAe,EAAC,OAAO,CAAC,CAAC;IACzB,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC;IAC3F,IAAA,sBAAa,EAAC,OAAO,CAAC,CAAC;IACvB,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC;IACrB,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC;IAErB,IAAA,gCAAsB,EAAC,eAAe,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;IAC1E,IAAA,iCAAsB,EAAC,eAAe,EAAE,SAAS,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;IAErF,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,GAC1E,MAAM,IAAA,2BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAEhD,IAAA,kBAAkB,EAAC,kBAAkB,CAAC,CAAC;IACvC,IAAA,kBAAW,EACT,kBAAkB,EAClB,aAAa,IAAI,aAAa,EAC9B,iBAAiB,IAAI,iBAAiB,CACvC,CAAC;IACF,IAAA,iCAAsB,EAAC,kBAAkB,EAAE,UAAU,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;IACzF,IAAA,uBAAiB,EAAC,kBAAkB,CAAC,CAAC;IACtC,IAAA,6BAAoB,EAAC,kBAAkB,CAAC,CAAC;IACzC,IAAA,wBAAqB,EAAC,kBAAkB,CAAC,CAAC;IAE1C,OAAO,CAAC,KAAK,EAAE,CAAC;AAClB,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IAC5B,IAAA,mCAAgB,GAAE,CAAC;IACnB,IAAI,EAAE,CAAC;AACT,CAAC"}
|
|
@@ -17,7 +17,11 @@ def call_method(script_path, method_name, *args):
|
|
|
17
17
|
script_module = importlib.util.module_from_spec(spec)
|
|
18
18
|
spec.loader.exec_module(script_module)
|
|
19
19
|
|
|
20
|
-
|
|
20
|
+
if "." in method_name:
|
|
21
|
+
class_name, classmethod_name = method_name.split(".")
|
|
22
|
+
method_to_call = getattr(getattr(script_module, class_name), classmethod_name)
|
|
23
|
+
else:
|
|
24
|
+
method_to_call = getattr(script_module, method_name)
|
|
21
25
|
if asyncio.iscoroutinefunction(method_to_call):
|
|
22
26
|
return asyncio.run(method_to_call(*args))
|
|
23
27
|
else:
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type winston from 'winston';
|
|
1
2
|
import type { Prompt } from './prompts';
|
|
2
3
|
import type { NunjucksFilterMap, TokenUsage } from './shared';
|
|
3
4
|
export type ProviderId = string;
|
|
@@ -28,8 +29,8 @@ export interface CallApiContextParams {
|
|
|
28
29
|
fetchWithCache?: any;
|
|
29
30
|
filters?: NunjucksFilterMap;
|
|
30
31
|
getCache?: any;
|
|
31
|
-
logger?:
|
|
32
|
-
originalProvider?:
|
|
32
|
+
logger?: winston.Logger;
|
|
33
|
+
originalProvider?: ApiProvider;
|
|
33
34
|
prompt: Prompt;
|
|
34
35
|
vars: Record<string, string | object>;
|
|
35
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../../src/types/providers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE9D,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC;AAChC,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC;AACnC,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;AACtD,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;AAErE,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,gBAAgB,GAAG,MAAM,GAAG,YAAY,CAAC;AAElF,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,eAAe,GAAG,WAAW,CAAC,CAAC,CAAC;AAEpG,MAAM,WAAW,0BAA0B;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,YAAY,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,MAAM,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../../src/types/providers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../../src/types/providers.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../../src/types/providers.ts"],"names":[],"mappings":";;AA2JA,sCAOC;AAED,8CAOC;AAhBD,SAAgB,aAAa,CAAC,QAAa;IACzC,OAAO,CACL,OAAO,QAAQ,KAAK,QAAQ;QAC5B,QAAQ,IAAI,IAAI;QAChB,IAAI,IAAI,QAAQ;QAChB,OAAO,QAAQ,CAAC,EAAE,KAAK,UAAU,CAClC,CAAC;AACJ,CAAC;AAED,SAAgB,iBAAiB,CAAC,QAAa;IAC7C,OAAO,CACL,OAAO,QAAQ,KAAK,QAAQ;QAC5B,QAAQ,IAAI,IAAI;QAChB,IAAI,IAAI,QAAQ;QAChB,OAAO,QAAQ,CAAC,EAAE,KAAK,QAAQ,CAChC,CAAC;AACJ,CAAC"}
|
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
import type { UnifiedConfig } from '../../types';
|
|
2
|
+
/**
|
|
3
|
+
* Cache to store loaded configurations for different directories.
|
|
4
|
+
*/
|
|
5
|
+
export declare const configCache: Map<string, {
|
|
6
|
+
defaultConfig: Partial<UnifiedConfig>;
|
|
7
|
+
defaultConfigPath: string | undefined;
|
|
8
|
+
}>;
|
|
2
9
|
/**
|
|
3
10
|
* Loads the default configuration file from the specified directory.
|
|
4
11
|
*
|
|
5
12
|
* @param dir - The directory to search for configuration files. Defaults to the current working directory.
|
|
13
|
+
* @param configName - The name of the configuration file to load. Defaults to 'promptfooconfig'.
|
|
6
14
|
* @returns A promise that resolves to an object containing the default configuration and its file path.
|
|
7
|
-
*
|
|
15
|
+
* The default configuration is partial, and the file path may be undefined if no configuration is found.
|
|
8
16
|
*/
|
|
9
|
-
export declare function loadDefaultConfig(dir?: string): Promise<{
|
|
17
|
+
export declare function loadDefaultConfig(dir?: string, configName?: string): Promise<{
|
|
10
18
|
defaultConfig: Partial<UnifiedConfig>;
|
|
11
19
|
defaultConfigPath: string | undefined;
|
|
12
20
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../../../../src/util/config/default.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD
|
|
1
|
+
{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../../../../src/util/config/default.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD;;GAEG;AACH,eAAO,MAAM,WAAW;mBAEL,OAAO,CAAC,aAAa,CAAC;uBAAqB,MAAM,GAAG,SAAS;EAC7E,CAAC;AAEJ;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,CAAC,EAAE,MAAM,EACZ,UAAU,GAAE,MAA0B,GACrC,OAAO,CAAC;IACT,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IACtC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;CACvC,CAAC,CA4BD"}
|
|
@@ -3,31 +3,44 @@ 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.configCache = void 0;
|
|
6
7
|
exports.loadDefaultConfig = loadDefaultConfig;
|
|
7
8
|
const path_1 = __importDefault(require("path"));
|
|
8
9
|
const load_1 = require("./load");
|
|
10
|
+
/**
|
|
11
|
+
* Cache to store loaded configurations for different directories.
|
|
12
|
+
*/
|
|
13
|
+
exports.configCache = new Map();
|
|
9
14
|
/**
|
|
10
15
|
* Loads the default configuration file from the specified directory.
|
|
11
16
|
*
|
|
12
17
|
* @param dir - The directory to search for configuration files. Defaults to the current working directory.
|
|
18
|
+
* @param configName - The name of the configuration file to load. Defaults to 'promptfooconfig'.
|
|
13
19
|
* @returns A promise that resolves to an object containing the default configuration and its file path.
|
|
14
|
-
*
|
|
20
|
+
* The default configuration is partial, and the file path may be undefined if no configuration is found.
|
|
15
21
|
*/
|
|
16
|
-
async function loadDefaultConfig(dir) {
|
|
22
|
+
async function loadDefaultConfig(dir, configName = 'promptfooconfig') {
|
|
17
23
|
dir = dir || process.cwd();
|
|
24
|
+
// Check if the result is already cached
|
|
25
|
+
const cacheKey = `${dir}:${configName}`;
|
|
26
|
+
if (exports.configCache.has(cacheKey)) {
|
|
27
|
+
return exports.configCache.get(cacheKey);
|
|
28
|
+
}
|
|
18
29
|
let defaultConfig = {};
|
|
19
30
|
let defaultConfigPath;
|
|
20
31
|
// NOTE: sorted by frequency of use
|
|
21
32
|
const extensions = ['yaml', 'yml', 'json', 'cjs', 'cts', 'js', 'mjs', 'mts', 'ts'];
|
|
22
33
|
for (const ext of extensions) {
|
|
23
|
-
const configPath = path_1.default.join(dir,
|
|
34
|
+
const configPath = path_1.default.join(dir, `${configName}.${ext}`);
|
|
24
35
|
const maybeConfig = await (0, load_1.maybeReadConfig)(configPath);
|
|
25
36
|
if (maybeConfig) {
|
|
26
37
|
defaultConfig = maybeConfig;
|
|
27
38
|
defaultConfigPath = configPath;
|
|
28
|
-
|
|
39
|
+
break;
|
|
29
40
|
}
|
|
30
41
|
}
|
|
31
|
-
|
|
42
|
+
const result = { defaultConfig, defaultConfigPath };
|
|
43
|
+
exports.configCache.set(cacheKey, result);
|
|
44
|
+
return result;
|
|
32
45
|
}
|
|
33
46
|
//# sourceMappingURL=default.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../../../src/util/config/default.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../../../src/util/config/default.ts"],"names":[],"mappings":";;;;;;AAoBA,8CAkCC;AAtDD,gDAAwB;AAExB,iCAAyC;AAEzC;;GAEG;AACU,QAAA,WAAW,GAAG,IAAI,GAAG,EAG/B,CAAC;AAEJ;;;;;;;GAOG;AACI,KAAK,UAAU,iBAAiB,CACrC,GAAY,EACZ,aAAqB,iBAAiB;IAKtC,GAAG,GAAG,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAE3B,wCAAwC;IACxC,MAAM,QAAQ,GAAG,GAAG,GAAG,IAAI,UAAU,EAAE,CAAC;IACxC,IAAI,mBAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9B,OAAO,mBAAW,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC;IACpC,CAAC;IAED,IAAI,aAAa,GAA2B,EAAE,CAAC;IAC/C,IAAI,iBAAqC,CAAC;IAE1C,mCAAmC;IACnC,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAEnF,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,IAAI,GAAG,EAAE,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,MAAM,IAAA,sBAAe,EAAC,UAAU,CAAC,CAAC;QACtD,IAAI,WAAW,EAAE,CAAC;YAChB,aAAa,GAAG,WAAW,CAAC;YAC5B,iBAAiB,GAAG,UAAU,CAAC;YAC/B,MAAM;QACR,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,EAAE,aAAa,EAAE,iBAAiB,EAAE,CAAC;IACpD,mBAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -12,15 +12,18 @@ jest.mock('../src/util/config/load', () => ({
|
|
|
12
12
|
describe('loadDefaultConfig', () => {
|
|
13
13
|
beforeEach(() => {
|
|
14
14
|
jest.resetAllMocks();
|
|
15
|
-
jest.spyOn(process, 'cwd').mockImplementation()
|
|
15
|
+
jest.spyOn(process, 'cwd').mockImplementation(() => '/test/path');
|
|
16
|
+
default_1.configCache.clear();
|
|
16
17
|
});
|
|
17
18
|
it('should return empty config when no config file is found', async () => {
|
|
18
19
|
jest.mocked(load_1.maybeReadConfig).mockResolvedValue(undefined);
|
|
19
|
-
await
|
|
20
|
+
const result = await (0, default_1.loadDefaultConfig)();
|
|
21
|
+
expect(result).toEqual({
|
|
20
22
|
defaultConfig: {},
|
|
21
23
|
defaultConfigPath: undefined,
|
|
22
24
|
});
|
|
23
|
-
expect(load_1.maybeReadConfig).toHaveBeenCalledTimes(9);
|
|
25
|
+
expect(load_1.maybeReadConfig).toHaveBeenCalledTimes(9);
|
|
26
|
+
expect(load_1.maybeReadConfig).toHaveBeenNthCalledWith(1, path_1.default.normalize('/test/path/promptfooconfig.yaml'));
|
|
24
27
|
});
|
|
25
28
|
it('should return the first valid config file found', async () => {
|
|
26
29
|
const mockConfig = { prompts: ['Some prompt'], providers: [], tests: [] };
|
|
@@ -29,29 +32,108 @@ describe('loadDefaultConfig', () => {
|
|
|
29
32
|
.mockResolvedValueOnce(undefined)
|
|
30
33
|
.mockResolvedValueOnce(undefined)
|
|
31
34
|
.mockResolvedValueOnce(mockConfig);
|
|
32
|
-
await
|
|
35
|
+
const result = await (0, default_1.loadDefaultConfig)();
|
|
36
|
+
expect(result).toEqual({
|
|
33
37
|
defaultConfig: mockConfig,
|
|
34
38
|
defaultConfigPath: path_1.default.normalize('/test/path/promptfooconfig.json'),
|
|
35
39
|
});
|
|
36
40
|
expect(load_1.maybeReadConfig).toHaveBeenCalledTimes(3);
|
|
37
41
|
});
|
|
38
|
-
it('should
|
|
39
|
-
|
|
42
|
+
it('should stop checking extensions after finding a valid config', async () => {
|
|
43
|
+
const mockConfig = { prompts: ['Some prompt'], providers: [], tests: [] };
|
|
44
|
+
jest.mocked(load_1.maybeReadConfig).mockResolvedValueOnce(undefined).mockResolvedValueOnce(mockConfig);
|
|
40
45
|
await (0, default_1.loadDefaultConfig)();
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
});
|
|
46
|
+
expect(load_1.maybeReadConfig).toHaveBeenCalledTimes(2);
|
|
47
|
+
expect(load_1.maybeReadConfig).toHaveBeenNthCalledWith(1, path_1.default.normalize('/test/path/promptfooconfig.yaml'));
|
|
48
|
+
expect(load_1.maybeReadConfig).toHaveBeenNthCalledWith(2, path_1.default.normalize('/test/path/promptfooconfig.yml'));
|
|
45
49
|
});
|
|
46
50
|
it('should use provided directory when specified', async () => {
|
|
47
51
|
const mockConfig = { prompts: ['Some prompt'], providers: [], tests: [] };
|
|
48
52
|
jest.mocked(load_1.maybeReadConfig).mockResolvedValueOnce(mockConfig);
|
|
49
53
|
const customDir = '/custom/directory';
|
|
50
|
-
await
|
|
54
|
+
const result = await (0, default_1.loadDefaultConfig)(customDir);
|
|
55
|
+
expect(result).toEqual({
|
|
51
56
|
defaultConfig: mockConfig,
|
|
52
57
|
defaultConfigPath: path_1.default.join(customDir, 'promptfooconfig.yaml'),
|
|
53
58
|
});
|
|
54
59
|
expect(load_1.maybeReadConfig).toHaveBeenCalledWith(path_1.default.join(customDir, 'promptfooconfig.yaml'));
|
|
55
60
|
});
|
|
61
|
+
it('should use custom config name when provided', async () => {
|
|
62
|
+
const mockConfig = { prompts: ['Custom config'], providers: [], tests: [] };
|
|
63
|
+
jest.mocked(load_1.maybeReadConfig).mockResolvedValueOnce(mockConfig);
|
|
64
|
+
const result = await (0, default_1.loadDefaultConfig)(undefined, 'redteam');
|
|
65
|
+
expect(result).toEqual({
|
|
66
|
+
defaultConfig: mockConfig,
|
|
67
|
+
defaultConfigPath: path_1.default.normalize('/test/path/redteam.yaml'),
|
|
68
|
+
});
|
|
69
|
+
expect(load_1.maybeReadConfig).toHaveBeenCalledWith(path_1.default.normalize('/test/path/redteam.yaml'));
|
|
70
|
+
});
|
|
71
|
+
it('should use different caches for different config names', async () => {
|
|
72
|
+
const mockConfig1 = { prompts: ['Config 1'], providers: [], tests: [] };
|
|
73
|
+
const mockConfig2 = { prompts: ['Config 2'], providers: [], tests: [] };
|
|
74
|
+
jest
|
|
75
|
+
.mocked(load_1.maybeReadConfig)
|
|
76
|
+
.mockResolvedValueOnce(mockConfig1)
|
|
77
|
+
.mockResolvedValueOnce(mockConfig2);
|
|
78
|
+
const result1 = await (0, default_1.loadDefaultConfig)(undefined, 'promptfooconfig');
|
|
79
|
+
const result2 = await (0, default_1.loadDefaultConfig)(undefined, 'redteam');
|
|
80
|
+
expect(result1).not.toEqual(result2);
|
|
81
|
+
expect(result1.defaultConfig).toEqual(mockConfig1);
|
|
82
|
+
expect(result2.defaultConfig).toEqual(mockConfig2);
|
|
83
|
+
const cachedResult1 = await (0, default_1.loadDefaultConfig)(undefined, 'promptfooconfig');
|
|
84
|
+
const cachedResult2 = await (0, default_1.loadDefaultConfig)(undefined, 'redteam');
|
|
85
|
+
expect(cachedResult1).toEqual(result1);
|
|
86
|
+
expect(cachedResult2).toEqual(result2);
|
|
87
|
+
expect(load_1.maybeReadConfig).toHaveBeenCalledTimes(2);
|
|
88
|
+
});
|
|
89
|
+
it('should use different caches for different directories', async () => {
|
|
90
|
+
const mockConfig1 = { prompts: ['Config 1'], providers: [], tests: [] };
|
|
91
|
+
const mockConfig2 = { prompts: ['Config 2'], providers: [], tests: [] };
|
|
92
|
+
jest
|
|
93
|
+
.mocked(load_1.maybeReadConfig)
|
|
94
|
+
.mockResolvedValueOnce(mockConfig1)
|
|
95
|
+
.mockResolvedValueOnce(mockConfig2);
|
|
96
|
+
const dir1 = '/dir1';
|
|
97
|
+
const dir2 = '/dir2';
|
|
98
|
+
const result1 = await (0, default_1.loadDefaultConfig)(dir1);
|
|
99
|
+
const result2 = await (0, default_1.loadDefaultConfig)(dir2);
|
|
100
|
+
expect(result1).not.toEqual(result2);
|
|
101
|
+
expect(result1.defaultConfig).toEqual(mockConfig1);
|
|
102
|
+
expect(result2.defaultConfig).toEqual(mockConfig2);
|
|
103
|
+
const cachedResult1 = await (0, default_1.loadDefaultConfig)(dir1);
|
|
104
|
+
const cachedResult2 = await (0, default_1.loadDefaultConfig)(dir2);
|
|
105
|
+
expect(cachedResult1).toEqual(result1);
|
|
106
|
+
expect(cachedResult2).toEqual(result2);
|
|
107
|
+
expect(load_1.maybeReadConfig).toHaveBeenCalledTimes(2);
|
|
108
|
+
});
|
|
109
|
+
it('should use cache for subsequent calls with same parameters', async () => {
|
|
110
|
+
const mockConfig = { prompts: ['Cached config'], providers: [], tests: [] };
|
|
111
|
+
jest.mocked(load_1.maybeReadConfig).mockResolvedValueOnce(mockConfig);
|
|
112
|
+
const result1 = await (0, default_1.loadDefaultConfig)();
|
|
113
|
+
const result2 = await (0, default_1.loadDefaultConfig)();
|
|
114
|
+
expect(result1).toEqual(result2);
|
|
115
|
+
expect(load_1.maybeReadConfig).toHaveBeenCalledTimes(1);
|
|
116
|
+
});
|
|
117
|
+
it('should handle errors when reading config files', async () => {
|
|
118
|
+
jest.mocked(load_1.maybeReadConfig).mockRejectedValue(new Error('Permission denied'));
|
|
119
|
+
await expect((0, default_1.loadDefaultConfig)()).rejects.toThrow('Permission denied');
|
|
120
|
+
});
|
|
121
|
+
it('should handle various config names', async () => {
|
|
122
|
+
const mockConfig = { prompts: ['Test config'], providers: [], tests: [] };
|
|
123
|
+
jest.mocked(load_1.maybeReadConfig).mockResolvedValue(mockConfig);
|
|
124
|
+
const configNames = ['test1', 'test2', 'test3'];
|
|
125
|
+
for (const name of configNames) {
|
|
126
|
+
const result = await (0, default_1.loadDefaultConfig)(undefined, name);
|
|
127
|
+
expect(result.defaultConfigPath).toContain(name);
|
|
128
|
+
}
|
|
129
|
+
});
|
|
130
|
+
it('should handle interaction between configName and directory', async () => {
|
|
131
|
+
const mockConfig = { prompts: ['Combined config'], providers: [], tests: [] };
|
|
132
|
+
jest.mocked(load_1.maybeReadConfig).mockResolvedValue(mockConfig);
|
|
133
|
+
const customDir = '/custom/dir';
|
|
134
|
+
const customName = 'customconfig';
|
|
135
|
+
const result = await (0, default_1.loadDefaultConfig)(customDir, customName);
|
|
136
|
+
expect(result.defaultConfigPath).toEqual(path_1.default.join(customDir, `${customName}.yaml`));
|
|
137
|
+
});
|
|
56
138
|
});
|
|
57
139
|
//# sourceMappingURL=util.config.default.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.config.default.test.js","sourceRoot":"","sources":["../../test/util.config.default.test.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"util.config.default.test.js","sourceRoot":"","sources":["../../test/util.config.default.test.ts"],"names":[],"mappings":"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"}
|