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
159 lines
6.1 KiB
JavaScript
159 lines
6.1 KiB
JavaScript
const fs = require('fs');
|
|
const path = require('path');
|
|
const sharp = require('sharp');
|
|
const { resizeImageBuffer } = require('../images/resize');
|
|
const { updateUser, updateFile } = require('~/models');
|
|
|
|
/**
|
|
* Converts an image file to the target format. The function first resizes the image based on the specified
|
|
* resolution.
|
|
*
|
|
* If the original image is already in target format, it writes the resized image back. Otherwise,
|
|
* it converts the image to target format before saving.
|
|
*
|
|
* The original image is deleted after conversion.
|
|
* @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 {EModelEndpoint} params.endpoint - The params object.
|
|
* @param {string} [params.resolution='high'] - Optional. The desired resolution for the image resizing. Default is 'high'.
|
|
*
|
|
* @returns {Promise<{ filepath: string, bytes: number, width: number, height: number}>}
|
|
* A promise that resolves to an object containing:
|
|
* - filepath: The path where the converted image is saved.
|
|
* - bytes: The size of the converted image in bytes.
|
|
* - width: The width of the converted image.
|
|
* - height: The height of the converted image.
|
|
*/
|
|
async function uploadLocalImage({ req, file, file_id, endpoint, resolution = 'high' }) {
|
|
const appConfig = req.config;
|
|
const inputFilePath = file.path;
|
|
const inputBuffer = await fs.promises.readFile(inputFilePath);
|
|
const {
|
|
buffer: resizedBuffer,
|
|
width,
|
|
height,
|
|
} = await resizeImageBuffer(inputBuffer, resolution, endpoint);
|
|
const extension = path.extname(inputFilePath);
|
|
|
|
const { imageOutput } = appConfig.paths;
|
|
const userPath = path.join(imageOutput, req.user.id);
|
|
|
|
if (!fs.existsSync(userPath)) {
|
|
fs.mkdirSync(userPath, { recursive: true });
|
|
}
|
|
|
|
const fileName = `${file_id}__${path.basename(inputFilePath)}`;
|
|
const newPath = path.join(userPath, fileName);
|
|
const targetExtension = `.${appConfig.imageOutputType}`;
|
|
|
|
if (extension.toLowerCase() === targetExtension) {
|
|
const bytes = Buffer.byteLength(resizedBuffer);
|
|
await fs.promises.writeFile(newPath, resizedBuffer);
|
|
const filepath = path.posix.join('/', 'images', req.user.id, path.basename(newPath));
|
|
return { filepath, bytes, width, height };
|
|
}
|
|
|
|
const outputFilePath = newPath.replace(extension, targetExtension);
|
|
const data = await sharp(resizedBuffer).toFormat(appConfig.imageOutputType).toBuffer();
|
|
await fs.promises.writeFile(outputFilePath, data);
|
|
const bytes = Buffer.byteLength(data);
|
|
const filepath = path.posix.join('/', 'images', req.user.id, path.basename(outputFilePath));
|
|
await fs.promises.unlink(inputFilePath);
|
|
return { filepath, bytes, width, height };
|
|
}
|
|
|
|
/**
|
|
* Encodes an image file to base64.
|
|
* @param {string} imagePath - The path to the image file.
|
|
* @returns {Promise<string>} A promise that resolves with the base64 encoded image data.
|
|
*/
|
|
function encodeImage(imagePath) {
|
|
return new Promise((resolve, reject) => {
|
|
fs.readFile(imagePath, (err, data) => {
|
|
if (err) {
|
|
reject(err);
|
|
} else {
|
|
resolve(data.toString('base64'));
|
|
}
|
|
});
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Local: Updates the file and encodes the image to base64,
|
|
* for image payload handling: tuple order of [filepath, base64].
|
|
* @param {Object} req - The request object.
|
|
* @param {MongoFile} file - The file object.
|
|
* @returns {Promise<[MongoFile, string]>} - A promise that resolves to an array of results from updateFile and encodeImage.
|
|
*/
|
|
async function prepareImagesLocal(req, file) {
|
|
const appConfig = req.config;
|
|
const { publicPath, imageOutput } = appConfig.paths;
|
|
const userPath = path.join(imageOutput, req.user.id);
|
|
|
|
if (!fs.existsSync(userPath)) {
|
|
fs.mkdirSync(userPath, { recursive: true });
|
|
}
|
|
const filepath = path.join(publicPath, file.filepath);
|
|
|
|
const promises = [];
|
|
promises.push(updateFile({ file_id: file.file_id }));
|
|
promises.push(encodeImage(filepath));
|
|
return await Promise.all(promises);
|
|
}
|
|
|
|
/**
|
|
* Uploads a user's avatar to local server storage and returns the URL.
|
|
* If the 'manual' flag is set to 'true', it also updates the user's avatar URL in the database.
|
|
*
|
|
* @param {object} params - The parameters object.
|
|
* @param {Buffer} params.buffer - The Buffer containing the avatar image.
|
|
* @param {string} params.userId - The user ID.
|
|
* @param {string} params.manual - A string flag indicating whether the update is manual ('true' or 'false').
|
|
* @param {string} [params.agentId] - Optional agent ID if this is an agent avatar.
|
|
* @returns {Promise<string>} - A promise that resolves with the URL of the uploaded avatar.
|
|
* @throws {Error} - Throws an error if Firebase is not initialized or if there is an error in uploading.
|
|
*/
|
|
async function processLocalAvatar({ buffer, userId, manual, agentId }) {
|
|
const userDir = path.resolve(
|
|
__dirname,
|
|
'..',
|
|
'..',
|
|
'..',
|
|
'..',
|
|
'..',
|
|
'client',
|
|
'public',
|
|
'images',
|
|
userId,
|
|
);
|
|
|
|
const metadata = await sharp(buffer).metadata();
|
|
const extension = metadata.format === 'gif' ? 'gif' : 'png';
|
|
|
|
const timestamp = new Date().getTime();
|
|
/** Unique filename with timestamp and optional agent ID */
|
|
const fileName = agentId
|
|
? `agent-${agentId}-avatar-${timestamp}.${extension}`
|
|
: `avatar-${timestamp}.${extension}`;
|
|
const urlRoute = `/images/${userId}/${fileName}`;
|
|
const avatarPath = path.join(userDir, fileName);
|
|
|
|
await fs.promises.mkdir(userDir, { recursive: true });
|
|
await fs.promises.writeFile(avatarPath, buffer);
|
|
|
|
const isManual = manual === 'true';
|
|
let url = `${urlRoute}?manual=${isManual}`;
|
|
|
|
// Only update user record if this is a user avatar (manual === 'true')
|
|
if (isManual && !agentId) {
|
|
await updateUser(userId, { avatar: url });
|
|
}
|
|
|
|
return url;
|
|
}
|
|
|
|
module.exports = { uploadLocalImage, encodeImage, prepareImagesLocal, processLocalAvatar };
|