Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-17 00:40:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

🛠️ fix: Ensure imageOutputType is Always Defined (#2438)

Browse source 
* avatar fix

* chore: ensure `imageOutputType` is always defined

* ci(AppService): extra test for default value

* chore: replace default value for `desiredFormat` with `EImageOutputType` enum
This commit is contained in:
Danny Avila 2024-04-16 16:34:19 -04:00 • committed by GitHub
parent bf4e64ce63
commit 3c184e9410
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/server/services/AppService.js
View file

@ -36,6 +36,7 @@ const AppService = async (app) => {
const config = (await loadCustomConfig()) ?? {};
const fileStrategy = config.fileStrategy ?? FileSources.local;
const imageOutputType = config?.imageOutputType ?? EImageOutputType.PNG;
process.env.CDN_PROVIDER = fileStrategy;
if (fileStrategy === FileSources.firebase) {
@ -58,9 +59,10 @@ const AppService = async (app) => {
if (!Object.keys(config).length) {
app.locals = {
availableTools,
fileStrategy,
socialLogins,
availableTools,
imageOutputType,
paths,
};
@ -177,12 +179,12 @@ const AppService = async (app) => {
app.locals = {
socialLogins,
availableTools,
fileStrategy,
availableTools,
imageOutputType,
fileConfig: config?.fileConfig,
interface: config?.interface,
secureImageLinks: config?.secureImageLinks,
imageOutputType: config?.imageOutputType?.toLowerCase() ?? EImageOutputType.PNG,
paths,
...endpointLocals,
};

9
api/server/services/AppService.spec.js
View file

@ -139,7 +139,6 @@ describe('AppService', () => {
);
await AppService(app);
expect(app.locals.imageOutputType).toEqual(EImageOutputType.WEBP);
});
@ -151,7 +150,15 @@ describe('AppService', () => {
);
await AppService(app);
expect(app.locals.imageOutputType).toEqual(EImageOutputType.PNG);
});
it('should default to `PNG` `imageOutputType` with no provided config', async () => {
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
Promise.resolve(undefined),
);
await AppService(app);
expect(app.locals.imageOutputType).toEqual(EImageOutputType.PNG);
});

3
api/server/services/Files/images/avatar.js
View file

@ -1,6 +1,7 @@
const sharp = require('sharp');
const fs = require('fs').promises;
const fetch = require('node-fetch');
const { EImageOutputType } = require('librechat-data-provider');
const { resizeAndConvert } = require('./resize');
const { logger } = require('~/config');
@ -20,7 +21,7 @@ const { logger } = require('~/config');
* @throws {Error} Throws an error if the user ID is undefined, the input type is invalid, the image fetching fails,
* or any other error occurs during the processing.
*/
async function resizeAvatar({ userId, input, desiredFormat }) {
async function resizeAvatar({ userId, input, desiredFormat = EImageOutputType.PNG }) {
try {
if (userId === undefined) {
throw new Error('User ID is undefined');