Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🪨 feat: AWS Bedrock support (#3935)
Danny Avilad59b62174f4b
diff --git a/.env.example b/.env.exampleindex 103728fe0c..5f2d157422 100644--- a/.env.example+++ b/.env.example@@ -111,6 +111,23 @@ ANTHROPIC_API_KEY=user_providedBINGAI_TOKEN=user_provided# BINGAI_HOST=https://cn.bing.com+#=================#+# AWS Bedrock #+#=================#++# BEDROCK_AWS_DEFAULT_REGION=us-east-1 # A default region must be provided+# BEDROCK_AWS_ACCESS_KEY_ID=someAccessKey+# BEDROCK_AWS_SECRET_ACCESS_KEY=someSecretAccessKey++# Note: This example list is not meant to be exhaustive. If omitted, all known, supported model IDs will be included for you.+# BEDROCK_AWS_MODELS=anthropic.claude-3-5-sonnet-20240620-v1:0,meta.llama3-1-8b-instruct-v1:0++# See all Bedrock model IDs here: https://docs.aws.amazon.com/bedrock/latest/userguide/model-ids.html#model-ids-arns++# Notes on specific models:+# 'ai21.j2-mid-v1', # Not supported, as it doesn't support streaming+# 'ai21.j2-ultra-v1', # Not supported, as it doesn't support conversation history+#============## Google ##============#diff --git a/api/app/clients/BaseClient.js b/api/app/clients/BaseClient.jsindex 7640388060..972716ee08 100644--- a/api/app/clients/BaseClient.js+++ b/api/app/clients/BaseClient.js@@ -2,6 +2,7 @@ const crypto = require('crypto');const fetch = require('node-fetch');const {supportsBalanceCheck,+ isAgentsEndpoint,ErrorTypes,Constants,CacheKeys,@@ -66,6 +67,17 @@ class BaseClient {throw new Error('Subclasses attempted to call summarizeMessages without implementing it');}+ /**+ * @returns {string}+ */+ getResponseModel() {+ if (isAgentsEndpoint(this.options.endpoint) && this.options.agent && this.options.agent.id) {+ return this.options.agent.id;+ }++ return this.modelOptions.model;+ }+/*** Abstract method to get the token count for a message. Subclasses must implement this method.* @param {TMessage} responseMessage@@ -217,6 +229,7 @@ class BaseClient {userMessage,conversationId,responseMessageId,+ sender: this.sender,});}@@ -557,7 +570,7 @@ class BaseClient {parentMessageId: userMessage.messageId,isCreatedByUser: false,isEdited,- model: this.modelOptions.model,+ model: this.getResponseModel(),sender: this.sender,promptTokens,iconURL: this.options.iconURL,diff --git a/api/app/clients/prompts/formatMessages.js b/api/app/clients/prompts/formatMessages.jsindex 87d5ba7a15..a5ed05c645 100644--- a/api/app/clients/prompts/formatMessages.js+++ b/api/app/clients/prompts/formatMessages.js@@ -170,7 +170,15 @@ const formatAgentMessages = (payload) => {}// Note: `tool_calls` list is defined when constructed by `AIMessage` class, and outputs should be excluded from it- const { output, ...tool_call } = part.tool_call;+ const { output, args: _args, ...tool_call } = part.tool_call;+ // TODO: investigate; args as dictionary may need to be provider-or-tool-specific+ let args = _args;+ try {+ args = JSON.parse(args);+ } catch (e) {+ // failed to parse, leave as is+ }+ tool_call.args = args;lastAIMessage.tool_calls.push(tool_call);// Add the corresponding ToolMessagediff --git a/api/app/clients/specs/BaseClient.test.js b/api/app/clients/specs/BaseClient.test.jsindex e3cc1515c5..0fdc6ce16c 100644--- a/api/app/clients/specs/BaseClient.test.js+++ b/api/app/clients/specs/BaseClient.test.js@@ -565,11 +565,13 @@ describe('BaseClient', () => {const getReqData = jest.fn();const opts = { getReqData };const response = await TestClient.sendMessage('Hello, world!', opts);- expect(getReqData).toHaveBeenCalledWith({- userMessage: expect.objectContaining({ text: 'Hello, world!' }),- conversationId: response.conversationId,- responseMessageId: response.messageId,- });+ expect(getReqData).toHaveBeenCalledWith(+ expect.objectContaining({+ userMessage: expect.objectContaining({ text: 'Hello, world!' }),+ conversationId: response.conversationId,+ responseMessageId: response.messageId,+ }),+ );});test('onStart is called with the correct arguments', async () => {diff --git a/api/models/Action.js b/api/models/Action.jsindex 7971f3e61a..299b3bf20a 100644--- a/api/models/Action.js+++ b/api/models/Action.js@@ -5,17 +5,16 @@ const Action = mongoose.model('action', actionSchema);/*** Update an action with new data without overwriting existing properties,- * or create a new action if it doesn't exist, within a transaction session if provided.+ * or create a new action if it doesn't exist.** @param {Object} searchParams - The search parameters to find the action to update.* @param {string} searchParams.action_id - The ID of the action to update.* @param {string} searchParams.user - The user ID of the action's author.* @param {Object} updateData - An object containing the properties to update.- * @param {mongoose.ClientSession} [session] - The transaction session to use.* @returns {Promise<Action>} The updated or newly created action document as a plain object.*/-const updateAction = async (searchParams, updateData, session = null) => {- const options = { new: true, upsert: true, session };+const updateAction = async (searchParams, updateData) => {+ const options = { new: true, upsert: true };return await Action.findOneAndUpdate(searchParams, updateData, options).lean();};@@ -49,31 +48,27 @@ const getActions = async (searchParams, includeSensitive = false) => {};/**- * Deletes an action by params, within a transaction session if provided.+ * Deletes an action by params.** @param {Object} searchParams - The search parameters to find the action to delete.* @param {string} searchParams.action_id - The ID of the action to delete.* @param {string} searchParams.user - The user ID of the action's author.- * @param {mongoose.ClientSession} [session] - The transaction session to use (optional).* @returns {Promise<Action>} A promise that resolves to the deleted action document as a plain object, or null if no document was found.*/-const deleteAction = async (searchParams, session = null) => {- const options = session ? { session } : {};- return await Action.findOneAndDelete(searchParams, options).lean();+const deleteAction = async (searchParams) => {+ return await Action.findOneAndDelete(searchParams).lean();};/**- * Deletes actions by params, within a transaction session if provided.+ * Deletes actions by params.** @param {Object} searchParams - The search parameters to find the actions to delete.* @param {string} searchParams.action_id - The ID of the action(s) to delete.* @param {string} searchParams.user - The user ID of the action's author.- * @param {mongoose.ClientSession} [session] - The transaction session to use (optional).* @returns {Promise<Number>} A promise that resolves to the number of deleted action documents.*/-const deleteActions = async (searchParams, session = null) => {- const options = session ? { session } : {};- const result = await Action.deleteMany(searchParams, options);+const deleteActions = async (searchParams) => {+ const result = await Action.deleteMany(searchParams);return result.deletedCount;};diff --git a/api/models/Agent.js b/api/models/Agent.jsindex 1ee783b101..2112a44991 100644--- a/api/models/Agent.js+++ b/api/models/Agent.js@@ -1,4 +1,11 @@const mongoose = require('mongoose');+const { GLOBAL_PROJECT_NAME } = require('librechat-data-provider').Constants;+const {+ getProjectByName,+ addAgentIdsToProject,+ removeAgentIdsFromProject,+ removeAgentFromAllProjects,+} = require('./Project');const agentSchema = require('./schema/agent');const Agent = mongoose.model('agent', agentSchema);@@ -24,18 +31,17 @@ const createAgent = async (agentData) => {const getAgent = async (searchParameter) => await Agent.findOne(searchParameter).lean();/**- * Update an agent with new data without overwriting existing properties,- * or create a new agent if it doesn't exist, within a transaction session if provided.+ * Update an agent with new data without overwriting existing+ * properties, or create a new agent if it doesn't exist.** @param {Object} searchParameter - The search parameters to find the agent to update.* @param {string} searchParameter.id - The ID of the agent to update.- * @param {string} searchParameter.author - The user ID of the agent's author.+ * @param {string} [searchParameter.author] - The user ID of the agent's author.* @param {Object} updateData - An object containing the properties to update.- * @param {mongoose.ClientSession} [session] - The transaction session to use (optional).* @returns {Promise<Agent>} The updated or newly created agent document as a plain object.*/-const updateAgent = async (searchParameter, updateData, session = null) => {- const options = { new: true, upsert: true, session };+const updateAgent = async (searchParameter, updateData) => {+ const options = { new: true, upsert: true };return await Agent.findOneAndUpdate(searchParameter, updateData, options).lean();};@@ -44,11 +50,15 @@ const updateAgent = async (searchParameter, updateData, session = null) => {** @param {Object} searchParameter - The search parameters to find the agent to delete.* @param {string} searchParameter.id - The ID of the agent to delete.- * @param {string} searchParameter.author - The user ID of the agent's author.+ * @param {string} [searchParameter.author] - The user ID of the agent's author.* @returns {Promise<void>} Resolves when the agent has been successfully deleted.*/const deleteAgent = async (searchParameter) => {- return await Agent.findOneAndDelete(searchParameter);+ const agent = await Agent.findOneAndDelete(searchParameter);+ if (agent) {+ await removeAgentFromAllProjects(agent.id);+ }+ return agent;};/**@@ -58,11 +68,24 @@ const deleteAgent = async (searchParameter) => {* @returns {Promise<Object>} A promise that resolves to an object containing the agents data and pagination info.*/const getListAgents = async (searchParameter) => {- const agents = await Agent.find(searchParameter, {+ const { author, ...otherParams } = searchParameter;++ let query = Object.assign({ author }, otherParams);++ const globalProject = await getProjectByName(GLOBAL_PROJECT_NAME, ['agentIds']);+ if (globalProject && (globalProject.agentIds?.length ?? 0) > 0) {+ const globalQuery = { id: { $in: globalProject.agentIds }, ...otherParams };+ delete globalQuery.author;+ query = { $or: [globalQuery, query] };+ }++ const agents = await Agent.find(query, {id: 1,name: 1,avatar: 1,+ projectIds: 1,}).lean();+const hasMore = agents.length > 0;const firstId = agents.length > 0 ? agents[0].id : null;const lastId = agents.length > 0 ? agents[agents.length - 1].id : null;@@ -75,10 +98,45 @@ 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.+ * @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 updateOps = {};++ if (removeProjectIds && removeProjectIds.length > 0) {+ for (const projectId of removeProjectIds) {+ await removeAgentIdsFromProject(projectId, [agentId]);+ }+ updateOps.$pull = { projectIds: { $in: removeProjectIds } };+ }++ if (projectIds && projectIds.length > 0) {+ for (const projectId of projectIds) {+ await addAgentIdsToProject(projectId, [agentId]);+ }+ updateOps.$addToSet = { projectIds: { $each: projectIds } };+ }++ if (Object.keys(updateOps).length === 0) {+ return await getAgent({ id: agentId });+ }++ return await updateAgent({ id: agentId }, updateOps);+};+module.exports = {createAgent,getAgent,updateAgent,deleteAgent,getListAgents,+ updateAgentProjects,};diff --git a/api/models/Assistant.js b/api/models/Assistant.jsindex 2c98287a88..d0e73ad4e7 100644--- a/api/models/Assistant.js+++ b/api/models/Assistant.js@@ -5,17 +5,16 @@ const Assistant = mongoose.model('assistant', assistantSchema);/*** Update an assistant with new data without overwriting existing properties,- * or create a new assistant if it doesn't exist, within a transaction session if provided.+ * or create a new assistant if it doesn't exist.** @param {Object} searchParams - The search parameters to find the assistant to update.* @param {string} searchParams.assistant_id - The ID of the assistant to update.* @param {string} searchParams.user - The user ID of the assistant's author.* @param {Object} updateData - An object containing the properties to update.- * @param {mongoose.ClientSession} [session] - The transaction session to use (optional).* @returns {Promise<AssistantDocument>} The updated or newly created assistant document as a plain object.*/-const updateAssistantDoc = async (searchParams, updateData, session = null) => {- const options = { new: true, upsert: true, session };+const updateAssistantDoc = async (searchParams, updateData) => {+ const options = { new: true, upsert: true };return await Assistant.findOneAndUpdate(searchParams, updateData, options).lean();};diff --git a/api/models/Project.js b/api/models/Project.jsindex e982e34b5d..17ef3093a5 100644--- a/api/models/Project.js+++ b/api/models/Project.js@@ -1,4 +1,5 @@const { model } = require('mongoose');+const { GLOBAL_PROJECT_NAME } = require('librechat-data-provider').Constants;const projectSchema = require('~/models/schema/projectSchema');const Project = model('Project', projectSchema);@@ -33,7 +34,7 @@ const getProjectByName = async function (projectName, fieldsToSelect = null) {const update = { $setOnInsert: { name: projectName } };const options = {new: true,- upsert: projectName === 'instance',+ upsert: projectName === GLOBAL_PROJECT_NAME,lean: true,select: fieldsToSelect,};@@ -81,10 +82,55 @@ const removeGroupFromAllProjects = async (promptGroupId) => {await Project.updateMany({}, { $pull: { promptGroupIds: promptGroupId } });};+/**+ * Add an array of agent IDs to a project's agentIds array, ensuring uniqueness.+ *+ * @param {string} projectId - The ID of the project to update.+ * @param {string[]} agentIds - The array of agent IDs to add to the project.+ * @returns {Promise<MongoProject>} The updated project document.+ */+const addAgentIdsToProject = async function (projectId, agentIds) {+ return await Project.findByIdAndUpdate(+ projectId,+ { $addToSet: { agentIds: { $each: agentIds } } },+ { new: true },+ );+};++/**+ * Remove an array of agent IDs from a project's agentIds array.+ *+ * @param {string} projectId - The ID of the project to update.+ * @param {string[]} agentIds - The array of agent IDs to remove from the project.+ * @returns {Promise<MongoProject>} The updated project document.+ */+const removeAgentIdsFromProject = async function (projectId, agentIds) {+ return await Project.findByIdAndUpdate(+ projectId,+ { $pull: { agentIds: { $in: agentIds } } },+ { new: true },+ );+};++/**+ * Remove an agent ID from all projects.+ *+ * @param {string} agentId - The ID of the agent to remove from projects.+ * @returns {Promise<void>}+ */+const removeAgentFromAllProjects = async (agentId) => {+ await Project.updateMany({}, { $pull: { agentIds: agentId } });+};+module.exports = {getProjectById,getProjectByName,+ /* prompts */addGroupIdsToProject,removeGroupIdsFromProject,removeGroupFromAllProjects,+ /* agents */+ addAgentIdsToProject,+ removeAgentIdsFromProject,+ removeAgentFromAllProjects,};diff --git a/api/models/Prompt.js b/api/models/Prompt.jsindex 56dcd78570..548589b4d7 100644--- a/api/models/Prompt.js+++ b/api/models/Prompt.js@@ -1,5 +1,5 @@const { ObjectId } = require('mongodb');-const { SystemRoles, SystemCategories } = require('librechat-data-provider');+const { SystemRoles, SystemCategories, Constants } = require('librechat-data-provider');const {getProjectByName,addGroupIdsToProject,@@ -123,7 +123,7 @@ const getAllPromptGroups = async (req, filter) => {let combinedQuery = query;if (searchShared) {- const project = await getProjectByName('instance', 'promptGroupIds');+ const project = await getProjectByName(Constants.GLOBAL_PROJECT_NAME, 'promptGroupIds');if (project && project.promptGroupIds.length > 0) {const projectQuery = { _id: { $in: project.promptGroupIds }, ...query };delete projectQuery.author;@@ -177,7 +177,7 @@ const getPromptGroups = async (req, filter) => {if (searchShared) {// const projects = req.user.projects || []; // TODO: handle multiple projects- const project = await getProjectByName('instance', 'promptGroupIds');+ const project = await getProjectByName(Constants.GLOBAL_PROJECT_NAME, 'promptGroupIds');if (project && project.promptGroupIds.length > 0) {const projectQuery = { _id: { $in: project.promptGroupIds }, ...query };delete projectQuery.author;diff --git a/api/models/Role.js b/api/models/Role.jsindex d21efee3b8..62ec8dfe29 100644--- a/api/models/Role.js+++ b/api/models/Role.js@@ -4,6 +4,7 @@ const {roleDefaults,PermissionTypes,removeNullishValues,+ agentPermissionsSchema,promptPermissionsSchema,bookmarkPermissionsSchema,} = require('librechat-data-provider');@@ -71,6 +72,7 @@ const updateRoleByName = async function (roleName, updates) {};const permissionSchemas = {+ [PermissionTypes.AGENTS]: agentPermissionsSchema,[PermissionTypes.PROMPTS]: promptPermissionsSchema,[PermissionTypes.BOOKMARKS]: bookmarkPermissionsSchema,};@@ -130,6 +132,7 @@ async function updateAccessPermissions(roleName, permissionsUpdate) {/*** Initialize default roles in the system.* Creates the default roles (ADMIN, USER) if they don't exist in the database.+ * Updates existing roles with new permission types if they're missing.** @returns {Promise<void>}*/@@ -137,14 +140,27 @@ const initializeRoles = async function () {const defaultRoles = [SystemRoles.ADMIN, SystemRoles.USER];for (const roleName of defaultRoles) {- let role = await Role.findOne({ name: roleName }).select('name').lean();+ let role = await Role.findOne({ name: roleName });+if (!role) {+ // Create new role if it doesn't existrole = new Role(roleDefaults[roleName]);- await role.save();+ } else {+ // Add missing permission types+ let isUpdated = false;+ for (const permType of Object.values(PermissionTypes)) {+ if (!role[permType]) {+ role[permType] = roleDefaults[roleName][permType];+ isUpdated = true;+ }+ }+ if (isUpdated) {+ await role.save();+ }}+ await role.save();}};-module.exports = {getRoleByName,initializeRoles,diff --git a/api/models/Role.spec.js b/api/models/Role.spec.jsindex c183b9d1c3..753df77e67 100644--- a/api/models/Role.spec.js+++ b/api/models/Role.spec.js@@ -1,9 +1,14 @@const mongoose = require('mongoose');const { MongoMemoryServer } = require('mongodb-memory-server');-const { SystemRoles, PermissionTypes } = require('librechat-data-provider');-const Role = require('~/models/schema/roleSchema');-const { updateAccessPermissions } = require('~/models/Role');+const {+ SystemRoles,+ PermissionTypes,+ roleDefaults,+ Permissions,+} = require('librechat-data-provider');+const { updateAccessPermissions, initializeRoles } = require('~/models/Role');const getLogStores = require('~/cache/getLogStores');+const Role = require('~/models/schema/roleSchema');// Mock the cachejest.mock('~/cache/getLogStores', () => {@@ -195,3 +200,117 @@ describe('updateAccessPermissions', () => {});});});++describe('initializeRoles', () => {+ beforeEach(async () => {+ await Role.deleteMany({});+ });++ it('should create default roles if they do not exist', async () => {+ await initializeRoles();++ const adminRole = await Role.findOne({ name: SystemRoles.ADMIN }).lean();+ const userRole = await Role.findOne({ name: SystemRoles.USER }).lean();++ expect(adminRole).toBeTruthy();+ expect(userRole).toBeTruthy();++ // Check if all permission types exist+ Object.values(PermissionTypes).forEach((permType) => {+ expect(adminRole[permType]).toBeDefined();+ expect(userRole[permType]).toBeDefined();+ });++ // Check if permissions match defaults (example for ADMIN role)+ expect(adminRole[PermissionTypes.PROMPTS].SHARED_GLOBAL).toBe(true);+ expect(adminRole[PermissionTypes.BOOKMARKS].USE).toBe(true);+ expect(adminRole[PermissionTypes.AGENTS].CREATE).toBe(true);+ });++ it('should not modify existing permissions for existing roles', async () => {+ const customUserRole = {+ name: SystemRoles.USER,+ [PermissionTypes.PROMPTS]: {+ [Permissions.USE]: false,+ [Permissions.CREATE]: true,+ [Permissions.SHARED_GLOBAL]: true,+ },+ [PermissionTypes.BOOKMARKS]: {+ [Permissions.USE]: false,+ },+ };++ await new Role(customUserRole).save();++ await initializeRoles();++ const userRole = await Role.findOne({ name: SystemRoles.USER }).lean();++ expect(userRole[PermissionTypes.PROMPTS]).toEqual(customUserRole[PermissionTypes.PROMPTS]);+ expect(userRole[PermissionTypes.BOOKMARKS]).toEqual(customUserRole[PermissionTypes.BOOKMARKS]);+ expect(userRole[PermissionTypes.AGENTS]).toBeDefined();+ });++ it('should add new permission types to existing roles', async () => {+ const partialUserRole = {+ name: SystemRoles.USER,+ [PermissionTypes.PROMPTS]: roleDefaults[SystemRoles.USER][PermissionTypes.PROMPTS],+ [PermissionTypes.BOOKMARKS]: roleDefaults[SystemRoles.USER][PermissionTypes.BOOKMARKS],+ };++ await new Role(partialUserRole).save();++ await initializeRoles();++ const userRole = await Role.findOne({ name: SystemRoles.USER }).lean();++ expect(userRole[PermissionTypes.AGENTS]).toBeDefined();+ expect(userRole[PermissionTypes.AGENTS].CREATE).toBeDefined();+ expect(userRole[PermissionTypes.AGENTS].USE).toBeDefined();+ expect(userRole[PermissionTypes.AGENTS].SHARED_GLOBAL).toBeDefined();+ });++ it('should handle multiple runs without duplicating or modifying data', async () => {+ await initializeRoles();+ await initializeRoles();++ const adminRoles = await Role.find({ name: SystemRoles.ADMIN });+ const userRoles = await Role.find({ name: SystemRoles.USER });++ expect(adminRoles).toHaveLength(1);+ expect(userRoles).toHaveLength(1);++ const adminRole = adminRoles[0].toObject();+ const userRole = userRoles[0].toObject();++ // Check if all permission types exist+ Object.values(PermissionTypes).forEach((permType) => {+ expect(adminRole[permType]).toBeDefined();+ expect(userRole[permType]).toBeDefined();+ });+ });++ it('should update roles with missing permission types from roleDefaults', async () => {+ const partialAdminRole = {+ name: SystemRoles.ADMIN,+ [PermissionTypes.PROMPTS]: {+ [Permissions.USE]: false,+ [Permissions.CREATE]: false,+ [Permissions.SHARED_GLOBAL]: false,+ },+ [PermissionTypes.BOOKMARKS]: roleDefaults[SystemRoles.ADMIN][PermissionTypes.BOOKMARKS],+ };++ await new Role(partialAdminRole).save();++ await initializeRoles();++ const adminRole = await Role.findOne({ name: SystemRoles.ADMIN }).lean();++ expect(adminRole[PermissionTypes.PROMPTS]).toEqual(partialAdminRole[PermissionTypes.PROMPTS]);+ expect(adminRole[PermissionTypes.AGENTS]).toBeDefined();+ expect(adminRole[PermissionTypes.AGENTS].CREATE).toBeDefined();+ expect(adminRole[PermissionTypes.AGENTS].USE).toBeDefined();+ expect(adminRole[PermissionTypes.AGENTS].SHARED_GLOBAL).toBeDefined();+ });+});diff --git a/api/models/schema/agent.js b/api/models/schema/agent.jsindex 97f0527916..819398ee7c 100644--- a/api/models/schema/agent.js+++ b/api/models/schema/agent.js@@ -57,6 +57,11 @@ const agentSchema = mongoose.Schema(ref: 'User',required: true,},+ projectIds: {+ type: [mongoose.Schema.Types.ObjectId],+ ref: 'Project',+ index: true,+ },},{timestamps: true,diff --git a/api/models/schema/defaults.js b/api/models/schema/defaults.jsindex 4a99a68373..6dced3af86 100644--- a/api/models/schema/defaults.js+++ b/api/models/schema/defaults.js@@ -13,6 +13,11 @@ const conversationPreset = {type: String,required: false,},+ // for bedrock only+ region: {+ type: String,+ required: false,+ },// for azureOpenAI, openAI onlychatGptLabel: {type: String,@@ -78,6 +83,9 @@ const conversationPreset = {promptCache: {type: Boolean,},+ system: {+ type: String,+ },// filesresendFiles: {type: Boolean,diff --git a/api/models/schema/projectSchema.js b/api/models/schema/projectSchema.jsindex 0e27c6a8f9..dfa68a06c2 100644--- a/api/models/schema/projectSchema.js+++ b/api/models/schema/projectSchema.js@@ -21,6 +21,11 @@ const projectSchema = new Schema(ref: 'PromptGroup',default: [],},+ agentIds: {+ type: [String],+ ref: 'Agent',+ default: [],+ },},{timestamps: true,diff --git a/api/models/schema/roleSchema.js b/api/models/schema/roleSchema.jsindex ebd1d0bc4b..b0cbeb8c2c 100644--- a/api/models/schema/roleSchema.js+++ b/api/models/schema/roleSchema.js@@ -28,6 +28,20 @@ const roleSchema = new mongoose.Schema({default: true,},},+ [PermissionTypes.AGENTS]: {+ [Permissions.SHARED_GLOBAL]: {+ type: Boolean,+ default: false,+ },+ [Permissions.USE]: {+ type: Boolean,+ default: true,+ },+ [Permissions.CREATE]: {+ type: Boolean,+ default: true,+ },+ },});const Role = mongoose.model('Role', roleSchema);diff --git a/api/models/tx.js b/api/models/tx.jsindex 1b515cca2a..2de31f1b3b 100644--- a/api/models/tx.js+++ b/api/models/tx.js@@ -3,38 +3,28 @@ const defaultRate = 6;/** AWS Bedrock pricing */const bedrockValues = {- 'anthropic.claude-3-haiku-20240307-v1:0': { prompt: 0.25, completion: 1.25 },- 'anthropic.claude-3-sonnet-20240229-v1:0': { prompt: 3.0, completion: 15.0 },- 'anthropic.claude-3-opus-20240229-v1:0': { prompt: 15.0, completion: 75.0 },- 'anthropic.claude-3-5-sonnet-20240620-v1:0': { prompt: 3.0, completion: 15.0 },- 'anthropic.claude-v2:1': { prompt: 8.0, completion: 24.0 },- 'anthropic.claude-instant-v1': { prompt: 0.8, completion: 2.4 },- 'meta.llama2-13b-chat-v1': { prompt: 0.75, completion: 1.0 },- 'meta.llama2-70b-chat-v1': { prompt: 1.95, completion: 2.56 },- 'meta.llama3-8b-instruct-v1:0': { prompt: 0.3, completion: 0.6 },- 'meta.llama3-70b-instruct-v1:0': { prompt: 2.65, completion: 3.5 },- 'meta.llama3-1-8b-instruct-v1:0': { prompt: 0.3, completion: 0.6 },- 'meta.llama3-1-70b-instruct-v1:0': { prompt: 2.65, completion: 3.5 },- 'meta.llama3-1-405b-instruct-v1:0': { prompt: 5.32, completion: 16.0 },- 'mistral.mistral-7b-instruct-v0:2': { prompt: 0.15, completion: 0.2 },- 'mistral.mistral-small-2402-v1:0': { prompt: 0.15, completion: 0.2 },- 'mistral.mixtral-8x7b-instruct-v0:1': { prompt: 0.45, completion: 0.7 },- 'mistral.mistral-large-2402-v1:0': { prompt: 4.0, completion: 12.0 },- 'mistral.mistral-large-2407-v1:0': { prompt: 3.0, completion: 9.0 },- 'cohere.command-text-v14': { prompt: 1.5, completion: 2.0 },- 'cohere.command-light-text-v14': { prompt: 0.3, completion: 0.6 },- 'cohere.command-r-v1:0': { prompt: 0.5, completion: 1.5 },- 'cohere.command-r-plus-v1:0': { prompt: 3.0, completion: 15.0 },+ 'llama2-13b': { prompt: 0.75, completion: 1.0 },+ 'llama2-70b': { prompt: 1.95, completion: 2.56 },+ 'llama3-8b': { prompt: 0.3, completion: 0.6 },+ 'llama3-70b': { prompt: 2.65, completion: 3.5 },+ 'llama3-1-8b': { prompt: 0.3, completion: 0.6 },+ 'llama3-1-70b': { prompt: 2.65, completion: 3.5 },+ 'llama3-1-405b': { prompt: 5.32, completion: 16.0 },+ 'mistral-7b': { prompt: 0.15, completion: 0.2 },+ 'mistral-small': { prompt: 0.15, completion: 0.2 },+ 'mixtral-8x7b': { prompt: 0.45, completion: 0.7 },+ 'mistral-large-2402': { prompt: 4.0, completion: 12.0 },+ 'mistral-large-2407': { prompt: 3.0, completion: 9.0 },+ 'command-text': { prompt: 1.5, completion: 2.0 },+ 'command-light': { prompt: 0.3, completion: 0.6 },'ai21.j2-mid-v1': { prompt: 12.5, completion: 12.5 },'ai21.j2-ultra-v1': { prompt: 18.8, completion: 18.8 },+ 'ai21.jamba-instruct-v1:0': { prompt: 0.5, completion: 0.7 },'amazon.titan-text-lite-v1': { prompt: 0.15, completion: 0.2 },'amazon.titan-text-express-v1': { prompt: 0.2, completion: 0.6 },+ 'amazon.titan-text-premier-v1:0': { prompt: 0.5, completion: 1.5 },};-for (const [key, value] of Object.entries(bedrockValues)) {- bedrockValues[`bedrock/${key}`] = value;-}-/*** Mapping of model token sizes to their respective multipliers for prompt and completion.* The rates are 1 USD per 1M tokens.@@ -59,6 +49,7 @@ const tokenValues = Object.assign('claude-3-haiku': { prompt: 0.25, completion: 1.25 },'claude-2.1': { prompt: 8, completion: 24 },'claude-2': { prompt: 8, completion: 24 },+ 'claude-instant': { prompt: 0.8, completion: 2.4 },'claude-': { prompt: 0.8, completion: 2.4 },'command-r-plus': { prompt: 3, completion: 15 },'command-r': { prompt: 0.5, completion: 1.5 },diff --git a/api/models/tx.spec.js b/api/models/tx.spec.jsindex f0a118c012..c8a8b335e3 100644--- a/api/models/tx.spec.js+++ b/api/models/tx.spec.js@@ -1,3 +1,4 @@+const { EModelEndpoint } = require('librechat-data-provider');const {defaultRate,tokenValues,@@ -224,34 +225,18 @@ describe('AWS Bedrock Model Tests', () => {it('should return the correct prompt multipliers for all models', () => {const results = awsModels.map((model) => {- const multiplier = getMultiplier({ valueKey: model, tokenType: 'prompt' });- return multiplier === tokenValues[model].prompt;+ const valueKey = getValueKey(model, EModelEndpoint.bedrock);+ const multiplier = getMultiplier({ valueKey, tokenType: 'prompt' });+ return tokenValues[valueKey].prompt && multiplier === tokenValues[valueKey].prompt;});expect(results.every(Boolean)).toBe(true);});it('should return the correct completion multipliers for all models', () => {const results = awsModels.map((model) => {- const multiplier = getMultiplier({ valueKey: model, tokenType: 'completion' });- return multiplier === tokenValues[model].completion;- });- expect(results.every(Boolean)).toBe(true);- });-- it('should return the correct prompt multipliers for all models with Bedrock prefix', () => {- const results = awsModels.map((model) => {- const modelName = `bedrock/${model}`;- const multiplier = getMultiplier({ valueKey: modelName, tokenType: 'prompt' });- return multiplier === tokenValues[model].prompt;- });- expect(results.every(Boolean)).toBe(true);- });-- it('should return the correct completion multipliers for all models with Bedrock prefix', () => {- const results = awsModels.map((model) => {- const modelName = `bedrock/${model}`;- const multiplier = getMultiplier({ valueKey: modelName, tokenType: 'completion' });- return multiplier === tokenValues[model].completion;+ const valueKey = getValueKey(model, EModelEndpoint.bedrock);+ const multiplier = getMultiplier({ valueKey, tokenType: 'completion' });+ return tokenValues[valueKey].completion && multiplier === tokenValues[valueKey].completion;});expect(results.every(Boolean)).toBe(true);});diff --git a/api/package.json b/api/package.jsonindex 43d8609a8e..75df20b2dd 100644--- a/api/package.json+++ b/api/package.json@@ -43,7 +43,7 @@"@langchain/core": "^0.2.18","@langchain/google-genai": "^0.0.11","@langchain/google-vertexai": "^0.0.17",- "@librechat/agents": "^1.4.1",+ "@librechat/agents": "^1.5.2","axios": "^1.3.4","bcryptjs": "^2.4.3","cheerio": "^1.0.0-rc.12",diff --git a/api/server/controllers/AskController.js b/api/server/controllers/AskController.jsindex ce6e0fb172..dd5c8d6570 100644--- a/api/server/controllers/AskController.js+++ b/api/server/controllers/AskController.js@@ -123,11 +123,6 @@ const AskController = async (req, res, next, initializeClient, addTitle) => {};let response = await client.sendMessage(text, messageOptions);-- if (overrideParentMessageId) {- response.parentMessageId = overrideParentMessageId;- }-response.endpoint = endpointOption.endpoint;const { conversation = {} } = await client.responsePromise;diff --git a/api/server/controllers/EndpointController.js b/api/server/controllers/EndpointController.jsindex d80ea6b14f..1e716870c3 100644--- a/api/server/controllers/EndpointController.js+++ b/api/server/controllers/EndpointController.js@@ -44,6 +44,14 @@ async function endpointController(req, res) {};}+ if (mergedConfig[EModelEndpoint.bedrock] && req.app.locals?.[EModelEndpoint.bedrock]) {+ const { availableRegions } = req.app.locals[EModelEndpoint.bedrock];+ mergedConfig[EModelEndpoint.bedrock] = {+ ...mergedConfig[EModelEndpoint.bedrock],+ availableRegions,+ };+ }+const endpointsConfig = orderEndpointsConfig(mergedConfig);await cache.set(CacheKeys.ENDPOINT_CONFIG, endpointsConfig);diff --git a/api/server/controllers/agents/callbacks.js b/api/server/controllers/agents/callbacks.jsindex 9649f56a53..f6c1972b4f 100644--- a/api/server/controllers/agents/callbacks.js+++ b/api/server/controllers/agents/callbacks.js@@ -1,7 +1,10 @@const { GraphEvents, ToolEndHandler, ChatModelStreamHandler } = require('@librechat/agents');+/** @typedef {import('@librechat/agents').Graph} Graph *//** @typedef {import('@librechat/agents').EventHandler} EventHandler */+/** @typedef {import('@librechat/agents').ModelEndData} ModelEndData *//** @typedef {import('@librechat/agents').ChatModelStreamHandler} ChatModelStreamHandler */+/** @typedef {import('@librechat/agents').ContentAggregatorResult['aggregateContent']} ContentAggregator *//** @typedef {import('@librechat/agents').GraphEvents} GraphEvents *//**@@ -18,18 +21,55 @@ const sendEvent = (res, event) => {res.write(`event: message\ndata: ${JSON.stringify(event)}\n\n`);};+class ModelEndHandler {+ /**+ * @param {Array<UsageMetadata>} collectedUsage+ */+ constructor(collectedUsage) {+ if (!Array.isArray(collectedUsage)) {+ throw new Error('collectedUsage must be an array');+ }+ this.collectedUsage = collectedUsage;+ }++ /**+ * @param {string} event+ * @param {ModelEndData | undefined} data+ * @param {Record<string, unknown> | undefined} metadata+ * @param {Graph} graph+ * @returns+ */+ handle(event, data, metadata, graph) {+ if (!graph || !metadata) {+ console.warn(`Graph or metadata not found in ${event} event`);+ return;+ }++ const usage = data?.output?.usage_metadata;++ if (usage) {+ this.collectedUsage.push(usage);+ }+ }+}+/*** Get default handlers for stream events.- * @param {{ res?: ServerResponse }} options - The options object.+ * @param {Object} options - The options object.+ * @param {ServerResponse} options.res - The options object.+ * @param {ContentAggregator} options.aggregateContent - The options object.+ * @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 }) {- if (!res) {- throw new Error('Request not found');+function getDefaultHandlers({ res, aggregateContent, collectedUsage }) {+ if (!res || !aggregateContent) {+ throw new Error(+ `[getDefaultHandlers] Missing required options: res: ${!res}, aggregateContent: ${!aggregateContent}`,+ );}const handlers = {- // [GraphEvents.CHAT_MODEL_END]: new ModelEndHandler(),+ [GraphEvents.CHAT_MODEL_END]: new ModelEndHandler(collectedUsage),[GraphEvents.TOOL_END]: new ToolEndHandler(),[GraphEvents.CHAT_MODEL_STREAM]: new ChatModelStreamHandler(),[GraphEvents.ON_RUN_STEP]: {@@ -40,6 +80,7 @@ function getDefaultHandlers({ res }) {*/handle: (event, data) => {sendEvent(res, { event, data });+ aggregateContent({ event, data });},},[GraphEvents.ON_RUN_STEP_DELTA]: {@@ -50,6 +91,7 @@ function getDefaultHandlers({ res }) {*/handle: (event, data) => {sendEvent(res, { event, data });+ aggregateContent({ event, data });},},[GraphEvents.ON_RUN_STEP_COMPLETED]: {@@ -60,6 +102,7 @@ function getDefaultHandlers({ res }) {*/handle: (event, data) => {sendEvent(res, { event, data });+ aggregateContent({ event, data });},},[GraphEvents.ON_MESSAGE_DELTA]: {@@ -70,6 +113,7 @@ function getDefaultHandlers({ res }) {*/handle: (event, data) => {sendEvent(res, { event, data });+ aggregateContent({ event, data });},},};diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.jsindex 82e6a6f48a..137068ddd6 100644--- a/api/server/controllers/agents/client.js+++ b/api/server/controllers/agents/client.js@@ -7,9 +7,11 @@// validateVisionModel,// mapModelToAzureConfig,// } = require('librechat-data-provider');-const { Callback } = require('@librechat/agents');+const { Callback, createMetadataAggregator } = require('@librechat/agents');const {+ Constants,EModelEndpoint,+ bedrockOutputParser,providerEndpointMap,removeNullishValues,} = require('librechat-data-provider');@@ -23,15 +25,27 @@ const {formatAgentMessages,createContextHandlers,} = require('~/app/clients/prompts');+const { encodeAndFormat } = require('~/server/services/Files/images/encode');const Tokenizer = require('~/server/services/Tokenizer');+const { spendTokens } = require('~/models/spendTokens');const BaseClient = require('~/app/clients/BaseClient');// const { sleep } = require('~/server/utils');const { createRun } = require('./run');const { logger } = require('~/config');+/** @typedef {import('@librechat/agents').MessageContentComplex} MessageContentComplex */++// const providerSchemas = {+// [EModelEndpoint.bedrock]: true,+// };++const providerParsers = {+ [EModelEndpoint.bedrock]: bedrockOutputParser,+};+class AgentClient extends BaseClient {constructor(options = {}) {- super(options);+ super(null, options);/** @type {'discard' | 'summarize'} */this.contextStrategy = 'discard';@@ -39,11 +53,31 @@ class AgentClient extends BaseClient {/** @deprecated @type {true} - Is a Chat Completion Request */this.isChatCompletion = true;- const { maxContextTokens, modelOptions = {}, ...clientOptions } = options;+ /** @type {AgentRun} */+ this.run;++ const {+ maxContextTokens,+ modelOptions = {},+ contentParts,+ collectedUsage,+ ...clientOptions+ } = options;this.modelOptions = modelOptions;this.maxContextTokens = maxContextTokens;- this.options = Object.assign({ endpoint: EModelEndpoint.agents }, clientOptions);+ /** @type {MessageContentComplex[]} */+ this.contentParts = contentParts;+ /** @type {Array<UsageMetadata>} */+ this.collectedUsage = collectedUsage;+ this.options = Object.assign({ endpoint: options.endpoint }, clientOptions);+ }++ /**+ * Returns the aggregated content parts for the current run.+ * @returns {MessageContentComplex[]} */+ getContentParts() {+ return this.contentParts;}setOptions(options) {@@ -112,9 +146,27 @@ class AgentClient extends BaseClient {}getSaveOptions() {+ const parseOptions = providerParsers[this.options.endpoint];+ let runOptions =+ this.options.endpoint === EModelEndpoint.agents+ ? {+ model: undefined,+ // TODO:+ // would need to be override settings; otherwise, model needs to be undefined+ // model: this.override.model,+ // instructions: this.override.instructions,+ // additional_instructions: this.override.additional_instructions,+ }+ : {};++ if (parseOptions) {+ runOptions = parseOptions(this.modelOptions);+ }+return removeNullishValues(Object.assign({+ endpoint: this.options.endpoint,agent_id: this.options.agent.id,modelLabel: this.options.modelLabel,maxContextTokens: this.options.maxContextTokens,@@ -122,15 +174,8 @@ class AgentClient extends BaseClient {imageDetail: this.options.imageDetail,spec: this.options.spec,},- this.modelOptions,- {- model: undefined,- // TODO:- // would need to be override settings; otherwise, model needs to be undefined- // model: this.override.model,- // instructions: this.override.instructions,- // additional_instructions: this.override.additional_instructions,- },+ // TODO: PARSE OPTIONS BY PROVIDER, MAY CONTAIN SENSITIVE DATA+ runOptions,),);}@@ -142,6 +187,16 @@ class AgentClient extends BaseClient {};}+ async addImageURLs(message, attachments) {+ const { files, image_urls } = await encodeAndFormat(+ this.options.req,+ attachments,+ this.options.agent.provider,+ );+ message.image_urls = image_urls.length ? image_urls : undefined;+ return files;+ }+async buildMessages(messages,parentMessageId,@@ -270,25 +325,34 @@ class AgentClient extends BaseClient {/** @type {sendCompletion} */async sendCompletion(payload, opts = {}) {this.modelOptions.user = this.user;- return await this.chatCompletion({+ await this.chatCompletion({payload,onProgress: opts.onProgress,abortController: opts.abortController,});+ return this.contentParts;}- // async recordTokenUsage({ promptTokens, completionTokens, context = 'message' }) {- // await spendTokens(- // {- // context,- // model: this.modelOptions.model,- // conversationId: this.conversationId,- // user: this.user ?? this.options.req.user?.id,- // endpointTokenConfig: this.options.endpointTokenConfig,- // },- // { promptTokens, completionTokens },- // );- // }+ /**+ * @param {Object} params+ * @param {string} [params.model]+ * @param {string} [params.context='message']+ * @param {UsageMetadata[]} [params.collectedUsage=this.collectedUsage]+ */+ async recordCollectedUsage({ model, context = 'message', collectedUsage = this.collectedUsage }) {+ for (const usage of collectedUsage) {+ await spendTokens(+ {+ context,+ model: model ?? this.modelOptions.model,+ conversationId: this.conversationId,+ user: this.user ?? this.options.req.user?.id,+ endpointTokenConfig: this.options.endpointTokenConfig,+ },+ { promptTokens: usage.input_tokens, completionTokens: usage.output_tokens },+ );+ }+ }async chatCompletion({ payload, abortController = null }) {try {@@ -398,9 +462,8 @@ class AgentClient extends BaseClient {// });// }- // const streamRate = this.options.streamRate ?? Constants.DEFAULT_STREAM_RATE;-const run = await createRun({+ req: this.options.req,agent: this.options.agent,tools: this.options.tools,toolMap: this.options.toolMap,@@ -415,6 +478,7 @@ class AgentClient extends BaseClient {thread_id: this.conversationId,},run_id: this.responseMessageId,+ signal: abortController.signal,streamMode: 'values',version: 'v2',};@@ -423,8 +487,10 @@ class AgentClient extends BaseClient {throw new Error('Failed to create run');}+ this.run = run;+const messages = formatAgentMessages(payload);- const runMessages = await run.processStream({ messages }, config, {+ await run.processStream({ messages }, config, {[Callback.TOOL_ERROR]: (graph, error, toolId) => {logger.error('[api/server/controllers/agents/client.js #chatCompletion] Tool Error',@@ -433,14 +499,94 @@ class AgentClient extends BaseClient {);},});- // console.dir(runMessages, { depth: null });- return runMessages;+ this.recordCollectedUsage({ context: 'message' }).catch((err) => {+ logger.error(+ '[api/server/controllers/agents/client.js #chatCompletion] Error recording collected usage',+ err,+ );+ });} catch (err) {- logger.error(- '[api/server/controllers/agents/client.js #chatCompletion] Unhandled error type',+ if (!abortController.signal.aborted) {+ logger.error(+ '[api/server/controllers/agents/client.js #sendCompletion] Unhandled error type',+ err,+ );+ throw err;+ }++ logger.warn(+ '[api/server/controllers/agents/client.js #sendCompletion] Operation aborted',err,);- throw err;+ }+ }++ /**+ *+ * @param {Object} params+ * @param {string} params.text+ * @param {string} params.conversationId+ */+ async titleConvo({ text }) {+ if (!this.run) {+ throw new Error('Run not initialized');+ }+ const { handleLLMEnd, collected: collectedMetadata } = createMetadataAggregator();+ const clientOptions = {};+ const providerConfig = this.options.req.app.locals[this.options.agent.provider];+ if (+ providerConfig &&+ providerConfig.titleModel &&+ providerConfig.titleModel !== Constants.CURRENT_MODEL+ ) {+ clientOptions.model = providerConfig.titleModel;+ }+ try {+ const titleResult = await this.run.generateTitle({+ inputText: text,+ contentParts: this.contentParts,+ clientOptions,+ chainOptions: {+ callbacks: [+ {+ handleLLMEnd,+ },+ ],+ },+ });++ const collectedUsage = collectedMetadata.map((item) => {+ let input_tokens, output_tokens;++ if (item.usage) {+ input_tokens = item.usage.input_tokens || item.usage.inputTokens;+ output_tokens = item.usage.output_tokens || item.usage.outputTokens;+ } else if (item.tokenUsage) {+ input_tokens = item.tokenUsage.promptTokens;+ output_tokens = item.tokenUsage.completionTokens;+ }++ return {+ input_tokens: input_tokens,+ output_tokens: output_tokens,+ };+ });++ this.recordCollectedUsage({+ model: clientOptions.model,+ context: 'title',+ collectedUsage,+ }).catch((err) => {+ logger.error(+ '[api/server/controllers/agents/client.js #titleConvo] Error recording collected usage',+ err,+ );+ });++ return titleResult.title;+ } catch (err) {+ logger.error('[api/server/controllers/agents/client.js #titleConvo] Error', err);+ return;}}diff --git a/api/server/controllers/agents/demo.js b/api/server/controllers/agents/demo.jsdeleted file mode 100644index c90745ba80..0000000000--- a/api/server/controllers/agents/demo.js+++ /dev/null@@ -1,44 +0,0 @@-// Import the necessary modules-const path = require('path');-const base = path.resolve(__dirname, '..', '..', '..', '..', 'api');-console.log(base);-//api/server/controllers/agents/demo.js-require('module-alias')({ base });-const connectDb = require('~/lib/db/connectDb');-const AgentClient = require('./client');--// Define the user and message options-const user = 'user123';-const parentMessageId = 'pmid123';-const conversationId = 'cid456';-const maxContextTokens = 200000;-const req = {- user: { id: user },-};-const progressOptions = {- res: {},-};--// Define the message options-const messageOptions = {- user,- parentMessageId,- conversationId,- progressOptions,-};--async function main() {- await connectDb();- const client = new AgentClient({ req, maxContextTokens });-- const text = 'Hello, this is a test message.';-- try {- let response = await client.sendMessage(text, messageOptions);- console.log('Response:', response);- } catch (error) {- console.error('Error sending message:', error);- }-}--main();diff --git a/api/server/controllers/agents/request.js b/api/server/controllers/agents/request.jsindex 6480205979..2006d4e6ea 100644--- a/api/server/controllers/agents/request.js+++ b/api/server/controllers/agents/request.js@@ -1,4 +1,4 @@-const { Constants, getResponseSender } = require('librechat-data-provider');+const { Constants } = require('librechat-data-provider');const { createAbortController, handleAbortError } = require('~/server/middleware');const { sendMessage } = require('~/server/utils');const { saveMessage } = require('~/models');@@ -9,22 +9,17 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {text,endpointOption,conversationId,- modelDisplayLabel,parentMessageId = null,overrideParentMessageId = null,} = req.body;+ let sender;let userMessage;- let userMessagePromise;let promptTokens;let userMessageId;let responseMessageId;+ let userMessagePromise;- const sender = getResponseSender({- ...endpointOption,- model: endpointOption.modelOptions.model,- modelDisplayLabel,- });const newConvo = !conversationId;const user = req.user.id;@@ -39,6 +34,8 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {responseMessageId = data[key];} else if (key === 'promptTokens') {promptTokens = data[key];+ } else if (key === 'sender') {+ sender = data[key];} else if (!conversationId && key === 'conversationId') {conversationId = data[key];}@@ -46,6 +43,7 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {};try {+ /** @type {{ client: TAgentClient }} */const { client } = await initializeClient({ req, res, endpointOption });const getAbortData = () => ({@@ -54,8 +52,8 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {promptTokens,conversationId,userMessagePromise,- // text: getPartialText(),messageId: responseMessageId,+ content: client.getContentParts(),parentMessageId: overrideParentMessageId ?? userMessageId,});@@ -90,11 +88,6 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {};let response = await client.sendMessage(text, messageOptions);-- if (overrideParentMessageId) {- response.parentMessageId = overrideParentMessageId;- }-response.endpoint = endpointOption.endpoint;const { conversation = {} } = await client.responsePromise;@@ -103,7 +96,6 @@ const AgentController = async (req, res, next, initializeClient, addTitle) => {if (client.options.attachments) {userMessage.files = client.options.attachments;- conversation.model = endpointOption.modelOptions.model;delete userMessage.image_urls;}diff --git a/api/server/controllers/agents/run.js b/api/server/controllers/agents/run.jsindex d30d43bd9d..5aeefa122d 100644--- a/api/server/controllers/agents/run.js+++ b/api/server/controllers/agents/run.js@@ -1,4 +1,4 @@-const { Run } = require('@librechat/agents');+const { Run, Providers } = require('@librechat/agents');const { providerEndpointMap } = require('librechat-data-provider');/**@@ -14,11 +14,12 @@ const { providerEndpointMap } = require('librechat-data-provider');* Creates a new Run instance with custom handlers and configuration.** @param {Object} options - The options for creating the Run instance.+ * @param {ServerRequest} [options.req] - The server request.+ * @param {string | undefined} [options.runId] - Optional run ID; otherwise, a new run ID will be generated.* @param {Agent} options.agent - The agent for this run.* @param {StructuredTool[] | undefined} [options.tools] - The tools to use in the run.* @param {Record<string, StructuredTool[]> | undefined} [options.toolMap] - The tool map for the run.* @param {Record<GraphEvents, EventHandler> | undefined} [options.customHandlers] - Custom event handlers.- * @param {string | undefined} [options.runId] - Optional run ID; otherwise, a new run ID will be generated.* @param {ClientOptions} [options.modelOptions] - Optional model to use; if not provided, it will use the default from modelMap.* @param {boolean} [options.streaming=true] - Whether to use streaming.* @param {boolean} [options.streamUsage=true] - Whether to stream usage information.@@ -43,15 +44,22 @@ async function createRun({modelOptions,);+ const graphConfig = {+ runId,+ llmConfig,+ tools,+ toolMap,+ instructions: agent.instructions,+ additional_instructions: agent.additional_instructions,+ };++ // TEMPORARY FOR TESTING+ if (agent.provider === Providers.ANTHROPIC) {+ graphConfig.streamBuffer = 2000;+ }+return Run.create({- graphConfig: {- runId,- llmConfig,- tools,- toolMap,- instructions: agent.instructions,- additional_instructions: agent.additional_instructions,- },+ graphConfig,customHandlers,});}diff --git a/api/server/controllers/agents/v1.js b/api/server/controllers/agents/v1.jsindex 2a9911c541..65e37f2618 100644--- a/api/server/controllers/agents/v1.js+++ b/api/server/controllers/agents/v1.js@@ -1,5 +1,5 @@const { nanoid } = require('nanoid');-const { FileContext } = require('librechat-data-provider');+const { FileContext, Constants } = require('librechat-data-provider');const {getAgent,createAgent,@@ -9,6 +9,8 @@ const {} = require('~/models/Agent');const { getStrategyFunctions } = require('~/server/services/Files/strategies');const { uploadImageBuffer } = require('~/server/services/Files/process');+const { getProjectByName } = require('~/models/Project');+const { updateAgentProjects } = require('~/models/Agent');const { deleteFileByFilter } = require('~/models/File');const { logger } = require('~/config');@@ -53,16 +55,35 @@ const createAgentHandler = async (req, res) => {* @param {object} req - Express Request* @param {object} req.params - Request params* @param {string} req.params.id - Agent identifier.- * @returns {Agent} 200 - success response - application/json+ * @param {object} req.user - Authenticated user information+ * @param {string} req.user.id - User ID+ * @returns {Promise<Agent>} 200 - success response - application/json* @returns {Error} 404 - Agent not found*/const getAgentHandler = async (req, res) => {try {const id = req.params.id;- const agent = await getAgent({ id });+ const author = req.user.id;++ let query = { id, author };++ const globalProject = await getProjectByName(Constants.GLOBAL_PROJECT_NAME, ['agentIds']);+ if (globalProject && (globalProject.agentIds?.length ?? 0) > 0) {+ query = {+ $or: [{ id, $in: globalProject.agentIds }, query],+ };+ }++ const agent = await getAgent(query);+if (!agent) {return res.status(404).json({ error: 'Agent not found' });}++ if (agent.author !== author) {+ delete agent.author;+ }+return res.status(200).json(agent);} catch (error) {logger.error('[/Agents/:id] Error retrieving agent', error);@@ -82,7 +103,17 @@ const getAgentHandler = async (req, res) => {const updateAgentHandler = async (req, res) => {try {const id = req.params.id;- const updatedAgent = await updateAgent({ id, author: req.user.id }, req.body);+ const { projectIds, removeProjectIds, ...updateData } = req.body;++ let updatedAgent;+ if (Object.keys(updateData).length > 0) {+ updatedAgent = await updateAgent({ id, author: req.user.id }, updateData);+ }++ if (projectIds || removeProjectIds) {+ updatedAgent = await updateAgentProjects(id, projectIds, removeProjectIds);+ }+return res.json(updatedAgent);} catch (error) {logger.error('[/Agents/:id] Error updating Agent', error);@@ -119,13 +150,13 @@ const deleteAgentHandler = async (req, res) => {* @param {object} req - Express Request* @param {object} req.query - Request query* @param {string} [req.query.user] - The user ID of the agent's author.- * @returns {AgentListResponse} 200 - success response - application/json+ * @returns {Promise<AgentListResponse>} 200 - success response - application/json*/const getListAgentsHandler = async (req, res) => {try {- const { user } = req.query;- const filter = user ? { author: user } : {};- const data = await getListAgents(filter);+ const data = await getListAgents({+ author: req.user.id,+ });return res.json(data);} catch (error) {logger.error('[/Agents] Error listing Agents', error);diff --git a/api/server/index.js b/api/server/index.jsindex 3fa5778301..47ce354f2a 100644--- a/api/server/index.js+++ b/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/bedrock', routes.bedrock);app.use('/api/tags', routes.tags);diff --git a/api/server/middleware/abortMiddleware.js b/api/server/middleware/abortMiddleware.jsindex e855c0cb69..7fb84a3074 100644--- a/api/server/middleware/abortMiddleware.js+++ b/api/server/middleware/abortMiddleware.js@@ -107,7 +107,7 @@ const createAbortController = (req, res, getAbortData, getReqData) => {finish_reason: 'incomplete',endpoint: endpointOption.endpoint,iconURL: endpointOption.iconURL,- model: endpointOption.modelOptions.model,+ model: endpointOption.modelOptions?.model ?? endpointOption.model_parameters?.model,unfinished: false,error: false,isCreatedByUser: false,diff --git a/api/server/middleware/buildEndpointOption.js b/api/server/middleware/buildEndpointOption.jsindex 83e06d77c3..2b4ba40172 100644--- a/api/server/middleware/buildEndpointOption.js+++ b/api/server/middleware/buildEndpointOption.js@@ -5,6 +5,7 @@ const assistants = require('~/server/services/Endpoints/assistants');const gptPlugins = require('~/server/services/Endpoints/gptPlugins');const { processFiles } = require('~/server/services/Files/process');const anthropic = require('~/server/services/Endpoints/anthropic');+const bedrock = require('~/server/services/Endpoints/bedrock');const openAI = require('~/server/services/Endpoints/openAI');const agents = require('~/server/services/Endpoints/agents');const custom = require('~/server/services/Endpoints/custom');@@ -17,6 +18,7 @@ const buildFunction = {[EModelEndpoint.google]: google.buildOptions,[EModelEndpoint.custom]: custom.buildOptions,[EModelEndpoint.agents]: agents.buildOptions,+ [EModelEndpoint.bedrock]: bedrock.buildOptions,[EModelEndpoint.azureOpenAI]: openAI.buildOptions,[EModelEndpoint.anthropic]: anthropic.buildOptions,[EModelEndpoint.gptPlugins]: gptPlugins.buildOptions,diff --git a/api/server/routes/agents/actions.js b/api/server/routes/agents/actions.jsindex e79f749fc1..dde3293b42 100644--- a/api/server/routes/agents/actions.js+++ b/api/server/routes/agents/actions.js@@ -41,7 +41,7 @@ router.post('/:agent_id', async (req, res) => {return res.status(400).json({ message: 'No functions provided' });}- let metadata = encryptMetadata(_metadata);+ let metadata = await encryptMetadata(_metadata);let { domain } = metadata;domain = await domainParser(req, domain, true);diff --git a/api/server/routes/agents/v1.js b/api/server/routes/agents/v1.jsindex 1001873fe4..d3a3005bd5 100644--- a/api/server/routes/agents/v1.js+++ b/api/server/routes/agents/v1.js@@ -1,11 +1,30 @@const multer = require('multer');const express = require('express');+const { PermissionTypes, Permissions } = require('librechat-data-provider');+const { requireJwtAuth, generateCheckAccess } = require('~/server/middleware');const v1 = require('~/server/controllers/agents/v1');const actions = require('./actions');const upload = multer();const router = express.Router();+const checkAgentAccess = generateCheckAccess(PermissionTypes.AGENTS, [Permissions.USE]);+const checkAgentCreate = generateCheckAccess(PermissionTypes.AGENTS, [+ Permissions.USE,+ Permissions.CREATE,+]);++const checkGlobalAgentShare = generateCheckAccess(+ PermissionTypes.AGENTS,+ [Permissions.USE, Permissions.CREATE],+ {+ [Permissions.SHARED_GLOBAL]: ['projectIds', 'removeProjectIds'],+ },+);++router.use(requireJwtAuth);+router.use(checkAgentAccess);+/*** Agent actions route.* @route GET|POST /agents/actions@@ -27,7 +46,7 @@ router.use('/tools', (req, res) => {* @param {AgentCreateParams} req.body - The agent creation parameters.* @returns {Agent} 201 - Success response - application/json*/-router.post('/', v1.createAgent);+router.post('/', checkAgentCreate, v1.createAgent);/*** Retrieves an agent.@@ -35,7 +54,7 @@ router.post('/', v1.createAgent);* @param {string} req.params.id - Agent identifier.* @returns {Agent} 200 - Success response - application/json*/-router.get('/:id', v1.getAgent);+router.get('/:id', checkAgentAccess, v1.getAgent);/*** Updates an agent.@@ -44,7 +63,7 @@ router.get('/:id', v1.getAgent);* @param {AgentUpdateParams} req.body - The agent update parameters.* @returns {Agent} 200 - Success response - application/json*/-router.patch('/:id', v1.updateAgent);+router.patch('/:id', checkGlobalAgentShare, v1.updateAgent);/*** Deletes an agent.@@ -52,7 +71,7 @@ router.patch('/:id', v1.updateAgent);* @param {string} req.params.id - Agent identifier.* @returns {Agent} 200 - success response - application/json*/-router.delete('/:id', v1.deleteAgent);+router.delete('/:id', checkAgentCreate, v1.deleteAgent);/*** Returns a list of agents.@@ -60,9 +79,7 @@ router.delete('/:id', v1.deleteAgent);* @param {AgentListParams} req.query - The agent list parameters for pagination and sorting.* @returns {AgentListResponse} 200 - success response - application/json*/-router.get('/', v1.getListAgents);--// TODO: handle private agents+router.get('/', checkAgentAccess, v1.getListAgents);/*** Uploads and updates an avatar for a specific agent.@@ -72,6 +89,6 @@ router.get('/', v1.getListAgents);* @param {string} [req.body.metadata] - Optional metadata for the agent's avatar.* @returns {Object} 200 - success response - application/json*/-router.post('/avatar/:agent_id', upload.single('file'), v1.uploadAgentAvatar);+router.post('/avatar/:agent_id', checkAgentAccess, upload.single('file'), v1.uploadAgentAvatar);module.exports = router;diff --git a/api/server/routes/bedrock/chat.js b/api/server/routes/bedrock/chat.jsnew file mode 100644index 0000000000..605a012710--- /dev/null+++ b/api/server/routes/bedrock/chat.js@@ -0,0 +1,36 @@+const express = require('express');++const router = express.Router();+const {+ setHeaders,+ handleAbort,+ // validateModel,+ // validateEndpoint,+ buildEndpointOption,+} = 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');++router.post('/abort', handleAbort());++/**+ * @route POST /+ * @desc Chat with an assistant+ * @access Public+ * @param {express.Request} req - The request object, containing the request data.+ * @param {express.Response} res - The response object, used to send back a response.+ * @returns {void}+ */+router.post(+ '/',+ // validateModel,+ // validateEndpoint,+ buildEndpointOption,+ setHeaders,+ async (req, res, next) => {+ await AgentController(req, res, next, initializeClient, addTitle);+ },+);++module.exports = router;diff --git a/api/server/routes/bedrock/index.js b/api/server/routes/bedrock/index.jsnew file mode 100644index 0000000000..b1a9efec4c--- /dev/null+++ b/api/server/routes/bedrock/index.js@@ -0,0 +1,19 @@+const express = require('express');+const router = express.Router();+const {+ uaParser,+ checkBan,+ requireJwtAuth,+ // concurrentLimiter,+ // messageIpLimiter,+ // messageUserLimiter,+} = require('~/server/middleware');++const chat = require('./chat');++router.use(requireJwtAuth);+router.use(checkBan);+router.use(uaParser);+router.use('/chat', chat);++module.exports = router;diff --git a/api/server/routes/config.js b/api/server/routes/config.jsindex 3fc90c14bc..f6669169ac 100644--- a/api/server/routes/config.js+++ b/api/server/routes/config.js@@ -1,5 +1,5 @@const express = require('express');-const { CacheKeys, defaultSocialLogins } = require('librechat-data-provider');+const { CacheKeys, defaultSocialLogins, Constants } = require('librechat-data-provider');const { getLdapConfig } = require('~/server/services/Config/ldap');const { getProjectByName } = require('~/models/Project');const { isEnabled } = require('~/server/utils');@@ -32,7 +32,7 @@ router.get('/', async function (req, res) {return today.getMonth() === 1 && today.getDate() === 11;};- const instanceProject = await getProjectByName('instance', '_id');+ const instanceProject = await getProjectByName(Constants.GLOBAL_PROJECT_NAME, '_id');const ldap = getLdapConfig();diff --git a/api/server/routes/index.js b/api/server/routes/index.jsindex 90ba5c73ad..3790aacd24 100644--- a/api/server/routes/index.js+++ b/api/server/routes/index.js@@ -8,6 +8,7 @@ const presets = require('./presets');const prompts = require('./prompts');const balance = require('./balance');const plugins = require('./plugins');+const bedrock = require('./bedrock');const search = require('./search');const models = require('./models');const convos = require('./convos');@@ -36,6 +37,7 @@ module.exports = {files,share,agents,+ bedrock,convos,search,prompts,diff --git a/api/server/routes/prompts.js b/api/server/routes/prompts.jsindex 5a6dcafcb6..54128d3b39 100644--- a/api/server/routes/prompts.js+++ b/api/server/routes/prompts.js@@ -24,6 +24,7 @@ const checkPromptCreate = generateCheckAccess(PermissionTypes.PROMPTS, [Permissions.USE,Permissions.CREATE,]);+const checkGlobalPromptShare = generateCheckAccess(PermissionTypes.PROMPTS,[Permissions.USE, Permissions.CREATE],diff --git a/api/server/services/ActionService.js b/api/server/services/ActionService.jsindex 04a9b9829d..da69548b43 100644--- a/api/server/services/ActionService.js+++ b/api/server/services/ActionService.js@@ -165,7 +165,7 @@ async function createActionTool({ action, requestBuilder, zodSchema, name, descr* Encrypts sensitive metadata values for an action.** @param {ActionMetadata} metadata - The action metadata to encrypt.- * @returns {ActionMetadata} The updated action metadata with encrypted values.+ * @returns {Promise<ActionMetadata>} The updated action metadata with encrypted values.*/async function encryptMetadata(metadata) {const encryptedMetadata = { ...metadata };diff --git a/api/server/services/AppService.js b/api/server/services/AppService.jsindex eae83bc6e0..19a9fc91a9 100644--- a/api/server/services/AppService.js+++ b/api/server/services/AppService.js@@ -94,18 +94,19 @@ const AppService = async (app) => {);}- if (endpoints?.[EModelEndpoint.openAI]) {- endpointLocals[EModelEndpoint.openAI] = endpoints[EModelEndpoint.openAI];- }- if (endpoints?.[EModelEndpoint.google]) {- endpointLocals[EModelEndpoint.google] = endpoints[EModelEndpoint.google];- }- if (endpoints?.[EModelEndpoint.anthropic]) {- endpointLocals[EModelEndpoint.anthropic] = endpoints[EModelEndpoint.anthropic];- }- if (endpoints?.[EModelEndpoint.gptPlugins]) {- endpointLocals[EModelEndpoint.gptPlugins] = endpoints[EModelEndpoint.gptPlugins];- }+ const endpointKeys = [+ EModelEndpoint.openAI,+ EModelEndpoint.google,+ EModelEndpoint.bedrock,+ EModelEndpoint.anthropic,+ EModelEndpoint.gptPlugins,+ ];++ endpointKeys.forEach((key) => {+ if (endpoints?.[key]) {+ endpointLocals[key] = endpoints[key];+ }+ });app.locals = {...defaultLocals,diff --git a/api/server/services/Config/EndpointService.js b/api/server/services/Config/EndpointService.jsindex b2f82f383b..485c99f373 100644--- a/api/server/services/Config/EndpointService.js+++ b/api/server/services/Config/EndpointService.js@@ -45,6 +45,7 @@ module.exports = {AZURE_ASSISTANTS_BASE_URL,EModelEndpoint.azureAssistants,),+ [EModelEndpoint.bedrock]: generateConfig(process.env.BEDROCK_AWS_SECRET_ACCESS_KEY),/* key will be part of separate config */[EModelEndpoint.agents]: generateConfig(process.env.I_AM_A_TEAPOT),},diff --git a/api/server/services/Config/loadDefaultEConfig.js b/api/server/services/Config/loadDefaultEConfig.jsindex df331d92fb..c11ddbe9d5 100644--- a/api/server/services/Config/loadDefaultEConfig.js+++ b/api/server/services/Config/loadDefaultEConfig.js@@ -9,22 +9,13 @@ const { config } = require('./EndpointService');*/async function loadDefaultEndpointsConfig(req) {const { google, gptPlugins } = await loadAsyncEndpoints(req);- const {- openAI,- agents,- assistants,- azureAssistants,- bingAI,- anthropic,- azureOpenAI,- chatGPTBrowser,- } = config;+ const { assistants, azureAssistants, bingAI, azureOpenAI, chatGPTBrowser } = config;const enabledEndpoints = getEnabledEndpoints();const endpointConfig = {- [EModelEndpoint.openAI]: openAI,- [EModelEndpoint.agents]: agents,+ [EModelEndpoint.openAI]: config[EModelEndpoint.openAI],+ [EModelEndpoint.agents]: config[EModelEndpoint.agents],[EModelEndpoint.assistants]: assistants,[EModelEndpoint.azureAssistants]: azureAssistants,[EModelEndpoint.azureOpenAI]: azureOpenAI,@@ -32,7 +23,8 @@ async function loadDefaultEndpointsConfig(req) {[EModelEndpoint.bingAI]: bingAI,[EModelEndpoint.chatGPTBrowser]: chatGPTBrowser,[EModelEndpoint.gptPlugins]: gptPlugins,- [EModelEndpoint.anthropic]: anthropic,+ [EModelEndpoint.anthropic]: config[EModelEndpoint.anthropic],+ [EModelEndpoint.bedrock]: config[EModelEndpoint.bedrock],};const orderedAndFilteredEndpoints = enabledEndpoints.reduce((config, key, index) => {diff --git a/api/server/services/Config/loadDefaultModels.js b/api/server/services/Config/loadDefaultModels.jsindex e06b73c0c0..464e84d44e 100644--- a/api/server/services/Config/loadDefaultModels.js+++ b/api/server/services/Config/loadDefaultModels.js@@ -3,6 +3,7 @@ const { useAzurePlugins } = require('~/server/services/Config/EndpointService').const {getOpenAIModels,getGoogleModels,+ getBedrockModels,getAnthropicModels,getChatGPTBrowserModels,} = require('~/server/services/ModelService');@@ -38,6 +39,7 @@ async function loadDefaultModels(req) {[EModelEndpoint.chatGPTBrowser]: chatGPTBrowser,[EModelEndpoint.assistants]: assistants,[EModelEndpoint.azureAssistants]: azureAssistants,+ [EModelEndpoint.bedrock]: getBedrockModels(),};}diff --git a/api/server/services/Endpoints/agents/build.js b/api/server/services/Endpoints/agents/build.jsindex 256901057d..d04dee9a06 100644--- a/api/server/services/Endpoints/agents/build.js+++ b/api/server/services/Endpoints/agents/build.js@@ -2,7 +2,7 @@ const { getAgent } = require('~/models/Agent');const { logger } = require('~/config');const buildOptions = (req, endpoint, parsedBody) => {- const { agent_id, instructions, spec, ...rest } = parsedBody;+ const { agent_id, instructions, spec, ...model_parameters } = parsedBody;const agentPromise = getAgent({id: agent_id,@@ -19,9 +19,7 @@ const buildOptions = (req, endpoint, parsedBody) => {agent_id,instructions,spec,- modelOptions: {- ...rest,- },+ model_parameters,};return endpointOption;diff --git a/api/server/services/Endpoints/agents/initialize.js b/api/server/services/Endpoints/agents/initialize.jsindex 8627775ce5..a079e2145f 100644--- a/api/server/services/Endpoints/agents/initialize.js+++ b/api/server/services/Endpoints/agents/initialize.js@@ -11,7 +11,12 @@const { z } = require('zod');const { tool } = require('@langchain/core/tools');-const { EModelEndpoint, providerEndpointMap } = require('librechat-data-provider');+const { createContentAggregator } = require('@librechat/agents');+const {+ EModelEndpoint,+ providerEndpointMap,+ getResponseSender,+} = require('librechat-data-provider');const { getDefaultHandlers } = require('~/server/controllers/agents/callbacks');// for testing purposes// const createTavilySearchTool = require('~/app/clients/tools/structured/TavilySearch');@@ -53,7 +58,8 @@ const initializeClient = async ({ req, res, endpointOption }) => {}// TODO: use endpointOption to determine options/modelOptions- const eventHandlers = getDefaultHandlers({ res });+ const { contentParts, aggregateContent } = createContentAggregator();+ const eventHandlers = getDefaultHandlers({ res, aggregateContent });// const tools = [createTavilySearchTool()];// const tools = [_getWeather];@@ -90,7 +96,7 @@ const initializeClient = async ({ req, res, endpointOption }) => {}// TODO: pass-in override settings that are specific to current run- endpointOption.modelOptions.model = agent.model;+ endpointOption.model_parameters.model = agent.model;const options = await getOptions({req,res,@@ -101,13 +107,21 @@ const initializeClient = async ({ req, res, endpointOption }) => {});modelOptions = Object.assign(modelOptions, options.llmConfig);+ const sender = getResponseSender({+ ...endpointOption,+ model: endpointOption.model_parameters.model,+ });+const client = new AgentClient({req,agent,tools,+ sender,toolMap,+ contentParts,modelOptions,eventHandlers,+ endpoint: EModelEndpoint.agents,configOptions: options.configOptions,maxContextTokens:agent.max_context_tokens ??diff --git a/api/server/services/Endpoints/anthropic/addTitle.js b/api/server/services/Endpoints/anthropic/addTitle.jsindex b69c04de68..5c477632d2 100644--- a/api/server/services/Endpoints/anthropic/addTitle.js+++ b/api/server/services/Endpoints/anthropic/addTitle.js@@ -23,7 +23,7 @@ const addTitle = async (req, { text, response, client }) => {const title = await client.titleConvo({text,- responseText: response?.text,+ responseText: response?.text ?? '',conversationId: response.conversationId,});await titleCache.set(key, title, 120000);diff --git a/api/server/services/Endpoints/bedrock/build.js b/api/server/services/Endpoints/bedrock/build.jsnew file mode 100644index 0000000000..d6fb0636a9--- /dev/null+++ b/api/server/services/Endpoints/bedrock/build.js@@ -0,0 +1,44 @@+const { removeNullishValues, bedrockInputParser } = require('librechat-data-provider');+const generateArtifactsPrompt = require('~/app/clients/prompts/artifacts');+const { logger } = require('~/config');++const buildOptions = (endpoint, parsedBody) => {+ const {+ modelLabel: name,+ promptPrefix,+ maxContextTokens,+ resendFiles = true,+ imageDetail,+ iconURL,+ greeting,+ spec,+ artifacts,+ ...model_parameters+ } = parsedBody;+ let parsedParams = model_parameters;+ try {+ parsedParams = bedrockInputParser.parse(model_parameters);+ } catch (error) {+ logger.warn('Failed to parse bedrock input', error);+ }+ const endpointOption = removeNullishValues({+ endpoint,+ name,+ resendFiles,+ imageDetail,+ iconURL,+ greeting,+ spec,+ promptPrefix,+ maxContextTokens,+ model_parameters: parsedParams,+ });++ if (typeof artifacts === 'string') {+ endpointOption.artifactsPrompt = generateArtifactsPrompt({ endpoint, artifacts });+ }++ return endpointOption;+};++module.exports = { buildOptions };diff --git a/api/server/services/Endpoints/bedrock/index.js b/api/server/services/Endpoints/bedrock/index.jsnew file mode 100644index 0000000000..8989f7df8c--- /dev/null+++ b/api/server/services/Endpoints/bedrock/index.js@@ -0,0 +1,7 @@+const build = require('./build');+const initialize = require('./initialize');++module.exports = {+ ...build,+ ...initialize,+};diff --git a/api/server/services/Endpoints/bedrock/initialize.js b/api/server/services/Endpoints/bedrock/initialize.jsnew file mode 100644index 0000000000..db90d5fc81--- /dev/null+++ b/api/server/services/Endpoints/bedrock/initialize.js@@ -0,0 +1,72 @@+const { createContentAggregator } = require('@librechat/agents');+const {+ EModelEndpoint,+ providerEndpointMap,+ getResponseSender,+} = require('librechat-data-provider');+const { getDefaultHandlers } = require('~/server/controllers/agents/callbacks');+// const { loadAgentTools } = require('~/server/services/ToolService');+const getOptions = require('~/server/services/Endpoints/bedrock/options');+const AgentClient = require('~/server/controllers/agents/client');+const { getModelMaxTokens } = require('~/utils');++const initializeClient = async ({ req, res, endpointOption }) => {+ if (!endpointOption) {+ throw new Error('Endpoint option not provided');+ }++ /** @type {Array<UsageMetadata>} */+ const collectedUsage = [];+ const { contentParts, aggregateContent } = createContentAggregator();+ const eventHandlers = getDefaultHandlers({ res, aggregateContent, collectedUsage });++ // const tools = [createTavilySearchTool()];++ /** @type {Agent} */+ const agent = {+ id: EModelEndpoint.bedrock,+ name: endpointOption.name,+ instructions: endpointOption.promptPrefix,+ provider: EModelEndpoint.bedrock,+ model: endpointOption.model_parameters.model,+ model_parameters: endpointOption.model_parameters,+ };++ let modelOptions = { model: agent.model };++ // TODO: pass-in override settings that are specific to current run+ const options = await getOptions({+ req,+ res,+ endpointOption,+ });++ modelOptions = Object.assign(modelOptions, options.llmConfig);+ const maxContextTokens =+ agent.max_context_tokens ??+ getModelMaxTokens(modelOptions.model, providerEndpointMap[agent.provider]);++ const sender = getResponseSender({+ ...endpointOption,+ model: endpointOption.model_parameters.model,+ });++ const client = new AgentClient({+ req,+ agent,+ sender,+ // tools,+ // toolMap,+ modelOptions,+ contentParts,+ eventHandlers,+ collectedUsage,+ maxContextTokens,+ endpoint: EModelEndpoint.bedrock,+ configOptions: options.configOptions,+ attachments: endpointOption.attachments,+ });+ return { client };+};++module.exports = { initializeClient };diff --git a/api/server/services/Endpoints/bedrock/options.js b/api/server/services/Endpoints/bedrock/options.jsnew file mode 100644index 0000000000..0839d033ce--- /dev/null+++ b/api/server/services/Endpoints/bedrock/options.js@@ -0,0 +1,90 @@+const { HttpsProxyAgent } = require('https-proxy-agent');+const {+ EModelEndpoint,+ Constants,+ AuthType,+ removeNullishValues,+} = require('librechat-data-provider');+const { getUserKey, checkUserKeyExpiry } = require('~/server/services/UserService');+const { sleep } = require('~/server/utils');++const getOptions = async ({ req, endpointOption }) => {+ const {+ BEDROCK_AWS_SECRET_ACCESS_KEY,+ BEDROCK_AWS_ACCESS_KEY_ID,+ BEDROCK_REVERSE_PROXY,+ BEDROCK_AWS_DEFAULT_REGION,+ PROXY,+ } = process.env;+ const expiresAt = req.body.key;+ const isUserProvided = BEDROCK_AWS_SECRET_ACCESS_KEY === AuthType.USER_PROVIDED;++ const credentials = isUserProvided+ ? await getUserKey({ userId: req.user.id, name: EModelEndpoint.bedrock })+ : {+ accessKeyId: BEDROCK_AWS_ACCESS_KEY_ID,+ secretAccessKey: BEDROCK_AWS_SECRET_ACCESS_KEY,+ };++ if (!credentials) {+ throw new Error('Bedrock credentials not provided. Please provide them again.');+ }++ if (expiresAt && isUserProvided) {+ checkUserKeyExpiry(expiresAt, EModelEndpoint.bedrock);+ }++ /** @type {number} */+ let streamRate = Constants.DEFAULT_STREAM_RATE;++ /** @type {undefined | TBaseEndpoint} */+ const bedrockConfig = req.app.locals[EModelEndpoint.bedrock];++ if (bedrockConfig && bedrockConfig.streamRate) {+ streamRate = bedrockConfig.streamRate;+ }++ /** @type {undefined | TBaseEndpoint} */+ const allConfig = req.app.locals.all;+ if (allConfig && allConfig.streamRate) {+ streamRate = allConfig.streamRate;+ }++ /** @type {import('@librechat/agents').BedrockConverseClientOptions} */+ const requestOptions = Object.assign(+ {+ credentials,+ model: endpointOption.model,+ region: BEDROCK_AWS_DEFAULT_REGION,+ streaming: true,+ streamUsage: true,+ callbacks: [+ {+ handleLLMNewToken: async () => {+ if (!streamRate) {+ return;+ }+ await sleep(streamRate);+ },+ },+ ],+ },+ endpointOption.model_parameters,+ );++ const configOptions = {};+ if (PROXY) {+ configOptions.httpAgent = new HttpsProxyAgent(PROXY);+ }++ if (BEDROCK_REVERSE_PROXY) {+ configOptions.endpointHost = BEDROCK_REVERSE_PROXY;+ }++ return {+ llmConfig: removeNullishValues(requestOptions),+ configOptions,+ };+};++module.exports = getOptions;diff --git a/api/server/services/Endpoints/bedrock/title.js b/api/server/services/Endpoints/bedrock/title.jsnew file mode 100644index 0000000000..520b9f78c4--- /dev/null+++ b/api/server/services/Endpoints/bedrock/title.js@@ -0,0 +1,40 @@+const { CacheKeys } = require('librechat-data-provider');+const getLogStores = require('~/cache/getLogStores');+const { isEnabled } = require('~/server/utils');+const { saveConvo } = require('~/models');++const addTitle = async (req, { text, response, client }) => {+ const { TITLE_CONVO = true } = process.env ?? {};+ if (!isEnabled(TITLE_CONVO)) {+ return;+ }++ if (client.options.titleConvo === false) {+ return;+ }++ // If the request was aborted, don't generate the title.+ if (client.abortController.signal.aborted) {+ return;+ }++ const titleCache = getLogStores(CacheKeys.GEN_TITLE);+ const key = `${req.user.id}-${response.conversationId}`;++ const title = await client.titleConvo({+ text,+ responseText: response?.text ?? '',+ conversationId: response.conversationId,+ });+ await titleCache.set(key, title, 120000);+ await saveConvo(+ req,+ {+ conversationId: response.conversationId,+ title,+ },+ { context: 'api/server/services/Endpoints/bedrock/title.js' },+ );+};++module.exports = addTitle;diff --git a/api/server/services/Endpoints/google/addTitle.js b/api/server/services/Endpoints/google/addTitle.jsindex 14eafe841d..f21d123214 100644--- a/api/server/services/Endpoints/google/addTitle.js+++ b/api/server/services/Endpoints/google/addTitle.js@@ -49,7 +49,7 @@ const addTitle = async (req, { text, response, client }) => {const title = await titleClient.titleConvo({text,- responseText: response?.text,+ responseText: response?.text ?? '',conversationId: response.conversationId,});await titleCache.set(key, title, 120000);diff --git a/api/server/services/Endpoints/openAI/addTitle.js b/api/server/services/Endpoints/openAI/addTitle.jsindex af886dd22d..35291c5e31 100644--- a/api/server/services/Endpoints/openAI/addTitle.js+++ b/api/server/services/Endpoints/openAI/addTitle.js@@ -23,7 +23,7 @@ const addTitle = async (req, { text, response, client }) => {const title = await client.titleConvo({text,- responseText: response?.text,+ responseText: response?.text ?? '',conversationId: response.conversationId,});await titleCache.set(key, title, 120000);diff --git a/api/server/services/Files/images/encode.js b/api/server/services/Files/images/encode.jsindex 4edb0bd56c..05c9fc1d33 100644--- a/api/server/services/Files/images/encode.js+++ b/api/server/services/Files/images/encode.js@@ -23,7 +23,13 @@ async function fetchImageToBase64(url) {}}-const base64Only = new Set([EModelEndpoint.google, EModelEndpoint.anthropic, 'Ollama', 'ollama']);+const base64Only = new Set([+ EModelEndpoint.google,+ EModelEndpoint.anthropic,+ 'Ollama',+ 'ollama',+ EModelEndpoint.bedrock,+]);/*** Encodes and formats the given files.diff --git a/api/server/services/ModelService.js b/api/server/services/ModelService.jsindex b6ca6e4f4b..7d2a3ae9ec 100644--- a/api/server/services/ModelService.js+++ b/api/server/services/ModelService.js@@ -5,6 +5,21 @@ const { extractBaseURL, inputSchema, processModelData, logAxiosError } = requireconst { OllamaClient } = require('~/app/clients/OllamaClient');const getLogStores = require('~/cache/getLogStores');+/**+ * Splits a string by commas and trims each resulting value.+ * @param {string} input - The input string to split.+ * @returns {string[]} An array of trimmed values.+ */+const splitAndTrim = (input) => {+ if (!input || typeof input !== 'string') {+ return [];+ }+ return input+ .split(',')+ .map((item) => item.trim())+ .filter(Boolean);+};+const { openAIApiKey, userProvidedOpenAI } = require('./Config/EndpointService').config;/**@@ -194,7 +209,7 @@ const getOpenAIModels = async (opts) => {}if (process.env[key]) {- models = String(process.env[key]).split(',');+ models = splitAndTrim(process.env[key]);return models;}@@ -208,7 +223,7 @@ const getOpenAIModels = async (opts) => {const getChatGPTBrowserModels = () => {let models = ['text-davinci-002-render-sha', 'gpt-4'];if (process.env.CHATGPT_MODELS) {- models = String(process.env.CHATGPT_MODELS).split(',');+ models = splitAndTrim(process.env.CHATGPT_MODELS);}return models;@@ -217,7 +232,7 @@ const getChatGPTBrowserModels = () => {const getAnthropicModels = () => {let models = defaultModels[EModelEndpoint.anthropic];if (process.env.ANTHROPIC_MODELS) {- models = String(process.env.ANTHROPIC_MODELS).split(',');+ models = splitAndTrim(process.env.ANTHROPIC_MODELS);}return models;@@ -226,7 +241,16 @@ const getAnthropicModels = () => {const getGoogleModels = () => {let models = defaultModels[EModelEndpoint.google];if (process.env.GOOGLE_MODELS) {- models = String(process.env.GOOGLE_MODELS).split(',');+ models = splitAndTrim(process.env.GOOGLE_MODELS);+ }++ return models;+};++const getBedrockModels = () => {+ let models = defaultModels[EModelEndpoint.bedrock];+ if (process.env.BEDROCK_AWS_MODELS) {+ models = splitAndTrim(process.env.BEDROCK_AWS_MODELS);}return models;@@ -234,7 +258,9 @@ const getGoogleModels = () => {module.exports = {fetchModels,+ splitAndTrim,getOpenAIModels,+ getBedrockModels,getChatGPTBrowserModels,getAnthropicModels,getGoogleModels,diff --git a/api/server/services/ModelService.spec.js b/api/server/services/ModelService.spec.jsindex fc7c8b1079..4e4647ee35 100644--- a/api/server/services/ModelService.spec.js+++ b/api/server/services/ModelService.spec.js@@ -1,7 +1,16 @@const axios = require('axios');+const { EModelEndpoint, defaultModels } = require('librechat-data-provider');const { logger } = require('~/config');-const { fetchModels, getOpenAIModels } = require('./ModelService');+const {+ fetchModels,+ splitAndTrim,+ getOpenAIModels,+ getGoogleModels,+ getBedrockModels,+ getAnthropicModels,+} = require('./ModelService');+jest.mock('~/utils', () => {const originalUtils = jest.requireActual('~/utils');return {@@ -329,3 +338,71 @@ describe('fetchModels with Ollama specific logic', () => {);});});++describe('splitAndTrim', () => {+ it('should split a string by commas and trim each value', () => {+ const input = ' model1, model2 , model3,model4 ';+ const expected = ['model1', 'model2', 'model3', 'model4'];+ expect(splitAndTrim(input)).toEqual(expected);+ });++ it('should return an empty array for empty input', () => {+ expect(splitAndTrim('')).toEqual([]);+ });++ it('should return an empty array for null input', () => {+ expect(splitAndTrim(null)).toEqual([]);+ });++ it('should return an empty array for undefined input', () => {+ expect(splitAndTrim(undefined)).toEqual([]);+ });++ it('should filter out empty values after trimming', () => {+ const input = 'model1,, ,model2,';+ const expected = ['model1', 'model2'];+ expect(splitAndTrim(input)).toEqual(expected);+ });+});++describe('getAnthropicModels', () => {+ it('returns default models when ANTHROPIC_MODELS is not set', () => {+ delete process.env.ANTHROPIC_MODELS;+ const models = getAnthropicModels();+ expect(models).toEqual(defaultModels[EModelEndpoint.anthropic]);+ });++ it('returns models from ANTHROPIC_MODELS when set', () => {+ process.env.ANTHROPIC_MODELS = 'claude-1, claude-2 ';+ const models = getAnthropicModels();+ expect(models).toEqual(['claude-1', 'claude-2']);+ });+});++describe('getGoogleModels', () => {+ it('returns default models when GOOGLE_MODELS is not set', () => {+ delete process.env.GOOGLE_MODELS;+ const models = getGoogleModels();+ expect(models).toEqual(defaultModels[EModelEndpoint.google]);+ });++ it('returns models from GOOGLE_MODELS when set', () => {+ process.env.GOOGLE_MODELS = 'gemini-pro, bard ';+ const models = getGoogleModels();+ expect(models).toEqual(['gemini-pro', 'bard']);+ });+});++describe('getBedrockModels', () => {+ it('returns default models when BEDROCK_AWS_MODELS is not set', () => {+ delete process.env.BEDROCK_AWS_MODELS;+ const models = getBedrockModels();+ expect(models).toEqual(defaultModels[EModelEndpoint.bedrock]);+ });++ it('returns models from BEDROCK_AWS_MODELS when set', () => {+ process.env.BEDROCK_AWS_MODELS = 'anthropic.claude-v2, ai21.j2-ultra ';+ const models = getBedrockModels();+ expect(models).toEqual(['anthropic.claude-v2', 'ai21.j2-ultra']);+ });+});diff --git a/api/typedefs.js b/api/typedefs.jsindex 6591d192b1..b2548acf15 100644--- a/api/typedefs.js+++ b/api/typedefs.js@@ -20,12 +20,30 @@* @memberof typedefs*/+/**+ * @exports AgentRun+ * @typedef {import('@librechat/agents').Run} AgentRun+ * @memberof typedefs+ */++/**+ * @exports IState+ * @typedef {import('@librechat/agents').IState} IState+ * @memberof typedefs+ */+/*** @exports ClientCallbacks* @typedef {import('@librechat/agents').ClientCallbacks} ClientCallbacks* @memberof typedefs*/+/**+ * @exports BedrockClientOptions+ * @typedef {import('@librechat/agents').BedrockConverseClientOptions} BedrockClientOptions+ * @memberof typedefs+ */+/*** @exports StreamEventData* @typedef {import('@librechat/agents').StreamEventData} StreamEventData@@ -38,6 +56,12 @@* @memberof typedefs*/+/**+ * @exports UsageMetadata+ * @typedef {import('@langchain/core/messages').UsageMetadata} UsageMetadata+ * @memberof typedefs+ */+/*** @exports Ollama* @typedef {import('ollama').Ollama} Ollama@@ -893,6 +917,12 @@* @memberof typedefs*/+/**+ * @exports TAgentClient+ * @typedef {import('./server/controllers/agents/client')} TAgentClient+ * @memberof typedefs+ */+/*** @exports ImportBatchBuilder* @typedef {import('./server/utils/import/importBatchBuilder.js').ImportBatchBuilder} ImportBatchBuilderdiff --git a/api/utils/tokens.js b/api/utils/tokens.jsindex 83246c5b74..ec248fe92c 100644--- a/api/utils/tokens.js+++ b/api/utils/tokens.js@@ -7,13 +7,13 @@ const openAIModels = {'gpt-4-32k': 32758, // -10 from max'gpt-4-32k-0314': 32758, // -10 from max'gpt-4-32k-0613': 32758, // -10 from max- 'gpt-4-1106': 127990, // -10 from max- 'gpt-4-0125': 127990, // -10 from max- 'gpt-4o': 127990, // -10 from max- 'gpt-4o-mini': 127990, // -10 from max- 'gpt-4o-2024-08-06': 127990, // -10 from max- 'gpt-4-turbo': 127990, // -10 from max- 'gpt-4-vision': 127990, // -10 from max+ 'gpt-4-1106': 127500, // -500 from max+ 'gpt-4-0125': 127500, // -500 from max+ 'gpt-4o': 127500, // -500 from max+ 'gpt-4o-mini': 127500, // -500 from max+ 'gpt-4o-2024-08-06': 127500, // -500 from max+ 'gpt-4-turbo': 127500, // -500 from max+ 'gpt-4-vision': 127500, // -500 from max'gpt-3.5-turbo': 16375, // -10 from max'gpt-3.5-turbo-0613': 4092, // -5 from max'gpt-3.5-turbo-0301': 4092, // -5 from max@@ -21,9 +21,15 @@ const openAIModels = {'gpt-3.5-turbo-16k-0613': 16375, // -10 from max'gpt-3.5-turbo-1106': 16375, // -10 from max'gpt-3.5-turbo-0125': 16375, // -10 from max+};++const mistralModels = {'mistral-': 31990, // -10 from max- llama3: 8187, // -5 from max- 'llama-3': 8187, // -5 from max+ 'mistral-7b': 31990, // -10 from max+ 'mistral-small': 31990, // -10 from max+ 'mixtral-8x7b': 31990, // -10 from max+ 'mistral-large-2402': 127500,+ 'mistral-large-2407': 127500,};const cohereModels = {@@ -54,6 +60,7 @@ const googleModels = {const anthropicModels = {'claude-': 100000,+ 'claude-instant': 100000,'claude-2': 100000,'claude-2.1': 200000,'claude-3-haiku': 200000,@@ -63,7 +70,38 @@ const anthropicModels = {'claude-3.5-sonnet': 200000,};-const aggregateModels = { ...openAIModels, ...googleModels, ...anthropicModels, ...cohereModels };+const metaModels = {+ 'llama2-13b': 4000,+ 'llama2-70b': 4000,+ 'llama3-8b': 8000,+ 'llama3-70b': 8000,+ 'llama3-1-8b': 127500,+ 'llama3-1-70b': 127500,+ 'llama3-1-405b': 127500,+};++const ai21Models = {+ 'ai21.j2-mid-v1': 8182, // -10 from max+ 'ai21.j2-ultra-v1': 8182, // -10 from max+ 'ai21.jamba-instruct-v1:0': 255500, // -500 from max+};++const amazonModels = {+ 'amazon.titan-text-lite-v1': 4000,+ 'amazon.titan-text-express-v1': 8000,+ 'amazon.titan-text-premier-v1:0': 31500, // -500 from max+};++const bedrockModels = {+ ...anthropicModels,+ ...mistralModels,+ ...cohereModels,+ ...metaModels,+ ...ai21Models,+ ...amazonModels,+};++const aggregateModels = { ...openAIModels, ...googleModels, ...bedrockModels };const maxTokensMap = {[EModelEndpoint.azureOpenAI]: openAIModels,@@ -72,6 +110,7 @@ const maxTokensMap = {[EModelEndpoint.custom]: aggregateModels,[EModelEndpoint.google]: googleModels,[EModelEndpoint.anthropic]: anthropicModels,+ [EModelEndpoint.bedrock]: bedrockModels,};/**diff --git a/api/utils/tokens.spec.js b/api/utils/tokens.spec.jsindex afcd4b217a..e76e01a568 100644--- a/api/utils/tokens.spec.js+++ b/api/utils/tokens.spec.js@@ -20,18 +20,6 @@ describe('getModelMaxTokens', () => {);});- test('should return correct tokens for LLama 3 models', () => {- expect(getModelMaxTokens('meta-llama/llama-3-8b')).toBe(- maxTokensMap[EModelEndpoint.openAI]['llama-3'],- );- expect(getModelMaxTokens('meta-llama/llama-3-8b')).toBe(- maxTokensMap[EModelEndpoint.openAI]['llama3'],- );- expect(getModelMaxTokens('llama-3-500b')).toBe(maxTokensMap[EModelEndpoint.openAI]['llama-3']);- expect(getModelMaxTokens('llama3-70b')).toBe(maxTokensMap[EModelEndpoint.openAI]['llama3']);- expect(getModelMaxTokens('llama3:latest')).toBe(maxTokensMap[EModelEndpoint.openAI]['llama3']);- });-test('should return undefined for no match', () => {expect(getModelMaxTokens('unknown-model')).toBeUndefined();});diff --git a/client/src/common/agents-types.ts b/client/src/common/agents-types.tsindex eaf64f4c6c..07633a68db 100644--- a/client/src/common/agents-types.ts+++ b/client/src/common/agents-types.ts@@ -1,8 +1,8 @@import { Capabilities } from 'librechat-data-provider';import type { Agent, AgentProvider, AgentModelParameters } from 'librechat-data-provider';-import type { Option, ExtendedFile } from './types';+import type { OptionWithIcon, ExtendedFile } from './types';-export type TAgentOption = Option &+export type TAgentOption = OptionWithIcon &Agent & {files?: Array<[string, ExtendedFile]>;code_files?: Array<[string, ExtendedFile]>;@@ -23,5 +23,5 @@ export type AgentForm = {model: string | null;model_parameters: AgentModelParameters;tools?: string[];- provider?: AgentProvider | Option;+ provider?: AgentProvider | OptionWithIcon;} & AgentCapabilities;diff --git a/client/src/components/Chat/Input/HeaderOptions.tsx b/client/src/components/Chat/Input/HeaderOptions.tsxindex ae28ae1623..652e971280 100644--- a/client/src/components/Chat/Input/HeaderOptions.tsx+++ b/client/src/components/Chat/Input/HeaderOptions.tsx@@ -2,7 +2,7 @@ import { useRecoilState } from 'recoil';import { Settings2 } from 'lucide-react';import { Root, Anchor } from '@radix-ui/react-popover';import { useState, useEffect, useMemo } from 'react';-import { tPresetUpdateSchema, EModelEndpoint } from 'librechat-data-provider';+import { tPresetUpdateSchema, EModelEndpoint, paramEndpoints } from 'librechat-data-provider';import type { TPreset, TInterfaceConfig } from 'librechat-data-provider';import { EndpointSettings, SaveAsPresetDialog, AlternativeSettings } from '~/components/Endpoints';import { ModelSelect } from '~/components/Input/ModelSelect';@@ -12,7 +12,6 @@ import PopoverButtons from './PopoverButtons';import { useSetIndexOptions } from '~/hooks';import { useChatContext } from '~/Providers';import { Button } from '~/components/ui';-import { cn, cardStyle } from '~/utils/';import store from '~/store';export default function HeaderOptions({@@ -29,10 +28,10 @@ export default function HeaderOptions({useChatContext();const { setOption } = useSetIndexOptions();- const { endpoint, conversationId, jailbreak } = conversation ?? {};+ const { endpoint, conversationId, jailbreak = false } = conversation ?? {};const altConditions: { [key: string]: boolean } = {- bingAI: !!(latestMessage && conversation?.jailbreak && endpoint === 'bingAI'),+ bingAI: !!(latestMessage && jailbreak && endpoint === 'bingAI'),};const altSettings: { [key: string]: () => void } = {@@ -74,7 +73,7 @@ export default function HeaderOptions({<div className="my-auto lg:max-w-2xl xl:max-w-3xl"><span className="flex w-full flex-col items-center justify-center gap-0 md:order-none md:m-auto md:gap-2"><div className="z-[61] flex w-full items-center justify-center gap-2">- {interfaceConfig?.modelSelect && (+ {interfaceConfig?.modelSelect === true && (<ModelSelectconversation={conversation}setOption={setOption}@@ -82,7 +81,9 @@ export default function HeaderOptions({popover={true}/>)}- {!noSettings[endpoint] && interfaceConfig?.parameters && (+ {!noSettings[endpoint] &&+ interfaceConfig?.parameters === true &&+ !paramEndpoints.has(endpoint) && (<Buttonaria-label="Settings/parameters"id="parameters-button"@@ -96,11 +97,11 @@ export default function HeaderOptions({</Button>)}</div>- {interfaceConfig?.parameters && (+ {interfaceConfig?.parameters === true && !paramEndpoints.has(endpoint) && (<OptionsPopovervisible={showPopover}saveAsPreset={saveAsPreset}- presetsDisabled={!interfaceConfig.presets}+ presetsDisabled={!(interfaceConfig.presets ?? false)}PopoverButtons={<PopoverButtons />}closePopover={() => setShowPopover(false)}>@@ -114,7 +115,7 @@ export default function HeaderOptions({</div></OptionsPopover>)}- {interfaceConfig?.presets && (+ {interfaceConfig?.presets === true && (<SaveAsPresetDialogopen={saveAsDialogShow}onOpenChange={setSaveAsDialogShow}@@ -125,7 +126,7 @@ export default function HeaderOptions({}/>)}- {interfaceConfig?.parameters && (+ {interfaceConfig?.parameters === true && (<PluginStoreDialogisOpen={showPluginStoreDialog}setIsOpen={setShowPluginStoreDialog}diff --git a/client/src/components/Chat/Menus/Endpoints/Icons.tsx b/client/src/components/Chat/Menus/Endpoints/Icons.tsxindex 913fc5b3f8..b7a775b269 100644--- a/client/src/components/Chat/Menus/Endpoints/Icons.tsx+++ b/client/src/components/Chat/Menus/Endpoints/Icons.tsx@@ -11,6 +11,7 @@ import {CustomMinimalIcon,AssistantIcon,LightningIcon,+ BedrockIcon,Sparkles,} from '~/components/svg';import UnknownIcon from './UnknownIcon';@@ -52,6 +53,10 @@ const AgentAvatar = ({ className = '', agentName, avatar, size }: AgentIconMapPrreturn <BrainCircuit className={cn(agentName === '' ? 'icon-2xl' : '', className)} />;};+const Bedrock = ({ className = '' }: IconMapProps) => {+ return <BedrockIcon className={cn(className, 'h-full w-full')} />;+};+export const icons = {[EModelEndpoint.azureOpenAI]: AzureMinimalIcon,[EModelEndpoint.openAI]: GPTIcon,@@ -64,5 +69,6 @@ export const icons = {[EModelEndpoint.assistants]: AssistantAvatar,[EModelEndpoint.azureAssistants]: AssistantAvatar,[EModelEndpoint.agents]: AgentAvatar,+ [EModelEndpoint.bedrock]: Bedrock,unknown: UnknownIcon,};diff --git a/client/src/components/Chat/Messages/Content/Container.tsx b/client/src/components/Chat/Messages/Content/Container.tsxindex cbd085e308..ecc40d6cd1 100644--- a/client/src/components/Chat/Messages/Content/Container.tsx+++ b/client/src/components/Chat/Messages/Content/Container.tsx@@ -1,12 +1,12 @@import { TMessage } from 'librechat-data-provider';import Files from './Files';-const Container = ({ children, message }: { children: React.ReactNode; message: TMessage }) => (+const Container = ({ children, message }: { children: React.ReactNode; message?: TMessage }) => (<divclassName="text-message flex min-h-[20px] flex-col items-start gap-3 overflow-x-auto [.text-message+&]:mt-5"dir="auto">- {message.isCreatedByUser && <Files message={message} />}+ {message?.isCreatedByUser === true && <Files message={message} />}{children}</div>);diff --git a/client/src/components/Chat/Messages/Content/ContentParts.tsx b/client/src/components/Chat/Messages/Content/ContentParts.tsxindex 3227bce072..d73377241e 100644--- a/client/src/components/Chat/Messages/Content/ContentParts.tsx+++ b/client/src/components/Chat/Messages/Content/ContentParts.tsx@@ -1,51 +1,34 @@-import { Suspense } from 'react';+import { memo } from 'react';import type { TMessageContentParts } from 'librechat-data-provider';-import { UnfinishedMessage } from './MessageContent';-import { DelayedRender } from '~/components/ui';import Part from './Part';-const ContentParts = ({- error,- unfinished,- isSubmitting,- isLast,- content,- ...props-}: // eslint-disable-next-line @typescript-eslint/no-explicit-any-any) => {- if (error) {- // return <ErrorMessage text={text} />;- } else {- const { message } = props;- const { messageId } = message;+type ContentPartsProps = {+ content: Array<TMessageContentParts | undefined>;+ messageId: string;+ isCreatedByUser: boolean;+ isLast: boolean;+ isSubmitting: boolean;+};+const ContentParts = memo(+ ({ content, messageId, isCreatedByUser, isLast, isSubmitting }: ContentPartsProps) => {return (<>{content- .filter((part: TMessageContentParts | undefined) => part)- .map((part: TMessageContentParts | undefined, idx: number) => {- const showCursor = idx === content.length - 1 && isLast;- return (- <Part- key={`display-${messageId}-${idx}`}- showCursor={showCursor === true && isSubmitting}- isSubmitting={isSubmitting}- part={part}- {...props}- />- );- })}- {/* Temporarily remove this */}- {/* {!isSubmitting && unfinished && (- <Suspense>- <DelayedRender delay={250}>- <UnfinishedMessage message={message} key={`unfinished-${messageId}`} />- </DelayedRender>- </Suspense>- )} */}+ .filter((part) => part)+ .map((part, idx) => (+ <Part+ key={`display-${messageId}-${idx}`}+ part={part}+ isSubmitting={isSubmitting}+ showCursor={idx === content.length - 1 && isLast}+ messageId={messageId}+ isCreatedByUser={isCreatedByUser}+ />+ ))}</>);- }-};+ },+);export default ContentParts;diff --git a/client/src/components/Chat/Messages/Content/Files.tsx b/client/src/components/Chat/Messages/Content/Files.tsxindex beff81b58b..09801d92c1 100644--- a/client/src/components/Chat/Messages/Content/Files.tsx+++ b/client/src/components/Chat/Messages/Content/Files.tsx@@ -3,7 +3,7 @@ import type { TFile, TMessage } from 'librechat-data-provider';import FileContainer from '~/components/Chat/Input/Files/FileContainer';import Image from './Image';-const Files = ({ message }: { message: TMessage }) => {+const Files = ({ message }: { message?: TMessage }) => {const imageFiles = useMemo(() => {return message?.files?.filter((file) => file.type?.startsWith('image/')) || [];}, [message?.files]);@@ -20,7 +20,7 @@ const Files = ({ message }: { message: TMessage }) => {imageFiles.map((file) => (<Imagekey={file.file_id}- imagePath={file?.preview ?? file.filepath ?? ''}+ imagePath={file.preview ?? file.filepath ?? ''}height={file.height ?? 1920}width={file.width ?? 1080}altText={file.filename ?? 'Uploaded Image'}diff --git a/client/src/components/Chat/Messages/Content/MessageContent.tsx b/client/src/components/Chat/Messages/Content/MessageContent.tsxindex f22576d1eb..5f03fc1efe 100644--- a/client/src/components/Chat/Messages/Content/MessageContent.tsx+++ b/client/src/components/Chat/Messages/Content/MessageContent.tsx@@ -15,7 +15,9 @@ export const ErrorMessage = ({text,message,className = '',-}: Pick<TDisplayProps, 'text' | 'className' | 'message'>) => {+}: Pick<TDisplayProps, 'text' | 'className'> & {+ message?: TMessage;+}) => {const localize = useLocalize();if (text === 'Error connecting to server, try refreshing the page.') {console.log('error message', message);diff --git a/client/src/components/Chat/Messages/Content/Part.tsx b/client/src/components/Chat/Messages/Content/Part.tsxindex 7fcc9dbe4a..ca0469cbfd 100644--- a/client/src/components/Chat/Messages/Content/Part.tsx+++ b/client/src/components/Chat/Messages/Content/Part.tsx@@ -4,81 +4,47 @@ import {imageGenTools,isImageVisionTool,} from 'librechat-data-provider';-import { useMemo } from 'react';-import type { TMessageContentParts, TMessage } from 'librechat-data-provider';-import type { TDisplayProps } from '~/common';+import { memo } from 'react';+import type { TMessageContentParts } from 'librechat-data-provider';import { ErrorMessage } from './MessageContent';-import { useChatContext } from '~/Providers';import RetrievalCall from './RetrievalCall';import CodeAnalyze from './CodeAnalyze';import Container from './Container';import ToolCall from './ToolCall';-import Markdown from './Markdown';import ImageGen from './ImageGen';-import { cn } from '~/utils';+import Text from './Parts/Text';import Image from './Image';-// Display Message Component-const DisplayMessage = ({ text, isCreatedByUser = false, message, showCursor }: TDisplayProps) => {- const { isSubmitting, latestMessage } = useChatContext();- const showCursorState = useMemo(- () => showCursor === true && isSubmitting,- [showCursor, isSubmitting],- );- const isLatestMessage = useMemo(- () => message.messageId === latestMessage?.messageId,- [message.messageId, latestMessage?.messageId],- );-- // Note: for testing purposes- // isSubmitting && isLatestMessage && logger.log('message_stream', { text, isCreatedByUser, isSubmitting, showCursorState });-- return (- <div- className={cn(- isSubmitting ? 'submitting' : '',- showCursorState && !!text.length ? 'result-streaming' : '',- 'markdown prose message-content dark:prose-invert light w-full break-words',- isCreatedByUser ? 'whitespace-pre-wrap dark:text-gray-20' : 'dark:text-gray-70',- )}- >- {!isCreatedByUser ? (- <Markdown content={text} showCursor={showCursorState} isLatestMessage={isLatestMessage} />- ) : (- <>{text}</>- )}- </div>- );-};--export default function Part({- part,- showCursor,- isSubmitting,- message,-}: {- part: TMessageContentParts | undefined;+type PartProps = {+ part?: TMessageContentParts;isSubmitting: boolean;showCursor: boolean;- message: TMessage;-}) {+ messageId: string;+ isCreatedByUser: boolean;+};++const Part = memo(({ part, isSubmitting, showCursor, messageId, isCreatedByUser }: PartProps) => {if (!part) {return null;}if (part.type === ContentTypes.ERROR) {- return <ErrorMessage message={message} text={part[ContentTypes.TEXT].value} className="my-2" />;+ return <ErrorMessage text={part[ContentTypes.TEXT].value} className="my-2" />;} else if (part.type === ContentTypes.TEXT) {const text = typeof part.text === 'string' ? part.text : part.text.value;+if (typeof text !== 'string') {return null;}+ if (part.tool_call_ids != null && !text) {+ return null;+ }return (- <Container message={message}>- <DisplayMessage+ <Container>+ <Texttext={text}- isCreatedByUser={message.isCreatedByUser}- message={message}+ isCreatedByUser={isCreatedByUser}+ messageId={messageId}showCursor={showCursor}/></Container>@@ -93,7 +59,7 @@ export default function Part({if ('args' in toolCall && (!toolCall.type || toolCall.type === ToolCallTypes.TOOL_CALL)) {return (<ToolCall- args={toolCall.args}+ args={toolCall.args ?? ''}name={toolCall.name ?? ''}output={toolCall.output ?? ''}initialProgress={toolCall.progress ?? 0.1}@@ -132,11 +98,11 @@ export default function Part({if (isImageVisionTool(toolCall)) {if (isSubmitting && showCursor) {return (- <Container message={message}>- <DisplayMessage+ <Container>+ <Texttext={''}- isCreatedByUser={message.isCreatedByUser}- message={message}+ isCreatedByUser={isCreatedByUser}+ messageId={messageId}showCursor={showCursor}/></Container>@@ -174,4 +140,6 @@ export default function Part({}return null;-}+});++export default Part;diff --git a/client/src/components/Chat/Messages/Content/Parts/Text.tsx b/client/src/components/Chat/Messages/Content/Parts/Text.tsxnew file mode 100644index 0000000000..7d0b386c81--- /dev/null+++ b/client/src/components/Chat/Messages/Content/Parts/Text.tsx@@ -0,0 +1,39 @@+import { memo, useMemo } from 'react';+import { useChatContext } from '~/Providers';+import Markdown from '~/components/Chat/Messages/Content/Markdown';+import { cn } from '~/utils';++type TextPartProps = {+ text: string;+ isCreatedByUser: boolean;+ messageId: string;+ showCursor: boolean;+};++const TextPart = memo(({ text, isCreatedByUser, messageId, showCursor }: TextPartProps) => {+ const { isSubmitting, latestMessage } = useChatContext();+ const showCursorState = useMemo(() => showCursor && isSubmitting, [showCursor, isSubmitting]);+ const isLatestMessage = useMemo(+ () => messageId === latestMessage?.messageId,+ [messageId, latestMessage?.messageId],+ );++ return (+ <div+ className={cn(+ isSubmitting ? 'submitting' : '',+ showCursorState && !!text.length ? 'result-streaming' : '',+ 'markdown prose message-content dark:prose-invert light w-full break-words',+ isCreatedByUser ? 'whitespace-pre-wrap dark:text-gray-20' : 'dark:text-gray-70',+ )}+ >+ {!isCreatedByUser ? (+ <Markdown content={text} showCursor={showCursorState} isLatestMessage={isLatestMessage} />+ ) : (+ <>{text}</>+ )}+ </div>+ );+});++export default TextPart;diff --git a/client/src/components/Chat/Messages/MessageParts.tsx b/client/src/components/Chat/Messages/MessageParts.tsxindex 37794c44f5..52a2dbe2dd 100644--- a/client/src/components/Chat/Messages/MessageParts.tsx+++ b/client/src/components/Chat/Messages/MessageParts.tsx@@ -1,4 +1,5 @@import { useRecoilValue } from 'recoil';+import type { TMessageContentParts } from 'librechat-data-provider';import type { TMessageProps } from '~/common';import Icon from '~/components/Chat/Messages/MessageIcon';import { useMessageHelpers, useLocalize } from '~/hooks';@@ -17,7 +18,6 @@ export default function Message(props: TMessageProps) {props;const {- ask,edit,index,agent,@@ -33,7 +33,7 @@ export default function Message(props: TMessageProps) {regenerateMessage,} = useMessageHelpers(props);const fontSize = useRecoilValue(store.fontSize);- const { content, children, messageId = null, isCreatedByUser, error, unfinished } = message ?? {};+ const { children, messageId = null, isCreatedByUser } = message ?? {};if (!message) {return null;@@ -82,24 +82,11 @@ export default function Message(props: TMessageProps) {<div className="flex-col gap-1 md:gap-3"><div className="flex max-w-full flex-grow flex-col gap-0"><ContentParts- ask={ask}- edit={edit}+ content={message.content as Array<TMessageContentParts | undefined>}+ messageId={message.messageId}+ isCreatedByUser={message.isCreatedByUser}isLast={isLast}- content={content ?? []}- message={message}- messageId={messageId}- enterEdit={enterEdit}- error={!!(error ?? false)}isSubmitting={isSubmitting}- unfinished={unfinished ?? false}- isCreatedByUser={isCreatedByUser ?? true}- siblingIdx={siblingIdx ?? 0}- setSiblingIdx={- setSiblingIdx ??- (() => {- return;- })- }/></div></div>diff --git a/client/src/components/Chat/Messages/MultiMessage.tsx b/client/src/components/Chat/Messages/MultiMessage.tsxindex 0e3204f392..eb2d2e9257 100644--- a/client/src/components/Chat/Messages/MultiMessage.tsx+++ b/client/src/components/Chat/Messages/MultiMessage.tsx@@ -1,10 +1,14 @@import { useRecoilState } from 'recoil';import { useEffect, useCallback } from 'react';+import { isAssistantsEndpoint } from 'librechat-data-provider';+import type { TMessage } from 'librechat-data-provider';import type { TMessageProps } from '~/common';// eslint-disable-next-line import/no-cycle-import Message from './Message';+import MessageContent from '~/components/Messages/MessageContent';// eslint-disable-next-line import/no-cycleimport MessageParts from './MessageParts';+// eslint-disable-next-line import/no-cycle+import Message from './Message';import store from '~/store';export default function MultiMessage({@@ -30,22 +34,22 @@ export default function MultiMessage({}, [messagesTree?.length]);useEffect(() => {- if (messagesTree?.length && siblingIdx >= messagesTree?.length) {+ if (messagesTree?.length && siblingIdx >= messagesTree.length) {setSiblingIdx(0);}}, [siblingIdx, messagesTree?.length, setSiblingIdx]);- if (!(messagesTree && messagesTree?.length)) {+ if (!(messagesTree && messagesTree.length)) {return null;}- const message = messagesTree[messagesTree.length - siblingIdx - 1];+ const message = messagesTree[messagesTree.length - siblingIdx - 1] as TMessage | undefined;if (!message) {return null;}- if (message.content) {+ if (isAssistantsEndpoint(message.endpoint) && message.content) {return (<MessagePartskey={message.messageId}@@ -57,6 +61,18 @@ export default function MultiMessage({setSiblingIdx={setSiblingIdxRev}/>);+ } else if (message.content) {+ return (+ <MessageContent+ key={message.messageId}+ message={message}+ currentEditId={currentEditId}+ setCurrentEditId={setCurrentEditId}+ siblingIdx={messagesTree.length - siblingIdx - 1}+ siblingCount={messagesTree.length}+ setSiblingIdx={setSiblingIdxRev}+ />+ );}return (diff --git a/client/src/components/Endpoints/MessageEndpointIcon.tsx b/client/src/components/Endpoints/MessageEndpointIcon.tsxindex fc084bbb55..ad204a7d4b 100644--- a/client/src/components/Endpoints/MessageEndpointIcon.tsx+++ b/client/src/components/Endpoints/MessageEndpointIcon.tsx@@ -1,4 +1,4 @@-import { EModelEndpoint, isAssistantsEndpoint } from 'librechat-data-provider';+import { EModelEndpoint, isAssistantsEndpoint, alternateName } from 'librechat-data-provider';import UnknownIcon from '~/components/Chat/Menus/Endpoints/UnknownIcon';import { BrainCircuit } from 'lucide-react';import {@@ -7,6 +7,7 @@ import {PaLMIcon,CodeyIcon,GeminiIcon,+ BedrockIcon,AssistantIcon,AnthropicIcon,AzureMinimalIcon,@@ -16,11 +17,31 @@ import {import { IconProps } from '~/common';import { cn } from '~/utils';+function getGoogleIcon(model: string | null | undefined, size: number) {+ if (model?.toLowerCase().includes('code') === true) {+ return <CodeyIcon size={size * 0.75} />;+ } else if (model?.toLowerCase().includes('gemini') === true) {+ return <GeminiIcon size={size * 0.7} />;+ } else {+ return <PaLMIcon size={size * 0.7} />;+ }+}++function getGoogleModelName(model: string | null | undefined) {+ if (model?.toLowerCase().includes('code') === true) {+ return 'Codey';+ } else if (model?.toLowerCase().includes('gemini') === true) {+ return 'Gemini';+ } else {+ return 'PaLM2';+ }+}+const MessageEndpointIcon: React.FC<IconProps> = (props) => {const {error,button,- iconURL,+ iconURL = '',endpoint,jailbreak,size = 30,@@ -30,7 +51,7 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {} = props;const assistantsIcon = {- icon: props.iconURL ? (+ icon: iconURL ? (<div className="relative flex h-6 w-6 items-center justify-center"><divtitle={assistantName}@@ -42,7 +63,7 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {><imgclassName="shadow-stroke h-full w-full object-cover"- src={props.iconURL}+ src={iconURL}alt={assistantName}style={{ height: '80', width: '80' }}/>@@ -59,7 +80,7 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {};const agentsIcon = {- icon: props.iconURL ? (+ icon: iconURL ? (<div className="relative flex h-6 w-6 items-center justify-center"><divtitle={agentName}@@ -71,7 +92,7 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {><imgclassName="shadow-stroke h-full w-full object-cover"- src={props.iconURL}+ src={iconURL}alt={agentName}style={{ height: '80', width: '80' }}/>@@ -104,42 +125,38 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {},[EModelEndpoint.gptPlugins]: {icon: <Plugin size={size * 0.7} />,- bg: `rgba(69, 89, 164, ${button ? 0.75 : 1})`,+ bg: `rgba(69, 89, 164, ${button === true ? 0.75 : 1})`,name: 'Plugins',},[EModelEndpoint.google]: {- icon: model?.toLowerCase()?.includes('code') ? (- <CodeyIcon size={size * 0.75} />- ) : model?.toLowerCase()?.includes('gemini') ? (- <GeminiIcon size={size * 0.7} />- ) : (- <PaLMIcon size={size * 0.7} />- ),- name: model?.toLowerCase()?.includes('code')- ? 'Codey'- : model?.toLowerCase()?.includes('gemini')- ? 'Gemini'- : 'PaLM2',+ icon: getGoogleIcon(model, size),+ name: getGoogleModelName(model),},[EModelEndpoint.anthropic]: {icon: <AnthropicIcon size={size * 0.5555555555555556} />,bg: '#d09a74',name: 'Claude',},+ [EModelEndpoint.bedrock]: {+ icon: <BedrockIcon className="icon-xl text-white" />,+ bg: '#268672',+ name: alternateName[EModelEndpoint.bedrock],+ },[EModelEndpoint.bingAI]: {- icon: jailbreak ? (- <img src="/assets/bingai-jb.png" alt="Bing Icon" />- ) : (- <img src="/assets/bingai.png" alt="Sydney Icon" />- ),- name: jailbreak ? 'Sydney' : 'BingAI',+ icon:+ jailbreak === true ? (+ <img src="/assets/bingai-jb.png" alt="Bing Icon" />+ ) : (+ <img src="/assets/bingai.png" alt="Sydney Icon" />+ ),+ name: jailbreak === true ? 'Sydney' : 'BingAI',},[EModelEndpoint.chatGPTBrowser]: {icon: <GPTIcon size={size * 0.5555555555555556} />,bg:typeof model === 'string' && model.toLowerCase().includes('gpt-4')? '#AB68FF'- : `rgba(0, 163, 255, ${button ? 0.75 : 1})`,+ : `rgba(0, 163, 255, ${button === true ? 0.75 : 1})`,name: 'ChatGPT',},[EModelEndpoint.custom]: {@@ -152,7 +169,7 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {<div className="h-6 w-6"><div className="overflow-hidden rounded-full"><UnknownIcon- iconURL={props.iconURL}+ iconURL={iconURL}endpoint={endpoint ?? ''}className="h-full w-full object-contain"context="message"@@ -185,11 +202,11 @@ const MessageEndpointIcon: React.FC<IconProps> = (props) => {}}className={cn('relative flex h-9 w-9 items-center justify-center rounded-sm p-1 text-white',- props.className || '',+ props.className ?? '',)}>{icon}- {error && (+ {error === true && (<span className="absolute right-0 top-[20px] -mr-2 flex h-3 w-3 items-center justify-center rounded-full border border-white bg-red-500 text-[10px] text-white">!</span>diff --git a/client/src/components/Endpoints/MinimalIcon.tsx b/client/src/components/Endpoints/MinimalIcon.tsxindex 80ab657a83..1f008e263c 100644--- a/client/src/components/Endpoints/MinimalIcon.tsx+++ b/client/src/components/Endpoints/MinimalIcon.tsx@@ -1,4 +1,4 @@-import { EModelEndpoint } from 'librechat-data-provider';+import { EModelEndpoint, alternateName } from 'librechat-data-provider';import { BrainCircuit } from 'lucide-react';import UnknownIcon from '~/components/Chat/Menus/Endpoints/UnknownIcon';import {@@ -10,6 +10,7 @@ import {GoogleMinimalIcon,CustomMinimalIcon,AnthropicIcon,+ BedrockIcon,Sparkles,} from '~/components/svg';import { cn } from '~/utils';@@ -27,17 +28,17 @@ const MinimalIcon: React.FC<IconProps> = (props) => {const endpointIcons = {[EModelEndpoint.azureOpenAI]: {icon: <AzureMinimalIcon className={iconClassName} />,- name: props.chatGptLabel || 'ChatGPT',+ name: props.chatGptLabel ?? 'ChatGPT',},[EModelEndpoint.openAI]: {icon: <OpenAIMinimalIcon className={iconClassName} />,- name: props.chatGptLabel || 'ChatGPT',+ name: props.chatGptLabel ?? 'ChatGPT',},[EModelEndpoint.gptPlugins]: { icon: <MinimalPlugin />, name: 'Plugins' },- [EModelEndpoint.google]: { icon: <GoogleMinimalIcon />, name: props.modelLabel || 'Google' },+ [EModelEndpoint.google]: { icon: <GoogleMinimalIcon />, name: props.modelLabel ?? 'Google' },[EModelEndpoint.anthropic]: {icon: <AnthropicIcon className="icon-md shrink-0 dark:text-white" />,- name: props.modelLabel || 'Claude',+ name: props.modelLabel ?? 'Claude',},[EModelEndpoint.custom]: {icon: <CustomMinimalIcon />,@@ -47,7 +48,14 @@ const MinimalIcon: React.FC<IconProps> = (props) => {[EModelEndpoint.chatGPTBrowser]: { icon: <LightningIcon />, name: 'ChatGPT' },[EModelEndpoint.assistants]: { icon: <Sparkles className="icon-sm" />, name: 'Assistant' },[EModelEndpoint.azureAssistants]: { icon: <Sparkles className="icon-sm" />, name: 'Assistant' },- [EModelEndpoint.agents]: { icon: <BrainCircuit className="icon-sm" />, name: 'Agent' },+ [EModelEndpoint.agents]: {+ icon: <BrainCircuit className="icon-sm" />,+ name: props.modelLabel ?? alternateName[EModelEndpoint.agents],+ },+ [EModelEndpoint.bedrock]: {+ icon: <BedrockIcon className="icon-xl text-text-primary" />,+ name: props.modelLabel ?? alternateName[EModelEndpoint.bedrock],+ },default: {icon: (<UnknownIcon@@ -76,11 +84,11 @@ const MinimalIcon: React.FC<IconProps> = (props) => {}}className={cn('relative flex items-center justify-center rounded-sm text-black dark:text-white',- props.className || '',+ props.className ?? '',)}>{icon}- {error && (+ {error === true && (<span className="absolute right-0 top-[20px] -mr-2 flex h-4 w-4 items-center justify-center rounded-full border border-white bg-red-500 text-[10px] text-black dark:text-white">!</span>diff --git a/client/src/components/Endpoints/SaveAsPresetDialog.tsx b/client/src/components/Endpoints/SaveAsPresetDialog.tsxindex 46abdb9807..f9a2909687 100644--- a/client/src/components/Endpoints/SaveAsPresetDialog.tsx+++ b/client/src/components/Endpoints/SaveAsPresetDialog.tsx@@ -2,14 +2,14 @@ import React, { useEffect, useState } from 'react';import { useCreatePresetMutation } from 'librechat-data-provider/react-query';import type { TEditPresetProps } from '~/common';import { cn, removeFocusOutlines, cleanupPreset, defaultTextProps } from '~/utils/';-import DialogTemplate from '~/components/ui/DialogTemplate';-import { Dialog, Input, Label } from '~/components/ui/';+import OGDialogTemplate from '~/components/ui/OGDialogTemplate';+import { OGDialog, Input, Label } from '~/components/ui/';import { NotificationSeverity } from '~/common';import { useToastContext } from '~/Providers';import { useLocalize } from '~/hooks';const SaveAsPresetDialog = ({ open, onOpenChange, preset }: TEditPresetProps) => {- const [title, setTitle] = useState<string>(preset.title || 'My Preset');+ const [title, setTitle] = useState<string>(preset.title ?? 'My Preset');const createPresetMutation = useCreatePresetMutation();const { showToast } = useToastContext();const localize = useLocalize();@@ -22,15 +22,15 @@ const SaveAsPresetDialog = ({ open, onOpenChange, preset }: TEditPresetProps) =>},});- const toastTitle = _preset.title- ? `\`${_preset.title}\``- : localize('com_endpoint_preset_title');+ const toastTitle =+ _preset.title ?? '' ? `\`${_preset.title}\`` : localize('com_endpoint_preset_title');createPresetMutation.mutate(_preset, {onSuccess: () => {showToast({message: `${toastTitle} ${localize('com_endpoint_preset_saved')}`,});+ onOpenChange(false); // Close the dialog on success},onError: () => {showToast({@@ -42,27 +42,38 @@ const SaveAsPresetDialog = ({ open, onOpenChange, preset }: TEditPresetProps) =>};useEffect(() => {- setTitle(preset.title || localize('com_endpoint_my_preset'));+ setTitle(preset.title ?? localize('com_endpoint_my_preset'));// eslint-disable-next-line react-hooks/exhaustive-deps}, [open]);+ // Handle Enter key press+ const handleKeyDown = (event: React.KeyboardEvent) => {+ if (event.key === 'Enter') {+ event.preventDefault();+ submitPreset();+ }+ };+return (- <Dialog open={open} onOpenChange={onOpenChange}>- <DialogTemplate+ <OGDialog open={open} onOpenChange={onOpenChange}>+ <OGDialogTemplatetitle={localize('com_endpoint_save_as_preset')}- className="w-11/12 sm:w-1/4"+ className="z-[90] w-11/12 sm:w-1/4"+ overlayClassName="z-[80]"showCloseButton={false}main={<div className="flex w-full flex-col items-center gap-2"><div className="grid w-full items-center gap-2">- <Label htmlFor="dialog-preset-name" className="text-left text-sm font-medium">+ <Label htmlFor="preset-custom-name" className="text-left text-sm font-medium">{localize('com_endpoint_preset_name')}</Label><Inputid="preset-custom-name"value={title || ''}onChange={(e) => setTitle(e.target.value || '')}- placeholder="Set a custom name for this preset"+ onKeyDown={handleKeyDown}+ placeholder={localize('com_endpoint_preset_custom_name_placeholder')}+ aria-label={localize('com_endpoint_preset_name')}className={cn(defaultTextProps,'flex h-10 max-h-10 w-full resize-none border-gray-100 px-3 py-2 dark:border-gray-600',@@ -78,7 +89,7 @@ const SaveAsPresetDialog = ({ open, onOpenChange, preset }: TEditPresetProps) =>selectText: localize('com_ui_save'),}}/>- </Dialog>+ </OGDialog>);};diff --git a/client/src/components/Endpoints/Settings/Bedrock.tsx b/client/src/components/Endpoints/Settings/Bedrock.tsxnew file mode 100644index 0000000000..1e88bf326a--- /dev/null+++ b/client/src/components/Endpoints/Settings/Bedrock.tsx@@ -0,0 +1,59 @@+import { useMemo } from 'react';+import { getSettingsKeys } from 'librechat-data-provider';+import type { SettingDefinition } from 'librechat-data-provider';+import type { TModelSelectProps } from '~/common';+import { componentMapping } from '~/components/SidePanel/Parameters/components';+import { presetSettings } from '~/components/SidePanel/Parameters/settings';++export default function BedrockSettings({+ conversation,+ setOption,+ models,+ readonly,+}: TModelSelectProps) {+ const parameters = useMemo(() => {+ const [combinedKey, endpointKey] = getSettingsKeys(+ conversation?.endpoint ?? '',+ conversation?.model ?? '',+ );+ return presetSettings[combinedKey] ?? presetSettings[endpointKey];+ }, [conversation]);++ if (!parameters) {+ return null;+ }++ const renderComponent = (setting: SettingDefinition) => {+ const Component = componentMapping[setting.component];+ const { key, default: defaultValue, ...rest } = setting;++ const props = {+ key,+ settingKey: key,+ defaultValue,+ ...rest,+ readonly,+ setOption,+ conversation,+ };++ if (key === 'model') {+ return <Component {...props} options={models} />;+ }++ return <Component {...props} />;+ };++ return (+ <div className="h-auto max-w-full overflow-x-hidden p-3">+ <div className="grid grid-cols-1 gap-6 md:grid-cols-5">+ <div className="flex flex-col gap-6 md:col-span-3">+ {parameters.col1.map(renderComponent)}+ </div>+ <div className="flex flex-col gap-6 md:col-span-2">+ {parameters.col2.map(renderComponent)}+ </div>+ </div>+ </div>+ );+}diff --git a/client/src/components/Endpoints/Settings/OpenAI.tsx b/client/src/components/Endpoints/Settings/OpenAI.tsxindex a95e7823c6..5062763583 100644--- a/client/src/components/Endpoints/Settings/OpenAI.tsx+++ b/client/src/components/Endpoints/Settings/OpenAI.tsx@@ -18,8 +18,7 @@ import {HoverCardTrigger,} from '~/components/ui';import { cn, defaultTextProps, optionText, removeFocusOutlines, removeFocusRings } from '~/utils';-import OptionHoverAlt from '~/components/SidePanel/Parameters/OptionHover';-import { DynamicTags } from '~/components/SidePanel/Parameters';+import { OptionHoverAlt, DynamicTags } from '~/components/SidePanel/Parameters';import { useLocalize, useDebouncedInput } from '~/hooks';import OptionHover from './OptionHover';import { ESide } from '~/common';diff --git a/client/src/components/Endpoints/Settings/index.ts b/client/src/components/Endpoints/Settings/index.tsindex 7d525d8a57..92af1a60b9 100644--- a/client/src/components/Endpoints/Settings/index.ts+++ b/client/src/components/Endpoints/Settings/index.ts@@ -1,5 +1,6 @@export { default as Advanced } from './Advanced';export { default as AssistantsSettings } from './Assistants';+export { default as BedrockSettings } from './Bedrock';export { default as OpenAISettings } from './OpenAI';export { default as BingAISettings } from './BingAI';export { default as GoogleSettings } from './Google';diff --git a/client/src/components/Endpoints/Settings/settings.ts b/client/src/components/Endpoints/Settings/settings.tsindex bcbaab8e8a..d58917df83 100644--- a/client/src/components/Endpoints/Settings/settings.ts+++ b/client/src/components/Endpoints/Settings/settings.ts@@ -4,6 +4,7 @@ import type { TModelSelectProps } from '~/common';import { GoogleSettings, PluginSettings } from './MultiView';import AssistantsSettings from './Assistants';import AnthropicSettings from './Anthropic';+import BedrockSettings from './Bedrock';import BingAISettings from './BingAI';import OpenAISettings from './OpenAI';@@ -16,6 +17,7 @@ const settings: { [key: string]: FC<TModelSelectProps> } = {[EModelEndpoint.azureOpenAI]: OpenAISettings,[EModelEndpoint.bingAI]: BingAISettings,[EModelEndpoint.anthropic]: AnthropicSettings,+ [EModelEndpoint.bedrock]: BedrockSettings,};export const getSettings = () => {diff --git a/client/src/components/Input/ModelSelect/options.ts b/client/src/components/Input/ModelSelect/options.tsindex 0159f0782f..24c820485e 100644--- a/client/src/components/Input/ModelSelect/options.ts+++ b/client/src/components/Input/ModelSelect/options.ts@@ -12,6 +12,7 @@ import PluginsByIndex from './PluginsByIndex';export const options: { [key: string]: FC<TModelSelectProps> } = {[EModelEndpoint.openAI]: OpenAI,[EModelEndpoint.custom]: OpenAI,+ [EModelEndpoint.bedrock]: OpenAI,[EModelEndpoint.azureOpenAI]: OpenAI,[EModelEndpoint.bingAI]: BingAI,[EModelEndpoint.google]: Google,diff --git a/client/src/components/Messages/ContentRender.tsx b/client/src/components/Messages/ContentRender.tsxnew file mode 100644index 0000000000..f341efbfd8--- /dev/null+++ b/client/src/components/Messages/ContentRender.tsx@@ -0,0 +1,170 @@+import { useRecoilValue } from 'recoil';+import { useCallback, useMemo, memo } from 'react';+import type { TMessage, TMessageContentParts } from 'librechat-data-provider';+import type { TMessageProps } from '~/common';+import ContentParts from '~/components/Chat/Messages/Content/ContentParts';+import PlaceholderRow from '~/components/Chat/Messages/ui/PlaceholderRow';+import SiblingSwitch from '~/components/Chat/Messages/SiblingSwitch';+import HoverButtons from '~/components/Chat/Messages/HoverButtons';+import Icon from '~/components/Chat/Messages/MessageIcon';+import SubRow from '~/components/Chat/Messages/SubRow';+import { useMessageActions } from '~/hooks';+import { cn, logger } from '~/utils';+import store from '~/store';++type ContentRenderProps = {+ message?: TMessage;+ isCard?: boolean;+ isMultiMessage?: boolean;+ isSubmittingFamily?: boolean;+} & Pick<+ TMessageProps,+ 'currentEditId' | 'setCurrentEditId' | 'siblingIdx' | 'setSiblingIdx' | 'siblingCount'+>;++const ContentRender = memo(+ ({+ isCard,+ siblingIdx,+ siblingCount,+ message: msg,+ setSiblingIdx,+ currentEditId,+ isMultiMessage,+ setCurrentEditId,+ isSubmittingFamily,+ }: ContentRenderProps) => {+ const {+ // ask,+ edit,+ index,+ agent,+ assistant,+ enterEdit,+ conversation,+ messageLabel,+ isSubmitting,+ latestMessage,+ handleContinue,+ copyToClipboard,+ setLatestMessage,+ regenerateMessage,+ } = useMessageActions({+ message: msg,+ currentEditId,+ isMultiMessage,+ setCurrentEditId,+ });++ const fontSize = useRecoilValue(store.fontSize);+ const handleRegenerateMessage = useCallback(() => regenerateMessage(), [regenerateMessage]);+ // const { isCreatedByUser, error, unfinished } = msg ?? {};+ const isLast = useMemo(+ () =>+ !(msg?.children?.length ?? 0) && (msg?.depth === latestMessage?.depth || msg?.depth === -1),+ [msg?.children, msg?.depth, latestMessage?.depth],+ );++ if (!msg) {+ return null;+ }++ const isLatestMessage = msg.messageId === latestMessage?.messageId;+ const showCardRender = isLast && !(isSubmittingFamily === true) && isCard === true;+ const isLatestCard = isCard === true && !(isSubmittingFamily === true) && isLatestMessage;+ const clickHandler =+ showCardRender && !isLatestMessage+ ? () => {+ logger.log(`Message Card click: Setting ${msg.messageId} as latest message`);+ logger.dir(msg);+ setLatestMessage(msg);+ }+ : undefined;++ return (+ <div+ aria-label={`message-${msg.depth}-${msg.messageId}`}+ className={cn(+ 'final-completion group mx-auto flex flex-1 gap-3',+ isCard === true+ ? 'relative w-full gap-1 rounded-lg border border-border-medium bg-surface-primary-alt p-2 md:w-1/2 md:gap-3 md:p-4'+ : 'md:max-w-3xl md:px-5 lg:max-w-[40rem] lg:px-1 xl:max-w-[48rem] xl:px-5',+ isLatestCard === true ? 'bg-surface-secondary' : '',+ showCardRender ? 'cursor-pointer transition-colors duration-300' : '',+ 'focus:outline-none focus:ring-2 focus:ring-border-xheavy',+ )}+ onClick={clickHandler}+ onKeyDown={(e) => {+ if ((e.key === 'Enter' || e.key === ' ') && clickHandler) {+ clickHandler();+ }+ }}+ role={showCardRender ? 'button' : undefined}+ tabIndex={showCardRender ? 0 : undefined}+ >+ {isLatestCard === true && (+ <div className="absolute right-0 top-0 m-2 h-3 w-3 rounded-full bg-text-primary" />+ )}+ <div className="relative flex flex-shrink-0 flex-col items-end">+ <div>+ <div className="pt-0.5">+ <div className="flex h-6 w-6 items-center justify-center overflow-hidden rounded-full">+ <Icon+ message={msg}+ conversation={conversation}+ assistant={assistant}+ agent={agent}+ />+ </div>+ </div>+ </div>+ </div>+ <div+ className={cn(+ 'relative flex w-11/12 flex-col',+ msg.isCreatedByUser === true ? '' : 'agent-turn',+ )}+ >+ <h2 className={cn('select-none font-semibold', fontSize)}>{messageLabel}</h2>+ <div className="flex-col gap-1 md:gap-3">+ <div className="flex max-w-full flex-grow flex-col gap-0">+ <ContentParts+ content={msg.content as Array<TMessageContentParts | undefined>}+ messageId={msg.messageId}+ isCreatedByUser={msg.isCreatedByUser}+ isLast={isLast}+ isSubmitting={isSubmitting}+ />+ </div>+ </div>+ {!(msg.children?.length ?? 0) && (isSubmittingFamily === true || isSubmitting) ? (+ <PlaceholderRow isCard={isCard} />+ ) : (+ <SubRow classes="text-xs">+ <SiblingSwitch+ siblingIdx={siblingIdx}+ siblingCount={siblingCount}+ setSiblingIdx={setSiblingIdx}+ />+ <HoverButtons+ index={index}+ isEditing={edit}+ message={msg}+ enterEdit={enterEdit}+ isSubmitting={isSubmitting}+ conversation={conversation ?? null}+ regenerate={handleRegenerateMessage}+ copyToClipboard={copyToClipboard}+ handleContinue={handleContinue}+ latestMessage={latestMessage}+ isLast={isLast}+ />+ </SubRow>+ )}+ </div>+ </div>+ );+ },+);++export default ContentRender;diff --git a/client/src/components/Messages/MessageContent.tsx b/client/src/components/Messages/MessageContent.tsxnew file mode 100644index 0000000000..e472b1e8dd--- /dev/null+++ b/client/src/components/Messages/MessageContent.tsx@@ -0,0 +1,82 @@+import React from 'react';+import { useMessageProcess } from '~/hooks';+import type { TMessageProps } from '~/common';+// eslint-disable-next-line import/no-cycle+import MultiMessage from '~/components/Chat/Messages/MultiMessage';+import ContentRender from './ContentRender';++const MessageContainer = React.memo(+ ({+ handleScroll,+ children,+ }: {+ handleScroll: (event?: unknown) => void;+ children: React.ReactNode;+ }) => {+ return (+ <div+ className="text-token-text-primary w-full border-0 bg-transparent dark:border-0 dark:bg-transparent"+ onWheel={handleScroll}+ onTouchMove={handleScroll}+ >+ {children}+ </div>+ );+ },+);++export default function MessageContent(props: TMessageProps) {+ const {+ showSibling,+ conversation,+ handleScroll,+ siblingMessage,+ latestMultiMessage,+ isSubmittingFamily,+ } = useMessageProcess({ message: props.message });+ const { message, currentEditId, setCurrentEditId } = props;++ if (!message || typeof message !== 'object') {+ return null;+ }++ const { children, messageId = null } = message;++ return (+ <>+ <MessageContainer handleScroll={handleScroll}>+ {showSibling ? (+ <div className="m-auto my-2 flex justify-center p-4 py-2 md:gap-6">+ <div className="flex w-full flex-row flex-wrap justify-between gap-1 md:max-w-5xl md:flex-nowrap md:gap-2 lg:max-w-5xl xl:max-w-6xl">+ <ContentRender+ {...props}+ message={message}+ isSubmittingFamily={isSubmittingFamily}+ isCard+ />+ <ContentRender+ {...props}+ isMultiMessage+ isCard+ message={siblingMessage ?? latestMultiMessage ?? undefined}+ isSubmittingFamily={isSubmittingFamily}+ />+ </div>+ </div>+ ) : (+ <div className="m-auto justify-center p-4 py-2 md:gap-6 ">+ <ContentRender {...props} />+ </div>+ )}+ </MessageContainer>+ <MultiMessage+ key={messageId}+ messageId={messageId}+ conversation={conversation}+ messagesTree={children ?? []}+ currentEditId={currentEditId}+ setCurrentEditId={setCurrentEditId}+ />+ </>+ );+}diff --git a/client/src/components/Prompts/Groups/ListCard.tsx b/client/src/components/Prompts/Groups/ListCard.tsxindex 2730bdc27f..c17faed8bf 100644--- a/client/src/components/Prompts/Groups/ListCard.tsx+++ b/client/src/components/Prompts/Groups/ListCard.tsx@@ -1,3 +1,4 @@+import React from 'react';import CategoryIcon from '~/components/Prompts/Groups/CategoryIcon';export default function ListCard({@@ -10,19 +11,33 @@ export default function ListCard({category: string;name: string;snippet: string;- onClick?: React.MouseEventHandler<HTMLButtonElement>;+ onClick?: React.MouseEventHandler<HTMLDivElement | HTMLButtonElement>;children?: React.ReactNode;}) {+ const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement | HTMLButtonElement>) => {+ if (event.key === 'Enter' || event.key === ' ') {+ event.preventDefault();+ onClick?.(event as unknown as React.MouseEvent<HTMLDivElement | HTMLButtonElement>);+ }+ };+return (- <button+ <divonClick={onClick}+ onKeyDown={handleKeyDown}className="relative my-2 flex w-full cursor-pointer flex-col gap-2 rounded-2xl border border-border-light px-3 pb-4 pt-3 text-startalign-top text-[15px] shadow-[0_0_2px_0_rgba(0,0,0,0.05),0_4px_6px_0_rgba(0,0,0,0.02)] transition-all duration-300 ease-in-out hover:bg-surface-tertiary"+ role="button"+ tabIndex={0}+ aria-labelledby={`card-title-${name}`}><div className="flex w-full justify-between"><div className="flex flex-row gap-2">- <CategoryIcon category={category} className="icon-md" />- <h3 className="break-word select-none text-balance text-sm font-semibold text-text-primary">+ <CategoryIcon category={category} className="icon-md" aria-hidden="true" />+ <h3+ id={`card-title-${name}`}+ className="break-word select-none text-balance text-sm font-semibold text-text-primary"+ >{name}</h3></div>@@ -31,6 +46,6 @@ export default function ListCard({<div className="ellipsis max-w-full select-none text-balance text-sm text-text-secondary">{snippet}</div>- </button>+ </div>);}diff --git a/client/src/components/Prompts/SharePrompt.tsx b/client/src/components/Prompts/SharePrompt.tsxindex 696b6a9490..9a12553c46 100644--- a/client/src/components/Prompts/SharePrompt.tsx+++ b/client/src/components/Prompts/SharePrompt.tsx@@ -31,7 +31,7 @@ const SharePrompt = ({ group, disabled }: { group?: TPromptGroup; disabled: boolconst { data: startupConfig = {} as TStartupConfig, isFetching } = useGetStartupConfig();const { instanceProjectId } = startupConfig;const groupIsGlobal = useMemo(- () => !!group?.projectIds?.includes(instanceProjectId),+ () => !!(group?.projectIds ?? []).includes(instanceProjectId),[group, instanceProjectId],);@@ -57,7 +57,8 @@ const SharePrompt = ({ group, disabled }: { group?: TPromptGroup; disabled: bool}const onSubmit = (data: FormValues) => {- if (!group._id || !instanceProjectId) {+ const groupId = group._id ?? '';+ if (!groupId || !instanceProjectId) {return;}@@ -70,7 +71,7 @@ const SharePrompt = ({ group, disabled }: { group?: TPromptGroup; disabled: bool}updateGroup.mutate({- id: group._id,+ id: groupId,payload,});};@@ -87,24 +88,38 @@ const SharePrompt = ({ group, disabled }: { group?: TPromptGroup; disabled: bool<Share2Icon className="cursor-pointer text-white " /></Button></OGDialogTrigger>- <OGDialogContent className="bg-white dark:border-gray-700 dark:bg-gray-850 dark:text-gray-300">+ <OGDialogContent className="border-border-light bg-surface-primary-alt text-text-secondary"><OGDialogTitle>{localize('com_ui_share_var', `"${group.name}"`)}</OGDialogTitle><form className="p-2" onSubmit={handleSubmit(onSubmit)}><div className="mb-4 flex items-center justify-between gap-2 py-4">- <label- className="cursor-pointer select-none"- htmlFor={Permissions.SHARED_GLOBAL}- onClick={() =>- setValue(Permissions.SHARED_GLOBAL, !getValues(Permissions.SHARED_GLOBAL), {- shouldDirty: true,- })- }- >- {localize('com_ui_share_to_all_users')}- {groupIsGlobal && (- <span className="ml-2 text-xs">{localize('com_ui_prompt_shared_to_all')}</span>- )}- </label>+ <div className="flex items-center">+ <button+ type="button"+ className="mr-2 cursor-pointer"+ onClick={() =>+ setValue(Permissions.SHARED_GLOBAL, !getValues(Permissions.SHARED_GLOBAL), {+ shouldDirty: true,+ })+ }+ onKeyDown={(e) => {+ if (e.key === 'Enter' || e.key === ' ') {+ e.preventDefault();+ setValue(Permissions.SHARED_GLOBAL, !getValues(Permissions.SHARED_GLOBAL), {+ shouldDirty: true,+ });+ }+ }}+ aria-checked={getValues(Permissions.SHARED_GLOBAL)}+ role="checkbox"+ >+ {localize('com_ui_share_to_all_users')}+ </button>+ <label htmlFor={Permissions.SHARED_GLOBAL} className="select-none">+ {groupIsGlobal && (+ <span className="ml-2 text-xs">{localize('com_ui_prompt_shared_to_all')}</span>+ )}+ </label>+ </div><Controllername={Permissions.SHARED_GLOBAL}control={control}@@ -126,7 +141,7 @@ const SharePrompt = ({ group, disabled }: { group?: TPromptGroup; disabled: bool{...field}checked={field.value}onCheckedChange={field.onChange}- value={field?.value?.toString()}+ value={field.value.toString()}/>)}/>diff --git a/client/src/components/SidePanel/Agents/AgentConfig.tsx b/client/src/components/SidePanel/Agents/AgentConfig.tsxindex e8395ba2b5..a35aa8e2ea 100644--- a/client/src/components/SidePanel/Agents/AgentConfig.tsx+++ b/client/src/components/SidePanel/Agents/AgentConfig.tsx@@ -11,9 +11,10 @@ import Action from '~/components/SidePanel/Builder/Action';import { useLocalize } from '~/hooks';import { ToolSelectDialog } from '~/components/Tools';import { useToastContext } from '~/Providers';-import ContextButton from './ContextButton';import { Spinner } from '~/components/svg';+import DeleteButton from './DeleteButton';import AgentAvatar from './AgentAvatar';+import ShareAgent from './ShareAgent';import AgentTool from './AgentTool';import { Panel } from '~/common';@@ -57,14 +58,14 @@ export default function AgentConfig({() => agentsConfig?.capabilities?.includes(Capabilities.actions),[agentsConfig],);- const retrievalEnabled = useMemo(- () => agentsConfig?.capabilities?.includes(Capabilities.retrieval),- [agentsConfig],- );- const codeEnabled = useMemo(- () => agentsConfig?.capabilities?.includes(Capabilities.code_interpreter),- [agentsConfig],- );+ // const retrievalEnabled = useMemo(+ // () => agentsConfig?.capabilities?.includes(Capabilities.retrieval),+ // [agentsConfig],+ // );+ // const codeEnabled = useMemo(+ // () => agentsConfig?.capabilities?.includes(Capabilities.code_interpreter),+ // [agentsConfig],+ // );/* Mutations */const update = useUpdateAgentMutation({@@ -190,7 +191,7 @@ export default function AgentConfig({name="id"control={control}render={({ field }) => (- <p className="h-3 text-xs italic text-gray-600" aria-live="polite">+ <p className="h-3 text-xs italic text-text-secondary" aria-live="polite">{field.value}</p>)}@@ -221,12 +222,11 @@ export default function AgentConfig({{/* Instructions */}<div className="mb-6"><label className={labelClass} htmlFor="instructions">- {localize('com_ui_instructions')} <span className="text-red-500">*</span>+ {localize('com_ui_instructions')}</label><Controllername="instructions"control={control}- rules={{ required: true, minLength: 1 }}render={({ field, fieldState: { error } }) => (<><textarea@@ -276,16 +276,16 @@ export default function AgentConfig({/></div>)}- <span>{model ? model : localize('com_ui_select_model')}</span>+ <span>{model != null ? model : localize('com_ui_select_model')}</span></div></button></div>{/* Agent Tools & Actions */}<div className="mb-6"><label className={labelClass}>- {`${toolsEnabled ? localize('com_assistants_tools') : ''}- ${toolsEnabled && actionsEnabled ? ' + ' : ''}- ${actionsEnabled ? localize('com_assistants_actions') : ''}`}+ {`${toolsEnabled === true ? localize('com_assistants_tools') : ''}+ ${toolsEnabled === true && actionsEnabled === true ? ' + ' : ''}+ ${actionsEnabled === true ? localize('com_assistants_actions') : ''}`}</label><div className="space-y-2">{tools?.map((func, i) => (@@ -339,11 +339,16 @@ export default function AgentConfig({</div>{/* Context Button */}<div className="flex items-center justify-end gap-2">- <ContextButton+ <DeleteButtonagent_id={agent_id}setCurrentAgentId={setCurrentAgentId}createMutation={create}/>+ <ShareAgent+ agent_id={agent_id}+ agentName={agent?.name ?? ''}+ projectIds={agent?.projectIds ?? []}+ />{/* Submit Button */}<buttonclassName="btn btn-primary focus:shadow-outline flex w-full items-center justify-center px-4 py-2 font-semibold text-white hover:bg-green-600 focus:border-green-500"diff --git a/client/src/components/SidePanel/Agents/AgentSelect.tsx b/client/src/components/SidePanel/Agents/AgentSelect.tsxindex 132adcee59..7803cca464 100644--- a/client/src/components/SidePanel/Agents/AgentSelect.tsx+++ b/client/src/components/SidePanel/Agents/AgentSelect.tsx@@ -1,10 +1,11 @@-import { Plus } from 'lucide-react';+import { Plus, EarthIcon } from 'lucide-react';import { useCallback, useEffect, useRef } from 'react';+import { useGetStartupConfig } from 'librechat-data-provider/react-query';import { Capabilities, defaultAgentFormValues } from 'librechat-data-provider';-import type { AgentCapabilities, AgentForm, TAgentOption } from '~/common';import type { Agent, AgentCreateParams } from 'librechat-data-provider';import type { UseMutationResult } from '@tanstack/react-query';import type { UseFormReset } from 'react-hook-form';+import type { AgentCapabilities, AgentForm, TAgentOption } from '~/common';import { cn, createDropdownSetter, createProviderOption, processAgentOption } from '~/utils';import { useListAgentsQuery, useGetAgentByIdQuery } from '~/data-provider';import SelectDropDown from '~/components/ui/SelectDropDown';@@ -16,7 +17,7 @@ const keys = new Set(Object.keys(defaultAgentFormValues));export default function AgentSelect({reset,value: currentAgentValue,- selectedAgentId,+ selectedAgentId = null,setCurrentAgentId,createMutation,}: {@@ -31,21 +32,33 @@ export default function AgentSelect({// const fileMap = useFileMapContext();const lastSelectedAgent = useRef<string | null>(null);- const { data: agents = [] } = useListAgentsQuery(undefined, {- select: (res) => res.data.map((agent) => processAgentOption(agent /*, fileMap */)),+ const { data: startupConfig } = useGetStartupConfig();+ const { data: agents = null } = useListAgentsQuery(undefined, {+ select: (res) =>+ res.data.map((agent) =>+ processAgentOption({+ agent,+ instanceProjectId: startupConfig?.instanceProjectId,+ /* fileMap */+ }),+ ),});const agentQuery = useGetAgentByIdQuery(selectedAgentId ?? '', {- enabled: !!selectedAgentId,+ enabled: !!(selectedAgentId ?? ''),});const resetAgentForm = useCallback((fullAgent: Agent) => {+ const { instanceProjectId } = startupConfig ?? {};+ const isGlobal =+ (instanceProjectId != null && fullAgent.projectIds?.includes(instanceProjectId)) ?? false;const update = {...fullAgent,provider: createProviderOption(fullAgent.provider),label: fullAgent.name ?? '',- value: fullAgent.id ?? '',+ value: fullAgent.id || '',+ icon: isGlobal ? <EarthIcon className={'icon-lg text-green-400'} /> : null,};const actions: AgentCapabilities = {@@ -84,7 +97,7 @@ export default function AgentSelect({const onSelect = useCallback((selectedId: string) => {const agentExists = !!(selectedId- ? agents.find((agent) => agent.id === selectedId)+ ? (agents ?? []).find((agent) => agent.id === selectedId): undefined);createMutation.reset();@@ -120,7 +133,7 @@ export default function AgentSelect({return;}- if (selectedAgentId && agents) {+ if (selectedAgentId != null && selectedAgentId !== '' && agents) {timerId = setTimeout(() => {lastSelectedAgent.current = selectedAgentId;onSelect(selectedAgentId);@@ -136,8 +149,9 @@ export default function AgentSelect({const createAgent = localize('com_ui_create') + ' ' + localize('com_ui_agent');const hasAgentValue = !!(typeof currentAgentValue === 'object'- ? currentAgentValue.value- : currentAgentValue);+ ? currentAgentValue.value != null && currentAgentValue.value !== ''+ : typeof currentAgentValue !== 'undefined');+return (<SelectDropDownvalue={!hasAgentValue ? createAgent : (currentAgentValue as TAgentOption)}@@ -151,9 +165,11 @@ export default function AgentSelect({]}iconSide="left"+ optionIconSide="right"showAbove={false}showLabel={false}emptyTitle={true}+ showOptionIcon={true}containerClassName="flex-grow"searchClassName="dark:from-gray-850"searchPlaceholder={localize('com_agents_search_name')}diff --git a/client/src/components/SidePanel/Agents/ContextButton.tsx b/client/src/components/SidePanel/Agents/DeleteButton.tsxsimilarity index 89%rename from client/src/components/SidePanel/Agents/ContextButton.tsxrename to client/src/components/SidePanel/Agents/DeleteButton.tsxindex 81b92701d1..af852ebc17 100644--- a/client/src/components/SidePanel/Agents/ContextButton.tsx+++ b/client/src/components/SidePanel/Agents/DeleteButton.tsx@@ -4,11 +4,11 @@ import { OGDialog, OGDialogTrigger, Label } from '~/components/ui';import { useChatContext, useToastContext } from '~/Providers';import OGDialogTemplate from '~/components/ui/OGDialogTemplate';import { useLocalize, useSetIndexOptions } from '~/hooks';+import { cn, removeFocusOutlines, logger } from '~/utils';import { useDeleteAgentMutation } from '~/data-provider';-import { cn, removeFocusOutlines } from '~/utils/';import { TrashIcon } from '~/components/svg';-export default function ContextButton({+export default function DeleteButton({agent_id,setCurrentAgentId,createMutation,@@ -34,8 +34,8 @@ export default function ContextButton({status: 'success',});- if (createMutation.data?.id) {- console.log('[deleteAgent] resetting createMutation');+ if (createMutation.data?.id ?? '') {+ logger.log('agents', 'resetting createMutation');createMutation.reset();}@@ -49,7 +49,7 @@ export default function ContextButton({return setOption('agent_id')(firstAgent.id);}- const currentAgent = updatedList?.find((agent) => agent.id === conversation?.agent_id);+ const currentAgent = updatedList.find((agent) => agent.id === conversation?.agent_id);if (currentAgent) {setCurrentAgentId(currentAgent.id);@@ -78,6 +78,7 @@ export default function ContextButton({'btn btn-neutral border-token-border-light relative h-9 rounded-lg font-medium',removeFocusOutlines,)}+ aria-label={localize('com_ui_delete') + ' ' + localize('com_ui_agent')}type="button"><div className="flex w-full items-center justify-center gap-2 text-red-500">diff --git a/client/src/components/SidePanel/Agents/ShareAgent.tsx b/client/src/components/SidePanel/Agents/ShareAgent.tsxnew file mode 100644index 0000000000..287e54b56e--- /dev/null+++ b/client/src/components/SidePanel/Agents/ShareAgent.tsx@@ -0,0 +1,206 @@+import React, { useEffect, useMemo } from 'react';+import { Share2Icon } from 'lucide-react';+import { useForm, Controller } from 'react-hook-form';+import { Permissions } from 'librechat-data-provider';+import { useGetStartupConfig } from 'librechat-data-provider/react-query';+import type { TStartupConfig, AgentUpdateParams } from 'librechat-data-provider';+import {+ Switch,+ OGDialog,+ OGDialogTitle,+ OGDialogClose,+ OGDialogContent,+ OGDialogTrigger,+} from '~/components/ui';+import { useUpdateAgentMutation } from '~/data-provider';+import { cn, removeFocusOutlines } from '~/utils';+import { useToastContext } from '~/Providers';+import { useLocalize } from '~/hooks';++type FormValues = {+ [Permissions.SHARED_GLOBAL]: boolean;+};++export default function ShareAgent({+ agent_id = '',+ agentName,+ projectIds = [],+}: {+ agent_id?: string;+ agentName?: string;+ projectIds?: string[];+}) {+ const localize = useLocalize();+ const { showToast } = useToastContext();+ const { data: startupConfig = {} as TStartupConfig, isFetching } = useGetStartupConfig();+ const { instanceProjectId } = startupConfig;+ const agentIsGlobal = useMemo(+ () => !!projectIds.includes(instanceProjectId),+ [projectIds, instanceProjectId],+ );++ const {+ control,+ setValue,+ getValues,+ handleSubmit,+ formState: { isSubmitting },+ } = useForm<FormValues>({+ mode: 'onChange',+ defaultValues: {+ [Permissions.SHARED_GLOBAL]: agentIsGlobal,+ },+ });++ useEffect(() => {+ setValue(Permissions.SHARED_GLOBAL, agentIsGlobal);+ }, [agentIsGlobal, setValue]);++ const updateAgent = useUpdateAgentMutation({+ onSuccess: (data) => {+ showToast({+ message: `${localize('com_assistants_update_success')} ${+ data.name ?? localize('com_ui_agent')+ }`,+ status: 'success',+ });+ },+ onError: (err) => {+ const error = err as Error;+ showToast({+ message: `${localize('com_agents_update_error')}${+ error.message ? ` ${localize('com_ui_error')}: ${error.message}` : ''+ }`,+ status: 'error',+ });+ },+ });++ if (!agent_id || !instanceProjectId) {+ return null;+ }++ const onSubmit = (data: FormValues) => {+ if (!agent_id || !instanceProjectId) {+ return;+ }++ const payload = {} as AgentUpdateParams;++ if (data[Permissions.SHARED_GLOBAL]) {+ payload.projectIds = [startupConfig.instanceProjectId];+ } else {+ payload.removeProjectIds = [startupConfig.instanceProjectId];+ }++ updateAgent.mutate({+ agent_id,+ data: payload,+ });+ };++ return (+ <OGDialog>+ <OGDialogTrigger asChild>+ <button+ className={cn(+ 'btn btn-neutral border-token-border-light relative h-9 rounded-lg font-medium',+ removeFocusOutlines,+ )}+ aria-label={localize(+ 'com_ui_share_var',+ agentName != null && agentName !== '' ? `"${agentName}"` : localize('com_ui_agent'),+ )}+ type="button"+ >+ <div className="flex w-full items-center justify-center gap-2 text-blue-500">+ <Share2Icon className="icon-md h-4 w-4" />+ </div>+ </button>+ </OGDialogTrigger>+ <OGDialogContent className="border-border-light bg-surface-primary-alt text-text-secondary">+ <OGDialogTitle>+ {localize(+ 'com_ui_share_var',+ agentName != null && agentName !== '' ? `"${agentName}"` : localize('com_ui_agent'),+ )}+ </OGDialogTitle>+ <form+ className="p-2"+ onSubmit={(e) => {+ e.preventDefault();+ e.stopPropagation();+ handleSubmit(onSubmit)(e);+ }}+ >+ <div className="mb-4 flex items-center justify-between gap-2 py-4">+ <div className="flex items-center">+ <button+ type="button"+ className="mr-2 cursor-pointer"+ onClick={() =>+ setValue(Permissions.SHARED_GLOBAL, !getValues(Permissions.SHARED_GLOBAL), {+ shouldDirty: true,+ })+ }+ onKeyDown={(e) => {+ if (e.key === 'Enter' || e.key === ' ') {+ e.preventDefault();+ setValue(Permissions.SHARED_GLOBAL, !getValues(Permissions.SHARED_GLOBAL), {+ shouldDirty: true,+ });+ }+ }}+ aria-checked={getValues(Permissions.SHARED_GLOBAL)}+ role="checkbox"+ >+ {localize('com_ui_share_to_all_users')}+ </button>+ <label htmlFor={Permissions.SHARED_GLOBAL} className="select-none">+ {agentIsGlobal && (+ <span className="ml-2 text-xs">{localize('com_ui_agent_shared_to_all')}</span>+ )}+ </label>+ </div>+ <Controller+ name={Permissions.SHARED_GLOBAL}+ control={control}+ disabled={isFetching || updateAgent.isLoading || !instanceProjectId}+ rules={{+ validate: (value) => {+ const isValid = !(value && agentIsGlobal);+ if (!isValid) {+ showToast({+ message: localize('com_ui_agent_already_shared_to_all'),+ status: 'warning',+ });+ }+ return isValid;+ },+ }}+ render={({ field }) => (+ <Switch+ {...field}+ checked={field.value}+ onCheckedChange={field.onChange}+ value={field.value.toString()}+ />+ )}+ />+ </div>+ <div className="flex justify-end">+ <OGDialogClose asChild>+ <button+ type="submit"+ disabled={isSubmitting || isFetching}+ className="btn rounded bg-green-500 font-bold text-white transition-all hover:bg-green-600"+ >+ {localize('com_ui_save')}+ </button>+ </OGDialogClose>+ </div>+ </form>+ </OGDialogContent>+ </OGDialog>+ );+}diff --git a/client/src/components/SidePanel/Builder/Action.tsx b/client/src/components/SidePanel/Builder/Action.tsxindex b129cc0d15..656888a3d7 100644--- a/client/src/components/SidePanel/Builder/Action.tsx+++ b/client/src/components/SidePanel/Builder/Action.tsx@@ -1,32 +1,40 @@import { useState } from 'react';import type { Action } from 'librechat-data-provider';import GearIcon from '~/components/svg/GearIcon';+import { cn } from '~/utils';export default function Action({ action, onClick }: { action: Action; onClick: () => void }) {const [isHovering, setIsHovering] = useState(false);return (- <div>+ <div+ role="button"+ tabIndex={0}+ onClick={onClick}+ onKeyDown={(e) => {+ if (e.key === 'Enter' || e.key === ' ') {+ onClick();+ }+ }}+ className="group flex w-full rounded-lg border border-border-medium text-sm hover:cursor-pointer focus:outline-none focus:ring-2 focus:ring-text-primary"+ onMouseEnter={() => setIsHovering(true)}+ onMouseLeave={() => setIsHovering(false)}+ aria-label={`Action for ${action.metadata.domain}`}+ ><div- onClick={onClick}- className="flex w-full rounded-lg text-sm hover:cursor-pointer"- onMouseEnter={() => setIsHovering(true)}- onMouseLeave={() => setIsHovering(false)}+ className="h-9 grow overflow-hidden text-ellipsis whitespace-nowrap px-3 py-2"+ style={{ wordBreak: 'break-all' }}>- <div- className="h-9 grow whitespace-nowrap px-3 py-2"- style={{ textOverflow: 'ellipsis', wordBreak: 'break-all', overflow: 'hidden' }}- >- {action.metadata.domain}- </div>- {isHovering && (- <button- type="button"- className="transition-colors flex h-9 w-9 min-w-9 items-center justify-center rounded-lg duration-200 hover:bg-gray-200 dark:hover:bg-gray-700"- >- <GearIcon className="icon-sm" />- </button>+ {action.metadata.domain}+ </div>+ <div+ className={cn(+ 'h-9 w-9 min-w-9 items-center justify-center rounded-lg transition-colors duration-200 hover:bg-surface-tertiary focus:outline-none focus:ring-2 focus:ring-text-primary group-focus:flex',+ isHovering ? 'flex' : 'hidden',)}+ aria-label="Settings"+ >+ <GearIcon className="icon-sm" aria-hidden="true" /></div></div>);diff --git a/client/src/components/SidePanel/Parameters/DynamicCheckbox.tsx b/client/src/components/SidePanel/Parameters/DynamicCheckbox.tsxindex 5722a9e5ec..98d85524a9 100644--- a/client/src/components/SidePanel/Parameters/DynamicCheckbox.tsx+++ b/client/src/components/SidePanel/Parameters/DynamicCheckbox.tsx@@ -9,17 +9,17 @@ import OptionHover from './OptionHover';import { ESide } from '~/common';function DynamicCheckbox({- label,+ label = '',settingKey,defaultValue,- description,+ description = '',columnSpan,setOption,optionType,readonly = false,- showDefault = true,- labelCode,- descriptionCode,+ showDefault = false,+ labelCode = false,+ descriptionCode = false,conversation,}: DynamicSettingProps) {const localize = useLocalize();@@ -57,7 +57,7 @@ function DynamicCheckbox({return (<divclassName={`flex flex-col items-center justify-start gap-6 ${- columnSpan ? `col-span-${columnSpan}` : 'col-span-full'+ columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full'}`}><HoverCard openDelay={300}>@@ -67,11 +67,11 @@ function DynamicCheckbox({htmlFor={`${settingKey}-dynamic-checkbox`}className="text-left text-sm font-medium">- {labelCode ? localize(label ?? '') || label : label ?? settingKey}{' '}+ {labelCode ? localize(label) ?? label : label || settingKey}{' '}{showDefault && (<small className="opacity-40">({localize('com_endpoint_default')}:{' '}- {defaultValue ? localize('com_ui_yes') : localize('com_ui_no')})+ {defaultValue != null ? localize('com_ui_yes') : localize('com_ui_no')})</small>)}</Label>@@ -86,7 +86,7 @@ function DynamicCheckbox({</HoverCardTrigger>{description && (<OptionHover- description={descriptionCode ? localize(description) || description : description}+ description={descriptionCode ? localize(description) ?? description : description}side={ESide.Left}/>)}diff --git a/client/src/components/SidePanel/Parameters/DynamicCombobox.tsx b/client/src/components/SidePanel/Parameters/DynamicCombobox.tsxnew file mode 100644index 0000000000..16af125b75--- /dev/null+++ b/client/src/components/SidePanel/Parameters/DynamicCombobox.tsx@@ -0,0 +1,132 @@+import { useMemo, useState, useCallback } from 'react';+import { OptionTypes } from 'librechat-data-provider';+import type { DynamicSettingProps } from 'librechat-data-provider';+import { Label, HoverCard, HoverCardTrigger } from '~/components/ui';+import ControlCombobox from '~/components/ui/ControlCombobox';+import { useLocalize, useParameterEffects } from '~/hooks';+import { useChatContext } from '~/Providers';+import OptionHover from './OptionHover';+import { ESide } from '~/common';+import { cn } from '~/utils';++function DynamicCombobox({+ label = '',+ settingKey,+ defaultValue,+ description = '',+ columnSpan,+ setOption,+ optionType,+ options: _options,+ items: _items,+ showLabel = true,+ showDefault = false,+ labelCode = false,+ descriptionCode = false,+ searchPlaceholderCode = false,+ selectPlaceholderCode = false,+ conversation,+ isCollapsed = false,+ SelectIcon = null,+ selectPlaceholder = '',+ searchPlaceholder = '',+}: DynamicSettingProps & { isCollapsed?: boolean; SelectIcon?: React.ReactNode }) {+ const localize = useLocalize();+ const { preset } = useChatContext();+ const [inputValue, setInputValue] = useState<string | null>(null);++ const selectedValue = useMemo(() => {+ if (optionType === OptionTypes.Custom) {+ return inputValue;+ }+ return conversation?.[settingKey] ?? defaultValue;+ }, [conversation, defaultValue, optionType, settingKey, inputValue]);++ const items = useMemo(() => {+ if (_items != null) {+ return _items;+ }+ return (_options ?? []).map((option) => ({+ label: option,+ value: option,+ }));+ }, [_options, _items]);++ const handleChange = useCallback(+ (value: string) => {+ if (optionType === OptionTypes.Custom) {+ setInputValue(value);+ } else {+ setOption(settingKey)(value);+ }+ },+ [optionType, setOption, settingKey],+ );++ useParameterEffects({+ preset,+ settingKey,+ defaultValue,+ conversation,+ inputValue,+ setInputValue,+ preventDelayedUpdate: true,+ });++ const options = items ?? _options ?? [];+ if (options.length === 0) {+ return null;+ }++ return (+ <div+ className={cn(+ 'flex flex-col items-center justify-start gap-6',+ columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full',+ )}+ >+ <HoverCard openDelay={300}>+ <HoverCardTrigger className="grid w-full items-center gap-2">+ {showLabel === true && (+ <div className="flex w-full justify-between">+ <Label+ htmlFor={`${settingKey}-dynamic-combobox`}+ className="text-left text-sm font-medium"+ >+ {labelCode ? localize(label) ?? label : label || settingKey}+ {showDefault && (+ <small className="opacity-40">+ ({localize('com_endpoint_default')}: {defaultValue})+ </small>+ )}+ </Label>+ </div>+ )}+ <ControlCombobox+ displayValue={selectedValue}+ selectPlaceholder={+ selectPlaceholderCode === true ? localize(selectPlaceholder) : selectPlaceholder+ }+ searchPlaceholder={+ searchPlaceholderCode === true ? localize(searchPlaceholder) : searchPlaceholder+ }+ isCollapsed={isCollapsed}+ ariaLabel={settingKey}+ selectedValue={selectedValue ?? ''}+ setValue={handleChange}+ items={items}+ SelectIcon={SelectIcon}+ />+ </HoverCardTrigger>+ {description && (+ <OptionHover+ description={descriptionCode ? localize(description) ?? description : description}+ side={ESide.Left}+ />+ )}+ </HoverCard>+ </div>+ );+}++export default DynamicCombobox;diff --git a/client/src/components/SidePanel/Parameters/DynamicDropdown.tsx b/client/src/components/SidePanel/Parameters/DynamicDropdown.tsxindex 4e298fb872..e90c348acc 100644--- a/client/src/components/SidePanel/Parameters/DynamicDropdown.tsx+++ b/client/src/components/SidePanel/Parameters/DynamicDropdown.tsx@@ -9,19 +9,22 @@ import { ESide } from '~/common';import { cn } from '~/utils';function DynamicDropdown({- label,+ label = '',settingKey,defaultValue,- description,+ description = '',columnSpan,setOption,optionType,options,// type: _type,readonly = false,- showDefault = true,- labelCode,- descriptionCode,+ showLabel = true,+ showDefault = false,+ labelCode = false,+ descriptionCode = false,+ placeholder = '',+ placeholderCode = false,conversation,}: DynamicSettingProps) {const localize = useLocalize();@@ -64,24 +67,26 @@ function DynamicDropdown({<divclassName={cn('flex flex-col items-center justify-start gap-6',- columnSpan ? `col-span-${columnSpan}` : 'col-span-full',+ columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full',)}><HoverCard openDelay={300}><HoverCardTrigger className="grid w-full items-center gap-2">- <div className="flex w-full justify-between">- <Label- htmlFor={`${settingKey}-dynamic-dropdown`}- className="text-left text-sm font-medium"- >- {labelCode ? localize(label ?? '') || label : label ?? settingKey}- {showDefault && (- <small className="opacity-40">- ({localize('com_endpoint_default')}: {defaultValue})- </small>- )}- </Label>- </div>+ {showLabel === true && (+ <div className="flex w-full justify-between">+ <Label+ htmlFor={`${settingKey}-dynamic-dropdown`}+ className="text-left text-sm font-medium"+ >+ {labelCode ? localize(label) ?? label : label || settingKey}+ {showDefault && (+ <small className="opacity-40">+ ({localize('com_endpoint_default')}: {defaultValue})+ </small>+ )}+ </Label>+ </div>+ )}<SelectDropDownshowLabel={false}emptyTitle={true}@@ -91,11 +96,12 @@ function DynamicDropdown({availableValues={options}containerClassName="w-full"id={`${settingKey}-dynamic-dropdown`}+ placeholder={placeholderCode ? localize(placeholder) ?? placeholder : placeholder}/></HoverCardTrigger>{description && (<OptionHover- description={descriptionCode ? localize(description) || description : description}+ description={descriptionCode ? localize(description) ?? description : description}side={ESide.Left}/>)}diff --git a/client/src/components/SidePanel/Parameters/DynamicInput.tsx b/client/src/components/SidePanel/Parameters/DynamicInput.tsxindex feccbae784..e1439a8c8f 100644--- a/client/src/components/SidePanel/Parameters/DynamicInput.tsx+++ b/client/src/components/SidePanel/Parameters/DynamicInput.tsx@@ -9,25 +9,25 @@ import OptionHover from './OptionHover';import { ESide } from '~/common';function DynamicInput({- label,+ label = '',settingKey,defaultValue,- description,+ description = '',columnSpan,setOption,optionType,- placeholder,+ placeholder = '',readonly = false,- showDefault = true,- labelCode,- descriptionCode,- placeholderCode,+ showDefault = false,+ labelCode = false,+ descriptionCode = false,+ placeholderCode = false,conversation,}: DynamicSettingProps) {const localize = useLocalize();const { preset } = useChatContext();- const [setInputValue, inputValue] = useDebouncedInput<string | null>({+ const [setInputValue, inputValue, setLocalValue] = useDebouncedInput<string | null>({optionKey: optionType !== OptionTypes.Custom ? settingKey : undefined,initialValue:optionType !== OptionTypes.Custom@@ -43,13 +43,13 @@ function DynamicInput({defaultValue: typeof defaultValue === 'undefined' ? '' : defaultValue,conversation,inputValue,- setInputValue,+ setInputValue: setLocalValue,});return (<divclassName={`flex flex-col items-center justify-start gap-6 ${- columnSpan ? `col-span-${columnSpan}` : 'col-span-full'+ columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full'}`}><HoverCard openDelay={300}>@@ -59,11 +59,11 @@ function DynamicInput({htmlFor={`${settingKey}-dynamic-input`}className="text-left text-sm font-medium">- {labelCode ? localize(label ?? '') || label : label ?? settingKey}{' '}+ {labelCode ? localize(label) ?? label : label || settingKey}{' '}{showDefault && (<small className="opacity-40">(- {typeof defaultValue === 'undefined' || !(defaultValue as string)?.length+ {typeof defaultValue === 'undefined' || !(defaultValue as string).length? localize('com_endpoint_default_blank'): `${localize('com_endpoint_default')}: ${defaultValue}`})@@ -76,13 +76,13 @@ function DynamicInput({disabled={readonly}value={inputValue ?? ''}onChange={setInputValue}- placeholder={placeholderCode ? localize(placeholder ?? '') || placeholder : placeholder}+ placeholder={placeholderCode ? localize(placeholder) ?? placeholder : placeholder}className={cn(defaultTextProps, 'flex h-10 max-h-10 w-full resize-none px-3 py-2')}/></HoverCardTrigger>{description && (<OptionHover- description={descriptionCode ? localize(description) || description : description}+ description={descriptionCode ? localize(description) ?? description : description}side={ESide.Left}/>)}diff --git a/client/src/components/SidePanel/Parameters/DynamicInputNumber.tsx b/client/src/components/SidePanel/Parameters/DynamicInputNumber.tsxindex 3807f2ed6f..9da1dcd699 100644--- a/client/src/components/SidePanel/Parameters/DynamicInputNumber.tsx+++ b/client/src/components/SidePanel/Parameters/DynamicInputNumber.tsx@@ -9,19 +9,19 @@ import { useChatContext } from '~/Providers';import OptionHover from './OptionHover';function DynamicInputNumber({- label,+ label = '',settingKey,defaultValue,- description,+ description = '',columnSpan,setOption,optionType,readonly = false,- showDefault = true,- labelCode,- descriptionCode,- placeholderCode,- placeholder,+ showDefault = false,+ labelCode = false,+ descriptionCode = false,+ placeholderCode = false,+ placeholder = '',conversation,range,className = '',@@ -30,7 +30,7 @@ function DynamicInputNumber({const localize = useLocalize();const { preset } = useChatContext();- const [setInputValue, inputValue] = useDebouncedInput<ValueType | null>({+ const [setInputValue, inputValue, setLocalValue] = useDebouncedInput<ValueType | null>({optionKey: optionType !== OptionTypes.Custom ? settingKey : undefined,initialValue:optionType !== OptionTypes.Custom@@ -46,14 +46,14 @@ function DynamicInputNumber({defaultValue: typeof defaultValue === 'undefined' ? '' : defaultValue,conversation,inputValue,- setInputValue,+ setInputValue: setLocalValue,});return (<divclassName={cn('flex flex-col items-center justify-start gap-6',- columnSpan ? `col-span-${columnSpan}` : 'col-span-full',+ columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full',className,)}>@@ -64,7 +64,7 @@ function DynamicInputNumber({htmlFor={`${settingKey}-dynamic-setting`}className="text-left text-sm font-medium">- {labelCode ? localize(label ?? '') || label : label ?? settingKey}{' '}+ {labelCode ? localize(label) ?? label : label || settingKey}{' '}{showDefault && (<small className="opacity-40">({localize('com_endpoint_default')}: {defaultValue})@@ -79,9 +79,7 @@ function DynamicInputNumber({min={range?.min}max={range?.max}step={range?.step}- placeholder={- placeholderCode ? localize(placeholder ?? '') || placeholder : placeholder- }+ placeholder={placeholderCode ? localize(placeholder) ?? placeholder : placeholder}controls={false}className={cn(defaultTextProps,@@ -96,7 +94,7 @@ function DynamicInputNumber({</HoverCardTrigger>{description && (<OptionHover- description={descriptionCode ? localize(description) || description : description}+ description={descriptionCode ? localize(description) ?? description : description}side={ESide.Left}/>)}diff --git a/client/src/components/SidePanel/Parameters/DynamicSlider.tsx b/client/src/components/SidePanel/Parameters/DynamicSlider.tsxindex 365f07177a..6df3789cc5 100644--- a/client/src/components/SidePanel/Parameters/DynamicSlider.tsx+++ b/client/src/components/SidePanel/Parameters/DynamicSlider.tsx@@ -9,27 +9,30 @@ import { useChatContext } from '~/Providers';import OptionHover from './OptionHover';function DynamicSlider({- label,+ label = '',settingKey,defaultValue,range,- description,+ description = '',columnSpan,setOption,optionType,options,readonly = false,- showDefault = true,+ showDefault = false,includeInput = true,- labelCode,- descriptionCode,+ labelCode = false,+ descriptionCode = false,conversation,}: DynamicSettingProps) {const localize = useLocalize();const { preset } = useChatContext();- const isEnum = useMemo(() => !range && options && options.length > 0, [options, range]);+ const isEnum = useMemo(+ () => (!range && options && options.length > 0) ?? false,+ [options, range],+ );- const [setInputValue, inputValue] = useDebouncedInput<string | number>({+ const [setInputValue, inputValue, setLocalValue] = useDebouncedInput<string | number>({optionKey: optionType !== OptionTypes.Custom ? settingKey : undefined,initialValue: optionType !== OptionTypes.Custom ? conversation?.[settingKey] : defaultValue,setter: () => ({}),@@ -43,7 +46,7 @@ function DynamicSlider({defaultValue,conversation,inputValue,- setInputValue,+ setInputValue: setLocalValue,preventDelayedUpdate: isEnum,});@@ -87,6 +90,16 @@ function DynamicSlider({[isEnum, setInputValue, valueToEnumOption],);+ const max = useMemo(() => {+ if (isEnum && options) {+ return options.length - 1;+ } else if (range) {+ return range.max;+ } else {+ return 0;+ }+ }, [isEnum, options, range]);+if (!range && !isEnum) {return null;}@@ -94,18 +107,18 @@ function DynamicSlider({return (<divclassName={cn(- 'flex flex-col items-center justify-start gap-6',- columnSpan ? `col-span-${columnSpan}` : 'col-span-full',+ 'flex flex-col items-center justify-start gap-2',+ columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full',)}><HoverCard openDelay={300}><HoverCardTrigger className="grid w-full items-center gap-2">- <div className="flex justify-between">+ <div className="flex w-full items-center justify-between"><LabelhtmlFor={`${settingKey}-dynamic-setting`}className="text-left text-sm font-medium">- {labelCode ? localize(label ?? '') || label : label ?? settingKey}{' '}+ {labelCode ? localize(label) ?? label : label || settingKey}{' '}{showDefault && (<small className="opacity-40">({localize('com_endpoint_default')}: {defaultValue})@@ -156,15 +169,16 @@ function DynamicSlider({]}onValueChange={(value) => handleValueChange(value[0])}doubleClickHandler={() => setInputValue(defaultValue as string | number)}- max={isEnum && options ? options.length - 1 : range ? range.max : 0}+ max={max}min={range ? range.min : 0}step={range ? range.step ?? 1 : 1}className="flex h-4 w-full"+ trackClassName="bg-surface-hover"/></HoverCardTrigger>{description && (<OptionHover- description={descriptionCode ? localize(description) || description : description}+ description={descriptionCode ? localize(description) ?? description : description}side={ESide.Left}/>)}diff --git a/client/src/components/SidePanel/Parameters/DynamicSwitch.tsx b/client/src/components/SidePanel/Parameters/DynamicSwitch.tsxindex f069e899d2..3f5aea86f9 100644--- a/client/src/components/SidePanel/Parameters/DynamicSwitch.tsx+++ b/client/src/components/SidePanel/Parameters/DynamicSwitch.tsx@@ -8,17 +8,17 @@ import OptionHover from './OptionHover';import { ESide } from '~/common';function DynamicSwitch({- label,+ label = '',settingKey,defaultValue,- description,+ description = '',columnSpan,setOption,optionType,readonly = false,- showDefault = true,- labelCode,- descriptionCode,+ showDefault = false,+ labelCode = false,+ descriptionCode = false,conversation,}: DynamicSettingProps) {const localize = useLocalize();@@ -55,7 +55,7 @@ function DynamicSwitch({return (<divclassName={`flex flex-col items-center justify-start gap-6 ${- columnSpan ? `col-span-${columnSpan}` : 'col-span-full'+ columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full'}`}><HoverCard openDelay={300}>@@ -65,10 +65,11 @@ function DynamicSwitch({htmlFor={`${settingKey}-dynamic-switch`}className="text-left text-sm font-medium">- {labelCode ? localize(label ?? '') || label : label ?? settingKey}{' '}+ {labelCode ? localize(label) ?? label : label || settingKey}{' '}{showDefault && (<small className="opacity-40">- ({localize('com_endpoint_default')}: {defaultValue ? 'com_ui_on' : 'com_ui_off'})+ ({localize('com_endpoint_default')}:{' '}+ {defaultValue != null ? 'com_ui_on' : 'com_ui_off'})</small>)}</Label>@@ -83,7 +84,7 @@ function DynamicSwitch({</HoverCardTrigger>{description && (<OptionHover- description={descriptionCode ? localize(description) || description : description}+ description={descriptionCode ? localize(description) ?? description : description}side={ESide.Left}/>)}diff --git a/client/src/components/SidePanel/Parameters/DynamicTags.tsx b/client/src/components/SidePanel/Parameters/DynamicTags.tsxindex a028a8aa56..5a48be32bb 100644--- a/client/src/components/SidePanel/Parameters/DynamicTags.tsx+++ b/client/src/components/SidePanel/Parameters/DynamicTags.tsx@@ -10,19 +10,19 @@ import OptionHover from './OptionHover';import { ESide } from '~/common';function DynamicTags({- label,+ label = '',settingKey,defaultValue = [],- description,+ description = '',columnSpan,setOption,optionType,- placeholder,+ placeholder = '',readonly = false,- showDefault = true,- labelCode,- descriptionCode,- placeholderCode,+ showDefault = false,+ labelCode = false,+ descriptionCode = false,+ placeholderCode = false,descriptionSide = ESide.Left,conversation,minTags,@@ -65,7 +65,7 @@ function DynamicTags({return defaultValue ?? [];}- return conversation?.[settingKey];+ return conversation[settingKey];}, [conversation, defaultValue, optionType, settingKey, tags]);const onTagRemove = useCallback(@@ -74,7 +74,7 @@ function DynamicTags({return;}- if (minTags && currentTags.length <= minTags) {+ if (minTags != null && currentTags.length <= minTags) {showToast({message: localize('com_ui_min_tags', minTags + ''),status: 'warning',@@ -93,7 +93,7 @@ function DynamicTags({}let update = [...(currentTags ?? []), tagText];- if (maxTags && update.length > maxTags) {+ if (maxTags != null && update.length > maxTags) {showToast({message: localize('com_ui_max_tags', maxTags + ''),status: 'warning',@@ -117,7 +117,7 @@ function DynamicTags({return (<divclassName={`flex flex-col items-center justify-start gap-6 ${- columnSpan ? `col-span-${columnSpan}` : 'col-span-full'+ columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full'}`}><HoverCard openDelay={300}>@@ -127,11 +127,11 @@ function DynamicTags({htmlFor={`${settingKey}-dynamic-input`}className="text-left text-sm font-medium">- {labelCode ? localize(label ?? '') || label : label ?? settingKey}{' '}+ {labelCode ? localize(label) ?? label : label || settingKey}{' '}{showDefault && (<small className="opacity-40">(- {typeof defaultValue === 'undefined' || !(defaultValue as string)?.length+ {typeof defaultValue === 'undefined' || !(defaultValue as string).length? localize('com_endpoint_default_blank'): `${localize('com_endpoint_default')}: ${defaultValue}`})@@ -171,9 +171,7 @@ function DynamicTags({}}}onChange={(e) => setTagText(e.target.value)}- placeholder={- placeholderCode ? localize(placeholder ?? '') || placeholder : placeholder- }+ placeholder={placeholderCode ? localize(placeholder) ?? placeholder : placeholder}className={cn(defaultTextProps, 'flex h-10 max-h-10 px-3 py-2')}/></div>@@ -181,7 +179,7 @@ function DynamicTags({</HoverCardTrigger>{description && (<OptionHover- description={descriptionCode ? localize(description) || description : description}+ description={descriptionCode ? localize(description) ?? description : description}side={descriptionSide as ESide}/>)}diff --git a/client/src/components/SidePanel/Parameters/DynamicTextarea.tsx b/client/src/components/SidePanel/Parameters/DynamicTextarea.tsxindex f6411b155b..ddc10d684b 100644--- a/client/src/components/SidePanel/Parameters/DynamicTextarea.tsx+++ b/client/src/components/SidePanel/Parameters/DynamicTextarea.tsx@@ -9,25 +9,25 @@ import OptionHover from './OptionHover';import { ESide } from '~/common';function DynamicTextarea({- label,+ label = '',settingKey,defaultValue,- description,+ description = '',columnSpan,setOption,optionType,- placeholder,+ placeholder = '',readonly = false,- showDefault = true,- labelCode,- descriptionCode,- placeholderCode,+ showDefault = false,+ labelCode = false,+ descriptionCode = false,+ placeholderCode = false,conversation,}: DynamicSettingProps) {const localize = useLocalize();const { preset } = useChatContext();- const [setInputValue, inputValue] = useDebouncedInput<string | null>({+ const [setInputValue, inputValue, setLocalValue] = useDebouncedInput<string | null>({optionKey: optionType !== OptionTypes.Custom ? settingKey : undefined,initialValue:optionType !== OptionTypes.Custom@@ -43,13 +43,13 @@ function DynamicTextarea({defaultValue: typeof defaultValue === 'undefined' ? '' : defaultValue,conversation,inputValue,- setInputValue,+ setInputValue: setLocalValue,});return (<divclassName={`flex flex-col items-center justify-start gap-6 ${- columnSpan ? `col-span-${columnSpan}` : 'col-span-full'+ columnSpan != null ? `col-span-${columnSpan}` : 'col-span-full'}`}><HoverCard openDelay={300}>@@ -59,11 +59,11 @@ function DynamicTextarea({htmlFor={`${settingKey}-dynamic-textarea`}className="text-left text-sm font-medium">- {labelCode ? localize(label ?? '') || label : label ?? settingKey}{' '}+ {labelCode ? localize(label) ?? label : label || settingKey}{' '}{showDefault && (<small className="opacity-40">(- {typeof defaultValue === 'undefined' || !(defaultValue as string)?.length+ {typeof defaultValue === 'undefined' || !(defaultValue as string).length? localize('com_endpoint_default_blank'): `${localize('com_endpoint_default')}: ${defaultValue}`})@@ -76,7 +76,7 @@ function DynamicTextarea({disabled={readonly}value={inputValue ?? ''}onChange={setInputValue}- placeholder={placeholderCode ? localize(placeholder ?? '') || placeholder : placeholder}+ placeholder={placeholderCode ? localize(placeholder) ?? placeholder : placeholder}className={cn(defaultTextProps,// TODO: configurable max height@@ -86,7 +86,7 @@ function DynamicTextarea({</HoverCardTrigger>{description && (<OptionHover- description={descriptionCode ? localize(description) || description : description}+ description={descriptionCode ? localize(description) ?? description : description}side={ESide.Left}/>)}diff --git a/client/src/components/SidePanel/Parameters/Panel.tsx b/client/src/components/SidePanel/Parameters/Panel.tsxindex f277da1692..c585dca458 100644--- a/client/src/components/SidePanel/Parameters/Panel.tsx+++ b/client/src/components/SidePanel/Parameters/Panel.tsx@@ -1,203 +1,46 @@-import { ComponentTypes } from 'librechat-data-provider';-import type {- DynamicSettingProps,- SettingDefinition,- SettingsConfiguration,-} from 'librechat-data-provider';-import { useSetIndexOptions } from '~/hooks';+import React, { useMemo, useState, useCallback } from 'react';+import { useGetEndpointsQuery } from 'librechat-data-provider/react-query';+import { getSettingsKeys, tPresetUpdateSchema } from 'librechat-data-provider';+import type { TPreset } from 'librechat-data-provider';+import { SaveAsPresetDialog } from '~/components/Endpoints';+import { useSetIndexOptions, useLocalize } from '~/hooks';+import { componentMapping } from './components';import { useChatContext } from '~/Providers';-import {- DynamicDropdown,- DynamicCheckbox,- DynamicTextarea,- DynamicSlider,- DynamicSwitch,- DynamicInput,- DynamicTags,-} from './';--const settingsConfiguration: SettingsConfiguration = [- {- key: 'temperature',- label: 'com_endpoint_temperature',- labelCode: true,- description: 'com_endpoint_openai_temp',- descriptionCode: true,- type: 'number',- default: 1,- range: {- min: 0,- max: 2,- step: 0.01,- },- component: 'slider',- optionType: 'model',- // columnSpan: 2,- // includeInput: false,- },- {- key: 'top_p',- label: 'com_endpoint_top_p',- labelCode: true,- description: 'com_endpoint_openai_topp',- descriptionCode: true,- type: 'number',- default: 1,- range: {- min: 0,- max: 1,- step: 0.01,- },- component: 'slider',- optionType: 'model',- },- {- key: 'presence_penalty',- label: 'com_endpoint_presence_penalty',- labelCode: true,- description: 'com_endpoint_openai_pres',- descriptionCode: true,- type: 'number',- default: 0,- range: {- min: -2,- max: 2,- step: 0.01,- },- component: 'slider',- optionType: 'model',- },- {- key: 'frequency_penalty',- label: 'com_endpoint_frequency_penalty',- labelCode: true,- description: 'com_endpoint_openai_freq',- descriptionCode: true,- type: 'number',- default: 0,- range: {- min: -2,- max: 2,- step: 0.01,- },- component: 'slider',- optionType: 'model',- },- {- key: 'chatGptLabel',- label: 'com_endpoint_custom_name',- labelCode: true,- type: 'string',- default: '',- component: 'input',- placeholder: 'com_endpoint_openai_custom_name_placeholder',- placeholderCode: true,- optionType: 'conversation',- },- {- key: 'promptPrefix',- label: 'com_endpoint_prompt_prefix',- labelCode: true,- type: 'string',- default: '',- component: 'textarea',- placeholder: 'com_endpoint_openai_prompt_prefix_placeholder',- placeholderCode: true,- optionType: 'conversation',- // columnSpan: 2,- },- {- key: 'resendFiles',- label: 'com_endpoint_plug_resend_files',- labelCode: true,- description: 'com_endpoint_openai_resend_files',- descriptionCode: true,- type: 'boolean',- default: true,- component: 'switch',- optionType: 'conversation',- showDefault: false,- columnSpan: 2,- },- {- key: 'imageDetail',- label: 'com_endpoint_plug_image_detail',- labelCode: true,- description: 'com_endpoint_openai_detail',- descriptionCode: true,- type: 'enum',- default: 'auto',- options: ['low', 'auto', 'high'],- optionType: 'conversation',- component: 'slider',- showDefault: false,- columnSpan: 2,- },- {- key: 'stop',- label: 'com_endpoint_stop',- labelCode: true,- description: 'com_endpoint_openai_stop',- descriptionCode: true,- placeholder: 'com_endpoint_stop_placeholder',- placeholderCode: true,- type: 'array',- default: [],- component: 'tags',- optionType: 'conversation',- columnSpan: 4,- minTags: 1,- maxTags: 4,- },-];--const componentMapping: Record<ComponentTypes, React.ComponentType<DynamicSettingProps>> = {- [ComponentTypes.Slider]: DynamicSlider,- [ComponentTypes.Dropdown]: DynamicDropdown,- [ComponentTypes.Switch]: DynamicSwitch,- [ComponentTypes.Textarea]: DynamicTextarea,- [ComponentTypes.Input]: DynamicInput,- [ComponentTypes.Checkbox]: DynamicCheckbox,- [ComponentTypes.Tags]: DynamicTags,-};+import { settings } from './settings';export default function Parameters() {+ const localize = useLocalize();const { conversation } = useChatContext();const { setOption } = useSetIndexOptions();- const temperature = settingsConfiguration.find(- (setting) => setting.key === 'temperature',- ) as SettingDefinition;- const TempComponent = componentMapping[temperature.component];- const { key: temp, default: tempDefault, ...tempSettings } = temperature;+ const [isDialogOpen, setIsDialogOpen] = useState(false);+ const [preset, setPreset] = useState<TPreset | null>(null);- const imageDetail = settingsConfiguration.find(- (setting) => setting.key === 'imageDetail',- ) as SettingDefinition;- const DetailComponent = componentMapping[imageDetail.component];- const { key: detail, default: detailDefault, ...detailSettings } = imageDetail;+ const { data: endpointsConfig } = useGetEndpointsQuery();- const resendFiles = settingsConfiguration.find(- (setting) => setting.key === 'resendFiles',- ) as SettingDefinition;- const Switch = componentMapping[resendFiles.component];- const { key: switchKey, default: switchDefault, ...switchSettings } = resendFiles;+ const bedrockRegions = useMemo(() => {+ return endpointsConfig?.[conversation?.endpoint ?? '']?.availableRegions ?? [];+ }, [endpointsConfig, conversation?.endpoint]);- const promptPrefix = settingsConfiguration.find(- (setting) => setting.key === 'promptPrefix',- ) as SettingDefinition;- const Textarea = componentMapping[promptPrefix.component];- const { key: textareaKey, default: textareaDefault, ...textareaSettings } = promptPrefix;+ const parameters = useMemo(() => {+ const [combinedKey, endpointKey] = getSettingsKeys(+ conversation?.endpoint ?? '',+ conversation?.model ?? '',+ );+ return settings[combinedKey] ?? settings[endpointKey];+ }, [conversation]);- const chatGptLabel = settingsConfiguration.find(- (setting) => setting.key === 'chatGptLabel',- ) as SettingDefinition;- const Input = componentMapping[chatGptLabel.component];- const { key: inputKey, default: inputDefault, ...inputSettings } = chatGptLabel;+ const openDialog = useCallback(() => {+ const newPreset = tPresetUpdateSchema.parse({+ ...conversation,+ }) as TPreset;+ setPreset(newPreset);+ setIsDialogOpen(true);+ }, [conversation]);- const stop = settingsConfiguration.find((setting) => setting.key === 'stop') as SettingDefinition;- const Tags = componentMapping[stop.component];- const { key: stopKey, default: stopDefault, ...stopSettings } = stop;+ if (!parameters) {+ return null;+ }return (<div className="h-auto max-w-full overflow-x-hidden p-3">@@ -205,49 +48,38 @@ export default function Parameters() {{' '}{/* This is the parent element containing all settings */}{/* Below is an example of an applied dynamic setting, each be contained by a div with the column span specified */}- <Input- settingKey={inputKey}- defaultValue={inputDefault}- {...inputSettings}- setOption={setOption}- conversation={conversation}- />- <Textarea- settingKey={textareaKey}- defaultValue={textareaDefault}- {...textareaSettings}- setOption={setOption}- conversation={conversation}- />- <TempComponent- settingKey={temp}- defaultValue={tempDefault}- {...tempSettings}- setOption={setOption}- conversation={conversation}- />- <Switch- settingKey={switchKey}- defaultValue={switchDefault}- {...switchSettings}- setOption={setOption}- conversation={conversation}- />- <DetailComponent- settingKey={detail}- defaultValue={detailDefault}- {...detailSettings}- setOption={setOption}- conversation={conversation}- />- <Tags- settingKey={stopKey}- defaultValue={stopDefault}- {...stopSettings}- setOption={setOption}- conversation={conversation}- />+ {parameters.map((setting) => {+ const Component = componentMapping[setting.component];+ const { key, default: defaultValue, ...rest } = setting;++ if (key === 'region' && bedrockRegions.length) {+ rest.options = bedrockRegions;+ }++ return (+ <Component+ key={key}+ settingKey={key}+ defaultValue={defaultValue}+ {...rest}+ setOption={setOption}+ conversation={conversation}+ />+ );+ })}+ </div>+ <div className="mt-6 flex justify-center">+ <button+ onClick={openDialog}+ className="btn btn-primary focus:shadow-outline flex w-full items-center justify-center px-4 py-2 font-semibold text-white hover:bg-green-600 focus:border-green-500"+ type="button"+ >+ {localize('com_endpoint_save_as_preset')}+ </button></div>+ {preset && (+ <SaveAsPresetDialog open={isDialogOpen} onOpenChange={setIsDialogOpen} preset={preset} />+ )}</div>);}diff --git a/client/src/components/SidePanel/Parameters/components.tsx b/client/src/components/SidePanel/Parameters/components.tsxnew file mode 100644index 0000000000..1d418c1a12--- /dev/null+++ b/client/src/components/SidePanel/Parameters/components.tsx@@ -0,0 +1,23 @@+import { ComponentTypes } from 'librechat-data-provider';+import type { DynamicSettingProps } from 'librechat-data-provider';+import {+ DynamicCombobox,+ DynamicDropdown,+ DynamicCheckbox,+ DynamicTextarea,+ DynamicSlider,+ DynamicSwitch,+ DynamicInput,+ DynamicTags,+} from './';++export const componentMapping: Record<ComponentTypes, React.ComponentType<DynamicSettingProps>> = {+ [ComponentTypes.Slider]: DynamicSlider,+ [ComponentTypes.Dropdown]: DynamicDropdown,+ [ComponentTypes.Switch]: DynamicSwitch,+ [ComponentTypes.Textarea]: DynamicTextarea,+ [ComponentTypes.Input]: DynamicInput,+ [ComponentTypes.Checkbox]: DynamicCheckbox,+ [ComponentTypes.Tags]: DynamicTags,+ [ComponentTypes.Combobox]: DynamicCombobox,+};diff --git a/client/src/components/SidePanel/Parameters/index.ts b/client/src/components/SidePanel/Parameters/index.tsindex e5c59ced58..d945367c6d 100644--- a/client/src/components/SidePanel/Parameters/index.ts+++ b/client/src/components/SidePanel/Parameters/index.ts@@ -1,4 +1,5 @@export { default as DynamicInputNumber } from './DynamicInputNumber';+export { default as DynamicCombobox } from './DynamicCombobox';export { default as DynamicDropdown } from './DynamicDropdown';export { default as DynamicCheckbox } from './DynamicCheckbox';export { default as DynamicTextarea } from './DynamicTextarea';@@ -6,3 +7,4 @@ export { default as DynamicSlider } from './DynamicSlider';export { default as DynamicSwitch } from './DynamicSwitch';export { default as DynamicInput } from './DynamicInput';export { default as DynamicTags } from './DynamicTags';+export { default as OptionHoverAlt } from './OptionHover';diff --git a/client/src/components/SidePanel/Parameters/settings.ts b/client/src/components/SidePanel/Parameters/settings.tsnew file mode 100644index 0000000000..062b8e2c4c--- /dev/null+++ b/client/src/components/SidePanel/Parameters/settings.ts@@ -0,0 +1,354 @@+import { EModelEndpoint, BedrockProviders } from 'librechat-data-provider';+import type { SettingsConfiguration, SettingDefinition } from 'librechat-data-provider';++// Base definitions+const baseDefinitions: Record<string, Partial<SettingDefinition>> = {+ model: {+ key: 'model',+ label: 'com_ui_model',+ labelCode: true,+ type: 'string',+ component: 'dropdown',+ optionType: 'model',+ selectPlaceholder: 'com_ui_select_model',+ searchPlaceholder: 'com_ui_select_search_model',+ searchPlaceholderCode: true,+ selectPlaceholderCode: true,+ columnSpan: 4,+ },+ temperature: {+ key: 'temperature',+ label: 'com_endpoint_temperature',+ labelCode: true,+ description: 'com_endpoint_openai_temp',+ descriptionCode: true,+ type: 'number',+ component: 'slider',+ optionType: 'model',+ columnSpan: 4,+ },+ topP: {+ key: 'topP',+ label: 'com_endpoint_top_p',+ labelCode: true,+ description: 'com_endpoint_anthropic_topp',+ descriptionCode: true,+ type: 'number',+ component: 'slider',+ optionType: 'model',+ columnSpan: 4,+ },+};++const bedrock: Record<string, SettingDefinition> = {+ region: {+ key: 'region',+ type: 'string',+ label: 'com_ui_region',+ labelCode: true,+ component: 'combobox',+ optionType: 'conversation',+ selectPlaceholder: 'com_ui_select_region',+ searchPlaceholder: 'com_ui_select_search_region',+ searchPlaceholderCode: true,+ selectPlaceholderCode: true,+ columnSpan: 2,+ },+};++const createDefinition = (+ base: Partial<SettingDefinition>,+ overrides: Partial<SettingDefinition>,+): SettingDefinition => {+ return { ...base, ...overrides } as SettingDefinition;+};++const librechat: Record<string, SettingDefinition> = {+ modelLabel: {+ key: 'modelLabel',+ label: 'com_endpoint_custom_name',+ labelCode: true,+ type: 'string',+ default: '',+ component: 'input',+ placeholder: 'com_endpoint_openai_custom_name_placeholder',+ placeholderCode: true,+ optionType: 'conversation',+ },+ maxContextTokens: {+ key: 'maxContextTokens',+ label: 'com_endpoint_context_tokens',+ labelCode: true,+ type: 'number',+ component: 'input',+ placeholder: 'com_endpoint_context_info',+ placeholderCode: true,+ optionType: 'model',+ columnSpan: 2,+ },+ resendFiles: {+ key: 'resendFiles',+ label: 'com_endpoint_plug_resend_files',+ labelCode: true,+ description: 'com_endpoint_openai_resend_files',+ descriptionCode: true,+ type: 'boolean',+ default: true,+ component: 'switch',+ optionType: 'conversation',+ showDefault: false,+ columnSpan: 2,+ },+ promptPrefix: {+ key: 'promptPrefix',+ label: 'com_endpoint_prompt_prefix',+ labelCode: true,+ type: 'string',+ default: '',+ component: 'textarea',+ placeholder: 'com_endpoint_openai_prompt_prefix_placeholder',+ placeholderCode: true,+ optionType: 'model',+ },+};++const anthropic: Record<string, SettingDefinition> = {+ system: {+ key: 'system',+ label: 'com_endpoint_prompt_prefix',+ labelCode: true,+ type: 'string',+ default: '',+ component: 'textarea',+ placeholder: 'com_endpoint_openai_prompt_prefix_placeholder',+ placeholderCode: true,+ optionType: 'model',+ },+ maxTokens: {+ key: 'maxTokens',+ label: 'com_endpoint_max_output_tokens',+ labelCode: true,+ type: 'number',+ component: 'input',+ placeholder: 'com_endpoint_anthropic_maxoutputtokens',+ placeholderCode: true,+ optionType: 'model',+ columnSpan: 2,+ },+ temperature: createDefinition(baseDefinitions.temperature, {+ default: 1,+ range: { min: 0, max: 1, step: 0.01 },+ }),+ topP: createDefinition(baseDefinitions.topP, {+ default: 0.999,+ range: { min: 0, max: 1, step: 0.01 },+ }),+ topK: {+ key: 'topK',+ label: 'com_endpoint_top_k',+ labelCode: true,+ description: 'com_endpoint_anthropic_topk',+ descriptionCode: true,+ type: 'number',+ range: { min: 0, max: 500, step: 1 },+ component: 'slider',+ optionType: 'model',+ columnSpan: 4,+ },+ stop: {+ key: 'stop',+ label: 'com_endpoint_stop',+ labelCode: true,+ description: 'com_endpoint_openai_stop',+ descriptionCode: true,+ placeholder: 'com_endpoint_stop_placeholder',+ placeholderCode: true,+ type: 'array',+ default: [],+ component: 'tags',+ optionType: 'conversation',+ minTags: 0,+ maxTags: 4,+ },+};++const mistral: Record<string, SettingDefinition> = {+ temperature: createDefinition(baseDefinitions.temperature, {+ default: 0.7,+ range: { min: 0, max: 1, step: 0.01 },+ }),+ topP: createDefinition(baseDefinitions.topP, {+ range: { min: 0, max: 1, step: 0.01 },+ }),+};++const cohere: Record<string, SettingDefinition> = {+ temperature: createDefinition(baseDefinitions.temperature, {+ default: 0.3,+ range: { min: 0, max: 1, step: 0.01 },+ }),+ topP: createDefinition(baseDefinitions.topP, {+ default: 0.75,+ range: { min: 0.01, max: 0.99, step: 0.01 },+ }),+};++const meta: Record<string, SettingDefinition> = {+ temperature: createDefinition(baseDefinitions.temperature, {+ default: 0.5,+ range: { min: 0, max: 1, step: 0.01 },+ }),+ topP: createDefinition(baseDefinitions.topP, {+ default: 0.9,+ range: { min: 0, max: 1, step: 0.01 },+ }),+};++const bedrockAnthropic: SettingsConfiguration = [+ librechat.modelLabel,+ anthropic.system,+ librechat.maxContextTokens,+ anthropic.maxTokens,+ anthropic.temperature,+ anthropic.topP,+ anthropic.topK,+ anthropic.stop,+ bedrock.region,+ librechat.resendFiles,+];++const bedrockMistral: SettingsConfiguration = [+ librechat.modelLabel,+ librechat.promptPrefix,+ librechat.maxContextTokens,+ anthropic.maxTokens,+ mistral.temperature,+ mistral.topP,+ bedrock.region,+ librechat.resendFiles,+];++const bedrockCohere: SettingsConfiguration = [+ librechat.modelLabel,+ librechat.promptPrefix,+ librechat.maxContextTokens,+ anthropic.maxTokens,+ cohere.temperature,+ cohere.topP,+ bedrock.region,+ librechat.resendFiles,+];++const bedrockGeneral: SettingsConfiguration = [+ librechat.modelLabel,+ librechat.promptPrefix,+ librechat.maxContextTokens,+ meta.temperature,+ meta.topP,+ bedrock.region,+ librechat.resendFiles,+];++const bedrockAnthropicCol1: SettingsConfiguration = [+ baseDefinitions.model as SettingDefinition,+ librechat.modelLabel,+ anthropic.system,+ anthropic.stop,+];++const bedrockAnthropicCol2: SettingsConfiguration = [+ librechat.maxContextTokens,+ anthropic.maxTokens,+ anthropic.temperature,+ anthropic.topP,+ anthropic.topK,+ bedrock.region,+ librechat.resendFiles,+];++const bedrockMistralCol1: SettingsConfiguration = [+ baseDefinitions.model as SettingDefinition,+ librechat.modelLabel,+ librechat.promptPrefix,+];++const bedrockMistralCol2: SettingsConfiguration = [+ librechat.maxContextTokens,+ anthropic.maxTokens,+ mistral.temperature,+ mistral.topP,+ bedrock.region,+ librechat.resendFiles,+];++const bedrockCohereCol1: SettingsConfiguration = [+ baseDefinitions.model as SettingDefinition,+ librechat.modelLabel,+ librechat.promptPrefix,+];++const bedrockCohereCol2: SettingsConfiguration = [+ librechat.maxContextTokens,+ anthropic.maxTokens,+ cohere.temperature,+ cohere.topP,+ bedrock.region,+ librechat.resendFiles,+];++const bedrockGeneralCol1: SettingsConfiguration = [+ baseDefinitions.model as SettingDefinition,+ librechat.modelLabel,+ librechat.promptPrefix,+];++const bedrockGeneralCol2: SettingsConfiguration = [+ librechat.maxContextTokens,+ meta.temperature,+ meta.topP,+ bedrock.region,+ librechat.resendFiles,+];++export const settings: Record<string, SettingsConfiguration | undefined> = {+ [`${EModelEndpoint.bedrock}-${BedrockProviders.Anthropic}`]: bedrockAnthropic,+ [`${EModelEndpoint.bedrock}-${BedrockProviders.MistralAI}`]: bedrockMistral,+ [`${EModelEndpoint.bedrock}-${BedrockProviders.Cohere}`]: bedrockCohere,+ [`${EModelEndpoint.bedrock}-${BedrockProviders.Meta}`]: bedrockGeneral,+ [`${EModelEndpoint.bedrock}-${BedrockProviders.AI21}`]: bedrockGeneral,+ [`${EModelEndpoint.bedrock}-${BedrockProviders.Amazon}`]: bedrockGeneral,+};++export const presetSettings: Record<+ string,+ | {+ col1: SettingsConfiguration;+ col2: SettingsConfiguration;+ }+ | undefined+> = {+ [`${EModelEndpoint.bedrock}-${BedrockProviders.Anthropic}`]: {+ col1: bedrockAnthropicCol1,+ col2: bedrockAnthropicCol2,+ },+ [`${EModelEndpoint.bedrock}-${BedrockProviders.MistralAI}`]: {+ col1: bedrockMistralCol1,+ col2: bedrockMistralCol2,+ },+ [`${EModelEndpoint.bedrock}-${BedrockProviders.Cohere}`]: {+ col1: bedrockCohereCol1,+ col2: bedrockCohereCol2,+ },+ [`${EModelEndpoint.bedrock}-${BedrockProviders.Meta}`]: {+ col1: bedrockGeneralCol1,+ col2: bedrockGeneralCol2,+ },+ [`${EModelEndpoint.bedrock}-${BedrockProviders.AI21}`]: {+ col1: bedrockGeneralCol1,+ col2: bedrockGeneralCol2,+ },+ [`${EModelEndpoint.bedrock}-${BedrockProviders.Amazon}`]: {+ col1: bedrockGeneralCol1,+ col2: bedrockGeneralCol2,+ },+};diff --git a/client/src/components/svg/BedrockIcon.tsx b/client/src/components/svg/BedrockIcon.tsxnew file mode 100644index 0000000000..f514790c38--- /dev/null+++ b/client/src/components/svg/BedrockIcon.tsx@@ -0,0 +1,23 @@+import { cn } from '~/utils';++export default function BedrockIcon({+ size = 25,+ className = '',+}: {+ size?: number;+ className?: string;+}) {+ return (+ <svg+ width={size}+ height={size}+ viewBox="0 0 24 24"+ xmlns="http://www.w3.org/2000/svg"+ className={cn('fill-current text-black', className)}+ >+ <g fill="currentColor">+ <path d="M12,18.1397014 L9.574,18.9487014 L8.628,18.3177014 L9.658,17.9737014 L9.342,17.0257014 L7.574,17.6147014 L7,17.2327014 L7,14.4997014 C7,14.3107014 6.893,14.1377014 6.724,14.0527014 L5,13.1907014 L5,10.8087014 L6.5,10.0587014 L8,10.8087014 L8,12.4997014 C8,12.6897014 8.107,12.8627014 8.276,12.9477014 L10.276,13.9477014 L10.724,13.0527014 L9,12.1907014 L9,10.8087014 L10.724,9.94770136 C10.893,9.86270136 11,9.68970136 11,9.49970136 L11,7.99970136 L10,7.99970136 L10,9.19070136 L8.5,9.94070136 L7,9.19070136 L7,6.76770136 L8,6.10070136 L8,7.99970136 L9,7.99970136 L9,5.43470136 L9.574,5.05170136 L12,5.86070136 L12,18.1397014 Z M17.5,16.9997014 C17.775,16.9997014 18,17.2237014 18,17.4997014 C18,17.7757014 17.775,17.9997014 17.5,17.9997014 C17.225,17.9997014 17,17.7757014 17,17.4997014 C17,17.2237014 17.225,16.9997014 17.5,16.9997014 L17.5,16.9997014 Z M16.5,5.99970136 C16.775,5.99970136 17,6.22370136 17,6.49970136 C17,6.77570136 16.775,6.99970136 16.5,6.99970136 C16.225,6.99970136 16,6.77570136 16,6.49970136 C16,6.22370136 16.225,5.99970136 16.5,5.99970136 L16.5,5.99970136 Z M18.5,11.9997014 C18.775,11.9997014 19,12.2237014 19,12.4997014 C19,12.7757014 18.775,12.9997014 18.5,12.9997014 C18.225,12.9997014 18,12.7757014 18,12.4997014 C18,12.2237014 18.225,11.9997014 18.5,11.9997014 L18.5,11.9997014 Z M17.092,12.9997014 C17.299,13.5807014 17.849,13.9997014 18.5,13.9997014 C19.327,13.9997014 20,13.3277014 20,12.4997014 C20,11.6727014 19.327,10.9997014 18.5,10.9997014 C17.849,10.9997014 17.299,11.4197014 17.092,11.9997014 L13,11.9997014 L13,9.99970136 L16.5,9.99970136 C16.776,9.99970136 17,9.77670136 17,9.49970136 L17,7.90770136 C17.581,7.70070136 18,7.15070136 18,6.49970136 C18,5.67270136 17.327,4.99970136 16.5,4.99970136 C15.673,4.99970136 15,5.67270136 15,6.49970136 C15,7.15070136 15.419,7.70070136 16,7.90770136 L16,8.99970136 L13,8.99970136 L13,5.49970136 C13,5.28470136 12.862,5.09370136 12.658,5.02570136 L9.658,4.02570136 C9.511,3.97670136 9.351,3.99870136 9.223,4.08370136 L6.223,6.08370136 C6.084,6.17670136 6,6.33270136 6,6.49970136 L6,9.19070136 L4.276,10.0527014 C4.107,10.1377014 4,10.3107014 4,10.4997014 L4,13.4997014 C4,13.6897014 4.107,13.8627014 4.276,13.9477014 L6,14.8087014 L6,17.4997014 C6,17.6667014 6.084,17.8237014 6.223,17.9157014 L9.223,19.9157014 C9.306,19.9717014 9.402,19.9997014 9.5,19.9997014 C9.553,19.9997014 9.606,19.9917014 9.658,19.9737014 L12.658,18.9737014 C12.862,18.9067014 13,18.7157014 13,18.4997014 L13,15.9997014 L15.293,15.9997014 L16.146,16.8537014 L16.159,16.8407014 C16.061,17.0407014 16,17.2627014 16,17.4997014 C16,18.3267014 16.673,18.9997014 17.5,18.9997014 C18.327,18.9997014 19,18.3267014 19,17.4997014 C19,16.6727014 18.327,15.9997014 17.5,15.9997014 C17.262,15.9997014 17.04,16.0607014 16.841,16.1597014 L16.854,16.1467014 L15.854,15.1467014 C15.76,15.0527014 15.633,14.9997014 15.5,14.9997014 L13,14.9997014 L13,12.9997014 L17.092,12.9997014 Z" />+ </g>+ </svg>+ );+}diff --git a/client/src/components/svg/EditIcon.tsx b/client/src/components/svg/EditIcon.tsxindex 7adfef0784..21a6b3c31f 100644--- a/client/src/components/svg/EditIcon.tsx+++ b/client/src/components/svg/EditIcon.tsx@@ -1,37 +1,34 @@import React from 'react';import { cn } from '~/utils';-const EditIcon = React.forwardRef<SVGSVGElement>(- (- props: {- className?: string;- size?: string;- },- ref,- ) => {- const { className = 'icon-md', size = '1.2em' } = props;- return (- <svg- ref={ref}- fill="none"- strokeWidth="2"- xmlns="http://www.w3.org/2000/svg"- viewBox="0 0 24 24"- strokeLinecap="round"- strokeLinejoin="round"- height={size}- width={size}- className={cn(className)}- >- <path- fillRule="evenodd"- clipRule="evenodd"- d="M13.2929 4.29291C15.0641 2.52167 17.9359 2.52167 19.7071 4.2929C21.4783 6.06414 21.4783 8.93588 19.7071 10.7071L18.7073 11.7069L11.1603 19.2539C10.7182 19.696 10.1489 19.989 9.53219 20.0918L4.1644 20.9864C3.84584 21.0395 3.52125 20.9355 3.29289 20.7071C3.06453 20.4788 2.96051 20.1542 3.0136 19.8356L3.90824 14.4678C4.01103 13.8511 4.30396 13.2818 4.7461 12.8397L13.2929 4.29291ZM13 7.41422L6.16031 14.2539C6.01293 14.4013 5.91529 14.591 5.88102 14.7966L5.21655 18.7835L9.20339 18.119C9.40898 18.0847 9.59872 17.9871 9.7461 17.8397L16.5858 11L13 7.41422ZM18 9.5858L14.4142 6.00001L14.7071 5.70712C15.6973 4.71693 17.3027 4.71693 18.2929 5.70712C19.2831 6.69731 19.2831 8.30272 18.2929 9.29291L18 9.5858Z"- fill="currentColor"- ></path>- </svg>- );- },-);+type IconProps = {+ className?: string;+ size?: string;+};++const EditIcon = React.forwardRef<SVGSVGElement, IconProps>((props: IconProps, ref) => {+ const { className = 'icon-md', size = '1.2em' } = props;+ return (+ <svg+ ref={ref}+ fill="none"+ strokeWidth="2"+ xmlns="http://www.w3.org/2000/svg"+ viewBox="0 0 24 24"+ strokeLinecap="round"+ strokeLinejoin="round"+ height={size}+ width={size}+ className={cn(className)}+ >+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M13.2929 4.29291C15.0641 2.52167 17.9359 2.52167 19.7071 4.2929C21.4783 6.06414 21.4783 8.93588 19.7071 10.7071L18.7073 11.7069L11.1603 19.2539C10.7182 19.696 10.1489 19.989 9.53219 20.0918L4.1644 20.9864C3.84584 21.0395 3.52125 20.9355 3.29289 20.7071C3.06453 20.4788 2.96051 20.1542 3.0136 19.8356L3.90824 14.4678C4.01103 13.8511 4.30396 13.2818 4.7461 12.8397L13.2929 4.29291ZM13 7.41422L6.16031 14.2539C6.01293 14.4013 5.91529 14.591 5.88102 14.7966L5.21655 18.7835L9.20339 18.119C9.40898 18.0847 9.59872 17.9871 9.7461 17.8397L16.5858 11L13 7.41422ZM18 9.5858L14.4142 6.00001L14.7071 5.70712C15.6973 4.71693 17.3027 4.71693 18.2929 5.70712C19.2831 6.69731 19.2831 8.30272 18.2929 9.29291L18 9.5858Z"+ fill="currentColor"+ ></path>+ </svg>+ );+});export default EditIcon;diff --git a/client/src/components/svg/index.ts b/client/src/components/svg/index.tsindex 8af68f965f..d88a626a0d 100644--- a/client/src/components/svg/index.ts+++ b/client/src/components/svg/index.ts@@ -55,3 +55,4 @@ export { default as Sparkles } from './Sparkles';export { default as SpeechIcon } from './SpeechIcon';export { default as SaveIcon } from './SaveIcon';export { default as CircleHelpIcon } from './CircleHelpIcon';+export { default as BedrockIcon } from './BedrockIcon';diff --git a/client/src/components/ui/MultiSearch.tsx b/client/src/components/ui/MultiSearch.tsxindex c3b3c563b2..1856449340 100644--- a/client/src/components/ui/MultiSearch.tsx+++ b/client/src/components/ui/MultiSearch.tsx@@ -19,29 +19,29 @@ export default function MultiSearch({const localize = useLocalize();const onChangeHandler: React.ChangeEventHandler<HTMLInputElement> = useCallback((e) => onChange(e.target.value),- [],+ [onChange],);return (<divclassName={cn(- 'group sticky left-0 top-0 z-10 flex h-12 items-center gap-2 bg-gradient-to-b from-white from-65% to-transparent px-2 px-3 py-2 text-black transition-colors duration-300 focus:bg-gradient-to-b focus:from-white focus:to-white/50 dark:from-gray-700 dark:to-transparent dark:text-white dark:focus:from-white/10 dark:focus:to-white/20',+ 'group sticky left-0 top-0 z-10 flex h-12 items-center gap-2 bg-gradient-to-b from-white from-65% to-transparent px-3 py-2 text-black transition-colors duration-300 focus:bg-gradient-to-b focus:from-white focus:to-white/50 dark:from-gray-700 dark:to-transparent dark:text-white dark:focus:from-white/10 dark:focus:to-white/20',className,)}><Search className="h-4 w-4 text-gray-500 transition-colors duration-300 dark:group-focus-within:text-gray-300 dark:group-hover:text-gray-300" /><inputtype="text"- value={value || ''}+ value={value ?? ''}onChange={onChangeHandler}- placeholder={placeholder || localize('com_ui_select_search_model')}+ placeholder={placeholder ?? localize('com_ui_select_search_model')}className="flex-1 rounded-md border-none bg-transparent px-2.5 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-gray-700/10 dark:focus:ring-gray-200/10"/><div className="relative flex h-5 w-5 items-center justify-end text-gray-500"><XclassName={cn('text-gray-500 dark:text-gray-300',- value?.length ? 'cursor-pointer opacity-100' : 'opacity-0',+ value?.length ?? 0 ? 'cursor-pointer opacity-100' : 'opacity-0',)}onClick={() => onChange('')}/>@@ -104,20 +104,24 @@ export function useMultiSearch<OptionsType extends unknown[]>({// Iterate said optionsconst filteredOptions = useMemo(() => {- if (!shouldShowSearch || !filterValue || !availableOptions.length) {+ const currentFilter = filterValue ?? '';+ if (!shouldShowSearch || !currentFilter || !availableOptions.length) {// Don't render if available options aren't present, there's no filter activereturn availableOptions;}// Filter through the values, using a simple text-based search// nothing too fancy, but we can add a better search algo later if we need- const upperFilterValue = filterValue.toUpperCase();+ const upperFilterValue = currentFilter.toUpperCase();return availableOptions.filter((value) =>getTextKeyHelper(value).includes(upperFilterValue),) as OptionsType;}, [availableOptions, getTextKeyHelper, filterValue, shouldShowSearch]);- const onSearchChange = useCallback((nextFilterValue) => setFilterValue(nextFilterValue), []);+ const onSearchChange = useCallback(+ (nextFilterValue: string) => setFilterValue(nextFilterValue),+ [],+ );const searchRender = shouldShowSearch ? (<MultiSearchdiff --git a/client/src/components/ui/OGDialogTemplate.tsx b/client/src/components/ui/OGDialogTemplate.tsxindex ef51b4e878..740fd390b8 100644--- a/client/src/components/ui/OGDialogTemplate.tsx+++ b/client/src/components/ui/OGDialogTemplate.tsx@@ -24,6 +24,7 @@ type DialogTemplateProps = {leftButtons?: ReactNode;selection?: SelectionProps;className?: string;+ overlayClassName?: string;headerClassName?: string;mainClassName?: string;footerClassName?: string;@@ -40,11 +41,12 @@ const OGDialogTemplate = forwardRef((props: DialogTemplateProps, ref: Ref<HTMLDiselection,className,leftButtons,- description,+ description = '',mainClassName,headerClassName,footerClassName,showCloseButton,+ overlayClassName,showCancelButton = true,} = props;const { selectHandler, selectClasses, selectText } = selection || {};@@ -54,11 +56,12 @@ const OGDialogTemplate = forwardRef((props: DialogTemplateProps, ref: Ref<HTMLDi'bg-gray-800 text-white transition-colors hover:bg-gray-700 disabled:cursor-not-allowed disabled:opacity-50 dark:bg-gray-200 dark:text-gray-800 dark:hover:bg-gray-200';return (<OGDialogContent+ overlayClassName={overlayClassName}showCloseButton={showCloseButton}ref={ref}className={cn('bg-white dark:border-gray-700 dark:bg-gray-850 dark:text-gray-300',- className || '',+ className ?? '',)}onClick={(e) => e.stopPropagation()}>@@ -66,21 +69,21 @@ const OGDialogTemplate = forwardRef((props: DialogTemplateProps, ref: Ref<HTMLDi<OGDialogTitle>{title}</OGDialogTitle>{description && <OGDialogDescription className="">{description}</OGDialogDescription>}</OGDialogHeader>- <div className={cn('px-0', mainClassName)}>{main ? main : null}</div>+ <div className={cn('px-0', mainClassName)}>{main != null ? main : null}</div><OGDialogFooter className={footerClassName}>- <div>{leftButtons ? leftButtons : null}</div>+ <div>{leftButtons != null ? leftButtons : null}</div><div className="flex h-auto gap-3">{showCancelButton && (<OGDialogClose className="btn btn-neutral border-token-border-light relative rounded-lg text-sm ring-offset-2 dark:ring-offset-0 focus:ring-2 focus:ring-black">{Cancel}</OGDialogClose>)}- {buttons ? buttons : null}+ {buttons != null ? buttons : null}{selection ? (<OGDialogCloseonClick={selectHandler}className={`${- selectClasses || defaultSelect+ selectClasses ?? defaultSelect} inline-flex h-10 items-center justify-center rounded-lg border-none px-4 py-2 text-sm`}>{selectText}diff --git a/client/src/components/ui/OriginalDialog.tsx b/client/src/components/ui/OriginalDialog.tsxindex 5da47af7b6..ef0508fbe9 100644--- a/client/src/components/ui/OriginalDialog.tsx+++ b/client/src/components/ui/OriginalDialog.tsx@@ -29,14 +29,15 @@ DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;type DialogContentProps = React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & {showCloseButton?: boolean;disableScroll?: boolean;+ overlayClassName?: string;};const DialogContent = React.forwardRef<React.ElementRef<typeof DialogPrimitive.Content>,DialogContentProps->(({ className, showCloseButton = true, children, ...props }, ref) => (+>(({ className, overlayClassName, showCloseButton = true, children, ...props }, ref) => (<DialogPortal>- <DialogOverlay />+ <DialogOverlay className={overlayClassName} /><DialogPrimitive.Contentref={ref}className={cn(diff --git a/client/src/components/ui/SelectDropDown.tsx b/client/src/components/ui/SelectDropDown.tsxindex 80478c29aa..550a6bf456 100644--- a/client/src/components/ui/SelectDropDown.tsx+++ b/client/src/components/ui/SelectDropDown.tsx@@ -25,6 +25,7 @@ type SelectDropDownProps = {showAbove?: boolean;showLabel?: boolean;iconSide?: 'left' | 'right';+ optionIconSide?: 'left' | 'right';renderOption?: () => React.ReactNode;containerClassName?: string;currentValueClass?: string;@@ -38,17 +39,30 @@ type SelectDropDownProps = {showOptionIcon?: boolean;};+function getOptionText(option: string | Option | OptionWithIcon): string {+ if (typeof option === 'string') {+ return option;+ }+ if ('label' in option) {+ return option.label ?? '';+ }+ if ('value' in option) {+ return (option.value ?? '') + '';+ }+ return '';+}+function SelectDropDown({title: _title,value,disabled,setValue,- tabIndex,availableValues,showAbove = false,showLabel = true,emptyTitle = false,iconSide = 'right',+ optionIconSide = 'left',placeholder,containerClassName,optionsListClass,@@ -59,7 +73,7 @@ function SelectDropDown({renderOption,searchClassName,searchPlaceholder,- showOptionIcon,+ showOptionIcon = false,}: SelectDropDownProps) {const localize = useLocalize();const transitionProps = { className: 'top-full mt-3' };@@ -71,7 +85,7 @@ function SelectDropDown({if (emptyTitle) {title = '';- } else if (!title) {+ } else if (!(title ?? '')) {title = localize('com_ui_model');}@@ -81,12 +95,16 @@ function SelectDropDown({const [filteredValues, searchRender] = useMultiSearch<string[] | Option[]>({availableOptions: availableValues,placeholder: searchPlaceholder,- getTextKeyOverride: (option) => ((option as Option)?.label || '').toUpperCase(),+ getTextKeyOverride: (option) => getOptionText(option).toUpperCase(),className: searchClassName,+ disabled,});- const hasSearchRender = Boolean(searchRender);+ const hasSearchRender = searchRender != null;const options = hasSearchRender ? filteredValues : availableValues;+ console.log({ hasSearchRender, options });+ const renderIcon = showOptionIcon && value != null && (value as OptionWithIcon).icon != null;+return (<div className={cn('flex items-center justify-center gap-2 ', containerClassName ?? '')}><div className={cn('relative w-full', subContainerClassName ?? '')}>@@ -121,20 +139,27 @@ function SelectDropDown({{!showLabel && !emptyTitle && (<span className="text-xs text-gray-700 dark:text-gray-500">{title}:</span>)}- {showOptionIcon && value && (value as OptionWithIcon)?.icon && (+ {renderIcon && optionIconSide !== 'right' && (<span className="icon-md flex items-center">{(value as OptionWithIcon).icon}</span>)}- {value ? (- typeof value !== 'string' ? (- value?.label ?? ''- ) : (- value- )- ) : (- <span className="text-gray-500 dark:text-gray-400">{placeholder}</span>+ {renderIcon && (+ <span className="icon-md absolute right-0 mr-8 flex items-center">+ {(value as OptionWithIcon).icon}+ </span>)}+ {(() => {+ if (!value) {+ return <span className="text-text-secondary">{placeholder}</span>;+ }++ if (typeof value !== 'string') {+ return value.label ?? '';+ }++ return value;+ })()}</span></span><span className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">@@ -188,10 +213,10 @@ function SelectDropDown({}const currentLabel =- typeof option === 'string' ? option : option?.label ?? option?.value ?? '';- const currentValue = typeof option === 'string' ? option : option?.value ?? '';+ typeof option === 'string' ? option : option.label ?? option.value ?? '';+ const currentValue = typeof option === 'string' ? option : option.value ?? '';const currentIcon =- typeof option === 'string' ? null : (option?.icon as React.ReactNode) ?? null;+ typeof option === 'string' ? null : (option.icon as React.ReactNode) ?? null;let activeValue: string | number | null | Option = value;if (typeof activeValue !== 'string') {activeValue = activeValue?.value ?? '';@@ -204,7 +229,7 @@ function SelectDropDown({className={({ active }) =>cn('group relative flex h-[42px] cursor-pointer select-none items-center overflow-hidden pl-3 pr-9 text-gray-800 hover:bg-gray-20 dark:text-white dark:hover:bg-gray-600',- active ? 'bg-surface-tertiary' : '',+ active ? 'bg-surface-active text-text-primary' : '',optionsClass ?? '',)}@@ -217,7 +242,16 @@ function SelectDropDown({iconSide === 'left' ? 'ml-4' : '',)}>- {currentIcon && <span className="mr-1">{currentIcon}</span>}+ {currentIcon != null && (+ <span+ className={cn(+ 'mr-1',+ optionIconSide === 'right' ? 'absolute right-0 pr-2' : '',+ )}+ >+ {currentIcon}+ </span>+ )}{currentLabel}</span>{currentValue === activeValue && (diff --git a/client/src/components/ui/Slider.tsx b/client/src/components/ui/Slider.tsxindex c944a93a71..ea407885ea 100644--- a/client/src/components/ui/Slider.tsx+++ b/client/src/components/ui/Slider.tsx@@ -2,20 +2,26 @@ import * as React from 'react';import * as SliderPrimitive from '@radix-ui/react-slider';import { useDoubleClick } from '@zattoo/use-double-click';import type { clickEvent } from '@zattoo/use-double-click';-import { cn } from '../../utils';+import { cn } from '~/utils';interface SliderProps extends React.ComponentPropsWithoutRef<typeof SliderPrimitive.Root> {doubleClickHandler?: clickEvent;+ trackClassName?: string;}const Slider = React.forwardRef<React.ElementRef<typeof SliderPrimitive.Root>, SliderProps>(- ({ className, doubleClickHandler, ...props }, ref) => (+ (+ { className, trackClassName = 'bg-gray-200 dark:bg-gray-850', doubleClickHandler, ...props },+ ref,+ ) => (<SliderPrimitive.Rootref={ref}className={cn('relative flex w-full touch-none select-none items-center', className ?? '')}{...props}>- <SliderPrimitive.Track className="relative h-1 w-full grow overflow-hidden rounded-full bg-gray-200 dark:bg-gray-850">+ <SliderPrimitive.Track+ className={cn('relative h-1 w-full grow overflow-hidden rounded-full', trackClassName)}+ ><SliderPrimitive.Range className="absolute h-full bg-gray-850 dark:bg-white" /></SliderPrimitive.Track><SliderPrimitive.Thumbdiff --git a/client/src/hooks/Chat/useChatFunctions.ts b/client/src/hooks/Chat/useChatFunctions.tsindex 419bf8a1d5..43a7fcd5da 100644--- a/client/src/hooks/Chat/useChatFunctions.ts+++ b/client/src/hooks/Chat/useChatFunctions.ts@@ -241,6 +241,7 @@ export default function useChatFunctions({},},];+ setShowStopButton(true);} else {setShowStopButton(true);}diff --git a/client/src/hooks/Conversations/useDebouncedInput.ts b/client/src/hooks/Conversations/useDebouncedInput.tsindex 5db075b769..bae6ae0c7e 100644--- a/client/src/hooks/Conversations/useDebouncedInput.ts+++ b/client/src/hooks/Conversations/useDebouncedInput.ts@@ -41,7 +41,7 @@ function useDebouncedInput<T = unknown>({const newValue: T =typeof e !== 'object'? e- : ((e as React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>)?.target+ : ((e as React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>).target.value as unknown as T);setValue(newValue);setDebouncedOption(newValue);diff --git a/client/src/hooks/Conversations/useParameterEffects.ts b/client/src/hooks/Conversations/useParameterEffects.tsindex a8fc067580..ad45f52238 100644--- a/client/src/hooks/Conversations/useParameterEffects.ts+++ b/client/src/hooks/Conversations/useParameterEffects.ts@@ -38,29 +38,31 @@ function useParameterEffects<T = unknown>({/** Resets the local state if conversationId changed */useEffect(() => {- if (!conversation?.conversationId) {+ const conversationId = conversation?.conversationId ?? '';+ if (!conversationId) {return;}- if (idRef.current === conversation?.conversationId) {+ if (idRef.current === conversationId) {return;}- idRef.current = conversation?.conversationId;+ idRef.current = conversationId;setInputValue(defaultValue as T);}, [setInputValue, conversation?.conversationId, defaultValue]);/** Resets the local state if presetId changed */useEffect(() => {- if (!preset?.presetId) {+ const presetId = preset?.presetId ?? '';+ if (!presetId) {return;}- if (presetIdRef.current === preset?.presetId) {+ if (presetIdRef.current === presetId) {return;}- presetIdRef.current = preset?.presetId;+ presetIdRef.current = presetId;setInputValue(defaultValue as T);}, [setInputValue, preset?.presetId, defaultValue]);}diff --git a/client/src/hooks/Messages/useMessageActions.tsx b/client/src/hooks/Messages/useMessageActions.tsxindex 3c481476df..3a7e1d59d3 100644--- a/client/src/hooks/Messages/useMessageActions.tsx+++ b/client/src/hooks/Messages/useMessageActions.tsx@@ -1,8 +1,13 @@import { useRecoilValue } from 'recoil';import { useCallback, useMemo } from 'react';-import { isAssistantsEndpoint } from 'librechat-data-provider';+import { isAssistantsEndpoint, isAgentsEndpoint } from 'librechat-data-provider';import type { TMessageProps } from '~/common';-import { useChatContext, useAddedChatContext, useAssistantsMapContext } from '~/Providers';+import {+ useChatContext,+ useAddedChatContext,+ useAssistantsMapContext,+ useAgentsMapContext,+} from '~/Providers';import useCopyToClipboard from './useCopyToClipboard';import { useAuthContext } from '~/hooks/AuthContext';import useLocalize from '~/hooks/useLocalize';@@ -35,6 +40,8 @@ export default function useMessageActions(props: TMessageActions) {() => (isMultiMessage === true ? addedConvo : rootConvo),[isMultiMessage, addedConvo, rootConvo],);++ const agentMap = useAgentsMapContext();const assistantMap = useAssistantsMapContext();const { text, content, messageId = null, isCreatedByUser } = message ?? {};@@ -56,6 +63,26 @@ export default function useMessageActions(props: TMessageActions) {return assistantMap?.[endpointKey] ? assistantMap[endpointKey][modelKey] : undefined;}, [conversation?.endpoint, message?.model, assistantMap]);+ const agent = useMemo(() => {+ if (!isAgentsEndpoint(conversation?.endpoint)) {+ return undefined;+ }++ if (!agentMap) {+ return undefined;+ }++ const modelKey = message?.model ?? '';+ if (modelKey) {+ return agentMap[modelKey];+ }++ const agentId = conversation?.agent_id ?? '';+ if (agentId) {+ return agentMap[agentId];+ }+ }, [agentMap, conversation?.agent_id, conversation?.endpoint, message?.model]);+const isSubmitting = useMemo(() => (isMultiMessage === true ? isSubmittingAdditional : isSubmittingRoot),[isMultiMessage, isSubmittingAdditional, isSubmittingRoot],@@ -74,17 +101,20 @@ export default function useMessageActions(props: TMessageActions) {const messageLabel = useMemo(() => {if (message?.isCreatedByUser === true) {return UsernameDisplay ? (user?.name ?? '') || user?.username : localize('com_user_message');+ } else if (agent) {+ return agent.name ?? 'Assistant';} else if (assistant) {return assistant.name ?? 'Assistant';} else {return message?.sender;}- }, [message, assistant, UsernameDisplay, user, localize]);+ }, [message, agent, assistant, UsernameDisplay, user, localize]);return {ask,edit,index,+ agent,assistant,enterEdit,conversation,diff --git a/client/src/hooks/Messages/useMessageHelpers.tsx b/client/src/hooks/Messages/useMessageHelpers.tsxindex 873dae9b33..2db72031e4 100644--- a/client/src/hooks/Messages/useMessageHelpers.tsx+++ b/client/src/hooks/Messages/useMessageHelpers.tsx@@ -103,7 +103,7 @@ export default function useMessageHelpers(props: TMessageProps) {const modelKey = message?.model ?? '';return agentMap ? agentMap[modelKey] : undefined;- }, [agentMap, conversation?.endpoint]);+ }, [agentMap, conversation?.endpoint, message?.model]);const regenerateMessage = () => {if ((isSubmitting && isCreatedByUser === true) || !message) {diff --git a/client/src/hooks/Nav/useSideNavLinks.ts b/client/src/hooks/Nav/useSideNavLinks.tsindex a8a09a3992..a50d73b7ff 100644--- a/client/src/hooks/Nav/useSideNavLinks.ts+++ b/client/src/hooks/Nav/useSideNavLinks.ts@@ -1,15 +1,11 @@import { useMemo } from 'react';+import { MessageSquareQuote, ArrowRightToLine, Settings2, Bookmark } from 'lucide-react';import {- ArrowRightToLine,- MessageSquareQuote,- Bookmark,- // Settings2,-} from 'lucide-react';-import {- EModelEndpoint,isAssistantsEndpoint,isAgentsEndpoint,PermissionTypes,+ paramEndpoints,+ EModelEndpoint,Permissions,} from 'librechat-data-provider';import type { TConfig, TInterfaceConfig } from 'librechat-data-provider';@@ -18,7 +14,7 @@ import BookmarkPanel from '~/components/SidePanel/Bookmarks/BookmarkPanel';import PanelSwitch from '~/components/SidePanel/Builder/PanelSwitch';import AgentPanelSwitch from '~/components/SidePanel/Agents/AgentPanelSwitch';import PromptsAccordion from '~/components/Prompts/PromptsAccordion';-// import Parameters from '~/components/SidePanel/Parameters/Panel';+import Parameters from '~/components/SidePanel/Parameters/Panel';import FilesPanel from '~/components/SidePanel/Files/Panel';import { Blocks, AttachmentIcon } from '~/components/svg';import { useHasAccess } from '~/hooks';@@ -54,7 +50,7 @@ export default function useSideNavLinks({assistants &&assistants.disableBuilder !== true &&keyProvided &&- interfaceConfig.parameters+ interfaceConfig.parameters === true) {links.push({title: 'com_sidepanel_assistant_builder',@@ -70,7 +66,7 @@ export default function useSideNavLinks({agents &&// agents.disableBuilder !== true &&keyProvided &&- interfaceConfig.parameters+ interfaceConfig.parameters === true) {links.push({title: 'com_sidepanel_agent_builder',@@ -91,6 +87,16 @@ export default function useSideNavLinks({});}+ if (interfaceConfig.parameters === true && paramEndpoints.has(endpoint ?? '') && keyProvided) {+ links.push({+ title: 'com_sidepanel_parameters',+ label: '',+ icon: Settings2,+ id: 'parameters',+ Component: Parameters,+ });+ }+links.push({title: 'com_sidepanel_attach_files',label: '',@@ -119,13 +125,14 @@ export default function useSideNavLinks({return links;}, [- assistants,- agents,+ interfaceConfig.parameters,keyProvided,- hidePanel,+ assistants,endpoint,- interfaceConfig.parameters,+ agents,hasAccessToPrompts,+ hasAccessToBookmarks,+ hidePanel,]);return Links;diff --git a/client/src/hooks/SSE/useSSE.ts b/client/src/hooks/SSE/useSSE.tsindex 43ff45f1ab..75a97e7b3a 100644--- a/client/src/hooks/SSE/useSSE.ts+++ b/client/src/hooks/SSE/useSSE.ts@@ -117,8 +117,8 @@ export default function useSSE(};createdHandler(data, { ...submission, userMessage } as EventSubmission);- } else if (data.event) {- stepHandler(data);+ } else if (data.event != null) {+ stepHandler(data, { ...submission, userMessage } as EventSubmission);} else if (data.sync != null) {const runId = v4();setActiveRunId(runId);diff --git a/client/src/hooks/SSE/useStepHandler.ts b/client/src/hooks/SSE/useStepHandler.tsindex 2fc987cf9c..40b5f18598 100644--- a/client/src/hooks/SSE/useStepHandler.ts+++ b/client/src/hooks/SSE/useStepHandler.ts@@ -1,6 +1,12 @@import { useCallback, useRef } from 'react';import { StepTypes, ContentTypes, ToolCallTypes } from 'librechat-data-provider';-import type { Agents, PartMetadata, TMessage } from 'librechat-data-provider';+import type {+ Agents,+ PartMetadata,+ TMessage,+ TMessageContentParts,+ EventSubmission,+} from 'librechat-data-provider';import { getNonEmptyValue } from 'librechat-data-provider';type TUseStepHandler = {@@ -13,8 +19,17 @@ type TStepEvent = {data: Agents.MessageDeltaEvent | Agents.RunStep | Agents.ToolEndEvent;};+type MessageDeltaUpdate = { type: ContentTypes.TEXT; text: string; tool_call_ids?: string[] };++type AllContentTypes =+ | ContentTypes.TEXT+ | ContentTypes.TOOL_CALL+ | ContentTypes.IMAGE_FILE+ | ContentTypes.IMAGE_URL+ | ContentTypes.ERROR;+export default function useStepHandler({ setMessages, getMessages }: TUseStepHandler) {- const toolCallIdMap = useRef(new Map<string, string>());+ const toolCallIdMap = useRef(new Map<string, string | undefined>());const messageMap = useRef(new Map<string, TMessage>());const stepMap = useRef(new Map<string, Agents.RunStep>());@@ -24,41 +39,53 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHancontentPart: Agents.MessageContentComplex,finalUpdate = false,) => {- if (!contentPart.type) {+ const contentType = contentPart.type ?? '';+ if (!contentType) {console.warn('No content type found in content part');return message;}- const updatedContent = [...(message.content || [])];+ const updatedContent = [...(message.content || [])] as Array<+ Partial<TMessageContentParts> | undefined+ >;if (!updatedContent[index]) {- updatedContent[index] = { type: contentPart.type };+ updatedContent[index] = { type: contentPart.type as AllContentTypes };}if (- contentPart.type.startsWith(ContentTypes.TEXT) &&+ contentType.startsWith(ContentTypes.TEXT) &&ContentTypes.TEXT in contentPart &&typeof contentPart.text === 'string') {- const currentContent = updatedContent[index] as { type: ContentTypes.TEXT; text: string };- updatedContent[index] = {+ const currentContent = updatedContent[index] as MessageDeltaUpdate;+ const update: MessageDeltaUpdate = {type: ContentTypes.TEXT,text: (currentContent.text || '') + contentPart.text,};- } else if (contentPart.type === 'image_url' && 'image_url' in contentPart) {- const currentContent = updatedContent[index] as { type: 'image_url'; image_url: string };++ if (contentPart.tool_call_ids != null) {+ update.tool_call_ids = contentPart.tool_call_ids;+ }+ updatedContent[index] = update;+ } else if (contentType === ContentTypes.IMAGE_URL && 'image_url' in contentPart) {+ const currentContent = updatedContent[index] as {+ type: ContentTypes.IMAGE_URL;+ image_url: string;+ };updatedContent[index] = {...currentContent,};- } else if (contentPart.type === ContentTypes.TOOL_CALL && 'tool_call' in contentPart) {- const existingContent = updatedContent[index] as Agents.ToolCallContent;+ } else if (contentType === ContentTypes.TOOL_CALL && 'tool_call' in contentPart) {+ const existingContent = updatedContent[index] as Agents.ToolCallContent | undefined;+ const existingToolCall = existingContent?.tool_call;+ const toolCallArgs = (contentPart.tool_call.args as unknown as string | undefined) ?? '';const args = finalUpdate? contentPart.tool_call.args- : (existingContent?.tool_call?.args || '') + (contentPart.tool_call.args || '');+ : (existingToolCall?.args ?? '') + toolCallArgs;- const id = getNonEmptyValue([contentPart.tool_call.id, existingContent?.tool_call?.id]) ?? '';- const name =- getNonEmptyValue([contentPart.tool_call.name, existingContent?.tool_call?.name]) ?? '';+ const id = getNonEmptyValue([contentPart.tool_call.id, existingToolCall?.id]) ?? '';+ const name = getNonEmptyValue([contentPart.tool_call.name, existingToolCall?.name]) ?? '';const newToolCall: Agents.ToolCall & PartMetadata = {id,@@ -78,16 +105,17 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHan};}- return { ...message, content: updatedContent };+ return { ...message, content: updatedContent as TMessageContentParts[] };};return useCallback(- ({ event, data }: TStepEvent) => {+ ({ event, data }: TStepEvent, submission: EventSubmission) => {const messages = getMessages() || [];+ const { userMessage } = submission;if (event === 'on_run_step') {const runStep = data as Agents.RunStep;- const responseMessageId = runStep.runId;+ const responseMessageId = runStep.runId ?? '';if (!responseMessageId) {console.warn('No message id found in run step event');return;@@ -98,12 +126,11 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHanif (!response) {const responseMessage = messages[messages.length - 1] as TMessage;- const userMessage = messages[messages.length - 2];response = {...responseMessage,- parentMessageId: userMessage?.messageId,- conversationId: userMessage?.conversationId,+ parentMessageId: userMessage.messageId,+ conversationId: userMessage.conversationId,messageId: responseMessageId,content: [],};@@ -115,20 +142,23 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHan// Store tool call IDs if presentif (runStep.stepDetails.type === StepTypes.TOOL_CALLS) {runStep.stepDetails.tool_calls.forEach((toolCall) => {- if ('id' in toolCall && toolCall.id) {- toolCallIdMap.current.set(runStep.id, toolCall.id);+ const toolCallId = toolCall.id ?? '';+ if ('id' in toolCall && toolCallId) {+ toolCallIdMap.current.set(runStep.id, toolCallId);}});}} else if (event === 'on_message_delta') {const messageDelta = data as Agents.MessageDeltaEvent;const runStep = stepMap.current.get(messageDelta.id);- if (!runStep || !runStep.runId) {+ const responseMessageId = runStep?.runId ?? '';++ if (!runStep || !responseMessageId) {console.warn('No run step or runId found for message delta event');return;}- const response = messageMap.current.get(runStep.runId);+ const response = messageMap.current.get(responseMessageId);if (response && messageDelta.delta.content) {const contentPart = Array.isArray(messageDelta.delta.content)? messageDelta.delta.content[0]@@ -136,19 +166,21 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHanconst updatedResponse = updateContent(response, runStep.index, contentPart);- messageMap.current.set(runStep.runId, updatedResponse);+ messageMap.current.set(responseMessageId, updatedResponse);const currentMessages = getMessages() || [];setMessages([...currentMessages.slice(0, -1), updatedResponse]);}} else if (event === 'on_run_step_delta') {const runStepDelta = data as Agents.RunStepDeltaEvent;const runStep = stepMap.current.get(runStepDelta.id);- if (!runStep || !runStep.runId) {+ const responseMessageId = runStep?.runId ?? '';++ if (!runStep || !responseMessageId) {console.warn('No run step or runId found for run step delta event');return;}- const response = messageMap.current.get(runStep.runId);+ const response = messageMap.current.get(responseMessageId);if (response &&runStepDelta.delta.type === StepTypes.TOOL_CALLS &&@@ -157,13 +189,13 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHanlet updatedResponse = { ...response };runStepDelta.delta.tool_calls.forEach((toolCallDelta) => {- const toolCallId = toolCallIdMap.current.get(runStepDelta.id) || '';+ const toolCallId = toolCallIdMap.current.get(runStepDelta.id) ?? '';const contentPart: Agents.MessageContentComplex = {type: ContentTypes.TOOL_CALL,tool_call: {name: toolCallDelta.name ?? '',- args: toolCallDelta.args || '',+ args: toolCallDelta.args ?? '',id: toolCallId,},};@@ -171,7 +203,7 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHanupdatedResponse = updateContent(updatedResponse, runStep.index, contentPart);});- messageMap.current.set(runStep.runId, updatedResponse);+ messageMap.current.set(responseMessageId, updatedResponse);const updatedMessages = messages.map((msg) =>msg.messageId === runStep.runId ? updatedResponse : msg,);@@ -184,12 +216,14 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHanconst { id: stepId } = result;const runStep = stepMap.current.get(stepId);- if (!runStep || !runStep.runId) {+ const responseMessageId = runStep?.runId ?? '';++ if (!runStep || !responseMessageId) {console.warn('No run step or runId found for completed tool call event');return;}- const response = messageMap.current.get(runStep.runId);+ const response = messageMap.current.get(responseMessageId);if (response) {let updatedResponse = { ...response };@@ -200,7 +234,7 @@ export default function useStepHandler({ setMessages, getMessages }: TUseStepHanupdatedResponse = updateContent(updatedResponse, runStep.index, contentPart, true);- messageMap.current.set(runStep.runId, updatedResponse);+ messageMap.current.set(responseMessageId, updatedResponse);const updatedMessages = messages.map((msg) =>msg.messageId === runStep.runId ? updatedResponse : msg,);diff --git a/client/src/hooks/useGenerationsByLatest.ts b/client/src/hooks/useGenerationsByLatest.tsindex 8dc37062f2..47bb935129 100644--- a/client/src/hooks/useGenerationsByLatest.ts+++ b/client/src/hooks/useGenerationsByLatest.ts@@ -3,7 +3,7 @@ import { EModelEndpoint, isAssistantsEndpoint } from 'librechat-data-provider';type TUseGenerations = {endpoint?: string;- message: TMessage;+ message?: TMessage;isSubmitting: boolean;isEditing?: boolean;latestMessage: TMessage | null;@@ -16,15 +16,25 @@ export default function useGenerationsByLatest({isEditing = false,latestMessage,}: TUseGenerations) {- const { error, messageId, searchResult, finish_reason, isCreatedByUser } = message ?? {};- const isEditableEndpoint = !![- EModelEndpoint.openAI,- EModelEndpoint.custom,- EModelEndpoint.google,- EModelEndpoint.anthropic,- EModelEndpoint.gptPlugins,- EModelEndpoint.azureOpenAI,- ].find((e) => e === endpoint);+ const {+ messageId,+ searchResult = false,+ error = false,+ finish_reason = '',+ isCreatedByUser = false,+ } = message ?? {};+ const isEditableEndpoint = Boolean(+ [+ EModelEndpoint.openAI,+ EModelEndpoint.custom,+ EModelEndpoint.google,+ EModelEndpoint.agents,+ EModelEndpoint.bedrock,+ EModelEndpoint.anthropic,+ EModelEndpoint.gptPlugins,+ EModelEndpoint.azureOpenAI,+ ].find((e) => e === endpoint),+ );const continueSupported =latestMessage?.messageId === messageId &&@@ -34,18 +44,20 @@ export default function useGenerationsByLatest({!searchResult &&isEditableEndpoint;- const branchingSupported =- // 5/21/23: Bing is allowing editing and Message regenerating- !![+ const branchingSupported = Boolean(+ [EModelEndpoint.azureOpenAI,EModelEndpoint.openAI,EModelEndpoint.custom,+ EModelEndpoint.agents,+ EModelEndpoint.bedrock,EModelEndpoint.chatGPTBrowser,EModelEndpoint.google,EModelEndpoint.bingAI,EModelEndpoint.gptPlugins,EModelEndpoint.anthropic,- ].find((e) => e === endpoint);+ ].find((e) => e === endpoint),+ );const regenerateEnabled =!isCreatedByUser && !searchResult && !isEditing && !isSubmitting && branchingSupported;diff --git a/client/src/hooks/useNewConvo.ts b/client/src/hooks/useNewConvo.tsindex 1d5dbeea39..a97688df4c 100644--- a/client/src/hooks/useNewConvo.ts+++ b/client/src/hooks/useNewConvo.ts@@ -5,7 +5,12 @@ import {useGetEndpointsQuery,} from 'librechat-data-provider/react-query';import { useNavigate } from 'react-router-dom';-import { FileSources, LocalStorageKeys, isAssistantsEndpoint } from 'librechat-data-provider';+import {+ FileSources,+ LocalStorageKeys,+ isAssistantsEndpoint,+ paramEndpoints,+} from 'librechat-data-provider';import { useRecoilState, useRecoilValue, useSetRecoilState, useRecoilCallback } from 'recoil';import type {TPreset,@@ -67,7 +72,7 @@ const useNewConvo = (index = 0) => {) => {const modelsConfig = modelsData ?? modelsQuery.data;const { endpoint = null } = conversation;- const buildDefaultConversation = endpoint === null || buildDefault;+ const buildDefaultConversation = (endpoint === null || buildDefault) ?? false;const activePreset =// use default preset only when it's defined,// preset is not provided,@@ -95,27 +100,24 @@ const useNewConvo = (index = 0) => {const isAssistantEndpoint = isAssistantsEndpoint(defaultEndpoint);const assistants: AssistantListItem[] = assistantsListMap[defaultEndpoint] ?? [];+ const currentAssistantId = conversation.assistant_id ?? '';+ const currentAssistant = assistantsListMap[defaultEndpoint]?.[currentAssistantId] as+ | AssistantListItem+ | undefined;- if (- conversation.assistant_id &&- !assistantsListMap[defaultEndpoint]?.[conversation.assistant_id]- ) {+ if (currentAssistantId && !currentAssistant) {conversation.assistant_id = undefined;}- if (!conversation.assistant_id && isAssistantEndpoint) {+ if (!currentAssistantId && isAssistantEndpoint) {conversation.assistant_id =localStorage.getItem(`${LocalStorageKeys.ASST_ID_PREFIX}${index}${defaultEndpoint}`,) ?? assistants[0]?.id;}- if (- conversation.assistant_id &&- isAssistantEndpoint &&- conversation.conversationId === 'new'- ) {- const assistant = assistants.find((asst) => asst.id === conversation.assistant_id);+ if (currentAssistantId && isAssistantEndpoint && conversation.conversationId === 'new') {+ const assistant = assistants.find((asst) => asst.id === currentAssistantId);conversation.model = assistant?.model;updateLastSelectedModel({endpoint: defaultEndpoint,@@ -123,7 +125,7 @@ const useNewConvo = (index = 0) => {});}- if (conversation.assistant_id && !isAssistantEndpoint) {+ if (currentAssistantId && !isAssistantEndpoint) {conversation.assistant_id = undefined;}@@ -136,17 +138,17 @@ const useNewConvo = (index = 0) => {});}- if (!keepAddedConvos) {+ if (!(keepAddedConvos ?? false)) {clearAllConversations(true);}setConversation(conversation);setSubmission({} as TSubmission);- if (!keepLatestMessage) {+ if (!(keepLatestMessage ?? false)) {clearAllLatestMessages();}if (conversation.conversationId === 'new' && !modelsData) {- const appTitle = localStorage.getItem(LocalStorageKeys.APP_TITLE);+ const appTitle = localStorage.getItem(LocalStorageKeys.APP_TITLE) ?? '';if (appTitle) {document.title = appTitle;}@@ -166,7 +168,7 @@ const useNewConvo = (index = 0) => {const newConversation = useCallback(({- template = {},+ template: _template = {},preset: _preset,modelsData,buildDefault = true,@@ -182,6 +184,16 @@ const useNewConvo = (index = 0) => {} = {}) => {pauseGlobalAudio();+ const templateConvoId = _template.conversationId ?? '';+ const isParamEndpoint =+ paramEndpoints.has(_template.endpoint ?? '') ||+ paramEndpoints.has(_preset?.endpoint ?? '') ||+ paramEndpoints.has(_template.endpointType ?? '');+ const template =+ isParamEndpoint && templateConvoId && templateConvoId === 'new'+ ? { endpoint: _template.endpoint }+ : _template;+const conversation = {conversationId: 'new',title: 'New Chat',@@ -193,7 +205,12 @@ const useNewConvo = (index = 0) => {let preset = _preset;const defaultModelSpec = getDefaultModelSpec(startupConfig?.modelSpecs?.list);- if (!preset && startupConfig && startupConfig.modelSpecs?.prioritize && defaultModelSpec) {+ if (+ !preset &&+ startupConfig &&+ startupConfig.modelSpecs?.prioritize === true &&+ defaultModelSpec+ ) {preset = {...defaultModelSpec.preset,iconURL: getModelSpecIconURL(defaultModelSpec),@@ -203,10 +220,17 @@ const useNewConvo = (index = 0) => {if (conversation.conversationId === 'new' && !modelsData) {const filesToDelete = Array.from(files.values())- .filter((file) => file.filepath && file.source && !file.embedded && file.temp_file_id)+ .filter(+ (file) =>+ file.filepath != null &&+ file.filepath !== '' &&+ file.source &&+ !(file.embedded ?? false) &&+ file.temp_file_id,+ ).map((file) => ({file_id: file.file_id,- embedded: !!file.embedded,+ embedded: !!(file.embedded ?? false),filepath: file.filepath as string,source: file.source as FileSources, // Ensure that the source is of type FileSources}));diff --git a/client/src/localization/languages/Eng.ts b/client/src/localization/languages/Eng.tsindex 69615a1504..e2f346891d 100644--- a/client/src/localization/languages/Eng.ts+++ b/client/src/localization/languages/Eng.ts@@ -140,12 +140,15 @@ export default {com_ui_endpoint: 'Endpoint',com_ui_provider: 'Provider',com_ui_model: 'Model',+ com_ui_region: 'Region',com_ui_model_parameters: 'Model Parameters',com_ui_model_save_success: 'Model parameters saved successfully',com_ui_select_model: 'Select a model',+ com_ui_select_region: 'Select a region',com_ui_select_provider: 'Select a provider',com_ui_select_provider_first: 'Select a provider first',com_ui_select_search_model: 'Search model by name',+ com_ui_select_search_region: 'Search region by name',com_ui_select_search_plugin: 'Search plugin by name',com_ui_use_prompt: 'Use prompt',com_ui_prev: 'Prev',diff --git a/client/src/store/families.ts b/client/src/store/families.tsindex 0a6d5badc1..5c24b8d0fa 100644--- a/client/src/store/families.ts+++ b/client/src/store/families.ts@@ -74,6 +74,7 @@ const conversationByIndex = atomFamily<TConversation | null, string | number>({({ onSet, node }) => {onSet(async (newValue) => {const index = Number(node.key.split('__')[1]);+ logger.log('conversation', 'Setting conversation:', { index, newValue });if (newValue?.assistant_id) {localStorage.setItem(`${LocalStorageKeys.ASST_ID_PREFIX}${index}${newValue.endpoint}`,diff --git a/client/src/utils/buildDefaultConvo.ts b/client/src/utils/buildDefaultConvo.tsindex 0f210823cb..22728d0753 100644--- a/client/src/utils/buildDefaultConvo.ts+++ b/client/src/utils/buildDefaultConvo.ts@@ -9,19 +9,17 @@ import getLocalStorageItems from './getLocalStorageItems';const buildDefaultConvo = ({conversation,- endpoint,+ endpoint = null,models,lastConversationSetup,}: {conversation: TConversation;- endpoint: EModelEndpoint;+ endpoint: EModelEndpoint | null;models: string[];- // TODO: fix this type as we should allow undefined- lastConversationSetup: TConversation;-}) => {- const { lastSelectedModel, lastSelectedTools, lastBingSettings } = getLocalStorageItems();- const { jailbreak, toneStyle } = lastBingSettings;- const endpointType = lastConversationSetup?.endpointType ?? conversation?.endpointType;+ lastConversationSetup: TConversation | null;+}): TConversation => {+ const { lastSelectedModel, lastSelectedTools } = getLocalStorageItems();+ const endpointType = lastConversationSetup?.endpointType ?? conversation.endpointType;if (!endpoint) {return {@@ -32,10 +30,10 @@ const buildDefaultConvo = ({}const availableModels = models;- const model = lastConversationSetup?.model ?? lastSelectedModel?.[endpoint];- const secondaryModel =+ const model = lastConversationSetup?.model ?? lastSelectedModel?.[endpoint] ?? '';+ const secondaryModel: string | null =endpoint === EModelEndpoint.gptPlugins- ? lastConversationSetup?.agentOptions?.model ?? lastSelectedModel?.secondaryModel+ ? lastConversationSetup?.agentOptions?.model ?? lastSelectedModel?.secondaryModel ?? null: null;let possibleModels: string[], secondaryModels: string[];@@ -46,7 +44,7 @@ const buildDefaultConvo = ({possibleModels = [...availableModels];}- if (secondaryModel && availableModels.includes(secondaryModel)) {+ if (secondaryModel != null && secondaryModel !== '' && availableModels.includes(secondaryModel)) {secondaryModels = [secondaryModel, ...availableModels];} else {secondaryModels = [...availableModels];@@ -70,18 +68,20 @@ const buildDefaultConvo = ({};// Ensures assistant_id is always defined- if (isAssistantsEndpoint(endpoint) && !defaultConvo.assistant_id && convo.assistant_id) {- defaultConvo.assistant_id = convo.assistant_id;+ const assistantId = convo?.assistant_id ?? '';+ const defaultAssistantId = lastConversationSetup?.assistant_id ?? '';+ if (isAssistantsEndpoint(endpoint) && !defaultAssistantId && assistantId) {+ defaultConvo.assistant_id = assistantId;}// Ensures agent_id is always defined- if (isAgentsEndpoint(endpoint) && !defaultConvo.agent_id && convo.agent_id) {- defaultConvo.agent_id = convo.agent_id;+ const agentId = convo?.agent_id ?? '';+ const defaultAgentId = lastConversationSetup?.agent_id ?? '';+ if (isAgentsEndpoint(endpoint) && !defaultAgentId && agentId) {+ defaultConvo.agent_id = agentId;}defaultConvo.tools = lastConversationSetup?.tools ?? lastSelectedTools ?? defaultConvo.tools;- defaultConvo.jailbreak = jailbreak ?? defaultConvo.jailbreak;- defaultConvo.toneStyle = toneStyle ?? defaultConvo.toneStyle;return defaultConvo;};diff --git a/client/src/utils/forms.ts b/client/src/utils/forms.tsxsimilarity index 79%rename from client/src/utils/forms.tsrename to client/src/utils/forms.tsxindex 0362f576ed..2447a234dd 100644--- a/client/src/utils/forms.ts+++ b/client/src/utils/forms.tsx@@ -1,3 +1,4 @@+import { EarthIcon } from 'lucide-react';import { alternateName } from 'librechat-data-provider';import type { Agent, TFile } from 'librechat-data-provider';import type { DropdownValueSetter, TAgentOption } from '~/common';@@ -39,14 +40,22 @@ export const createProviderOption = (provider: string) => ({type FileTuple = [string, Partial<TFile>];type FileList = Array<FileTuple>;-export const processAgentOption = (- _agent?: Agent,- fileMap?: Record<string, TFile>,-): TAgentOption => {+export const processAgentOption = ({+ agent: _agent,+ fileMap,+ instanceProjectId,+}: {+ agent?: Agent;+ fileMap?: Record<string, TFile | undefined>;+ instanceProjectId?: string;+}): TAgentOption => {+ const isGlobal =+ (instanceProjectId != null && _agent?.projectIds?.includes(instanceProjectId)) ?? false;const agent: TAgentOption = {...(_agent ?? ({} as Agent)),label: _agent?.name ?? '',value: _agent?.id ?? '',+ icon: isGlobal ? <EarthIcon className="icon-md text-green-400" /> : null,// files: _agent?.file_ids ? ([] as FileList) : undefined,// code_files: _agent?.tool_resources?.code_interpreter?.file_ids// ? ([] as FileList)@@ -58,7 +67,7 @@ export const processAgentOption = (}const handleFile = (file_id: string, list?: FileList) => {- const file = fileMap?.[file_id];+ const file = fileMap[file_id];if (file) {list?.push([file_id, file]);} else {@@ -82,7 +91,7 @@ export const processAgentOption = (}if (agent.code_files && _agent?.tool_resources?.code_interpreter?.file_ids) {- _agent.tool_resources?.code_interpreter?.file_ids?.forEach((file_id) =>+ _agent.tool_resources.code_interpreter.file_ids.forEach((file_id) =>handleFile(file_id, agent.code_files),);}diff --git a/client/src/utils/getLocalStorageItems.ts b/client/src/utils/getLocalStorageItems.tsindex f189d0d9c9..dd7177955b 100644--- a/client/src/utils/getLocalStorageItems.ts+++ b/client/src/utils/getLocalStorageItems.ts@@ -1,24 +1,25 @@-import { LocalStorageKeys } from 'librechat-data-provider';+import { LocalStorageKeys, TConversation } from 'librechat-data-provider';export default function getLocalStorageItems() {const items = {- lastSelectedModel: localStorage.getItem(LocalStorageKeys.LAST_MODEL),- lastSelectedTools: localStorage.getItem(LocalStorageKeys.LAST_TOOLS),- lastBingSettings: localStorage.getItem(LocalStorageKeys.LAST_BING),- lastConversationSetup: localStorage.getItem(LocalStorageKeys.LAST_CONVO_SETUP + '_0'),+ lastSelectedModel: localStorage.getItem(LocalStorageKeys.LAST_MODEL) ?? '',+ lastSelectedTools: localStorage.getItem(LocalStorageKeys.LAST_TOOLS) ?? '',+ lastConversationSetup: localStorage.getItem(LocalStorageKeys.LAST_CONVO_SETUP + '_0') ?? '',};- const lastSelectedModel = items.lastSelectedModel ? JSON.parse(items.lastSelectedModel) : {};- const lastSelectedTools = items.lastSelectedTools ? JSON.parse(items.lastSelectedTools) : [];- const lastBingSettings = items.lastBingSettings ? JSON.parse(items.lastBingSettings) : {};+ const lastSelectedModel = items.lastSelectedModel+ ? (JSON.parse(items.lastSelectedModel) as Record<string, string | undefined> | null)+ : {};+ const lastSelectedTools = items.lastSelectedTools+ ? (JSON.parse(items.lastSelectedTools) as string[] | null)+ : [];const lastConversationSetup = items.lastConversationSetup- ? JSON.parse(items.lastConversationSetup)+ ? (JSON.parse(items.lastConversationSetup) as Partial<TConversation> | null): {};return {lastSelectedModel,lastSelectedTools,- lastBingSettings,lastConversationSetup,};}diff --git a/package-lock.json b/package-lock.jsonindex ab752abba3..18fbe341e3 100644--- a/package-lock.json+++ b/package-lock.json@@ -52,7 +52,7 @@"@langchain/core": "^0.2.18","@langchain/google-genai": "^0.0.11","@langchain/google-vertexai": "^0.0.17",- "@librechat/agents": "^1.4.1",+ "@librechat/agents": "^1.5.2","axios": "^1.3.4","bcryptjs": "^2.4.3","cheerio": "^1.0.0-rc.12",@@ -8960,15 +8960,16 @@}},"node_modules/@langchain/aws": {- "version": "0.0.6",- "resolved": "https://registry.npmjs.org/@langchain/aws/-/aws-0.0.6.tgz",- "integrity": "sha512-Shc64LB2eRbcDAg5wzBvrWB99QRdS+jZ3RE2epLs0f6lfo0IIdLmcM8MLQOB8Y7Yfn2XAlujpdpX2pX3D2G8Bw==",+ "version": "0.0.10",+ "resolved": "https://registry.npmjs.org/@langchain/aws/-/aws-0.0.10.tgz",+ "integrity": "sha512-q9sL34lq2UpSVDBTNixy2+DJbjd5RSlCGBoatVeWpfMDv2J47sJZlfVGfXLidFZhQox6uL1GyQJoKrIb+Cu97Q==","dependencies": {"@aws-sdk/client-bedrock-agent-runtime": "^3.616.0","@aws-sdk/client-bedrock-runtime": "^3.602.0","@aws-sdk/client-kendra": "^3.352.0","@aws-sdk/credential-provider-node": "^3.600.0",- "@langchain/core": ">=0.2.16 <0.3.0",+ "@langchain/core": ">=0.2.21 <0.3.0",+ "zod": "^3.23.8","zod-to-json-schema": "^3.22.5"},"engines": {@@ -10014,17 +10015,17 @@}},"node_modules/@librechat/agents": {- "version": "1.4.1",- "resolved": "https://registry.npmjs.org/@librechat/agents/-/agents-1.4.1.tgz",- "integrity": "sha512-i8FEiIUal570rbBQ5G7WRjpxd6JwSnYMif/VkfVQkMxx/6ln8gULdbzh6q0zwvUGcHp90Rv4e+Ve9C2dtNk2Ww==",+ "version": "1.5.2",+ "resolved": "https://registry.npmjs.org/@librechat/agents/-/agents-1.5.2.tgz",+ "integrity": "sha512-mPBmzzidqTxsQ2nCNgPEqZnNzHKY6QvAr6mF+MTjsME/qQbqN+PjGUSQTCcvEKa3ClQK8yrZl8nNELFq9Ghv/w==","dependencies": {"@aws-crypto/sha256-js": "^5.2.0","@aws-sdk/credential-provider-node": "^3.613.0","@aws-sdk/types": "^3.609.0",- "@langchain/anthropic": "^0.2.14",- "@langchain/aws": "^0.0.6",+ "@langchain/anthropic": "^0.2.15",+ "@langchain/aws": "^0.0.10","@langchain/community": "^0.2.20",- "@langchain/core": "^0.2.18",+ "@langchain/core": "^0.2.31","@langchain/google-vertexai": "^0.0.20","@langchain/langgraph": "^0.0.31","@langchain/mistralai": "^0.0.26",@@ -10034,7 +10035,7 @@"@smithy/util-utf8": "^2.0.0","dotenv": "^16.4.5","langchain": "^0.2.10",- "nanoid": "^3.3.4"+ "nanoid": "^3.3.7"},"engines": {"node": ">=14.0.0"diff --git a/packages/data-provider/src/bedrock.ts b/packages/data-provider/src/bedrock.tsnew file mode 100644index 0000000000..c4e231ec50--- /dev/null+++ b/packages/data-provider/src/bedrock.ts@@ -0,0 +1,144 @@+import { z } from 'zod';+import * as s from './schemas';++export const bedrockInputSchema = s.tConversationSchema+ .pick({+ /* LibreChat params; optionType: 'conversation' */+ modelLabel: true,+ promptPrefix: true,+ resendFiles: true,+ iconURL: true,+ greeting: true,+ spec: true,+ maxOutputTokens: true,+ maxContextTokens: true,+ /* Bedrock params; optionType: 'model' */+ region: true,+ system: true,+ model: true,+ maxTokens: true,+ temperature: true,+ topP: true,+ stop: true,+ /* Catch-all fields */+ topK: true,+ additionalModelRequestFields: true,+ })+ .transform(s.removeNullishValues)+ .catch(() => ({}));++export type BedrockConverseInput = z.infer<typeof bedrockInputSchema>;++export const bedrockInputParser = s.tConversationSchema+ .pick({+ /* LibreChat params; optionType: 'conversation' */+ modelLabel: true,+ promptPrefix: true,+ resendFiles: true,+ iconURL: true,+ greeting: true,+ spec: true,+ maxOutputTokens: true,+ maxContextTokens: true,+ /* Bedrock params; optionType: 'model' */+ region: true,+ model: true,+ maxTokens: true,+ temperature: true,+ topP: true,+ stop: true,+ /* Catch-all fields */+ topK: true,+ additionalModelRequestFields: true,+ })+ .catchall(z.any())+ .transform((data) => {+ const knownKeys = [+ 'modelLabel',+ 'promptPrefix',+ 'resendFiles',+ 'iconURL',+ 'greeting',+ 'spec',+ 'maxOutputTokens',+ 'additionalModelRequestFields',+ 'region',+ 'model',+ 'maxTokens',+ 'temperature',+ 'topP',+ 'stop',+ ];++ const additionalFields: Record<string, unknown> = {};+ const typedData = data as Record<string, unknown>;++ Object.entries(typedData).forEach(([key, value]) => {+ if (!knownKeys.includes(key)) {+ if (key === 'topK') {+ additionalFields['top_k'] = value;+ } else {+ additionalFields[key] = value;+ }+ delete typedData[key];+ }+ });++ if (Object.keys(additionalFields).length > 0) {+ typedData.additionalModelRequestFields = {+ ...((typedData.additionalModelRequestFields as Record<string, unknown> | undefined) || {}),+ ...additionalFields,+ };+ }++ if (typedData.maxOutputTokens !== undefined) {+ typedData.maxTokens = typedData.maxOutputTokens;+ } else if (typedData.maxTokens !== undefined) {+ typedData.maxOutputTokens = typedData.maxTokens;+ }++ return s.removeNullishValues(typedData) as BedrockConverseInput;+ })+ .catch(() => ({}));++export const bedrockOutputParser = (data: Record<string, unknown>) => {+ const knownKeys = [...Object.keys(s.tConversationSchema.shape), 'topK', 'top_k'];+ const result: Record<string, unknown> = {};++ // Extract known fields from the root level+ Object.entries(data).forEach(([key, value]) => {+ if (knownKeys.includes(key)) {+ result[key] = value;+ }+ });++ // Extract known fields from additionalModelRequestFields+ if (+ typeof data.additionalModelRequestFields === 'object' &&+ data.additionalModelRequestFields !== null+ ) {+ Object.entries(data.additionalModelRequestFields as Record<string, unknown>).forEach(+ ([key, value]) => {+ if (knownKeys.includes(key)) {+ if (key === 'top_k') {+ result['topK'] = value;+ } else {+ result[key] = value;+ }+ }+ },+ );+ }++ // Handle maxTokens and maxOutputTokens+ if (result.maxTokens !== undefined && result.maxOutputTokens === undefined) {+ result.maxOutputTokens = result.maxTokens;+ } else if (result.maxOutputTokens !== undefined && result.maxTokens === undefined) {+ result.maxTokens = result.maxOutputTokens;+ }++ // Remove additionalModelRequestFields from the result+ delete result.additionalModelRequestFields;++ return result;+};diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.tsindex c06a872844..d0bd5aa1ad 100644--- a/packages/data-provider/src/config.ts+++ b/packages/data-provider/src/config.ts@@ -142,10 +142,19 @@ export const defaultAssistantsVersion = {export const baseEndpointSchema = z.object({streamRate: z.number().optional(),+ baseURL: z.string().optional(),+ titlePrompt: z.string().optional(),+ titleModel: z.string().optional(),});export type TBaseEndpoint = z.infer<typeof baseEndpointSchema>;+export const bedrockEndpointSchema = baseEndpointSchema.merge(+ z.object({+ availableRegions: z.array(z.string()).optional(),+ }),+);+export const assistantEndpointSchema = baseEndpointSchema.merge(z.object({/* assistants specific */@@ -169,7 +178,6 @@ export const assistantEndpointSchema = baseEndpointSchema.merge(]),/* general */apiKey: z.string().optional(),- baseURL: z.string().optional(),models: z.object({default: z.array(z.string()).min(1),@@ -179,7 +187,6 @@ export const assistantEndpointSchema = baseEndpointSchema.merge(.optional(),titleConvo: z.boolean().optional(),titleMethod: z.union([z.literal('completion'), z.literal('functions')]).optional(),- titleModel: z.string().optional(),headers: z.record(z.any()).optional(),}),);@@ -187,43 +194,39 @@ export const assistantEndpointSchema = baseEndpointSchema.merge(export type TAssistantEndpoint = z.infer<typeof assistantEndpointSchema>;export const agentsEndpointSChema = baseEndpointSchema.merge(- baseEndpointSchema.merge(- z.object({- /* assistants specific */- disableBuilder: z.boolean().optional(),- pollIntervalMs: z.number().optional(),- timeoutMs: z.number().optional(),- version: z.union([z.string(), z.number()]).default(2),- supportedIds: z.array(z.string()).min(1).optional(),- excludedIds: z.array(z.string()).min(1).optional(),- privateAssistants: z.boolean().optional(),- retrievalModels: z.array(z.string()).min(1).optional().default(defaultRetrievalModels),- capabilities: z- .array(z.nativeEnum(Capabilities))- .optional()- .default([- Capabilities.code_interpreter,- Capabilities.image_vision,- Capabilities.retrieval,- Capabilities.actions,- Capabilities.tools,- ]),- /* general */- apiKey: z.string().optional(),- baseURL: z.string().optional(),- models: z- .object({- default: z.array(z.string()).min(1),- fetch: z.boolean().optional(),- userIdQuery: z.boolean().optional(),- })- .optional(),- titleConvo: z.boolean().optional(),- titleMethod: z.union([z.literal('completion'), z.literal('functions')]).optional(),- titleModel: z.string().optional(),- headers: z.record(z.any()).optional(),- }),- ),+ z.object({+ /* assistants specific */+ disableBuilder: z.boolean().optional(),+ pollIntervalMs: z.number().optional(),+ timeoutMs: z.number().optional(),+ version: z.union([z.string(), z.number()]).default(2),+ supportedIds: z.array(z.string()).min(1).optional(),+ excludedIds: z.array(z.string()).min(1).optional(),+ privateAssistants: z.boolean().optional(),+ retrievalModels: z.array(z.string()).min(1).optional().default(defaultRetrievalModels),+ capabilities: z+ .array(z.nativeEnum(Capabilities))+ .optional()+ .default([+ Capabilities.code_interpreter,+ Capabilities.image_vision,+ Capabilities.retrieval,+ Capabilities.actions,+ Capabilities.tools,+ ]),+ /* general */+ apiKey: z.string().optional(),+ models: z+ .object({+ default: z.array(z.string()).min(1),+ fetch: z.boolean().optional(),+ userIdQuery: z.boolean().optional(),+ })+ .optional(),+ titleConvo: z.boolean().optional(),+ titleMethod: z.union([z.literal('completion'), z.literal('functions')]).optional(),+ headers: z.record(z.any()).optional(),+ }),);export type TAgentsEndpoint = z.infer<typeof agentsEndpointSChema>;@@ -244,7 +247,6 @@ export const endpointSchema = baseEndpointSchema.merge(}),titleConvo: z.boolean().optional(),titleMethod: z.union([z.literal('completion'), z.literal('functions')]).optional(),- titleModel: z.string().optional(),summarize: z.boolean().optional(),summaryModel: z.string().optional(),forcePrompt: z.boolean().optional(),@@ -500,6 +502,7 @@ export const configSchema = z.object({[EModelEndpoint.assistants]: assistantEndpointSchema.optional(),[EModelEndpoint.agents]: agentsEndpointSChema.optional(),[EModelEndpoint.custom]: z.array(endpointSchema.partial()).optional(),+ [EModelEndpoint.bedrock]: baseEndpointSchema.optional(),}).strict().refine((data) => Object.keys(data).length > 0, {@@ -552,6 +555,7 @@ export const defaultEndpoints: EModelEndpoint[] = [EModelEndpoint.google,EModelEndpoint.anthropic,EModelEndpoint.custom,+ EModelEndpoint.bedrock,];export const alternateName = {@@ -566,6 +570,7 @@ export const alternateName = {[EModelEndpoint.google]: 'Google',[EModelEndpoint.anthropic]: 'Anthropic',[EModelEndpoint.custom]: 'Custom',+ [EModelEndpoint.bedrock]: 'AWS Bedrock',};const sharedOpenAIModels = [@@ -588,6 +593,52 @@ const sharedOpenAIModels = ['gpt-3.5-turbo-0613',];+const sharedAnthropicModels = [+ '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',+];++export const bedrockModels = [+ 'anthropic.claude-3-5-sonnet-20240620-v1:0',+ 'anthropic.claude-3-haiku-20240307-v1:0',+ 'anthropic.claude-3-opus-20240229-v1:0',+ 'anthropic.claude-3-sonnet-20240229-v1:0',+ 'anthropic.claude-v2',+ 'anthropic.claude-v2:1',+ 'anthropic.claude-instant-v1',+ 'cohere.command-text-v14',+ 'cohere.command-light-text-v14',+ 'cohere.command-r-v1:0',+ 'cohere.command-r-plus-v1:0',+ 'meta.llama2-13b-chat-v1',+ 'meta.llama2-70b-chat-v1',+ 'meta.llama3-8b-instruct-v1:0',+ 'meta.llama3-70b-instruct-v1:0',+ 'meta.llama3-1-8b-instruct-v1:0',+ 'meta.llama3-1-70b-instruct-v1:0',+ 'meta.llama3-1-405b-instruct-v1:0',+ 'mistral.mistral-7b-instruct-v0:2',+ 'mistral.mixtral-8x7b-instruct-v0:1',+ 'mistral.mistral-large-2402-v1:0',+ 'mistral.mistral-large-2407-v1:0',+ 'mistral.mistral-small-2402-v1:0',+ 'ai21.jamba-instruct-v1:0',+ // 'ai21.j2-mid-v1', // no streaming+ // 'ai21.j2-ultra-v1', no conversation history+ 'amazon.titan-text-lite-v1',+ 'amazon.titan-text-express-v1',+ 'amazon.titan-text-premier-v1:0',+];+export const defaultModels = {[EModelEndpoint.azureAssistants]: sharedOpenAIModels,[EModelEndpoint.assistants]: ['chatgpt-4o-latest', ...sharedOpenAIModels],@@ -606,19 +657,7 @@ export const defaultModels = {'code-bison','code-bison-32k',],- [EModelEndpoint.anthropic]: [- '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',- ],+ [EModelEndpoint.anthropic]: sharedAnthropicModels,[EModelEndpoint.openAI]: ['chatgpt-4o-latest',...sharedOpenAIModels,@@ -626,6 +665,7 @@ export const defaultModels = {'gpt-3.5-turbo-instruct-0914','gpt-3.5-turbo-instruct',],+ [EModelEndpoint.bedrock]: bedrockModels,};const fitlerAssistantModels = (str: string) => {@@ -645,6 +685,7 @@ export const initialModelsConfig: TModelsConfig = {[EModelEndpoint.chatGPTBrowser]: ['text-davinci-002-render-sha'],[EModelEndpoint.google]: defaultModels[EModelEndpoint.google],[EModelEndpoint.anthropic]: defaultModels[EModelEndpoint.anthropic],+ [EModelEndpoint.bedrock]: defaultModels[EModelEndpoint.bedrock],};export const EndpointURLs: { [key in EModelEndpoint]: string } = {@@ -658,7 +699,8 @@ export const EndpointURLs: { [key in EModelEndpoint]: string } = {[EModelEndpoint.chatGPTBrowser]: `/api/ask/${EModelEndpoint.chatGPTBrowser}`,[EModelEndpoint.azureAssistants]: '/api/assistants/v1/chat',[EModelEndpoint.assistants]: '/api/assistants/v2/chat',- [EModelEndpoint.agents]: '/api/agents/chat',+ [EModelEndpoint.agents]: `/api/${EModelEndpoint.agents}/chat`,+ [EModelEndpoint.bedrock]: `/api/${EModelEndpoint.bedrock}/chat`,};export const modularEndpoints = new Set<EModelEndpoint | string>([@@ -668,6 +710,13 @@ export const modularEndpoints = new Set<EModelEndpoint | string>([EModelEndpoint.openAI,EModelEndpoint.azureOpenAI,EModelEndpoint.custom,+ EModelEndpoint.agents,+ EModelEndpoint.bedrock,+]);++export const paramEndpoints = new Set<EModelEndpoint | string>([+ EModelEndpoint.agents,+ EModelEndpoint.bedrock,]);export const supportsBalanceCheck = {@@ -679,6 +728,7 @@ export const supportsBalanceCheck = {[EModelEndpoint.agents]: true,[EModelEndpoint.azureAssistants]: true,[EModelEndpoint.azureOpenAI]: true,+ [EModelEndpoint.bedrock]: true,};export const visionModels = [@@ -1007,7 +1057,7 @@ export enum Constants {/** Key for the app's version. */VERSION = 'v0.7.5-rc1',/** Key for the Custom Config's version (librechat.yaml). */- CONFIG_VERSION = '1.1.6',+ CONFIG_VERSION = '1.1.7',/** Standard value for the first message's `parentMessageId` value, to indicate no parent exists. */NO_PARENT = '00000000-0000-0000-0000-000000000000',/** Standard value for the initial conversationId before a request is sent */@@ -1026,6 +1076,8 @@ export enum Constants {SAVED_TAG = 'Saved',/** Max number of Conversation starters for Agents/Assistants */MAX_CONVO_STARTERS = 4,+ /** Global/instance Project Name */+ GLOBAL_PROJECT_NAME = 'instance',}export enum LocalStorageKeys {@@ -1105,6 +1157,7 @@ export enum SystemCategories {export const providerEndpointMap = {[EModelEndpoint.openAI]: EModelEndpoint.openAI,+ [EModelEndpoint.bedrock]: EModelEndpoint.bedrock,[EModelEndpoint.azureOpenAI]: EModelEndpoint.openAI,[EModelEndpoint.anthropic]: EModelEndpoint.anthropic,};diff --git a/packages/data-provider/src/file-config.ts b/packages/data-provider/src/file-config.tsindex 40bce689d7..8d2980bd57 100644--- a/packages/data-provider/src/file-config.ts+++ b/packages/data-provider/src/file-config.ts@@ -12,6 +12,7 @@ export const supportsFiles = {[EModelEndpoint.azureOpenAI]: true,[EModelEndpoint.anthropic]: true,[EModelEndpoint.custom]: true,+ [EModelEndpoint.bedrock]: true,};export const excelFileTypes = [diff --git a/packages/data-provider/src/generate.ts b/packages/data-provider/src/generate.tsindex 42024fda75..972e5d2ac1 100644--- a/packages/data-provider/src/generate.ts+++ b/packages/data-provider/src/generate.ts@@ -13,10 +13,18 @@ export type ComponentType =| 'checkbox'| 'switch'| 'dropdown'+ | 'combobox'| 'tags';export type OptionType = 'conversation' | 'model' | 'custom';+export type Option = Record<string, unknown> & {+ label?: string;+ value: string | number | null;+};++export type OptionWithIcon = Option & { icon?: React.ReactNode };+export enum ComponentTypes {Input = 'input',Textarea = 'textarea',@@ -24,6 +32,7 @@ export enum ComponentTypes {Checkbox = 'checkbox',Switch = 'switch',Dropdown = 'dropdown',+ Combobox = 'combobox',Tags = 'tags',}@@ -45,6 +54,7 @@ export interface SettingDefinition {description?: string;type: 'number' | 'boolean' | 'string' | 'enum' | 'array';default?: number | boolean | string | string[];+ showLabel?: boolean;showDefault?: boolean;options?: string[];range?: SettingRange;@@ -64,6 +74,11 @@ export interface SettingDefinition {maxTags?: number; // Specific to tags componentincludeInput?: boolean; // Specific to slider componentdescriptionSide?: 'top' | 'right' | 'bottom' | 'left';+ items?: OptionWithIcon[]; // Specific to combobox component+ searchPlaceholder?: string; // Specific to combobox component+ selectPlaceholder?: string; // Specific to combobox component+ searchPlaceholderCode?: boolean; // Specific to combobox component+ selectPlaceholderCode?: boolean; // Specific to combobox component}export type DynamicSettingProps = Partial<SettingDefinition> & {@@ -190,6 +205,7 @@ const minColumns = 1;const maxColumns = 4;const minSliderOptions = 2;const minDropdownOptions = 2;+const minComboboxOptions = 2;/*** Validates the provided setting using the constraints unique to each component type.@@ -383,6 +399,19 @@ export function validateSettingDefinitions(settings: SettingsConfiguration): voi}}+ if (setting.component === ComponentTypes.Combobox) {+ if (!setting.options || setting.options.length < minComboboxOptions) {+ errors.push({+ code: ZodIssueCode.custom,+ message: `Combobox component for setting ${setting.key} requires at least ${minComboboxOptions} options.`,+ path: ['options'],+ });+ }+ if (!setting.default && setting.options && setting.options.length > 0) {+ setting.default = setting.options[0];+ }+ }+// Default columnSpanif (!setting.columnSpan) {setting.columnSpan = Math.floor(columns / 2);diff --git a/packages/data-provider/src/index.ts b/packages/data-provider/src/index.tsindex 7ea26d83b3..1fe1c00337 100644--- a/packages/data-provider/src/index.ts+++ b/packages/data-provider/src/index.ts@@ -1,5 +1,6 @@/* config */export * from './azure';+export * from './bedrock';export * from './config';export * from './file-config';/* artifacts */diff --git a/packages/data-provider/src/parsers.ts b/packages/data-provider/src/parsers.tsindex b3a14509ad..62b07f76aa 100644--- a/packages/data-provider/src/parsers.ts+++ b/packages/data-provider/src/parsers.ts@@ -21,6 +21,7 @@ import {compactAssistantSchema,compactAnthropicSchema,} from './schemas';+import { bedrockInputSchema } from './bedrock';import { alternateName } from './config';type EndpointSchema =@@ -31,7 +32,8 @@ type EndpointSchema =| typeof chatGPTBrowserSchema| typeof gptPluginsSchema| typeof assistantSchema- | typeof compactAgentsSchema;+ | typeof compactAgentsSchema+ | typeof bedrockInputSchema;const endpointSchemas: Record<EModelEndpoint, EndpointSchema> = {[EModelEndpoint.openAI]: openAISchema,@@ -45,6 +47,7 @@ const endpointSchemas: Record<EModelEndpoint, EndpointSchema> = {[EModelEndpoint.assistants]: assistantSchema,[EModelEndpoint.azureAssistants]: assistantSchema,[EModelEndpoint.agents]: compactAgentsSchema,+ [EModelEndpoint.bedrock]: bedrockInputSchema,};// const schemaCreators: Record<EModelEndpoint, (customSchema: DefaultSchemaValues) => EndpointSchema> = {@@ -64,6 +67,7 @@ export function getEnabledEndpoints() {EModelEndpoint.chatGPTBrowser,EModelEndpoint.gptPlugins,EModelEndpoint.anthropic,+ EModelEndpoint.bedrock,];const endpointsEnv = process.env.ENDPOINTS ?? '';@@ -182,12 +186,12 @@ export const parseConvo = ({}: {endpoint: EModelEndpoint;endpointType?: EModelEndpoint;- conversation: Partial<s.TConversation | s.TPreset>;+ conversation: Partial<s.TConversation | s.TPreset> | null;possibleValues?: TPossibleValues;// TODO: POC for default schema// defaultSchema?: Partial<EndpointSchema>,}) => {- let schema = endpointSchemas[endpoint];+ let schema = endpointSchemas[endpoint] as EndpointSchema | undefined;if (!schema && !endpointType) {throw new Error(`Unknown endpoint: ${endpoint}`);@@ -199,14 +203,14 @@ export const parseConvo = ({// schema = schemaCreators[endpoint](defaultSchema);// }- const convo = schema.parse(conversation) as s.TConversation;+ const convo = schema?.parse(conversation) as s.TConversation | undefined;const { models, secondaryModels } = possibleValues ?? {};if (models && convo) {convo.model = getFirstDefinedValue(models) ?? convo.model;}- if (secondaryModels && convo.agentOptions) {+ if (secondaryModels && convo?.agentOptions) {convo.agentOptions.model = getFirstDefinedValue(secondaryModels) ?? convo.agentOptions.model;}@@ -214,14 +218,23 @@ export const parseConvo = ({};export const getResponseSender = (endpointOption: t.TEndpointOption): string => {- const { model, endpoint, endpointType, modelDisplayLabel, chatGptLabel, modelLabel, jailbreak } =- endpointOption;-+ const {+ model: _m,+ endpoint,+ endpointType,+ modelDisplayLabel,+ chatGptLabel,+ modelLabel,+ jailbreak,+ } = endpointOption;++ const model = _m ?? '';if ([EModelEndpoint.openAI,- EModelEndpoint.azureOpenAI,+ EModelEndpoint.bedrock,EModelEndpoint.gptPlugins,+ EModelEndpoint.azureOpenAI,EModelEndpoint.chatGPTBrowser,].includes(endpoint)) {@@ -229,22 +242,28 @@ export const getResponseSender = (endpointOption: t.TEndpointOption): string =>return chatGptLabel;} else if (model && model.includes('gpt-3')) {return 'GPT-3.5';+ } else if (model && model.includes('gpt-4o')) {+ return 'GPT-4o';} else if (model && model.includes('gpt-4')) {return 'GPT-4';} else if (model && model.includes('mistral')) {return 'Mistral';}- return alternateName[endpoint] ?? 'ChatGPT';+ return (alternateName[endpoint] as string | undefined) ?? 'ChatGPT';}if (endpoint === EModelEndpoint.bingAI) {- return jailbreak ? 'Sydney' : 'BingAI';+ return jailbreak === true ? 'Sydney' : 'BingAI';}if (endpoint === EModelEndpoint.anthropic) {return modelLabel ?? 'Claude';}+ if (endpoint === EModelEndpoint.bedrock) {+ return modelLabel ?? alternateName[endpoint];+ }+if (endpoint === EModelEndpoint.google) {if (modelLabel) {return modelLabel;@@ -266,6 +285,8 @@ export const getResponseSender = (endpointOption: t.TEndpointOption): string =>return 'Mistral';} else if (model && model.includes('gpt-3')) {return 'GPT-3.5';+ } else if (model && model.includes('gpt-4o')) {+ return 'GPT-4o';} else if (model && model.includes('gpt-4')) {return 'GPT-4';} else if (modelDisplayLabel) {@@ -286,6 +307,7 @@ type CompactEndpointSchema =| typeof bingAISchema| typeof compactAnthropicSchema| typeof compactChatGPTSchema+ | typeof bedrockInputSchema| typeof compactPluginsSchema;const compactEndpointSchemas: Record<string, CompactEndpointSchema> = {@@ -296,6 +318,7 @@ const compactEndpointSchemas: Record<string, CompactEndpointSchema> = {[EModelEndpoint.azureAssistants]: compactAssistantSchema,[EModelEndpoint.agents]: compactAgentsSchema,[EModelEndpoint.google]: compactGoogleSchema,+ [EModelEndpoint.bedrock]: bedrockInputSchema,/* BingAI needs all fields */[EModelEndpoint.bingAI]: bingAISchema,[EModelEndpoint.anthropic]: compactAnthropicSchema,diff --git a/packages/data-provider/src/roles.ts b/packages/data-provider/src/roles.tsindex 62ade4fcd8..0da92c212c 100644--- a/packages/data-provider/src/roles.ts+++ b/packages/data-provider/src/roles.ts@@ -23,9 +23,13 @@ export enum PermissionTypes {*/PROMPTS = 'PROMPTS',/**- * Type for Bookmarks Permissions+ * Type for Bookmark Permissions*/BOOKMARKS = 'BOOKMARKS',+ /**+ * Type for Agent Permissions+ */+ AGENTS = 'AGENTS',}/**@@ -42,20 +46,29 @@ export const promptPermissionsSchema = z.object({[Permissions.SHARED_GLOBAL]: z.boolean().default(false),[Permissions.USE]: z.boolean().default(true),[Permissions.CREATE]: z.boolean().default(true),- [Permissions.SHARE]: z.boolean().default(false),+ // [Permissions.SHARE]: z.boolean().default(false),});export const bookmarkPermissionsSchema = z.object({[Permissions.USE]: z.boolean().default(true),});+export const agentPermissionsSchema = z.object({+ [Permissions.SHARED_GLOBAL]: z.boolean().default(false),+ [Permissions.USE]: z.boolean().default(true),+ [Permissions.CREATE]: z.boolean().default(true),+ // [Permissions.SHARE]: z.boolean().default(false),+});+export const roleSchema = z.object({name: z.string(),[PermissionTypes.PROMPTS]: promptPermissionsSchema,[PermissionTypes.BOOKMARKS]: bookmarkPermissionsSchema,+ [PermissionTypes.AGENTS]: agentPermissionsSchema,});export type TRole = z.infer<typeof roleSchema>;+export type TAgentPermissions = z.infer<typeof agentPermissionsSchema>;export type TPromptPermissions = z.infer<typeof promptPermissionsSchema>;export type TBookmarkPermissions = z.infer<typeof bookmarkPermissionsSchema>;@@ -66,16 +79,23 @@ const defaultRolesSchema = z.object({[Permissions.SHARED_GLOBAL]: z.boolean().default(true),[Permissions.USE]: z.boolean().default(true),[Permissions.CREATE]: z.boolean().default(true),- [Permissions.SHARE]: z.boolean().default(true),+ // [Permissions.SHARE]: z.boolean().default(true),}),[PermissionTypes.BOOKMARKS]: bookmarkPermissionsSchema.extend({[Permissions.USE]: z.boolean().default(true),}),+ [PermissionTypes.AGENTS]: agentPermissionsSchema.extend({+ [Permissions.SHARED_GLOBAL]: z.boolean().default(true),+ [Permissions.USE]: z.boolean().default(true),+ [Permissions.CREATE]: z.boolean().default(true),+ // [Permissions.SHARE]: z.boolean().default(true),+ }),}),[SystemRoles.USER]: roleSchema.extend({name: z.literal(SystemRoles.USER),[PermissionTypes.PROMPTS]: promptPermissionsSchema,[PermissionTypes.BOOKMARKS]: bookmarkPermissionsSchema,+ [PermissionTypes.AGENTS]: agentPermissionsSchema,}),});@@ -84,10 +104,12 @@ export const roleDefaults = defaultRolesSchema.parse({name: SystemRoles.ADMIN,[PermissionTypes.PROMPTS]: {},[PermissionTypes.BOOKMARKS]: {},+ [PermissionTypes.AGENTS]: {},},[SystemRoles.USER]: {name: SystemRoles.USER,[PermissionTypes.PROMPTS]: {},[PermissionTypes.BOOKMARKS]: {},+ [PermissionTypes.AGENTS]: {},},});diff --git a/packages/data-provider/src/schemas.ts b/packages/data-provider/src/schemas.tsindex dff571f9b4..19c8548574 100644--- a/packages/data-provider/src/schemas.ts+++ b/packages/data-provider/src/schemas.ts@@ -25,11 +25,37 @@ export enum EModelEndpoint {azureAssistants = 'azureAssistants',agents = 'agents',custom = 'custom',+ bedrock = 'bedrock',}+export enum BedrockProviders {+ AI21 = 'ai21',+ Amazon = 'amazon',+ Anthropic = 'anthropic',+ Cohere = 'cohere',+ Meta = 'meta',+ MistralAI = 'mistral',+ StabilityAI = 'stability',+}++export const getModelKey = (endpoint: EModelEndpoint | string, model: string) => {+ if (endpoint === EModelEndpoint.bedrock) {+ return model.split('.')[0] as BedrockProviders;+ }+ return model;+};++export const getSettingsKeys = (endpoint: EModelEndpoint | string, model: string) => {+ const endpointKey = endpoint;+ const modelKey = getModelKey(endpointKey, model);+ const combinedKey = `${endpointKey}-${modelKey}`;+ return [combinedKey, endpointKey];+};+export type AssistantsEndpoint = EModelEndpoint.assistants | EModelEndpoint.azureAssistants;-export const isAssistantsEndpoint = (endpoint?: AssistantsEndpoint | null | string): boolean => {+export const isAssistantsEndpoint = (_endpoint?: AssistantsEndpoint | null | string): boolean => {+ const endpoint = _endpoint ?? '';if (!endpoint) {return false;}@@ -38,7 +64,8 @@ export const isAssistantsEndpoint = (endpoint?: AssistantsEndpoint | null | striexport type AgentProvider = Exclude<keyof typeof EModelEndpoint, EModelEndpoint.agents> | string;-export const isAgentsEndpoint = (endpoint?: EModelEndpoint.agents | null | string): boolean => {+export const isAgentsEndpoint = (_endpoint?: EModelEndpoint.agents | null | string): boolean => {+ const endpoint = _endpoint ?? '';if (!endpoint) {return false;}@@ -89,6 +116,7 @@ export const defaultAgentFormValues = {model_parameters: {},tools: [],provider: {},+ projectIds: [],code_interpreter: false,image_vision: false,retrieval: false,@@ -295,6 +323,7 @@ export const endpointSettings = {[EModelEndpoint.google]: googleSettings,[EModelEndpoint.anthropic]: anthropicSettings,[EModelEndpoint.agents]: agentsSettings,+ [EModelEndpoint.bedrock]: agentsSettings,};const google = endpointSettings[EModelEndpoint.google];@@ -433,6 +462,25 @@ export const coerceNumber = z.union([z.number(), z.string()]).transform((val) =>return val;});+type DocumentTypeValue =+ | null+ | boolean+ | number+ | string+ | DocumentTypeValue[]+ | { [key: string]: DocumentTypeValue };++const DocumentType: z.ZodType<DocumentTypeValue> = z.lazy(() =>+ z.union([+ z.null(),+ z.boolean(),+ z.number(),+ z.string(),+ z.array(z.lazy(() => DocumentType)),+ z.record(z.lazy(() => DocumentType)),+ ]),+);+export const tConversationSchema = z.object({conversationId: z.string().nullable(),endpoint: eModelEndpointSchema.nullable(),@@ -457,6 +505,7 @@ export const tConversationSchema = z.object({max_tokens: coerceNumber.optional(),/* Anthropic */promptCache: z.boolean().optional(),+ system: z.string().optional(),/* artifacts */artifacts: z.string().optional(),/* google */@@ -475,6 +524,10 @@ export const tConversationSchema = z.object({assistant_id: z.string().optional(),/* agents */agent_id: z.string().optional(),+ /* AWS Bedrock */+ region: z.string().optional(),+ maxTokens: coerceNumber.optional(),+ additionalModelRequestFields: DocumentType.optional(),/* assistant + agents */instructions: z.string().optional(),additional_instructions: z.string().optional(),@@ -618,7 +671,7 @@ export const openAISchema = tConversationSchemamax_tokens: obj.max_tokens ?? undefined,};- if (obj.modelLabel) {+ if (obj.modelLabel != null && obj.modelLabel !== '') {result.modelLabel = null;}@@ -836,7 +889,7 @@ export const gptPluginsSchema = tConversationSchemamaxContextTokens: obj.maxContextTokens ?? undefined,};- if (obj.modelLabel) {+ if (obj.modelLabel != null && obj.modelLabel !== '') {result.modelLabel = null;}@@ -863,16 +916,17 @@ export const gptPluginsSchema = tConversationSchemamaxContextTokens: undefined,}));-export function removeNullishValues<T extends object>(obj: T): T {+export function removeNullishValues<T extends Record<string, unknown>>(obj: T): Partial<T> {const newObj: Partial<T> = { ...obj };(Object.keys(newObj) as Array<keyof T>).forEach((key) => {- if (newObj[key] === undefined || newObj[key] === null || newObj[key] === '') {+ const value = newObj[key];+ if (value === undefined || value === null || value === '') {delete newObj[key];}});- return newObj as T;+ return newObj;}export const assistantSchema = tConversationSchema@@ -973,19 +1027,6 @@ export const agentsSchema = tConversationSchemamaxContextTokens: undefined,}));-export const compactAgentsSchema = tConversationSchema- .pick({- model: true,- agent_id: true,- instructions: true,- promptPrefix: true,- iconURL: true,- greeting: true,- spec: true,- })- .transform(removeNullishValues)- .catch(() => ({}));-export const compactOpenAISchema = tConversationSchema.pick({model: true,@@ -1170,3 +1211,16 @@ export const compactPluginsSchema = tConversationSchemareturn removeNullishValues(newObj);}).catch(() => ({}));++export const compactAgentsSchema = tConversationSchema+ .pick({+ model: true,+ agent_id: true,+ instructions: true,+ additional_instructions: true,+ iconURL: true,+ greeting: true,+ spec: true,+ })+ .transform(removeNullishValues)+ .catch(() => ({}));diff --git a/packages/data-provider/src/types.ts b/packages/data-provider/src/types.tsindex 89d40b17e6..a14d09104d 100644--- a/packages/data-provider/src/types.ts+++ b/packages/data-provider/src/types.ts@@ -221,6 +221,7 @@ export type TConfig = {type?: EModelEndpoint;azure?: boolean;availableTools?: [];+ availableRegions?: string[];plugins?: Record<string, string>;name?: string;iconURL?: string;diff --git a/packages/data-provider/src/types/agents.ts b/packages/data-provider/src/types/agents.tsindex 04f668be63..d66fa63b9e 100644--- a/packages/data-provider/src/types/agents.ts+++ b/packages/data-provider/src/types/agents.ts@@ -10,10 +10,11 @@ export namespace Agents {export type MessageContentText = {type: ContentTypes.TEXT;text: string;+ tool_call_ids?: string[];};export type MessageContentImageUrl = {- type: 'image_url';+ type: ContentTypes.IMAGE_URL;image_url: string | { url: string; detail?: ImageDetail };};@@ -21,7 +22,7 @@ export namespace Agents {| MessageContentText| MessageContentImageUrl// eslint-disable-next-line @typescript-eslint/no-explicit-any- | (Record<string, any> & { type?: ContentTypes | 'image_url' | 'text_delta' | string })+ | (Record<string, any> & { type?: ContentTypes | string })// eslint-disable-next-line @typescript-eslint/no-explicit-any| (Record<string, any> & { type?: never });@@ -38,7 +39,7 @@ export namespace Agents {/** The arguments to the tool call */// eslint-disable-next-line @typescript-eslint/no-explicit-any- args: string | Record<string, any>;+ args?: string | Record<string, any>;/** If provided, an identifier associated with the tool call */id?: string;@@ -50,14 +51,14 @@ export namespace Agents {/** The Step Id of the Tool Call */id: string;/** The Completed Tool Call */- tool_call: ToolCall;+ tool_call?: ToolCall;/** The content index of the tool call */index: number;};export type ToolCallContent = {type: ContentTypes.TOOL_CALL;- tool_call: ToolCall;+ tool_call?: ToolCall;};/**@@ -180,8 +181,8 @@ export namespace Agents {tool_calls: AgentToolCall[];};export type ToolCallDelta = {- type: StepTypes.TOOL_CALLS;- tool_calls: ToolCallChunk[];+ type: StepTypes.TOOL_CALLS | string;+ tool_calls?: ToolCallChunk[];};export type AgentToolCall = FunctionToolCall | ToolCall;export interface ExtendedMessageContent {@@ -215,5 +216,5 @@ export namespace Agents {*/content?: MessageContentComplex[];}- export type ContentType = ContentTypes.TEXT | 'image_url' | string;+ export type ContentType = ContentTypes.TEXT | ContentTypes.IMAGE_URL | string;}diff --git a/packages/data-provider/src/types/assistants.ts b/packages/data-provider/src/types/assistants.tsindex 7c70258e74..0768a3d5b9 100644--- a/packages/data-provider/src/types/assistants.ts+++ b/packages/data-provider/src/types/assistants.ts@@ -160,6 +160,7 @@ export type Agent = {file_ids: string[];instructions: string | null;tools?: string[];+ projectIds?: string[];tool_kwargs?: Record<string, unknown>;tool_resources?: ToolResources;metadata?: Record<string, unknown>;@@ -192,8 +193,10 @@ export type AgentUpdateParams = {tools?: Array<FunctionTool | string>;tool_resources?: ToolResources;provider?: AgentProvider;- model: string | null;- model_parameters: AgentModelParameters;+ model?: string | null;+ model_parameters?: AgentModelParameters;+ projectIds?: string[];+ removeProjectIds?: string[];};export type AgentListParams = {@@ -381,7 +384,7 @@ export type ContentPart = (export type TMessageContentParts =| { type: ContentTypes.ERROR; text: Text & PartMetadata }- | { type: ContentTypes.TEXT; text: string | (Text & PartMetadata) }+ | { type: ContentTypes.TEXT; text: string | (Text & PartMetadata); tool_call_ids?: string[] }| {type: ContentTypes.TOOL_CALL;tool_call: (diff --git a/packages/data-provider/src/types/runs.ts b/packages/data-provider/src/types/runs.tsindex 4a28a32032..2d66d58695 100644--- a/packages/data-provider/src/types/runs.ts+++ b/packages/data-provider/src/types/runs.ts@@ -1,5 +1,6 @@export enum ContentTypes {TEXT = 'text',+ TEXT_DELTA = 'text_delta',TOOL_CALL = 'tool_call',IMAGE_FILE = 'image_file',IMAGE_URL = 'image_url',