mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-27 13:48: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
426 lines
10 KiB
JavaScript
426 lines
10 KiB
JavaScript
const { logger } = require('@librechat/data-schemas');
|
|
|
|
/** WeakMap to hold temporary data associated with requests */
|
|
const requestDataMap = new WeakMap();
|
|
|
|
const FinalizationRegistry = global.FinalizationRegistry || null;
|
|
|
|
/**
|
|
* FinalizationRegistry to clean up client objects when they are garbage collected.
|
|
* This is used to prevent memory leaks and ensure that client objects are
|
|
* properly disposed of when they are no longer needed.
|
|
* The registry holds a weak reference to the client object and a cleanup
|
|
* callback that is called when the client object is garbage collected.
|
|
* The callback can be used to perform any necessary cleanup operations,
|
|
* such as removing event listeners or freeing up resources.
|
|
*/
|
|
const clientRegistry = FinalizationRegistry
|
|
? new FinalizationRegistry((heldValue) => {
|
|
try {
|
|
// This will run when the client is garbage collected
|
|
if (heldValue && heldValue.userId) {
|
|
logger.debug(`[FinalizationRegistry] Cleaning up client for user ${heldValue.userId}`);
|
|
} else {
|
|
logger.debug('[FinalizationRegistry] Cleaning up client');
|
|
}
|
|
} catch {
|
|
// Ignore errors
|
|
}
|
|
})
|
|
: null;
|
|
|
|
const graphPropsToClean = [
|
|
'handlerRegistry',
|
|
'runId',
|
|
'tools',
|
|
'signal',
|
|
'config',
|
|
'agentContexts',
|
|
'messages',
|
|
'contentData',
|
|
'stepKeyIds',
|
|
'contentIndexMap',
|
|
'toolCallStepIds',
|
|
'messageIdsByStepKey',
|
|
'messageStepHasToolCalls',
|
|
'prelimMessageIdsByStepKey',
|
|
'startIndex',
|
|
'defaultAgentId',
|
|
'dispatchReasoningDelta',
|
|
'compileOptions',
|
|
'invokedToolIds',
|
|
'overrideModel',
|
|
];
|
|
|
|
const graphRunnablePropsToClean = [
|
|
'lc_serializable',
|
|
'lc_kwargs',
|
|
'lc_runnable',
|
|
'name',
|
|
'lc_namespace',
|
|
'lg_is_pregel',
|
|
'nodes',
|
|
'channels',
|
|
'inputChannels',
|
|
'outputChannels',
|
|
'autoValidate',
|
|
'streamMode',
|
|
'streamChannels',
|
|
'interruptAfter',
|
|
'interruptBefore',
|
|
'stepTimeout',
|
|
'debug',
|
|
'checkpointer',
|
|
'retryPolicy',
|
|
'config',
|
|
'store',
|
|
'triggerToNodes',
|
|
'cache',
|
|
'description',
|
|
'metaRegistry',
|
|
];
|
|
|
|
/**
|
|
* Cleans up the client object by removing potential circular references to its properties.
|
|
* This is useful for preventing memory leaks and ensuring that the client
|
|
* and its properties can be garbage collected when it is no longer needed.
|
|
*/
|
|
function disposeClient(client) {
|
|
if (!client) {
|
|
return;
|
|
}
|
|
|
|
try {
|
|
if (client.user) {
|
|
client.user = null;
|
|
}
|
|
if (client.apiKey) {
|
|
client.apiKey = null;
|
|
}
|
|
if (client.azure) {
|
|
client.azure = null;
|
|
}
|
|
if (client.conversationId) {
|
|
client.conversationId = null;
|
|
}
|
|
if (client.responseMessageId) {
|
|
client.responseMessageId = null;
|
|
}
|
|
if (client.parentMessageId) {
|
|
client.parentMessageId = null;
|
|
}
|
|
if (client.message_file_map) {
|
|
client.message_file_map = null;
|
|
}
|
|
if (client.clientName) {
|
|
client.clientName = null;
|
|
}
|
|
if (client.sender) {
|
|
client.sender = null;
|
|
}
|
|
if (client.model) {
|
|
client.model = null;
|
|
}
|
|
if (client.maxContextTokens) {
|
|
client.maxContextTokens = null;
|
|
}
|
|
if (client.contextStrategy) {
|
|
client.contextStrategy = null;
|
|
}
|
|
if (client.currentDateString) {
|
|
client.currentDateString = null;
|
|
}
|
|
if (client.inputTokensKey) {
|
|
client.inputTokensKey = null;
|
|
}
|
|
if (client.outputTokensKey) {
|
|
client.outputTokensKey = null;
|
|
}
|
|
if (client.skipSaveUserMessage !== undefined) {
|
|
client.skipSaveUserMessage = null;
|
|
}
|
|
if (client.visionMode) {
|
|
client.visionMode = null;
|
|
}
|
|
if (client.continued !== undefined) {
|
|
client.continued = null;
|
|
}
|
|
if (client.fetchedConvo !== undefined) {
|
|
client.fetchedConvo = null;
|
|
}
|
|
if (client.previous_summary) {
|
|
client.previous_summary = null;
|
|
}
|
|
if (client.metadata) {
|
|
client.metadata = null;
|
|
}
|
|
if (client.isVisionModel) {
|
|
client.isVisionModel = null;
|
|
}
|
|
if (client.isChatCompletion !== undefined) {
|
|
client.isChatCompletion = null;
|
|
}
|
|
if (client.contextHandlers) {
|
|
client.contextHandlers = null;
|
|
}
|
|
if (client.augmentedPrompt) {
|
|
client.augmentedPrompt = null;
|
|
}
|
|
if (client.systemMessage) {
|
|
client.systemMessage = null;
|
|
}
|
|
if (client.azureEndpoint) {
|
|
client.azureEndpoint = null;
|
|
}
|
|
if (client.langchainProxy) {
|
|
client.langchainProxy = null;
|
|
}
|
|
if (client.isOmni !== undefined) {
|
|
client.isOmni = null;
|
|
}
|
|
if (client.runManager) {
|
|
client.runManager = null;
|
|
}
|
|
// Properties specific to AnthropicClient
|
|
if (client.message_start) {
|
|
client.message_start = null;
|
|
}
|
|
if (client.message_delta) {
|
|
client.message_delta = null;
|
|
}
|
|
if (client.isClaudeLatest !== undefined) {
|
|
client.isClaudeLatest = null;
|
|
}
|
|
if (client.useMessages !== undefined) {
|
|
client.useMessages = null;
|
|
}
|
|
if (client.supportsCacheControl !== undefined) {
|
|
client.supportsCacheControl = null;
|
|
}
|
|
// Properties specific to GoogleClient
|
|
if (client.serviceKey) {
|
|
client.serviceKey = null;
|
|
}
|
|
if (client.project_id) {
|
|
client.project_id = null;
|
|
}
|
|
if (client.client_email) {
|
|
client.client_email = null;
|
|
}
|
|
if (client.private_key) {
|
|
client.private_key = null;
|
|
}
|
|
if (client.access_token) {
|
|
client.access_token = null;
|
|
}
|
|
if (client.reverseProxyUrl) {
|
|
client.reverseProxyUrl = null;
|
|
}
|
|
if (client.authHeader) {
|
|
client.authHeader = null;
|
|
}
|
|
if (client.isGenerativeModel !== undefined) {
|
|
client.isGenerativeModel = null;
|
|
}
|
|
// Properties specific to OpenAIClient
|
|
if (client.completionsUrl) {
|
|
client.completionsUrl = null;
|
|
}
|
|
if (client.shouldSummarize !== undefined) {
|
|
client.shouldSummarize = null;
|
|
}
|
|
if (client.isOllama !== undefined) {
|
|
client.isOllama = null;
|
|
}
|
|
if (client.FORCE_PROMPT !== undefined) {
|
|
client.FORCE_PROMPT = null;
|
|
}
|
|
if (client.isChatGptModel !== undefined) {
|
|
client.isChatGptModel = null;
|
|
}
|
|
if (client.isUnofficialChatGptModel !== undefined) {
|
|
client.isUnofficialChatGptModel = null;
|
|
}
|
|
if (client.useOpenRouter !== undefined) {
|
|
client.useOpenRouter = null;
|
|
}
|
|
if (client.startToken) {
|
|
client.startToken = null;
|
|
}
|
|
if (client.endToken) {
|
|
client.endToken = null;
|
|
}
|
|
if (client.userLabel) {
|
|
client.userLabel = null;
|
|
}
|
|
if (client.chatGptLabel) {
|
|
client.chatGptLabel = null;
|
|
}
|
|
if (client.modelLabel) {
|
|
client.modelLabel = null;
|
|
}
|
|
if (client.modelOptions) {
|
|
client.modelOptions = null;
|
|
}
|
|
if (client.defaultVisionModel) {
|
|
client.defaultVisionModel = null;
|
|
}
|
|
if (client.maxPromptTokens) {
|
|
client.maxPromptTokens = null;
|
|
}
|
|
if (client.maxResponseTokens) {
|
|
client.maxResponseTokens = null;
|
|
}
|
|
if (client.processMemory) {
|
|
client.processMemory = null;
|
|
}
|
|
|
|
if (client.run) {
|
|
if (client.run.Graph) {
|
|
client.run.Graph.resetValues();
|
|
|
|
graphPropsToClean.forEach((prop) => {
|
|
if (client.run.Graph[prop] !== undefined) {
|
|
client.run.Graph[prop] = null;
|
|
}
|
|
});
|
|
|
|
client.run.Graph = null;
|
|
}
|
|
|
|
if (client.run.graphRunnable) {
|
|
graphRunnablePropsToClean.forEach((prop) => {
|
|
if (client.run.graphRunnable[prop] !== undefined) {
|
|
client.run.graphRunnable[prop] = null;
|
|
}
|
|
});
|
|
|
|
if (client.run.graphRunnable.builder) {
|
|
if (client.run.graphRunnable.builder.nodes !== undefined) {
|
|
client.run.graphRunnable.builder.nodes = null;
|
|
}
|
|
client.run.graphRunnable.builder = null;
|
|
}
|
|
|
|
client.run.graphRunnable = null;
|
|
}
|
|
|
|
const runPropsToClean = [
|
|
'handlerRegistry',
|
|
'id',
|
|
'indexTokenCountMap',
|
|
'returnContent',
|
|
'tokenCounter',
|
|
];
|
|
|
|
runPropsToClean.forEach((prop) => {
|
|
if (client.run[prop] !== undefined) {
|
|
client.run[prop] = null;
|
|
}
|
|
});
|
|
|
|
client.run = null;
|
|
}
|
|
|
|
if (client.sendMessage) {
|
|
client.sendMessage = null;
|
|
}
|
|
if (client.savedMessageIds) {
|
|
client.savedMessageIds.clear();
|
|
client.savedMessageIds = null;
|
|
}
|
|
if (client.currentMessages) {
|
|
client.currentMessages = null;
|
|
}
|
|
if (client.streamHandler) {
|
|
client.streamHandler = null;
|
|
}
|
|
if (client.contentParts) {
|
|
client.contentParts = null;
|
|
}
|
|
if (client.abortController) {
|
|
client.abortController = null;
|
|
}
|
|
if (client.collectedUsage) {
|
|
client.collectedUsage = null;
|
|
}
|
|
if (client.indexTokenCountMap) {
|
|
client.indexTokenCountMap = null;
|
|
}
|
|
if (client.agentConfigs) {
|
|
client.agentConfigs = null;
|
|
}
|
|
if (client.artifactPromises) {
|
|
client.artifactPromises = null;
|
|
}
|
|
if (client.usage) {
|
|
client.usage = null;
|
|
}
|
|
if (typeof client.dispose === 'function') {
|
|
client.dispose();
|
|
}
|
|
if (client.options) {
|
|
if (client.options.req) {
|
|
client.options.req = null;
|
|
}
|
|
if (client.options.res) {
|
|
client.options.res = null;
|
|
}
|
|
if (client.options.attachments) {
|
|
client.options.attachments = null;
|
|
}
|
|
if (client.options.agent) {
|
|
client.options.agent = null;
|
|
}
|
|
}
|
|
client.options = null;
|
|
} catch {
|
|
// Ignore errors during disposal
|
|
} finally {
|
|
logger.debug('[disposeClient] Client disposed');
|
|
}
|
|
}
|
|
|
|
function processReqData(data = {}, context) {
|
|
let {
|
|
abortKey,
|
|
userMessage,
|
|
userMessagePromise,
|
|
responseMessageId,
|
|
promptTokens,
|
|
conversationId,
|
|
userMessageId,
|
|
} = context;
|
|
for (const key in data) {
|
|
if (key === 'userMessage') {
|
|
userMessage = data[key];
|
|
userMessageId = data[key].messageId;
|
|
} else if (key === 'userMessagePromise') {
|
|
userMessagePromise = data[key];
|
|
} else if (key === 'responseMessageId') {
|
|
responseMessageId = data[key];
|
|
} else if (key === 'promptTokens') {
|
|
promptTokens = data[key];
|
|
} else if (key === 'abortKey') {
|
|
abortKey = data[key];
|
|
} else if (!conversationId && key === 'conversationId') {
|
|
conversationId = data[key];
|
|
}
|
|
}
|
|
return {
|
|
abortKey,
|
|
userMessage,
|
|
userMessagePromise,
|
|
responseMessageId,
|
|
promptTokens,
|
|
conversationId,
|
|
userMessageId,
|
|
};
|
|
}
|
|
|
|
module.exports = {
|
|
disposeClient,
|
|
requestDataMap,
|
|
clientRegistry,
|
|
processReqData,
|
|
};
|