2025-11-17 13:12:16 -05:00
|
|
|
const axios = require('axios');
|
2025-07-25 00:07:37 -04:00
|
|
|
|
2025-11-17 13:12:16 -05:00
|
|
|
jest.mock('axios');
|
|
|
|
|
jest.mock('@librechat/api', () => ({
|
|
|
|
|
generateShortLivedToken: jest.fn(),
|
2025-07-25 00:07:37 -04:00
|
|
|
}));
|
|
|
|
|
|
2025-11-17 13:12:16 -05:00
|
|
|
jest.mock('@librechat/data-schemas', () => ({
|
2025-07-25 00:07:37 -04:00
|
|
|
logger: {
|
|
|
|
|
warn: jest.fn(),
|
|
|
|
|
error: jest.fn(),
|
|
|
|
|
debug: jest.fn(),
|
|
|
|
|
},
|
|
|
|
|
}));
|
|
|
|
|
|
🧵 refactor: Migrate Endpoint Initialization to TypeScript (#10794)
* refactor: move endpoint initialization methods to typescript
* refactor: move agent init to packages/api
- Introduced `initialize.ts` for agent initialization, including file processing and tool loading.
- Updated `resources.ts` to allow optional appConfig parameter.
- Enhanced endpoint configuration handling in various initialization files to support model parameters.
- Added new artifacts and prompts for React component generation.
- Refactored existing code to improve type safety and maintainability.
* refactor: streamline endpoint initialization and enhance type safety
- Updated initialization functions across various endpoints to use a consistent request structure, replacing `unknown` types with `ServerResponse`.
- Simplified request handling by directly extracting keys from the request body.
- Improved type safety by ensuring user IDs are safely accessed with optional chaining.
- Removed unnecessary parameters and streamlined model options handling for better clarity and maintainability.
* refactor: moved ModelService and extractBaseURL to packages/api
- Added comprehensive tests for the models fetching functionality, covering scenarios for OpenAI, Anthropic, Google, and Ollama models.
- Updated existing endpoint index to include the new models module.
- Enhanced utility functions for URL extraction and model data processing.
- Improved type safety and error handling across the models fetching logic.
* refactor: consolidate utility functions and remove unused files
- Merged `deriveBaseURL` and `extractBaseURL` into the `@librechat/api` module for better organization.
- Removed redundant utility files and their associated tests to streamline the codebase.
- Updated imports across various client files to utilize the new consolidated functions.
- Enhanced overall maintainability by reducing the number of utility modules.
* refactor: replace ModelService references with direct imports from @librechat/api and remove ModelService file
* refactor: move encrypt/decrypt methods and key db methods to data-schemas, use `getProviderConfig` from `@librechat/api`
* chore: remove unused 'res' from options in AgentClient
* refactor: file model imports and methods
- Updated imports in various controllers and services to use the unified file model from '~/models' instead of '~/models/File'.
- Consolidated file-related methods into a new file methods module in the data-schemas package.
- Added comprehensive tests for file methods including creation, retrieval, updating, and deletion.
- Enhanced the initializeAgent function to accept dependency injection for file-related methods.
- Improved error handling and logging in file methods.
* refactor: streamline database method references in agent initialization
* refactor: enhance file method tests and update type references to IMongoFile
* refactor: consolidate database method imports in agent client and initialization
* chore: remove redundant import of initializeAgent from @librechat/api
* refactor: move checkUserKeyExpiry utility to @librechat/api and update references across endpoints
* refactor: move updateUserPlugins logic to user.ts and simplify UserController
* refactor: update imports for user key management and remove UserService
* refactor: remove unused Anthropics and Bedrock endpoint files and clean up imports
* refactor: consolidate and update encryption imports across various files to use @librechat/data-schemas
* chore: update file model mock to use unified import from '~/models'
* chore: import order
* refactor: remove migrated to TS agent.js file and its associated logic from the endpoints
* chore: add reusable function to extract imports from source code in unused-packages workflow
* chore: enhance unused-packages workflow to include @librechat/api dependencies and improve dependency extraction
* chore: improve dependency extraction in unused-packages workflow with enhanced error handling and debugging output
* chore: add detailed debugging output to unused-packages workflow for better visibility into unused dependencies and exclusion lists
* chore: refine subpath handling in unused-packages workflow to correctly process scoped and non-scoped package imports
* chore: clean up unused debug output in unused-packages workflow and reorganize type imports in initialize.ts
2025-12-03 17:21:41 -05:00
|
|
|
jest.mock('~/models', () => ({
|
2025-11-17 13:12:16 -05:00
|
|
|
getFiles: jest.fn().mockResolvedValue([]),
|
|
|
|
|
}));
|
2025-07-25 00:07:37 -04:00
|
|
|
|
2025-11-17 13:12:16 -05:00
|
|
|
jest.mock('~/server/services/Files/permissions', () => ({
|
|
|
|
|
filterFilesByAgentAccess: jest.fn((options) => Promise.resolve(options.files)),
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
const { createFileSearchTool } = require('~/app/clients/tools/util/fileSearch');
|
|
|
|
|
const { generateShortLivedToken } = require('@librechat/api');
|
|
|
|
|
|
|
|
|
|
describe('fileSearch.js - tuple return validation', () => {
|
2025-07-25 00:07:37 -04:00
|
|
|
beforeEach(() => {
|
|
|
|
|
jest.clearAllMocks();
|
2025-11-17 13:12:16 -05:00
|
|
|
process.env.RAG_API_URL = 'http://localhost:8000';
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
describe('error cases should return tuple with undefined as second value', () => {
|
|
|
|
|
it('should return tuple when no files provided', async () => {
|
|
|
|
|
const fileSearchTool = await createFileSearchTool({
|
|
|
|
|
userId: 'user1',
|
|
|
|
|
files: [],
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const result = await fileSearchTool.func({ query: 'test query' });
|
|
|
|
|
|
|
|
|
|
expect(Array.isArray(result)).toBe(true);
|
|
|
|
|
expect(result).toHaveLength(2);
|
|
|
|
|
expect(result[0]).toBe('No files to search. Instruct the user to add files for the search.');
|
|
|
|
|
expect(result[1]).toBeUndefined();
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('should return tuple when JWT token generation fails', async () => {
|
|
|
|
|
generateShortLivedToken.mockReturnValue(null);
|
|
|
|
|
|
|
|
|
|
const fileSearchTool = await createFileSearchTool({
|
|
|
|
|
userId: 'user1',
|
|
|
|
|
files: [{ file_id: 'file-1', filename: 'test.pdf' }],
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const result = await fileSearchTool.func({ query: 'test query' });
|
|
|
|
|
|
|
|
|
|
expect(Array.isArray(result)).toBe(true);
|
|
|
|
|
expect(result).toHaveLength(2);
|
|
|
|
|
expect(result[0]).toBe('There was an error authenticating the file search request.');
|
|
|
|
|
expect(result[1]).toBeUndefined();
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('should return tuple when no valid results found', async () => {
|
|
|
|
|
generateShortLivedToken.mockReturnValue('mock-jwt-token');
|
|
|
|
|
axios.post.mockRejectedValue(new Error('API Error'));
|
|
|
|
|
|
|
|
|
|
const fileSearchTool = await createFileSearchTool({
|
|
|
|
|
userId: 'user1',
|
|
|
|
|
files: [{ file_id: 'file-1', filename: 'test.pdf' }],
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const result = await fileSearchTool.func({ query: 'test query' });
|
|
|
|
|
|
|
|
|
|
expect(Array.isArray(result)).toBe(true);
|
|
|
|
|
expect(result).toHaveLength(2);
|
|
|
|
|
expect(result[0]).toBe('No results found or errors occurred while searching the files.');
|
|
|
|
|
expect(result[1]).toBeUndefined();
|
|
|
|
|
});
|
2025-07-25 00:07:37 -04:00
|
|
|
});
|
|
|
|
|
|
2025-11-17 13:12:16 -05:00
|
|
|
describe('success cases should return tuple with artifact object', () => {
|
|
|
|
|
it('should return tuple with formatted results and sources artifact', async () => {
|
|
|
|
|
generateShortLivedToken.mockReturnValue('mock-jwt-token');
|
|
|
|
|
|
|
|
|
|
const mockApiResponse = {
|
2025-07-25 00:07:37 -04:00
|
|
|
data: [
|
|
|
|
|
[
|
|
|
|
|
{
|
2025-11-17 13:12:16 -05:00
|
|
|
page_content: 'This is test content from the document',
|
|
|
|
|
metadata: { source: '/path/to/test.pdf', page: 1 },
|
2025-07-25 00:07:37 -04:00
|
|
|
},
|
2025-11-17 13:12:16 -05:00
|
|
|
0.2,
|
|
|
|
|
],
|
|
|
|
|
[
|
|
|
|
|
{
|
|
|
|
|
page_content: 'Additional relevant content',
|
|
|
|
|
metadata: { source: '/path/to/test.pdf', page: 2 },
|
|
|
|
|
},
|
|
|
|
|
0.35,
|
2025-07-25 00:07:37 -04:00
|
|
|
],
|
|
|
|
|
],
|
2025-11-17 13:12:16 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
axios.post.mockResolvedValue(mockApiResponse);
|
|
|
|
|
|
|
|
|
|
const fileSearchTool = await createFileSearchTool({
|
|
|
|
|
userId: 'user1',
|
|
|
|
|
files: [{ file_id: 'file-123', filename: 'test.pdf' }],
|
|
|
|
|
entity_id: 'agent-456',
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const result = await fileSearchTool.func({ query: 'test query' });
|
2025-07-25 00:07:37 -04:00
|
|
|
|
2025-11-17 13:12:16 -05:00
|
|
|
expect(Array.isArray(result)).toBe(true);
|
|
|
|
|
expect(result).toHaveLength(2);
|
2025-07-25 00:07:37 -04:00
|
|
|
|
2025-11-17 13:12:16 -05:00
|
|
|
const [formattedString, artifact] = result;
|
|
|
|
|
|
|
|
|
|
expect(typeof formattedString).toBe('string');
|
|
|
|
|
expect(formattedString).toContain('File: test.pdf');
|
|
|
|
|
expect(formattedString).toContain('Relevance:');
|
|
|
|
|
expect(formattedString).toContain('This is test content from the document');
|
|
|
|
|
expect(formattedString).toContain('Additional relevant content');
|
|
|
|
|
|
|
|
|
|
expect(artifact).toBeDefined();
|
|
|
|
|
expect(artifact).toHaveProperty('file_search');
|
|
|
|
|
expect(artifact.file_search).toHaveProperty('sources');
|
|
|
|
|
expect(artifact.file_search).toHaveProperty('fileCitations', false);
|
|
|
|
|
expect(Array.isArray(artifact.file_search.sources)).toBe(true);
|
|
|
|
|
expect(artifact.file_search.sources.length).toBe(2);
|
|
|
|
|
|
|
|
|
|
const source = artifact.file_search.sources[0];
|
|
|
|
|
expect(source).toMatchObject({
|
|
|
|
|
type: 'file',
|
|
|
|
|
fileId: 'file-123',
|
|
|
|
|
fileName: 'test.pdf',
|
|
|
|
|
content: expect.any(String),
|
|
|
|
|
relevance: expect.any(Number),
|
|
|
|
|
pages: [1],
|
|
|
|
|
pageRelevance: { 1: expect.any(Number) },
|
|
|
|
|
});
|
2025-07-25 00:07:37 -04:00
|
|
|
});
|
|
|
|
|
|
2025-11-17 13:12:16 -05:00
|
|
|
it('should include file citations in description when enabled', async () => {
|
|
|
|
|
generateShortLivedToken.mockReturnValue('mock-jwt-token');
|
|
|
|
|
|
|
|
|
|
const mockApiResponse = {
|
|
|
|
|
data: [
|
|
|
|
|
[
|
|
|
|
|
{
|
|
|
|
|
page_content: 'Content with citations',
|
|
|
|
|
metadata: { source: '/path/to/doc.pdf', page: 3 },
|
|
|
|
|
},
|
|
|
|
|
0.15,
|
|
|
|
|
],
|
|
|
|
|
],
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
axios.post.mockResolvedValue(mockApiResponse);
|
|
|
|
|
|
|
|
|
|
const fileSearchTool = await createFileSearchTool({
|
|
|
|
|
userId: 'user1',
|
|
|
|
|
files: [{ file_id: 'file-789', filename: 'doc.pdf' }],
|
|
|
|
|
fileCitations: true,
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const result = await fileSearchTool.func({ query: 'test query' });
|
|
|
|
|
|
|
|
|
|
expect(Array.isArray(result)).toBe(true);
|
|
|
|
|
expect(result).toHaveLength(2);
|
|
|
|
|
|
|
|
|
|
const [formattedString, artifact] = result;
|
|
|
|
|
|
|
|
|
|
expect(formattedString).toContain('Anchor:');
|
|
|
|
|
expect(formattedString).toContain('\\ue202turn0file0');
|
|
|
|
|
expect(artifact.file_search.fileCitations).toBe(true);
|
2025-07-25 00:07:37 -04:00
|
|
|
});
|
|
|
|
|
|
2025-11-17 13:12:16 -05:00
|
|
|
it('should handle multiple files correctly', async () => {
|
|
|
|
|
generateShortLivedToken.mockReturnValue('mock-jwt-token');
|
2025-07-25 00:07:37 -04:00
|
|
|
|
2025-11-17 13:12:16 -05:00
|
|
|
const mockResponse1 = {
|
|
|
|
|
data: [
|
|
|
|
|
[
|
|
|
|
|
{
|
|
|
|
|
page_content: 'Content from file 1',
|
|
|
|
|
metadata: { source: '/path/to/file1.pdf', page: 1 },
|
|
|
|
|
},
|
|
|
|
|
0.25,
|
|
|
|
|
],
|
|
|
|
|
],
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const mockResponse2 = {
|
|
|
|
|
data: [
|
|
|
|
|
[
|
|
|
|
|
{
|
|
|
|
|
page_content: 'Content from file 2',
|
|
|
|
|
metadata: { source: '/path/to/file2.pdf', page: 1 },
|
|
|
|
|
},
|
|
|
|
|
0.15,
|
|
|
|
|
],
|
|
|
|
|
],
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
axios.post.mockResolvedValueOnce(mockResponse1).mockResolvedValueOnce(mockResponse2);
|
|
|
|
|
|
|
|
|
|
const fileSearchTool = await createFileSearchTool({
|
|
|
|
|
userId: 'user1',
|
|
|
|
|
files: [
|
|
|
|
|
{ file_id: 'file-1', filename: 'file1.pdf' },
|
|
|
|
|
{ file_id: 'file-2', filename: 'file2.pdf' },
|
|
|
|
|
],
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const result = await fileSearchTool.func({ query: 'test query' });
|
|
|
|
|
|
|
|
|
|
expect(Array.isArray(result)).toBe(true);
|
|
|
|
|
expect(result).toHaveLength(2);
|
|
|
|
|
|
|
|
|
|
const [formattedString, artifact] = result;
|
|
|
|
|
|
|
|
|
|
expect(formattedString).toContain('file1.pdf');
|
|
|
|
|
expect(formattedString).toContain('file2.pdf');
|
|
|
|
|
expect(artifact.file_search.sources).toHaveLength(2);
|
|
|
|
|
// Results are sorted by distance (ascending), so file-2 (0.15) comes before file-1 (0.25)
|
|
|
|
|
expect(artifact.file_search.sources[0].fileId).toBe('file-2');
|
|
|
|
|
expect(artifact.file_search.sources[1].fileId).toBe('file-1');
|
|
|
|
|
});
|
2025-07-25 00:07:37 -04:00
|
|
|
});
|
|
|
|
|
});
|