mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 17:00:15 +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
156 lines
5.1 KiB
JavaScript
156 lines
5.1 KiB
JavaScript
const { nanoid } = require('nanoid');
|
|
const { checkAccess } = require('@librechat/api');
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const {
|
|
Tools,
|
|
Permissions,
|
|
FileSources,
|
|
EModelEndpoint,
|
|
PermissionTypes,
|
|
} = require('librechat-data-provider');
|
|
const { getRoleByName } = require('~/models/Role');
|
|
const { Files } = require('~/models');
|
|
|
|
/**
|
|
* Process file search results from tool calls
|
|
* @param {Object} options
|
|
* @param {IUser} options.user - The user object
|
|
* @param {AppConfig} options.appConfig - The app configuration object
|
|
* @param {GraphRunnableConfig['configurable']} options.metadata - The metadata
|
|
* @param {any} options.toolArtifact - The tool artifact containing structured data
|
|
* @param {string} options.toolCallId - The tool call ID
|
|
* @returns {Promise<Object|null>} The file search attachment or null
|
|
*/
|
|
async function processFileCitations({ user, appConfig, toolArtifact, toolCallId, metadata }) {
|
|
try {
|
|
if (!toolArtifact?.[Tools.file_search]?.sources) {
|
|
return null;
|
|
}
|
|
|
|
if (user) {
|
|
try {
|
|
const hasFileCitationsAccess = await checkAccess({
|
|
user,
|
|
permissionType: PermissionTypes.FILE_CITATIONS,
|
|
permissions: [Permissions.USE],
|
|
getRoleByName,
|
|
});
|
|
|
|
if (!hasFileCitationsAccess) {
|
|
logger.debug(
|
|
`[processFileCitations] User ${user.id} does not have FILE_CITATIONS permission`,
|
|
);
|
|
return null;
|
|
}
|
|
} catch (error) {
|
|
logger.error(
|
|
`[processFileCitations] Permission check failed for FILE_CITATIONS: ${error.message}`,
|
|
);
|
|
logger.debug(`[processFileCitations] Proceeding with citations due to permission error`);
|
|
}
|
|
}
|
|
|
|
const maxCitations = appConfig.endpoints?.[EModelEndpoint.agents]?.maxCitations ?? 30;
|
|
const maxCitationsPerFile =
|
|
appConfig.endpoints?.[EModelEndpoint.agents]?.maxCitationsPerFile ?? 5;
|
|
const minRelevanceScore =
|
|
appConfig.endpoints?.[EModelEndpoint.agents]?.minRelevanceScore ?? 0.45;
|
|
|
|
const sources = toolArtifact[Tools.file_search].sources || [];
|
|
const filteredSources = sources.filter((source) => source.relevance >= minRelevanceScore);
|
|
if (filteredSources.length === 0) {
|
|
logger.debug(
|
|
`[processFileCitations] No sources above relevance threshold of ${minRelevanceScore}`,
|
|
);
|
|
return null;
|
|
}
|
|
|
|
const selectedSources = applyCitationLimits(filteredSources, maxCitations, maxCitationsPerFile);
|
|
const enhancedSources = await enhanceSourcesWithMetadata(selectedSources, appConfig);
|
|
|
|
if (enhancedSources.length > 0) {
|
|
const fileSearchAttachment = {
|
|
type: Tools.file_search,
|
|
[Tools.file_search]: { sources: enhancedSources },
|
|
toolCallId: toolCallId,
|
|
messageId: metadata.run_id,
|
|
conversationId: metadata.thread_id,
|
|
name: `${Tools.file_search}_file_search_results_${nanoid()}`,
|
|
};
|
|
|
|
return fileSearchAttachment;
|
|
}
|
|
|
|
return null;
|
|
} catch (error) {
|
|
logger.error('[processFileCitations] Error processing file citations:', error);
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Apply citation limits to sources
|
|
* @param {Array} sources - All sources
|
|
* @param {number} maxCitations - Maximum total citations
|
|
* @param {number} maxCitationsPerFile - Maximum citations per file
|
|
* @returns {Array} Selected sources
|
|
*/
|
|
function applyCitationLimits(sources, maxCitations, maxCitationsPerFile) {
|
|
const byFile = {};
|
|
sources.forEach((source) => {
|
|
if (!byFile[source.fileId]) {
|
|
byFile[source.fileId] = [];
|
|
}
|
|
byFile[source.fileId].push(source);
|
|
});
|
|
|
|
const representatives = [];
|
|
for (const fileId in byFile) {
|
|
const fileSources = byFile[fileId].sort((a, b) => b.relevance - a.relevance);
|
|
const selectedFromFile = fileSources.slice(0, maxCitationsPerFile);
|
|
representatives.push(...selectedFromFile);
|
|
}
|
|
|
|
return representatives.sort((a, b) => b.relevance - a.relevance).slice(0, maxCitations);
|
|
}
|
|
|
|
/**
|
|
* Enhance sources with file metadata from database
|
|
* @param {Array} sources - Selected sources
|
|
* @param {AppConfig} appConfig - Custom configuration
|
|
* @returns {Promise<Array>} Enhanced sources
|
|
*/
|
|
async function enhanceSourcesWithMetadata(sources, appConfig) {
|
|
const fileIds = [...new Set(sources.map((source) => source.fileId))];
|
|
|
|
let fileMetadataMap = {};
|
|
try {
|
|
const files = await Files.find({ file_id: { $in: fileIds } });
|
|
fileMetadataMap = files.reduce((map, file) => {
|
|
map[file.file_id] = file;
|
|
return map;
|
|
}, {});
|
|
} catch (error) {
|
|
logger.error('[enhanceSourcesWithMetadata] Error looking up file metadata:', error);
|
|
}
|
|
|
|
return sources.map((source) => {
|
|
const fileRecord = fileMetadataMap[source.fileId] || {};
|
|
const configuredStorageType = fileRecord.source || appConfig?.fileStrategy || FileSources.local;
|
|
|
|
return {
|
|
...source,
|
|
fileName: fileRecord.filename || source.fileName || 'Unknown File',
|
|
metadata: {
|
|
...source.metadata,
|
|
storageType: configuredStorageType,
|
|
},
|
|
};
|
|
});
|
|
}
|
|
|
|
module.exports = {
|
|
applyCitationLimits,
|
|
processFileCitations,
|
|
enhanceSourcesWithMetadata,
|
|
};
|