mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 00:40:14 +01:00
* WIP: app.locals refactoring
WIP: appConfig
fix: update memory configuration retrieval to use getAppConfig based on user role
fix: update comment for AppConfig interface to clarify purpose
🏷️ refactor: Update tests to use getAppConfig for endpoint configurations
ci: Update AppService tests to initialize app config instead of app.locals
ci: Integrate getAppConfig into remaining tests
refactor: Update multer storage destination to use promise-based getAppConfig and improve error handling in tests
refactor: Rename initializeAppConfig to setAppConfig and update related tests
ci: Mock getAppConfig in various tests to provide default configurations
refactor: Update convertMCPToolsToPlugins to use mcpManager for server configuration and adjust related tests
chore: rename `Config/getAppConfig` -> `Config/app`
fix: streamline OpenAI image tools configuration by removing direct appConfig dependency and using function parameters
chore: correct parameter documentation for imageOutputType in ToolService.js
refactor: remove `getCustomConfig` dependency in config route
refactor: update domain validation to use appConfig for allowed domains
refactor: use appConfig registration property
chore: remove app parameter from AppService invocation
refactor: update AppConfig interface to correct registration and turnstile configurations
refactor: remove getCustomConfig dependency and use getAppConfig in PluginController, multer, and MCP services
refactor: replace getCustomConfig with getAppConfig in STTService, TTSService, and related files
refactor: replace getCustomConfig with getAppConfig in Conversation and Message models, update tempChatRetention functions to use AppConfig type
refactor: update getAppConfig calls in Conversation and Message models to include user role for temporary chat expiration
ci: update related tests
refactor: update getAppConfig call in getCustomConfigSpeech to include user role
fix: update appConfig usage to access allowedDomains from actions instead of registration
refactor: enhance AppConfig to include fileStrategies and update related file strategy logic
refactor: update imports to use normalizeEndpointName from @librechat/api and remove redundant definitions
chore: remove deprecated unused RunManager
refactor: get balance config primarily from appConfig
refactor: remove customConfig dependency for appConfig and streamline loadConfigModels logic
refactor: remove getCustomConfig usage and use app config in file citations
refactor: consolidate endpoint loading logic into loadEndpoints function
refactor: update appConfig access to use endpoints structure across various services
refactor: implement custom endpoints configuration and streamline endpoint loading logic
refactor: update getAppConfig call to include user role parameter
refactor: streamline endpoint configuration and enhance appConfig usage across services
refactor: replace getMCPAuthMap with getUserMCPAuthMap and remove unused getCustomConfig file
refactor: add type annotation for loadedEndpoints in loadEndpoints function
refactor: move /services/Files/images/parse to TS API
chore: add missing FILE_CITATIONS permission to IRole interface
refactor: restructure toolkits to TS API
refactor: separate manifest logic into its own module
refactor: consolidate tool loading logic into a new tools module for startup logic
refactor: move interface config logic to TS API
refactor: migrate checkEmailConfig to TypeScript and update imports
refactor: add FunctionTool interface and availableTools to AppConfig
refactor: decouple caching and DB operations from AppService, make part of consolidated `getAppConfig`
WIP: fix tests
* fix: rebase conflicts
* refactor: remove app.locals references
* refactor: replace getBalanceConfig with getAppConfig in various strategies and middleware
* refactor: replace appConfig?.balance with getBalanceConfig in various controllers and clients
* test: add balance configuration to titleConvo method in AgentClient tests
* chore: remove unused `openai-chat-tokens` package
* chore: remove unused imports in initializeMCPs.js
* refactor: update balance configuration to use getAppConfig instead of getBalanceConfig
* refactor: integrate configMiddleware for centralized configuration handling
* refactor: optimize email domain validation by removing unnecessary async calls
* refactor: simplify multer storage configuration by removing async calls
* refactor: reorder imports for better readability in user.js
* refactor: replace getAppConfig calls with req.config for improved performance
* chore: replace getAppConfig calls with req.config in tests for centralized configuration handling
* chore: remove unused override config
* refactor: add configMiddleware to endpoint route and replace getAppConfig with req.config
* chore: remove customConfig parameter from TTSService constructor
* refactor: pass appConfig from request to processFileCitations for improved configuration handling
* refactor: remove configMiddleware from endpoint route and retrieve appConfig directly in getEndpointsConfig if not in `req.config`
* test: add mockAppConfig to processFileCitations tests for improved configuration handling
* fix: pass req.config to hasCustomUserVars and call without await after synchronous refactor
* fix: type safety in useExportConversation
* refactor: retrieve appConfig using getAppConfig in PluginController and remove configMiddleware from plugins route, to avoid always retrieving when plugins are cached
* chore: change `MongoUser` typedef to `IUser`
* fix: Add `user` and `config` fields to ServerRequest and update JSDoc type annotations from Express.Request to ServerRequest
* fix: remove unused setAppConfig mock from Server configuration tests
352 lines
8.8 KiB
JavaScript
352 lines
8.8 KiB
JavaScript
const { Tools } = require('librechat-data-provider');
|
|
const {
|
|
processFileCitations,
|
|
applyCitationLimits,
|
|
enhanceSourcesWithMetadata,
|
|
} = require('~/server/services/Files/Citations');
|
|
|
|
// Mock dependencies
|
|
jest.mock('~/models', () => ({
|
|
Files: {
|
|
find: jest.fn().mockResolvedValue([]),
|
|
},
|
|
}));
|
|
|
|
jest.mock('~/models/Role', () => ({
|
|
getRoleByName: jest.fn(),
|
|
}));
|
|
|
|
jest.mock('@librechat/api', () => ({
|
|
checkAccess: jest.fn().mockResolvedValue(true),
|
|
}));
|
|
|
|
jest.mock('~/cache/getLogStores', () => () => ({
|
|
get: jest.fn().mockResolvedValue({
|
|
agents: {
|
|
maxCitations: 30,
|
|
maxCitationsPerFile: 5,
|
|
minRelevanceScore: 0.45,
|
|
},
|
|
fileStrategy: 'local',
|
|
}),
|
|
set: jest.fn(),
|
|
delete: jest.fn(),
|
|
}));
|
|
|
|
jest.mock('~/config', () => ({
|
|
logger: {
|
|
debug: jest.fn(),
|
|
error: jest.fn(),
|
|
warn: jest.fn(),
|
|
},
|
|
}));
|
|
|
|
describe('processFileCitations', () => {
|
|
const mockReq = {
|
|
user: {
|
|
id: 'user123',
|
|
},
|
|
};
|
|
|
|
const mockAppConfig = {
|
|
endpoints: {
|
|
agents: {
|
|
maxCitations: 30,
|
|
maxCitationsPerFile: 5,
|
|
minRelevanceScore: 0.45,
|
|
},
|
|
},
|
|
fileStrategy: 'local',
|
|
};
|
|
|
|
const mockMetadata = {
|
|
run_id: 'run123',
|
|
thread_id: 'conv123',
|
|
};
|
|
|
|
describe('file search artifact processing', () => {
|
|
it('should process file search artifacts correctly', async () => {
|
|
const toolArtifact = {
|
|
[Tools.file_search]: {
|
|
sources: [
|
|
{
|
|
fileId: 'file_123',
|
|
fileName: 'example.pdf',
|
|
pages: [5],
|
|
relevance: 0.85,
|
|
type: 'file',
|
|
pageRelevance: { 5: 0.85 },
|
|
content: 'This is the content',
|
|
},
|
|
{
|
|
fileId: 'file_456',
|
|
fileName: 'document.txt',
|
|
pages: [],
|
|
relevance: 0.72,
|
|
type: 'file',
|
|
pageRelevance: {},
|
|
content: 'Another document',
|
|
},
|
|
],
|
|
},
|
|
};
|
|
|
|
const result = await processFileCitations({
|
|
toolArtifact,
|
|
toolCallId: 'call_123',
|
|
metadata: mockMetadata,
|
|
user: mockReq.user,
|
|
appConfig: mockAppConfig,
|
|
});
|
|
|
|
expect(result).toBeTruthy();
|
|
expect(result.type).toBe('file_search');
|
|
expect(result.file_search.sources).toHaveLength(2);
|
|
expect(result.file_search.sources[0].fileId).toBe('file_123');
|
|
expect(result.file_search.sources[0].relevance).toBe(0.85);
|
|
});
|
|
|
|
it('should return null for non-file_search tools', async () => {
|
|
const result = await processFileCitations({
|
|
toolArtifact: { other_tool: {} },
|
|
toolCallId: 'call_123',
|
|
metadata: mockMetadata,
|
|
user: mockReq.user,
|
|
appConfig: mockAppConfig,
|
|
});
|
|
|
|
expect(result).toBeNull();
|
|
});
|
|
|
|
it('should filter results below relevance threshold', async () => {
|
|
const toolArtifact = {
|
|
[Tools.file_search]: {
|
|
sources: [
|
|
{
|
|
fileId: 'file_789',
|
|
fileName: 'low_relevance.pdf',
|
|
pages: [],
|
|
relevance: 0.2,
|
|
type: 'file',
|
|
pageRelevance: {},
|
|
content: 'Low relevance content',
|
|
},
|
|
],
|
|
},
|
|
};
|
|
|
|
const result = await processFileCitations({
|
|
toolArtifact,
|
|
toolCallId: 'call_123',
|
|
metadata: mockMetadata,
|
|
user: mockReq.user,
|
|
appConfig: mockAppConfig,
|
|
});
|
|
|
|
expect(result).toBeNull();
|
|
});
|
|
|
|
it('should return null when artifact is missing file_search data', async () => {
|
|
const result = await processFileCitations({
|
|
toolArtifact: {},
|
|
toolCallId: 'call_123',
|
|
metadata: mockMetadata,
|
|
user: mockReq.user,
|
|
appConfig: mockAppConfig,
|
|
});
|
|
|
|
expect(result).toBeNull();
|
|
});
|
|
});
|
|
|
|
describe('applyCitationLimits', () => {
|
|
it('should limit citations per file and total', () => {
|
|
const sources = [
|
|
{ fileId: 'file1', relevance: 0.9 },
|
|
{ fileId: 'file1', relevance: 0.8 },
|
|
{ fileId: 'file1', relevance: 0.7 },
|
|
{ fileId: 'file2', relevance: 0.85 },
|
|
{ fileId: 'file2', relevance: 0.75 },
|
|
];
|
|
|
|
const result = applyCitationLimits(sources, 3, 2);
|
|
|
|
expect(result).toHaveLength(3);
|
|
expect(result[0].relevance).toBe(0.9);
|
|
expect(result[1].relevance).toBe(0.85);
|
|
expect(result[2].relevance).toBe(0.8);
|
|
});
|
|
});
|
|
|
|
describe('enhanceSourcesWithMetadata', () => {
|
|
const { Files } = require('~/models');
|
|
const mockCustomConfig = {
|
|
fileStrategy: 'local',
|
|
};
|
|
|
|
beforeEach(() => {
|
|
jest.clearAllMocks();
|
|
});
|
|
|
|
it('should enhance sources with file metadata from database', async () => {
|
|
const sources = [
|
|
{
|
|
fileId: 'file_123',
|
|
fileName: 'example.pdf',
|
|
relevance: 0.85,
|
|
type: 'file',
|
|
},
|
|
{
|
|
fileId: 'file_456',
|
|
fileName: 'document.txt',
|
|
relevance: 0.72,
|
|
type: 'file',
|
|
},
|
|
];
|
|
|
|
Files.find.mockResolvedValue([
|
|
{
|
|
file_id: 'file_123',
|
|
filename: 'example_from_db.pdf',
|
|
source: 's3',
|
|
},
|
|
{
|
|
file_id: 'file_456',
|
|
filename: 'document_from_db.txt',
|
|
source: 'local',
|
|
},
|
|
]);
|
|
|
|
const result = await enhanceSourcesWithMetadata(sources, mockCustomConfig);
|
|
|
|
expect(Files.find).toHaveBeenCalledWith({ file_id: { $in: ['file_123', 'file_456'] } });
|
|
expect(result).toHaveLength(2);
|
|
|
|
expect(result[0]).toEqual({
|
|
fileId: 'file_123',
|
|
fileName: 'example_from_db.pdf',
|
|
relevance: 0.85,
|
|
type: 'file',
|
|
metadata: {
|
|
storageType: 's3',
|
|
},
|
|
});
|
|
|
|
expect(result[1]).toEqual({
|
|
fileId: 'file_456',
|
|
fileName: 'document_from_db.txt',
|
|
relevance: 0.72,
|
|
type: 'file',
|
|
metadata: {
|
|
storageType: 'local',
|
|
},
|
|
});
|
|
});
|
|
|
|
it('should preserve existing metadata and source data', async () => {
|
|
const sources = [
|
|
{
|
|
fileId: 'file_123',
|
|
fileName: 'example.pdf',
|
|
relevance: 0.85,
|
|
type: 'file',
|
|
pages: [1, 2, 3],
|
|
content: 'Some content',
|
|
metadata: {
|
|
existingField: 'value',
|
|
},
|
|
},
|
|
];
|
|
|
|
Files.find.mockResolvedValue([
|
|
{
|
|
file_id: 'file_123',
|
|
filename: 'example_from_db.pdf',
|
|
source: 'gcs',
|
|
},
|
|
]);
|
|
|
|
const result = await enhanceSourcesWithMetadata(sources, mockCustomConfig);
|
|
|
|
expect(result[0]).toEqual({
|
|
fileId: 'file_123',
|
|
fileName: 'example_from_db.pdf',
|
|
relevance: 0.85,
|
|
type: 'file',
|
|
pages: [1, 2, 3],
|
|
content: 'Some content',
|
|
metadata: {
|
|
existingField: 'value',
|
|
storageType: 'gcs',
|
|
},
|
|
});
|
|
});
|
|
|
|
it('should handle missing file metadata gracefully', async () => {
|
|
const sources = [
|
|
{
|
|
fileId: 'file_789',
|
|
fileName: 'missing.pdf',
|
|
relevance: 0.9,
|
|
type: 'file',
|
|
},
|
|
];
|
|
|
|
Files.find.mockResolvedValue([]);
|
|
|
|
const result = await enhanceSourcesWithMetadata(sources, mockCustomConfig);
|
|
|
|
expect(result[0]).toEqual({
|
|
fileId: 'file_789',
|
|
fileName: 'missing.pdf',
|
|
relevance: 0.9,
|
|
type: 'file',
|
|
metadata: {
|
|
storageType: 'local', // Falls back to customConfig.fileStrategy
|
|
},
|
|
});
|
|
});
|
|
|
|
it('should handle database errors gracefully', async () => {
|
|
const sources = [
|
|
{
|
|
fileId: 'file_123',
|
|
fileName: 'example.pdf',
|
|
relevance: 0.85,
|
|
type: 'file',
|
|
},
|
|
];
|
|
|
|
Files.find.mockRejectedValue(new Error('Database error'));
|
|
|
|
const result = await enhanceSourcesWithMetadata(sources, mockCustomConfig);
|
|
|
|
expect(result[0]).toEqual({
|
|
fileId: 'file_123',
|
|
fileName: 'example.pdf',
|
|
relevance: 0.85,
|
|
type: 'file',
|
|
metadata: {
|
|
storageType: 'local',
|
|
},
|
|
});
|
|
});
|
|
|
|
it('should deduplicate file IDs when querying database', async () => {
|
|
const sources = [
|
|
{ fileId: 'file_123', fileName: 'doc1.pdf', relevance: 0.9, type: 'file' },
|
|
{ fileId: 'file_123', fileName: 'doc1.pdf', relevance: 0.8, type: 'file' },
|
|
{ fileId: 'file_456', fileName: 'doc2.pdf', relevance: 0.7, type: 'file' },
|
|
];
|
|
|
|
Files.find.mockResolvedValue([
|
|
{ file_id: 'file_123', filename: 'document1.pdf', source: 's3' },
|
|
{ file_id: 'file_456', filename: 'document2.pdf', source: 'local' },
|
|
]);
|
|
|
|
await enhanceSourcesWithMetadata(sources, mockCustomConfig);
|
|
|
|
expect(Files.find).toHaveBeenCalledWith({ file_id: { $in: ['file_123', 'file_456'] } });
|
|
});
|
|
});
|
|
});
|