Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🔀 fix: Remove use of Mongo Transactions (#2525)

Danny Avilabde6bb0152a8
diff --git a/api/server/routes/assistants/actions.js b/api/server/routes/assistants/actions.js
index 711e224c6e..9cf47c8699 100644
--- a/api/server/routes/assistants/actions.js
+++ b/api/server/routes/assistants/actions.js
@@ -5,7 +5,6 @@ const { actionDelimiter, EModelEndpoint } = require('librechat-data-provider');
const { initializeClient } = require('~/server/services/Endpoints/assistants');
const { updateAction, getActions, deleteAction } = require('~/models/Action');
const { updateAssistant, getAssistant } = require('~/models/Assistant');
-const { withSession } = require('~/server/utils');
const { logger } = require('~/config');
const router = express.Router();
@@ -109,10 +108,10 @@ router.post('/:assistant_id', async (req, res) => {
})),
);
+ let updatedAssistant = await openai.beta.assistants.update(assistant_id, { tools });
const promises = [];
promises.push(
- withSession(
- updateAssistant,
+ updateAssistant(
{ assistant_id },
{
actions,
@@ -120,29 +119,26 @@ router.post('/:assistant_id', async (req, res) => {
},
),
);
- promises.push(openai.beta.assistants.update(assistant_id, { tools }));
- promises.push(
- withSession(updateAction, { action_id }, { metadata, assistant_id, user: req.user.id }),
- );
+ promises.push(updateAction({ action_id }, { metadata, assistant_id, user: req.user.id }));
- /** @type {[AssistantDocument, Assistant, Action]} */
- const resolved = await Promise.all(promises);
+ /** @type {[AssistantDocument, Action]} */
+ let [assistantDocument, updatedAction] = await Promise.all(promises);
const sensitiveFields = ['api_key', 'oauth_client_id', 'oauth_client_secret'];
for (let field of sensitiveFields) {
- if (resolved[2].metadata[field]) {
- delete resolved[2].metadata[field];
+ if (updatedAction.metadata[field]) {
+ delete updatedAction.metadata[field];
}
}
/* Map Azure OpenAI model to the assistant as defined by config */
if (req.app.locals[EModelEndpoint.azureOpenAI]?.assistants) {
- resolved[1] = {
- ...resolved[1],
+ updatedAssistant = {
+ ...updatedAssistant,
model: req.body.model,
};
}
- res.json(resolved);
+ res.json([assistantDocument, updatedAssistant, updatedAction]);
} catch (error) {
const message = 'Trouble updating the Assistant Action';
logger.error(message, error);
@@ -190,10 +186,11 @@ router.delete('/:assistant_id/:action_id/:model', async (req, res) => {
(tool) => !(tool.function && tool.function.name.includes(domain)),
);
+ await openai.beta.assistants.update(assistant_id, { tools: updatedTools });
+
const promises = [];
promises.push(
- withSession(
- updateAssistant,
+ updateAssistant(
{ assistant_id },
{
actions: updatedActions,
@@ -201,8 +198,7 @@ router.delete('/:assistant_id/:action_id/:model', async (req, res) => {
},
),
);
- promises.push(openai.beta.assistants.update(assistant_id, { tools: updatedTools }));
- promises.push(withSession(deleteAction, { action_id }));
+ promises.push(deleteAction({ action_id }));
await Promise.all(promises);
res.status(200).json({ message: 'Action deleted successfully' });
diff --git a/api/server/utils/index.js b/api/server/utils/index.js
index d4e39a3ae5..e87a4680fc 100644
--- a/api/server/utils/index.js
+++ b/api/server/utils/index.js
@@ -5,7 +5,6 @@ const handleText = require('./handleText');
const cryptoUtils = require('./crypto');
const citations = require('./citations');
const sendEmail = require('./sendEmail');
-const mongoose = require('./mongoose');
const queue = require('./queue');
const files = require('./files');
const math = require('./math');
@@ -15,7 +14,6 @@ module.exports = {
...cryptoUtils,
...handleText,
...citations,
- ...mongoose,
countTokens,
removePorts,
sendEmail,
diff --git a/api/server/utils/mongoose.js b/api/server/utils/mongoose.js
deleted file mode 100644
index 652a01c77a..0000000000
--- a/api/server/utils/mongoose.js
+++ /dev/null
@@ -1,25 +0,0 @@
-const mongoose = require('mongoose');
-/**
- * Executes a database operation within a session.
- * @param {() => Promise<any>} method - The method to execute. This method must accept a session as its first argument.
- * @param {...any} args - Additional arguments to pass to the method.
- * @returns {Promise<any>} - The result of the executed method.
- */
-async function withSession(method, ...args) {
- const session = await mongoose.startSession();
- session.startTransaction();
- try {
- const result = await method(...args, session);
- await session.commitTransaction();
- return result;
- } catch (error) {
- if (session.inTransaction()) {
- await session.abortTransaction();
- }
- throw error;
- } finally {
- await session.endSession();
- }
-}
-
-module.exports = { withSession };