mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-03-07 08:40:19 +01:00
* fix: remove scaleImage function that stretched vertical images * chore: lint * refactor: Simplify Image Component Usage Across Chat Parts - Removed height and width props from the Image component in various parts (Files, Part, ImageAttachment, LogContent) to streamline image rendering. - Introduced a constant for maximum image height in the Image component for consistent styling. - Updated related components to utilize the new simplified Image component structure, enhancing maintainability and reducing redundancy. * refactor: Simplify LogContent and Enhance Image Component Tests - Removed height and width properties from the ImageAttachment type in LogContent for cleaner code. - Updated the image rendering logic to rely solely on the filepath, improving clarity. - Enhanced the Image component tests with additional assertions for rendering behavior and accessibility. - Introduced new tests for OpenAIImageGen to validate image preloading and progress handling, ensuring robust functionality. --------- Co-authored-by: Danny Avila <danny@librechat.ai>
106 lines
3.1 KiB
TypeScript
106 lines
3.1 KiB
TypeScript
import { isAfter } from 'date-fns';
|
|
import React, { useMemo } from 'react';
|
|
import { imageExtRegex } from 'librechat-data-provider';
|
|
import type { TFile, TAttachment, TAttachmentMetadata } from 'librechat-data-provider';
|
|
import Image from '~/components/Chat/Messages/Content/Image';
|
|
import { useLocalize } from '~/hooks';
|
|
import LogLink from './LogLink';
|
|
|
|
interface LogContentProps {
|
|
output?: string;
|
|
renderImages?: boolean;
|
|
attachments?: TAttachment[];
|
|
}
|
|
|
|
type ImageAttachment = TFile & TAttachmentMetadata;
|
|
|
|
const LogContent: React.FC<LogContentProps> = ({ output = '', renderImages, attachments }) => {
|
|
const localize = useLocalize();
|
|
|
|
const processedContent = useMemo(() => {
|
|
if (!output) {
|
|
return '';
|
|
}
|
|
|
|
const parts = output.split('Generated files:');
|
|
return parts[0].trim();
|
|
}, [output]);
|
|
|
|
const { imageAttachments, nonImageAttachments } = useMemo(() => {
|
|
const imageAtts: ImageAttachment[] = [];
|
|
const nonImageAtts: TAttachment[] = [];
|
|
|
|
attachments?.forEach((attachment) => {
|
|
const { filepath = null } = attachment as TFile & TAttachmentMetadata;
|
|
const isImage = imageExtRegex.test(attachment.filename ?? '') && filepath != null;
|
|
if (isImage) {
|
|
imageAtts.push(attachment as ImageAttachment);
|
|
} else {
|
|
nonImageAtts.push(attachment);
|
|
}
|
|
});
|
|
|
|
return {
|
|
imageAttachments: renderImages === true ? imageAtts : null,
|
|
nonImageAttachments: nonImageAtts,
|
|
};
|
|
}, [attachments, renderImages]);
|
|
|
|
const renderAttachment = (file: TAttachment) => {
|
|
const now = new Date();
|
|
const expiresAt =
|
|
'expiresAt' in file && typeof file.expiresAt === 'number' ? new Date(file.expiresAt) : null;
|
|
const isExpired = expiresAt ? isAfter(now, expiresAt) : false;
|
|
const filename = file.filename || '';
|
|
|
|
if (isExpired) {
|
|
return `${filename} ${localize('com_download_expired')}`;
|
|
}
|
|
|
|
const fileData = file as TFile & TAttachmentMetadata;
|
|
const filepath = file.filepath || '';
|
|
|
|
// const expirationText = expiresAt
|
|
// ? ` ${localize('com_download_expires', { 0: format(expiresAt, 'MM/dd/yy HH:mm') })}`
|
|
// : ` ${localize('com_click_to_download')}`;
|
|
|
|
return (
|
|
<LogLink
|
|
href={filepath}
|
|
filename={filename}
|
|
file_id={fileData.file_id}
|
|
user={fileData.user}
|
|
source={fileData.source}
|
|
>
|
|
{'- '}
|
|
{filename} {localize('com_click_to_download')}
|
|
</LogLink>
|
|
);
|
|
};
|
|
|
|
return (
|
|
<>
|
|
{processedContent && <div>{processedContent}</div>}
|
|
{nonImageAttachments.length > 0 && (
|
|
<div>
|
|
<p>{localize('com_generated_files')}</p>
|
|
{nonImageAttachments.map((file, index) => (
|
|
<React.Fragment key={file.filepath}>
|
|
{renderAttachment(file)}
|
|
{index < nonImageAttachments.length - 1 && ', '}
|
|
</React.Fragment>
|
|
))}
|
|
</div>
|
|
)}
|
|
{imageAttachments?.map((attachment) => (
|
|
<Image
|
|
key={attachment.filepath}
|
|
altText={attachment.filename}
|
|
imagePath={attachment.filepath}
|
|
/>
|
|
))}
|
|
</>
|
|
);
|
|
};
|
|
|
|
export default LogContent;
|