mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 00:40:14 +01:00
* chore: use node-fetch for OpenAIClient fetch key for non-crashing usage of AbortController in Bun runtime * chore: variable order * fix(useSSE): prevent finalHandler call in abortConversation to update messages/conversation after user navigated away * chore: params order * refactor: organize intermediate message logic and ensure correct variables are passed * fix: Add stt and tts routes before upload limiters, prevent bans * fix(abortRun): temp fix to delete unfinished messages to avoid message thread parent relationship issues * refactor: Update AnthropicClient to use node-fetch for fetch key and add proxy support * fix(gptPlugins): ensure parentMessageId/messageId relationship is maintained * feat(BaseClient): custom fetch function to analyze/edit payloads just before sending (also prevents abortController crash on Bun runtime) * feat: `directEndpoint` and `titleMessageRole` custom endpoint options * chore: Bump version to 0.6.6 in data-provider package.json
100 lines
3 KiB
JavaScript
100 lines
3 KiB
JavaScript
const { CacheKeys, RunStatus, isUUID } = require('librechat-data-provider');
|
|
const { initializeClient } = require('~/server/services/Endpoints/assistants');
|
|
const { checkMessageGaps, recordUsage } = require('~/server/services/Threads');
|
|
const { deleteMessages } = require('~/models/Message');
|
|
const { getConvo } = require('~/models/Conversation');
|
|
const getLogStores = require('~/cache/getLogStores');
|
|
const { sendMessage } = require('~/server/utils');
|
|
const { logger } = require('~/config');
|
|
|
|
const three_minutes = 1000 * 60 * 3;
|
|
|
|
async function abortRun(req, res) {
|
|
res.setHeader('Content-Type', 'application/json');
|
|
const { abortKey, endpoint } = req.body;
|
|
const [conversationId, latestMessageId] = abortKey.split(':');
|
|
const conversation = await getConvo(req.user.id, conversationId);
|
|
|
|
if (conversation?.model) {
|
|
req.body.model = conversation.model;
|
|
}
|
|
|
|
if (!isUUID.safeParse(conversationId).success) {
|
|
logger.error('[abortRun] Invalid conversationId', { conversationId });
|
|
return res.status(400).send({ message: 'Invalid conversationId' });
|
|
}
|
|
|
|
const cacheKey = `${req.user.id}:${conversationId}`;
|
|
const cache = getLogStores(CacheKeys.ABORT_KEYS);
|
|
const runValues = await cache.get(cacheKey);
|
|
const [thread_id, run_id] = runValues.split(':');
|
|
|
|
if (!run_id) {
|
|
logger.warn('[abortRun] Couldn\'t find run for cancel request', { thread_id });
|
|
return res.status(204).send({ message: 'Run not found' });
|
|
} else if (run_id === 'cancelled') {
|
|
logger.warn('[abortRun] Run already cancelled', { thread_id });
|
|
return res.status(204).send({ message: 'Run already cancelled' });
|
|
}
|
|
|
|
let runMessages = [];
|
|
/** @type {{ openai: OpenAI }} */
|
|
const { openai } = await initializeClient({ req, res });
|
|
|
|
try {
|
|
await cache.set(cacheKey, 'cancelled', three_minutes);
|
|
const cancelledRun = await openai.beta.threads.runs.cancel(thread_id, run_id);
|
|
logger.debug('[abortRun] Cancelled run:', cancelledRun);
|
|
} catch (error) {
|
|
logger.error('[abortRun] Error cancelling run', error);
|
|
if (
|
|
error?.message?.includes(RunStatus.CANCELLED) ||
|
|
error?.message?.includes(RunStatus.CANCELLING)
|
|
) {
|
|
return res.end();
|
|
}
|
|
}
|
|
|
|
try {
|
|
const run = await openai.beta.threads.runs.retrieve(thread_id, run_id);
|
|
await recordUsage({
|
|
...run.usage,
|
|
model: run.model,
|
|
user: req.user.id,
|
|
conversationId,
|
|
});
|
|
} catch (error) {
|
|
logger.error('[abortRun] Error fetching or processing run', error);
|
|
}
|
|
|
|
/* TODO: a reconciling strategy between the existing intermediate message would be more optimal than deleting it */
|
|
await deleteMessages({
|
|
user: req.user.id,
|
|
unfinished: true,
|
|
conversationId,
|
|
});
|
|
runMessages = await checkMessageGaps({
|
|
openai,
|
|
run_id,
|
|
endpoint,
|
|
thread_id,
|
|
conversationId,
|
|
latestMessageId,
|
|
});
|
|
|
|
const finalEvent = {
|
|
final: true,
|
|
conversation,
|
|
runMessages,
|
|
};
|
|
|
|
if (res.headersSent && finalEvent) {
|
|
return sendMessage(res, finalEvent);
|
|
}
|
|
|
|
res.json(finalEvent);
|
|
}
|
|
|
|
module.exports = {
|
|
abortRun,
|
|
};
|