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
218 lines
6.6 KiB
JavaScript
218 lines
6.6 KiB
JavaScript
const { logger } = require('@librechat/data-schemas');
|
|
const { getCustomEndpointConfig } = require('@librechat/api');
|
|
const {
|
|
Tools,
|
|
Constants,
|
|
isAgentsEndpoint,
|
|
getResponseSender,
|
|
isEphemeralAgentId,
|
|
appendAgentIdSuffix,
|
|
encodeEphemeralAgentId,
|
|
} = require('librechat-data-provider');
|
|
const { getMCPServerTools } = require('~/server/services/Config');
|
|
|
|
const { mcp_all, mcp_delimiter } = Constants;
|
|
|
|
/**
|
|
* Constant for added conversation agent ID
|
|
*/
|
|
const ADDED_AGENT_ID = 'added_agent';
|
|
|
|
/**
|
|
* Get an agent document based on the provided ID.
|
|
* @param {Object} searchParameter - The search parameters to find the agent.
|
|
* @param {string} searchParameter.id - The ID of the agent.
|
|
* @returns {Promise<import('librechat-data-provider').Agent|null>}
|
|
*/
|
|
let getAgent;
|
|
|
|
/**
|
|
* Set the getAgent function (dependency injection to avoid circular imports)
|
|
* @param {Function} fn
|
|
*/
|
|
const setGetAgent = (fn) => {
|
|
getAgent = fn;
|
|
};
|
|
|
|
/**
|
|
* Load an agent from an added conversation (TConversation).
|
|
* Used for multi-convo parallel agent execution.
|
|
*
|
|
* @param {Object} params
|
|
* @param {import('express').Request} params.req
|
|
* @param {import('librechat-data-provider').TConversation} params.conversation - The added conversation
|
|
* @param {import('librechat-data-provider').Agent} [params.primaryAgent] - The primary agent (used to duplicate tools when both are ephemeral)
|
|
* @returns {Promise<import('librechat-data-provider').Agent|null>} The agent config as a plain object, or null if invalid.
|
|
*/
|
|
const loadAddedAgent = async ({ req, conversation, primaryAgent }) => {
|
|
if (!conversation) {
|
|
return null;
|
|
}
|
|
|
|
// If there's an agent_id, load the existing agent
|
|
if (conversation.agent_id && !isEphemeralAgentId(conversation.agent_id)) {
|
|
if (!getAgent) {
|
|
throw new Error('getAgent not initialized - call setGetAgent first');
|
|
}
|
|
const agent = await getAgent({
|
|
id: conversation.agent_id,
|
|
});
|
|
|
|
if (!agent) {
|
|
logger.warn(`[loadAddedAgent] Agent ${conversation.agent_id} not found`);
|
|
return null;
|
|
}
|
|
|
|
agent.version = agent.versions ? agent.versions.length : 0;
|
|
// Append suffix to distinguish from primary agent (matches ephemeral format)
|
|
// This is needed when both agents have the same ID or for consistent parallel content attribution
|
|
agent.id = appendAgentIdSuffix(agent.id, 1);
|
|
return agent;
|
|
}
|
|
|
|
// Otherwise, create an ephemeral agent config from the conversation
|
|
const { model, endpoint, promptPrefix, spec, ...rest } = conversation;
|
|
|
|
if (!endpoint || !model) {
|
|
logger.warn('[loadAddedAgent] Missing required endpoint or model for ephemeral agent');
|
|
return null;
|
|
}
|
|
|
|
// If both primary and added agents are ephemeral, duplicate tools from primary agent
|
|
const primaryIsEphemeral = primaryAgent && isEphemeralAgentId(primaryAgent.id);
|
|
if (primaryIsEphemeral && Array.isArray(primaryAgent.tools)) {
|
|
// Get display name using getResponseSender
|
|
const appConfig = req.config;
|
|
let endpointConfig = appConfig?.endpoints?.[endpoint];
|
|
if (!isAgentsEndpoint(endpoint) && !endpointConfig) {
|
|
try {
|
|
endpointConfig = getCustomEndpointConfig({ endpoint, appConfig });
|
|
} catch (err) {
|
|
logger.error('[loadAddedAgent] Error getting custom endpoint config', err);
|
|
}
|
|
}
|
|
|
|
const sender = getResponseSender({
|
|
modelLabel: rest.modelLabel,
|
|
modelDisplayLabel: endpointConfig?.modelDisplayLabel,
|
|
});
|
|
|
|
const ephemeralId = encodeEphemeralAgentId({ endpoint, model, sender, index: 1 });
|
|
|
|
return {
|
|
id: ephemeralId,
|
|
instructions: promptPrefix || '',
|
|
provider: endpoint,
|
|
model_parameters: {},
|
|
model,
|
|
tools: [...primaryAgent.tools],
|
|
};
|
|
}
|
|
|
|
// Extract ephemeral agent options from conversation if present
|
|
const ephemeralAgent = rest.ephemeralAgent;
|
|
const mcpServers = new Set(ephemeralAgent?.mcp);
|
|
const userId = req.user?.id;
|
|
|
|
// Check model spec for MCP servers
|
|
const modelSpecs = req.config?.modelSpecs?.list;
|
|
let modelSpec = null;
|
|
if (spec != null && spec !== '') {
|
|
modelSpec = modelSpecs?.find((s) => s.name === spec) || null;
|
|
}
|
|
if (modelSpec?.mcpServers) {
|
|
for (const mcpServer of modelSpec.mcpServers) {
|
|
mcpServers.add(mcpServer);
|
|
}
|
|
}
|
|
|
|
/** @type {string[]} */
|
|
const tools = [];
|
|
if (ephemeralAgent?.execute_code === true || modelSpec?.executeCode === true) {
|
|
tools.push(Tools.execute_code);
|
|
}
|
|
if (ephemeralAgent?.file_search === true || modelSpec?.fileSearch === true) {
|
|
tools.push(Tools.file_search);
|
|
}
|
|
if (ephemeralAgent?.web_search === true || modelSpec?.webSearch === true) {
|
|
tools.push(Tools.web_search);
|
|
}
|
|
|
|
const addedServers = new Set();
|
|
if (mcpServers.size > 0) {
|
|
for (const mcpServer of mcpServers) {
|
|
if (addedServers.has(mcpServer)) {
|
|
continue;
|
|
}
|
|
const serverTools = await getMCPServerTools(userId, mcpServer);
|
|
if (!serverTools) {
|
|
tools.push(`${mcp_all}${mcp_delimiter}${mcpServer}`);
|
|
addedServers.add(mcpServer);
|
|
continue;
|
|
}
|
|
tools.push(...Object.keys(serverTools));
|
|
addedServers.add(mcpServer);
|
|
}
|
|
}
|
|
|
|
// Build model_parameters from conversation fields
|
|
const model_parameters = {};
|
|
const paramKeys = [
|
|
'temperature',
|
|
'top_p',
|
|
'topP',
|
|
'topK',
|
|
'presence_penalty',
|
|
'frequency_penalty',
|
|
'maxOutputTokens',
|
|
'maxTokens',
|
|
'max_tokens',
|
|
];
|
|
|
|
for (const key of paramKeys) {
|
|
if (rest[key] != null) {
|
|
model_parameters[key] = rest[key];
|
|
}
|
|
}
|
|
|
|
// Get endpoint config for modelDisplayLabel (same pattern as initialize.js)
|
|
const appConfig = req.config;
|
|
let endpointConfig = appConfig?.endpoints?.[endpoint];
|
|
if (!isAgentsEndpoint(endpoint) && !endpointConfig) {
|
|
try {
|
|
endpointConfig = getCustomEndpointConfig({ endpoint, appConfig });
|
|
} catch (err) {
|
|
logger.error('[loadAddedAgent] Error getting custom endpoint config', err);
|
|
}
|
|
}
|
|
|
|
// Compute display name using getResponseSender (same logic used for main agent)
|
|
const sender = getResponseSender({
|
|
modelLabel: rest.modelLabel,
|
|
modelDisplayLabel: endpointConfig?.modelDisplayLabel,
|
|
});
|
|
|
|
/** Encoded ephemeral agent ID with endpoint, model, sender, and index=1 to distinguish from primary */
|
|
const ephemeralId = encodeEphemeralAgentId({ endpoint, model, sender, index: 1 });
|
|
|
|
const result = {
|
|
id: ephemeralId,
|
|
instructions: promptPrefix || '',
|
|
provider: endpoint,
|
|
model_parameters,
|
|
model,
|
|
tools,
|
|
};
|
|
|
|
if (ephemeralAgent?.artifacts != null && ephemeralAgent.artifacts) {
|
|
result.artifacts = ephemeralAgent.artifacts;
|
|
}
|
|
|
|
return result;
|
|
};
|
|
|
|
module.exports = {
|
|
ADDED_AGENT_ID,
|
|
loadAddedAgent,
|
|
setGetAgent,
|
|
};
|