mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-08 11:38:51 +01:00
* 🌊 feat: Implement multi-conversation feature with added conversation context and payload adjustments
* refactor: Replace isSubmittingFamily with isSubmitting across message components for consistency
* feat: Add loadAddedAgent and processAddedConvo for multi-conversation agent execution
* refactor: Update ContentRender usage to conditionally render PlaceholderRow based on isLast and isSubmitting
* WIP: first pass, sibling index
* feat: Enhance multi-conversation support with agent tracking and display improvements
* refactor: Introduce isEphemeralAgentId utility and update related logic for agent handling
* refactor: Implement createDualMessageContent utility for sibling message display and enhance useStepHandler for added conversations
* refactor: duplicate tools for added agent if ephemeral and primary agent is also ephemeral
* chore: remove deprecated multimessage rendering
* refactor: enhance dual message content creation and agent handling for parallel rendering
* refactor: streamline message rendering and submission handling by removing unused state and optimizing conditional logic
* refactor: adjust content handling in parallel mode to utilize existing content for improved agent display
* refactor: update @librechat/agents dependency to version 3.0.53
* refactor: update @langchain/core and @librechat/agents dependencies to latest versions
* refactor: remove deprecated @langchain/core dependency from package.json
* chore: remove unused SearchToolConfig and GetSourcesParams types from web.ts
* refactor: remove unused message properties from Message component
* refactor: enhance parallel content handling with groupId support in ContentParts and useStepHandler
* refactor: implement parallel content styling in Message, MessageRender, and ContentRender components. use explicit model name
* refactor: improve agent ID handling in createDualMessageContent for dual message display
* refactor: simplify title generation in AddedConvo by removing unused sender and preset logic
* refactor: replace string interpolation with cn utility for className in HoverButtons component
* refactor: enhance agent ID handling by adding suffix management for parallel agents and updating related components
* refactor: enhance column ordering in ContentParts by sorting agents with suffix management
* refactor: update @librechat/agents dependency to version 3.0.55
* feat: implement parallel content rendering with metadata support
- Added `ParallelContentRenderer` and `ParallelColumns` components for rendering messages in parallel based on groupId and agentId.
- Introduced `contentMetadataMap` to store metadata for each content part, allowing efficient parallel content detection.
- Updated `Message` and `ContentRender` components to utilize the new metadata structure for rendering.
- Modified `useStepHandler` to manage content indices and metadata during message processing.
- Enhanced `IJobStore` interface and its implementations to support storing and retrieving content metadata.
- Updated data schemas to include `contentMetadataMap` for messages, enabling multi-agent and parallel execution scenarios.
* refactor: update @librechat/agents dependency to version 3.0.56
* refactor: remove unused EPHEMERAL_AGENT_ID constant and simplify agent ID check
* refactor: enhance multi-agent message processing and primary agent determination
* refactor: implement branch message functionality for parallel responses
* refactor: integrate added conversation retrieval into message editing and regeneration processes
* refactor: remove unused isCard and isMultiMessage props from MessageRender and ContentRender components
* refactor: update @librechat/agents dependency to version 3.0.60
* refactor: replace usage of EPHEMERAL_AGENT_ID constant with isEphemeralAgentId function for improved clarity and consistency
* refactor: standardize agent ID format in tests for consistency
* chore: move addedConvo property to the correct position in payload construction
* refactor: rename agent_id values in loadAgent tests for clarity
* chore: reorder props in ContentParts component for improved readability
* refactor: rename variable 'content' to 'result' for clarity in RedisJobStore tests
* refactor: streamline useMessageActions by removing duplicate handleFeedback assignment
* chore: revert placeholder rendering logic MessageRender and ContentRender components to original
* refactor: implement useContentMetadata hook for optimized content metadata handling
* refactor: remove contentMetadataMap and related logic from the codebase and revert back to agentId/groupId in content parts
- Eliminated contentMetadataMap from various components and services, simplifying the handling of message content.
- Updated functions to directly access agentId and groupId from content parts instead of relying on a separate metadata map.
- Adjusted related hooks and components to reflect the removal of contentMetadataMap, ensuring consistent handling of message content.
- Updated tests and documentation to align with the new structure of message content handling.
* refactor: remove logging from groupParallelContent function to clean up output
* refactor: remove model parameter from TBranchMessageRequest type for simplification
* refactor: enhance branch message creation by stripping metadata for standalone content
* chore: streamline branch message creation by simplifying content filtering and removing unnecessary metadata checks
* refactor: include attachments in branch message creation for improved content handling
* refactor: streamline agent content processing by consolidating primary agent identification and filtering logic
* refactor: simplify multi-agent message processing by creating a dedicated mapping method and enhancing content filtering
* refactor: remove unused parameter from loadEphemeralAgent function for cleaner code
* refactor: update groupId handling in metadata to only set when provided by the server
276 lines
7.4 KiB
TypeScript
276 lines
7.4 KiB
TypeScript
import React, { useState, useMemo, memo } from 'react';
|
|
import { useRecoilState } from 'recoil';
|
|
import type { TConversation, TMessage, TFeedback } from 'librechat-data-provider';
|
|
import { EditIcon, Clipboard, CheckMark, ContinueIcon, RegenerateIcon } from '@librechat/client';
|
|
import { useGenerationsByLatest, useLocalize } from '~/hooks';
|
|
import { Fork } from '~/components/Conversations';
|
|
import MessageAudio from './MessageAudio';
|
|
import Feedback from './Feedback';
|
|
import { cn } from '~/utils';
|
|
import store from '~/store';
|
|
|
|
type THoverButtons = {
|
|
isEditing: boolean;
|
|
enterEdit: (cancel?: boolean) => void;
|
|
copyToClipboard: (setIsCopied: React.Dispatch<React.SetStateAction<boolean>>) => void;
|
|
conversation: TConversation | null;
|
|
isSubmitting: boolean;
|
|
message: TMessage;
|
|
regenerate: () => void;
|
|
handleContinue: (e: React.MouseEvent<HTMLButtonElement>) => void;
|
|
latestMessage: TMessage | null;
|
|
isLast: boolean;
|
|
index: number;
|
|
handleFeedback?: ({ feedback }: { feedback: TFeedback | undefined }) => void;
|
|
};
|
|
|
|
type HoverButtonProps = {
|
|
id?: string;
|
|
onClick: (e?: React.MouseEvent<HTMLButtonElement>) => void;
|
|
title: string;
|
|
icon: React.ReactNode;
|
|
isActive?: boolean;
|
|
isVisible?: boolean;
|
|
isDisabled?: boolean;
|
|
isLast?: boolean;
|
|
className?: string;
|
|
buttonStyle?: string;
|
|
};
|
|
|
|
const extractMessageContent = (message: TMessage): string => {
|
|
if (typeof message.content === 'string') {
|
|
return message.content;
|
|
}
|
|
|
|
if (Array.isArray(message.content)) {
|
|
return message.content
|
|
.map((part) => {
|
|
if (part == null) {
|
|
return '';
|
|
}
|
|
if (typeof part === 'string') {
|
|
return part;
|
|
}
|
|
if ('text' in part) {
|
|
return part.text || '';
|
|
}
|
|
if ('think' in part) {
|
|
const think = part.think;
|
|
if (typeof think === 'string') {
|
|
return think;
|
|
}
|
|
return think && 'text' in think ? think.text || '' : '';
|
|
}
|
|
return '';
|
|
})
|
|
.join('');
|
|
}
|
|
|
|
return message.text || '';
|
|
};
|
|
|
|
const HoverButton = memo(
|
|
({
|
|
id,
|
|
onClick,
|
|
title,
|
|
icon,
|
|
isActive = false,
|
|
isVisible = true,
|
|
isDisabled = false,
|
|
isLast = false,
|
|
className = '',
|
|
}: HoverButtonProps) => {
|
|
const buttonStyle = cn(
|
|
'hover-button rounded-lg p-1.5 text-text-secondary-alt transition-colors duration-200',
|
|
'hover:text-text-primary hover:bg-surface-hover',
|
|
'md:group-hover:visible md:group-focus-within:visible md:group-[.final-completion]:visible',
|
|
!isLast && 'md:opacity-0 md:group-hover:opacity-100 md:group-focus-within:opacity-100',
|
|
!isVisible && 'opacity-0',
|
|
'focus-visible:ring-2 focus-visible:ring-black dark:focus-visible:ring-white focus-visible:outline-none',
|
|
isActive && isVisible && 'active text-text-primary bg-surface-hover',
|
|
className,
|
|
);
|
|
|
|
return (
|
|
<button
|
|
id={id}
|
|
className={buttonStyle}
|
|
onClick={onClick}
|
|
type="button"
|
|
title={title}
|
|
disabled={isDisabled}
|
|
>
|
|
{icon}
|
|
</button>
|
|
);
|
|
},
|
|
);
|
|
|
|
HoverButton.displayName = 'HoverButton';
|
|
|
|
const HoverButtons = ({
|
|
index,
|
|
isEditing,
|
|
enterEdit,
|
|
copyToClipboard,
|
|
conversation,
|
|
isSubmitting,
|
|
message,
|
|
regenerate,
|
|
handleContinue,
|
|
latestMessage,
|
|
isLast,
|
|
handleFeedback,
|
|
}: THoverButtons) => {
|
|
const localize = useLocalize();
|
|
const [isCopied, setIsCopied] = useState(false);
|
|
const [TextToSpeech] = useRecoilState<boolean>(store.textToSpeech);
|
|
|
|
const endpoint = useMemo(() => {
|
|
if (!conversation) {
|
|
return '';
|
|
}
|
|
return conversation.endpointType ?? conversation.endpoint;
|
|
}, [conversation]);
|
|
|
|
const generationCapabilities = useGenerationsByLatest({
|
|
isEditing,
|
|
isSubmitting,
|
|
error: message.error,
|
|
endpoint: endpoint ?? '',
|
|
messageId: message.messageId,
|
|
searchResult: message.searchResult,
|
|
finish_reason: message.finish_reason,
|
|
isCreatedByUser: message.isCreatedByUser,
|
|
latestMessageId: latestMessage?.messageId,
|
|
});
|
|
|
|
const {
|
|
hideEditButton,
|
|
regenerateEnabled,
|
|
continueSupported,
|
|
forkingSupported,
|
|
isEditableEndpoint,
|
|
} = generationCapabilities;
|
|
|
|
if (!conversation) {
|
|
return null;
|
|
}
|
|
|
|
const { isCreatedByUser, error } = message;
|
|
|
|
if (error === true) {
|
|
return (
|
|
<div className="visible flex justify-center self-end lg:justify-start">
|
|
{regenerateEnabled && (
|
|
<HoverButton
|
|
onClick={regenerate}
|
|
title={localize('com_ui_regenerate')}
|
|
icon={<RegenerateIcon size="19" />}
|
|
isLast={isLast}
|
|
/>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
const onEdit = () => {
|
|
if (isEditing) {
|
|
return enterEdit(true);
|
|
}
|
|
enterEdit();
|
|
};
|
|
|
|
const handleCopy = () => copyToClipboard(setIsCopied);
|
|
|
|
return (
|
|
<div className="group visible flex justify-center gap-0.5 self-end focus-within:outline-none lg:justify-start">
|
|
{/* Text to Speech */}
|
|
{TextToSpeech && (
|
|
<MessageAudio
|
|
index={index}
|
|
isLast={isLast}
|
|
messageId={message.messageId}
|
|
content={extractMessageContent(message)}
|
|
renderButton={(props) => (
|
|
<HoverButton
|
|
onClick={props.onClick}
|
|
title={props.title}
|
|
icon={props.icon}
|
|
isActive={props.isActive}
|
|
isLast={isLast}
|
|
/>
|
|
)}
|
|
/>
|
|
)}
|
|
|
|
{/* Copy Button */}
|
|
<HoverButton
|
|
onClick={handleCopy}
|
|
title={
|
|
isCopied ? localize('com_ui_copied_to_clipboard') : localize('com_ui_copy_to_clipboard')
|
|
}
|
|
icon={isCopied ? <CheckMark className="h-[18px] w-[18px]" /> : <Clipboard size="19" />}
|
|
isLast={isLast}
|
|
className={cn(
|
|
'ml-0 flex items-center gap-1.5 text-xs',
|
|
isSubmitting && isCreatedByUser ? 'md:opacity-0 md:group-hover:opacity-100' : '',
|
|
)}
|
|
/>
|
|
|
|
{/* Edit Button */}
|
|
{isEditableEndpoint && (
|
|
<HoverButton
|
|
id={`edit-${message.messageId}`}
|
|
onClick={onEdit}
|
|
title={localize('com_ui_edit')}
|
|
icon={<EditIcon size="19" />}
|
|
isActive={isEditing}
|
|
isVisible={!hideEditButton}
|
|
isDisabled={hideEditButton}
|
|
isLast={isLast}
|
|
className={isCreatedByUser ? '' : 'active'}
|
|
/>
|
|
)}
|
|
|
|
{/* Fork Button */}
|
|
<Fork
|
|
messageId={message.messageId}
|
|
conversationId={conversation.conversationId}
|
|
forkingSupported={forkingSupported}
|
|
latestMessageId={latestMessage?.messageId}
|
|
isLast={isLast}
|
|
/>
|
|
|
|
{/* Feedback Buttons */}
|
|
{!isCreatedByUser && handleFeedback != null && (
|
|
<Feedback handleFeedback={handleFeedback} feedback={message.feedback} isLast={isLast} />
|
|
)}
|
|
|
|
{/* Regenerate Button */}
|
|
{regenerateEnabled && (
|
|
<HoverButton
|
|
onClick={regenerate}
|
|
title={localize('com_ui_regenerate')}
|
|
icon={<RegenerateIcon size="19" />}
|
|
isLast={isLast}
|
|
className="active"
|
|
/>
|
|
)}
|
|
|
|
{/* Continue Button */}
|
|
{continueSupported && (
|
|
<HoverButton
|
|
onClick={(e) => e && handleContinue(e)}
|
|
title={localize('com_ui_continue')}
|
|
icon={<ContinueIcon className="w-19 h-19 -rotate-180" />}
|
|
isLast={isLast}
|
|
className="active"
|
|
/>
|
|
)}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
export default memo(HoverButtons);
|