mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02:00

* ✨feat: OAuth for Actions * WIP: PoC flow state manager * refactor: Add identifier field to token model from action schema * chore: fix potential file type issues * ci: fix type issue with action metadata auth * fix: ensure FlowManagerOptions has a default ttl value * WIP: OAUTH actions * WIP: first pass OAuth Action * fix: standardize identifier usage in OAuth flow handling * fix: update token retrieval to include userId in query and use correct identifier * refacotr: update token retrieval to use userId for OAuth token query * feat: Tool Call Auth styling * fix: streamline token creation and add type field to token schema * refactor: cleanup OAuth flow by encrypting client credentials and ensuring oauth operations only run under condition * refactor: use encrypted credentials in OAuth callback * fix: update Token collection indexes to use expiresAt TTL index and not createdAt legacy index * refactor: enhance Token index cleanup by improving logging and removing redundant index creation logic * refactor: remove unused OAuth login route and related logic for improved clarity * refactor: replace fetch with axios for OAuth token exchange and improve error handling * refactor: better UX after authentication before oauth tool execution * refactor: implement cleanup handlers for FlowStateManager intervals to enhance resource management * refactor: encrypt OAuth tokens before storing and decrypt upon retrieval for enhanced security * refactor: enhance authentication success page with improved styling and countdown feature * refactor: add response_type parameter to OAuth redirect URI for improved compatibility * chore: update translation.json new localizations * chore: remove unused OGDialog import from OGDialogTemplate component * refactor: Actions Auth using new Dialog styling, use same component with Agents/Assistants * refactor: update removeNullishValues function to support removal of empty strings and adjust transform usage in schemas * chore: bump version of librechat-data-provider to 0.7.6991 * refactor: integrate removeNullishValues function to clean metadata before encryption in agent and assistant routes * refactor: update OAuth input fields to use 'password' type for better security * refactor: update localization placeholders for sign-in message to use double curly braces * refactor: add access_type parameter for offline access in createActionTool function * refactor: implement handleOAuthToken function for token management and encryption * feat: refresh token support * refactor: add default expiration for access token and error handling for missing token * feat: localizations for ActionAuth * refactor: set refresh token expiration to null to not expire if expiry never given * fix: prevent crash fromerror within async handleAbortError in AskController, EditController, and AgentController * feat: Action Callback URL * 🌍 i18n: Update translation.json with latest translations * refactor: handle errors in flow state checking to prevent unhandled promise rejections * fix: improve flow state concurrency to prevent multiple token creation calls * refactor: RequestExecutor to use separate axios instance * refactor: improve concurrency flows by keeping completed state until TTL expiry * refactor: increase TTL for flow state management and adjust monitoring interval * ci: mock axios instance creation in actions spec * feat: add Babel and Jest configuration files; implement FlowStateManager tests with concurrency handling * chore: add disableOAuth prop to ActionsAuth (not implemented for Assistants yet) --------- Co-authored-by: Danny Avila <danny@librechat.ai> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
238 lines
6.7 KiB
JavaScript
238 lines
6.7 KiB
JavaScript
const { createContentAggregator, Providers } = require('@librechat/agents');
|
|
const {
|
|
EModelEndpoint,
|
|
getResponseSender,
|
|
providerEndpointMap,
|
|
} = require('librechat-data-provider');
|
|
const {
|
|
getDefaultHandlers,
|
|
createToolEndCallback,
|
|
} = require('~/server/controllers/agents/callbacks');
|
|
const initAnthropic = require('~/server/services/Endpoints/anthropic/initialize');
|
|
const getBedrockOptions = require('~/server/services/Endpoints/bedrock/options');
|
|
const initOpenAI = require('~/server/services/Endpoints/openAI/initialize');
|
|
const initCustom = require('~/server/services/Endpoints/custom/initialize');
|
|
const initGoogle = require('~/server/services/Endpoints/google/initialize');
|
|
const { getCustomEndpointConfig } = require('~/server/services/Config');
|
|
const { loadAgentTools } = require('~/server/services/ToolService');
|
|
const AgentClient = require('~/server/controllers/agents/client');
|
|
const { getModelMaxTokens } = require('~/utils');
|
|
const { getAgent } = require('~/models/Agent');
|
|
const { logger } = require('~/config');
|
|
|
|
const providerConfigMap = {
|
|
[EModelEndpoint.openAI]: initOpenAI,
|
|
[EModelEndpoint.azureOpenAI]: initOpenAI,
|
|
[EModelEndpoint.anthropic]: initAnthropic,
|
|
[EModelEndpoint.bedrock]: getBedrockOptions,
|
|
[EModelEndpoint.google]: initGoogle,
|
|
[Providers.OLLAMA]: initCustom,
|
|
};
|
|
|
|
/**
|
|
*
|
|
* @param {Promise<Array<MongoFile | null>> | undefined} _attachments
|
|
* @param {AgentToolResources | undefined} _tool_resources
|
|
* @returns {Promise<{ attachments: Array<MongoFile | undefined> | undefined, tool_resources: AgentToolResources | undefined }>}
|
|
*/
|
|
const primeResources = async (_attachments, _tool_resources) => {
|
|
try {
|
|
if (!_attachments) {
|
|
return { attachments: undefined, tool_resources: _tool_resources };
|
|
}
|
|
/** @type {Array<MongoFile | undefined> | undefined} */
|
|
const files = await _attachments;
|
|
const attachments = [];
|
|
const tool_resources = _tool_resources ?? {};
|
|
|
|
for (const file of files) {
|
|
if (!file) {
|
|
continue;
|
|
}
|
|
if (file.metadata?.fileIdentifier) {
|
|
const execute_code = tool_resources.execute_code ?? {};
|
|
if (!execute_code.files) {
|
|
tool_resources.execute_code = { ...execute_code, files: [] };
|
|
}
|
|
tool_resources.execute_code.files.push(file);
|
|
} else if (file.embedded === true) {
|
|
const file_search = tool_resources.file_search ?? {};
|
|
if (!file_search.files) {
|
|
tool_resources.file_search = { ...file_search, files: [] };
|
|
}
|
|
tool_resources.file_search.files.push(file);
|
|
}
|
|
|
|
attachments.push(file);
|
|
}
|
|
return { attachments, tool_resources };
|
|
} catch (error) {
|
|
logger.error('Error priming resources', error);
|
|
return { attachments: _attachments, tool_resources: _tool_resources };
|
|
}
|
|
};
|
|
|
|
const initializeAgentOptions = async ({
|
|
req,
|
|
res,
|
|
agent,
|
|
endpointOption,
|
|
tool_resources,
|
|
isInitialAgent = false,
|
|
}) => {
|
|
const { tools, toolContextMap } = await loadAgentTools({
|
|
req,
|
|
res,
|
|
agent,
|
|
tool_resources,
|
|
});
|
|
|
|
const provider = agent.provider;
|
|
let getOptions = providerConfigMap[provider];
|
|
|
|
if (!getOptions) {
|
|
const customEndpointConfig = await getCustomEndpointConfig(provider);
|
|
if (!customEndpointConfig) {
|
|
throw new Error(`Provider ${provider} not supported`);
|
|
}
|
|
getOptions = initCustom;
|
|
agent.provider = Providers.OPENAI;
|
|
agent.endpoint = provider.toLowerCase();
|
|
}
|
|
|
|
const model_parameters = Object.assign(
|
|
{},
|
|
agent.model_parameters ?? { model: agent.model },
|
|
isInitialAgent === true ? endpointOption?.model_parameters : {},
|
|
);
|
|
const _endpointOption =
|
|
isInitialAgent === true
|
|
? Object.assign({}, endpointOption, { model_parameters })
|
|
: { model_parameters };
|
|
|
|
const options = await getOptions({
|
|
req,
|
|
res,
|
|
optionsOnly: true,
|
|
overrideEndpoint: provider,
|
|
overrideModel: agent.model,
|
|
endpointOption: _endpointOption,
|
|
});
|
|
|
|
if (options.provider != null) {
|
|
agent.provider = options.provider;
|
|
}
|
|
|
|
agent.model_parameters = Object.assign(model_parameters, options.llmConfig);
|
|
if (options.configOptions) {
|
|
agent.model_parameters.configuration = options.configOptions;
|
|
}
|
|
|
|
if (!agent.model_parameters.model) {
|
|
agent.model_parameters.model = agent.model;
|
|
}
|
|
|
|
const tokensModel =
|
|
agent.provider === EModelEndpoint.azureOpenAI ? agent.model : agent.model_parameters.model;
|
|
|
|
return {
|
|
...agent,
|
|
tools,
|
|
toolContextMap,
|
|
maxContextTokens:
|
|
agent.max_context_tokens ??
|
|
getModelMaxTokens(tokensModel, providerEndpointMap[provider]) ??
|
|
4000,
|
|
};
|
|
};
|
|
|
|
const initializeClient = async ({ req, res, endpointOption }) => {
|
|
if (!endpointOption) {
|
|
throw new Error('Endpoint option not provided');
|
|
}
|
|
|
|
// TODO: use endpointOption to determine options/modelOptions
|
|
/** @type {Array<UsageMetadata>} */
|
|
const collectedUsage = [];
|
|
/** @type {ArtifactPromises} */
|
|
const artifactPromises = [];
|
|
const { contentParts, aggregateContent } = createContentAggregator();
|
|
const toolEndCallback = createToolEndCallback({ req, res, artifactPromises });
|
|
const eventHandlers = getDefaultHandlers({
|
|
res,
|
|
aggregateContent,
|
|
toolEndCallback,
|
|
collectedUsage,
|
|
});
|
|
|
|
if (!endpointOption.agent) {
|
|
throw new Error('No agent promise provided');
|
|
}
|
|
|
|
// Initialize primary agent
|
|
const primaryAgent = await endpointOption.agent;
|
|
if (!primaryAgent) {
|
|
throw new Error('Agent not found');
|
|
}
|
|
|
|
const { attachments, tool_resources } = await primeResources(
|
|
endpointOption.attachments,
|
|
primaryAgent.tool_resources,
|
|
);
|
|
|
|
const agentConfigs = new Map();
|
|
|
|
// Handle primary agent
|
|
const primaryConfig = await initializeAgentOptions({
|
|
req,
|
|
res,
|
|
agent: primaryAgent,
|
|
endpointOption,
|
|
tool_resources,
|
|
isInitialAgent: true,
|
|
});
|
|
|
|
const agent_ids = primaryConfig.agent_ids;
|
|
if (agent_ids?.length) {
|
|
for (const agentId of agent_ids) {
|
|
const agent = await getAgent({ id: agentId });
|
|
if (!agent) {
|
|
throw new Error(`Agent ${agentId} not found`);
|
|
}
|
|
const config = await initializeAgentOptions({
|
|
req,
|
|
res,
|
|
agent,
|
|
endpointOption,
|
|
});
|
|
agentConfigs.set(agentId, config);
|
|
}
|
|
}
|
|
|
|
const sender =
|
|
primaryAgent.name ??
|
|
getResponseSender({
|
|
...endpointOption,
|
|
model: endpointOption.model_parameters.model,
|
|
});
|
|
|
|
const client = new AgentClient({
|
|
req,
|
|
agent: primaryConfig,
|
|
sender,
|
|
attachments,
|
|
contentParts,
|
|
eventHandlers,
|
|
collectedUsage,
|
|
artifactPromises,
|
|
spec: endpointOption.spec,
|
|
iconURL: endpointOption.iconURL,
|
|
agentConfigs,
|
|
endpoint: EModelEndpoint.agents,
|
|
maxContextTokens: primaryConfig.maxContextTokens,
|
|
});
|
|
|
|
return { client };
|
|
};
|
|
|
|
module.exports = { initializeClient };
|