mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-22 10:16: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
|
|
@ -153,7 +153,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should not affect regular agents when ephemeralAgent is provided', () => {
|
||||
const agentId = 'regular-agent';
|
||||
const agentId = 'agent_regular';
|
||||
const mockAgent = {
|
||||
id: agentId,
|
||||
tools: [Tools.file_search],
|
||||
|
|
@ -179,7 +179,7 @@ describe('useAgentToolPermissions', () => {
|
|||
|
||||
describe('Regular Agent with Tools', () => {
|
||||
it('should allow file_search when agent has the tool', () => {
|
||||
const agentId = 'agent-123';
|
||||
const agentId = 'agent_123';
|
||||
const mockAgent = {
|
||||
id: agentId,
|
||||
tools: [Tools.file_search, 'other_tool'],
|
||||
|
|
@ -198,7 +198,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should allow execute_code when agent has the tool', () => {
|
||||
const agentId = 'agent-456';
|
||||
const agentId = 'agent_456';
|
||||
const mockAgent = {
|
||||
id: agentId,
|
||||
tools: [Tools.execute_code, 'another_tool'],
|
||||
|
|
@ -217,7 +217,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should allow both tools when agent has both', () => {
|
||||
const agentId = 'agent-789';
|
||||
const agentId = 'agent_789';
|
||||
const mockAgent = {
|
||||
id: agentId,
|
||||
tools: [Tools.file_search, Tools.execute_code, 'custom_tool'],
|
||||
|
|
@ -236,7 +236,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should disallow both tools when agent has neither', () => {
|
||||
const agentId = 'agent-no-tools';
|
||||
const agentId = 'agent_no_tools';
|
||||
const mockAgent = {
|
||||
id: agentId,
|
||||
tools: ['custom_tool1', 'custom_tool2'],
|
||||
|
|
@ -255,7 +255,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should handle agent with empty tools array', () => {
|
||||
const agentId = 'agent-empty-tools';
|
||||
const agentId = 'agent_empty_tools';
|
||||
const mockAgent = {
|
||||
id: agentId,
|
||||
tools: [],
|
||||
|
|
@ -274,7 +274,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should handle agent with undefined tools', () => {
|
||||
const agentId = 'agent-undefined-tools';
|
||||
const agentId = 'agent_undefined_tools';
|
||||
const mockAgent = {
|
||||
id: agentId,
|
||||
tools: undefined,
|
||||
|
|
@ -295,7 +295,7 @@ describe('useAgentToolPermissions', () => {
|
|||
|
||||
describe('Agent Data from Query', () => {
|
||||
it('should prioritize agentData tools over selectedAgent tools', () => {
|
||||
const agentId = 'agent-with-query-data';
|
||||
const agentId = 'agent_with_query_data';
|
||||
const mockAgent = {
|
||||
id: agentId,
|
||||
tools: ['old_tool'],
|
||||
|
|
@ -318,7 +318,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should fallback to selectedAgent tools when agentData has no tools', () => {
|
||||
const agentId = 'agent-fallback';
|
||||
const agentId = 'agent_fallback';
|
||||
const mockAgent = {
|
||||
id: agentId,
|
||||
tools: [Tools.file_search],
|
||||
|
|
@ -343,7 +343,7 @@ describe('useAgentToolPermissions', () => {
|
|||
|
||||
describe('Agent Not Found Scenarios', () => {
|
||||
it('should disallow all tools when agent is not found in map', () => {
|
||||
const agentId = 'non-existent-agent';
|
||||
const agentId = 'agent_nonexistent';
|
||||
|
||||
(useAgentsMapContext as jest.Mock).mockReturnValue({});
|
||||
(useGetAgentByIdQuery as jest.Mock).mockReturnValue({ data: undefined });
|
||||
|
|
@ -356,7 +356,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should disallow all tools when agentsMap is null', () => {
|
||||
const agentId = 'agent-with-null-map';
|
||||
const agentId = 'agent_with_null_map';
|
||||
|
||||
(useAgentsMapContext as jest.Mock).mockReturnValue(null);
|
||||
(useGetAgentByIdQuery as jest.Mock).mockReturnValue({ data: undefined });
|
||||
|
|
@ -369,7 +369,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should disallow all tools when agentsMap is undefined', () => {
|
||||
const agentId = 'agent-with-undefined-map';
|
||||
const agentId = 'agent_with_undefined_map';
|
||||
|
||||
(useAgentsMapContext as jest.Mock).mockReturnValue(undefined);
|
||||
(useGetAgentByIdQuery as jest.Mock).mockReturnValue({ data: undefined });
|
||||
|
|
@ -384,7 +384,7 @@ describe('useAgentToolPermissions', () => {
|
|||
|
||||
describe('Memoization and Performance', () => {
|
||||
it('should memoize results when inputs do not change', () => {
|
||||
const agentId = 'memoized-agent';
|
||||
const agentId = 'agent_memoized';
|
||||
const mockAgent = {
|
||||
id: agentId,
|
||||
tools: [Tools.file_search],
|
||||
|
|
@ -417,8 +417,8 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should recompute when agentId changes', () => {
|
||||
const agentId1 = 'agent-1';
|
||||
const agentId2 = 'agent-2';
|
||||
const agentId1 = 'agent_1';
|
||||
const agentId2 = 'agent_2';
|
||||
const mockAgents = {
|
||||
[agentId1]: { id: agentId1, tools: [Tools.file_search] },
|
||||
[agentId2]: { id: agentId2, tools: [Tools.execute_code] },
|
||||
|
|
@ -442,7 +442,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should handle switching between ephemeral and regular agents', () => {
|
||||
const regularAgentId = 'regular-agent';
|
||||
const regularAgentId = 'agent_regular';
|
||||
const mockAgent = {
|
||||
id: regularAgentId,
|
||||
tools: [],
|
||||
|
|
@ -486,7 +486,7 @@ describe('useAgentToolPermissions', () => {
|
|||
|
||||
describe('Edge Cases', () => {
|
||||
it('should handle agents with null tools gracefully', () => {
|
||||
const agentId = 'agent-null-tools';
|
||||
const agentId = 'agent_null_tools';
|
||||
const mockAgent = {
|
||||
id: agentId,
|
||||
tools: null as any,
|
||||
|
|
@ -520,7 +520,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should handle query loading state', () => {
|
||||
const agentId = 'loading-agent';
|
||||
const agentId = 'agent_loading';
|
||||
|
||||
(useAgentsMapContext as jest.Mock).mockReturnValue({});
|
||||
(useGetAgentByIdQuery as jest.Mock).mockReturnValue({
|
||||
|
|
@ -538,7 +538,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should handle query error state', () => {
|
||||
const agentId = 'error-agent';
|
||||
const agentId = 'agent_error';
|
||||
|
||||
(useAgentsMapContext as jest.Mock).mockReturnValue({});
|
||||
(useGetAgentByIdQuery as jest.Mock).mockReturnValue({
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ describe('useAgentToolPermissions', () => {
|
|||
mockUseAgentsMapContext.mockReturnValue({});
|
||||
mockUseGetAgentByIdQuery.mockReturnValue({ data: undefined });
|
||||
|
||||
const { result } = renderHook(() => useAgentToolPermissions('non-existent-agent'));
|
||||
const { result } = renderHook(() => useAgentToolPermissions('agent_nonexistent'));
|
||||
|
||||
expect(result.current.fileSearchAllowedByAgent).toBe(false);
|
||||
expect(result.current.codeAllowedByAgent).toBe(false);
|
||||
|
|
@ -69,7 +69,7 @@ describe('useAgentToolPermissions', () => {
|
|||
|
||||
describe('when agent is found with tools', () => {
|
||||
it('should allow tools that are included in the agent tools array', () => {
|
||||
const agentId = 'test-agent';
|
||||
const agentId = 'agent_test';
|
||||
const agent = {
|
||||
id: agentId,
|
||||
tools: [Tools.file_search],
|
||||
|
|
@ -86,7 +86,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should allow both tools when both are included', () => {
|
||||
const agentId = 'test-agent';
|
||||
const agentId = 'agent_test';
|
||||
const agent = {
|
||||
id: agentId,
|
||||
tools: [Tools.file_search, Tools.execute_code],
|
||||
|
|
@ -103,7 +103,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should use data from API query when available', () => {
|
||||
const agentId = 'test-agent';
|
||||
const agentId = 'agent_test';
|
||||
const agentMapData = {
|
||||
id: agentId,
|
||||
tools: [Tools.file_search],
|
||||
|
|
@ -125,7 +125,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should fallback to agent map data when API data is not available', () => {
|
||||
const agentId = 'test-agent';
|
||||
const agentId = 'agent_test';
|
||||
const agentMapData = {
|
||||
id: agentId,
|
||||
tools: [Tools.execute_code],
|
||||
|
|
@ -144,7 +144,7 @@ describe('useAgentToolPermissions', () => {
|
|||
|
||||
describe('when agent has no tools', () => {
|
||||
it('should disallow all tools with empty array', () => {
|
||||
const agentId = 'test-agent';
|
||||
const agentId = 'agent_test';
|
||||
const agent = {
|
||||
id: agentId,
|
||||
tools: [],
|
||||
|
|
@ -161,7 +161,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should disallow all tools with undefined tools', () => {
|
||||
const agentId = 'test-agent';
|
||||
const agentId = 'agent_test';
|
||||
const agent = {
|
||||
id: agentId,
|
||||
tools: undefined,
|
||||
|
|
@ -226,7 +226,7 @@ describe('useAgentToolPermissions', () => {
|
|||
});
|
||||
|
||||
it('should not affect regular agents when ephemeralAgent is provided', () => {
|
||||
const agentId = 'regular-agent';
|
||||
const agentId = 'agent_regular';
|
||||
const agent = {
|
||||
id: agentId,
|
||||
tools: [Tools.file_search],
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
export { default as useChatHelpers } from './useChatHelpers';
|
||||
export { default as useAddedHelpers } from './useAddedHelpers';
|
||||
export { default as useAddedResponse } from './useAddedResponse';
|
||||
export { default as useChatFunctions } from './useChatFunctions';
|
||||
export { default as useGetAddedConvo } from './useGetAddedConvo';
|
||||
export { default as useIdChangeEffect } from './useIdChangeEffect';
|
||||
export { default as useFocusChatEffect } from './useFocusChatEffect';
|
||||
|
|
|
|||
|
|
@ -1,128 +0,0 @@
|
|||
import { useCallback } from 'react';
|
||||
import { useQueryClient } from '@tanstack/react-query';
|
||||
import { QueryKeys } from 'librechat-data-provider';
|
||||
import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
|
||||
import type { TMessage } from 'librechat-data-provider';
|
||||
import useChatFunctions from '~/hooks/Chat/useChatFunctions';
|
||||
import store from '~/store';
|
||||
|
||||
// this to be set somewhere else
|
||||
export default function useAddedHelpers({
|
||||
rootIndex = 0,
|
||||
currentIndex,
|
||||
paramId,
|
||||
}: {
|
||||
rootIndex?: number;
|
||||
currentIndex: number;
|
||||
paramId?: string;
|
||||
}) {
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
const clearAllSubmissions = store.useClearSubmissionState();
|
||||
const [files, setFiles] = useRecoilState(store.filesByIndex(rootIndex));
|
||||
const latestMessage = useRecoilValue(store.latestMessageFamily(rootIndex));
|
||||
const setLatestMultiMessage = useSetRecoilState(store.latestMessageFamily(currentIndex));
|
||||
|
||||
const { useCreateConversationAtom } = store;
|
||||
const { conversation, setConversation } = useCreateConversationAtom(currentIndex);
|
||||
const [isSubmitting, setIsSubmitting] = useRecoilState(store.isSubmittingFamily(currentIndex));
|
||||
|
||||
const setSiblingIdx = useSetRecoilState(
|
||||
store.messagesSiblingIdxFamily(latestMessage?.parentMessageId ?? null),
|
||||
);
|
||||
|
||||
const queryParam = paramId === 'new' ? paramId : (conversation?.conversationId ?? paramId ?? '');
|
||||
|
||||
const setMessages = useCallback(
|
||||
(messages: TMessage[]) => {
|
||||
queryClient.setQueryData<TMessage[]>(
|
||||
[QueryKeys.messages, queryParam, currentIndex],
|
||||
messages,
|
||||
);
|
||||
const latestMultiMessage = messages[messages.length - 1];
|
||||
if (latestMultiMessage) {
|
||||
setLatestMultiMessage({ ...latestMultiMessage, depth: -1 });
|
||||
}
|
||||
},
|
||||
[queryParam, queryClient, currentIndex, setLatestMultiMessage],
|
||||
);
|
||||
|
||||
const getMessages = useCallback(() => {
|
||||
return queryClient.getQueryData<TMessage[]>([QueryKeys.messages, queryParam, currentIndex]);
|
||||
}, [queryParam, queryClient, currentIndex]);
|
||||
|
||||
const setSubmission = useSetRecoilState(store.submissionByIndex(currentIndex));
|
||||
|
||||
const { ask, regenerate } = useChatFunctions({
|
||||
index: currentIndex,
|
||||
files,
|
||||
setFiles,
|
||||
getMessages,
|
||||
setMessages,
|
||||
isSubmitting,
|
||||
conversation,
|
||||
setSubmission,
|
||||
latestMessage,
|
||||
});
|
||||
|
||||
const continueGeneration = () => {
|
||||
if (!latestMessage) {
|
||||
console.error('Failed to regenerate the message: latestMessage not found.');
|
||||
return;
|
||||
}
|
||||
|
||||
const messages = getMessages();
|
||||
|
||||
const parentMessage = messages?.find(
|
||||
(element) => element.messageId == latestMessage.parentMessageId,
|
||||
);
|
||||
|
||||
if (parentMessage && parentMessage.isCreatedByUser) {
|
||||
ask({ ...parentMessage }, { isContinued: true, isRegenerate: true, isEdited: true });
|
||||
} else {
|
||||
console.error(
|
||||
'Failed to regenerate the message: parentMessage not found, or not created by user.',
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
const stopGenerating = () => clearAllSubmissions();
|
||||
|
||||
const handleStopGenerating = (e: React.MouseEvent<HTMLButtonElement>) => {
|
||||
e.preventDefault();
|
||||
stopGenerating();
|
||||
};
|
||||
|
||||
const handleRegenerate = (e: React.MouseEvent<HTMLButtonElement>) => {
|
||||
e.preventDefault();
|
||||
const parentMessageId = latestMessage?.parentMessageId;
|
||||
if (!parentMessageId) {
|
||||
console.error('Failed to regenerate the message: parentMessageId not found.');
|
||||
return;
|
||||
}
|
||||
regenerate({ parentMessageId });
|
||||
};
|
||||
|
||||
const handleContinue = (e: React.MouseEvent<HTMLButtonElement>) => {
|
||||
e.preventDefault();
|
||||
continueGeneration();
|
||||
setSiblingIdx(0);
|
||||
};
|
||||
|
||||
return {
|
||||
ask,
|
||||
regenerate,
|
||||
getMessages,
|
||||
setMessages,
|
||||
conversation,
|
||||
isSubmitting,
|
||||
setSiblingIdx,
|
||||
latestMessage,
|
||||
stopGenerating,
|
||||
handleContinue,
|
||||
setConversation,
|
||||
setIsSubmitting,
|
||||
handleRegenerate,
|
||||
handleStopGenerating,
|
||||
};
|
||||
}
|
||||
|
|
@ -1,39 +1,123 @@
|
|||
import { useMemo } from 'react';
|
||||
import useGenerateConvo from '~/hooks/Conversations/useGenerateConvo';
|
||||
import useAddedHelpers from '~/hooks/Chat/useAddedHelpers';
|
||||
import { useCallback } from 'react';
|
||||
import { useRecoilValue } from 'recoil';
|
||||
import { useGetModelsQuery } from 'librechat-data-provider/react-query';
|
||||
import { getEndpointField, LocalStorageKeys, isAssistantsEndpoint } from 'librechat-data-provider';
|
||||
import type { TEndpointsConfig, EModelEndpoint, TConversation } from 'librechat-data-provider';
|
||||
import type { AssistantListItem, NewConversationParams } from '~/common';
|
||||
import useAssistantListMap from '~/hooks/Assistants/useAssistantListMap';
|
||||
import { buildDefaultConvo, getDefaultEndpoint } from '~/utils';
|
||||
import { useGetEndpointsQuery } from '~/data-provider';
|
||||
import { mainTextareaId } from '~/common';
|
||||
import store from '~/store';
|
||||
|
||||
export default function useAddedResponse({ rootIndex }: { rootIndex: number }) {
|
||||
const currentIndex = useMemo(() => rootIndex + 1, [rootIndex]);
|
||||
const {
|
||||
ask,
|
||||
regenerate,
|
||||
setMessages,
|
||||
getMessages,
|
||||
conversation,
|
||||
isSubmitting,
|
||||
setConversation,
|
||||
setIsSubmitting,
|
||||
} = useAddedHelpers({
|
||||
rootIndex,
|
||||
currentIndex,
|
||||
});
|
||||
const ADDED_INDEX = 1;
|
||||
|
||||
const { generateConversation } = useGenerateConvo({
|
||||
index: currentIndex,
|
||||
rootIndex,
|
||||
setConversation,
|
||||
});
|
||||
/**
|
||||
* Simplified hook for added conversation state.
|
||||
* Provides just the conversation state and a function to generate a new conversation,
|
||||
* mirroring the pattern from useNewConvo.
|
||||
*/
|
||||
export default function useAddedResponse() {
|
||||
const modelsQuery = useGetModelsQuery();
|
||||
const assistantsListMap = useAssistantListMap();
|
||||
const rootConvo = useRecoilValue(store.conversationByKeySelector(0));
|
||||
const { data: endpointsConfig = {} as TEndpointsConfig } = useGetEndpointsQuery();
|
||||
const { conversation, setConversation } = store.useCreateConversationAtom(ADDED_INDEX);
|
||||
|
||||
/**
|
||||
* Generate a new conversation based on template and preset.
|
||||
* Mirrors the logic from useNewConvo's switchToConversation.
|
||||
*/
|
||||
const generateConversation = useCallback(
|
||||
({ template = {}, preset, modelsData }: NewConversationParams = {}) => {
|
||||
let newConversation: TConversation = {
|
||||
conversationId: rootConvo?.conversationId ?? 'new',
|
||||
title: '',
|
||||
endpoint: null,
|
||||
...template,
|
||||
createdAt: '',
|
||||
updatedAt: '',
|
||||
} as TConversation;
|
||||
|
||||
const modelsConfig = modelsData ?? modelsQuery.data;
|
||||
const activePreset = preset ?? newConversation;
|
||||
|
||||
const defaultEndpoint = getDefaultEndpoint({
|
||||
convoSetup: activePreset,
|
||||
endpointsConfig,
|
||||
});
|
||||
|
||||
const endpointType = getEndpointField(endpointsConfig, defaultEndpoint, 'type');
|
||||
if (!newConversation.endpointType && endpointType) {
|
||||
newConversation.endpointType = endpointType;
|
||||
} else if (newConversation.endpointType && !endpointType) {
|
||||
newConversation.endpointType = undefined;
|
||||
}
|
||||
|
||||
const isAssistantEndpoint = isAssistantsEndpoint(defaultEndpoint);
|
||||
const assistants: AssistantListItem[] = assistantsListMap[defaultEndpoint ?? ''] ?? [];
|
||||
|
||||
if (
|
||||
newConversation.assistant_id &&
|
||||
!assistantsListMap[defaultEndpoint ?? '']?.[newConversation.assistant_id]
|
||||
) {
|
||||
newConversation.assistant_id = undefined;
|
||||
}
|
||||
|
||||
if (!newConversation.assistant_id && isAssistantEndpoint) {
|
||||
newConversation.assistant_id =
|
||||
localStorage.getItem(`${LocalStorageKeys.ASST_ID_PREFIX}0${defaultEndpoint}`) ??
|
||||
assistants[0]?.id;
|
||||
}
|
||||
|
||||
if (
|
||||
newConversation.assistant_id != null &&
|
||||
isAssistantEndpoint &&
|
||||
newConversation.conversationId === 'new'
|
||||
) {
|
||||
const assistant = assistants.find((asst) => asst.id === newConversation.assistant_id);
|
||||
newConversation.model = assistant?.model;
|
||||
}
|
||||
|
||||
if (newConversation.assistant_id != null && !isAssistantEndpoint) {
|
||||
newConversation.assistant_id = undefined;
|
||||
}
|
||||
|
||||
const models = modelsConfig?.[defaultEndpoint ?? ''] ?? [];
|
||||
newConversation = buildDefaultConvo({
|
||||
conversation: newConversation,
|
||||
lastConversationSetup: preset as TConversation,
|
||||
endpoint: defaultEndpoint ?? ('' as EModelEndpoint),
|
||||
models,
|
||||
});
|
||||
|
||||
if (preset?.title != null && preset.title !== '') {
|
||||
newConversation.title = preset.title;
|
||||
}
|
||||
|
||||
setConversation(newConversation);
|
||||
|
||||
setTimeout(() => {
|
||||
const textarea = document.getElementById(mainTextareaId);
|
||||
if (textarea) {
|
||||
textarea.focus();
|
||||
}
|
||||
}, 150);
|
||||
|
||||
return newConversation;
|
||||
},
|
||||
[
|
||||
endpointsConfig,
|
||||
setConversation,
|
||||
modelsQuery.data,
|
||||
assistantsListMap,
|
||||
rootConvo?.conversationId,
|
||||
],
|
||||
);
|
||||
|
||||
return {
|
||||
ask,
|
||||
regenerate,
|
||||
getMessages,
|
||||
setMessages,
|
||||
conversation,
|
||||
isSubmitting,
|
||||
setConversation,
|
||||
setIsSubmitting,
|
||||
generateConversation,
|
||||
addedIndex: currentIndex,
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
import { v4 } from 'uuid';
|
||||
import { cloneDeep } from 'lodash';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { useQueryClient } from '@tanstack/react-query';
|
||||
import { useSetRecoilState, useResetRecoilState, useRecoilValue } from 'recoil';
|
||||
import {
|
||||
Constants,
|
||||
QueryKeys,
|
||||
|
|
@ -12,7 +14,6 @@ import {
|
|||
replaceSpecialVars,
|
||||
isAssistantsEndpoint,
|
||||
} from 'librechat-data-provider';
|
||||
import { useSetRecoilState, useResetRecoilState, useRecoilValue } from 'recoil';
|
||||
import type {
|
||||
TMessage,
|
||||
TSubmission,
|
||||
|
|
@ -25,11 +26,10 @@ import type { SetterOrUpdater } from 'recoil';
|
|||
import type { TAskFunction, ExtendedFile } from '~/common';
|
||||
import useSetFilesToDelete from '~/hooks/Files/useSetFilesToDelete';
|
||||
import useGetSender from '~/hooks/Conversations/useGetSender';
|
||||
import { logger, createDualMessageContent } from '~/utils';
|
||||
import store, { useGetEphemeralAgent } from '~/store';
|
||||
import useUserKey from '~/hooks/Input/useUserKey';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { useAuthContext } from '~/hooks';
|
||||
import { logger } from '~/utils';
|
||||
|
||||
const logChatRequest = (request: Record<string, unknown>) => {
|
||||
logger.log('=====================================\nAsk function called with:');
|
||||
|
|
@ -69,6 +69,7 @@ export default function useChatFunctions({
|
|||
const getEphemeralAgent = useGetEphemeralAgent();
|
||||
const isTemporary = useRecoilValue(store.isTemporary);
|
||||
const { getExpiry } = useUserKey(immutableConversation?.endpoint ?? '');
|
||||
const setIsSubmitting = useSetRecoilState(store.isSubmittingFamily(index));
|
||||
const setShowStopButton = useSetRecoilState(store.showStopButtonByIndex(index));
|
||||
const resetLatestMultiMessage = useResetRecoilState(store.latestMessageFamily(index + 1));
|
||||
|
||||
|
|
@ -89,6 +90,7 @@ export default function useChatFunctions({
|
|||
isEdited = false,
|
||||
overrideMessages,
|
||||
overrideFiles,
|
||||
addedConvo,
|
||||
} = {},
|
||||
) => {
|
||||
setShowStopButton(false);
|
||||
|
|
@ -282,9 +284,18 @@ export default function useChatFunctions({
|
|||
contentPart[ContentTypes.TEXT] = part[ContentTypes.TEXT];
|
||||
}
|
||||
}
|
||||
} else if (addedConvo && conversation) {
|
||||
// Pre-populate placeholders for smooth UI - these will be overridden/extended
|
||||
// as SSE events arrive with actual content, preserving the agent-based agentId
|
||||
initialResponse.content = createDualMessageContent(
|
||||
conversation,
|
||||
addedConvo,
|
||||
endpointsConfig,
|
||||
);
|
||||
} else {
|
||||
initialResponse.content = [];
|
||||
}
|
||||
setIsSubmitting(true);
|
||||
setShowStopButton(true);
|
||||
}
|
||||
|
||||
|
|
@ -312,6 +323,7 @@ export default function useChatFunctions({
|
|||
isTemporary,
|
||||
ephemeralAgent,
|
||||
editedContent,
|
||||
addedConvo,
|
||||
};
|
||||
|
||||
if (isRegenerate) {
|
||||
|
|
@ -327,12 +339,15 @@ export default function useChatFunctions({
|
|||
logger.dir('message_stream', submission, { depth: null });
|
||||
};
|
||||
|
||||
const regenerate = ({ parentMessageId }) => {
|
||||
const regenerate = ({ parentMessageId }, options?: { addedConvo?: TConversation | null }) => {
|
||||
const messages = getMessages();
|
||||
const parentMessage = messages?.find((element) => element.messageId == parentMessageId);
|
||||
|
||||
if (parentMessage && parentMessage.isCreatedByUser) {
|
||||
ask({ ...parentMessage }, { isRegenerate: true });
|
||||
ask(
|
||||
{ ...parentMessage },
|
||||
{ isRegenerate: true, addedConvo: options?.addedConvo ?? undefined },
|
||||
);
|
||||
} else {
|
||||
console.error(
|
||||
'Failed to regenerate the message: parentMessage not found or not created by user.',
|
||||
|
|
|
|||
15
client/src/hooks/Chat/useGetAddedConvo.ts
Normal file
15
client/src/hooks/Chat/useGetAddedConvo.ts
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
import { useRecoilCallback } from 'recoil';
|
||||
import store from '~/store';
|
||||
|
||||
/**
|
||||
* Hook that provides lazy access to addedConvo without subscribing to changes.
|
||||
* Use this to avoid unnecessary re-renders when addedConvo changes.
|
||||
*/
|
||||
export default function useGetAddedConvo() {
|
||||
return useRecoilCallback(
|
||||
({ snapshot }) =>
|
||||
() =>
|
||||
snapshot.getLoadable(store.conversationByKeySelector(1)).getValue(),
|
||||
[],
|
||||
);
|
||||
}
|
||||
|
|
@ -1,5 +1,10 @@
|
|||
import React, { useMemo, useEffect, useRef } from 'react';
|
||||
import { isAgentsEndpoint, isAssistantsEndpoint, LocalStorageKeys } from 'librechat-data-provider';
|
||||
import {
|
||||
isAgentsEndpoint,
|
||||
LocalStorageKeys,
|
||||
isEphemeralAgentId,
|
||||
isAssistantsEndpoint,
|
||||
} from 'librechat-data-provider';
|
||||
import type * as t from 'librechat-data-provider';
|
||||
import type { SelectedValues } from '~/common';
|
||||
import useSetIndexOptions from '~/hooks/Conversations/useSetIndexOptions';
|
||||
|
|
@ -39,7 +44,7 @@ export default function useSelectorEffects({
|
|||
}
|
||||
if (selectedAgentId == null && agents.length > 0) {
|
||||
let agent_id = localStorage.getItem(`${LocalStorageKeys.AGENT_ID_PREFIX}${index}`);
|
||||
if (agent_id == null) {
|
||||
if (agent_id == null || isEphemeralAgentId(agent_id)) {
|
||||
agent_id = agents[0]?.id;
|
||||
}
|
||||
const agent = agentsMap?.[agent_id];
|
||||
|
|
|
|||
|
|
@ -6,3 +6,5 @@ export { default as useMessageProcess } from './useMessageProcess';
|
|||
export { default as useMessageHelpers } from './useMessageHelpers';
|
||||
export { default as useCopyToClipboard } from './useCopyToClipboard';
|
||||
export { default as useMessageScrolling } from './useMessageScrolling';
|
||||
export { default as useContentMetadata } from './useContentMetadata';
|
||||
export type { ContentMetadataResult } from './useContentMetadata';
|
||||
|
|
|
|||
30
client/src/hooks/Messages/useContentMetadata.ts
Normal file
30
client/src/hooks/Messages/useContentMetadata.ts
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
import { useMemo } from 'react';
|
||||
import type { TMessage } from 'librechat-data-provider';
|
||||
|
||||
export type ContentMetadataResult = {
|
||||
/** Whether the message has parallel content (content with groupId) */
|
||||
hasParallelContent: boolean;
|
||||
};
|
||||
|
||||
/**
|
||||
* Hook to check if a message has parallel content.
|
||||
* Returns whether any content part has a groupId.
|
||||
*
|
||||
* @param message - The message to check
|
||||
* @returns ContentMetadataResult with hasParallelContent boolean
|
||||
*/
|
||||
export default function useContentMetadata(
|
||||
message: TMessage | null | undefined,
|
||||
): ContentMetadataResult {
|
||||
return useMemo(() => {
|
||||
const content = message?.content;
|
||||
if (!content || !Array.isArray(content)) {
|
||||
return { hasParallelContent: false };
|
||||
}
|
||||
|
||||
// Check if any content part has a groupId (TMessageContentParts now includes ContentMetadata)
|
||||
const hasParallelContent = content.some((part) => part?.groupId != null);
|
||||
|
||||
return { hasParallelContent };
|
||||
}, [message?.content]);
|
||||
}
|
||||
|
|
@ -1,24 +1,20 @@
|
|||
import { useRecoilValue } from 'recoil';
|
||||
import { useCallback, useMemo, useState } from 'react';
|
||||
import { useRecoilValue } from 'recoil';
|
||||
import { useUpdateFeedbackMutation } from 'librechat-data-provider/react-query';
|
||||
import {
|
||||
isAssistantsEndpoint,
|
||||
isAgentsEndpoint,
|
||||
TUpdateFeedbackRequest,
|
||||
getTagByKey,
|
||||
TFeedback,
|
||||
toMinimalFeedback,
|
||||
getTagByKey,
|
||||
isAgentsEndpoint,
|
||||
SearchResultData,
|
||||
toMinimalFeedback,
|
||||
isAssistantsEndpoint,
|
||||
TUpdateFeedbackRequest,
|
||||
} from 'librechat-data-provider';
|
||||
import type { TMessageProps } from '~/common';
|
||||
import {
|
||||
useChatContext,
|
||||
useAddedChatContext,
|
||||
useAssistantsMapContext,
|
||||
useAgentsMapContext,
|
||||
} from '~/Providers';
|
||||
import { useChatContext, useAssistantsMapContext, useAgentsMapContext } from '~/Providers';
|
||||
import useCopyToClipboard from './useCopyToClipboard';
|
||||
import { useAuthContext } from '~/hooks/AuthContext';
|
||||
import { useGetAddedConvo } from '~/hooks/Chat';
|
||||
import { useLocalize } from '~/hooks';
|
||||
import store from '~/store';
|
||||
|
||||
|
|
@ -26,7 +22,6 @@ export type TMessageActions = Pick<
|
|||
TMessageProps,
|
||||
'message' | 'currentEditId' | 'setCurrentEditId'
|
||||
> & {
|
||||
isMultiMessage?: boolean;
|
||||
searchResults?: { [key: string]: SearchResultData };
|
||||
};
|
||||
|
||||
|
|
@ -34,23 +29,12 @@ export default function useMessageActions(props: TMessageActions) {
|
|||
const localize = useLocalize();
|
||||
const { user } = useAuthContext();
|
||||
const UsernameDisplay = useRecoilValue<boolean>(store.UsernameDisplay);
|
||||
const { message, currentEditId, setCurrentEditId, isMultiMessage, searchResults } = props;
|
||||
const { message, currentEditId, setCurrentEditId, searchResults } = props;
|
||||
|
||||
const {
|
||||
ask,
|
||||
index,
|
||||
regenerate,
|
||||
latestMessage,
|
||||
handleContinue,
|
||||
setLatestMessage,
|
||||
conversation: rootConvo,
|
||||
isSubmitting: isSubmittingRoot,
|
||||
} = useChatContext();
|
||||
const { conversation: addedConvo, isSubmitting: isSubmittingAdditional } = useAddedChatContext();
|
||||
const conversation = useMemo(
|
||||
() => (isMultiMessage === true ? addedConvo : rootConvo),
|
||||
[isMultiMessage, addedConvo, rootConvo],
|
||||
);
|
||||
const { ask, index, regenerate, isSubmitting, conversation, latestMessage, handleContinue } =
|
||||
useChatContext();
|
||||
|
||||
const getAddedConvo = useGetAddedConvo();
|
||||
|
||||
const agentsMap = useAgentsMapContext();
|
||||
const assistantMap = useAssistantsMapContext();
|
||||
|
|
@ -106,18 +90,13 @@ export default function useMessageActions(props: TMessageActions) {
|
|||
}
|
||||
}, [agentsMap, conversation?.agent_id, conversation?.endpoint, message?.model]);
|
||||
|
||||
const isSubmitting = useMemo(
|
||||
() => (isMultiMessage === true ? isSubmittingAdditional : isSubmittingRoot),
|
||||
[isMultiMessage, isSubmittingAdditional, isSubmittingRoot],
|
||||
);
|
||||
|
||||
const regenerateMessage = useCallback(() => {
|
||||
if ((isSubmitting && isCreatedByUser === true) || !message) {
|
||||
return;
|
||||
}
|
||||
|
||||
regenerate(message);
|
||||
}, [isSubmitting, isCreatedByUser, message, regenerate]);
|
||||
regenerate(message, { addedConvo: getAddedConvo() });
|
||||
}, [isSubmitting, isCreatedByUser, message, regenerate, getAddedConvo]);
|
||||
|
||||
const copyToClipboard = useCopyToClipboard({ text, content, searchResults });
|
||||
|
||||
|
|
@ -170,17 +149,15 @@ export default function useMessageActions(props: TMessageActions) {
|
|||
edit,
|
||||
index,
|
||||
agent,
|
||||
feedback,
|
||||
assistant,
|
||||
enterEdit,
|
||||
conversation,
|
||||
messageLabel,
|
||||
isSubmitting,
|
||||
latestMessage,
|
||||
handleFeedback,
|
||||
handleContinue,
|
||||
copyToClipboard,
|
||||
setLatestMessage,
|
||||
regenerateMessage,
|
||||
handleFeedback,
|
||||
feedback,
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
import throttle from 'lodash/throttle';
|
||||
import { useEffect, useRef, useCallback, useMemo } from 'react';
|
||||
import throttle from 'lodash/throttle';
|
||||
import { Constants, isAssistantsEndpoint, isAgentsEndpoint } from 'librechat-data-provider';
|
||||
import type { TMessageProps } from '~/common';
|
||||
import { useMessagesViewContext, useAssistantsMapContext, useAgentsMapContext } from '~/Providers';
|
||||
import { getTextKey, TEXT_KEY_DIVIDER, logger } from '~/utils';
|
||||
import useCopyToClipboard from './useCopyToClipboard';
|
||||
import { useGetAddedConvo } from '~/hooks/Chat';
|
||||
|
||||
export default function useMessageHelpers(props: TMessageProps) {
|
||||
const latestText = useRef<string | number>('');
|
||||
|
|
@ -24,6 +25,8 @@ export default function useMessageHelpers(props: TMessageProps) {
|
|||
const agentsMap = useAgentsMapContext();
|
||||
const assistantMap = useAssistantsMapContext();
|
||||
|
||||
const getAddedConvo = useGetAddedConvo();
|
||||
|
||||
const { text, content, children, messageId = null, isCreatedByUser } = message ?? {};
|
||||
const edit = messageId === currentEditId;
|
||||
const isLast = children?.length === 0 || children?.length === undefined;
|
||||
|
|
@ -122,7 +125,7 @@ export default function useMessageHelpers(props: TMessageProps) {
|
|||
return;
|
||||
}
|
||||
|
||||
regenerate(message);
|
||||
regenerate(message, { addedConvo: getAddedConvo() });
|
||||
};
|
||||
|
||||
const copyToClipboard = useCopyToClipboard({ text, content });
|
||||
|
|
|
|||
|
|
@ -1,26 +1,15 @@
|
|||
import throttle from 'lodash/throttle';
|
||||
import { useRecoilValue } from 'recoil';
|
||||
import { Constants } from 'librechat-data-provider';
|
||||
import { useEffect, useRef, useCallback, useMemo, useState } from 'react';
|
||||
import { useEffect, useRef, useCallback, useMemo } from 'react';
|
||||
import type { TMessage } from 'librechat-data-provider';
|
||||
import { getTextKey, TEXT_KEY_DIVIDER, logger } from '~/utils';
|
||||
import { useMessagesViewContext } from '~/Providers';
|
||||
import store from '~/store';
|
||||
|
||||
export default function useMessageProcess({ message }: { message?: TMessage | null }) {
|
||||
const latestText = useRef<string | number>('');
|
||||
const [siblingMessage, setSiblingMessage] = useState<TMessage | null>(null);
|
||||
const hasNoChildren = useMemo(() => (message?.children?.length ?? 0) === 0, [message]);
|
||||
|
||||
const {
|
||||
index,
|
||||
conversation,
|
||||
latestMessage,
|
||||
setAbortScroll,
|
||||
setLatestMessage,
|
||||
isSubmittingFamily,
|
||||
} = useMessagesViewContext();
|
||||
const latestMultiMessage = useRecoilValue(store.latestMessageFamily(index + 1));
|
||||
const { conversation, setAbortScroll, setLatestMessage, isSubmitting } = useMessagesViewContext();
|
||||
|
||||
useEffect(() => {
|
||||
const convoId = conversation?.conversationId;
|
||||
|
|
@ -72,47 +61,22 @@ export default function useMessageProcess({ message }: { message?: TMessage | nu
|
|||
throttle(() => {
|
||||
logger.log(
|
||||
'message_scrolling',
|
||||
`useMessageProcess: setting abort scroll to ${isSubmittingFamily}, handleScroll event`,
|
||||
`useMessageProcess: setting abort scroll to ${isSubmitting}, handleScroll event`,
|
||||
event,
|
||||
);
|
||||
if (isSubmittingFamily) {
|
||||
if (isSubmitting) {
|
||||
setAbortScroll(true);
|
||||
} else {
|
||||
setAbortScroll(false);
|
||||
}
|
||||
}, 500)();
|
||||
},
|
||||
[isSubmittingFamily, setAbortScroll],
|
||||
[isSubmitting, setAbortScroll],
|
||||
);
|
||||
|
||||
const showSibling = useMemo(
|
||||
() =>
|
||||
(hasNoChildren && latestMultiMessage && (latestMultiMessage.children?.length ?? 0) === 0) ||
|
||||
!!siblingMessage,
|
||||
[hasNoChildren, latestMultiMessage, siblingMessage],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
if (
|
||||
hasNoChildren &&
|
||||
latestMultiMessage &&
|
||||
latestMultiMessage.conversationId === message?.conversationId
|
||||
) {
|
||||
const newSibling = Object.assign({}, latestMultiMessage, {
|
||||
parentMessageId: message.parentMessageId,
|
||||
depth: message.depth,
|
||||
});
|
||||
setSiblingMessage(newSibling);
|
||||
}
|
||||
}, [hasNoChildren, latestMultiMessage, message, setSiblingMessage, latestMessage]);
|
||||
|
||||
return {
|
||||
showSibling,
|
||||
handleScroll,
|
||||
isSubmitting,
|
||||
conversation,
|
||||
siblingMessage,
|
||||
setSiblingMessage,
|
||||
isSubmittingFamily,
|
||||
latestMultiMessage,
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,17 @@
|
|||
import { v4 } from 'uuid';
|
||||
import { useCallback } from 'react';
|
||||
import { useRecoilValue, useSetRecoilState } from 'recoil';
|
||||
import { Constants, replaceSpecialVars } from 'librechat-data-provider';
|
||||
import { replaceSpecialVars } from 'librechat-data-provider';
|
||||
import { useChatContext, useChatFormContext, useAddedChatContext } from '~/Providers';
|
||||
import { useAuthContext } from '~/hooks/AuthContext';
|
||||
import store from '~/store';
|
||||
|
||||
const appendIndex = (index: number, value?: string) => {
|
||||
if (!value) {
|
||||
return value;
|
||||
}
|
||||
return `${value}${Constants.COMMON_DIVIDER}${index}`;
|
||||
};
|
||||
|
||||
export default function useSubmitMessage() {
|
||||
const { user } = useAuthContext();
|
||||
const methods = useChatFormContext();
|
||||
const { conversation: addedConvo } = useAddedChatContext();
|
||||
const { ask, index, getMessages, setMessages, latestMessage } = useChatContext();
|
||||
const { addedIndex, ask: askAdditional, conversation: addedConvo } = useAddedChatContext();
|
||||
|
||||
const autoSendPrompts = useRecoilValue(store.autoSendPrompts);
|
||||
const activeConvos = useRecoilValue(store.allConversationsSelector);
|
||||
const setActivePrompt = useSetRecoilState(store.activePromptByIndex(index));
|
||||
|
||||
const submitMessage = useCallback(
|
||||
|
|
@ -36,47 +27,17 @@ export default function useSubmitMessage() {
|
|||
setMessages([...(rootMessages || []), latestMessage]);
|
||||
}
|
||||
|
||||
const hasAdded = addedIndex && activeConvos[addedIndex] && addedConvo;
|
||||
const isNewMultiConvo =
|
||||
hasAdded &&
|
||||
activeConvos.every((convoId) => convoId === Constants.NEW_CONVO) &&
|
||||
!rootMessages?.length;
|
||||
const overrideConvoId = isNewMultiConvo ? v4() : undefined;
|
||||
const overrideUserMessageId = hasAdded ? v4() : undefined;
|
||||
const rootIndex = addedIndex - 1;
|
||||
const clientTimestamp = new Date().toISOString();
|
||||
|
||||
ask({
|
||||
text: data.text,
|
||||
overrideConvoId: appendIndex(rootIndex, overrideConvoId),
|
||||
overrideUserMessageId: appendIndex(rootIndex, overrideUserMessageId),
|
||||
clientTimestamp,
|
||||
});
|
||||
|
||||
if (hasAdded) {
|
||||
askAdditional(
|
||||
{
|
||||
text: data.text,
|
||||
overrideConvoId: appendIndex(addedIndex, overrideConvoId),
|
||||
overrideUserMessageId: appendIndex(addedIndex, overrideUserMessageId),
|
||||
clientTimestamp,
|
||||
},
|
||||
{ overrideMessages: rootMessages },
|
||||
);
|
||||
}
|
||||
ask(
|
||||
{
|
||||
text: data.text,
|
||||
},
|
||||
{
|
||||
addedConvo: addedConvo ?? undefined,
|
||||
},
|
||||
);
|
||||
methods.reset();
|
||||
},
|
||||
[
|
||||
ask,
|
||||
methods,
|
||||
addedIndex,
|
||||
addedConvo,
|
||||
setMessages,
|
||||
getMessages,
|
||||
activeConvos,
|
||||
askAdditional,
|
||||
latestMessage,
|
||||
],
|
||||
[ask, methods, addedConvo, setMessages, getMessages, latestMessage],
|
||||
);
|
||||
|
||||
const submitPrompt = useCallback(
|
||||
|
|
|
|||
|
|
@ -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(() => {
|
||||
|
|
|
|||
|
|
@ -5,14 +5,15 @@ import { useRecoilState, useRecoilValue, useSetRecoilState, useRecoilCallback }
|
|||
import {
|
||||
Constants,
|
||||
FileSources,
|
||||
Permissions,
|
||||
EModelEndpoint,
|
||||
isParamEndpoint,
|
||||
getEndpointField,
|
||||
LocalStorageKeys,
|
||||
isAssistantsEndpoint,
|
||||
isAgentsEndpoint,
|
||||
PermissionTypes,
|
||||
Permissions,
|
||||
getEndpointField,
|
||||
isAgentsEndpoint,
|
||||
LocalStorageKeys,
|
||||
isEphemeralAgentId,
|
||||
isAssistantsEndpoint,
|
||||
} from 'librechat-data-provider';
|
||||
import type {
|
||||
TPreset,
|
||||
|
|
@ -120,8 +121,8 @@ const useNewConvo = (index = 0) => {
|
|||
isAgentsEndpoint(lastConversationSetup?.endpoint) && lastConversationSetup?.agent_id;
|
||||
const isExistingAgentConvo =
|
||||
isAgentsEndpoint(defaultEndpoint) &&
|
||||
((conversation.agent_id && conversation.agent_id !== Constants.EPHEMERAL_AGENT_ID) ||
|
||||
(storedAgentId && storedAgentId !== Constants.EPHEMERAL_AGENT_ID));
|
||||
((conversation.agent_id && !isEphemeralAgentId(conversation.agent_id)) ||
|
||||
(storedAgentId && !isEphemeralAgentId(storedAgentId)));
|
||||
if (
|
||||
defaultEndpoint &&
|
||||
isAgentsEndpoint(defaultEndpoint) &&
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue