promptfoo 0.103.3 → 0.103.5
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/LICENSE +10 -1
- package/dist/package.json +13 -13
- package/dist/src/app/assets/index-BR1tgrAf.css +1 -0
- package/dist/src/app/assets/{index-XXoiz61D.js → index-CmPQAxfe.js} +276 -276
- package/dist/src/app/assets/{index.es-DTKpmNcZ.js → index.es-DfqJ7zdu.js} +1 -1
- package/dist/src/app/assets/{sync-ClbHj3jr.js → sync-C-aW1Mpw.js} +1 -1
- package/dist/src/app/index.html +2 -2
- package/dist/src/assertions/index.d.ts +3 -2
- package/dist/src/assertions/index.d.ts.map +1 -1
- package/dist/src/assertions/index.js +21 -6
- package/dist/src/assertions/index.js.map +1 -1
- package/dist/src/assertions/utils.d.ts +6 -2
- package/dist/src/assertions/utils.d.ts.map +1 -1
- package/dist/src/commands/eval/filterErrorTests.d.ts +5 -0
- package/dist/src/commands/eval/filterErrorTests.d.ts.map +1 -0
- package/dist/src/commands/eval/filterErrorTests.js +19 -0
- package/dist/src/commands/eval/filterErrorTests.js.map +1 -0
- package/dist/src/commands/eval/filterTests.d.ts +1 -0
- package/dist/src/commands/eval/filterTests.d.ts.map +1 -1
- package/dist/src/commands/eval/filterTests.js +4 -0
- package/dist/src/commands/eval/filterTests.js.map +1 -1
- package/dist/src/commands/eval.d.ts.map +1 -1
- package/dist/src/commands/eval.js +1 -0
- package/dist/src/commands/eval.js.map +1 -1
- package/dist/src/database/tables.d.ts +51 -12
- package/dist/src/database/tables.d.ts.map +1 -1
- package/dist/src/envars.d.ts +1 -0
- package/dist/src/envars.d.ts.map +1 -1
- package/dist/src/envars.js.map +1 -1
- package/dist/src/evaluator.d.ts.map +1 -1
- package/dist/src/evaluator.js +1 -0
- package/dist/src/evaluator.js.map +1 -1
- package/dist/src/fetch.d.ts.map +1 -1
- package/dist/src/fetch.js +20 -3
- package/dist/src/fetch.js.map +1 -1
- package/dist/src/models/evalResult.d.ts.map +1 -1
- package/dist/src/models/evalResult.js +9 -1
- package/dist/src/models/evalResult.js.map +1 -1
- package/dist/src/providers/browser.js +1 -1
- package/dist/src/providers/browser.js.map +1 -1
- package/dist/src/providers/defaults.d.ts +1 -0
- package/dist/src/providers/defaults.d.ts.map +1 -1
- package/dist/src/providers/defaults.js +11 -0
- package/dist/src/providers/defaults.js.map +1 -1
- package/dist/src/providers/http.d.ts.map +1 -1
- package/dist/src/providers/http.js +39 -63
- package/dist/src/providers/http.js.map +1 -1
- package/dist/src/providers/llama.d.ts.map +1 -1
- package/dist/src/providers/llama.js +8 -1
- package/dist/src/providers/llama.js.map +1 -1
- package/dist/src/providers/openai.d.ts.map +1 -1
- package/dist/src/providers/openai.js +6 -13
- package/dist/src/providers/openai.js.map +1 -1
- package/dist/src/providers/watsonx.d.ts.map +1 -1
- package/dist/src/providers/watsonx.js +9 -0
- package/dist/src/providers/watsonx.js.map +1 -1
- package/dist/src/providers.d.ts.map +1 -1
- package/dist/src/providers.js +15 -0
- package/dist/src/providers.js.map +1 -1
- package/dist/src/redteam/commands/generate.d.ts.map +1 -1
- package/dist/src/redteam/commands/generate.js +4 -0
- package/dist/src/redteam/commands/generate.js.map +1 -1
- package/dist/src/redteam/constants.d.ts +4 -2
- package/dist/src/redteam/constants.d.ts.map +1 -1
- package/dist/src/redteam/constants.js +11 -7
- package/dist/src/redteam/constants.js.map +1 -1
- package/dist/src/redteam/plugins/base.d.ts.map +1 -1
- package/dist/src/redteam/plugins/base.js +3 -0
- package/dist/src/redteam/plugins/base.js.map +1 -1
- package/dist/src/redteam/plugins/cyberseceval.d.ts.map +1 -1
- package/dist/src/redteam/plugins/cyberseceval.js +13 -3
- package/dist/src/redteam/plugins/cyberseceval.js.map +1 -1
- package/dist/src/redteam/providers/crescendo/index.d.ts +1 -0
- package/dist/src/redteam/providers/crescendo/index.d.ts.map +1 -1
- package/dist/src/redteam/providers/crescendo/index.js +58 -3
- package/dist/src/redteam/providers/crescendo/index.js.map +1 -1
- package/dist/src/redteam/providers/iterative.d.ts.map +1 -1
- package/dist/src/redteam/providers/iterative.js +59 -5
- package/dist/src/redteam/providers/iterative.js.map +1 -1
- package/dist/src/redteam/providers/iterativeImage.d.ts +6 -2
- package/dist/src/redteam/providers/iterativeImage.d.ts.map +1 -1
- package/dist/src/redteam/providers/iterativeImage.js +322 -131
- package/dist/src/redteam/providers/iterativeImage.js.map +1 -1
- package/dist/src/redteam/providers/iterativeTree.d.ts +37 -26
- package/dist/src/redteam/providers/iterativeTree.d.ts.map +1 -1
- package/dist/src/redteam/providers/iterativeTree.js +193 -85
- package/dist/src/redteam/providers/iterativeTree.js.map +1 -1
- package/dist/src/redteam/shared.d.ts.map +1 -1
- package/dist/src/redteam/shared.js +4 -1
- package/dist/src/redteam/shared.js.map +1 -1
- package/dist/src/server/routes/providers.js +11 -6
- package/dist/src/server/routes/providers.js.map +1 -1
- package/dist/src/types/env.d.ts +3 -0
- package/dist/src/types/env.d.ts.map +1 -1
- package/dist/src/types/index.d.ts +1376 -351
- package/dist/src/types/index.d.ts.map +1 -1
- package/dist/src/types/index.js +4 -1
- package/dist/src/types/index.js.map +1 -1
- package/dist/src/types/providers.d.ts +22 -0
- package/dist/src/types/providers.d.ts.map +1 -1
- package/dist/src/types/providers.js.map +1 -1
- package/dist/src/util/config/manage.d.ts +1 -1
- package/dist/src/util/config/manage.d.ts.map +1 -1
- package/dist/src/util/config/manage.js.map +1 -1
- package/dist/src/util/convertEvalResultsToTable.d.ts.map +1 -1
- package/dist/src/util/convertEvalResultsToTable.js +14 -0
- package/dist/src/util/convertEvalResultsToTable.js.map +1 -1
- package/dist/src/util/index.d.ts +12 -4
- package/dist/src/util/index.d.ts.map +1 -1
- package/dist/src/validators/providers.d.ts +71 -2
- package/dist/src/validators/providers.d.ts.map +1 -1
- package/dist/src/validators/providers.js +3 -0
- package/dist/src/validators/providers.js.map +1 -1
- package/dist/src/validators/redteam.d.ts +24 -0
- package/dist/src/validators/redteam.d.ts.map +1 -1
- package/dist/test/assertions/index.test.js +26 -475
- package/dist/test/assertions/index.test.js.map +1 -1
- package/dist/test/assertions/javascript.test.d.ts +2 -0
- package/dist/test/assertions/javascript.test.d.ts.map +1 -0
- package/dist/test/assertions/javascript.test.js +679 -0
- package/dist/test/assertions/javascript.test.js.map +1 -0
- package/dist/test/assertions/python.test.d.ts +2 -0
- package/dist/test/assertions/python.test.d.ts.map +1 -0
- package/dist/test/assertions/python.test.js +377 -0
- package/dist/test/assertions/python.test.js.map +1 -0
- package/dist/test/cache.test.js +297 -100
- package/dist/test/cache.test.js.map +1 -1
- package/dist/test/commands/eval/filterErrorTests.test.d.ts +2 -0
- package/dist/test/commands/eval/filterErrorTests.test.d.ts.map +1 -0
- package/dist/test/commands/eval/filterErrorTests.test.js +110 -0
- package/dist/test/commands/eval/filterErrorTests.test.js.map +1 -0
- package/dist/test/evaluator.test.js +10 -0
- package/dist/test/evaluator.test.js.map +1 -1
- package/dist/test/factories/evalFactory.d.ts +39 -8
- package/dist/test/factories/evalFactory.d.ts.map +1 -1
- package/dist/test/fetch.test.js +147 -19
- package/dist/test/fetch.test.js.map +1 -1
- package/dist/test/models/eval.test.js +12 -0
- package/dist/test/models/eval.test.js.map +1 -1
- package/dist/test/providers/defaults.test.d.ts +2 -0
- package/dist/test/providers/defaults.test.d.ts.map +1 -0
- package/dist/test/providers/defaults.test.js +77 -0
- package/dist/test/providers/defaults.test.js.map +1 -0
- package/dist/test/providers/http.test.js +65 -9
- package/dist/test/providers/http.test.js.map +1 -1
- package/dist/test/providers/index.test.js +6 -3
- package/dist/test/providers/index.test.js.map +1 -1
- package/dist/test/providers/mistral.test.js +28 -19
- package/dist/test/providers/mistral.test.js.map +1 -1
- package/dist/test/providers/watsonx.test.js +58 -0
- package/dist/test/providers/watsonx.test.js.map +1 -1
- package/dist/test/redteam/providers/iterativeTree.test.js +329 -98
- package/dist/test/redteam/providers/iterativeTree.test.js.map +1 -1
- package/dist/test/server/providers.test.js +4 -4
- package/dist/test/server/providers.test.js.map +1 -1
- package/dist/test/util/config/main.test.js +3 -0
- package/dist/test/util/config/main.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +13 -13
- package/dist/src/app/assets/index-DdUNCsxz.css +0 -1
package/dist/test/cache.test.js
CHANGED
|
@@ -1,130 +1,327 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
2
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
const fs_1 = __importDefault(require("fs"));
|
|
3
40
|
const cache_1 = require("../src/cache");
|
|
41
|
+
jest.mock('../src/logger', () => ({
|
|
42
|
+
debug: jest.fn(),
|
|
43
|
+
info: jest.fn(),
|
|
44
|
+
}));
|
|
45
|
+
jest.mock('../src/util/config/manage', () => ({
|
|
46
|
+
getConfigDirectoryPath: jest.fn().mockReturnValue('/mock/config/path'),
|
|
47
|
+
}));
|
|
48
|
+
jest.mock('../src/fetch', () => ({
|
|
49
|
+
fetchWithRetries: jest.fn(),
|
|
50
|
+
}));
|
|
51
|
+
// Mock fetch with retries
|
|
52
|
+
jest.mock('../src/fetch', () => ({
|
|
53
|
+
fetchWithRetries: jest.fn().mockImplementation(async (url, options) => {
|
|
54
|
+
const result = await global.fetch(url, options);
|
|
55
|
+
return result;
|
|
56
|
+
}),
|
|
57
|
+
}));
|
|
58
|
+
// Mock cache-manager
|
|
59
|
+
jest.mock('cache-manager', () => ({
|
|
60
|
+
caching: jest.fn().mockImplementation(({ store }) => {
|
|
61
|
+
const cache = new Map();
|
|
62
|
+
return {
|
|
63
|
+
store: {
|
|
64
|
+
name: store === 'memory' ? 'memory' : 'fs-hash',
|
|
65
|
+
},
|
|
66
|
+
get: jest.fn().mockImplementation((key) => cache.get(key)),
|
|
67
|
+
set: jest.fn().mockImplementation((key, value) => {
|
|
68
|
+
cache.set(key, value);
|
|
69
|
+
return Promise.resolve();
|
|
70
|
+
}),
|
|
71
|
+
del: jest.fn().mockImplementation((key) => {
|
|
72
|
+
cache.delete(key);
|
|
73
|
+
return Promise.resolve();
|
|
74
|
+
}),
|
|
75
|
+
reset: jest.fn().mockImplementation(() => {
|
|
76
|
+
cache.clear();
|
|
77
|
+
return Promise.resolve();
|
|
78
|
+
}),
|
|
79
|
+
wrap: jest.fn().mockImplementation(async (key, fn) => {
|
|
80
|
+
const existing = cache.get(key);
|
|
81
|
+
if (existing) {
|
|
82
|
+
return existing;
|
|
83
|
+
}
|
|
84
|
+
const value = await fn();
|
|
85
|
+
cache.set(key, value);
|
|
86
|
+
return value;
|
|
87
|
+
}),
|
|
88
|
+
};
|
|
89
|
+
}),
|
|
90
|
+
}));
|
|
4
91
|
const mockedFetch = jest.mocked(jest.fn());
|
|
5
92
|
global.fetch = mockedFetch;
|
|
6
|
-
const mockedFetchResponse = (ok, response) => {
|
|
7
|
-
const responseText = JSON.stringify(response);
|
|
93
|
+
const mockedFetchResponse = (ok, response, contentType = 'application/json') => {
|
|
94
|
+
const responseText = typeof response === 'string' ? response : JSON.stringify(response);
|
|
8
95
|
return {
|
|
9
96
|
ok,
|
|
10
97
|
status: ok ? 200 : 400,
|
|
11
98
|
statusText: ok ? 'OK' : 'Bad Request',
|
|
12
99
|
text: () => Promise.resolve(responseText),
|
|
13
|
-
json: () => Promise.resolve(response),
|
|
100
|
+
json: () => (ok ? Promise.resolve(response) : Promise.reject(new Error('Invalid JSON'))),
|
|
14
101
|
headers: new Headers({
|
|
15
|
-
'content-type':
|
|
102
|
+
'content-type': contentType,
|
|
16
103
|
'x-session-id': '45',
|
|
17
104
|
}),
|
|
18
105
|
};
|
|
19
106
|
};
|
|
20
|
-
describe('
|
|
107
|
+
describe('cache configuration', () => {
|
|
108
|
+
const originalEnv = process.env;
|
|
109
|
+
let mkdirSyncMock;
|
|
110
|
+
let existsSyncMock;
|
|
111
|
+
beforeEach(() => {
|
|
112
|
+
jest.resetModules();
|
|
113
|
+
process.env = { ...originalEnv };
|
|
114
|
+
mkdirSyncMock = jest.spyOn(fs_1.default, 'mkdirSync').mockImplementation();
|
|
115
|
+
existsSyncMock = jest.spyOn(fs_1.default, 'existsSync').mockReturnValue(false);
|
|
116
|
+
});
|
|
21
117
|
afterEach(() => {
|
|
22
|
-
|
|
118
|
+
process.env = originalEnv;
|
|
119
|
+
mkdirSyncMock.mockRestore();
|
|
120
|
+
existsSyncMock.mockRestore();
|
|
23
121
|
});
|
|
24
|
-
it('should
|
|
25
|
-
|
|
26
|
-
const
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
const result = await (0, cache_1.fetchWithCache)(url, {}, 1000);
|
|
30
|
-
expect(mockedFetch).toHaveBeenCalledTimes(1);
|
|
31
|
-
expect(result).toEqual({
|
|
32
|
-
cached: false,
|
|
33
|
-
data: response,
|
|
34
|
-
headers: { 'content-type': 'application/json', 'x-session-id': '45' },
|
|
35
|
-
status: 400,
|
|
36
|
-
statusText: 'Bad Request',
|
|
37
|
-
});
|
|
122
|
+
it('should use memory cache in test environment', async () => {
|
|
123
|
+
process.env.NODE_ENV = 'test';
|
|
124
|
+
const cacheModule = await Promise.resolve().then(() => __importStar(require('../src/cache')));
|
|
125
|
+
const cache = cacheModule.getCache();
|
|
126
|
+
expect(cache.store).toHaveProperty('name', 'memory');
|
|
38
127
|
});
|
|
39
|
-
it('should
|
|
40
|
-
|
|
41
|
-
const
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
};
|
|
45
|
-
mockedFetch.mockResolvedValueOnce(mockedFetchResponse(true, response));
|
|
46
|
-
const result = await (0, cache_1.fetchWithCache)(url, {}, 1000);
|
|
47
|
-
expect(mockedFetch).toHaveBeenCalledTimes(1);
|
|
48
|
-
expect(result).toEqual({
|
|
49
|
-
cached: false,
|
|
50
|
-
data: response,
|
|
51
|
-
status: 200,
|
|
52
|
-
statusText: 'OK',
|
|
53
|
-
headers: { 'x-session-id': '45', 'content-type': 'application/json' },
|
|
54
|
-
});
|
|
128
|
+
it('should use disk cache in non-test environment', async () => {
|
|
129
|
+
process.env.NODE_ENV = 'production';
|
|
130
|
+
const cacheModule = await Promise.resolve().then(() => __importStar(require('../src/cache')));
|
|
131
|
+
const cache = cacheModule.getCache();
|
|
132
|
+
expect(cache.store).toHaveProperty('name', 'fs-hash');
|
|
55
133
|
});
|
|
56
|
-
it('should
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
expect(
|
|
62
|
-
expect(result).toEqual({
|
|
63
|
-
cached: true,
|
|
64
|
-
data: response,
|
|
65
|
-
status: 200,
|
|
66
|
-
statusText: 'OK',
|
|
67
|
-
headers: { 'content-type': 'application/json', 'x-session-id': '45' },
|
|
68
|
-
});
|
|
134
|
+
it('should respect custom cache path', async () => {
|
|
135
|
+
process.env.PROMPTFOO_CACHE_PATH = '/custom/cache/path';
|
|
136
|
+
process.env.NODE_ENV = 'production';
|
|
137
|
+
const cacheModule = await Promise.resolve().then(() => __importStar(require('../src/cache')));
|
|
138
|
+
cacheModule.getCache();
|
|
139
|
+
expect(fs_1.default.mkdirSync).toHaveBeenCalledWith('/custom/cache/path', { recursive: true });
|
|
69
140
|
});
|
|
70
|
-
it('should
|
|
71
|
-
|
|
141
|
+
it('should respect cache configuration from environment', async () => {
|
|
142
|
+
process.env.PROMPTFOO_CACHE_MAX_FILE_COUNT = '100';
|
|
143
|
+
process.env.PROMPTFOO_CACHE_TTL = '3600';
|
|
144
|
+
process.env.PROMPTFOO_CACHE_MAX_SIZE = '1000000';
|
|
145
|
+
process.env.NODE_ENV = 'production';
|
|
146
|
+
const cacheModule = await Promise.resolve().then(() => __importStar(require('../src/cache')));
|
|
147
|
+
const cache = cacheModule.getCache();
|
|
148
|
+
expect(cache.store).toHaveProperty('name', 'fs-hash');
|
|
149
|
+
});
|
|
150
|
+
it('should handle cache directory creation when it exists', async () => {
|
|
151
|
+
existsSyncMock.mockReturnValue(true);
|
|
152
|
+
process.env.NODE_ENV = 'production';
|
|
153
|
+
const cacheModule = await Promise.resolve().then(() => __importStar(require('../src/cache')));
|
|
154
|
+
cacheModule.getCache();
|
|
155
|
+
expect(mkdirSyncMock).not.toHaveBeenCalled();
|
|
156
|
+
});
|
|
157
|
+
});
|
|
158
|
+
describe('fetchWithCache', () => {
|
|
159
|
+
const url = 'https://api.example.com/data';
|
|
160
|
+
const response = { data: 'test data' };
|
|
161
|
+
beforeEach(() => {
|
|
162
|
+
jest.resetModules();
|
|
163
|
+
mockedFetch.mockReset();
|
|
72
164
|
(0, cache_1.clearCache)();
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
165
|
+
(0, cache_1.enableCache)();
|
|
166
|
+
});
|
|
167
|
+
afterEach(() => {
|
|
168
|
+
jest.useRealTimers();
|
|
169
|
+
});
|
|
170
|
+
afterAll(() => {
|
|
171
|
+
(0, cache_1.enableCache)(); // Reset to default state
|
|
172
|
+
});
|
|
173
|
+
describe('with cache enabled', () => {
|
|
174
|
+
it('should fetch and cache successful requests', async () => {
|
|
175
|
+
const mockResponse = mockedFetchResponse(true, response);
|
|
176
|
+
mockedFetch.mockResolvedValueOnce(mockResponse);
|
|
177
|
+
const result = await (0, cache_1.fetchWithCache)(url, {}, 1000);
|
|
178
|
+
expect(mockedFetch).toHaveBeenCalledTimes(1);
|
|
179
|
+
expect(result).toEqual({
|
|
180
|
+
cached: false,
|
|
181
|
+
data: response,
|
|
182
|
+
status: 200,
|
|
183
|
+
statusText: 'OK',
|
|
184
|
+
headers: { 'x-session-id': '45', 'content-type': 'application/json' },
|
|
185
|
+
});
|
|
186
|
+
// Second call should use cache
|
|
187
|
+
const cachedResult = await (0, cache_1.fetchWithCache)(url, {}, 1000);
|
|
188
|
+
expect(mockedFetch).toHaveBeenCalledTimes(1); // No additional fetch calls
|
|
189
|
+
expect(cachedResult).toEqual({
|
|
190
|
+
...result,
|
|
191
|
+
cached: true,
|
|
192
|
+
});
|
|
193
|
+
});
|
|
194
|
+
it('should not cache failed requests', async () => {
|
|
195
|
+
const mockResponse = {
|
|
196
|
+
ok: false,
|
|
197
|
+
status: 400,
|
|
198
|
+
statusText: 'Bad Request',
|
|
199
|
+
text: () => Promise.resolve(JSON.stringify({ error: 'Bad Request' })),
|
|
200
|
+
json: () => Promise.resolve({ error: 'Bad Request' }),
|
|
201
|
+
headers: new Headers({
|
|
202
|
+
'content-type': 'application/json',
|
|
203
|
+
'x-session-id': '45',
|
|
204
|
+
}),
|
|
205
|
+
};
|
|
206
|
+
mockedFetch.mockResolvedValueOnce(mockResponse);
|
|
207
|
+
const result = await (0, cache_1.fetchWithCache)(url, {}, 1000);
|
|
208
|
+
expect(result.status).toBe(400);
|
|
209
|
+
expect(result.statusText).toBe('Bad Request');
|
|
210
|
+
expect(result.data).toEqual({ error: 'Bad Request' });
|
|
211
|
+
// Second call should try fetching again
|
|
212
|
+
mockedFetch.mockResolvedValueOnce(mockResponse);
|
|
213
|
+
const result2 = await (0, cache_1.fetchWithCache)(url, {}, 1000);
|
|
214
|
+
expect(result2.status).toBe(400);
|
|
215
|
+
expect(result2.statusText).toBe('Bad Request');
|
|
216
|
+
expect(result2.data).toEqual({ error: 'Bad Request' });
|
|
217
|
+
expect(mockedFetch).toHaveBeenCalledTimes(2);
|
|
88
218
|
});
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
219
|
+
it('should handle empty responses', async () => {
|
|
220
|
+
const mockResponse = {
|
|
221
|
+
ok: false,
|
|
222
|
+
status: 400,
|
|
223
|
+
statusText: 'Bad Request',
|
|
224
|
+
text: () => Promise.resolve(JSON.stringify({ error: 'Empty Response' })),
|
|
225
|
+
json: () => Promise.resolve({ error: 'Empty Response' }),
|
|
226
|
+
headers: new Headers({
|
|
227
|
+
'content-type': 'application/json',
|
|
228
|
+
'x-session-id': '45',
|
|
229
|
+
}),
|
|
230
|
+
};
|
|
231
|
+
mockedFetch.mockResolvedValueOnce(mockResponse);
|
|
232
|
+
const result = await (0, cache_1.fetchWithCache)(url, {}, 1000);
|
|
233
|
+
expect(result.status).toBe(400);
|
|
234
|
+
expect(result.statusText).toBe('Bad Request');
|
|
235
|
+
expect(result.data).toEqual({ error: 'Empty Response' });
|
|
236
|
+
});
|
|
237
|
+
it('should handle non-JSON responses when JSON is expected', async () => {
|
|
238
|
+
const mockResponse = mockedFetchResponse(true, 'not json');
|
|
239
|
+
mockedFetch.mockResolvedValueOnce(mockResponse);
|
|
240
|
+
await expect((0, cache_1.fetchWithCache)(url, {}, 1000, 'json')).rejects.toThrow('Error parsing response');
|
|
241
|
+
});
|
|
242
|
+
it('should handle request timeout', async () => {
|
|
243
|
+
jest.useFakeTimers();
|
|
244
|
+
const mockTimeoutPromise = new Promise((resolve) => {
|
|
245
|
+
setTimeout(() => resolve(mockedFetchResponse(true, response)), 2000);
|
|
246
|
+
});
|
|
247
|
+
mockedFetch.mockImplementationOnce(() => mockTimeoutPromise);
|
|
248
|
+
const fetchPromise = (0, cache_1.fetchWithCache)(url, {}, 100);
|
|
249
|
+
await expect(Promise.race([
|
|
250
|
+
fetchPromise,
|
|
251
|
+
new Promise((_, reject) => {
|
|
252
|
+
jest.advanceTimersByTime(150);
|
|
253
|
+
reject(new Error('timeout'));
|
|
254
|
+
}),
|
|
255
|
+
])).rejects.toThrow('timeout');
|
|
256
|
+
});
|
|
257
|
+
it('should handle network errors', async () => {
|
|
258
|
+
mockedFetch.mockRejectedValueOnce(new Error('Network error'));
|
|
259
|
+
await expect((0, cache_1.fetchWithCache)(url, {}, 100)).rejects.toThrow('Network error');
|
|
260
|
+
});
|
|
261
|
+
it('should handle request options in cache key', async () => {
|
|
262
|
+
const options = { method: 'POST', body: JSON.stringify({ test: true }) };
|
|
263
|
+
const mockResponse = mockedFetchResponse(true, response);
|
|
264
|
+
mockedFetch.mockResolvedValueOnce(mockResponse);
|
|
265
|
+
await (0, cache_1.fetchWithCache)(url, options, 1000);
|
|
266
|
+
expect(mockedFetch).toHaveBeenCalledTimes(1);
|
|
267
|
+
// Different options should trigger new fetch
|
|
268
|
+
const differentOptions = { method: 'POST', body: JSON.stringify({ test: false }) };
|
|
269
|
+
mockedFetch.mockResolvedValueOnce(mockResponse);
|
|
270
|
+
await (0, cache_1.fetchWithCache)(url, differentOptions, 1000);
|
|
271
|
+
expect(mockedFetch).toHaveBeenCalledTimes(2);
|
|
272
|
+
});
|
|
273
|
+
it('should respect cache busting', async () => {
|
|
274
|
+
const mockResponse = mockedFetchResponse(true, response);
|
|
275
|
+
mockedFetch.mockResolvedValueOnce(mockResponse);
|
|
276
|
+
await (0, cache_1.fetchWithCache)(url, {}, 1000);
|
|
277
|
+
mockedFetch.mockResolvedValueOnce(mockedFetchResponse(true, { data: 'new data' }));
|
|
278
|
+
const result = await (0, cache_1.fetchWithCache)(url, {}, 1000, 'json', true);
|
|
279
|
+
expect(mockedFetch).toHaveBeenCalledTimes(2);
|
|
280
|
+
expect(result.data).toEqual({ data: 'new data' });
|
|
281
|
+
expect(result.cached).toBe(false);
|
|
95
282
|
});
|
|
96
283
|
});
|
|
97
|
-
|
|
98
|
-
(
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
284
|
+
describe('with cache disabled', () => {
|
|
285
|
+
beforeEach(() => {
|
|
286
|
+
(0, cache_1.disableCache)();
|
|
287
|
+
});
|
|
288
|
+
it('should always fetch fresh data', async () => {
|
|
289
|
+
const mockResponse = mockedFetchResponse(true, response);
|
|
290
|
+
mockedFetch.mockResolvedValueOnce(mockResponse);
|
|
291
|
+
const firstResult = await (0, cache_1.fetchWithCache)(url, {}, 1000);
|
|
292
|
+
expect(mockedFetch).toHaveBeenCalledTimes(1);
|
|
293
|
+
expect(firstResult).toEqual({
|
|
294
|
+
cached: false,
|
|
295
|
+
data: response,
|
|
296
|
+
status: 200,
|
|
297
|
+
statusText: 'OK',
|
|
298
|
+
headers: { 'content-type': 'application/json', 'x-session-id': '45' },
|
|
299
|
+
});
|
|
300
|
+
// Second call should fetch again
|
|
301
|
+
mockedFetch.mockResolvedValueOnce(mockResponse);
|
|
302
|
+
const secondResult = await (0, cache_1.fetchWithCache)(url, {}, 1000);
|
|
303
|
+
expect(mockedFetch).toHaveBeenCalledTimes(2);
|
|
304
|
+
expect(secondResult).toEqual(firstResult);
|
|
110
305
|
});
|
|
111
|
-
(0, cache_1.enableCache)();
|
|
112
306
|
});
|
|
113
|
-
|
|
114
|
-
(
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
307
|
+
describe('cache utility functions', () => {
|
|
308
|
+
it('should track cache enabled state', () => {
|
|
309
|
+
expect((0, cache_1.isCacheEnabled)()).toBe(true);
|
|
310
|
+
(0, cache_1.disableCache)();
|
|
311
|
+
expect((0, cache_1.isCacheEnabled)()).toBe(false);
|
|
312
|
+
(0, cache_1.enableCache)();
|
|
313
|
+
expect((0, cache_1.isCacheEnabled)()).toBe(true);
|
|
314
|
+
});
|
|
315
|
+
it('should clear cache', async () => {
|
|
316
|
+
const mockResponse = mockedFetchResponse(true, response);
|
|
317
|
+
mockedFetch.mockResolvedValueOnce(mockResponse);
|
|
318
|
+
await (0, cache_1.fetchWithCache)(url, {}, 1000);
|
|
319
|
+
expect(mockedFetch).toHaveBeenCalledTimes(1);
|
|
320
|
+
await (0, cache_1.clearCache)();
|
|
321
|
+
mockedFetch.mockResolvedValueOnce(mockResponse);
|
|
322
|
+
await (0, cache_1.fetchWithCache)(url, {}, 1000);
|
|
323
|
+
expect(mockedFetch).toHaveBeenCalledTimes(2);
|
|
126
324
|
});
|
|
127
|
-
(0, cache_1.enableCache)();
|
|
128
325
|
});
|
|
129
326
|
});
|
|
130
327
|
//# sourceMappingURL=cache.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.test.js","sourceRoot":"","sources":["../../test/cache.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cache.test.js","sourceRoot":"","sources":["../../test/cache.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"filterErrorTests.test.d.ts","sourceRoot":"","sources":["../../../../test/commands/eval/filterErrorTests.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const filterErrorTests_1 = require("../../../src/commands/eval/filterErrorTests");
|
|
4
|
+
const types_1 = require("../../../src/types");
|
|
5
|
+
const util_1 = require("../../../src/util");
|
|
6
|
+
jest.mock('../../../src/util', () => {
|
|
7
|
+
return {
|
|
8
|
+
...jest.requireActual('../../../src/util'),
|
|
9
|
+
readOutput: jest.fn(),
|
|
10
|
+
};
|
|
11
|
+
});
|
|
12
|
+
describe('filterErrorTests', () => {
|
|
13
|
+
const varsSuccess = { successKey: 'value' };
|
|
14
|
+
const varsError = { errorKey: 'value' };
|
|
15
|
+
const successTest = { vars: varsSuccess };
|
|
16
|
+
const errorTest = { vars: varsError };
|
|
17
|
+
const testSuite = {
|
|
18
|
+
tests: [successTest, errorTest],
|
|
19
|
+
};
|
|
20
|
+
const outputPath = 'outputPath.json';
|
|
21
|
+
const restResult = {
|
|
22
|
+
prompt: {
|
|
23
|
+
raw: 'prompt',
|
|
24
|
+
label: 'prompt',
|
|
25
|
+
},
|
|
26
|
+
score: 0.5,
|
|
27
|
+
latencyMs: 1000,
|
|
28
|
+
namedScores: {},
|
|
29
|
+
};
|
|
30
|
+
beforeEach(() => {
|
|
31
|
+
jest.mocked(util_1.readOutput).mockResolvedValue({
|
|
32
|
+
results: {
|
|
33
|
+
version: 2,
|
|
34
|
+
timestamp: '2024-01-01T00:00:00.000Z',
|
|
35
|
+
results: [
|
|
36
|
+
{
|
|
37
|
+
...restResult,
|
|
38
|
+
success: true,
|
|
39
|
+
failureReason: types_1.ResultFailureReason.NONE,
|
|
40
|
+
provider: { id: 'provider1' },
|
|
41
|
+
vars: varsSuccess,
|
|
42
|
+
promptIdx: 0,
|
|
43
|
+
testIdx: 0,
|
|
44
|
+
testCase: {},
|
|
45
|
+
promptId: 'foo',
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
...restResult,
|
|
49
|
+
success: false,
|
|
50
|
+
failureReason: types_1.ResultFailureReason.ERROR,
|
|
51
|
+
provider: { id: 'provider2' },
|
|
52
|
+
vars: varsError,
|
|
53
|
+
promptIdx: 0,
|
|
54
|
+
testIdx: 0,
|
|
55
|
+
testCase: {},
|
|
56
|
+
promptId: 'foo',
|
|
57
|
+
},
|
|
58
|
+
],
|
|
59
|
+
table: {},
|
|
60
|
+
stats: {},
|
|
61
|
+
},
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
afterEach(jest.clearAllMocks);
|
|
65
|
+
it('can filter using vars', async () => {
|
|
66
|
+
const result = await (0, filterErrorTests_1.filterErrorTests)(testSuite, outputPath);
|
|
67
|
+
expect(result).toStrictEqual([errorTest]);
|
|
68
|
+
});
|
|
69
|
+
it('can filter using test provider', async () => {
|
|
70
|
+
const errorTest1 = { provider: 'provider1', vars: varsError };
|
|
71
|
+
const errorTest2 = { provider: 'provider2', vars: varsError };
|
|
72
|
+
const testSuite = {
|
|
73
|
+
tests: [errorTest1, errorTest2],
|
|
74
|
+
};
|
|
75
|
+
const result = await (0, filterErrorTests_1.filterErrorTests)(testSuite, outputPath);
|
|
76
|
+
expect(result).toStrictEqual([errorTest2]);
|
|
77
|
+
});
|
|
78
|
+
it('returns empty array when no error tests', async () => {
|
|
79
|
+
jest.mocked(util_1.readOutput).mockResolvedValue({
|
|
80
|
+
results: {
|
|
81
|
+
version: 2,
|
|
82
|
+
timestamp: '2024-01-01T00:00:00.000Z',
|
|
83
|
+
results: [
|
|
84
|
+
{
|
|
85
|
+
success: true,
|
|
86
|
+
failureReason: types_1.ResultFailureReason.NONE,
|
|
87
|
+
provider: { id: 'provider1' },
|
|
88
|
+
vars: varsSuccess,
|
|
89
|
+
prompt: {
|
|
90
|
+
raw: 'prompt',
|
|
91
|
+
label: 'prompt',
|
|
92
|
+
},
|
|
93
|
+
score: 0.5,
|
|
94
|
+
latencyMs: 1000,
|
|
95
|
+
namedScores: {},
|
|
96
|
+
promptIdx: 0,
|
|
97
|
+
testIdx: 0,
|
|
98
|
+
testCase: {},
|
|
99
|
+
promptId: 'foo',
|
|
100
|
+
},
|
|
101
|
+
],
|
|
102
|
+
table: {},
|
|
103
|
+
stats: {},
|
|
104
|
+
},
|
|
105
|
+
});
|
|
106
|
+
const result = await (0, filterErrorTests_1.filterErrorTests)(testSuite, outputPath);
|
|
107
|
+
expect(result).toStrictEqual([]);
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
//# sourceMappingURL=filterErrorTests.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"filterErrorTests.test.js","sourceRoot":"","sources":["../../../../test/commands/eval/filterErrorTests.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -82,6 +82,16 @@ describe('evaluator', () => {
|
|
|
82
82
|
await (0, evaluator_1.evaluate)(testSuite, evalRecord, {});
|
|
83
83
|
const summary = await evalRecord.toEvaluateSummary();
|
|
84
84
|
expect(mockApiProvider.callApi).toHaveBeenCalledTimes(1);
|
|
85
|
+
expect(mockApiProvider.callApi).toHaveBeenCalledWith('Test prompt value1 value2', expect.objectContaining({
|
|
86
|
+
vars: { var1: 'value1', var2: 'value2' },
|
|
87
|
+
test: testSuite.tests[0],
|
|
88
|
+
prompt: expect.any(Object),
|
|
89
|
+
filters: undefined,
|
|
90
|
+
originalProvider: mockApiProvider,
|
|
91
|
+
logger: expect.any(Object),
|
|
92
|
+
fetchWithCache: expect.any(Function),
|
|
93
|
+
getCache: expect.any(Function),
|
|
94
|
+
}), expect.anything());
|
|
85
95
|
expect(summary.stats.successes).toBe(1);
|
|
86
96
|
expect(summary.stats.failures).toBe(0);
|
|
87
97
|
expect(summary.stats.tokenUsage).toEqual({
|