mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 08:50:15 +01:00
* 🤖 Assistants V2 Support: Part 1 - Separated Azure Assistants to its own endpoint - File Search / Vector Store integration is incomplete, but can toggle and use storage from playground - Code Interpreter resource files can be added but not deleted - GPT-4o is supported - Many improvements to the Assistants Endpoint overall data-provider v2 changes copy existing route as v1 chore: rename new endpoint to reduce comparison operations and add new azure filesource api: add azureAssistants part 1 force use of version for assistants/assistantsAzure chore: switch name back to azureAssistants refactor type version: string | number Ensure assistants endpoints have version set fix: isArchived type issue in ConversationListParams refactor: update assistants mutations/queries with endpoint/version definitions, update Assistants Map structure chore: FilePreview component ExtendedFile type assertion feat: isAssistantsEndpoint helper chore: remove unused useGenerations chore(buildTree): type issue chore(Advanced): type issue (unused component, maybe in future) first pass for multi-assistant endpoint rewrite fix(listAssistants): pass params correctly feat: list separate assistants by endpoint fix(useTextarea): access assistantMap correctly fix: assistant endpoint switching, resetting ID fix: broken during rewrite, selecting assistant mention fix: set/invalidate assistants endpoint query data correctly feat: Fix issue with assistant ID not being reset correctly getOpenAIClient helper function feat: add toast for assistant deletion fix: assistants delete right after create issue for azure fix: assistant patching refactor: actions to use getOpenAIClient refactor: consolidate logic into helpers file fix: issue where conversation data was not initially available v1 chat support refactor(spendTokens): only early return if completionTokens isNaN fix(OpenAIClient): ensure spendTokens has all necessary params refactor: route/controller logic fix(assistants/initializeClient): use defaultHeaders field fix: sanitize default operation id chore: bump openai package first pass v2 action service feat: retroactive domain parsing for actions added via v1 feat: delete db records of actions/assistants on openai assistant deletion chore: remove vision tools from v2 assistants feat: v2 upload and delete assistant vision images WIP first pass, thread attachments fix: show assistant vision files (save local/firebase copy) v2 image continue fix: annotations fix: refine annotations show analyze as error if is no longer submitting before progress reaches 1 and show file_search as retrieval tool fix: abort run, undefined endpoint issue refactor: consolidate capabilities logic and anticipate versioning frontend version 2 changes fix: query selection and filter add endpoint to unknown filepath add file ids to resource, deleting in progress enable/disable file search remove version log * 🤖 Assistants V2 Support: Part 2 🎹 fix: Autocompletion Chrome Bug on Action API Key Input chore: remove `useOriginNavigate` chore: set correct OpenAI Storage Source fix: azure file deletions, instantiate clients by source for deletion update code interpret files info feat: deleteResourceFileId chore: increase poll interval as azure easily rate limits fix: openai file deletions, TODO: evaluate rejected deletion settled promises to determine which to delete from db records file source icons update table file filters chore: file search info and versioning fix: retrieval update with necessary tool_resources if specified fix(useMentions): add optional chaining in case listMap value is undefined fix: force assistant avatar roundedness fix: azure assistants, check correct flag chore: bump data-provider * fix: merge conflict * ci: fix backend tests due to new updates * chore: update .env.example * meilisearch improvements * localization updates * chore: update comparisons * feat: add additional metadata: endpoint, author ID * chore: azureAssistants ENDPOINTS exclusion warning
93 lines
2.8 KiB
JavaScript
93 lines
2.8 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 { 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);
|
|
}
|
|
|
|
runMessages = await checkMessageGaps({
|
|
openai,
|
|
endpoint,
|
|
thread_id,
|
|
run_id,
|
|
latestMessageId,
|
|
conversationId,
|
|
});
|
|
|
|
const finalEvent = {
|
|
final: true,
|
|
conversation,
|
|
runMessages,
|
|
};
|
|
|
|
if (res.headersSent && finalEvent) {
|
|
return sendMessage(res, finalEvent);
|
|
}
|
|
|
|
res.json(finalEvent);
|
|
}
|
|
|
|
module.exports = {
|
|
abortRun,
|
|
};
|