mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 08:50: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
126 lines
4.4 KiB
JavaScript
126 lines
4.4 KiB
JavaScript
const fs = require('fs');
|
|
const axios = require('axios');
|
|
const FormData = require('form-data');
|
|
const { logAxiosError } = require('@librechat/api');
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const { FileSources } = require('librechat-data-provider');
|
|
const { generateShortLivedToken } = require('~/server/services/AuthService');
|
|
|
|
/**
|
|
* Deletes a file from the vector database. This function takes a file object, constructs the full path, and
|
|
* verifies the path's validity before deleting the file. If the path is invalid, an error is thrown.
|
|
*
|
|
* @param {ServerRequest} req - The request object from Express.
|
|
* @param {MongoFile} file - The file object to be deleted. It should have a `filepath` property that is
|
|
* a string representing the path of the file relative to the publicPath.
|
|
*
|
|
* @returns {Promise<void>}
|
|
* A promise that resolves when the file has been successfully deleted, or throws an error if the
|
|
* file path is invalid or if there is an error in deletion.
|
|
*/
|
|
const deleteVectors = async (req, file) => {
|
|
if (!file.embedded || !process.env.RAG_API_URL) {
|
|
return;
|
|
}
|
|
try {
|
|
const jwtToken = generateShortLivedToken(req.user.id);
|
|
|
|
return await axios.delete(`${process.env.RAG_API_URL}/documents`, {
|
|
headers: {
|
|
Authorization: `Bearer ${jwtToken}`,
|
|
'Content-Type': 'application/json',
|
|
accept: 'application/json',
|
|
},
|
|
data: [file.file_id],
|
|
});
|
|
} catch (error) {
|
|
logAxiosError({
|
|
error,
|
|
message: 'Error deleting vectors',
|
|
});
|
|
if (
|
|
error.response &&
|
|
error.response.status !== 404 &&
|
|
(error.response.status < 200 || error.response.status >= 300)
|
|
) {
|
|
logger.warn('Error deleting vectors, file will not be deleted');
|
|
throw new Error(error.message || 'An error occurred during file deletion.');
|
|
}
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Uploads a file to the configured Vector database
|
|
*
|
|
* @param {Object} params - The params object.
|
|
* @param {Object} params.req - The request object from Express. It should have a `user` property with an `id` representing the user
|
|
* @param {Express.Multer.File} params.file - The file object, which is part of the request. The file object should
|
|
* have a `path` property that points to the location of the uploaded file.
|
|
* @param {string} params.file_id - The file ID.
|
|
* @param {string} [params.entity_id] - The entity ID for shared resources.
|
|
* @param {Object} [params.storageMetadata] - Storage metadata for dual storage pattern.
|
|
*
|
|
* @returns {Promise<{ filepath: string, bytes: number }>}
|
|
* A promise that resolves to an object containing:
|
|
* - filepath: The path where the file is saved.
|
|
* - bytes: The size of the file in bytes.
|
|
*/
|
|
async function uploadVectors({ req, file, file_id, entity_id, storageMetadata }) {
|
|
if (!process.env.RAG_API_URL) {
|
|
throw new Error('RAG_API_URL not defined');
|
|
}
|
|
|
|
try {
|
|
const jwtToken = generateShortLivedToken(req.user.id);
|
|
const formData = new FormData();
|
|
formData.append('file_id', file_id);
|
|
formData.append('file', fs.createReadStream(file.path));
|
|
if (entity_id != null && entity_id) {
|
|
formData.append('entity_id', entity_id);
|
|
}
|
|
|
|
// Include storage metadata for RAG API to store with embeddings
|
|
if (storageMetadata) {
|
|
formData.append('storage_metadata', JSON.stringify(storageMetadata));
|
|
}
|
|
|
|
const formHeaders = formData.getHeaders();
|
|
|
|
const response = await axios.post(`${process.env.RAG_API_URL}/embed`, formData, {
|
|
headers: {
|
|
Authorization: `Bearer ${jwtToken}`,
|
|
accept: 'application/json',
|
|
...formHeaders,
|
|
},
|
|
});
|
|
|
|
const responseData = response.data;
|
|
logger.debug('Response from embedding file', responseData);
|
|
|
|
if (responseData.known_type === false) {
|
|
throw new Error(`File embedding failed. The filetype ${file.mimetype} is not supported`);
|
|
}
|
|
|
|
if (!responseData.status) {
|
|
throw new Error('File embedding failed.');
|
|
}
|
|
|
|
return {
|
|
bytes: file.size,
|
|
filename: file.originalname,
|
|
filepath: FileSources.vectordb,
|
|
embedded: Boolean(responseData.known_type),
|
|
};
|
|
} catch (error) {
|
|
logAxiosError({
|
|
error,
|
|
message: 'Error uploading vectors',
|
|
});
|
|
throw new Error(error.message || 'An error occurred during file upload.');
|
|
}
|
|
}
|
|
|
|
module.exports = {
|
|
deleteVectors,
|
|
uploadVectors,
|
|
};
|