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
144 lines
4.6 KiB
JavaScript
144 lines
4.6 KiB
JavaScript
const fs = require('fs');
|
|
const path = require('path');
|
|
const sharp = require('sharp');
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const { resizeImageBuffer } = require('../images/resize');
|
|
const { updateUser, updateFile } = require('~/models');
|
|
const { saveBufferToAzure } = require('./crud');
|
|
|
|
/**
|
|
* Uploads an image file to Azure Blob Storage.
|
|
* It resizes and converts the image similar to your Firebase implementation.
|
|
*
|
|
* @param {Object} params
|
|
* @param {object} params.req - The Express request object.
|
|
* @param {Express.Multer.File} params.file - The file object.
|
|
* @param {string} params.file_id - The file id.
|
|
* @param {EModelEndpoint} params.endpoint - The endpoint parameters.
|
|
* @param {string} [params.resolution='high'] - The image resolution.
|
|
* @param {string} [params.basePath='images'] - The base folder within the container.
|
|
* @param {string} [params.containerName] - The Azure Blob container name.
|
|
* @returns {Promise<{ filepath: string, bytes: number, width: number, height: number }>}
|
|
*/
|
|
async function uploadImageToAzure({
|
|
req,
|
|
file,
|
|
file_id,
|
|
endpoint,
|
|
resolution = 'high',
|
|
basePath = 'images',
|
|
containerName,
|
|
}) {
|
|
try {
|
|
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 userId = req.user.id;
|
|
let webPBuffer;
|
|
let fileName = `${file_id}__${path.basename(inputFilePath)}`;
|
|
const targetExtension = `.${appConfig.imageOutputType}`;
|
|
|
|
if (extension.toLowerCase() === targetExtension) {
|
|
webPBuffer = resizedBuffer;
|
|
} else {
|
|
webPBuffer = await sharp(resizedBuffer).toFormat(appConfig.imageOutputType).toBuffer();
|
|
const extRegExp = new RegExp(path.extname(fileName) + '$');
|
|
fileName = fileName.replace(extRegExp, targetExtension);
|
|
if (!path.extname(fileName)) {
|
|
fileName += targetExtension;
|
|
}
|
|
}
|
|
const downloadURL = await saveBufferToAzure({
|
|
userId,
|
|
buffer: webPBuffer,
|
|
fileName,
|
|
basePath,
|
|
containerName,
|
|
});
|
|
await fs.promises.unlink(inputFilePath);
|
|
const bytes = Buffer.byteLength(webPBuffer);
|
|
return { filepath: downloadURL, bytes, width, height };
|
|
} catch (error) {
|
|
logger.error('[uploadImageToAzure] Error uploading image:', error);
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Prepares the image URL and updates the file record.
|
|
*
|
|
* @param {object} req - The Express request object.
|
|
* @param {MongoFile} file - The file object.
|
|
* @returns {Promise<[MongoFile, string]>}
|
|
*/
|
|
async function prepareAzureImageURL(req, file) {
|
|
const { filepath } = file;
|
|
const promises = [];
|
|
promises.push(updateFile({ file_id: file.file_id }));
|
|
promises.push(filepath);
|
|
return await Promise.all(promises);
|
|
}
|
|
|
|
/**
|
|
* Uploads and processes a user's avatar to Azure Blob Storage.
|
|
*
|
|
* @param {Object} params
|
|
* @param {Buffer} params.buffer - The avatar image buffer.
|
|
* @param {string} params.userId - The user's id.
|
|
* @param {string} params.manual - Flag to indicate manual update.
|
|
* @param {string} [params.agentId] - Optional agent ID if this is an agent avatar.
|
|
* @param {string} [params.basePath='images'] - The base folder within the container.
|
|
* @param {string} [params.containerName] - The Azure Blob container name.
|
|
* @returns {Promise<string>} The URL of the avatar.
|
|
*/
|
|
async function processAzureAvatar({
|
|
buffer,
|
|
userId,
|
|
manual,
|
|
agentId,
|
|
basePath = 'images',
|
|
containerName,
|
|
}) {
|
|
try {
|
|
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 downloadURL = await saveBufferToAzure({
|
|
userId,
|
|
buffer,
|
|
fileName,
|
|
basePath,
|
|
containerName,
|
|
});
|
|
const isManual = manual === 'true';
|
|
const url = `${downloadURL}?manual=${isManual}`;
|
|
|
|
// Only update user record if this is a user avatar (manual === 'true')
|
|
if (isManual && !agentId) {
|
|
await updateUser(userId, { avatar: url });
|
|
}
|
|
|
|
return url;
|
|
} catch (error) {
|
|
logger.error('[processAzureAvatar] Error uploading profile picture to Azure:', error);
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
module.exports = {
|
|
uploadImageToAzure,
|
|
prepareAzureImageURL,
|
|
processAzureAvatar,
|
|
};
|