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
221 lines
6.6 KiB
JavaScript
221 lines
6.6 KiB
JavaScript
const axios = require('axios');
|
|
const { logAxiosError } = require('@librechat/api');
|
|
const {
|
|
FileSources,
|
|
VisionModes,
|
|
ImageDetail,
|
|
ContentTypes,
|
|
EModelEndpoint,
|
|
} = require('librechat-data-provider');
|
|
const { getStrategyFunctions } = require('~/server/services/Files/strategies');
|
|
|
|
/**
|
|
* Converts a readable stream to a base64 encoded string.
|
|
*
|
|
* @param {NodeJS.ReadableStream} stream - The readable stream to convert.
|
|
* @param {boolean} [destroyStream=true] - Whether to destroy the stream after processing.
|
|
* @returns {Promise<string>} - Promise resolving to the base64 encoded content.
|
|
*/
|
|
async function streamToBase64(stream, destroyStream = true) {
|
|
return new Promise((resolve, reject) => {
|
|
const chunks = [];
|
|
|
|
stream.on('data', (chunk) => {
|
|
chunks.push(chunk);
|
|
});
|
|
|
|
stream.on('end', () => {
|
|
try {
|
|
const buffer = Buffer.concat(chunks);
|
|
const base64Data = buffer.toString('base64');
|
|
chunks.length = 0; // Clear the array
|
|
resolve(base64Data);
|
|
} catch (err) {
|
|
reject(err);
|
|
}
|
|
});
|
|
|
|
stream.on('error', (error) => {
|
|
chunks.length = 0;
|
|
reject(error);
|
|
});
|
|
}).finally(() => {
|
|
// Clean up the stream if required
|
|
if (destroyStream && stream.destroy && typeof stream.destroy === 'function') {
|
|
stream.destroy();
|
|
}
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Fetches an image from a URL and returns its base64 representation.
|
|
*
|
|
* @async
|
|
* @param {string} url The URL of the image.
|
|
* @returns {Promise<string>} The base64-encoded string of the image.
|
|
* @throws {Error} If there's an issue fetching the image or encoding it.
|
|
*/
|
|
async function fetchImageToBase64(url) {
|
|
try {
|
|
const response = await axios.get(url, {
|
|
responseType: 'arraybuffer',
|
|
});
|
|
const base64Data = Buffer.from(response.data).toString('base64');
|
|
response.data = null;
|
|
return base64Data;
|
|
} catch (error) {
|
|
const message = 'Error fetching image to convert to base64';
|
|
throw new Error(logAxiosError({ message, error }));
|
|
}
|
|
}
|
|
|
|
const base64Only = new Set([
|
|
EModelEndpoint.google,
|
|
EModelEndpoint.anthropic,
|
|
'Ollama',
|
|
'ollama',
|
|
EModelEndpoint.bedrock,
|
|
]);
|
|
|
|
const blobStorageSources = new Set([FileSources.azure_blob, FileSources.s3]);
|
|
|
|
/**
|
|
* Encodes and formats the given files.
|
|
* @param {ServerRequest} req - The request object.
|
|
* @param {Array<MongoFile>} files - The array of files to encode and format.
|
|
* @param {EModelEndpoint} [endpoint] - Optional: The endpoint for the image.
|
|
* @param {string} [mode] - Optional: The endpoint mode for the image.
|
|
* @returns {Promise<{ text: string; files: MongoFile[]; image_urls: MessageContentImageUrl[] }>} - A promise that resolves to the result object containing the encoded images and file details.
|
|
*/
|
|
async function encodeAndFormat(req, files, endpoint, mode) {
|
|
const promises = [];
|
|
/** @type {Record<FileSources, Pick<ReturnType<typeof getStrategyFunctions>, 'prepareImagePayload' | 'getDownloadStream'>>} */
|
|
const encodingMethods = {};
|
|
/** @type {{ text: string; files: MongoFile[]; image_urls: MessageContentImageUrl[] }} */
|
|
const result = {
|
|
text: '',
|
|
files: [],
|
|
image_urls: [],
|
|
};
|
|
|
|
if (!files || !files.length) {
|
|
return result;
|
|
}
|
|
|
|
for (let file of files) {
|
|
/** @type {FileSources} */
|
|
const source = file.source ?? FileSources.local;
|
|
if (source === FileSources.text && file.text) {
|
|
result.text += `${!result.text ? 'Attached document(s):\n```md' : '\n\n---\n\n'}# "${file.filename}"\n${file.text}\n`;
|
|
}
|
|
|
|
if (!file.height) {
|
|
promises.push([file, null]);
|
|
continue;
|
|
}
|
|
|
|
if (!encodingMethods[source]) {
|
|
const { prepareImagePayload, getDownloadStream } = getStrategyFunctions(source);
|
|
if (!prepareImagePayload) {
|
|
throw new Error(`Encoding function not implemented for ${source}`);
|
|
}
|
|
|
|
encodingMethods[source] = { prepareImagePayload, getDownloadStream };
|
|
}
|
|
|
|
const preparePayload = encodingMethods[source].prepareImagePayload;
|
|
/* We need to fetch the image and convert it to base64 if we are using S3/Azure Blob storage. */
|
|
if (blobStorageSources.has(source)) {
|
|
try {
|
|
const downloadStream = encodingMethods[source].getDownloadStream;
|
|
let stream = await downloadStream(req, file.filepath);
|
|
let base64Data = await streamToBase64(stream);
|
|
stream = null;
|
|
promises.push([file, base64Data]);
|
|
base64Data = null;
|
|
continue;
|
|
} catch (error) {
|
|
// Error handling code
|
|
}
|
|
} else if (source !== FileSources.local && base64Only.has(endpoint)) {
|
|
const [_file, imageURL] = await preparePayload(req, file);
|
|
promises.push([_file, await fetchImageToBase64(imageURL)]);
|
|
continue;
|
|
}
|
|
promises.push(preparePayload(req, file));
|
|
}
|
|
|
|
if (result.text) {
|
|
result.text += '\n```';
|
|
}
|
|
|
|
const detail = req.body.imageDetail ?? ImageDetail.auto;
|
|
|
|
/** @type {Array<[MongoFile, string]>} */
|
|
const formattedImages = await Promise.all(promises);
|
|
promises.length = 0;
|
|
|
|
for (const [file, imageContent] of formattedImages) {
|
|
const fileMetadata = {
|
|
type: file.type,
|
|
file_id: file.file_id,
|
|
filepath: file.filepath,
|
|
filename: file.filename,
|
|
embedded: !!file.embedded,
|
|
metadata: file.metadata,
|
|
};
|
|
|
|
if (file.height && file.width) {
|
|
fileMetadata.height = file.height;
|
|
fileMetadata.width = file.width;
|
|
}
|
|
|
|
if (!imageContent) {
|
|
result.files.push(fileMetadata);
|
|
continue;
|
|
}
|
|
|
|
const imagePart = {
|
|
type: ContentTypes.IMAGE_URL,
|
|
image_url: {
|
|
url: imageContent.startsWith('http')
|
|
? imageContent
|
|
: `data:${file.type};base64,${imageContent}`,
|
|
detail,
|
|
},
|
|
};
|
|
|
|
if (mode === VisionModes.agents) {
|
|
result.image_urls.push({ ...imagePart });
|
|
result.files.push({ ...fileMetadata });
|
|
continue;
|
|
}
|
|
|
|
if (endpoint && endpoint === EModelEndpoint.google && mode === VisionModes.generative) {
|
|
delete imagePart.image_url;
|
|
imagePart.inlineData = {
|
|
mimeType: file.type,
|
|
data: imageContent,
|
|
};
|
|
} else if (endpoint && endpoint === EModelEndpoint.google) {
|
|
imagePart.image_url = imagePart.image_url.url;
|
|
} else if (endpoint && endpoint === EModelEndpoint.anthropic) {
|
|
imagePart.type = 'image';
|
|
imagePart.source = {
|
|
type: 'base64',
|
|
media_type: file.type,
|
|
data: imageContent,
|
|
};
|
|
delete imagePart.image_url;
|
|
}
|
|
|
|
result.image_urls.push({ ...imagePart });
|
|
result.files.push({ ...fileMetadata });
|
|
}
|
|
formattedImages.length = 0;
|
|
return { ...result };
|
|
}
|
|
|
|
module.exports = {
|
|
encodeAndFormat,
|
|
};
|