mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-18 09:20:15 +01:00
* feat: Add BedrockIcon component to SVG library * feat: EModelEndpoint.bedrock * feat: first pass, bedrock chat. note: AgentClient is returning `agents` as conversation.endpoint * fix: declare endpoint in initialization step * chore: Update @librechat/agents dependency to version 1.4.5 * feat: backend content aggregation for agents/bedrock * feat: abort agent requests * feat: AWS Bedrock icons * WIP: agent provider schema parsing * chore: Update EditIcon props type * refactor(useGenerationsByLatest): make agents and bedrock editable * refactor: non-assistant message content, parts * fix: Bedrock response `sender` * fix: use endpointOption.model_parameters not endpointOption.modelOptions * fix: types for step handler * refactor: Update Agents.ToolCallDelta type * refactor: Remove unnecessary assignment of parentMessageId in AskController * refactor: remove unnecessary assignment of parentMessageId (agent request handler) * fix(bedrock/agents): message regeneration * refactor: dynamic form elements using react-hook-form Controllers * fix: agent icons/labels for messages * fix: agent actions * fix: use of new dynamic tags causing application crash * refactor: dynamic settings touch-ups * refactor: update Slider component to allow custom track class name * refactor: update DynamicSlider component styles * refactor: use Constants value for GLOBAL_PROJECT_NAME (enum) * feat: agent share global methods/controllers * fix: agents query * fix: `getResponseModel` * fix: share prompt a11y issue * refactor: update SharePrompt dialog theme styles * refactor: explicit typing for SharePrompt * feat: add agent roles/permissions * chore: update @librechat/agents dependency to version 1.4.7 for tool_call_ids edge case * fix(Anthropic): messages.X.content.Y.tool_use.input: Input should be a valid dictionary * fix: handle text parts with tool_call_ids and empty text * fix: role initialization * refactor: don't make instructions required * refactor: improve typing of Text part * fix: setShowStopButton for agents route * chore: remove params for now * fix: add streamBuffer and streamRate to help prevent 'Overloaded' errors from Anthropic API * refactor: remove console.log statement in ContentRender component * chore: typing, rename Context to Delete Button * chore(DeleteButton): logging * refactor(Action): make accessible * style(Action): improve a11y again * refactor: remove use/mention of mongoose sessions * feat: first pass, sharing agents * feat: visual indicator for global agent, remove author when serving to non-author * wip: params * chore: fix typing issues * fix(schemas): typing * refactor: improve accessibility of ListCard component and fix console React warning * wip: reset templates for non-legacy new convos * Revert "wip: params" This reverts commitf8067e91d4. * Revert "refactor: dynamic form elements using react-hook-form Controllers" This reverts commit2150c4815d. * fix(Parameters): types and parameter effect update to only update local state to parameters * refactor: optimize useDebouncedInput hook for better performance * feat: first pass, anthropic bedrock params * chore: paramEndpoints check for endpointType too * fix: maxTokens to use coerceNumber.optional(), * feat: extra chat model params * chore: reduce code repetition * refactor: improve preset title handling in SaveAsPresetDialog component * refactor: improve preset handling in HeaderOptions component * chore: improve typing, replace legacy dialog for SaveAsPresetDialog * feat: save as preset from parameters panel * fix: multi-search in select dropdown when using Option type * refactor: update default showDefault value to false in Dynamic components * feat: Bedrock presets settings * chore: config, fix agents schema, update config version * refactor: update AWS region variable name in bedrock options endpoint to BEDROCK_AWS_DEFAULT_REGION * refactor: update baseEndpointSchema in config.ts to include baseURL property * refactor: update createRun function to include req parameter and set streamRate based on provider * feat: availableRegions via config * refactor: remove unused demo agent controller file * WIP: title * Update @librechat/agents to version 1.5.0 * chore: addTitle.js to handle empty responseText * feat: support images and titles * feat: context token updates * Refactor BaseClient test to use expect.objectContaining * refactor: add model select, remove header options params, move side panel params below prompts * chore: update models list, catch title error * feat: model service for bedrock models (env) * chore: Remove verbose debug log in AgentClient class following stream * feat(bedrock): track token spend; fix: token rates, value key mapping for AWS models * refactor: handle streamRate in `handleLLMNewToken` callback * chore: AWS Bedrock example config in `.env.example` * refactor: Rename bedrockMeta to bedrockGeneral in settings.ts and use for AI21 and Amazon Bedrock providers * refactor: Update `.env.example` with AWS Bedrock model IDs URL and additional notes * feat: titleModel support for bedrock * refactor: Update `.env.example` with additional notes for AWS Bedrock model IDs
219 lines
6.4 KiB
JavaScript
219 lines
6.4 KiB
JavaScript
const { isAssistantsEndpoint } = require('librechat-data-provider');
|
|
const { sendMessage, sendError, countTokens, isEnabled } = require('~/server/utils');
|
|
const { truncateText, smartTruncateText } = require('~/app/clients/prompts');
|
|
const clearPendingReq = require('~/cache/clearPendingReq');
|
|
const { spendTokens } = require('~/models/spendTokens');
|
|
const abortControllers = require('./abortControllers');
|
|
const { saveMessage, getConvo } = require('~/models');
|
|
const { abortRun } = require('./abortRun');
|
|
const { logger } = require('~/config');
|
|
|
|
async function abortMessage(req, res) {
|
|
let { abortKey, endpoint } = req.body;
|
|
|
|
if (isAssistantsEndpoint(endpoint)) {
|
|
return await abortRun(req, res);
|
|
}
|
|
|
|
const conversationId = abortKey?.split(':')?.[0] ?? req.user.id;
|
|
|
|
if (!abortControllers.has(abortKey) && abortControllers.has(conversationId)) {
|
|
abortKey = conversationId;
|
|
}
|
|
|
|
if (!abortControllers.has(abortKey) && !res.headersSent) {
|
|
return res.status(204).send({ message: 'Request not found' });
|
|
}
|
|
|
|
const { abortController } = abortControllers.get(abortKey) ?? {};
|
|
if (!abortController) {
|
|
return res.status(204).send({ message: 'Request not found' });
|
|
}
|
|
const finalEvent = await abortController.abortCompletion();
|
|
logger.debug(
|
|
`[abortMessage] ID: ${req.user.id} | ${req.user.email} | Aborted request: ` +
|
|
JSON.stringify({ abortKey }),
|
|
);
|
|
abortControllers.delete(abortKey);
|
|
|
|
if (res.headersSent && finalEvent) {
|
|
return sendMessage(res, finalEvent);
|
|
}
|
|
|
|
res.setHeader('Content-Type', 'application/json');
|
|
|
|
res.send(JSON.stringify(finalEvent));
|
|
}
|
|
|
|
const handleAbort = () => {
|
|
return async (req, res) => {
|
|
try {
|
|
if (isEnabled(process.env.LIMIT_CONCURRENT_MESSAGES)) {
|
|
await clearPendingReq({ userId: req.user.id });
|
|
}
|
|
return await abortMessage(req, res);
|
|
} catch (err) {
|
|
logger.error('[abortMessage] handleAbort error', err);
|
|
}
|
|
};
|
|
};
|
|
|
|
const createAbortController = (req, res, getAbortData, getReqData) => {
|
|
const abortController = new AbortController();
|
|
const { endpointOption } = req.body;
|
|
|
|
abortController.getAbortData = function () {
|
|
return getAbortData();
|
|
};
|
|
|
|
/**
|
|
* @param {TMessage} userMessage
|
|
* @param {string} responseMessageId
|
|
*/
|
|
const onStart = (userMessage, responseMessageId) => {
|
|
sendMessage(res, { message: userMessage, created: true });
|
|
|
|
const abortKey = userMessage?.conversationId ?? req.user.id;
|
|
const prevRequest = abortControllers.get(abortKey);
|
|
|
|
if (prevRequest && prevRequest?.abortController) {
|
|
const data = prevRequest.abortController.getAbortData();
|
|
getReqData({ userMessage: data?.userMessage });
|
|
const addedAbortKey = `${abortKey}:${responseMessageId}`;
|
|
abortControllers.set(addedAbortKey, { abortController, ...endpointOption });
|
|
res.on('finish', function () {
|
|
abortControllers.delete(addedAbortKey);
|
|
});
|
|
return;
|
|
}
|
|
|
|
abortControllers.set(abortKey, { abortController, ...endpointOption });
|
|
|
|
res.on('finish', function () {
|
|
abortControllers.delete(abortKey);
|
|
});
|
|
};
|
|
|
|
abortController.abortCompletion = async function () {
|
|
abortController.abort();
|
|
const { conversationId, userMessage, userMessagePromise, promptTokens, ...responseData } =
|
|
getAbortData();
|
|
const completionTokens = await countTokens(responseData?.text ?? '');
|
|
const user = req.user.id;
|
|
|
|
const responseMessage = {
|
|
...responseData,
|
|
conversationId,
|
|
finish_reason: 'incomplete',
|
|
endpoint: endpointOption.endpoint,
|
|
iconURL: endpointOption.iconURL,
|
|
model: endpointOption.modelOptions?.model ?? endpointOption.model_parameters?.model,
|
|
unfinished: false,
|
|
error: false,
|
|
isCreatedByUser: false,
|
|
tokenCount: completionTokens,
|
|
};
|
|
|
|
await spendTokens(
|
|
{ ...responseMessage, context: 'incomplete', user },
|
|
{ promptTokens, completionTokens },
|
|
);
|
|
|
|
saveMessage(
|
|
req,
|
|
{ ...responseMessage, user },
|
|
{ context: 'api/server/middleware/abortMiddleware.js' },
|
|
);
|
|
|
|
let conversation;
|
|
if (userMessagePromise) {
|
|
const resolved = await userMessagePromise;
|
|
conversation = resolved?.conversation;
|
|
}
|
|
|
|
if (!conversation) {
|
|
conversation = await getConvo(req.user.id, conversationId);
|
|
}
|
|
|
|
return {
|
|
title: conversation && !conversation.title ? null : conversation?.title || 'New Chat',
|
|
final: true,
|
|
conversation,
|
|
requestMessage: userMessage,
|
|
responseMessage: responseMessage,
|
|
};
|
|
};
|
|
|
|
return { abortController, onStart };
|
|
};
|
|
|
|
const handleAbortError = async (res, req, error, data) => {
|
|
if (error?.message?.includes('base64')) {
|
|
logger.error('[handleAbortError] Error in base64 encoding', {
|
|
...error,
|
|
stack: smartTruncateText(error?.stack, 1000),
|
|
message: truncateText(error.message, 350),
|
|
});
|
|
} else {
|
|
logger.error('[handleAbortError] AI response error; aborting request:', error);
|
|
}
|
|
const { sender, conversationId, messageId, parentMessageId, partialText } = data;
|
|
|
|
if (error.stack && error.stack.includes('google')) {
|
|
logger.warn(
|
|
`AI Response error for conversation ${conversationId} likely caused by Google censor/filter`,
|
|
);
|
|
}
|
|
|
|
const errorText = error?.message?.includes('"type"')
|
|
? error.message
|
|
: 'An error occurred while processing your request. Please contact the Admin.';
|
|
|
|
const respondWithError = async (partialText) => {
|
|
let options = {
|
|
sender,
|
|
messageId,
|
|
conversationId,
|
|
parentMessageId,
|
|
text: errorText,
|
|
shouldSaveMessage: true,
|
|
user: req.user.id,
|
|
};
|
|
|
|
if (partialText) {
|
|
options = {
|
|
...options,
|
|
error: false,
|
|
unfinished: true,
|
|
text: partialText,
|
|
};
|
|
}
|
|
|
|
const callback = async () => {
|
|
if (abortControllers.has(conversationId)) {
|
|
const { abortController } = abortControllers.get(conversationId);
|
|
abortController.abort();
|
|
abortControllers.delete(conversationId);
|
|
}
|
|
};
|
|
|
|
await sendError(req, res, options, callback);
|
|
};
|
|
|
|
if (partialText && partialText.length > 5) {
|
|
try {
|
|
return await abortMessage(req, res);
|
|
} catch (err) {
|
|
logger.error('[handleAbortError] error while trying to abort message', err);
|
|
return respondWithError(partialText);
|
|
}
|
|
} else {
|
|
return respondWithError();
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
handleAbort,
|
|
createAbortController,
|
|
handleAbortError,
|
|
};
|