mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-15 06:58:51 +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:
parent
9b6e7cabc9
commit
439bc98682
74 changed files with 2174 additions and 957 deletions
|
|
@ -238,8 +238,8 @@ class GenerationJobManagerClass {
|
|||
if (currentRuntime.allSubscribersLeftHandlers) {
|
||||
this.jobStore
|
||||
.getContentParts(streamId)
|
||||
.then((content) => {
|
||||
const parts = content ?? [];
|
||||
.then((result) => {
|
||||
const parts = result?.content ?? [];
|
||||
for (const handler of currentRuntime.allSubscribersLeftHandlers ?? []) {
|
||||
try {
|
||||
handler(parts);
|
||||
|
|
@ -426,7 +426,8 @@ class GenerationJobManagerClass {
|
|||
}
|
||||
|
||||
// Get content before clearing state
|
||||
const content = (await this.jobStore.getContentParts(streamId)) ?? [];
|
||||
const result = await this.jobStore.getContentParts(streamId);
|
||||
const content = result?.content ?? [];
|
||||
|
||||
// Detect "early abort" - aborted before any generation happened (e.g., during tool loading)
|
||||
// In this case, no messages were saved to DB, so frontend shouldn't navigate to conversation
|
||||
|
|
@ -765,7 +766,8 @@ class GenerationJobManagerClass {
|
|||
return null;
|
||||
}
|
||||
|
||||
const aggregatedContent = (await this.jobStore.getContentParts(streamId)) ?? [];
|
||||
const result = await this.jobStore.getContentParts(streamId);
|
||||
const aggregatedContent = result?.content ?? [];
|
||||
const runSteps = await this.jobStore.getRunSteps(streamId);
|
||||
|
||||
logger.debug(`[GenerationJobManager] getResumeState:`, {
|
||||
|
|
@ -872,7 +874,8 @@ class GenerationJobManagerClass {
|
|||
return null;
|
||||
}
|
||||
|
||||
const aggregatedContent = (await this.jobStore.getContentParts(streamId)) ?? [];
|
||||
const result = await this.jobStore.getContentParts(streamId);
|
||||
const aggregatedContent = result?.content ?? [];
|
||||
|
||||
return {
|
||||
active: jobData.status === 'running',
|
||||
|
|
|
|||
|
|
@ -233,11 +233,11 @@ describe('RedisJobStore Integration Tests', () => {
|
|||
}
|
||||
|
||||
// Instance 2 reconstructs content (simulating reconnect to different instance)
|
||||
const content = await instance2.getContentParts(streamId);
|
||||
const result = await instance2.getContentParts(streamId);
|
||||
|
||||
// Should have reconstructed content
|
||||
expect(content).not.toBeNull();
|
||||
expect(content!.length).toBeGreaterThan(0);
|
||||
expect(result).not.toBeNull();
|
||||
expect(result!.content.length).toBeGreaterThan(0);
|
||||
|
||||
await instance1.destroy();
|
||||
await instance2.destroy();
|
||||
|
|
@ -325,11 +325,11 @@ describe('RedisJobStore Integration Tests', () => {
|
|||
await store.appendChunk(streamId, chunk);
|
||||
}
|
||||
|
||||
const content = await store.getContentParts(streamId);
|
||||
const result = await store.getContentParts(streamId);
|
||||
|
||||
expect(content).not.toBeNull();
|
||||
expect(result).not.toBeNull();
|
||||
// Content aggregator combines text deltas
|
||||
const textPart = content!.find((p) => p.type === 'text');
|
||||
const textPart = result!.content.find((p) => p.type === 'text');
|
||||
expect(textPart).toBeDefined();
|
||||
|
||||
await store.destroy();
|
||||
|
|
@ -388,12 +388,12 @@ describe('RedisJobStore Integration Tests', () => {
|
|||
await store.appendChunk(streamId, chunk);
|
||||
}
|
||||
|
||||
const content = await store.getContentParts(streamId);
|
||||
const result = await store.getContentParts(streamId);
|
||||
|
||||
expect(content).not.toBeNull();
|
||||
expect(result).not.toBeNull();
|
||||
// Should have both think and text parts
|
||||
const thinkPart = content!.find((p) => p.type === 'think');
|
||||
const textPart = content!.find((p) => p.type === 'text');
|
||||
const thinkPart = result!.content.find((p) => p.type === 'think');
|
||||
const textPart = result!.content.find((p) => p.type === 'text');
|
||||
expect(thinkPart).toBeDefined();
|
||||
expect(textPart).toBeDefined();
|
||||
|
||||
|
|
@ -905,8 +905,8 @@ describe('RedisJobStore Integration Tests', () => {
|
|||
store.setGraph(streamId, mockGraph as unknown as StandardGraph);
|
||||
|
||||
// Get content - should come from local cache, not Redis
|
||||
const content = await store.getContentParts(streamId);
|
||||
expect(content).toEqual(mockContentParts);
|
||||
const result = await store.getContentParts(streamId);
|
||||
expect(result!.content).toEqual(mockContentParts);
|
||||
|
||||
// Get run steps - should come from local cache
|
||||
const runSteps = await store.getRunSteps(streamId);
|
||||
|
|
@ -959,9 +959,9 @@ describe('RedisJobStore Integration Tests', () => {
|
|||
await instance2.initialize();
|
||||
|
||||
// Get content - should reconstruct from Redis chunks
|
||||
const content = await instance2.getContentParts(streamId);
|
||||
expect(content).not.toBeNull();
|
||||
expect(content!.length).toBeGreaterThan(0);
|
||||
const result = await instance2.getContentParts(streamId);
|
||||
expect(result).not.toBeNull();
|
||||
expect(result!.content.length).toBeGreaterThan(0);
|
||||
|
||||
// Get run steps - should fetch from Redis
|
||||
const runSteps = await instance2.getRunSteps(streamId);
|
||||
|
|
|
|||
|
|
@ -260,8 +260,16 @@ export class InMemoryJobStore implements IJobStore {
|
|||
* Get content parts for a job.
|
||||
* Returns live content from stored reference.
|
||||
*/
|
||||
async getContentParts(streamId: string): Promise<Agents.MessageContentComplex[] | null> {
|
||||
return this.contentState.get(streamId)?.contentParts ?? null;
|
||||
async getContentParts(streamId: string): Promise<{
|
||||
content: Agents.MessageContentComplex[];
|
||||
} | null> {
|
||||
const state = this.contentState.get(streamId);
|
||||
if (!state?.contentParts) {
|
||||
return null;
|
||||
}
|
||||
return {
|
||||
content: state.contentParts,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ export class RedisJobStore implements IJobStore {
|
|||
}
|
||||
|
||||
async deleteJob(streamId: string): Promise<void> {
|
||||
// Clear local cache
|
||||
// Clear local caches
|
||||
this.localGraphCache.delete(streamId);
|
||||
|
||||
// Note: userJobs cleanup is handled lazily via self-healing in getActiveJobIdsByUser
|
||||
|
|
@ -380,7 +380,7 @@ export class RedisJobStore implements IJobStore {
|
|||
clearInterval(this.cleanupInterval);
|
||||
this.cleanupInterval = null;
|
||||
}
|
||||
// Clear local cache
|
||||
// Clear local caches
|
||||
this.localGraphCache.clear();
|
||||
// Don't close the Redis connection - it's shared
|
||||
logger.info('[RedisJobStore] Destroyed');
|
||||
|
|
@ -403,10 +403,12 @@ export class RedisJobStore implements IJobStore {
|
|||
}
|
||||
|
||||
/**
|
||||
* No-op for Redis - content is built from chunks.
|
||||
* No-op for Redis - content parts are reconstructed from chunks.
|
||||
* Metadata (agentId, groupId) is embedded directly on content parts by the agent runtime.
|
||||
*/
|
||||
setContentParts(): void {
|
||||
// No-op: Redis uses chunks for content reconstruction
|
||||
setContentParts(_streamId: string, _contentParts: Agents.MessageContentComplex[]): void {
|
||||
// Content parts are reconstructed from chunks during getContentParts
|
||||
// No separate storage needed
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -417,9 +419,11 @@ export class RedisJobStore implements IJobStore {
|
|||
* For cross-instance reconnects, we reconstruct from Redis Streams.
|
||||
*
|
||||
* @param streamId - The stream identifier
|
||||
* @returns Content parts array, or null if not found
|
||||
* @returns Content parts array or null if not found
|
||||
*/
|
||||
async getContentParts(streamId: string): Promise<Agents.MessageContentComplex[] | null> {
|
||||
async getContentParts(streamId: string): Promise<{
|
||||
content: Agents.MessageContentComplex[];
|
||||
} | null> {
|
||||
// 1. Try local graph cache first (fast path for same-instance reconnect)
|
||||
const graphRef = this.localGraphCache.get(streamId);
|
||||
if (graphRef) {
|
||||
|
|
@ -427,7 +431,9 @@ export class RedisJobStore implements IJobStore {
|
|||
if (graph) {
|
||||
const localParts = graph.getContentParts();
|
||||
if (localParts && localParts.length > 0) {
|
||||
return localParts;
|
||||
return {
|
||||
content: localParts,
|
||||
};
|
||||
}
|
||||
} else {
|
||||
// WeakRef was collected, remove from cache
|
||||
|
|
@ -472,7 +478,10 @@ export class RedisJobStore implements IJobStore {
|
|||
filtered.push(part);
|
||||
}
|
||||
}
|
||||
return filtered;
|
||||
|
||||
return {
|
||||
content: filtered,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -517,7 +526,7 @@ export class RedisJobStore implements IJobStore {
|
|||
* Removes both local cache and Redis data.
|
||||
*/
|
||||
clearContentState(streamId: string): void {
|
||||
// Clear local cache immediately
|
||||
// Clear local caches immediately
|
||||
this.localGraphCache.delete(streamId);
|
||||
|
||||
// Fire and forget - async cleanup for Redis
|
||||
|
|
|
|||
|
|
@ -167,7 +167,9 @@ export interface IJobStore {
|
|||
* @param streamId - The stream identifier
|
||||
* @returns Content parts or null if not available
|
||||
*/
|
||||
getContentParts(streamId: string): Promise<Agents.MessageContentComplex[] | null>;
|
||||
getContentParts(streamId: string): Promise<{
|
||||
content: Agents.MessageContentComplex[];
|
||||
} | null>;
|
||||
|
||||
/**
|
||||
* Get run steps for a job (for resume state).
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue