Merge branch 'main' into refactor/openai-moderation

api/server/middleware/abortRun.js

@@ -27,6 +27,10 @@ async function abortRun(req, res) {
   const cacheKey = `${req.user.id}:${conversationId}`;
   const cache = getLogStores(CacheKeys.ABORT_KEYS);
   const runValues = await cache.get(cacheKey);
+  if (!runValues) {
+    logger.warn('[abortRun] Run not found in cache', { cacheKey });
+    return res.status(204).send({ message: 'Run not found' });
+  }
   const [thread_id, run_id] = runValues.split(':');
 
   if (!run_id) {

api/server/middleware/buildEndpointOption.js

@@ -10,6 +10,7 @@ const openAI = require('~/server/services/Endpoints/openAI');
 const agents = require('~/server/services/Endpoints/agents');
 const custom = require('~/server/services/Endpoints/custom');
 const google = require('~/server/services/Endpoints/google');
+const { getConvoFiles } = require('~/models/Conversation');
 const { handleError } = require('~/server/utils');
 
 const buildFunction = {
@@ -62,6 +63,10 @@ async function buildEndpointOption(req, res, next) {
     }
 
     try {
+      currentModelSpec.preset.spec = spec;
+      if (currentModelSpec.iconURL != null && currentModelSpec.iconURL !== '') {
+        currentModelSpec.preset.iconURL = currentModelSpec.iconURL;
+      }
       parsedBody = parseCompactConvo({
         endpoint,
         endpointType,
@@ -72,21 +77,32 @@ async function buildEndpointOption(req, res, next) {
     }
   }
 
-  const endpointFn = buildFunction[endpointType ?? endpoint];
-  const builder = isAgentsEndpoint(endpoint) ? (...args) => endpointFn(req, ...args) : endpointFn;
+  try {
+    const isAgents = isAgentsEndpoint(endpoint);
+    const endpointFn = buildFunction[endpointType ?? endpoint];
+    const builder = isAgents ? (...args) => endpointFn(req, ...args) : endpointFn;
 
-  // TODO: use object params
-  req.body.endpointOption = builder(endpoint, parsedBody, endpointType);
+    // TODO: use object params
+    req.body.endpointOption = await builder(endpoint, parsedBody, endpointType);
 
-  // TODO: use `getModelsConfig` only when necessary
-  const modelsConfig = await getModelsConfig(req);
-  req.body.endpointOption.modelsConfig = modelsConfig;
-
-  if (req.body.files) {
-    // hold the promise
-    req.body.endpointOption.attachments = processFiles(req.body.files);
+    // TODO: use `getModelsConfig` only when necessary
+    const modelsConfig = await getModelsConfig(req);
+    const { resendFiles = true } = req.body.endpointOption;
+    req.body.endpointOption.modelsConfig = modelsConfig;
+    if (isAgents && resendFiles && req.body.conversationId) {
+      const fileIds = await getConvoFiles(req.body.conversationId);
+      const requestFiles = req.body.files ?? [];
+      if (requestFiles.length || fileIds.length) {
+        req.body.endpointOption.attachments = processFiles(requestFiles, fileIds);
+      }
+    } else if (req.body.files) {
+      // hold the promise
+      req.body.endpointOption.attachments = processFiles(req.body.files);
+    }
+    next();
+  } catch (error) {
+    return handleError(res, { text: 'Error building endpoint option' });
   }
-  next();
 }
 
 module.exports = buildEndpointOption;

api/server/middleware/checkDomainAllowed.js

@@ -1,4 +1,4 @@
-const { isDomainAllowed } = require('~/server/services/AuthService');
+const { isEmailDomainAllowed } = require('~/server/services/domains');
 const { logger } = require('~/config');
 
 /**
@@ -14,7 +14,7 @@ const { logger } = require('~/config');
  */
 const checkDomainAllowed = async (req, res, next = () => {}) => {
   const email = req?.user?.email;
-  if (email && !(await isDomainAllowed(email))) {
+  if (email && !(await isEmailDomainAllowed(email))) {
     logger.error(`[Social Login] [Social Login not allowed] [Email: ${email}]`);
     return res.redirect('/login');
   } else {

api/server/middleware/limiters/index.js

@@ -5,6 +5,7 @@ const loginLimiter = require('./loginLimiter');
 const importLimiters = require('./importLimiters');
 const uploadLimiters = require('./uploadLimiters');
 const registerLimiter = require('./registerLimiter');
+const toolCallLimiter = require('./toolCallLimiter');
 const messageLimiters = require('./messageLimiters');
 const verifyEmailLimiter = require('./verifyEmailLimiter');
 const resetPasswordLimiter = require('./resetPasswordLimiter');
@@ -15,6 +16,7 @@ module.exports = {
   ...messageLimiters,
   loginLimiter,
   registerLimiter,
+  toolCallLimiter,
   createTTSLimiters,
   createSTTLimiters,
   verifyEmailLimiter,

api/server/middleware/limiters/toolCallLimiter.js

@@ -0,0 +1,25 @@
+const rateLimit = require('express-rate-limit');
+const { ViolationTypes } = require('librechat-data-provider');
+const logViolation = require('~/cache/logViolation');
+
+const toolCallLimiter = rateLimit({
+  windowMs: 1000,
+  max: 1,
+  handler: async (req, res) => {
+    const type = ViolationTypes.TOOL_CALL_LIMIT;
+    const errorMessage = {
+      type,
+      max: 1,
+      limiter: 'user',
+      windowInMinutes: 1,
+    };
+
+    await logViolation(req, res, type, errorMessage, 0);
+    res.status(429).json({ message: 'Too many tool call requests. Try again later' });
+  },
+  keyGenerator: function (req) {
+    return req.user?.id;
+  },
+});
+
+module.exports = toolCallLimiter;