@librechat/agents 2.4.76 → 2.4.78
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/cjs/graphs/Graph.cjs +4 -1
- package/dist/cjs/graphs/Graph.cjs.map +1 -1
- package/dist/cjs/tools/search/rerankers.cjs +8 -6
- package/dist/cjs/tools/search/rerankers.cjs.map +1 -1
- package/dist/cjs/tools/search/tool.cjs +2 -1
- package/dist/cjs/tools/search/tool.cjs.map +1 -1
- package/dist/esm/graphs/Graph.mjs +4 -1
- package/dist/esm/graphs/Graph.mjs.map +1 -1
- package/dist/esm/tools/search/rerankers.mjs +8 -6
- package/dist/esm/tools/search/rerankers.mjs.map +1 -1
- package/dist/esm/tools/search/tool.mjs +2 -1
- package/dist/esm/tools/search/tool.mjs.map +1 -1
- package/dist/types/tools/search/rerankers.d.ts +4 -1
- package/dist/types/tools/search/types.d.ts +1 -0
- package/package.json +1 -1
- package/src/graphs/Graph.ts +6 -1
- package/src/scripts/simple.ts +9 -3
- package/src/tools/search/jina-reranker.test.ts +126 -0
- package/src/tools/search/rerankers.ts +11 -5
- package/src/tools/search/tool.ts +2 -0
- package/src/tools/search/types.ts +1 -0
- package/src/utils/llmConfig.ts +1 -1
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
import { JinaReranker } from './rerankers';
|
|
2
|
+
import { createDefaultLogger } from './utils';
|
|
3
|
+
|
|
4
|
+
describe('JinaReranker', () => {
|
|
5
|
+
const mockLogger = createDefaultLogger();
|
|
6
|
+
|
|
7
|
+
describe('constructor', () => {
|
|
8
|
+
it('should use default API URL when no apiUrl is provided', () => {
|
|
9
|
+
const reranker = new JinaReranker({
|
|
10
|
+
apiKey: 'test-key',
|
|
11
|
+
logger: mockLogger,
|
|
12
|
+
});
|
|
13
|
+
|
|
14
|
+
// Access private property for testing
|
|
15
|
+
const apiUrl = (reranker as any).apiUrl;
|
|
16
|
+
expect(apiUrl).toBe('https://api.jina.ai/v1/rerank');
|
|
17
|
+
});
|
|
18
|
+
|
|
19
|
+
it('should use custom API URL when provided', () => {
|
|
20
|
+
const customUrl = 'https://custom-jina-endpoint.com/v1/rerank';
|
|
21
|
+
const reranker = new JinaReranker({
|
|
22
|
+
apiKey: 'test-key',
|
|
23
|
+
apiUrl: customUrl,
|
|
24
|
+
logger: mockLogger,
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
const apiUrl = (reranker as any).apiUrl;
|
|
28
|
+
expect(apiUrl).toBe(customUrl);
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
it('should use environment variable JINA_API_URL when available', () => {
|
|
32
|
+
const originalEnv = process.env.JINA_API_URL;
|
|
33
|
+
process.env.JINA_API_URL = 'https://env-jina-endpoint.com/v1/rerank';
|
|
34
|
+
|
|
35
|
+
const reranker = new JinaReranker({
|
|
36
|
+
apiKey: 'test-key',
|
|
37
|
+
logger: mockLogger,
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
const apiUrl = (reranker as any).apiUrl;
|
|
41
|
+
expect(apiUrl).toBe('https://env-jina-endpoint.com/v1/rerank');
|
|
42
|
+
|
|
43
|
+
// Restore original environment
|
|
44
|
+
if (originalEnv) {
|
|
45
|
+
process.env.JINA_API_URL = originalEnv;
|
|
46
|
+
} else {
|
|
47
|
+
delete process.env.JINA_API_URL;
|
|
48
|
+
}
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
it('should prioritize explicit apiUrl over environment variable', () => {
|
|
52
|
+
const originalEnv = process.env.JINA_API_URL;
|
|
53
|
+
process.env.JINA_API_URL = 'https://env-jina-endpoint.com/v1/rerank';
|
|
54
|
+
|
|
55
|
+
const customUrl = 'https://explicit-jina-endpoint.com/v1/rerank';
|
|
56
|
+
const reranker = new JinaReranker({
|
|
57
|
+
apiKey: 'test-key',
|
|
58
|
+
apiUrl: customUrl,
|
|
59
|
+
logger: mockLogger,
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
const apiUrl = (reranker as any).apiUrl;
|
|
63
|
+
expect(apiUrl).toBe(customUrl);
|
|
64
|
+
|
|
65
|
+
// Restore original environment
|
|
66
|
+
if (originalEnv) {
|
|
67
|
+
process.env.JINA_API_URL = originalEnv;
|
|
68
|
+
} else {
|
|
69
|
+
delete process.env.JINA_API_URL;
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
describe('rerank method', () => {
|
|
75
|
+
it('should log the API URL being used', async () => {
|
|
76
|
+
const customUrl = 'https://test-jina-endpoint.com/v1/rerank';
|
|
77
|
+
const reranker = new JinaReranker({
|
|
78
|
+
apiKey: 'test-key',
|
|
79
|
+
apiUrl: customUrl,
|
|
80
|
+
logger: mockLogger,
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
const logSpy = jest.spyOn(mockLogger, 'debug');
|
|
84
|
+
|
|
85
|
+
try {
|
|
86
|
+
await reranker.rerank('test query', ['document1', 'document2'], 2);
|
|
87
|
+
} catch (error) {
|
|
88
|
+
// Expected to fail due to missing API key, but we can check the log
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
expect(logSpy).toHaveBeenCalledWith(
|
|
92
|
+
expect.stringContaining(`Reranking 2 chunks with Jina using API URL: ${customUrl}`)
|
|
93
|
+
);
|
|
94
|
+
|
|
95
|
+
logSpy.mockRestore();
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
describe('createReranker', () => {
|
|
101
|
+
const { createReranker } = require('./rerankers');
|
|
102
|
+
|
|
103
|
+
it('should create JinaReranker with jinaApiUrl when provided', () => {
|
|
104
|
+
const customUrl = 'https://custom-jina-endpoint.com/v1/rerank';
|
|
105
|
+
const reranker = createReranker({
|
|
106
|
+
rerankerType: 'jina',
|
|
107
|
+
jinaApiKey: 'test-key',
|
|
108
|
+
jinaApiUrl: customUrl,
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
expect(reranker).toBeInstanceOf(JinaReranker);
|
|
112
|
+
const apiUrl = (reranker as any).apiUrl;
|
|
113
|
+
expect(apiUrl).toBe(customUrl);
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
it('should create JinaReranker with default URL when jinaApiUrl is not provided', () => {
|
|
117
|
+
const reranker = createReranker({
|
|
118
|
+
rerankerType: 'jina',
|
|
119
|
+
jinaApiKey: 'test-key',
|
|
120
|
+
});
|
|
121
|
+
|
|
122
|
+
expect(reranker).toBeInstanceOf(JinaReranker);
|
|
123
|
+
const apiUrl = (reranker as any).apiUrl;
|
|
124
|
+
expect(apiUrl).toBe('https://api.jina.ai/v1/rerank');
|
|
125
|
+
});
|
|
126
|
+
});
|
|
@@ -28,15 +28,20 @@ export abstract class BaseReranker {
|
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
export class JinaReranker extends BaseReranker {
|
|
31
|
+
private apiUrl: string;
|
|
32
|
+
|
|
31
33
|
constructor({
|
|
32
34
|
apiKey = process.env.JINA_API_KEY,
|
|
35
|
+
apiUrl = process.env.JINA_API_URL || 'https://api.jina.ai/v1/rerank',
|
|
33
36
|
logger,
|
|
34
37
|
}: {
|
|
35
38
|
apiKey?: string;
|
|
39
|
+
apiUrl?: string;
|
|
36
40
|
logger?: t.Logger;
|
|
37
41
|
}) {
|
|
38
42
|
super(logger);
|
|
39
43
|
this.apiKey = apiKey;
|
|
44
|
+
this.apiUrl = apiUrl;
|
|
40
45
|
}
|
|
41
46
|
|
|
42
47
|
async rerank(
|
|
@@ -44,7 +49,7 @@ export class JinaReranker extends BaseReranker {
|
|
|
44
49
|
documents: string[],
|
|
45
50
|
topK: number = 5
|
|
46
51
|
): Promise<t.Highlight[]> {
|
|
47
|
-
this.logger.debug(`Reranking ${documents.length} chunks with Jina`);
|
|
52
|
+
this.logger.debug(`Reranking ${documents.length} chunks with Jina using API URL: ${this.apiUrl}`);
|
|
48
53
|
|
|
49
54
|
try {
|
|
50
55
|
if (this.apiKey == null || this.apiKey === '') {
|
|
@@ -61,7 +66,7 @@ export class JinaReranker extends BaseReranker {
|
|
|
61
66
|
};
|
|
62
67
|
|
|
63
68
|
const response = await axios.post<t.JinaRerankerResponse | undefined>(
|
|
64
|
-
|
|
69
|
+
this.apiUrl,
|
|
65
70
|
requestData,
|
|
66
71
|
{
|
|
67
72
|
headers: {
|
|
@@ -201,17 +206,18 @@ export class InfinityReranker extends BaseReranker {
|
|
|
201
206
|
export const createReranker = (config: {
|
|
202
207
|
rerankerType: t.RerankerType;
|
|
203
208
|
jinaApiKey?: string;
|
|
209
|
+
jinaApiUrl?: string;
|
|
204
210
|
cohereApiKey?: string;
|
|
205
211
|
logger?: t.Logger;
|
|
206
212
|
}): BaseReranker | undefined => {
|
|
207
|
-
const { rerankerType, jinaApiKey, cohereApiKey, logger } = config;
|
|
213
|
+
const { rerankerType, jinaApiKey, jinaApiUrl, cohereApiKey, logger } = config;
|
|
208
214
|
|
|
209
215
|
// Create a default logger if none is provided
|
|
210
216
|
const defaultLogger = logger || createDefaultLogger();
|
|
211
217
|
|
|
212
218
|
switch (rerankerType.toLowerCase()) {
|
|
213
219
|
case 'jina':
|
|
214
|
-
return new JinaReranker({ apiKey: jinaApiKey, logger: defaultLogger });
|
|
220
|
+
return new JinaReranker({ apiKey: jinaApiKey, apiUrl: jinaApiUrl, logger: defaultLogger });
|
|
215
221
|
case 'cohere':
|
|
216
222
|
return new CohereReranker({
|
|
217
223
|
apiKey: cohereApiKey,
|
|
@@ -226,7 +232,7 @@ export const createReranker = (config: {
|
|
|
226
232
|
defaultLogger.warn(
|
|
227
233
|
`Unknown reranker type: ${rerankerType}. Defaulting to InfinityReranker.`
|
|
228
234
|
);
|
|
229
|
-
return new JinaReranker({ apiKey: jinaApiKey, logger: defaultLogger });
|
|
235
|
+
return new JinaReranker({ apiKey: jinaApiKey, apiUrl: jinaApiUrl, logger: defaultLogger });
|
|
230
236
|
}
|
|
231
237
|
};
|
|
232
238
|
|
package/src/tools/search/tool.ts
CHANGED
|
@@ -349,6 +349,7 @@ export const createSearchTool = (
|
|
|
349
349
|
firecrawlOptions,
|
|
350
350
|
scraperTimeout,
|
|
351
351
|
jinaApiKey,
|
|
352
|
+
jinaApiUrl,
|
|
352
353
|
cohereApiKey,
|
|
353
354
|
onSearchResults: _onSearchResults,
|
|
354
355
|
onGetHighlights,
|
|
@@ -395,6 +396,7 @@ export const createSearchTool = (
|
|
|
395
396
|
const selectedReranker = createReranker({
|
|
396
397
|
rerankerType,
|
|
397
398
|
jinaApiKey,
|
|
399
|
+
jinaApiUrl,
|
|
398
400
|
cohereApiKey,
|
|
399
401
|
logger,
|
|
400
402
|
});
|
package/src/utils/llmConfig.ts
CHANGED