mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-25 19:56:13 +01:00
⏸ refactor: Improve UX for Parallel Streams (Multi-Convo) (#11096)
* 🌊 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
This commit is contained in:
Danny Avila
GitHub
parent
9b6e7cabc9
commit
439bc98682
74 changed files with 2174 additions and 957 deletions
|
|
@ -304,6 +304,7 @@ export default function useResumableSSE(
|
|||
}
|
||||
}
|
||||
|
||||
setIsSubmitting(true);
|
||||
setShowStopButton(true);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import type {
|
|||
Agents,
|
||||
TMessage,
|
||||
PartMetadata,
|
||||
ContentMetadata,
|
||||
EventSubmission,
|
||||
TMessageContentParts,
|
||||
} from 'librechat-data-provider';
|
||||
|
|
@ -61,31 +62,41 @@ export default function useStepHandler({
|
|||
const messageMap = useRef(new Map<string, TMessage>());
|
||||
const stepMap = useRef(new Map<string, Agents.RunStep>());
|
||||
|
||||
const calculateContentIndex = (
|
||||
baseIndex: number,
|
||||
initialContent: TMessageContentParts[],
|
||||
incomingContentType: string,
|
||||
existingContent?: TMessageContentParts[],
|
||||
): number => {
|
||||
/** Only apply -1 adjustment for TEXT or THINK types when they match existing content */
|
||||
if (
|
||||
initialContent.length > 0 &&
|
||||
(incomingContentType === ContentTypes.TEXT || incomingContentType === ContentTypes.THINK)
|
||||
) {
|
||||
const targetIndex = baseIndex + initialContent.length - 1;
|
||||
const existingType = existingContent?.[targetIndex]?.type;
|
||||
if (existingType === incomingContentType) {
|
||||
return targetIndex;
|
||||
/**
|
||||
* Calculate content index for a run step.
|
||||
* For edited content scenarios, offset by initialContent length.
|
||||
*/
|
||||
const calculateContentIndex = useCallback(
|
||||
(
|
||||
serverIndex: number,
|
||||
initialContent: TMessageContentParts[],
|
||||
incomingContentType: string,
|
||||
existingContent?: TMessageContentParts[],
|
||||
): number => {
|
||||
/** Only apply -1 adjustment for TEXT or THINK types when they match existing content */
|
||||
if (
|
||||
initialContent.length > 0 &&
|
||||
(incomingContentType === ContentTypes.TEXT || incomingContentType === ContentTypes.THINK)
|
||||
) {
|
||||
const targetIndex = serverIndex + initialContent.length - 1;
|
||||
const existingType = existingContent?.[targetIndex]?.type;
|
||||
if (existingType === incomingContentType) {
|
||||
return targetIndex;
|
||||
}
|
||||
}
|
||||
}
|
||||
return baseIndex + initialContent.length;
|
||||
};
|
||||
return serverIndex + initialContent.length;
|
||||
},
|
||||
[],
|
||||
);
|
||||
|
||||
/** Metadata to propagate onto content parts for parallel rendering - uses ContentMetadata from data-provider */
|
||||
|
||||
const updateContent = (
|
||||
message: TMessage,
|
||||
index: number,
|
||||
contentPart: Agents.MessageContentComplex,
|
||||
finalUpdate = false,
|
||||
metadata?: ContentMetadata,
|
||||
) => {
|
||||
const contentType = contentPart.type ?? '';
|
||||
if (!contentType) {
|
||||
|
|
@ -99,6 +110,7 @@ export default function useStepHandler({
|
|||
if (!updatedContent[index]) {
|
||||
updatedContent[index] = { type: contentPart.type as AllContentTypes };
|
||||
}
|
||||
|
||||
/** Prevent overwriting an existing content part with a different type */
|
||||
const existingType = (updatedContent[index]?.type as string | undefined) ?? '';
|
||||
if (
|
||||
|
|
@ -196,9 +208,36 @@ export default function useStepHandler({
|
|||
};
|
||||
}
|
||||
|
||||
// Apply metadata to the content part for parallel rendering
|
||||
// This must happen AFTER all content updates to avoid being overwritten
|
||||
if (metadata?.agentId != null || metadata?.groupId != null) {
|
||||
const part = updatedContent[index] as TMessageContentParts & ContentMetadata;
|
||||
if (metadata.agentId != null) {
|
||||
part.agentId = metadata.agentId;
|
||||
}
|
||||
if (metadata.groupId != null) {
|
||||
part.groupId = metadata.groupId;
|
||||
}
|
||||
}
|
||||
|
||||
return { ...message, content: updatedContent as TMessageContentParts[] };
|
||||
};
|
||||
|
||||
/** Extract metadata from runStep for parallel content rendering */
|
||||
const getStepMetadata = (runStep: Agents.RunStep | undefined): ContentMetadata | undefined => {
|
||||
if (!runStep?.agentId && runStep?.groupId == null) {
|
||||
return undefined;
|
||||
}
|
||||
const metadata = {
|
||||
agentId: runStep.agentId,
|
||||
// Only set groupId when explicitly provided by the server
|
||||
// Sequential handoffs have agentId but no groupId
|
||||
// Parallel execution has both agentId AND groupId
|
||||
groupId: runStep.groupId,
|
||||
};
|
||||
return metadata;
|
||||
};
|
||||
|
||||
const stepHandler = useCallback(
|
||||
({ event, data }: TStepEvent, submission: EventSubmission) => {
|
||||
const messages = getMessages() || [];
|
||||
|
|
@ -212,6 +251,7 @@ export default function useStepHandler({
|
|||
}
|
||||
|
||||
let initialContent: TMessageContentParts[] = [];
|
||||
// For editedContent scenarios, use the initial response content for index offsetting
|
||||
if (submission?.editedContent != null) {
|
||||
initialContent = submission?.initialResponse?.content ?? initialContent;
|
||||
}
|
||||
|
|
@ -229,6 +269,10 @@ export default function useStepHandler({
|
|||
}
|
||||
|
||||
stepMap.current.set(runStep.id, runStep);
|
||||
|
||||
// Calculate content index - use server index, offset by initialContent for edit scenarios
|
||||
const contentIndex = runStep.index + initialContent.length;
|
||||
|
||||
let response = messageMap.current.get(responseMessageId);
|
||||
|
||||
if (!response) {
|
||||
|
|
@ -242,7 +286,8 @@ export default function useStepHandler({
|
|||
// For edit scenarios, initialContent IS the complete starting content (not to be merged)
|
||||
// For resume scenarios (no editedContent), initialContent is empty and we use existingContent
|
||||
const existingContent = responseMessage?.content ?? [];
|
||||
const mergedContent = initialContent.length > 0 ? initialContent : existingContent;
|
||||
const mergedContent: TMessageContentParts[] =
|
||||
initialContent.length > 0 ? initialContent : existingContent;
|
||||
|
||||
response = {
|
||||
...responseMessage,
|
||||
|
|
@ -288,9 +333,14 @@ export default function useStepHandler({
|
|||
},
|
||||
};
|
||||
|
||||
/** Tool calls don't need index adjustment */
|
||||
const currentIndex = runStep.index + initialContent.length;
|
||||
updatedResponse = updateContent(updatedResponse, currentIndex, contentPart);
|
||||
// Use the pre-calculated contentIndex which handles parallel agent indexing
|
||||
updatedResponse = updateContent(
|
||||
updatedResponse,
|
||||
contentIndex,
|
||||
contentPart,
|
||||
false,
|
||||
getStepMetadata(runStep),
|
||||
);
|
||||
});
|
||||
|
||||
messageMap.current.set(responseMessageId, updatedResponse);
|
||||
|
|
@ -316,7 +366,17 @@ export default function useStepHandler({
|
|||
if (response) {
|
||||
// Agent updates don't need index adjustment
|
||||
const currentIndex = agent_update.index + initialContent.length;
|
||||
const updatedResponse = updateContent(response, currentIndex, data);
|
||||
// Agent updates carry their own agentId - use default groupId if agentId is present
|
||||
const agentUpdateMeta: ContentMetadata | undefined = agent_update.agentId
|
||||
? { agentId: agent_update.agentId, groupId: 1 }
|
||||
: undefined;
|
||||
const updatedResponse = updateContent(
|
||||
response,
|
||||
currentIndex,
|
||||
data,
|
||||
false,
|
||||
agentUpdateMeta,
|
||||
);
|
||||
messageMap.current.set(responseMessageId, updatedResponse);
|
||||
const currentMessages = getMessages() || [];
|
||||
setMessages([...currentMessages.slice(0, -1), updatedResponse]);
|
||||
|
|
@ -351,8 +411,13 @@ export default function useStepHandler({
|
|||
contentPart.type || '',
|
||||
response.content,
|
||||
);
|
||||
const updatedResponse = updateContent(response, currentIndex, contentPart);
|
||||
|
||||
const updatedResponse = updateContent(
|
||||
response,
|
||||
currentIndex,
|
||||
contentPart,
|
||||
false,
|
||||
getStepMetadata(runStep),
|
||||
);
|
||||
messageMap.current.set(responseMessageId, updatedResponse);
|
||||
const currentMessages = getMessages() || [];
|
||||
setMessages([...currentMessages.slice(0, -1), updatedResponse]);
|
||||
|
|
@ -387,8 +452,13 @@ export default function useStepHandler({
|
|||
contentPart.type || '',
|
||||
response.content,
|
||||
);
|
||||
const updatedResponse = updateContent(response, currentIndex, contentPart);
|
||||
|
||||
const updatedResponse = updateContent(
|
||||
response,
|
||||
currentIndex,
|
||||
contentPart,
|
||||
false,
|
||||
getStepMetadata(runStep),
|
||||
);
|
||||
messageMap.current.set(responseMessageId, updatedResponse);
|
||||
const currentMessages = getMessages() || [];
|
||||
setMessages([...currentMessages.slice(0, -1), updatedResponse]);
|
||||
|
|
@ -432,9 +502,15 @@ export default function useStepHandler({
|
|||
contentPart.tool_call.expires_at = runStepDelta.delta.expires_at;
|
||||
}
|
||||
|
||||
/** Tool calls don't need index adjustment */
|
||||
// Use server's index, offset by initialContent for edit scenarios
|
||||
const currentIndex = runStep.index + initialContent.length;
|
||||
updatedResponse = updateContent(updatedResponse, currentIndex, contentPart);
|
||||
updatedResponse = updateContent(
|
||||
updatedResponse,
|
||||
currentIndex,
|
||||
contentPart,
|
||||
false,
|
||||
getStepMetadata(runStep),
|
||||
);
|
||||
});
|
||||
|
||||
messageMap.current.set(responseMessageId, updatedResponse);
|
||||
|
|
@ -470,9 +546,15 @@ export default function useStepHandler({
|
|||
tool_call: result.tool_call,
|
||||
};
|
||||
|
||||
/** Tool calls don't need index adjustment */
|
||||
// Use server's index, offset by initialContent for edit scenarios
|
||||
const currentIndex = runStep.index + initialContent.length;
|
||||
updatedResponse = updateContent(updatedResponse, currentIndex, contentPart, true);
|
||||
updatedResponse = updateContent(
|
||||
updatedResponse,
|
||||
currentIndex,
|
||||
contentPart,
|
||||
true,
|
||||
getStepMetadata(runStep),
|
||||
);
|
||||
|
||||
messageMap.current.set(responseMessageId, updatedResponse);
|
||||
const updatedMessages = messages.map((msg) =>
|
||||
|
|
@ -489,7 +571,7 @@ export default function useStepHandler({
|
|||
stepMap.current.clear();
|
||||
};
|
||||
},
|
||||
[getMessages, lastAnnouncementTimeRef, announcePolite, setMessages],
|
||||
[getMessages, lastAnnouncementTimeRef, announcePolite, setMessages, calculateContentIndex],
|
||||
);
|
||||
|
||||
const clearStepMaps = useCallback(() => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue