🚧 WIP: Merge Dev Build (#4611)

* refactor: Agent CodeFiles, abortUpload WIP

* feat: code environment file upload

* refactor: useLazyEffect

* refactor:
- Add `watch` from `useFormContext` to check if code execution is enabled
- Disable file upload button if `agent_id` is not selected or code execution is disabled

* WIP: primeCodeFiles; refactor: rename sessionId to session_id for uniformity

* Refactor: Rename session_id to sessionId for uniformity in AuthService.js

* chore: bump @librechat/agents to version 1.7.1

* WIP: prime code files

* refactor: Update code env file upload method to use read stream

* feat: reupload code env file if no longer active

* refactor: isAssistantTool -> isEntityTool + address type issues

* feat: execute code tool hook

* refactor: Rename isPluginAuthenticated to checkPluginAuth in PluginController.js

* refactor: Update PluginController.js to use AuthType constant for comparison

* feat: verify tool authentication (execute_code)

* feat: enter librechat_code_api_key

* refactor: Remove unused imports in BookmarkForm.tsx

* feat: authenticate code tool

* refactor: Update Action.tsx to conditionally render the key and revoke key buttons

* refactor(Code/Action): prevent uncheck-able 'Run Code' capability when key is revoked

* refactor(Code/Action): Update Action.tsx to conditionally render the key and revoke key buttons

* fix: agent file upload edge cases

* chore: bump @librechat/agents

* fix: custom endpoint providerValue icon

* feat: ollama meta modal token values + context

* feat: ollama agents

* refactor: Update token models for Ollama models

* chore: Comment out CodeForm

* refactor: Update token models for Ollama and Meta models

api/server/controllers/PluginController.js

@@ -1,5 +1,5 @@
 const { promises: fs } = require('fs');
-const { CacheKeys } = require('librechat-data-provider');
+const { CacheKeys, AuthType } = require('librechat-data-provider');
 const { addOpenAPISpecs } = require('~/app/clients/tools/util/addOpenAPISpecs');
 const { getLogStores } = require('~/cache');
 
@@ -25,7 +25,7 @@ const filterUniquePlugins = (plugins) => {
  * @param {TPlugin} plugin The plugin object containing the authentication configuration.
  * @returns {boolean} True if the plugin is authenticated for all required fields, false otherwise.
  */
-const isPluginAuthenticated = (plugin) => {
+const checkPluginAuth = (plugin) => {
   if (!plugin.authConfig || plugin.authConfig.length === 0) {
     return false;
   }
@@ -36,7 +36,7 @@ const isPluginAuthenticated = (plugin) => {
 
     for (const fieldOption of authFieldOptions) {
       const envValue = process.env[fieldOption];
-      if (envValue && envValue.trim() !== '' && envValue !== 'user_provided') {
+      if (envValue && envValue.trim() !== '' && envValue !== AuthType.USER_PROVIDED) {
         isFieldAuthenticated = true;
         break;
       }
@@ -64,7 +64,7 @@ const getAvailablePluginsController = async (req, res) => {
     let authenticatedPlugins = [];
     for (const plugin of uniquePlugins) {
       authenticatedPlugins.push(
-        isPluginAuthenticated(plugin) ? { ...plugin, authenticated: true } : plugin,
+        checkPluginAuth(plugin) ? { ...plugin, authenticated: true } : plugin,
       );
     }
 
@@ -111,7 +111,7 @@ const getAvailableTools = async (req, res) => {
     const uniquePlugins = filterUniquePlugins(jsonData);
 
     const authenticatedPlugins = uniquePlugins.map((plugin) => {
-      if (isPluginAuthenticated(plugin)) {
+      if (checkPluginAuth(plugin)) {
         return { ...plugin, authenticated: true };
       } else {
         return plugin;

api/server/controllers/UserController.js

@@ -61,10 +61,10 @@ const deleteUserFiles = async (req) => {
 
 const updateUserPluginsController = async (req, res) => {
   const { user } = req;
-  const { pluginKey, action, auth, isAssistantTool } = req.body;
+  const { pluginKey, action, auth, isEntityTool } = req.body;
   let authService;
   try {
-    if (!isAssistantTool) {
+    if (!isEntityTool) {
       const userPluginsService = await updateUserPluginsService(user, pluginKey, action);
 
       if (userPluginsService instanceof Error) {

api/server/controllers/agents/callbacks.js

@@ -1,6 +1,12 @@
 const { Tools } = require('librechat-data-provider');
-const { GraphEvents, ToolEndHandler, ChatModelStreamHandler } = require('@librechat/agents');
+const {
+  EnvVar,
+  GraphEvents,
+  ToolEndHandler,
+  ChatModelStreamHandler,
+} = require('@librechat/agents');
 const { processCodeOutput } = require('~/server/services/Files/Code/process');
+const { loadAuthValues } = require('~/app/clients/tools/util');
 const { logger } = require('~/config');
 
 /** @typedef {import('@librechat/agents').Graph} Graph */
@@ -158,13 +164,18 @@ function createToolEndCallback({ req, res, artifactPromises }) {
       const { id, name } = file;
       artifactPromises.push(
         (async () => {
+          const result = await loadAuthValues({
+            userId: req.user.id,
+            authFields: [EnvVar.CODE_API_KEY],
+          });
           const fileMetadata = await processCodeOutput({
             req,
             id,
             name,
+            apiKey: result[EnvVar.CODE_API_KEY],
             toolCallId: tool_call_id,
             messageId: metadata.run_id,
-            sessionId: artifact.session_id,
+            session_id: artifact.session_id,
             conversationId: metadata.thread_id,
           });
           if (!res.headersSent) {

api/server/controllers/agents/client.js

@@ -15,7 +15,6 @@ const {
   EModelEndpoint,
   anthropicSchema,
   bedrockOutputParser,
-  providerEndpointMap,
   removeNullishValues,
 } = require('librechat-data-provider');
 const {
@@ -465,7 +464,6 @@ class AgentClient extends BaseClient {
 
       const config = {
         configurable: {
-          provider: providerEndpointMap[this.options.agent.provider],
           thread_id: this.conversationId,
         },
         signal: abortController.signal,

api/server/controllers/agents/run.js

@@ -35,9 +35,10 @@ async function createRun({
   streaming = true,
   streamUsage = true,
 }) {
+  const provider = providerEndpointMap[agent.provider] ?? agent.provider;
   const llmConfig = Object.assign(
     {
-      provider: providerEndpointMap[agent.provider],
+      provider,
       streaming,
       streamUsage,
     },

api/server/controllers/tools.js

@@ -0,0 +1,53 @@
+const { EnvVar } = require('@librechat/agents');
+const { Tools, AuthType } = require('librechat-data-provider');
+const { loadAuthValues } = require('~/app/clients/tools/util');
+
+const fieldsMap = {
+  [Tools.execute_code]: [EnvVar.CODE_API_KEY],
+};
+
+/**
+ * @param {ServerRequest} req - The request object, containing information about the HTTP request.
+ * @param {ServerResponse} res - The response object, used to send back the desired HTTP response.
+ * @returns {Promise<void>} A promise that resolves when the function has completed.
+ */
+const verifyToolAuth = async (req, res) => {
+  try {
+    const { toolId } = req.params;
+    const authFields = fieldsMap[toolId];
+    if (!authFields) {
+      res.status(404).json({ message: 'Tool not found' });
+      return;
+    }
+    let result;
+    try {
+      result = await loadAuthValues({
+        userId: req.user.id,
+        authFields,
+      });
+    } catch (error) {
+      res.status(200).json({ authenticated: false, message: AuthType.USER_PROVIDED });
+      return;
+    }
+    let isUserProvided = false;
+    for (const field of authFields) {
+      if (!result[field]) {
+        res.status(200).json({ authenticated: false, message: AuthType.USER_PROVIDED });
+        return;
+      }
+      if (!isUserProvided && process.env[field] !== result[field]) {
+        isUserProvided = true;
+      }
+    }
+    res.status(200).json({
+      authenticated: true,
+      message: isUserProvided ? AuthType.USER_PROVIDED : AuthType.SYSTEM_DEFINED,
+    });
+  } catch (error) {
+    res.status(500).json({ message: error.message });
+  }
+};
+
+module.exports = {
+  verifyToolAuth,
+};