mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-11 04:58: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
174 lines
5.2 KiB
TypeScript
174 lines
5.2 KiB
TypeScript
import { useMutation, useQueryClient } from '@tanstack/react-query';
|
|
import { dataService, QueryKeys, Constants } from 'librechat-data-provider';
|
|
import type { UseMutationResult, UseMutationOptions } from '@tanstack/react-query';
|
|
import type * as t from 'librechat-data-provider';
|
|
|
|
type EditArtifactContext = {
|
|
previousMessages: Record<string, t.TMessage[] | undefined>;
|
|
updatedConversationId: string | null;
|
|
};
|
|
|
|
export const useEditArtifact = (
|
|
_options?: t.EditArtifactOptions,
|
|
): UseMutationResult<
|
|
t.TEditArtifactResponse,
|
|
Error,
|
|
t.TEditArtifactRequest,
|
|
EditArtifactContext
|
|
> => {
|
|
const queryClient = useQueryClient();
|
|
const { onSuccess, onError, onMutate: userOnMutate, ...options } = _options ?? {};
|
|
|
|
const mutationOptions: UseMutationOptions<
|
|
t.TEditArtifactResponse,
|
|
Error,
|
|
t.TEditArtifactRequest,
|
|
EditArtifactContext
|
|
> = {
|
|
mutationFn: (variables: t.TEditArtifactRequest) => dataService.editArtifact(variables),
|
|
/**
|
|
* onMutate: No optimistic updates for artifact editing
|
|
* The code editor shows changes instantly via local Sandpack state
|
|
* Optimistic updates cause "original content not found" errors because:
|
|
* 1. First edit optimistically updates cache
|
|
* 2. Artifact.content reflects the updated cache
|
|
* 3. Next edit sends updated content as "original" → doesn't match DB → error
|
|
*/
|
|
onMutate: async (vars) => {
|
|
// Call user's onMutate if provided
|
|
if (userOnMutate) {
|
|
await userOnMutate(vars);
|
|
}
|
|
return { previousMessages: {}, updatedConversationId: null };
|
|
},
|
|
onError: (error, vars, context) => {
|
|
onError?.(error, vars, context);
|
|
},
|
|
/**
|
|
* On success: Update with server response to ensure consistency
|
|
*/
|
|
onSuccess: (data, vars, context) => {
|
|
let targetNotFound = true;
|
|
const setMessageData = (conversationId?: string | null) => {
|
|
if (!conversationId) {
|
|
return;
|
|
}
|
|
queryClient.setQueryData<t.TMessage[]>([QueryKeys.messages, conversationId], (prev) => {
|
|
if (!prev) {
|
|
return prev;
|
|
}
|
|
|
|
const newArray = [...prev];
|
|
let targetIndex: number | undefined;
|
|
|
|
for (let i = newArray.length - 1; i >= 0; i--) {
|
|
if (newArray[i].messageId === vars.messageId) {
|
|
targetIndex = i;
|
|
targetNotFound = false;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (targetIndex == null) {
|
|
return prev;
|
|
}
|
|
|
|
newArray[targetIndex] = {
|
|
...newArray[targetIndex],
|
|
content: data.content,
|
|
text: data.text,
|
|
};
|
|
|
|
return newArray;
|
|
});
|
|
};
|
|
setMessageData(data.conversationId);
|
|
if (targetNotFound) {
|
|
console.warn(
|
|
'Edited Artifact Message not found in cache, trying `new` as `conversationId`',
|
|
);
|
|
setMessageData(Constants.NEW_CONVO as string);
|
|
}
|
|
|
|
onSuccess?.(data, vars, context);
|
|
},
|
|
...options,
|
|
};
|
|
|
|
return useMutation(mutationOptions);
|
|
};
|
|
|
|
type BranchMessageContext = {
|
|
previousMessages: t.TMessage[] | undefined;
|
|
conversationId: string | null;
|
|
};
|
|
|
|
export const useBranchMessageMutation = (
|
|
conversationId: string | null,
|
|
_options?: t.BranchMessageOptions,
|
|
): UseMutationResult<
|
|
t.TBranchMessageResponse,
|
|
Error,
|
|
t.TBranchMessageRequest,
|
|
BranchMessageContext
|
|
> => {
|
|
const queryClient = useQueryClient();
|
|
const { onSuccess, onError, onMutate: userOnMutate, ...options } = _options ?? {};
|
|
|
|
const mutationOptions: UseMutationOptions<
|
|
t.TBranchMessageResponse,
|
|
Error,
|
|
t.TBranchMessageRequest,
|
|
BranchMessageContext
|
|
> = {
|
|
mutationFn: (variables: t.TBranchMessageRequest) => dataService.branchMessage(variables),
|
|
onMutate: async (vars) => {
|
|
// Call user's onMutate if provided
|
|
if (userOnMutate) {
|
|
await userOnMutate(vars);
|
|
}
|
|
|
|
// Cancel any outgoing queries for messages
|
|
if (conversationId) {
|
|
await queryClient.cancelQueries([QueryKeys.messages, conversationId]);
|
|
}
|
|
|
|
// Get the previous messages for rollback
|
|
const previousMessages = conversationId
|
|
? queryClient.getQueryData<t.TMessage[]>([QueryKeys.messages, conversationId])
|
|
: undefined;
|
|
|
|
return { previousMessages, conversationId };
|
|
},
|
|
onError: (error, vars, context) => {
|
|
// Rollback to previous messages on error
|
|
if (context?.conversationId && context?.previousMessages) {
|
|
queryClient.setQueryData(
|
|
[QueryKeys.messages, context.conversationId],
|
|
context.previousMessages,
|
|
);
|
|
}
|
|
onError?.(error, vars, context);
|
|
},
|
|
onSuccess: (data, vars, context) => {
|
|
// Add the new message to the cache
|
|
const targetConversationId = data.conversationId || context?.conversationId;
|
|
if (targetConversationId) {
|
|
queryClient.setQueryData<t.TMessage[]>(
|
|
[QueryKeys.messages, targetConversationId],
|
|
(prev) => {
|
|
if (!prev) {
|
|
return [data];
|
|
}
|
|
return [...prev, data];
|
|
},
|
|
);
|
|
}
|
|
|
|
onSuccess?.(data, vars, context);
|
|
},
|
|
...options,
|
|
};
|
|
|
|
return useMutation(mutationOptions);
|
|
};
|