mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-03-09 09:32:36 +01:00
* refactor: process code output files for re-use (WIP) * feat: file attachment handling with additional metadata for downloads * refactor: Update directory path logic for local file saving based on basePath * refactor: file attachment handling to support TFile type and improve data merging logic * feat: thread filtering of code-generated files - Introduced parentMessageId parameter in addedConvo and initialize functions to enhance thread management. - Updated related methods to utilize parentMessageId for retrieving messages and filtering code-generated files by conversation threads. - Enhanced type definitions to include parentMessageId in relevant interfaces for better clarity and usage. * chore: imports/params ordering * feat: update file model to use messageId for filtering and processing - Changed references from 'message' to 'messageId' in file-related methods for consistency. - Added messageId field to the file schema and updated related types. - Enhanced file processing logic to accommodate the new messageId structure. * feat: enhance file retrieval methods to support user-uploaded execute_code files - Added a new method `getUserCodeFiles` to retrieve user-uploaded execute_code files, excluding code-generated files. - Updated existing file retrieval methods to improve filtering logic and handle edge cases. - Enhanced thread data extraction to collect both message IDs and file IDs efficiently. - Integrated `getUserCodeFiles` into relevant endpoints for better file management in conversations. * chore: update @librechat/agents package version to 3.0.78 in package-lock.json and related package.json files * refactor: file processing and retrieval logic - Added a fallback mechanism for download URLs when files exceed size limits or cannot be processed locally. - Implemented a deduplication strategy for code-generated files based on conversationId and filename to optimize storage. - Updated file retrieval methods to ensure proper filtering by messageIds, preventing orphaned files from being included. - Introduced comprehensive tests for new thread data extraction functionality, covering edge cases and performance considerations. * fix: improve file retrieval tests and handling of optional properties - Updated tests to safely access optional properties using non-null assertions. - Modified test descriptions for clarity regarding the exclusion of execute_code files. - Ensured that the retrieval logic correctly reflects the expected outcomes for file queries. * test: add comprehensive unit tests for processCodeOutput functionality - Introduced a new test suite for the processCodeOutput function, covering various scenarios including file retrieval, creation, and processing for both image and non-image files. - Implemented mocks for dependencies such as axios, logger, and file models to isolate tests and ensure reliable outcomes. - Validated behavior for existing files, new file creation, and error handling, including size limits and fallback mechanisms. - Enhanced test coverage for metadata handling and usage increment logic, ensuring robust verification of file processing outcomes. * test: enhance file size limit enforcement in processCodeOutput tests - Introduced a configurable file size limit for tests to improve flexibility and coverage. - Mocked the `librechat-data-provider` to allow dynamic adjustment of file size limits during tests. - Updated the file size limit enforcement test to validate behavior when files exceed specified limits, ensuring proper fallback to download URLs. - Reset file size limit after tests to maintain isolation for subsequent test cases.
119 lines
3.4 KiB
TypeScript
119 lines
3.4 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 & {
|
|
height: number;
|
|
width: number;
|
|
};
|
|
|
|
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 { width, height, filepath = null } = attachment as TFile & TAttachmentMetadata;
|
|
const isImage =
|
|
imageExtRegex.test(attachment.filename ?? '') &&
|
|
width != null &&
|
|
height != null &&
|
|
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, index) => {
|
|
const { width, height, filepath } = attachment;
|
|
return (
|
|
<Image
|
|
key={index}
|
|
altText={attachment.filename}
|
|
imagePath={filepath}
|
|
height={height}
|
|
width={width}
|
|
/>
|
|
);
|
|
})}
|
|
</>
|
|
);
|
|
};
|
|
|
|
export default LogContent;
|