✨ v0.7.5 (#4541)

* fix: ReDoS in ChatGPT Import

* ci: should correctly process citations from real ChatGPT data

* ci: Add ReDoS vulnerability test for processAssistantMessage

* refactor: Update thread management and citation handling

* refactor(validateImageRequest): robust validation

* refactor(Prompt.js): update name search regex to escape special characters

* refactor(Preset): exclude user from preset update to prevent mass assignment

* refactor(files.js): Improve file deletion process

* ci: updated validateImageRequest.spec.js

* a11y: plugin pagination

* refactor(CreatePromptForm.tsx): Improve input field styling

* chore(Prompts): typing and accessibility

* fix: prompt creation access role check

* chore: remove duplicate jsdocs

.devcontainer/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   app:
     build:

.env.example

@@ -82,7 +82,7 @@ PROXY=
 #============#
 
 ANTHROPIC_API_KEY=user_provided
-# ANTHROPIC_MODELS=claude-3-5-sonnet-20240620,claude-3-opus-20240229,claude-3-sonnet-20240229,claude-3-haiku-20240307,claude-2.1,claude-2,claude-1.2,claude-1,claude-1-100k,claude-instant-1,claude-instant-1-100k
+# ANTHROPIC_MODELS=claude-3-5-sonnet-20241022,claude-3-5-sonnet-latest,claude-3-5-sonnet-20240620,claude-3-opus-20240229,claude-3-sonnet-20240229,claude-3-haiku-20240307,claude-2.1,claude-2,claude-1.2,claude-1,claude-1-100k,claude-instant-1,claude-instant-1-100k
 # ANTHROPIC_REVERSE_PROXY=
 
 #============#
@@ -146,6 +146,8 @@ GOOGLE_KEY=user_provided
 
 # GOOGLE_TITLE_MODEL=gemini-pro
 
+# GOOGLE_LOC=us-central1
+
 # Google Safety Settings
 # NOTE: These settings apply to both Vertex AI and Gemini API (AI Studio)
 #
@@ -412,6 +414,7 @@ LDAP_CA_CERT_PATH=
 # LDAP_LOGIN_USES_USERNAME=true
 # LDAP_ID=
 # LDAP_USERNAME=
+# LDAP_EMAIL=
 # LDAP_FULL_NAME=
 
 #========================#

.github/dependabot.yml

@@ -1,47 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/api" # Location of package manifests
-    target-branch: "dev"
-    versioning-strategy: increase-if-necessary
-    schedule:
-      interval: "weekly"
-    allow:
-      # Allow both direct and indirect updates for all packages
-      - dependency-type: "all"
-    commit-message:
-      prefix: "npm api prod"
-      prefix-development: "npm api dev"
-      include: "scope"
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/client" # Location of package manifests
-    target-branch: "dev"
-    versioning-strategy: increase-if-necessary
-    schedule:
-      interval: "weekly"
-    allow:
-      # Allow both direct and indirect updates for all packages
-      - dependency-type: "all"
-    commit-message:
-      prefix: "npm client prod"
-      prefix-development: "npm client dev"
-      include: "scope"
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    target-branch: "dev"
-    versioning-strategy: increase-if-necessary
-    schedule:
-      interval: "weekly"
-    allow:
-      # Allow both direct and indirect updates for all packages
-      - dependency-type: "all"
-    commit-message:
-      prefix: "npm all prod"
-      prefix-development: "npm all dev"
-      include: "scope" 
-     

.github/workflows/helmcharts.yml

@@ -25,11 +25,9 @@ jobs:
       - name: Install Helm
         uses: azure/setup-helm@v4
         env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"       
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.6.0
-        with:
-          charts_dir: helmchart
         env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

Dockerfile

@@ -1,4 +1,4 @@
-# v0.7.5-rc2
+# v0.7.5
 
 # Base node image
 FROM node:20-alpine AS node

Dockerfile.multi

@@ -1,5 +1,5 @@
 # Dockerfile.multi
-# v0.7.5-rc2
+# v0.7.5
 
 # Base for all builds
 FROM node:20-alpine AS base

api/app/clients/AnthropicClient.js

@@ -17,8 +17,8 @@ const {
   parseParamFromPrompt,
   createContextHandlers,
 } = require('./prompts');
+const { getModelMaxTokens, getModelMaxOutputTokens, matchModelName } = require('~/utils');
 const { spendTokens, spendStructuredTokens } = require('~/models/spendTokens');
-const { getModelMaxTokens, matchModelName } = require('~/utils');
 const { sleep } = require('~/server/utils');
 const BaseClient = require('./BaseClient');
 const { logger } = require('~/config');
@@ -64,6 +64,12 @@ class AnthropicClient extends BaseClient {
     /** Whether or not the model supports Prompt Caching
      * @type {boolean} */
     this.supportsCacheControl;
+    /** The key for the usage object's input tokens
+     * @type {string} */
+    this.inputTokensKey = 'input_tokens';
+    /** The key for the usage object's output tokens
+     * @type {string} */
+    this.outputTokensKey = 'output_tokens';
   }
 
   setOptions(options) {
@@ -114,7 +120,14 @@ class AnthropicClient extends BaseClient {
       this.options.maxContextTokens ??
       getModelMaxTokens(this.modelOptions.model, EModelEndpoint.anthropic) ??
       100000;
-    this.maxResponseTokens = this.modelOptions.maxOutputTokens || 1500;
+    this.maxResponseTokens =
+      this.modelOptions.maxOutputTokens ??
+      getModelMaxOutputTokens(
+        this.modelOptions.model,
+        this.options.endpointType ?? this.options.endpoint,
+        this.options.endpointTokenConfig,
+      ) ??
+      1500;
     this.maxPromptTokens =
       this.options.maxPromptTokens || this.maxContextTokens - this.maxResponseTokens;
 
@@ -138,17 +151,6 @@ class AnthropicClient extends BaseClient {
     this.endToken = '';
     this.gptEncoder = this.constructor.getTokenizer('cl100k_base');
 
-    if (!this.modelOptions.stop) {
-      const stopTokens = [this.startToken];
-      if (this.endToken && this.endToken !== this.startToken) {
-        stopTokens.push(this.endToken);
-      }
-      stopTokens.push(`${this.userLabel}`);
-      stopTokens.push('<|diff_marker|>');
-
-      this.modelOptions.stop = stopTokens;
-    }
-
     return this;
   }
 
@@ -200,7 +202,7 @@ class AnthropicClient extends BaseClient {
   }
 
   /**
-   * Calculates the correct token count for the current message based on the token count map and API usage.
+   * Calculates the correct token count for the current user message based on the token count map and API usage.
    * Edge case: If the calculation results in a negative value, it returns the original estimate.
    * If revisiting a conversation with a chat history entirely composed of token estimates,
    * the cumulative token count going forward should become more accurate as the conversation progresses.
@@ -208,7 +210,7 @@ class AnthropicClient extends BaseClient {
    * @param {Record<string, number>} params.tokenCountMap - A map of message IDs to their token counts.
    * @param {string} params.currentMessageId - The ID of the current message to calculate.
    * @param {AnthropicStreamUsage} params.usage - The usage object returned by the API.
-   * @returns {number} The correct token count for the current message.
+   * @returns {number} The correct token count for the current user message.
    */
   calculateCurrentTokenCount({ tokenCountMap, currentMessageId, usage }) {
     const originalEstimate = tokenCountMap[currentMessageId] || 0;
@@ -680,7 +682,14 @@ class AnthropicClient extends BaseClient {
    */
   checkPromptCacheSupport(modelName) {
     const modelMatch = matchModelName(modelName, EModelEndpoint.anthropic);
-    if (modelMatch === 'claude-3-5-sonnet' || modelMatch === 'claude-3-haiku') {
+    if (modelMatch.includes('claude-3-5-sonnet-latest')) {
+      return false;
+    }
+    if (
+      modelMatch === 'claude-3-5-sonnet' ||
+      modelMatch === 'claude-3-haiku' ||
+      modelMatch === 'claude-3-opus'
+    ) {
       return true;
     }
     return false;

api/app/clients/BaseClient.js

@@ -3,7 +3,7 @@ const fetch = require('node-fetch');
 const {
   supportsBalanceCheck,
   isAgentsEndpoint,
-  paramEndpoints,
+  isParamEndpoint,
   ErrorTypes,
   Constants,
   CacheKeys,
@@ -42,6 +42,14 @@ class BaseClient {
     this.conversationId;
     /** @type {string} */
     this.responseMessageId;
+    /** @type {TAttachment[]} */
+    this.attachments;
+    /** The key for the usage object's input tokens
+     * @type {string} */
+    this.inputTokensKey = 'prompt_tokens';
+    /** The key for the usage object's output tokens
+     * @type {string} */
+    this.outputTokensKey = 'completion_tokens';
   }
 
   setOptions() {
@@ -582,7 +590,10 @@ class BaseClient {
 
     if (typeof completion === 'string') {
       responseMessage.text = addSpaceIfNeeded(generation) + completion;
-    } else if (Array.isArray(completion) && paramEndpoints.has(this.options.endpoint)) {
+    } else if (
+      Array.isArray(completion) &&
+      isParamEndpoint(this.options.endpoint, this.options.endpointType)
+    ) {
       responseMessage.text = '';
       responseMessage.content = completion;
     } else if (Array.isArray(completion)) {
@@ -604,8 +615,8 @@ class BaseClient {
        * @type {StreamUsage | null} */
       const usage = this.getStreamUsage != null ? this.getStreamUsage() : null;
 
-      if (usage != null && Number(usage.output_tokens) > 0) {
-        responseMessage.tokenCount = usage.output_tokens;
+      if (usage != null && Number(usage[this.outputTokensKey]) > 0) {
+        responseMessage.tokenCount = usage[this.outputTokensKey];
         completionTokens = responseMessage.tokenCount;
         await this.updateUserMessageTokenCount({ usage, tokenCountMap, userMessage, opts });
       } else {
@@ -620,6 +631,10 @@ class BaseClient {
       await this.userMessagePromise;
     }
 
+    if (this.artifactPromises) {
+      responseMessage.attachments = (await Promise.all(this.artifactPromises)).filter((a) => a);
+    }
+
     this.responsePromise = this.saveMessageToDatabase(responseMessage, saveOptions, user);
     const messageCache = getLogStores(CacheKeys.MESSAGES);
     messageCache.set(
@@ -655,7 +670,7 @@ class BaseClient {
     /** @type {boolean} */
     const shouldUpdateCount =
       this.calculateCurrentTokenCount != null &&
-      Number(usage.input_tokens) > 0 &&
+      Number(usage[this.inputTokensKey]) > 0 &&
       (this.options.resendFiles ||
         (!this.options.resendFiles && !this.options.attachments?.length)) &&
       !this.options.promptPrefix;

api/app/clients/ChatGPTClient.js

@@ -1,19 +1,21 @@
 const Keyv = require('keyv');
 const crypto = require('crypto');
+const { CohereClient } = require('cohere-ai');
+const { fetchEventSource } = require('@waylaidwanderer/fetch-event-source');
+const { encoding_for_model: encodingForModel, get_encoding: getEncoding } = require('tiktoken');
 const {
+  ImageDetail,
   EModelEndpoint,
   resolveHeaders,
   CohereConstants,
   mapModelToAzureConfig,
 } = require('librechat-data-provider');
-const { CohereClient } = require('cohere-ai');
-const { encoding_for_model: encodingForModel, get_encoding: getEncoding } = require('tiktoken');
-const { fetchEventSource } = require('@waylaidwanderer/fetch-event-source');
+const { extractBaseURL, constructAzureURL, genAzureChatCompletion } = require('~/utils');
+const { createContextHandlers } = require('./prompts');
 const { createCoherePayload } = require('./llm');
 const { Agent, ProxyAgent } = require('undici');
 const BaseClient = require('./BaseClient');
 const { logger } = require('~/config');
-const { extractBaseURL, constructAzureURL, genAzureChatCompletion } = require('~/utils');
 
 const CHATGPT_MODEL = 'gpt-3.5-turbo';
 const tokenizersCache = {};
@@ -612,21 +614,66 @@ ${botMessage.message}
 
   async buildPrompt(messages, { isChatGptModel = false, promptPrefix = null }) {
     promptPrefix = (promptPrefix || this.options.promptPrefix || '').trim();
+
+    // Handle attachments and create augmentedPrompt
+    if (this.options.attachments) {
+      const attachments = await this.options.attachments;
+      const lastMessage = messages[messages.length - 1];
+
+      if (this.message_file_map) {
+        this.message_file_map[lastMessage.messageId] = attachments;
+      } else {
+        this.message_file_map = {
+          [lastMessage.messageId]: attachments,
+        };
+      }
+
+      const files = await this.addImageURLs(lastMessage, attachments);
+      this.options.attachments = files;
+
+      this.contextHandlers = createContextHandlers(this.options.req, lastMessage.text);
+    }
+
+    if (this.message_file_map) {
+      this.contextHandlers = createContextHandlers(
+        this.options.req,
+        messages[messages.length - 1].text,
+      );
+    }
+
+    // Calculate image token cost and process embedded files
+    messages.forEach((message, i) => {
+      if (this.message_file_map && this.message_file_map[message.messageId]) {
+        const attachments = this.message_file_map[message.messageId];
+        for (const file of attachments) {
+          if (file.embedded) {
+            this.contextHandlers?.processFile(file);
+            continue;
+          }
+
+          messages[i].tokenCount =
+            (messages[i].tokenCount || 0) +
+            this.calculateImageTokenCost({
+              width: file.width,
+              height: file.height,
+              detail: this.options.imageDetail ?? ImageDetail.auto,
+            });
+        }
+      }
+    });
+
+    if (this.contextHandlers) {
+      this.augmentedPrompt = await this.contextHandlers.createContext();
+      promptPrefix = this.augmentedPrompt + promptPrefix;
+    }
+
     if (promptPrefix) {
       // If the prompt prefix doesn't end with the end token, add it.
       if (!promptPrefix.endsWith(`${this.endToken}`)) {
         promptPrefix = `${promptPrefix.trim()}${this.endToken}\n\n`;
       }
       promptPrefix = `${this.startToken}Instructions:\n${promptPrefix}`;
-    } else {
-      const currentDateString = new Date().toLocaleDateString('en-us', {
-        year: 'numeric',
-        month: 'long',
-        day: 'numeric',
-      });
-      promptPrefix = `${this.startToken}Instructions:\nYou are ChatGPT, a large language model trained by OpenAI. Respond conversationally.\nCurrent date: ${currentDateString}${this.endToken}\n\n`;
     }
-
     const promptSuffix = `${this.startToken}${this.chatGptLabel}:\n`; // Prompt ChatGPT to respond.
 
     const instructionsPayload = {
@@ -714,10 +761,6 @@ ${botMessage.message}
       this.maxResponseTokens,
     );
 
-    if (this.options.debug) {
-      console.debug(`Prompt : ${prompt}`);
-    }
-
     if (isChatGptModel) {
       return { prompt: [instructionsPayload, messagePayload], context };
     }

api/app/clients/GoogleClient.js

@@ -28,7 +28,7 @@ const {
 } = require('./prompts');
 const BaseClient = require('./BaseClient');
 
-const loc = 'us-central1';
+const loc = process.env.GOOGLE_LOC || 'us-central1';
 const publisher = 'google';
 const endpointPrefix = `https://${loc}-aiplatform.googleapis.com`;
 // const apiEndpoint = loc + '-aiplatform.googleapis.com';
@@ -593,6 +593,8 @@ class GoogleClient extends BaseClient {
 
   createLLM(clientOptions) {
     const model = clientOptions.modelName ?? clientOptions.model;
+    clientOptions.location = loc;
+    clientOptions.endpoint = `${loc}-aiplatform.googleapis.com`;
     if (this.project_id && this.isTextModel) {
       logger.debug('Creating Google VertexAI client');
       return new GoogleVertexAI(clientOptions);

api/app/clients/OllamaClient.js

@@ -60,7 +60,9 @@ class OllamaClient {
     try {
       const ollamaEndpoint = deriveBaseURL(baseURL);
       /** @type {Promise<AxiosResponse<OllamaListResponse>>} */
-      const response = await axios.get(`${ollamaEndpoint}/api/tags`);
+      const response = await axios.get(`${ollamaEndpoint}/api/tags`, {
+        timeout: 5000,
+      });
       models = response.data.models.map((tag) => tag.name);
       return models;
     } catch (error) {

api/app/clients/OpenAIClient.js

@@ -19,6 +19,7 @@ const {
   constructAzureURL,
   getModelMaxTokens,
   genAzureChatCompletion,
+  getModelMaxOutputTokens,
 } = require('~/utils');
 const {
   truncateText,
@@ -64,6 +65,11 @@ class OpenAIClient extends BaseClient {
 
     /** @type {string | undefined} - The API Completions URL */
     this.completionsUrl;
+
+    /** @type {OpenAIUsageMetadata | undefined} */
+    this.usage;
+    /** @type {boolean|undefined} */
+    this.isO1Model;
   }
 
   // TODO: PluginsClient calls this 3x, unneeded
@@ -94,6 +100,8 @@ class OpenAIClient extends BaseClient {
       this.options.modelOptions,
     );
 
+    this.isO1Model = /\bo1\b/i.test(this.modelOptions.model);
+
     this.defaultVisionModel = this.options.visionModel ?? 'gpt-4-vision-preview';
     if (typeof this.options.attachments?.then === 'function') {
       this.options.attachments.then((attachments) => this.checkVisionRequest(attachments));
@@ -138,7 +146,8 @@ class OpenAIClient extends BaseClient {
 
     const { model } = this.modelOptions;
 
-    this.isChatCompletion = this.useOpenRouter || !!reverseProxy || model.includes('gpt');
+    this.isChatCompletion =
+      /\bo1\b/i.test(model) || model.includes('gpt') || this.useOpenRouter || !!reverseProxy;
     this.isChatGptModel = this.isChatCompletion;
     if (
       model.includes('text-davinci') ||
@@ -169,7 +178,14 @@ class OpenAIClient extends BaseClient {
       logger.debug('[OpenAIClient] maxContextTokens', this.maxContextTokens);
     }
 
-    this.maxResponseTokens = this.modelOptions.max_tokens || 1024;
+    this.maxResponseTokens =
+      this.modelOptions.max_tokens ??
+      getModelMaxOutputTokens(
+        model,
+        this.options.endpointType ?? this.options.endpoint,
+        this.options.endpointTokenConfig,
+      ) ??
+      1024;
     this.maxPromptTokens =
       this.options.maxPromptTokens || this.maxContextTokens - this.maxResponseTokens;
 
@@ -187,8 +203,8 @@ class OpenAIClient extends BaseClient {
         model: this.modelOptions.model,
         endpoint: this.options.endpoint,
         endpointType: this.options.endpointType,
-        chatGptLabel: this.options.chatGptLabel,
         modelDisplayLabel: this.options.modelDisplayLabel,
+        chatGptLabel: this.options.chatGptLabel || this.options.modelLabel,
       });
 
     this.userLabel = this.options.userLabel || 'User';
@@ -533,7 +549,7 @@ class OpenAIClient extends BaseClient {
       promptPrefix = this.augmentedPrompt + promptPrefix;
     }
 
-    if (promptPrefix) {
+    if (promptPrefix && this.isO1Model !== true) {
       promptPrefix = `Instructions:\n${promptPrefix.trim()}`;
       instructions = {
         role: 'system',
@@ -561,6 +577,16 @@ class OpenAIClient extends BaseClient {
       messages,
     };
 
+    /** EXPERIMENTAL */
+    if (promptPrefix && this.isO1Model === true) {
+      const lastUserMessageIndex = payload.findLastIndex((message) => message.role === 'user');
+      if (lastUserMessageIndex !== -1) {
+        payload[
+          lastUserMessageIndex
+        ].content = `${promptPrefix}\n${payload[lastUserMessageIndex].content}`;
+      }
+    }
+
     if (tokenCountMap) {
       tokenCountMap.instructions = instructions?.tokenCount;
       result.tokenCountMap = tokenCountMap;
@@ -621,6 +647,12 @@ class OpenAIClient extends BaseClient {
 
       if (completionResult && typeof completionResult === 'string') {
         reply = completionResult;
+      } else if (
+        completionResult &&
+        typeof completionResult === 'object' &&
+        Array.isArray(completionResult.choices)
+      ) {
+        reply = completionResult.choices[0]?.text?.replace(this.endToken, '');
       }
     } else if (typeof opts.onProgress === 'function' || this.options.useChatCompletion) {
       reply = await this.chatCompletion({
@@ -810,27 +842,27 @@ class OpenAIClient extends BaseClient {
     }
 
     const titleChatCompletion = async () => {
-      modelOptions.model = model;
+      try {
+        modelOptions.model = model;
 
-      if (this.azure) {
-        modelOptions.model = process.env.AZURE_OPENAI_DEFAULT_MODEL ?? modelOptions.model;
-        this.azureEndpoint = genAzureChatCompletion(this.azure, modelOptions.model, this);
-      }
+        if (this.azure) {
+          modelOptions.model = process.env.AZURE_OPENAI_DEFAULT_MODEL ?? modelOptions.model;
+          this.azureEndpoint = genAzureChatCompletion(this.azure, modelOptions.model, this);
+        }
 
-      const instructionsPayload = [
-        {
-          role: this.options.titleMessageRole ?? (this.isOllama ? 'user' : 'system'),
-          content: `Please generate ${titleInstruction}
+        const instructionsPayload = [
+          {
+            role: this.options.titleMessageRole ?? (this.isOllama ? 'user' : 'system'),
+            content: `Please generate ${titleInstruction}
 
 ${convo}
 
 ||>Title:`,
-        },
-      ];
+          },
+        ];
 
-      const promptTokens = this.getTokenCountForMessage(instructionsPayload[0]);
+        const promptTokens = this.getTokenCountForMessage(instructionsPayload[0]);
 
-      try {
         let useChatCompletion = true;
 
         if (this.options.reverseProxyUrl === CohereConstants.API_URL) {
@@ -885,6 +917,60 @@ ${convo}
     return title;
   }
 
+  /**
+   * Get stream usage as returned by this client's API response.
+   * @returns {OpenAIUsageMetadata} The stream usage object.
+   */
+  getStreamUsage() {
+    if (
+      this.usage &&
+      typeof this.usage === 'object' &&
+      'completion_tokens_details' in this.usage &&
+      this.usage.completion_tokens_details &&
+      typeof this.usage.completion_tokens_details === 'object' &&
+      'reasoning_tokens' in this.usage.completion_tokens_details
+    ) {
+      const outputTokens = Math.abs(
+        this.usage.completion_tokens_details.reasoning_tokens - this.usage[this.outputTokensKey],
+      );
+      return {
+        ...this.usage.completion_tokens_details,
+        [this.inputTokensKey]: this.usage[this.inputTokensKey],
+        [this.outputTokensKey]: outputTokens,
+      };
+    }
+    return this.usage;
+  }
+
+  /**
+   * Calculates the correct token count for the current user message based on the token count map and API usage.
+   * Edge case: If the calculation results in a negative value, it returns the original estimate.
+   * If revisiting a conversation with a chat history entirely composed of token estimates,
+   * the cumulative token count going forward should become more accurate as the conversation progresses.
+   * @param {Object} params - The parameters for the calculation.
+   * @param {Record<string, number>} params.tokenCountMap - A map of message IDs to their token counts.
+   * @param {string} params.currentMessageId - The ID of the current message to calculate.
+   * @param {OpenAIUsageMetadata} params.usage - The usage object returned by the API.
+   * @returns {number} The correct token count for the current user message.
+   */
+  calculateCurrentTokenCount({ tokenCountMap, currentMessageId, usage }) {
+    const originalEstimate = tokenCountMap[currentMessageId] || 0;
+
+    if (!usage || typeof usage[this.inputTokensKey] !== 'number') {
+      return originalEstimate;
+    }
+
+    tokenCountMap[currentMessageId] = 0;
+    const totalTokensFromMap = Object.values(tokenCountMap).reduce((sum, count) => {
+      const numCount = Number(count);
+      return sum + (isNaN(numCount) ? 0 : numCount);
+    }, 0);
+    const totalInputTokens = usage[this.inputTokensKey] ?? 0;
+
+    const currentMessageTokens = totalInputTokens - totalTokensFromMap;
+    return currentMessageTokens > 0 ? currentMessageTokens : originalEstimate;
+  }
+
   async summarizeMessages({ messagesToRefine, remainingContextTokens }) {
     logger.debug('[OpenAIClient] Summarizing messages...');
     let context = messagesToRefine;
@@ -1000,7 +1086,16 @@ ${convo}
     }
   }
 
-  async recordTokenUsage({ promptTokens, completionTokens, context = 'message' }) {
+  /**
+   * @param {object} params
+   * @param {number} params.promptTokens
+   * @param {number} params.completionTokens
+   * @param {OpenAIUsageMetadata} [params.usage]
+   * @param {string} [params.model]
+   * @param {string} [params.context='message']
+   * @returns {Promise<void>}
+   */
+  async recordTokenUsage({ promptTokens, completionTokens, usage, context = 'message' }) {
     await spendTokens(
       {
         context,
@@ -1011,6 +1106,24 @@ ${convo}
       },
       { promptTokens, completionTokens },
     );
+
+    if (
+      usage &&
+      typeof usage === 'object' &&
+      'reasoning_tokens' in usage &&
+      typeof usage.reasoning_tokens === 'number'
+    ) {
+      await spendTokens(
+        {
+          context: 'reasoning',
+          model: this.modelOptions.model,
+          conversationId: this.conversationId,
+          user: this.user ?? this.options.req.user?.id,
+          endpointTokenConfig: this.options.endpointTokenConfig,
+        },
+        { completionTokens: usage.reasoning_tokens },
+      );
+    }
   }
 
   getTokenCountForResponse(response) {
@@ -1117,6 +1230,11 @@ ${convo}
         opts.defaultHeaders = { ...opts.defaultHeaders, 'api-key': this.apiKey };
       }
 
+      if (this.isO1Model === true && modelOptions.max_tokens != null) {
+        modelOptions.max_completion_tokens = modelOptions.max_tokens;
+        delete modelOptions.max_tokens;
+      }
+
       if (process.env.OPENAI_ORGANIZATION) {
         opts.organization = process.env.OPENAI_ORGANIZATION;
       }
@@ -1191,6 +1309,11 @@ ${convo}
       /** @type {(value: void | PromiseLike<void>) => void} */
       let streamResolve;
 
+      if (modelOptions.stream && this.isO1Model) {
+        delete modelOptions.stream;
+        delete modelOptions.stop;
+      }
+
       if (modelOptions.stream) {
         streamPromise = new Promise((resolve) => {
           streamResolve = resolve;
@@ -1269,6 +1392,8 @@ ${convo}
       }
 
       const { choices } = chatCompletion;
+      this.usage = chatCompletion.usage;
+
       if (!Array.isArray(choices) || choices.length === 0) {
         logger.warn('[OpenAIClient] Chat completion response has no choices');
         return intermediateReply.join('');

api/app/clients/prompts/formatAgentMessages.spec.js

@@ -0,0 +1,285 @@
+const { ToolMessage } = require('@langchain/core/messages');
+const { ContentTypes } = require('librechat-data-provider');
+const { HumanMessage, AIMessage, SystemMessage } = require('langchain/schema');
+const { formatAgentMessages } = require('./formatMessages');
+
+describe('formatAgentMessages', () => {
+  it('should format simple user and AI messages', () => {
+    const payload = [
+      { role: 'user', content: 'Hello' },
+      { role: 'assistant', content: 'Hi there!' },
+    ];
+    const result = formatAgentMessages(payload);
+    expect(result).toHaveLength(2);
+    expect(result[0]).toBeInstanceOf(HumanMessage);
+    expect(result[1]).toBeInstanceOf(AIMessage);
+  });
+
+  it('should handle system messages', () => {
+    const payload = [{ role: 'system', content: 'You are a helpful assistant.' }];
+    const result = formatAgentMessages(payload);
+    expect(result).toHaveLength(1);
+    expect(result[0]).toBeInstanceOf(SystemMessage);
+  });
+
+  it('should format messages with content arrays', () => {
+    const payload = [
+      {
+        role: 'user',
+        content: [{ type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Hello' }],
+      },
+    ];
+    const result = formatAgentMessages(payload);
+    expect(result).toHaveLength(1);
+    expect(result[0]).toBeInstanceOf(HumanMessage);
+  });
+
+  it('should handle tool calls and create ToolMessages', () => {
+    const payload = [
+      {
+        role: 'assistant',
+        content: [
+          {
+            type: ContentTypes.TEXT,
+            [ContentTypes.TEXT]: 'Let me check that for you.',
+            tool_call_ids: ['123'],
+          },
+          {
+            type: ContentTypes.TOOL_CALL,
+            tool_call: {
+              id: '123',
+              name: 'search',
+              args: '{"query":"weather"}',
+              output: 'The weather is sunny.',
+            },
+          },
+        ],
+      },
+    ];
+    const result = formatAgentMessages(payload);
+    expect(result).toHaveLength(2);
+    expect(result[0]).toBeInstanceOf(AIMessage);
+    expect(result[1]).toBeInstanceOf(ToolMessage);
+    expect(result[0].tool_calls).toHaveLength(1);
+    expect(result[1].tool_call_id).toBe('123');
+  });
+
+  it('should handle multiple content parts in assistant messages', () => {
+    const payload = [
+      {
+        role: 'assistant',
+        content: [
+          { type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Part 1' },
+          { type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Part 2' },
+        ],
+      },
+    ];
+    const result = formatAgentMessages(payload);
+    expect(result).toHaveLength(1);
+    expect(result[0]).toBeInstanceOf(AIMessage);
+    expect(result[0].content).toHaveLength(2);
+  });
+
+  it('should throw an error for invalid tool call structure', () => {
+    const payload = [
+      {
+        role: 'assistant',
+        content: [
+          {
+            type: ContentTypes.TOOL_CALL,
+            tool_call: {
+              id: '123',
+              name: 'search',
+              args: '{"query":"weather"}',
+              output: 'The weather is sunny.',
+            },
+          },
+        ],
+      },
+    ];
+    expect(() => formatAgentMessages(payload)).toThrow('Invalid tool call structure');
+  });
+
+  it('should handle tool calls with non-JSON args', () => {
+    const payload = [
+      {
+        role: 'assistant',
+        content: [
+          { type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Checking...', tool_call_ids: ['123'] },
+          {
+            type: ContentTypes.TOOL_CALL,
+            tool_call: {
+              id: '123',
+              name: 'search',
+              args: 'non-json-string',
+              output: 'Result',
+            },
+          },
+        ],
+      },
+    ];
+    const result = formatAgentMessages(payload);
+    expect(result).toHaveLength(2);
+    expect(result[0].tool_calls[0].args).toBe('non-json-string');
+  });
+
+  it('should handle complex tool calls with multiple steps', () => {
+    const payload = [
+      {
+        role: 'assistant',
+        content: [
+          {
+            type: ContentTypes.TEXT,
+            [ContentTypes.TEXT]: 'I\'ll search for that information.',
+            tool_call_ids: ['search_1'],
+          },
+          {
+            type: ContentTypes.TOOL_CALL,
+            tool_call: {
+              id: 'search_1',
+              name: 'search',
+              args: '{"query":"weather in New York"}',
+              output: 'The weather in New York is currently sunny with a temperature of 75°F.',
+            },
+          },
+          {
+            type: ContentTypes.TEXT,
+            [ContentTypes.TEXT]: 'Now, I\'ll convert the temperature.',
+            tool_call_ids: ['convert_1'],
+          },
+          {
+            type: ContentTypes.TOOL_CALL,
+            tool_call: {
+              id: 'convert_1',
+              name: 'convert_temperature',
+              args: '{"temperature": 75, "from": "F", "to": "C"}',
+              output: '23.89°C',
+            },
+          },
+          { type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Here\'s your answer.' },
+        ],
+      },
+    ];
+
+    const result = formatAgentMessages(payload);
+
+    expect(result).toHaveLength(5);
+    expect(result[0]).toBeInstanceOf(AIMessage);
+    expect(result[1]).toBeInstanceOf(ToolMessage);
+    expect(result[2]).toBeInstanceOf(AIMessage);
+    expect(result[3]).toBeInstanceOf(ToolMessage);
+    expect(result[4]).toBeInstanceOf(AIMessage);
+
+    // Check first AIMessage
+    expect(result[0].content).toBe('I\'ll search for that information.');
+    expect(result[0].tool_calls).toHaveLength(1);
+    expect(result[0].tool_calls[0]).toEqual({
+      id: 'search_1',
+      name: 'search',
+      args: { query: 'weather in New York' },
+    });
+
+    // Check first ToolMessage
+    expect(result[1].tool_call_id).toBe('search_1');
+    expect(result[1].name).toBe('search');
+    expect(result[1].content).toBe(
+      'The weather in New York is currently sunny with a temperature of 75°F.',
+    );
+
+    // Check second AIMessage
+    expect(result[2].content).toBe('Now, I\'ll convert the temperature.');
+    expect(result[2].tool_calls).toHaveLength(1);
+    expect(result[2].tool_calls[0]).toEqual({
+      id: 'convert_1',
+      name: 'convert_temperature',
+      args: { temperature: 75, from: 'F', to: 'C' },
+    });
+
+    // Check second ToolMessage
+    expect(result[3].tool_call_id).toBe('convert_1');
+    expect(result[3].name).toBe('convert_temperature');
+    expect(result[3].content).toBe('23.89°C');
+
+    // Check final AIMessage
+    expect(result[4].content).toStrictEqual([
+      { [ContentTypes.TEXT]: 'Here\'s your answer.', type: ContentTypes.TEXT },
+    ]);
+  });
+
+  it.skip('should not produce two consecutive assistant messages and format content correctly', () => {
+    const payload = [
+      { role: 'user', content: 'Hello' },
+      {
+        role: 'assistant',
+        content: [{ type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Hi there!' }],
+      },
+      {
+        role: 'assistant',
+        content: [{ type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'How can I help you?' }],
+      },
+      { role: 'user', content: 'What\'s the weather?' },
+      {
+        role: 'assistant',
+        content: [
+          {
+            type: ContentTypes.TEXT,
+            [ContentTypes.TEXT]: 'Let me check that for you.',
+            tool_call_ids: ['weather_1'],
+          },
+          {
+            type: ContentTypes.TOOL_CALL,
+            tool_call: {
+              id: 'weather_1',
+              name: 'check_weather',
+              args: '{"location":"New York"}',
+              output: 'Sunny, 75°F',
+            },
+          },
+        ],
+      },
+      {
+        role: 'assistant',
+        content: [
+          { type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Here\'s the weather information.' },
+        ],
+      },
+    ];
+
+    const result = formatAgentMessages(payload);
+
+    // Check correct message count and types
+    expect(result).toHaveLength(6);
+    expect(result[0]).toBeInstanceOf(HumanMessage);
+    expect(result[1]).toBeInstanceOf(AIMessage);
+    expect(result[2]).toBeInstanceOf(HumanMessage);
+    expect(result[3]).toBeInstanceOf(AIMessage);
+    expect(result[4]).toBeInstanceOf(ToolMessage);
+    expect(result[5]).toBeInstanceOf(AIMessage);
+
+    // Check content of messages
+    expect(result[0].content).toStrictEqual([
+      { [ContentTypes.TEXT]: 'Hello', type: ContentTypes.TEXT },
+    ]);
+    expect(result[1].content).toStrictEqual([
+      { [ContentTypes.TEXT]: 'Hi there!', type: ContentTypes.TEXT },
+      { [ContentTypes.TEXT]: 'How can I help you?', type: ContentTypes.TEXT },
+    ]);
+    expect(result[2].content).toStrictEqual([
+      { [ContentTypes.TEXT]: 'What\'s the weather?', type: ContentTypes.TEXT },
+    ]);
+    expect(result[3].content).toBe('Let me check that for you.');
+    expect(result[4].content).toBe('Sunny, 75°F');
+    expect(result[5].content).toStrictEqual([
+      { [ContentTypes.TEXT]: 'Here\'s the weather information.', type: ContentTypes.TEXT },
+    ]);
+
+    // Check that there are no consecutive AIMessages
+    const messageTypes = result.map((message) => message.constructor);
+    for (let i = 0; i < messageTypes.length - 1; i++) {
+      expect(messageTypes[i] === AIMessage && messageTypes[i + 1] === AIMessage).toBe(false);
+    }
+
+    // Additional check to ensure the consecutive assistant messages were combined
+    expect(result[1].content).toHaveLength(2);
+  });
+});

api/app/clients/prompts/formatMessages.js

@@ -142,6 +142,9 @@ const formatAgentMessages = (payload) => {
   const messages = [];
 
   for (const message of payload) {
+    if (typeof message.content === 'string') {
+      message.content = [{ type: ContentTypes.TEXT, [ContentTypes.TEXT]: message.content }];
+    }
     if (message.role !== 'assistant') {
       messages.push(formatMessage({ message, langChain: true }));
       continue;
@@ -152,10 +155,22 @@ const formatAgentMessages = (payload) => {
 
     for (const part of message.content) {
       if (part.type === ContentTypes.TEXT && part.tool_call_ids) {
-        // If there's pending content, add it as an AIMessage
+        /*
+        If there's pending content, it needs to be aggregated as a single string to prepare for tool calls.
+        For Anthropic models, the "tool_calls" field on a message is only respected if content is a string.
+         */
         if (currentContent.length > 0) {
-          messages.push(new AIMessage({ content: currentContent }));
+          let content = currentContent.reduce((acc, curr) => {
+            if (curr.type === ContentTypes.TEXT) {
+              return `${acc}${curr[ContentTypes.TEXT]}\n`;
+            }
+            return acc;
+          }, '');
+          content = `${content}\n${part[ContentTypes.TEXT] ?? ''}`.trim();
+          lastAIMessage = new AIMessage({ content });
+          messages.push(lastAIMessage);
           currentContent = [];
+          continue;
         }
 
         // Create a new AIMessage with this text and prepare for tool calls

api/app/clients/specs/AnthropicClient.test.js

@@ -201,10 +201,10 @@ describe('AnthropicClient', () => {
       );
     });
 
-    it('should add beta header for claude-3-5-sonnet model', () => {
+    it('should add "max-tokens" & "prompt-caching" beta header for claude-3-5-sonnet model', () => {
       const client = new AnthropicClient('test-api-key');
       const modelOptions = {
-        model: 'claude-3-5-sonnet-20240307',
+        model: 'claude-3-5-sonnet-20241022',
       };
       client.setOptions({ modelOptions, promptCache: true });
       const anthropicClient = client.getClient(modelOptions);
@@ -215,7 +215,7 @@ describe('AnthropicClient', () => {
       );
     });
 
-    it('should add beta header for claude-3-haiku model', () => {
+    it('should add "prompt-caching" beta header for claude-3-haiku model', () => {
       const client = new AnthropicClient('test-api-key');
       const modelOptions = {
         model: 'claude-3-haiku-2028',
@@ -229,6 +229,30 @@ describe('AnthropicClient', () => {
       );
     });
 
+    it('should add "prompt-caching" beta header for claude-3-opus model', () => {
+      const client = new AnthropicClient('test-api-key');
+      const modelOptions = {
+        model: 'claude-3-opus-2028',
+      };
+      client.setOptions({ modelOptions, promptCache: true });
+      const anthropicClient = client.getClient(modelOptions);
+      expect(anthropicClient._options.defaultHeaders).toBeDefined();
+      expect(anthropicClient._options.defaultHeaders).toHaveProperty('anthropic-beta');
+      expect(anthropicClient._options.defaultHeaders['anthropic-beta']).toBe(
+        'prompt-caching-2024-07-31',
+      );
+    });
+
+    it('should not add beta header for claude-3-5-sonnet-latest model', () => {
+      const client = new AnthropicClient('test-api-key');
+      const modelOptions = {
+        model: 'anthropic/claude-3-5-sonnet-latest',
+      };
+      client.setOptions({ modelOptions, promptCache: true });
+      const anthropicClient = client.getClient(modelOptions);
+      expect(anthropicClient.defaultHeaders).not.toHaveProperty('anthropic-beta');
+    });
+
     it('should not add beta header for other models', () => {
       const client = new AnthropicClient('test-api-key');
       client.setOptions({

api/app/clients/specs/OpenAIClient.test.js

@@ -611,15 +611,7 @@ describe('OpenAIClient', () => {
       expect(getCompletion).toHaveBeenCalled();
       expect(getCompletion.mock.calls.length).toBe(1);
 
-      const currentDateString = new Date().toLocaleDateString('en-us', {
-        year: 'numeric',
-        month: 'long',
-        day: 'numeric',
-      });
-
-      expect(getCompletion.mock.calls[0][0]).toBe(
-        `||>Instructions:\nYou are ChatGPT, a large language model trained by OpenAI. Respond conversationally.\nCurrent date: ${currentDateString}\n\n||>User:\nHi mom!\n||>Assistant:\n`,
-      );
+      expect(getCompletion.mock.calls[0][0]).toBe('||>User:\nHi mom!\n||>Assistant:\n');
 
       expect(fetchEventSource).toHaveBeenCalled();
       expect(fetchEventSource.mock.calls.length).toBe(1);
@@ -701,4 +693,70 @@ describe('OpenAIClient', () => {
       expect(client.modelOptions.stop).toBeUndefined();
     });
   });
+
+  describe('getStreamUsage', () => {
+    it('should return this.usage when completion_tokens_details is null', () => {
+      const client = new OpenAIClient('test-api-key', defaultOptions);
+      client.usage = {
+        completion_tokens_details: null,
+        prompt_tokens: 10,
+        completion_tokens: 20,
+      };
+      client.inputTokensKey = 'prompt_tokens';
+      client.outputTokensKey = 'completion_tokens';
+
+      const result = client.getStreamUsage();
+
+      expect(result).toEqual(client.usage);
+    });
+
+    it('should return this.usage when completion_tokens_details is missing reasoning_tokens', () => {
+      const client = new OpenAIClient('test-api-key', defaultOptions);
+      client.usage = {
+        completion_tokens_details: {
+          other_tokens: 5,
+        },
+        prompt_tokens: 10,
+        completion_tokens: 20,
+      };
+      client.inputTokensKey = 'prompt_tokens';
+      client.outputTokensKey = 'completion_tokens';
+
+      const result = client.getStreamUsage();
+
+      expect(result).toEqual(client.usage);
+    });
+
+    it('should calculate output tokens correctly when completion_tokens_details is present with reasoning_tokens', () => {
+      const client = new OpenAIClient('test-api-key', defaultOptions);
+      client.usage = {
+        completion_tokens_details: {
+          reasoning_tokens: 30,
+          other_tokens: 5,
+        },
+        prompt_tokens: 10,
+        completion_tokens: 20,
+      };
+      client.inputTokensKey = 'prompt_tokens';
+      client.outputTokensKey = 'completion_tokens';
+
+      const result = client.getStreamUsage();
+
+      expect(result).toEqual({
+        reasoning_tokens: 30,
+        other_tokens: 5,
+        prompt_tokens: 10,
+        completion_tokens: 10, // |30 - 20| = 10
+      });
+    });
+
+    it('should return this.usage when it is undefined', () => {
+      const client = new OpenAIClient('test-api-key', defaultOptions);
+      client.usage = undefined;
+
+      const result = client.getStreamUsage();
+
+      expect(result).toBeUndefined();
+    });
+  });
 });

api/app/clients/tools/AzureAiSearch.js

@@ -77,7 +77,7 @@ class AzureAISearch extends StructuredTool {
     try {
       const searchOption = {
         queryType: this.queryType,
-        top: this.top,
+        top: typeof this.top === 'string' ? Number(this.top) : this.top,
       };
       if (this.select) {
         searchOption.select = this.select.split(',');

api/app/clients/tools/index.js

@@ -25,7 +25,6 @@ module.exports = {
   // Basic Tools
   CodeBrew,
   AzureAiSearch,
-  GoogleSearchAPI,
   WolframAlphaAPI,
   OpenAICreateImage,
   StableDiffusionAPI,
@@ -37,8 +36,9 @@ module.exports = {
   CodeSherpa,
   StructuredSD,
   StructuredACS,
+  GoogleSearchAPI,
   CodeSherpaTools,
+  TraversaalSearch,
   StructuredWolfram,
   TavilySearchResults,
-  TraversaalSearch,
 };

api/app/clients/tools/structured/AzureAISearch.js

@@ -1,9 +1,9 @@
 const { z } = require('zod');
-const { StructuredTool } = require('langchain/tools');
+const { Tool } = require('@langchain/core/tools');
 const { SearchClient, AzureKeyCredential } = require('@azure/search-documents');
 const { logger } = require('~/config');
 
-class AzureAISearch extends StructuredTool {
+class AzureAISearch extends Tool {
   // Constants for default values
   static DEFAULT_API_VERSION = '2023-11-01';
   static DEFAULT_QUERY_TYPE = 'simple';
@@ -83,7 +83,7 @@ class AzureAISearch extends StructuredTool {
     try {
       const searchOption = {
         queryType: this.queryType,
-        top: this.top,
+        top: typeof this.top === 'string' ? Number(this.top) : this.top,
       };
       if (this.select) {
         searchOption.select = this.select.split(',');

api/app/clients/tools/structured/DALLE3.js

@@ -2,7 +2,7 @@ const { z } = require('zod');
 const path = require('path');
 const OpenAI = require('openai');
 const { v4: uuidv4 } = require('uuid');
-const { Tool } = require('langchain/tools');
+const { Tool } = require('@langchain/core/tools');
 const { HttpsProxyAgent } = require('https-proxy-agent');
 const { FileContext } = require('librechat-data-provider');
 const { getImageBasename } = require('~/server/services/Files/images');

api/app/clients/tools/structured/GoogleSearch.js

@@ -4,11 +4,12 @@ const { getEnvironmentVariable } = require('@langchain/core/utils/env');
 
 class GoogleSearchResults extends Tool {
   static lc_name() {
-    return 'GoogleSearchResults';
+    return 'google';
   }
 
   constructor(fields = {}) {
     super(fields);
+    this.name = 'google';
     this.envVarApiKey = 'GOOGLE_SEARCH_API_KEY';
     this.envVarSearchEngineId = 'GOOGLE_CSE_ID';
     this.override = fields.override ?? false;

api/app/clients/tools/structured/StableDiffusion.js

@@ -5,12 +5,12 @@ const path = require('path');
 const axios = require('axios');
 const sharp = require('sharp');
 const { v4: uuidv4 } = require('uuid');
-const { StructuredTool } = require('langchain/tools');
+const { Tool } = require('@langchain/core/tools');
 const { FileContext } = require('librechat-data-provider');
 const paths = require('~/config/paths');
 const { logger } = require('~/config');
 
-class StableDiffusionAPI extends StructuredTool {
+class StableDiffusionAPI extends Tool {
   constructor(fields) {
     super();
     /** @type {string} User ID */

api/app/clients/tools/structured/Wolfram.js

@@ -1,10 +1,10 @@
 /* eslint-disable no-useless-escape */
 const axios = require('axios');
 const { z } = require('zod');
-const { StructuredTool } = require('langchain/tools');
+const { Tool } = require('@langchain/core/tools');
 const { logger } = require('~/config');
 
-class WolframAlphaAPI extends StructuredTool {
+class WolframAlphaAPI extends Tool {
   constructor(fields) {
     super();
     /* Used to initialize the Tool without necessary variables. */

api/app/clients/tools/util/createFileSearchTool.js

@@ -0,0 +1,104 @@
+const { z } = require('zod');
+const axios = require('axios');
+const { tool } = require('@langchain/core/tools');
+const { Tools, EToolResources } = require('librechat-data-provider');
+const { getFiles } = require('~/models/File');
+const { logger } = require('~/config');
+
+/**
+ *
+ * @param {Object} options
+ * @param {ServerRequest} options.req
+ * @param {Agent['tool_resources']} options.tool_resources
+ * @returns
+ */
+const createFileSearchTool = async (options) => {
+  const { req, tool_resources } = options;
+  const file_ids = tool_resources?.[EToolResources.file_search]?.file_ids ?? [];
+  const files = (await getFiles({ file_id: { $in: file_ids } })).map((file) => ({
+    file_id: file.file_id,
+    filename: file.filename,
+  }));
+
+  const fileList = files.map((file) => `- ${file.filename}`).join('\n');
+  const toolDescription = `Performs a semantic search based on a natural language query across the following files:\n${fileList}`;
+
+  const FileSearch = tool(
+    async ({ query }) => {
+      if (files.length === 0) {
+        return 'No files to search. Instruct the user to add files for the search.';
+      }
+      const jwtToken = req.headers.authorization.split(' ')[1];
+      if (!jwtToken) {
+        return 'There was an error authenticating the file search request.';
+      }
+      const queryPromises = files.map((file) =>
+        axios
+          .post(
+            `${process.env.RAG_API_URL}/query`,
+            {
+              file_id: file.file_id,
+              query,
+              k: 5,
+            },
+            {
+              headers: {
+                Authorization: `Bearer ${jwtToken}`,
+                'Content-Type': 'application/json',
+              },
+            },
+          )
+          .catch((error) => {
+            logger.error(
+              `Error encountered in \`file_search\` while querying file_id ${file._id}:`,
+              error,
+            );
+            return null;
+          }),
+      );
+
+      const results = await Promise.all(queryPromises);
+      const validResults = results.filter((result) => result !== null);
+
+      if (validResults.length === 0) {
+        return 'No results found or errors occurred while searching the files.';
+      }
+
+      const formattedResults = validResults
+        .flatMap((result) =>
+          result.data.map(([docInfo, relevanceScore]) => ({
+            filename: docInfo.metadata.source.split('/').pop(),
+            content: docInfo.page_content,
+            relevanceScore,
+          })),
+        )
+        .sort((a, b) => b.relevanceScore - a.relevanceScore);
+
+      const formattedString = formattedResults
+        .map(
+          (result) =>
+            `File: ${result.filename}\nRelevance: ${result.relevanceScore.toFixed(4)}\nContent: ${
+              result.content
+            }\n`,
+        )
+        .join('\n---\n');
+
+      return formattedString;
+    },
+    {
+      name: Tools.file_search,
+      description: toolDescription,
+      schema: z.object({
+        query: z
+          .string()
+          .describe(
+            'A natural language query to search for relevant information in the files. Be specific and use keywords related to the information you\'re looking for. The query will be used for semantic similarity matching against the file contents.',
+          ),
+      }),
+    },
+  );
+
+  return FileSearch;
+};
+
+module.exports = createFileSearchTool;

api/app/clients/tools/util/handleTools.js

@@ -1,8 +1,8 @@
+const { Tools } = require('librechat-data-provider');
 const { ZapierToolKit } = require('langchain/agents');
 const { Calculator } = require('langchain/tools/calculator');
-const { WebBrowser } = require('langchain/tools/webbrowser');
 const { SerpAPI, ZapierNLAWrapper } = require('langchain/tools');
-const { OpenAIEmbeddings } = require('langchain/embeddings/openai');
+const { createCodeExecutionTool, EnvVar } = require('@librechat/agents');
 const { getUserPluginAuthValue } = require('~/server/services/PluginService');
 const {
   availableTools,
@@ -24,16 +24,11 @@ const {
   StructuredWolfram,
   TavilySearchResults,
 } = require('../');
+const createFileSearchTool = require('./createFileSearchTool');
 const { loadToolSuite } = require('./loadToolSuite');
 const { loadSpecs } = require('./loadSpecs');
 const { logger } = require('~/config');
 
-const getOpenAIKey = async (options, user) => {
-  let openAIApiKey = options.openAIApiKey ?? process.env.OPENAI_API_KEY;
-  openAIApiKey = openAIApiKey === 'user_provided' ? null : openAIApiKey;
-  return openAIApiKey || (await getUserPluginAuthValue(user, 'OPENAI_API_KEY'));
-};
-
 /**
  * Validates the availability and authentication of tools for a user based on environment variables or user-specific plugin authentication values.
  * Tools without required authentication or with valid authentication are considered valid.
@@ -97,6 +92,45 @@ const validateTools = async (user, tools = []) => {
   }
 };
 
+const loadAuthValues = async ({ userId, authFields }) => {
+  let authValues = {};
+
+  /**
+   * Finds the first non-empty value for the given authentication field, supporting alternate fields.
+   * @param {string[]} fields Array of strings representing the authentication fields. Supports alternate fields delimited by "||".
+   * @returns {Promise<{ authField: string, authValue: string} | null>} An object containing the authentication field and value, or null if not found.
+   */
+  const findAuthValue = async (fields) => {
+    for (const field of fields) {
+      let value = process.env[field];
+      if (value) {
+        return { authField: field, authValue: value };
+      }
+      try {
+        value = await getUserPluginAuthValue(userId, field);
+      } catch (err) {
+        if (field === fields[fields.length - 1] && !value) {
+          throw err;
+        }
+      }
+      if (value) {
+        return { authField: field, authValue: value };
+      }
+    }
+    return null;
+  };
+
+  for (let authField of authFields) {
+    const fields = authField.split('||');
+    const result = await findAuthValue(fields);
+    if (result) {
+      authValues[result.authField] = result.authValue;
+    }
+  }
+
+  return authValues;
+};
+
 /**
  * Initializes a tool with authentication values for the given user, supporting alternate authentication fields.
  * Authentication fields can have alternates separated by "||", and the first defined variable will be used.
@@ -109,41 +143,7 @@ const validateTools = async (user, tools = []) => {
  */
 const loadToolWithAuth = (userId, authFields, ToolConstructor, options = {}) => {
   return async function () {
-    let authValues = {};
-
-    /**
-     * Finds the first non-empty value for the given authentication field, supporting alternate fields.
-     * @param {string[]} fields Array of strings representing the authentication fields. Supports alternate fields delimited by "||".
-     * @returns {Promise<{ authField: string, authValue: string} | null>} An object containing the authentication field and value, or null if not found.
-     */
-    const findAuthValue = async (fields) => {
-      for (const field of fields) {
-        let value = process.env[field];
-        if (value) {
-          return { authField: field, authValue: value };
-        }
-        try {
-          value = await getUserPluginAuthValue(userId, field);
-        } catch (err) {
-          if (field === fields[fields.length - 1] && !value) {
-            throw err;
-          }
-        }
-        if (value) {
-          return { authField: field, authValue: value };
-        }
-      }
-      return null;
-    };
-
-    for (let authField of authFields) {
-      const fields = authField.split('||');
-      const result = await findAuthValue(fields);
-      if (result) {
-        authValues[result.authField] = result.authValue;
-      }
-    }
-
+    const authValues = await loadAuthValues({ userId, authFields });
     return new ToolConstructor({ ...options, ...authValues, userId });
   };
 };
@@ -169,8 +169,6 @@ const loadTools = async ({
     traversaal_search: TraversaalSearch,
   };
 
-  const openAIApiKey = await getOpenAIKey(options, user);
-
   const customConstructors = {
     e2b_code_interpreter: async () => {
       if (!functions) {
@@ -183,7 +181,6 @@ const loadTools = async ({
         user,
         options: {
           model,
-          openAIApiKey,
           ...options,
         },
       });
@@ -200,14 +197,6 @@ const loadTools = async ({
         options,
       });
     },
-    'web-browser': async () => {
-      // let openAIApiKey = options.openAIApiKey ?? process.env.OPENAI_API_KEY;
-      // openAIApiKey = openAIApiKey === 'user_provided' ? null : openAIApiKey;
-      // openAIApiKey = openAIApiKey || (await getUserPluginAuthValue(user, 'OPENAI_API_KEY'));
-      const browser = new WebBrowser({ model, embeddings: new OpenAIEmbeddings({ openAIApiKey }) });
-      browser.description_for_model = browser.description;
-      return browser;
-    },
     serpapi: async () => {
       let apiKey = process.env.SERPAPI_API_KEY;
       if (!apiKey) {
@@ -264,6 +253,22 @@ const loadTools = async ({
   const remainingTools = [];
 
   for (const tool of tools) {
+    if (tool === Tools.execute_code) {
+      const authValues = await loadAuthValues({
+        userId: user.id,
+        authFields: [EnvVar.CODE_API_KEY],
+      });
+      requestedTools[tool] = () =>
+        createCodeExecutionTool({
+          user_id: user.id,
+          ...authValues,
+        });
+      continue;
+    } else if (tool === Tools.file_search) {
+      requestedTools[tool] = () => createFileSearchTool(options);
+      continue;
+    }
+
     if (customConstructors[tool]) {
       requestedTools[tool] = customConstructors[tool];
       continue;
@@ -331,6 +336,7 @@ const loadTools = async ({
 
 module.exports = {
   loadToolWithAuth,
+  loadAuthValues,
   validateTools,
   loadTools,
 };

api/app/clients/tools/util/index.js

@@ -1,8 +1,9 @@
-const { validateTools, loadTools } = require('./handleTools');
+const { validateTools, loadTools, loadAuthValues } = require('./handleTools');
 const handleOpenAIErrors = require('./handleOpenAIErrors');
 
 module.exports = {
   handleOpenAIErrors,
+  loadAuthValues,
   validateTools,
   loadTools,
 };

api/models/Agent.js

@@ -1,11 +1,14 @@
 const mongoose = require('mongoose');
+const { SystemRoles } = require('librechat-data-provider');
 const { GLOBAL_PROJECT_NAME } = require('librechat-data-provider').Constants;
+const { CONFIG_STORE, STARTUP_CONFIG } = require('librechat-data-provider').CacheKeys;
 const {
   getProjectByName,
   addAgentIdsToProject,
   removeAgentIdsFromProject,
   removeAgentFromAllProjects,
 } = require('./Project');
+const getLogStores = require('~/cache/getLogStores');
 const agentSchema = require('./schema/agent');
 
 const Agent = mongoose.model('agent', agentSchema);
@@ -30,6 +33,43 @@ const createAgent = async (agentData) => {
  */
 const getAgent = async (searchParameter) => await Agent.findOne(searchParameter).lean();
 
+/**
+ * Load an agent based on the provided ID
+ *
+ * @param {Object} params
+ * @param {ServerRequest} params.req
+ * @param {string} params.agent_id
+ * @returns {Promise<Agent|null>} The agent document as a plain object, or null if not found.
+ */
+const loadAgent = async ({ req, agent_id }) => {
+  const agent = await getAgent({
+    id: agent_id,
+  });
+
+  if (agent.author.toString() === req.user.id) {
+    return agent;
+  }
+
+  if (!agent.projectIds) {
+    return null;
+  }
+
+  const cache = getLogStores(CONFIG_STORE);
+  /** @type {TStartupConfig} */
+  const cachedStartupConfig = await cache.get(STARTUP_CONFIG);
+  let { instanceProjectId } = cachedStartupConfig ?? {};
+  if (!instanceProjectId) {
+    instanceProjectId = (await getProjectByName(GLOBAL_PROJECT_NAME, '_id'))._id.toString();
+  }
+
+  for (const projectObjectId of agent.projectIds) {
+    const projectId = projectObjectId.toString();
+    if (projectId === instanceProjectId) {
+      return agent;
+    }
+  }
+};
+
 /**
  * Update an agent with new data without overwriting existing
  *  properties, or create a new agent if it doesn't exist.
@@ -41,10 +81,76 @@ const getAgent = async (searchParameter) => await Agent.findOne(searchParameter)
  * @returns {Promise<Agent>} The updated or newly created agent document as a plain object.
  */
 const updateAgent = async (searchParameter, updateData) => {
-  const options = { new: true, upsert: true };
+  const options = { new: true, upsert: false };
   return await Agent.findOneAndUpdate(searchParameter, updateData, options).lean();
 };
 
+/**
+ * Modifies an agent with the resource file id.
+ * @param {object} params
+ * @param {ServerRequest} params.req
+ * @param {string} params.agent_id
+ * @param {string} params.tool_resource
+ * @param {string} params.file_id
+ * @returns {Promise<Agent>} The updated agent.
+ */
+const addAgentResourceFile = async ({ agent_id, tool_resource, file_id }) => {
+  const searchParameter = { id: agent_id };
+  const agent = await getAgent(searchParameter);
+
+  if (!agent) {
+    throw new Error('Agent not found for adding resource file');
+  }
+
+  const tool_resources = agent.tool_resources || {};
+
+  if (!tool_resources[tool_resource]) {
+    tool_resources[tool_resource] = { file_ids: [] };
+  }
+
+  if (!tool_resources[tool_resource].file_ids.includes(file_id)) {
+    tool_resources[tool_resource].file_ids.push(file_id);
+  }
+
+  const updateData = { tool_resources };
+
+  return await updateAgent(searchParameter, updateData);
+};
+
+/**
+ * Removes a resource file id from an agent.
+ * @param {object} params
+ * @param {ServerRequest} params.req
+ * @param {string} params.agent_id
+ * @param {string} params.tool_resource
+ * @param {string} params.file_id
+ * @returns {Promise<Agent>} The updated agent.
+ */
+const removeAgentResourceFile = async ({ agent_id, tool_resource, file_id }) => {
+  const searchParameter = { id: agent_id };
+  const agent = await getAgent(searchParameter);
+
+  if (!agent) {
+    throw new Error('Agent not found for removing resource file');
+  }
+
+  const tool_resources = agent.tool_resources || {};
+
+  if (tool_resources[tool_resource] && tool_resources[tool_resource].file_ids) {
+    tool_resources[tool_resource].file_ids = tool_resources[tool_resource].file_ids.filter(
+      (id) => id !== file_id,
+    );
+
+    if (tool_resources[tool_resource].file_ids.length === 0) {
+      delete tool_resources[tool_resource];
+    }
+  }
+
+  const updateData = { tool_resources };
+
+  return await updateAgent(searchParameter, updateData);
+};
+
 /**
  * Deletes an agent based on the provided ID.
  *
@@ -79,12 +185,25 @@ const getListAgents = async (searchParameter) => {
     query = { $or: [globalQuery, query] };
   }
 
-  const agents = await Agent.find(query, {
-    id: 1,
-    name: 1,
-    avatar: 1,
-    projectIds: 1,
-  }).lean();
+  const agents = (
+    await Agent.find(query, {
+      id: 1,
+      _id: 0,
+      name: 1,
+      avatar: 1,
+      author: 1,
+      projectIds: 1,
+      isCollaborative: 1,
+    }).lean()
+  ).map((agent) => {
+    if (agent.author?.toString() !== author) {
+      delete agent.author;
+    }
+    if (agent.author) {
+      agent.author = agent.author.toString();
+    }
+    return agent;
+  });
 
   const hasMore = agents.length > 0;
   const firstId = agents.length > 0 ? agents[0].id : null;
@@ -102,13 +221,15 @@ const getListAgents = async (searchParameter) => {
  * Updates the projects associated with an agent, adding and removing project IDs as specified.
  * This function also updates the corresponding projects to include or exclude the agent ID.
  *
- * @param {string} agentId - The ID of the agent to update.
- * @param {string[]} [projectIds] - Array of project IDs to add to the agent.
- * @param {string[]} [removeProjectIds] - Array of project IDs to remove from the agent.
+ * @param {Object} params - Parameters for updating the agent's projects.
+ * @param {import('librechat-data-provider').TUser} params.user - Parameters for updating the agent's projects.
+ * @param {string} params.agentId - The ID of the agent to update.
+ * @param {string[]} [params.projectIds] - Array of project IDs to add to the agent.
+ * @param {string[]} [params.removeProjectIds] - Array of project IDs to remove from the agent.
  * @returns {Promise<MongoAgent>} The updated agent document.
  * @throws {Error} If there's an error updating the agent or projects.
  */
-const updateAgentProjects = async (agentId, projectIds, removeProjectIds) => {
+const updateAgentProjects = async ({ user, agentId, projectIds, removeProjectIds }) => {
   const updateOps = {};
 
   if (removeProjectIds && removeProjectIds.length > 0) {
@@ -129,14 +250,36 @@ const updateAgentProjects = async (agentId, projectIds, removeProjectIds) => {
     return await getAgent({ id: agentId });
   }
 
-  return await updateAgent({ id: agentId }, updateOps);
+  const updateQuery = { id: agentId, author: user.id };
+  if (user.role === SystemRoles.ADMIN) {
+    delete updateQuery.author;
+  }
+
+  const updatedAgent = await updateAgent(updateQuery, updateOps);
+  if (updatedAgent) {
+    return updatedAgent;
+  }
+  if (updateOps.$addToSet) {
+    for (const projectId of projectIds) {
+      await removeAgentIdsFromProject(projectId, [agentId]);
+    }
+  } else if (updateOps.$pull) {
+    for (const projectId of removeProjectIds) {
+      await addAgentIdsToProject(projectId, [agentId]);
+    }
+  }
+
+  return await getAgent({ id: agentId });
 };
 
 module.exports = {
-  createAgent,
   getAgent,
+  loadAgent,
+  createAgent,
   updateAgent,
   deleteAgent,
   getListAgents,
   updateAgentProjects,
+  addAgentResourceFile,
+  removeAgentResourceFile,
 };

api/models/Banner.js

@@ -0,0 +1,27 @@
+const Banner = require('./schema/banner');
+const logger = require('~/config/winston');
+/**
+ * Retrieves the current active banner.
+ * @returns {Promise<Object|null>} The active banner object or null if no active banner is found.
+ */
+const getBanner = async (user) => {
+  try {
+    const now = new Date();
+    const banner = await Banner.findOne({
+      displayFrom: { $lte: now },
+      $or: [{ displayTo: { $gte: now } }, { displayTo: null }],
+      type: 'banner',
+    }).lean();
+
+    if (!banner || banner.isPublic || user) {
+      return banner;
+    }
+
+    return null;
+  } catch (error) {
+    logger.error('[getBanners] Error getting banners', error);
+    throw new Error('Error getting banners');
+  }
+};
+
+module.exports = { getBanner };

api/models/Conversation.js

@@ -31,9 +31,39 @@ const getConvo = async (user, conversationId) => {
   }
 };
 
+const deleteNullOrEmptyConversations = async () => {
+  try {
+    const filter = {
+      $or: [
+        { conversationId: null },
+        { conversationId: '' },
+        { conversationId: { $exists: false } },
+      ],
+    };
+
+    const result = await Conversation.deleteMany(filter);
+
+    // Delete associated messages
+    const messageDeleteResult = await deleteMessages(filter);
+
+    logger.info(
+      `[deleteNullOrEmptyConversations] Deleted ${result.deletedCount} conversations and ${messageDeleteResult.deletedCount} messages`,
+    );
+
+    return {
+      conversations: result,
+      messages: messageDeleteResult,
+    };
+  } catch (error) {
+    logger.error('[deleteNullOrEmptyConversations] Error deleting conversations', error);
+    throw new Error('Error deleting conversations with null or empty conversationId');
+  }
+};
+
 module.exports = {
   Conversation,
   searchConversation,
+  deleteNullOrEmptyConversations,
   /**
    * Saves a conversation to the database.
    * @param {Object} req - The request object.

api/models/Preset.js

@@ -38,7 +38,8 @@ module.exports = {
   savePreset: async (user, { presetId, newPresetId, defaultPreset, ...preset }) => {
     try {
       const setter = { $set: {} };
-      const update = { presetId, ...preset };
+      const { user: _, ...cleanPreset } = preset;
+      const update = { presetId, ...cleanPreset };
       if (preset.tools && Array.isArray(preset.tools)) {
         update.tools =
           preset.tools

api/models/Prompt.js

@@ -7,6 +7,7 @@ const {
   removeGroupFromAllProjects,
 } = require('./Project');
 const { Prompt, PromptGroup } = require('./schema/promptSchema');
+const { escapeRegExp } = require('~/server/utils');
 const { logger } = require('~/config');
 
 /**
@@ -106,7 +107,7 @@ const getAllPromptGroups = async (req, filter) => {
     let searchShared = true;
     let searchSharedOnly = false;
     if (name) {
-      query.name = new RegExp(name, 'i');
+      query.name = new RegExp(escapeRegExp(name), 'i');
     }
     if (!query.category) {
       delete query.category;
@@ -159,7 +160,7 @@ const getPromptGroups = async (req, filter) => {
     let searchShared = true;
     let searchSharedOnly = false;
     if (name) {
-      query.name = new RegExp(name, 'i');
+      query.name = new RegExp(escapeRegExp(name), 'i');
     }
     if (!query.category) {
       delete query.category;

api/models/inviteUser.js

@@ -1,6 +1,5 @@
-const crypto = require('crypto');
-const bcrypt = require('bcryptjs');
 const mongoose = require('mongoose');
+const { getRandomValues, hashToken } = require('~/server/utils/crypto');
 const { createToken, findToken } = require('./Token');
 const logger = require('~/config/winston');
 
@@ -18,8 +17,8 @@ const logger = require('~/config/winston');
  */
 const createInvite = async (email) => {
   try {
-    let token = crypto.randomBytes(32).toString('hex');
-    const hash = bcrypt.hashSync(token, 10);
+    const token = await getRandomValues(32);
+    const hash = await hashToken(token);
     const encodedToken = encodeURIComponent(token);
 
     const fakeUserId = new mongoose.Types.ObjectId();
@@ -50,7 +49,7 @@ const createInvite = async (email) => {
 const getInvite = async (encodedToken, email) => {
   try {
     const token = decodeURIComponent(encodedToken);
-    const hash = bcrypt.hashSync(token, 10);
+    const hash = await hashToken(token);
     const invite = await findToken({ token: hash, email });
 
     if (!invite) {
@@ -59,7 +58,7 @@ const getInvite = async (encodedToken, email) => {
 
     return invite;
   } catch (error) {
-    logger.error('[getInvite] Error getting invite', error);
+    logger.error('[getInvite] Error getting invite:', error);
     return { error: true, message: error.message };
   }
 };

api/models/schema/agent.js

@@ -5,6 +5,7 @@ const agentSchema = mongoose.Schema(
     id: {
       type: String,
       index: true,
+      unique: true,
       required: true,
     },
     name: {
@@ -44,10 +45,6 @@ const agentSchema = mongoose.Schema(
     tool_kwargs: {
       type: [{ type: mongoose.Schema.Types.Mixed }],
     },
-    file_ids: {
-      type: [String],
-      default: undefined,
-    },
     actions: {
       type: [String],
       default: undefined,
@@ -57,6 +54,22 @@ const agentSchema = mongoose.Schema(
       ref: 'User',
       required: true,
     },
+    authorName: {
+      type: String,
+      default: undefined,
+    },
+    isCollaborative: {
+      type: Boolean,
+      default: undefined,
+    },
+    conversation_starters: {
+      type: [String],
+      default: [],
+    },
+    tool_resources: {
+      type: mongoose.Schema.Types.Mixed,
+      default: {},
+    },
     projectIds: {
       type: [mongoose.Schema.Types.ObjectId],
       ref: 'Project',

api/models/schema/banner.js

@@ -0,0 +1,36 @@
+const mongoose = require('mongoose');
+
+const bannerSchema = mongoose.Schema(
+  {
+    bannerId: {
+      type: String,
+      required: true,
+    },
+    message: {
+      type: String,
+      required: true,
+    },
+    displayFrom: {
+      type: Date,
+      required: true,
+      default: Date.now,
+    },
+    displayTo: {
+      type: Date,
+    },
+    type: {
+      type: String,
+      enum: ['banner', 'popup'],
+      default: 'banner',
+    },
+    isPublic: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  { timestamps: true },
+);
+
+const Banner = mongoose.model('Banner', bannerSchema);
+module.exports = Banner;

api/models/schema/conversationTagSchema.js

@@ -21,6 +21,7 @@ const conversationTagSchema = mongoose.Schema(
     position: {
       type: Number,
       default: 0,
+      index: true,
     },
   },
   { timestamps: true },

api/models/schema/messageSchema.js

@@ -115,6 +115,29 @@ const messageSchema = mongoose.Schema(
     iconURL: {
       type: String,
     },
+    attachments: { type: [{ type: mongoose.Schema.Types.Mixed }], default: undefined },
+    /*
+    attachments: {
+      type: [
+        {
+          file_id: String,
+          filename: String,
+          filepath: String,
+          expiresAt: Date,
+          width: Number,
+          height: Number,
+          type: String,
+          conversationId: String,
+          messageId: {
+            type: String,
+            required: true,
+          },
+          toolCallId: String,
+        },
+      ],
+      default: undefined,
+    },
+    */
   },
   { timestamps: true },
 );

api/models/tx.js

@@ -37,9 +37,12 @@ const tokenValues = Object.assign(
     '4k': { prompt: 1.5, completion: 2 },
     '16k': { prompt: 3, completion: 4 },
     'gpt-3.5-turbo-1106': { prompt: 1, completion: 2 },
-    'gpt-4o-2024-08-06': { prompt: 2.5, completion: 10 },
+    'o1-preview': { prompt: 15, completion: 60 },
+    'o1-mini': { prompt: 3, completion: 12 },
+    o1: { prompt: 15, completion: 60 },
     'gpt-4o-mini': { prompt: 0.15, completion: 0.6 },
-    'gpt-4o': { prompt: 5, completion: 15 },
+    'gpt-4o': { prompt: 2.5, completion: 10 },
+    'gpt-4o-2024-05-13': { prompt: 5, completion: 15 },
     'gpt-4-1106': { prompt: 10, completion: 30 },
     'gpt-3.5-turbo-0125': { prompt: 0.5, completion: 1.5 },
     'claude-3-opus': { prompt: 15, completion: 75 },
@@ -95,8 +98,14 @@ const getValueKey = (model, endpoint) => {
     return 'gpt-3.5-turbo-1106';
   } else if (modelName.includes('gpt-3.5')) {
     return '4k';
-  } else if (modelName.includes('gpt-4o-2024-08-06')) {
-    return 'gpt-4o-2024-08-06';
+  } else if (modelName.includes('o1-preview')) {
+    return 'o1-preview';
+  } else if (modelName.includes('o1-mini')) {
+    return 'o1-mini';
+  } else if (modelName.includes('o1')) {
+    return 'o1';
+  } else if (modelName.includes('gpt-4o-2024-05-13')) {
+    return 'gpt-4o-2024-05-13';
   } else if (modelName.includes('gpt-4o-mini')) {
     return 'gpt-4o-mini';
   } else if (modelName.includes('gpt-4o')) {

api/models/tx.spec.js

@@ -50,8 +50,10 @@ describe('getValueKey', () => {
   });
 
   it('should return "gpt-4o" for model type of "gpt-4o"', () => {
-    expect(getValueKey('gpt-4o-2024-05-13')).toBe('gpt-4o');
+    expect(getValueKey('gpt-4o-2024-08-06')).toBe('gpt-4o');
+    expect(getValueKey('gpt-4o-2024-08-06-0718')).toBe('gpt-4o');
     expect(getValueKey('openai/gpt-4o')).toBe('gpt-4o');
+    expect(getValueKey('openai/gpt-4o-2024-08-06')).toBe('gpt-4o');
     expect(getValueKey('gpt-4o-turbo')).toBe('gpt-4o');
     expect(getValueKey('gpt-4o-0125')).toBe('gpt-4o');
   });
@@ -60,14 +62,14 @@ describe('getValueKey', () => {
     expect(getValueKey('gpt-4o-mini-2024-07-18')).toBe('gpt-4o-mini');
     expect(getValueKey('openai/gpt-4o-mini')).toBe('gpt-4o-mini');
     expect(getValueKey('gpt-4o-mini-0718')).toBe('gpt-4o-mini');
-    expect(getValueKey('gpt-4o-2024-08-06-0718')).not.toBe('gpt-4o');
+    expect(getValueKey('gpt-4o-2024-08-06-0718')).not.toBe('gpt-4o-mini');
   });
 
-  it('should return "gpt-4o-2024-08-06" for model type of "gpt-4o-2024-08-06"', () => {
-    expect(getValueKey('gpt-4o-2024-08-06-2024-07-18')).toBe('gpt-4o-2024-08-06');
-    expect(getValueKey('openai/gpt-4o-2024-08-06')).toBe('gpt-4o-2024-08-06');
-    expect(getValueKey('gpt-4o-2024-08-06-0718')).toBe('gpt-4o-2024-08-06');
-    expect(getValueKey('gpt-4o-2024-08-06-0718')).not.toBe('gpt-4o');
+  it('should return "gpt-4o-2024-05-13" for model type of "gpt-4o-2024-05-13"', () => {
+    expect(getValueKey('gpt-4o-2024-05-13')).toBe('gpt-4o-2024-05-13');
+    expect(getValueKey('openai/gpt-4o-2024-05-13')).toBe('gpt-4o-2024-05-13');
+    expect(getValueKey('gpt-4o-2024-05-13-0718')).toBe('gpt-4o-2024-05-13');
+    expect(getValueKey('gpt-4o-2024-05-13-0718')).not.toBe('gpt-4o');
   });
 
   it('should return "gpt-4o" for model type of "chatgpt-4o"', () => {
@@ -134,7 +136,7 @@ describe('getMultiplier', () => {
   });
 
   it('should return the correct multiplier for gpt-4o', () => {
-    const valueKey = getValueKey('gpt-4o-2024-05-13');
+    const valueKey = getValueKey('gpt-4o-2024-08-06');
     expect(getMultiplier({ valueKey, tokenType: 'prompt' })).toBe(tokenValues['gpt-4o'].prompt);
     expect(getMultiplier({ valueKey, tokenType: 'completion' })).toBe(
       tokenValues['gpt-4o'].completion,

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@librechat/backend",
-  "version": "v0.7.5-rc2",
+  "version": "v0.7.5",
   "description": "",
   "scripts": {
     "start": "echo 'please run this from the root directory'",
@@ -43,22 +43,22 @@
     "@langchain/core": "^0.2.18",
     "@langchain/google-genai": "^0.0.11",
     "@langchain/google-vertexai": "^0.0.17",
-    "@librechat/agents": "^1.5.2",
-    "axios": "^1.3.4",
+    "@librechat/agents": "^1.6.9",
+    "axios": "^1.7.7",
     "bcryptjs": "^2.4.3",
     "cheerio": "^1.0.0-rc.12",
     "cohere-ai": "^7.9.1",
     "compression": "^1.7.4",
     "connect-redis": "^7.1.0",
-    "cookie": "^0.5.0",
-    "cookie-parser": "^1.4.6",
+    "cookie": "^0.7.2",
+    "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
     "dedent": "^1.5.3",
     "dotenv": "^16.0.3",
-    "express": "^4.18.2",
+    "express": "^4.21.1",
     "express-mongo-sanitize": "^2.2.0",
-    "express-rate-limit": "^6.9.0",
-    "express-session": "^1.17.3",
+    "express-rate-limit": "^7.4.1",
+    "express-session": "^1.18.1",
     "file-type": "^18.7.0",
     "firebase": "^10.6.0",
     "googleapis": "^126.0.1",
@@ -76,11 +76,11 @@
     "meilisearch": "^0.38.0",
     "mime": "^3.0.0",
     "module-alias": "^2.2.3",
-    "mongoose": "^7.1.1",
+    "mongoose": "^7.3.3",
     "multer": "^1.4.5-lts.1",
     "nanoid": "^3.3.7",
     "nodejs-gpt": "^1.37.4",
-    "nodemailer": "^6.9.4",
+    "nodemailer": "^6.9.15",
     "ollama": "^0.5.0",
     "openai": "^4.47.1",
     "openai-chat-tokens": "^0.2.8",
@@ -101,7 +101,6 @@
     "ua-parser-js": "^1.0.36",
     "winston": "^3.11.0",
     "winston-daily-rotate-file": "^4.7.1",
-    "ws": "^8.17.0",
     "zod": "^3.22.4"
   },
   "devDependencies": {

api/server/controllers/AskController.js

@@ -16,7 +16,12 @@ const AskController = async (req, res, next, initializeClient, addTitle) => {
     overrideParentMessageId = null,
   } = req.body;
 
-  logger.debug('[AskController]', { text, conversationId, ...endpointOption });
+  logger.debug('[AskController]', {
+    text,
+    conversationId,
+    ...endpointOption,
+    modelsConfig: endpointOption.modelsConfig ? 'exists' : '',
+  });
 
   let userMessage;
   let userMessagePromise;

api/server/controllers/EditController.js

@@ -25,6 +25,7 @@ const EditController = async (req, res, next, initializeClient) => {
     isContinued,
     conversationId,
     ...endpointOption,
+    modelsConfig: endpointOption.modelsConfig ? 'exists' : '',
   });
 
   let userMessage;

api/server/controllers/agents/callbacks.js

@@ -1,8 +1,13 @@
+const { Tools } = require('librechat-data-provider');
 const { GraphEvents, ToolEndHandler, ChatModelStreamHandler } = require('@librechat/agents');
+const { processCodeOutput } = require('~/server/services/Files/Code/process');
+const { logger } = require('~/config');
 
 /** @typedef {import('@librechat/agents').Graph} Graph */
 /** @typedef {import('@librechat/agents').EventHandler} EventHandler */
 /** @typedef {import('@librechat/agents').ModelEndData} ModelEndData */
+/** @typedef {import('@librechat/agents').ToolEndData} ToolEndData */
+/** @typedef {import('@librechat/agents').ToolEndCallback} ToolEndCallback */
 /** @typedef {import('@librechat/agents').ChatModelStreamHandler} ChatModelStreamHandler */
 /** @typedef {import('@librechat/agents').ContentAggregatorResult['aggregateContent']} ContentAggregator */
 /** @typedef {import('@librechat/agents').GraphEvents} GraphEvents */
@@ -58,11 +63,12 @@ class ModelEndHandler {
  * @param {Object} options - The options object.
  * @param {ServerResponse} options.res - The options object.
  * @param {ContentAggregator} options.aggregateContent - The options object.
+ * @param {ToolEndCallback} options.toolEndCallback - Callback to use when tool ends.
  * @param {Array<UsageMetadata>} options.collectedUsage - The list of collected usage metadata.
  * @returns {Record<string, t.EventHandler>} The default handlers.
  * @throws {Error} If the request is not found.
  */
-function getDefaultHandlers({ res, aggregateContent, collectedUsage }) {
+function getDefaultHandlers({ res, aggregateContent, toolEndCallback, collectedUsage }) {
   if (!res || !aggregateContent) {
     throw new Error(
       `[getDefaultHandlers] Missing required options: res: ${!res}, aggregateContent: ${!aggregateContent}`,
@@ -70,7 +76,7 @@ function getDefaultHandlers({ res, aggregateContent, collectedUsage }) {
   }
   const handlers = {
     [GraphEvents.CHAT_MODEL_END]: new ModelEndHandler(collectedUsage),
-    [GraphEvents.TOOL_END]: new ToolEndHandler(),
+    [GraphEvents.TOOL_END]: new ToolEndHandler(toolEndCallback),
     [GraphEvents.CHAT_MODEL_STREAM]: new ChatModelStreamHandler(),
     [GraphEvents.ON_RUN_STEP]: {
       /**
@@ -121,7 +127,67 @@ function getDefaultHandlers({ res, aggregateContent, collectedUsage }) {
   return handlers;
 }
 
+/**
+ *
+ * @param {Object} params
+ * @param {ServerRequest} params.req
+ * @param {ServerResponse} params.res
+ * @param {Promise<MongoFile | { filename: string; filepath: string; expires: number;} | null>[]} params.artifactPromises
+ * @returns {ToolEndCallback} The tool end callback.
+ */
+function createToolEndCallback({ req, res, artifactPromises }) {
+  /**
+   * @type {ToolEndCallback}
+   */
+  return async (data, metadata) => {
+    const output = data?.output;
+    if (!output) {
+      return;
+    }
+
+    if (output.name !== Tools.execute_code) {
+      return;
+    }
+
+    const { tool_call_id, artifact } = output;
+    if (!artifact.files) {
+      return;
+    }
+
+    for (const file of artifact.files) {
+      const { id, name } = file;
+      artifactPromises.push(
+        (async () => {
+          const fileMetadata = await processCodeOutput({
+            req,
+            id,
+            name,
+            toolCallId: tool_call_id,
+            messageId: metadata.run_id,
+            sessionId: artifact.session_id,
+            conversationId: metadata.thread_id,
+          });
+          if (!res.headersSent) {
+            return fileMetadata;
+          }
+
+          if (!fileMetadata) {
+            return null;
+          }
+
+          res.write(`event: attachment\ndata: ${JSON.stringify(fileMetadata)}\n\n`);
+          return fileMetadata;
+        })().catch((error) => {
+          logger.error('Error processing code output:', error);
+          return null;
+        }),
+      );
+    }
+  };
+}
+
 module.exports = {
   sendEvent,
   getDefaultHandlers,
+  createToolEndCallback,
 };

api/server/controllers/agents/client.js

@@ -10,7 +10,10 @@
 const { Callback, createMetadataAggregator } = require('@librechat/agents');
 const {
   Constants,
+  VisionModes,
+  openAISchema,
   EModelEndpoint,
+  anthropicSchema,
   bedrockOutputParser,
   providerEndpointMap,
   removeNullishValues,
@@ -35,11 +38,10 @@ const { logger } = require('~/config');
 
 /** @typedef {import('@librechat/agents').MessageContentComplex} MessageContentComplex */
 
-// const providerSchemas = {
-// [EModelEndpoint.bedrock]: true,
-// };
-
 const providerParsers = {
+  [EModelEndpoint.openAI]: openAISchema,
+  [EModelEndpoint.azureOpenAI]: openAISchema,
+  [EModelEndpoint.anthropic]: anthropicSchema,
   [EModelEndpoint.bedrock]: bedrockOutputParser,
 };
 
@@ -57,10 +59,11 @@ class AgentClient extends BaseClient {
     this.run;
 
     const {
-      maxContextTokens,
-      modelOptions = {},
       contentParts,
       collectedUsage,
+      artifactPromises,
+      maxContextTokens,
+      modelOptions = {},
       ...clientOptions
     } = options;
 
@@ -70,6 +73,8 @@ class AgentClient extends BaseClient {
     this.contentParts = contentParts;
     /** @type {Array<UsageMetadata>} */
     this.collectedUsage = collectedUsage;
+    /** @type {ArtifactPromises} */
+    this.artifactPromises = artifactPromises;
     this.options = Object.assign({ endpoint: options.endpoint }, clientOptions);
   }
 
@@ -180,10 +185,10 @@ class AgentClient extends BaseClient {
     );
   }
 
-  getBuildMessagesOptions(opts) {
+  getBuildMessagesOptions() {
     return {
-      instructions: opts.instructions,
-      additional_instructions: opts.additional_instructions,
+      instructions: this.options.agent.instructions,
+      additional_instructions: this.options.agent.additional_instructions,
     };
   }
 
@@ -192,6 +197,7 @@ class AgentClient extends BaseClient {
       this.options.req,
       attachments,
       this.options.agent.provider,
+      VisionModes.agents,
     );
     message.image_urls = image_urls.length ? image_urls : undefined;
     return files;
@@ -210,8 +216,6 @@ class AgentClient extends BaseClient {
     });
 
     let payload;
-    /** @type {{ role: string; name: string; content: string } | undefined} */
-    let systemMessage;
     /** @type {number | undefined} */
     let promptTokens;
 
@@ -259,21 +263,21 @@ class AgentClient extends BaseClient {
       }
 
       /* If message has files, calculate image token cost */
-      // if (this.message_file_map && this.message_file_map[message.messageId]) {
-      //   const attachments = this.message_file_map[message.messageId];
-      //   for (const file of attachments) {
-      //     if (file.embedded) {
-      //       this.contextHandlers?.processFile(file);
-      //       continue;
-      //     }
+      if (this.message_file_map && this.message_file_map[message.messageId]) {
+        const attachments = this.message_file_map[message.messageId];
+        for (const file of attachments) {
+          if (file.embedded) {
+            this.contextHandlers?.processFile(file);
+            continue;
+          }
 
-      //     orderedMessages[i].tokenCount += this.calculateImageTokenCost({
-      //       width: file.width,
-      //       height: file.height,
-      //       detail: this.options.imageDetail ?? ImageDetail.auto,
-      //     });
-      //   }
-      // }
+          // orderedMessages[i].tokenCount += this.calculateImageTokenCost({
+          //   width: file.width,
+          //   height: file.height,
+          //   detail: this.options.imageDetail ?? ImageDetail.auto,
+          // });
+        }
+      }
 
       return formattedMessage;
     });
@@ -284,20 +288,7 @@ class AgentClient extends BaseClient {
     }
 
     if (systemContent) {
-      systemContent = `${systemContent.trim()}`;
-      systemMessage = {
-        role: 'system',
-        name: 'instructions',
-        content: systemContent,
-      };
-
-      if (this.contextStrategy) {
-        const instructionTokens = this.getTokenCountForMessage(systemMessage);
-        if (instructionTokens >= 0) {
-          const firstMessageTokens = orderedMessages[0].tokenCount ?? 0;
-          orderedMessages[0].tokenCount = firstMessageTokens + instructionTokens;
-        }
-      }
+      this.options.agent.instructions = systemContent;
     }
 
     if (this.contextStrategy) {
@@ -477,7 +468,6 @@ class AgentClient extends BaseClient {
           provider: providerEndpointMap[this.options.agent.provider],
           thread_id: this.conversationId,
         },
-        run_id: this.responseMessageId,
         signal: abortController.signal,
         streamMode: 'values',
         version: 'v2',

api/server/controllers/agents/run.js

@@ -45,10 +45,9 @@ async function createRun({
   );
 
   const graphConfig = {
-    runId,
-    llmConfig,
     tools,
     toolMap,
+    llmConfig,
     instructions: agent.instructions,
     additional_instructions: agent.additional_instructions,
   };
@@ -59,6 +58,7 @@ async function createRun({
   }
 
   return Run.create({
+    runId,
     graphConfig,
     customHandlers,
   });

api/server/controllers/agents/v1.js

@@ -1,5 +1,5 @@
 const { nanoid } = require('nanoid');
-const { FileContext, Constants } = require('librechat-data-provider');
+const { FileContext, Constants, Tools, SystemRoles } = require('librechat-data-provider');
 const {
   getAgent,
   createAgent,
@@ -14,6 +14,11 @@ const { updateAgentProjects } = require('~/models/Agent');
 const { deleteFileByFilter } = require('~/models/File');
 const { logger } = require('~/config');
 
+const systemTools = {
+  [Tools.execute_code]: true,
+  [Tools.file_search]: true,
+};
+
 /**
  * Creates an Agent.
  * @route POST /Agents
@@ -27,9 +32,17 @@ const createAgentHandler = async (req, res) => {
     const { tools = [], provider, name, description, instructions, model, ...agentData } = req.body;
     const { id: userId } = req.user;
 
-    agentData.tools = tools
-      .map((tool) => (typeof tool === 'string' ? req.app.locals.availableTools[tool] : tool))
-      .filter(Boolean);
+    agentData.tools = [];
+
+    for (const tool of tools) {
+      if (req.app.locals.availableTools[tool]) {
+        agentData.tools.push(tool);
+      }
+
+      if (systemTools[tool]) {
+        agentData.tools.push(tool);
+      }
+    }
 
     Object.assign(agentData, {
       author: userId,
@@ -80,10 +93,24 @@ const getAgentHandler = async (req, res) => {
       return res.status(404).json({ error: 'Agent not found' });
     }
 
+    agent.author = agent.author.toString();
+    agent.isCollaborative = !!agent.isCollaborative;
+
     if (agent.author !== author) {
       delete agent.author;
     }
 
+    if (!agent.isCollaborative && agent.author !== author && req.user.role !== SystemRoles.ADMIN) {
+      return res.status(200).json({
+        id: agent.id,
+        name: agent.name,
+        avatar: agent.avatar,
+        author: agent.author,
+        projectIds: agent.projectIds,
+        isCollaborative: agent.isCollaborative,
+      });
+    }
+
     return res.status(200).json(agent);
   } catch (error) {
     logger.error('[/Agents/:id] Error retrieving agent', error);
@@ -106,12 +133,29 @@ const updateAgentHandler = async (req, res) => {
     const { projectIds, removeProjectIds, ...updateData } = req.body;
 
     let updatedAgent;
+    const query = { id, author: req.user.id };
+    if (req.user.role === SystemRoles.ADMIN) {
+      delete query.author;
+    }
     if (Object.keys(updateData).length > 0) {
-      updatedAgent = await updateAgent({ id, author: req.user.id }, updateData);
+      updatedAgent = await updateAgent(query, updateData);
     }
 
     if (projectIds || removeProjectIds) {
-      updatedAgent = await updateAgentProjects(id, projectIds, removeProjectIds);
+      updatedAgent = await updateAgentProjects({
+        user: req.user,
+        agentId: id,
+        projectIds,
+        removeProjectIds,
+      });
+    }
+
+    if (updatedAgent.author) {
+      updatedAgent.author = updatedAgent.author.toString();
+    }
+
+    if (updatedAgent.author !== req.user.id) {
+      delete updatedAgent.author;
     }
 
     return res.json(updatedAgent);
@@ -182,8 +226,6 @@ const uploadAgentAvatarHandler = async (req, res) => {
       return res.status(400).json({ message: 'Agent ID is required' });
     }
 
-    let { avatar: _avatar = '{}' } = req.body;
-
     const image = await uploadImageBuffer({
       req,
       context: FileContext.avatar,
@@ -192,10 +234,12 @@ const uploadAgentAvatarHandler = async (req, res) => {
       },
     });
 
+    let _avatar;
     try {
-      _avatar = JSON.parse(_avatar);
+      const agent = await getAgent({ id: agent_id });
+      _avatar = agent.avatar;
     } catch (error) {
-      logger.error('[/avatar/:agent_id] Error parsing avatar', error);
+      logger.error('[/avatar/:agent_id] Error fetching agent', error);
       _avatar = {};
     }
 
@@ -203,7 +247,7 @@ const uploadAgentAvatarHandler = async (req, res) => {
       const { deleteFile } = getStrategyFunctions(_avatar.source);
       try {
         await deleteFile(req, { filepath: _avatar.filepath });
-        await deleteFileByFilter({ filepath: _avatar.filepath });
+        await deleteFileByFilter({ user: req.user.id, filepath: _avatar.filepath });
       } catch (error) {
         logger.error('[/avatar/:agent_id] Error deleting old avatar', error);
       }

api/server/controllers/assistants/chatV1.js

@@ -314,7 +314,9 @@ const chatV1 = async (req, res) => {
     }
 
     if (typeof endpointOption.artifactsPrompt === 'string' && endpointOption.artifactsPrompt) {
-      body.additional_instructions = `${body.additional_instructions ?? ''}\n${endpointOption.artifactsPrompt}`.trim();
+      body.additional_instructions = `${body.additional_instructions ?? ''}\n${
+        endpointOption.artifactsPrompt
+      }`.trim();
     }
 
     if (instructions) {
@@ -371,11 +373,14 @@ const chatV1 = async (req, res) => {
       visionMessage.content = createVisionPrompt(plural);
       visionMessage = formatMessage({ message: visionMessage, endpoint: EModelEndpoint.openAI });
 
-      visionPromise = openai.chat.completions.create({
-        model: 'gpt-4-vision-preview',
-        messages: [visionMessage],
-        max_tokens: 4000,
-      });
+      visionPromise = openai.chat.completions
+        .create({
+          messages: [visionMessage],
+          max_tokens: 4000,
+        })
+        .catch((error) => {
+          logger.error('[/assistants/chat/] Error creating vision prompt', error);
+        });
 
       const pluralized = plural ? 's' : '';
       body.additional_instructions = `${

api/server/controllers/assistants/v1.js

@@ -241,7 +241,6 @@ const getAssistantDocuments = async (req, res) => {
  * @param {string} req.params.assistant_id - The ID of the assistant.
  * @param {Express.Multer.File} req.file - The avatar image file.
  * @param {object} req.body - Request body
- * @param {string} [req.body.metadata] - Optional metadata for the assistant's avatar.
  * @returns {Object} 200 - success response - application/json
  */
 const uploadAssistantAvatar = async (req, res) => {
@@ -251,7 +250,6 @@ const uploadAssistantAvatar = async (req, res) => {
       return res.status(400).json({ message: 'Assistant ID is required' });
     }
 
-    let { metadata: _metadata = '{}' } = req.body;
     const { openai } = await getOpenAIClient({ req, res });
     await validateAuthor({ req, openai });
 
@@ -263,10 +261,15 @@ const uploadAssistantAvatar = async (req, res) => {
       },
     });
 
+    let _metadata;
+
     try {
-      _metadata = JSON.parse(_metadata);
+      const assistant = await openai.beta.assistants.retrieve(assistant_id);
+      if (assistant) {
+        _metadata = assistant.metadata;
+      }
     } catch (error) {
-      logger.error('[/avatar/:assistant_id] Error parsing metadata', error);
+      logger.error('[/avatar/:assistant_id] Error fetching assistant', error);
       _metadata = {};
     }
 
@@ -274,7 +277,7 @@ const uploadAssistantAvatar = async (req, res) => {
       const { deleteFile } = getStrategyFunctions(_metadata.avatar_source);
       try {
         await deleteFile(req, { filepath: _metadata.avatar });
-        await deleteFileByFilter({ filepath: _metadata.avatar });
+        await deleteFileByFilter({ user: req.user.id, filepath: _metadata.avatar });
       } catch (error) {
         logger.error('[/avatar/:assistant_id] Error deleting old avatar', error);
       }

api/server/controllers/assistants/v2.js

@@ -149,7 +149,6 @@ const updateAssistant = async ({ req, openai, assistant_id, updateData }) => {
  * @param {string} params.assistant_id
  * @param {string} params.tool_resource
  * @param {string} params.file_id
- * @param {AssistantUpdateParams} params.updateData
  * @returns {Promise<Assistant>} The updated assistant.
  */
 const addResourceFileId = async ({ req, openai, assistant_id, tool_resource, file_id }) => {

api/server/index.js

@@ -106,6 +106,7 @@ const startServer = async () => {
   app.use('/api/share', routes.share);
   app.use('/api/roles', routes.roles);
   app.use('/api/agents', routes.agents);
+  app.use('/api/banner', routes.banner);
   app.use('/api/bedrock', routes.bedrock);
 
   app.use('/api/tags', routes.tags);
@@ -113,7 +114,8 @@ const startServer = async () => {
   app.use((req, res) => {
     // Replace lang attribute in index.html with lang from cookies or accept-language header
     const lang = req.cookies.lang || req.headers['accept-language']?.split(',')[0] || 'en-US';
-    const updatedIndexHtml = indexHTML.replace(/lang="en-US"/g, `lang="${lang}"`);
+    const saneLang = lang.replace(/"/g, '"'); // sanitize untrusted user input
+    const updatedIndexHtml = indexHTML.replace(/lang="en-US"/g, `lang="${saneLang}"`);
     res.send(updatedIndexHtml);
   });
 

api/server/middleware/abortMiddleware.js

@@ -173,6 +173,10 @@ const handleAbortError = async (res, req, error, data) => {
     errorText = `{"type":"${ErrorTypes.INVALID_REQUEST}"}`;
   }
 
+  if (error?.message?.includes('does not support \'system\'')) {
+    errorText = `{"type":"${ErrorTypes.NO_SYSTEM_MESSAGES}"}`;
+  }
+
   const respondWithError = async (partialText) => {
     let options = {
       sender,

api/server/middleware/buildEndpointOption.js

@@ -10,7 +10,6 @@ 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 enforceModelSpec = require('./enforceModelSpec');
 const { handleError } = require('~/server/utils');
 
 const buildFunction = {
@@ -28,7 +27,7 @@ const buildFunction = {
 
 async function buildEndpointOption(req, res, next) {
   const { endpoint, endpointType } = req.body;
-  const parsedBody = parseCompactConvo({ endpoint, endpointType, conversation: req.body });
+  let parsedBody = parseCompactConvo({ endpoint, endpointType, conversation: req.body });
 
   if (req.app.locals.modelSpecs?.list && req.app.locals.modelSpecs?.enforce) {
     /** @type {{ list: TModelSpec[] }}*/
@@ -57,10 +56,11 @@ async function buildEndpointOption(req, res, next) {
       });
     }
 
-    const isValidModelSpec = enforceModelSpec(currentModelSpec, parsedBody);
-    if (!isValidModelSpec) {
-      return handleError(res, { text: 'Model spec mismatch' });
-    }
+    parsedBody = parseCompactConvo({
+      endpoint,
+      endpointType,
+      conversation: currentModelSpec.preset,
+    });
   }
 
   const endpointFn = buildFunction[endpointType ?? endpoint];

api/server/middleware/enforceModelSpec.js

@@ -1,58 +0,0 @@
-const interchangeableKeys = new Map([
-  ['chatGptLabel', ['modelLabel']],
-  ['modelLabel', ['chatGptLabel']],
-]);
-
-/**
- * Middleware to enforce the model spec for a conversation
- * @param {TModelSpec} modelSpec - The model spec to enforce
- * @param {TConversation} parsedBody - The parsed body of the conversation
- * @returns {boolean} - Whether the model spec is enforced
- */
-const enforceModelSpec = (modelSpec, parsedBody) => {
-  for (const [key, value] of Object.entries(modelSpec.preset)) {
-    if (key === 'endpoint') {
-      continue;
-    }
-
-    if (!checkMatch(key, value, parsedBody)) {
-      return false;
-    }
-  }
-  return true;
-};
-
-/**
- * Checks if there is a match for the given key and value in the parsed body
- * or any of its interchangeable keys, including deep comparison for objects and arrays.
- * @param {string} key
- * @param {any} value
- * @param {object} parsedBody
- * @returns {boolean}
- */
-const checkMatch = (key, value, parsedBody) => {
-  const isEqual = (a, b) => {
-    if (Array.isArray(a) && Array.isArray(b)) {
-      return a.length === b.length && a.every((val, index) => isEqual(val, b[index]));
-    } else if (typeof a === 'object' && typeof b === 'object' && a !== null && b !== null) {
-      const keysA = Object.keys(a);
-      const keysB = Object.keys(b);
-      return keysA.length === keysB.length && keysA.every((k) => isEqual(a[k], b[k]));
-    }
-    return a === b;
-  };
-
-  if (isEqual(parsedBody[key], value)) {
-    return true;
-  }
-
-  if (interchangeableKeys.has(key)) {
-    return interchangeableKeys
-      .get(key)
-      .some((interchangeableKey) => isEqual(parsedBody[interchangeableKey], value));
-  }
-
-  return false;
-};
-
-module.exports = enforceModelSpec;

api/server/middleware/enforceModelSpec.spec.js

@@ -1,47 +0,0 @@
-// enforceModelSpec.test.js
-
-const enforceModelSpec = require('./enforceModelSpec');
-
-describe('enforceModelSpec function', () => {
-  test('returns true when all model specs match parsed body directly', () => {
-    const modelSpec = { preset: { title: 'Dialog', status: 'Active' } };
-    const parsedBody = { title: 'Dialog', status: 'Active' };
-    expect(enforceModelSpec(modelSpec, parsedBody)).toBe(true);
-  });
-
-  test('returns true when model specs match via interchangeable keys', () => {
-    const modelSpec = { preset: { chatGptLabel: 'GPT-4' } };
-    const parsedBody = { modelLabel: 'GPT-4' };
-    expect(enforceModelSpec(modelSpec, parsedBody)).toBe(true);
-  });
-
-  test('returns false if any key value does not match', () => {
-    const modelSpec = { preset: { language: 'English', level: 'Advanced' } };
-    const parsedBody = { language: 'Spanish', level: 'Advanced' };
-    expect(enforceModelSpec(modelSpec, parsedBody)).toBe(false);
-  });
-
-  test('ignores the \'endpoint\' key in model spec', () => {
-    const modelSpec = { preset: { endpoint: 'ignored', feature: 'Special' } };
-    const parsedBody = { feature: 'Special' };
-    expect(enforceModelSpec(modelSpec, parsedBody)).toBe(true);
-  });
-
-  test('handles nested objects correctly', () => {
-    const modelSpec = { preset: { details: { time: 'noon', location: 'park' } } };
-    const parsedBody = { details: { time: 'noon', location: 'park' } };
-    expect(enforceModelSpec(modelSpec, parsedBody)).toBe(true);
-  });
-
-  test('handles arrays within objects', () => {
-    const modelSpec = { preset: { tags: ['urgent', 'important'] } };
-    const parsedBody = { tags: ['urgent', 'important'] };
-    expect(enforceModelSpec(modelSpec, parsedBody)).toBe(true);
-  });
-
-  test('fails when arrays in objects do not match', () => {
-    const modelSpec = { preset: { tags: ['urgent', 'important'] } };
-    const parsedBody = { tags: ['important', 'urgent'] }; // Different order
-    expect(enforceModelSpec(modelSpec, parsedBody)).toBe(false);
-  });
-});

api/server/middleware/optionalJwtAuth.js

@@ -0,0 +1,17 @@
+const passport = require('passport');
+
+// This middleware does not require authentication,
+// but if the user is authenticated, it will set the user object.
+const optionalJwtAuth = (req, res, next) => {
+  passport.authenticate('jwt', { session: false }, (err, user) => {
+    if (err) {
+      return next(err);
+    }
+    if (user) {
+      req.user = user;
+    }
+    next();
+  })(req, res, next);
+};
+
+module.exports = optionalJwtAuth;

api/server/middleware/spec/validateImages.spec.js

@@ -3,6 +3,7 @@ const validateImageRequest = require('~/server/middleware/validateImageRequest')
 
 describe('validateImageRequest middleware', () => {
   let req, res, next;
+  const validObjectId = '65cfb246f7ecadb8b1e8036b';
 
   beforeEach(() => {
     req = {
@@ -43,7 +44,7 @@ describe('validateImageRequest middleware', () => {
 
   test('should return 403 if refresh token is expired', () => {
     const expiredToken = jwt.sign(
-      { id: '123', exp: Math.floor(Date.now() / 1000) - 3600 },
+      { id: validObjectId, exp: Math.floor(Date.now() / 1000) - 3600 },
       process.env.JWT_REFRESH_SECRET,
     );
     req.headers.cookie = `refreshToken=${expiredToken}`;
@@ -54,22 +55,34 @@ describe('validateImageRequest middleware', () => {
 
   test('should call next() for valid image path', () => {
     const validToken = jwt.sign(
-      { id: '123', exp: Math.floor(Date.now() / 1000) + 3600 },
+      { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
       process.env.JWT_REFRESH_SECRET,
     );
     req.headers.cookie = `refreshToken=${validToken}`;
-    req.originalUrl = '/images/123/example.jpg';
+    req.originalUrl = `/images/${validObjectId}/example.jpg`;
     validateImageRequest(req, res, next);
     expect(next).toHaveBeenCalled();
   });
 
   test('should return 403 for invalid image path', () => {
     const validToken = jwt.sign(
-      { id: '123', exp: Math.floor(Date.now() / 1000) + 3600 },
+      { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
       process.env.JWT_REFRESH_SECRET,
     );
     req.headers.cookie = `refreshToken=${validToken}`;
-    req.originalUrl = '/images/456/example.jpg';
+    req.originalUrl = '/images/65cfb246f7ecadb8b1e8036c/example.jpg'; // Different ObjectId
+    validateImageRequest(req, res, next);
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(res.send).toHaveBeenCalledWith('Access Denied');
+  });
+
+  test('should return 403 for invalid ObjectId format', () => {
+    const validToken = jwt.sign(
+      { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
+      process.env.JWT_REFRESH_SECRET,
+    );
+    req.headers.cookie = `refreshToken=${validToken}`;
+    req.originalUrl = '/images/123/example.jpg'; // Invalid ObjectId
     validateImageRequest(req, res, next);
     expect(res.status).toHaveBeenCalledWith(403);
     expect(res.send).toHaveBeenCalledWith('Access Denied');
@@ -78,16 +91,16 @@ describe('validateImageRequest middleware', () => {
   // File traversal tests
   test('should prevent file traversal attempts', () => {
     const validToken = jwt.sign(
-      { id: '123', exp: Math.floor(Date.now() / 1000) + 3600 },
+      { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
       process.env.JWT_REFRESH_SECRET,
     );
     req.headers.cookie = `refreshToken=${validToken}`;
 
     const traversalAttempts = [
-      '/images/123/../../../etc/passwd',
-      '/images/123/..%2F..%2F..%2Fetc%2Fpasswd',
-      '/images/123/image.jpg/../../../etc/passwd',
-      '/images/123/%2e%2e%2f%2e%2e%2f%2e%2e%2fetc%2fpasswd',
+      `/images/${validObjectId}/../../../etc/passwd`,
+      `/images/${validObjectId}/..%2F..%2F..%2Fetc%2Fpasswd`,
+      `/images/${validObjectId}/image.jpg/../../../etc/passwd`,
+      `/images/${validObjectId}/%2e%2e%2f%2e%2e%2f%2e%2e%2fetc%2fpasswd`,
     ];
 
     traversalAttempts.forEach((attempt) => {
@@ -101,11 +114,11 @@ describe('validateImageRequest middleware', () => {
 
   test('should handle URL encoded characters in valid paths', () => {
     const validToken = jwt.sign(
-      { id: '123', exp: Math.floor(Date.now() / 1000) + 3600 },
+      { id: validObjectId, exp: Math.floor(Date.now() / 1000) + 3600 },
       process.env.JWT_REFRESH_SECRET,
     );
     req.headers.cookie = `refreshToken=${validToken}`;
-    req.originalUrl = '/images/123/image%20with%20spaces.jpg';
+    req.originalUrl = `/images/${validObjectId}/image%20with%20spaces.jpg`;
     validateImageRequest(req, res, next);
     expect(next).toHaveBeenCalled();
   });

api/server/middleware/validateImageRequest.js

@@ -2,6 +2,24 @@ const cookies = require('cookie');
 const jwt = require('jsonwebtoken');
 const { logger } = require('~/config');
 
+const OBJECT_ID_LENGTH = 24;
+const OBJECT_ID_PATTERN = /^[0-9a-f]{24}$/i;
+
+/**
+ * Validates if a string is a valid MongoDB ObjectId
+ * @param {string} id - String to validate
+ * @returns {boolean} - Whether string is a valid ObjectId format
+ */
+function isValidObjectId(id) {
+  if (typeof id !== 'string') {
+    return false;
+  }
+  if (id.length !== OBJECT_ID_LENGTH) {
+    return false;
+  }
+  return OBJECT_ID_PATTERN.test(id);
+}
+
 /**
  * Middleware to validate image request.
  * Must be set by `secureImageLinks` via custom config file.
@@ -25,6 +43,11 @@ function validateImageRequest(req, res, next) {
     return res.status(403).send('Access Denied');
   }
 
+  if (!isValidObjectId(payload.id)) {
+    logger.warn('[validateImageRequest] Invalid User ID');
+    return res.status(403).send('Access Denied');
+  }
+
   const currentTimeInSeconds = Math.floor(Date.now() / 1000);
   if (payload.exp < currentTimeInSeconds) {
     logger.warn('[validateImageRequest] Refresh token expired');

api/server/routes/agents/chat.js

@@ -10,6 +10,7 @@ const {
 } = require('~/server/middleware');
 const { initializeClient } = require('~/server/services/Endpoints/agents');
 const AgentController = require('~/server/controllers/agents/request');
+const addTitle = require('~/server/services/Endpoints/agents/title');
 
 router.post('/abort', handleAbort());
 
@@ -28,7 +29,7 @@ router.post(
   buildEndpointOption,
   setHeaders,
   async (req, res, next) => {
-    await AgentController(req, res, next, initializeClient);
+    await AgentController(req, res, next, initializeClient, addTitle);
   },
 );
 

api/server/routes/agents/v1.js

@@ -2,6 +2,7 @@ const multer = require('multer');
 const express = require('express');
 const { PermissionTypes, Permissions } = require('librechat-data-provider');
 const { requireJwtAuth, generateCheckAccess } = require('~/server/middleware');
+const { getAvailableTools } = require('~/server/controllers/PluginController');
 const v1 = require('~/server/controllers/agents/v1');
 const actions = require('./actions');
 
@@ -36,9 +37,7 @@ router.use('/actions', actions);
  * @route GET /agents/tools
  * @returns {TPlugin[]} 200 - application/json
  */
-router.use('/tools', (req, res) => {
-  res.json([]);
-});
+router.use('/tools', getAvailableTools);
 
 /**
  * Creates an agent.

api/server/routes/banner.js

@@ -0,0 +1,15 @@
+const express = require('express');
+
+const { getBanner } = require('~/models/Banner');
+const optionalJwtAuth = require('~/server/middleware/optionalJwtAuth');
+const router = express.Router();
+
+router.get('/', optionalJwtAuth, async (req, res) => {
+  try {
+    res.status(200).send(await getBanner(req.user));
+  } catch (error) {
+    res.status(500).json({ message: 'Error getting banner' });
+  }
+});
+
+module.exports = router;

api/server/routes/bedrock/chat.js

@@ -10,7 +10,7 @@ const {
 } = require('~/server/middleware');
 const { initializeClient } = require('~/server/services/Endpoints/bedrock');
 const AgentController = require('~/server/controllers/agents/request');
-const addTitle = require('~/server/services/Endpoints/bedrock/title');
+const addTitle = require('~/server/services/Endpoints/agents/title');
 
 router.post('/abort', handleAbort());
 

api/server/routes/convos.js

@@ -109,8 +109,14 @@ router.post('/clear', async (req, res) => {
 router.post('/update', async (req, res) => {
   const update = req.body.arg;
 
+  if (!update.conversationId) {
+    return res.status(400).json({ error: 'conversationId is required' });
+  }
+
   try {
-    const dbResponse = await saveConvo(req, update, { context: 'POST /api/convos/update' });
+    const dbResponse = await saveConvo(req, update, {
+      context: `POST /api/convos/update ${update.conversationId}`,
+    });
     res.status(201).json(dbResponse);
   } catch (error) {
     logger.error('Error updating conversation', error);

api/server/routes/files/files.js

@@ -1,18 +1,22 @@
 const fs = require('fs').promises;
 const express = require('express');
+const { EnvVar } = require('@librechat/agents');
 const {
   isUUID,
-  checkOpenAIStorage,
   FileSources,
   EModelEndpoint,
+  isAgentsEndpoint,
+  checkOpenAIStorage,
 } = require('librechat-data-provider');
 const {
   filterFile,
   processFileUpload,
   processDeleteRequest,
+  processAgentFileUpload,
 } = require('~/server/services/Files/process');
 const { getStrategyFunctions } = require('~/server/services/Files/strategies');
 const { getOpenAIClient } = require('~/server/controllers/assistants/helpers');
+const { loadAuthValues } = require('~/app/clients/tools/util');
 const { getFiles } = require('~/models/File');
 const { logger } = require('~/config');
 
@@ -62,8 +66,20 @@ router.delete('/', async (req, res) => {
       return;
     }
 
-    await processDeleteRequest({ req, files });
+    const fileIds = files.map((file) => file.file_id);
+    const userFiles = await getFiles({ file_id: { $in: fileIds }, user: req.user.id });
+    if (userFiles.length !== files.length) {
+      return res.status(403).json({ message: 'You can only delete your own files' });
+    }
 
+    await processDeleteRequest({ req, files: userFiles });
+
+    logger.debug(
+      `[/files] Files deleted successfully: ${files
+        .filter((f) => f.file_id)
+        .map((f) => f.file_id)
+        .join(', ')}`,
+    );
     res.status(200).json({ message: 'Files deleted successfully' });
   } catch (error) {
     logger.error('[/files] Error deleting files:', error);
@@ -71,6 +87,36 @@ router.delete('/', async (req, res) => {
   }
 });
 
+router.get('/code/download/:sessionId/:fileId', async (req, res) => {
+  try {
+    const { sessionId, fileId } = req.params;
+    const logPrefix = `Session ID: ${sessionId} | File ID: ${fileId} | Code output download requested by user `;
+    logger.debug(logPrefix);
+
+    if (!sessionId || !fileId) {
+      return res.status(400).send('Bad request');
+    }
+
+    const { getDownloadStream } = getStrategyFunctions(FileSources.execute_code);
+    if (!getDownloadStream) {
+      logger.warn(
+        `${logPrefix} has no stream method implemented for ${FileSources.execute_code} source`,
+      );
+      return res.status(501).send('Not Implemented');
+    }
+
+    const result = await loadAuthValues({ userId: req.user.id, authFields: [EnvVar.CODE_API_KEY] });
+
+    /** @type {AxiosResponse<ReadableStream> | undefined} */
+    const response = await getDownloadStream(`${sessionId}/${fileId}`, result[EnvVar.CODE_API_KEY]);
+    res.set(response.headers);
+    response.data.pipe(res);
+  } catch (error) {
+    logger.error('Error downloading file:', error);
+    res.status(500).send('Error downloading file');
+  }
+});
+
 router.get('/download/:userId/:file_id', async (req, res) => {
   try {
     const { userId, file_id } = req.params;
@@ -154,6 +200,10 @@ router.post('/', async (req, res) => {
     metadata.temp_file_id = metadata.file_id;
     metadata.file_id = req.file_id;
 
+    if (isAgentsEndpoint(metadata.endpoint)) {
+      return await processAgentFileUpload({ req, res, file, metadata });
+    }
+
     await processFileUpload({ req, res, file, metadata });
   } catch (error) {
     let message = 'Error processing file';
@@ -177,7 +227,7 @@ router.post('/', async (req, res) => {
     try {
       await fs.unlink(file.path);
     } catch (error) {
-      logger.error('[/files/images] Error deleting file after file processing:', error);
+      logger.error('[/files] Error deleting file after file processing:', error);
     }
   }
 });

api/server/routes/index.js

@@ -24,6 +24,7 @@ const edit = require('./edit');
 const keys = require('./keys');
 const user = require('./user');
 const ask = require('./ask');
+const banner = require('./banner');
 
 module.exports = {
   ask,
@@ -52,4 +53,5 @@ module.exports = {
   assistants,
   categories,
   staticRoute,
+  banner,
 };

api/server/routes/prompts.js

@@ -134,7 +134,7 @@ const createPrompt = async (req, res) => {
   }
 };
 
-router.post('/', createPrompt);
+router.post('/', checkPromptCreate, createPrompt);
 
 /**
  * Updates a prompt group

api/server/routes/tags.js

@@ -61,7 +61,8 @@ router.post('/', async (req, res) => {
  */
 router.put('/:tag', async (req, res) => {
   try {
-    const tag = await updateConversationTag(req.user.id, req.params.tag, req.body);
+    const decodedTag = decodeURIComponent(req.params.tag);
+    const tag = await updateConversationTag(req.user.id, decodedTag, req.body);
     if (tag) {
       res.status(200).json(tag);
     } else {
@@ -81,7 +82,8 @@ router.put('/:tag', async (req, res) => {
  */
 router.delete('/:tag', async (req, res) => {
   try {
-    const tag = await deleteConversationTag(req.user.id, req.params.tag);
+    const decodedTag = decodeURIComponent(req.params.tag);
+    const tag = await deleteConversationTag(req.user.id, decodedTag);
     if (tag) {
       res.status(200).json(tag);
     } else {

api/server/services/AppService.js

@@ -8,6 +8,7 @@ const { loadDefaultInterface } = require('./start/interface');
 const { azureConfigSetup } = require('./start/azureOpenAI');
 const { loadAndFormatTools } = require('./ToolService');
 const { initializeRoles } = require('~/models/Role');
+const { cleanup } = require('./cleanup');
 const paths = require('~/config/paths');
 
 /**
@@ -17,6 +18,7 @@ const paths = require('~/config/paths');
  * @param {Express.Application} app - The Express application object.
  */
 const AppService = async (app) => {
+  cleanup();
   await initializeRoles();
   /** @type {TCustomConfig}*/
   const config = (await loadCustomConfig()) ?? {};

api/server/services/AuthService.js

@@ -11,7 +11,7 @@ const {
   deleteUserById,
 } = require('~/models/userMethods');
 const { createToken, findToken, deleteTokens, Session } = require('~/models');
-const { sendEmail, checkEmailConfig } = require('~/server/utils');
+const { isEnabled, checkEmailConfig, sendEmail } = require('~/server/utils');
 const { registerSchema } = require('~/strategies/validators');
 const { hashToken } = require('~/server/utils/crypto');
 const isDomainAllowed = require('./isDomainAllowed');
@@ -188,7 +188,8 @@ const registerUser = async (user, additionalData = {}) => {
     };
 
     const emailEnabled = checkEmailConfig();
-    const newUser = await createUser(newUserData, false, true);
+    const disableTTL = isEnabled(process.env.ALLOW_UNVERIFIED_EMAIL_LOGIN);
+    const newUser = await createUser(newUserData, disableTTL, true);
     newUserId = newUser._id;
     if (emailEnabled && !newUser.emailVerified) {
       await sendVerificationEmail({

api/server/services/Config/EndpointService.js

@@ -45,8 +45,14 @@ module.exports = {
       AZURE_ASSISTANTS_BASE_URL,
       EModelEndpoint.azureAssistants,
     ),
-    [EModelEndpoint.bedrock]: generateConfig(process.env.BEDROCK_AWS_SECRET_ACCESS_KEY),
+    [EModelEndpoint.bedrock]: generateConfig(
+      process.env.BEDROCK_AWS_SECRET_ACCESS_KEY ?? process.env.BEDROCK_AWS_DEFAULT_REGION,
+    ),
     /* key will be part of separate config */
-    [EModelEndpoint.agents]: generateConfig(process.env.I_AM_A_TEAPOT),
+    [EModelEndpoint.agents]: generateConfig(
+      process.env.EXPERIMENTAL_AGENTS,
+      undefined,
+      EModelEndpoint.agents,
+    ),
   },
 };

api/server/services/Endpoints/agents/build.js

@@ -1,13 +1,12 @@
-const { getAgent } = require('~/models/Agent');
+const { loadAgent } = require('~/models/Agent');
 const { logger } = require('~/config');
 
 const buildOptions = (req, endpoint, parsedBody) => {
   const { agent_id, instructions, spec, ...model_parameters } = parsedBody;
 
-  const agentPromise = getAgent({
-    id: agent_id,
-    // TODO: better author handling
-    author: req.user.id,
+  const agentPromise = loadAgent({
+    req,
+    agent_id,
   }).catch((error) => {
     logger.error(`[/agents/:${agent_id}] Error retrieving agent during build options step`, error);
     return undefined;

api/server/services/Endpoints/agents/initialize.js

@@ -14,14 +14,16 @@ const { tool } = require('@langchain/core/tools');
 const { createContentAggregator } = require('@librechat/agents');
 const {
   EModelEndpoint,
-  providerEndpointMap,
   getResponseSender,
+  providerEndpointMap,
 } = require('librechat-data-provider');
-const { getDefaultHandlers } = require('~/server/controllers/agents/callbacks');
-// for testing purposes
-// const createTavilySearchTool = require('~/app/clients/tools/structured/TavilySearch');
-const initAnthropic = require('~/server/services/Endpoints/anthropic/initializeClient');
-const initOpenAI = require('~/server/services/Endpoints/openAI/initializeClient');
+const {
+  getDefaultHandlers,
+  createToolEndCallback,
+} = require('~/server/controllers/agents/callbacks');
+const initAnthropic = require('~/server/services/Endpoints/anthropic/initialize');
+const initOpenAI = require('~/server/services/Endpoints/openAI/initialize');
+const getBedrockOptions = require('~/server/services/Endpoints/bedrock/options');
 const { loadAgentTools } = require('~/server/services/ToolService');
 const AgentClient = require('~/server/controllers/agents/client');
 const { getModelMaxTokens } = require('~/utils');
@@ -50,6 +52,7 @@ const providerConfigMap = {
   [EModelEndpoint.openAI]: initOpenAI,
   [EModelEndpoint.azureOpenAI]: initOpenAI,
   [EModelEndpoint.anthropic]: initAnthropic,
+  [EModelEndpoint.bedrock]: getBedrockOptions,
 };
 
 const initializeClient = async ({ req, res, endpointOption }) => {
@@ -58,34 +61,33 @@ const initializeClient = async ({ req, res, endpointOption }) => {
   }
 
   // TODO: use endpointOption to determine options/modelOptions
+  /** @type {Array<UsageMetadata>} */
+  const collectedUsage = [];
+  /** @type {ArtifactPromises} */
+  const artifactPromises = [];
   const { contentParts, aggregateContent } = createContentAggregator();
-  const eventHandlers = getDefaultHandlers({ res, aggregateContent });
-
-  // const tools = [createTavilySearchTool()];
-  // const tools = [_getWeather];
-  // const tool_calls = [{ name: 'getPeople_action_swapi---dev' }];
-  // const tool_calls = [{ name: 'dalle' }];
-  // const tool_calls = [{ name: 'getItmOptions_action_YWlhcGkzLn' }];
-  // const tool_calls = [{ name: 'tavily_search_results_json' }];
-  // const tool_calls = [
-  //   { name: 'searchListings_action_emlsbG93NT' },
-  //   { name: 'searchAddress_action_emlsbG93NT' },
-  //   { name: 'searchMLS_action_emlsbG93NT' },
-  //   { name: 'searchCoordinates_action_emlsbG93NT' },
-  //   { name: 'searchUrl_action_emlsbG93NT' },
-  //   { name: 'getPropertyDetails_action_emlsbG93NT' },
-  // ];
+  const toolEndCallback = createToolEndCallback({ req, res, artifactPromises });
+  const eventHandlers = getDefaultHandlers({
+    res,
+    aggregateContent,
+    toolEndCallback,
+    collectedUsage,
+  });
 
   if (!endpointOption.agent) {
     throw new Error('No agent promise provided');
   }
 
-  /** @type {Agent} */
+  /** @type {Agent | null} */
   const agent = await endpointOption.agent;
+  if (!agent) {
+    throw new Error('Agent not found');
+  }
   const { tools, toolMap } = await loadAgentTools({
     req,
     tools: agent.tools,
     agent_id: agent.id,
+    tool_resources: agent.tool_resources,
     // openAIApiKey: process.env.OPENAI_API_KEY,
   });
 
@@ -121,8 +123,11 @@ const initializeClient = async ({ req, res, endpointOption }) => {
     contentParts,
     modelOptions,
     eventHandlers,
+    collectedUsage,
+    artifactPromises,
     endpoint: EModelEndpoint.agents,
     configOptions: options.configOptions,
+    attachments: endpointOption.attachments,
     maxContextTokens:
       agent.max_context_tokens ??
       getModelMaxTokens(modelOptions.model, providerEndpointMap[agent.provider]),

api/server/services/Endpoints/agents/title.js

@@ -33,7 +33,7 @@ const addTitle = async (req, { text, response, client }) => {
       conversationId: response.conversationId,
       title,
     },
-    { context: 'api/server/services/Endpoints/bedrock/title.js' },
+    { context: 'api/server/services/Endpoints/agents/title.js' },
   );
 };
 

api/server/services/Endpoints/anthropic/index.js

@@ -1,6 +1,6 @@
-const addTitle = require('./addTitle');
-const buildOptions = require('./buildOptions');
-const initializeClient = require('./initializeClient');
+const addTitle = require('./title');
+const buildOptions = require('./build');
+const initializeClient = require('./initialize');
 
 module.exports = {
   addTitle,

api/server/services/Endpoints/assistants/index.js

@@ -1,6 +1,6 @@
-const addTitle = require('./addTitle');
-const buildOptions = require('./buildOptions');
-const initializeClient = require('./initializeClient');
+const addTitle = require('./title');
+const buildOptions = require('./build');
+const initializeClient = require('./initalize');
 
 module.exports = {
   addTitle,

api/server/services/Endpoints/assistants/initialize.spec.js

@@ -2,7 +2,7 @@
 const { HttpsProxyAgent } = require('https-proxy-agent');
 const { ErrorTypes } = require('librechat-data-provider');
 const { getUserKey, getUserKeyExpiry, getUserKeyValues } = require('~/server/services/UserService');
-const initializeClient = require('./initializeClient');
+const initializeClient = require('./initalize');
 // const { OpenAIClient } = require('~/app');
 
 jest.mock('~/server/services/UserService', () => ({

api/server/services/Endpoints/azureAssistants/index.js

@@ -1,5 +1,5 @@
-const buildOptions = require('./buildOptions');
-const initializeClient = require('./initializeClient');
+const buildOptions = require('./build');
+const initializeClient = require('./initialize');
 
 module.exports = {
   buildOptions,

api/server/services/Endpoints/azureAssistants/initialize.spec.js

@@ -2,7 +2,7 @@
 const { HttpsProxyAgent } = require('https-proxy-agent');
 const { ErrorTypes } = require('librechat-data-provider');
 const { getUserKey, getUserKeyExpiry, getUserKeyValues } = require('~/server/services/UserService');
-const initializeClient = require('./initializeClient');
+const initializeClient = require('./initialize');
 // const { OpenAIClient } = require('~/app');
 
 jest.mock('~/server/services/UserService', () => ({

api/server/services/Endpoints/bedrock/options.js

@@ -19,7 +19,7 @@ const getOptions = async ({ req, endpointOption }) => {
   const expiresAt = req.body.key;
   const isUserProvided = BEDROCK_AWS_SECRET_ACCESS_KEY === AuthType.USER_PROVIDED;
 
-  const credentials = isUserProvided
+  let credentials = isUserProvided
     ? await getUserKey({ userId: req.user.id, name: EModelEndpoint.bedrock })
     : {
       accessKeyId: BEDROCK_AWS_ACCESS_KEY_ID,
@@ -30,6 +30,14 @@ const getOptions = async ({ req, endpointOption }) => {
     throw new Error('Bedrock credentials not provided. Please provide them again.');
   }
 
+  if (
+    !isUserProvided &&
+    (credentials.accessKeyId === undefined || credentials.accessKeyId === '') &&
+    (credentials.secretAccessKey === undefined || credentials.secretAccessKey === '')
+  ) {
+    credentials = undefined;
+  }
+
   if (expiresAt && isUserProvided) {
     checkUserKeyExpiry(expiresAt, EModelEndpoint.bedrock);
   }
@@ -53,7 +61,6 @@ const getOptions = async ({ req, endpointOption }) => {
   /** @type {import('@librechat/agents').BedrockConverseClientOptions} */
   const requestOptions = Object.assign(
     {
-      credentials,
       model: endpointOption.model,
       region: BEDROCK_AWS_DEFAULT_REGION,
       streaming: true,
@@ -72,6 +79,10 @@ const getOptions = async ({ req, endpointOption }) => {
     endpointOption.model_parameters,
   );
 
+  if (credentials) {
+    requestOptions.credentials = credentials;
+  }
+
   const configOptions = {};
   if (PROXY) {
     configOptions.httpAgent = new HttpsProxyAgent(PROXY);

api/server/services/Endpoints/custom/build.js

@@ -3,6 +3,7 @@ const generateArtifactsPrompt = require('~/app/clients/prompts/artifacts');
 
 const buildOptions = (endpoint, parsedBody, endpointType) => {
   const {
+    modelLabel,
     chatGptLabel,
     promptPrefix,
     maxContextTokens,
@@ -17,6 +18,7 @@ const buildOptions = (endpoint, parsedBody, endpointType) => {
   const endpointOption = removeNullishValues({
     endpoint,
     endpointType,
+    modelLabel,
     chatGptLabel,
     promptPrefix,
     resendFiles,

api/server/services/Endpoints/custom/index.js

@@ -1,5 +1,5 @@
-const initializeClient = require('./initializeClient');
-const buildOptions = require('./buildOptions');
+const initializeClient = require('./initialize');
+const buildOptions = require('./build');
 
 module.exports = {
   initializeClient,

api/server/services/Endpoints/google/index.js

@@ -1,6 +1,6 @@
-const addTitle = require('./addTitle');
-const buildOptions = require('./buildOptions');
-const initializeClient = require('./initializeClient');
+const addTitle = require('./title');
+const buildOptions = require('./build');
+const initializeClient = require('./initialize');
 
 module.exports = {
   addTitle,

api/server/services/Endpoints/google/initialize.spec.js

@@ -1,6 +1,6 @@
 // file deepcode ignore HardcodedNonCryptoSecret: No hardcoded secrets
 const { getUserKey } = require('~/server/services/UserService');
-const initializeClient = require('./initializeClient');
+const initializeClient = require('./initialize');
 const { GoogleClient } = require('~/app');
 
 jest.mock('~/server/services/UserService', () => ({

api/server/services/Endpoints/google/title.js

@@ -3,7 +3,7 @@ const getLogStores = require('~/cache/getLogStores');
 const { isEnabled } = require('~/server/utils');
 const { saveConvo } = require('~/models');
 const { logger } = require('~/config');
-const initializeClient = require('./initializeClient');
+const initializeClient = require('./initialize');
 
 const addTitle = async (req, { text, response, client }) => {
   const { TITLE_CONVO = 'true' } = process.env ?? {};

api/server/services/Endpoints/gptPlugins/build.js

@@ -3,6 +3,7 @@ const generateArtifactsPrompt = require('~/app/clients/prompts/artifacts');
 
 const buildOptions = (endpoint, parsedBody) => {
   const {
+    modelLabel,
     chatGptLabel,
     promptPrefix,
     agentOptions,
@@ -16,10 +17,10 @@ const buildOptions = (endpoint, parsedBody) => {
   } = parsedBody;
   const endpointOption = removeNullishValues({
     endpoint,
-    tools:
-      tools
-        .map((tool) => tool?.pluginKey ?? tool)
-        .filter((toolName) => typeof toolName === 'string'),
+    tools: tools
+      .map((tool) => tool?.pluginKey ?? tool)
+      .filter((toolName) => typeof toolName === 'string'),
+    modelLabel,
     chatGptLabel,
     promptPrefix,
     agentOptions,

api/server/services/Endpoints/gptPlugins/index.js

@@ -1,5 +1,5 @@
-const buildOptions = require('./buildOptions');
-const initializeClient = require('./initializeClient');
+const buildOptions = require('./build');
+const initializeClient = require('./initialize');
 
 module.exports = {
   buildOptions,

api/server/services/Endpoints/gptPlugins/initialize.spec.js

@@ -1,7 +1,7 @@
 // gptPlugins/initializeClient.spec.js
 const { EModelEndpoint, ErrorTypes, validateAzureGroups } = require('librechat-data-provider');
 const { getUserKey, getUserKeyValues } = require('~/server/services/UserService');
-const initializeClient = require('./initializeClient');
+const initializeClient = require('./initialize');
 const { PluginsClient } = require('~/app');
 
 // Mock getUserKey since it's the only function we want to mock

api/server/services/Endpoints/openAI/build.js

@@ -3,6 +3,7 @@ const generateArtifactsPrompt = require('~/app/clients/prompts/artifacts');
 
 const buildOptions = (endpoint, parsedBody) => {
   const {
+    modelLabel,
     chatGptLabel,
     promptPrefix,
     maxContextTokens,
@@ -17,6 +18,7 @@ const buildOptions = (endpoint, parsedBody) => {
 
   const endpointOption = removeNullishValues({
     endpoint,
+    modelLabel,
     chatGptLabel,
     promptPrefix,
     resendFiles,

api/server/services/Endpoints/openAI/index.js

@@ -1,6 +1,6 @@
-const addTitle = require('./addTitle');
-const buildOptions = require('./buildOptions');
-const initializeClient = require('./initializeClient');
+const addTitle = require('./title');
+const buildOptions = require('./build');
+const initializeClient = require('./initialize');
 
 module.exports = {
   addTitle,

api/server/services/Endpoints/openAI/initialize.js

@@ -130,7 +130,7 @@ const initializeClient = async ({
   if (optionsOnly) {
     const requestOptions = Object.assign(
       {
-        modelOptions: endpointOption.modelOptions,
+        modelOptions: endpointOption.model_parameters,
       },
       clientOptions,
     );