mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 17:00:15 +01:00
* feat: Code Interpreter API & File Search Agent Uploads chore: add back code files wip: first pass, abstract key dialog refactor: influence checkbox on key changes refactor: update localization keys for 'execute code' to 'run code' wip: run code button refactor: add throwError parameter to loadAuthValues and getUserPluginAuthValue functions feat: first pass, API tool calling fix: handle missing toolId in callTool function and return 404 for non-existent tools feat: show code outputs fix: improve error handling in callTool function and log errors fix: handle potential null value for filepath in attachment destructuring fix: normalize language before rendering and prevent null return fix: add loading indicator in RunCode component while executing code feat: add support for conditional code execution in Markdown components feat: attachments refactor: remove bash fix: pass abort signal to graph/run refactor: debounce and rate limit tool call refactor: increase debounce delay for execute function feat: set code output attachments feat: image attachments refactor: apply message context refactor: pass `partIndex` feat: toolCall schema/model/methods feat: block indexing feat: get tool calls chore: imports chore: typing chore: condense type imports feat: get tool calls fix: block indexing chore: typing refactor: update tool calls mapping to support multiple results fix: add unique key to nav link for rendering wip: first pass, tool call results refactor: update query cache from successful tool call mutation style: improve result switcher styling chore: note on using \`.toObject()\` feat: add agent_id field to conversation schema chore: typing refactor: rename agentMap to agentsMap for consistency feat: Agent Name as chat input placeholder chore: bump agents 📦 chore: update @langchain dependencies to latest versions to match agents package 📦 chore: update @librechat/agents dependency to version 1.8.0 fix: Aborting agent stream removes sender; fix(bedrock): completion removes preset name label refactor: remove direct file parameter to use req.file, add `processAgentFileUpload` for image uploads feat: upload menu feat: prime message_file resources feat: implement conversation access validation in chat route refactor: remove file parameter from processFileUpload and use req.file instead feat: add savedMessageIds set to track saved message IDs in BaseClient, to prevent unnecessary double-write to db feat: prevent duplicate message saves by checking savedMessageIds in AgentController refactor: skip legacy RAG API handling for agents feat: add files field to convoSchema refactor: update request type annotations from Express.Request to ServerRequest in file processing functions feat: track conversation files fix: resendFiles, addPreviousAttachments handling feat: add ID validation for session_id and file_id in download route feat: entity_id for code file uploads/downloads fix: code file edge cases feat: delete related tool calls feat: add stream rate handling for LLM configuration feat: enhance system content with attached file information fix: improve error logging in resource priming function * WIP: PoC, sequential agents WIP: PoC Sequential Agents, first pass content data + bump agents package fix: package-lock WIP: PoC, o1 support, refactor bufferString feat: convertJsonSchemaToZod fix: form issues and schema defining erroneous model fix: max length issue on agent form instructions, limit conversation messages to sequential agents feat: add abort signal support to createRun function and AgentClient feat: PoC, hide prior sequential agent steps fix: update parameter naming from config to metadata in event handlers for clarity, add model to usage data refactor: use only last contentData, track model for usage data chore: bump agents package fix: content parts issue refactor: filter contentParts to include tool calls and relevant indices feat: show function calls refactor: filter context messages to exclude tool calls when no tools are available to the agent fix: ensure tool call content is not undefined in formatMessages feat: add agent_id field to conversationPreset schema feat: hide sequential agents feat: increase upload toast duration to 10 seconds * refactor: tool context handling & update Code API Key Dialog feat: toolContextMap chore: skipSpecs -> useSpecs ci: fix handleTools tests feat: API Key Dialog * feat: Agent Permissions Admin Controls feat: replace label with button for prompt permission toggle feat: update agent permissions feat: enable experimental agents and streamline capability configuration feat: implement access control for agents and enhance endpoint menu items feat: add welcome message for agent selection in localization feat: add agents permission to access control and update version to 0.7.57 * fix: update types in useAssistantListMap and useMentions hooks for better null handling * feat: mention agents * fix: agent tool resource race conditions when deleting agent tool resource files * feat: add error handling for code execution with user feedback * refactor: rename AdminControls to AdminSettings for clarity * style: add gap to button in AdminSettings for improved layout * refactor: separate agent query hooks and check access to enable fetching * fix: remove unused provider from agent initialization options, creates issue with custom endpoints * refactor: remove redundant/deprecated modelOptions from AgentClient processes * chore: update @librechat/agents to version 1.8.5 in package.json and package-lock.json * fix: minor styling issues + agent panel uniformity * fix: agent edge cases when set endpoint is no longer defined * refactor: remove unused cleanup function call from AppService * fix: update link in ApiKeyDialog to point to pricing page * fix: improve type handling and layout calculations in SidePanel component * fix: add missing localization string for agent selection in SidePanel * chore: form styling and localizations for upload filesearch/code interpreter * fix: model selection placeholder logic in AgentConfig component * style: agent capabilities * fix: add localization for provider selection and improve dropdown styling in ModelPanel * refactor: use gpt-4o-mini > gpt-3.5-turbo * fix: agents configuration for loadDefaultInterface and update related tests * feat: DALLE Agents support
249 lines
8 KiB
JavaScript
249 lines
8 KiB
JavaScript
const mockUser = {
|
|
_id: 'fakeId',
|
|
save: jest.fn(),
|
|
findByIdAndDelete: jest.fn(),
|
|
};
|
|
|
|
const mockPluginService = {
|
|
updateUserPluginAuth: jest.fn(),
|
|
deleteUserPluginAuth: jest.fn(),
|
|
getUserPluginAuthValue: jest.fn(),
|
|
};
|
|
|
|
jest.mock('~/models/User', () => {
|
|
return function () {
|
|
return mockUser;
|
|
};
|
|
});
|
|
|
|
jest.mock('~/server/services/PluginService', () => mockPluginService);
|
|
|
|
const { BaseLLM } = require('@langchain/openai');
|
|
const { Calculator } = require('@langchain/community/tools/calculator');
|
|
|
|
const User = require('~/models/User');
|
|
const PluginService = require('~/server/services/PluginService');
|
|
const { validateTools, loadTools, loadToolWithAuth } = require('./handleTools');
|
|
const { StructuredSD, availableTools, DALLE3 } = require('../');
|
|
|
|
describe('Tool Handlers', () => {
|
|
let fakeUser;
|
|
const pluginKey = 'dalle';
|
|
const pluginKey2 = 'wolfram';
|
|
const ToolClass = DALLE3;
|
|
const initialTools = [pluginKey, pluginKey2];
|
|
const mockCredential = 'mock-credential';
|
|
const mainPlugin = availableTools.find((tool) => tool.pluginKey === pluginKey);
|
|
const authConfigs = mainPlugin.authConfig;
|
|
|
|
beforeAll(async () => {
|
|
mockUser.save.mockResolvedValue(undefined);
|
|
|
|
const userAuthValues = {};
|
|
mockPluginService.getUserPluginAuthValue.mockImplementation((userId, authField) => {
|
|
return userAuthValues[`${userId}-${authField}`];
|
|
});
|
|
mockPluginService.updateUserPluginAuth.mockImplementation(
|
|
(userId, authField, _pluginKey, credential) => {
|
|
const fields = authField.split('||');
|
|
fields.forEach((field) => {
|
|
userAuthValues[`${userId}-${field}`] = credential;
|
|
});
|
|
},
|
|
);
|
|
|
|
fakeUser = new User({
|
|
name: 'Fake User',
|
|
username: 'fakeuser',
|
|
email: 'fakeuser@example.com',
|
|
emailVerified: false,
|
|
// file deepcode ignore NoHardcodedPasswords/test: fake value
|
|
password: 'fakepassword123',
|
|
avatar: '',
|
|
provider: 'local',
|
|
role: 'USER',
|
|
googleId: null,
|
|
plugins: [],
|
|
refreshToken: [],
|
|
});
|
|
await fakeUser.save();
|
|
for (const authConfig of authConfigs) {
|
|
await PluginService.updateUserPluginAuth(
|
|
fakeUser._id,
|
|
authConfig.authField,
|
|
pluginKey,
|
|
mockCredential,
|
|
);
|
|
}
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await mockUser.findByIdAndDelete(fakeUser._id);
|
|
for (const authConfig of authConfigs) {
|
|
await PluginService.deleteUserPluginAuth(fakeUser._id, authConfig.authField);
|
|
}
|
|
});
|
|
|
|
describe('validateTools', () => {
|
|
it('returns valid tools given input tools and user authentication', async () => {
|
|
const validTools = await validateTools(fakeUser._id, initialTools);
|
|
expect(validTools).toBeDefined();
|
|
expect(validTools.some((tool) => tool === pluginKey)).toBeTruthy();
|
|
expect(validTools.length).toBeGreaterThan(0);
|
|
});
|
|
|
|
it('removes tools without valid credentials from the validTools array', async () => {
|
|
const validTools = await validateTools(fakeUser._id, initialTools);
|
|
expect(validTools.some((tool) => tool.pluginKey === pluginKey2)).toBeFalsy();
|
|
});
|
|
|
|
it('returns an empty array when no authenticated tools are provided', async () => {
|
|
const validTools = await validateTools(fakeUser._id, []);
|
|
expect(validTools).toEqual([]);
|
|
});
|
|
|
|
it('should validate a tool from an Environment Variable', async () => {
|
|
const plugin = availableTools.find((tool) => tool.pluginKey === pluginKey2);
|
|
const authConfigs = plugin.authConfig;
|
|
for (const authConfig of authConfigs) {
|
|
process.env[authConfig.authField] = mockCredential;
|
|
}
|
|
const validTools = await validateTools(fakeUser._id, [pluginKey2]);
|
|
expect(validTools.length).toEqual(1);
|
|
for (const authConfig of authConfigs) {
|
|
delete process.env[authConfig.authField];
|
|
}
|
|
});
|
|
});
|
|
|
|
describe('loadTools', () => {
|
|
let toolFunctions;
|
|
let loadTool1;
|
|
let loadTool2;
|
|
let loadTool3;
|
|
const sampleTools = [...initialTools, 'calculator'];
|
|
let ToolClass2 = Calculator;
|
|
let remainingTools = availableTools.filter(
|
|
(tool) => sampleTools.indexOf(tool.pluginKey) === -1,
|
|
);
|
|
|
|
beforeAll(async () => {
|
|
const toolMap = await loadTools({
|
|
user: fakeUser._id,
|
|
model: BaseLLM,
|
|
tools: sampleTools,
|
|
returnMap: true,
|
|
useSpecs: true,
|
|
});
|
|
toolFunctions = toolMap;
|
|
loadTool1 = toolFunctions[sampleTools[0]];
|
|
loadTool2 = toolFunctions[sampleTools[1]];
|
|
loadTool3 = toolFunctions[sampleTools[2]];
|
|
});
|
|
|
|
let originalEnv;
|
|
|
|
beforeEach(() => {
|
|
originalEnv = process.env;
|
|
process.env = { ...originalEnv };
|
|
});
|
|
|
|
afterEach(() => {
|
|
process.env = originalEnv;
|
|
});
|
|
|
|
it('returns the expected load functions for requested tools', async () => {
|
|
expect(loadTool1).toBeDefined();
|
|
expect(loadTool2).toBeDefined();
|
|
expect(loadTool3).toBeDefined();
|
|
|
|
for (const tool of remainingTools) {
|
|
expect(toolFunctions[tool.pluginKey]).toBeUndefined();
|
|
}
|
|
});
|
|
|
|
it('should initialize an authenticated tool or one without authentication', async () => {
|
|
const authTool = await loadTool1();
|
|
const tool = await loadTool3();
|
|
expect(authTool).toBeInstanceOf(ToolClass);
|
|
expect(tool).toBeInstanceOf(ToolClass2);
|
|
});
|
|
|
|
it('should initialize an authenticated tool with primary auth field', async () => {
|
|
process.env.DALLE3_API_KEY = 'mocked_api_key';
|
|
const initToolFunction = loadToolWithAuth(
|
|
'userId',
|
|
['DALLE3_API_KEY||DALLE_API_KEY'],
|
|
ToolClass,
|
|
);
|
|
const authTool = await initToolFunction();
|
|
|
|
expect(authTool).toBeInstanceOf(ToolClass);
|
|
expect(mockPluginService.getUserPluginAuthValue).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('should initialize an authenticated tool with alternate auth field when primary is missing', async () => {
|
|
delete process.env.DALLE3_API_KEY; // Ensure the primary key is not set
|
|
process.env.DALLE_API_KEY = 'mocked_alternate_api_key';
|
|
const initToolFunction = loadToolWithAuth(
|
|
'userId',
|
|
['DALLE3_API_KEY||DALLE_API_KEY'],
|
|
ToolClass,
|
|
);
|
|
const authTool = await initToolFunction();
|
|
|
|
expect(authTool).toBeInstanceOf(ToolClass);
|
|
expect(mockPluginService.getUserPluginAuthValue).toHaveBeenCalledTimes(1);
|
|
expect(mockPluginService.getUserPluginAuthValue).toHaveBeenCalledWith(
|
|
'userId',
|
|
'DALLE3_API_KEY',
|
|
true,
|
|
);
|
|
});
|
|
|
|
it('should fallback to getUserPluginAuthValue when env vars are missing', async () => {
|
|
mockPluginService.updateUserPluginAuth('userId', 'DALLE_API_KEY', 'dalle', 'mocked_api_key');
|
|
const initToolFunction = loadToolWithAuth(
|
|
'userId',
|
|
['DALLE3_API_KEY||DALLE_API_KEY'],
|
|
ToolClass,
|
|
);
|
|
const authTool = await initToolFunction();
|
|
|
|
expect(authTool).toBeInstanceOf(ToolClass);
|
|
expect(mockPluginService.getUserPluginAuthValue).toHaveBeenCalledTimes(2);
|
|
});
|
|
|
|
it('should throw an error for an unauthenticated tool', async () => {
|
|
try {
|
|
await loadTool2();
|
|
} catch (error) {
|
|
// eslint-disable-next-line jest/no-conditional-expect
|
|
expect(error).toBeDefined();
|
|
}
|
|
});
|
|
it('returns an empty object when no tools are requested', async () => {
|
|
toolFunctions = await loadTools({
|
|
user: fakeUser._id,
|
|
model: BaseLLM,
|
|
returnMap: true,
|
|
useSpecs: true,
|
|
});
|
|
expect(toolFunctions).toEqual({});
|
|
});
|
|
it('should return the StructuredTool version when using functions', async () => {
|
|
process.env.SD_WEBUI_URL = mockCredential;
|
|
toolFunctions = await loadTools({
|
|
user: fakeUser._id,
|
|
model: BaseLLM,
|
|
tools: ['stable-diffusion'],
|
|
functions: true,
|
|
returnMap: true,
|
|
useSpecs: true,
|
|
});
|
|
const structuredTool = await toolFunctions['stable-diffusion']();
|
|
expect(structuredTool).toBeInstanceOf(StructuredSD);
|
|
delete process.env.SD_WEBUI_URL;
|
|
});
|
|
});
|
|
});
|