mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02:00

bugfix: Enhance Agent and AgentCategory schemas with new fields for category, support contact, and promotion status refactored and moved agent category methods and schema to data-schema package 🔧 fix: Merge and Rebase Conflicts - Move AgentCategory from api/models to @packages/data-schemas structure - Add schema, types, methods, and model following codebase conventions - Implement auto-seeding of default categories during AppService startup - Update marketplace controller to use new data-schemas methods - Remove old model file and standalone seed script refactor: unify agent marketplace to single endpoint with cursor pagination - Replace multiple marketplace routes with unified /marketplace endpoint - Add query string controls: category, search, limit, cursor, promoted, requiredPermission - Implement cursor-based pagination replacing page-based system - Integrate ACL permissions for proper access control - Fix ObjectId constructor error in Agent model - Update React components to use unified useGetMarketplaceAgentsQuery hook - Enhance type safety and remove deprecated useDynamicAgentQuery - Update tests for new marketplace architecture -Known issues: see more button after category switching + Unit tests feat: add icon property to ProcessedAgentCategory interface - Add useMarketplaceAgentsInfiniteQuery and useGetAgentCategoriesQuery to client/src/data-provider/Agents/ - Replace manual pagination in AgentGrid with infinite query pattern - Update imports to use local data provider instead of librechat-data-provider - Add proper permission handling with PERMISSION_BITS.VIEW/EDIT constants - Improve agent access control by adding requiredPermission validation in backend - Remove manual cursor/state management in favor of infinite query built-ins - Maintain existing search and category filtering functionality refactor: consolidate agent marketplace endpoints into main agents API and improve data management consistency - Remove dedicated marketplace controller and routes, merging functionality into main agents v1 API - Add countPromotedAgents function to Agent model for promoted agents count - Enhance getListAgents handler with marketplace filtering (category, search, promoted status) - Move getAgentCategories from marketplace to v1 controller with same functionality - Update agent mutations to invalidate marketplace queries and handle multiple permission levels - Improve cache management by updating all agent query variants (VIEW/EDIT permissions) - Consolidate agent data access patterns for better maintainability and consistency - Remove duplicate marketplace route definitions and middleware selected view only agents injected in the drop down fix: remove minlength validation for support contact name in agent schema feat: add validation and error messages for agent name in AgentConfig and AgentPanel fix: update agent permission check logic in AgentPanel to simplify condition Fix linting WIP Fix Unit tests WIP ESLint fixes eslint fix refactor: enhance isDuplicateVersion function in Agent model for improved comparison logic - Introduced handling for undefined/null values in array and object comparisons. - Normalized array comparisons to treat undefined/null as empty arrays. - Added deep comparison for objects and improved handling of primitive values. - Enhanced projectIds comparison to ensure consistent MongoDB ObjectId handling. refactor: remove redundant properties from IAgent interface in agent schema chore: update localization for agent detail component and clean up imports ci: update access middleware tests chore: remove unused PermissionTypes import from Role model ci: update AclEntry model tests ci: update button accessibility labels in AgentDetail tests refactor: update exhaustive dep. lint warning 🔧 fix: Fixed agent actions access feat: Add role-level permissions for agent sharing people picker - Add PEOPLE_PICKER permission type with VIEW_USERS and VIEW_GROUPS permissions - Create custom middleware for query-aware permission validation - Implement permission-based type filtering in PeoplePicker component - Hide people picker UI when user lacks permissions, show only public toggle - Support granular access: users-only, groups-only, or mixed search modes refactor: Replace marketplace interface config with permission-based system - Add MARKETPLACE permission type to handle marketplace access control - Update interface configuration to use role-based marketplace settings (admin/user) - Replace direct marketplace boolean config with permission-based checks - Modify frontend components to use marketplace permissions instead of interface config - Update agent query hooks to use marketplace permissions for determining permission levels - Add marketplace configuration structure similar to peoplePicker in YAML config - Backend now sets MARKETPLACE permissions based on interface configuration - When marketplace enabled: users get agents with EDIT permissions in dropdown lists (builder mode) - When marketplace disabled: users get agents with VIEW permissions in dropdown lists (browse mode) 🔧 fix: Redirect to New Chat if No Marketplace Access and Required Agent Name Placeholder (#8213) * Fix: Fix the redirect to new chat page if access to marketplace is denied * Fixed the required agent name placeholder --------- Co-authored-by: Atef Bellaaj <slalom.bellaaj@external.daimlertruck.com> chore: fix tests, remove unnecessary imports refactor: Implement permission checks for file access via agents - Updated `hasAccessToFilesViaAgent` to utilize permission checks for VIEW and EDIT access. - Replaced project-based access validation with permission-based checks. - Enhanced tests to cover new permission logic and ensure proper access control for files associated with agents. - Cleaned up imports and initialized models in test files for consistency. refactor: Enhance test setup and cleanup for file access control - Introduced modelsToCleanup array to track models added during tests for proper cleanup. - Updated afterAll hooks in test files to ensure all collections are cleared and only added models are deleted. - Improved consistency in model initialization across test files. - Added comments for clarity on cleanup processes and test data management. chore: Update Jest configuration and test setup for improved timeout handling - Added a global test timeout of 30 seconds in jest.config.js. - Configured jest.setTimeout in jestSetup.js to allow individual test overrides if needed. - Enhanced test reliability by ensuring consistent timeout settings across all tests. refactor: Implement file access filtering based on agent permissions - Introduced `filterFilesByAgentAccess` function to filter files based on user access through agents. - Updated `getFiles` and `primeFiles` functions to utilize the new filtering logic. - Moved `hasAccessToFilesViaAgent` function from the File model to permission services, adjusting imports accordingly - Enhanced tests to ensure proper access control and filtering behavior for files associated with agents. fix: make support_contact field a nested object rather than a sub-document refactor: Update support_contact field initialization in agent model - Removed handling for empty support_contact object in createAgent function. - Changed default value of support_contact in agent schema to undefined. test: Add comprehensive tests for support_contact field handling and versioning refactor: remove unused avatar upload mutation field and add informational toast for success chore: add missing SidePanelProvider for AgentMarketplace and organize imports fix: resolve agent selection race condition in marketplace HandleStartChat - Set agent in localStorage before newConversation to prevent useSelectorEffects from auto-selecting previous agent fix: resolve agent dropdown showing raw ID instead of agent info from URL - Add proactive agent fetching when agent_id is present in URL parameters - Inject fetched agent into agents cache so dropdowns display proper name/avatar - Use useAgentsMap dependency to ensure proper cache initialization timing - Prevents raw agent IDs from showing in UI when visiting shared agent links Fix: Agents endpoint renamed to "My Agent" for less confusion with the Marketplace agents. chore: fix ESLint issues and Test Mocks ci: update permissions structure in loadDefaultInterface tests - Refactored permissions for MEMORY and added new permissions for MARKETPLACE and PEOPLE_PICKER. - Ensured consistent structure for permissions across different types. feat: support_contact validation to allow empty email strings
967 lines
31 KiB
JavaScript
967 lines
31 KiB
JavaScript
const {
|
|
FileSources,
|
|
EModelEndpoint,
|
|
EImageOutputType,
|
|
AgentCapabilities,
|
|
defaultSocialLogins,
|
|
validateAzureGroups,
|
|
defaultAgentCapabilities,
|
|
deprecatedAzureVariables,
|
|
conflictingAzureVariables,
|
|
} = require('librechat-data-provider');
|
|
|
|
const AppService = require('./AppService');
|
|
|
|
jest.mock('./Config/loadCustomConfig', () => {
|
|
return jest.fn(() =>
|
|
Promise.resolve({
|
|
registration: { socialLogins: ['testLogin'] },
|
|
fileStrategy: 'testStrategy',
|
|
balance: {
|
|
enabled: true,
|
|
},
|
|
}),
|
|
);
|
|
});
|
|
jest.mock('./Files/Firebase/initialize', () => ({
|
|
initializeFirebase: jest.fn(),
|
|
}));
|
|
jest.mock('~/models', () => ({
|
|
initializeRoles: jest.fn(),
|
|
seedDefaultRoles: jest.fn(),
|
|
ensureDefaultCategories: jest.fn(),
|
|
}));
|
|
jest.mock('~/models/Role', () => ({
|
|
updateAccessPermissions: jest.fn(),
|
|
}));
|
|
jest.mock('./Config', () => ({
|
|
setCachedTools: jest.fn(),
|
|
getCachedTools: jest.fn().mockResolvedValue({
|
|
ExampleTool: {
|
|
type: 'function',
|
|
function: {
|
|
description: 'Example tool function',
|
|
name: 'exampleFunction',
|
|
parameters: {
|
|
type: 'object',
|
|
properties: {
|
|
param1: { type: 'string', description: 'An example parameter' },
|
|
},
|
|
required: ['param1'],
|
|
},
|
|
},
|
|
},
|
|
}),
|
|
}));
|
|
jest.mock('./ToolService', () => ({
|
|
loadAndFormatTools: jest.fn().mockReturnValue({
|
|
ExampleTool: {
|
|
type: 'function',
|
|
function: {
|
|
description: 'Example tool function',
|
|
name: 'exampleFunction',
|
|
parameters: {
|
|
type: 'object',
|
|
properties: {
|
|
param1: { type: 'string', description: 'An example parameter' },
|
|
},
|
|
required: ['param1'],
|
|
},
|
|
},
|
|
},
|
|
}),
|
|
}));
|
|
jest.mock('./start/turnstile', () => ({
|
|
loadTurnstileConfig: jest.fn(() => ({
|
|
siteKey: 'default-site-key',
|
|
options: {},
|
|
})),
|
|
}));
|
|
|
|
const azureGroups = [
|
|
{
|
|
group: 'librechat-westus',
|
|
apiKey: '${WESTUS_API_KEY}',
|
|
instanceName: 'librechat-westus',
|
|
version: '2023-12-01-preview',
|
|
models: {
|
|
'gpt-4-vision-preview': {
|
|
deploymentName: 'gpt-4-vision-preview',
|
|
version: '2024-02-15-preview',
|
|
},
|
|
'gpt-3.5-turbo': {
|
|
deploymentName: 'gpt-35-turbo',
|
|
},
|
|
'gpt-3.5-turbo-1106': {
|
|
deploymentName: 'gpt-35-turbo-1106',
|
|
},
|
|
'gpt-4': {
|
|
deploymentName: 'gpt-4',
|
|
},
|
|
'gpt-4-1106-preview': {
|
|
deploymentName: 'gpt-4-1106-preview',
|
|
},
|
|
},
|
|
},
|
|
{
|
|
group: 'librechat-eastus',
|
|
apiKey: '${EASTUS_API_KEY}',
|
|
instanceName: 'librechat-eastus',
|
|
deploymentName: 'gpt-4-turbo',
|
|
version: '2024-02-15-preview',
|
|
models: {
|
|
'gpt-4-turbo': true,
|
|
},
|
|
},
|
|
];
|
|
|
|
describe('AppService', () => {
|
|
let app;
|
|
const mockedTurnstileConfig = {
|
|
siteKey: 'default-site-key',
|
|
options: {},
|
|
};
|
|
|
|
beforeEach(() => {
|
|
app = { locals: {} };
|
|
process.env.CDN_PROVIDER = undefined;
|
|
});
|
|
|
|
it('should correctly assign process.env and app.locals based on custom config', async () => {
|
|
await AppService(app);
|
|
|
|
expect(process.env.CDN_PROVIDER).toEqual('testStrategy');
|
|
|
|
expect(app.locals).toEqual({
|
|
socialLogins: ['testLogin'],
|
|
fileStrategy: 'testStrategy',
|
|
interfaceConfig: expect.objectContaining({
|
|
endpointsMenu: true,
|
|
modelSelect: true,
|
|
parameters: true,
|
|
sidePanel: true,
|
|
presets: true,
|
|
}),
|
|
mcpConfig: null,
|
|
turnstileConfig: mockedTurnstileConfig,
|
|
modelSpecs: undefined,
|
|
paths: expect.anything(),
|
|
ocr: expect.anything(),
|
|
imageOutputType: expect.any(String),
|
|
fileConfig: undefined,
|
|
secureImageLinks: undefined,
|
|
balance: { enabled: true },
|
|
filteredTools: undefined,
|
|
includedTools: undefined,
|
|
webSearch: {
|
|
safeSearch: 1,
|
|
jinaApiKey: '${JINA_API_KEY}',
|
|
cohereApiKey: '${COHERE_API_KEY}',
|
|
serperApiKey: '${SERPER_API_KEY}',
|
|
searxngApiKey: '${SEARXNG_API_KEY}',
|
|
firecrawlApiKey: '${FIRECRAWL_API_KEY}',
|
|
firecrawlApiUrl: '${FIRECRAWL_API_URL}',
|
|
searxngInstanceUrl: '${SEARXNG_INSTANCE_URL}',
|
|
},
|
|
memory: undefined,
|
|
agents: {
|
|
disableBuilder: false,
|
|
capabilities: expect.arrayContaining([...defaultAgentCapabilities]),
|
|
maxCitations: 30,
|
|
maxCitationsPerFile: 7,
|
|
minRelevanceScore: 0.45,
|
|
},
|
|
});
|
|
});
|
|
|
|
it('should log a warning if the config version is outdated', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
version: '0.9.0', // An outdated version for this test
|
|
registration: { socialLogins: ['testLogin'] },
|
|
fileStrategy: 'testStrategy',
|
|
}),
|
|
);
|
|
|
|
await AppService(app);
|
|
|
|
const { logger } = require('~/config');
|
|
expect(logger.info).toHaveBeenCalledWith(expect.stringContaining('Outdated Config version'));
|
|
});
|
|
|
|
it('should change the `imageOutputType` based on config value', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
version: '0.10.0',
|
|
imageOutputType: EImageOutputType.WEBP,
|
|
}),
|
|
);
|
|
|
|
await AppService(app);
|
|
expect(app.locals.imageOutputType).toEqual(EImageOutputType.WEBP);
|
|
});
|
|
|
|
it('should default to `PNG` `imageOutputType` with no provided type', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
version: '0.10.0',
|
|
}),
|
|
);
|
|
|
|
await AppService(app);
|
|
expect(app.locals.imageOutputType).toEqual(EImageOutputType.PNG);
|
|
});
|
|
|
|
it('should default to `PNG` `imageOutputType` with no provided config', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() => Promise.resolve(undefined));
|
|
|
|
await AppService(app);
|
|
expect(app.locals.imageOutputType).toEqual(EImageOutputType.PNG);
|
|
});
|
|
|
|
it('should initialize Firebase when fileStrategy is firebase', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
fileStrategy: FileSources.firebase,
|
|
}),
|
|
);
|
|
|
|
await AppService(app);
|
|
|
|
const { initializeFirebase } = require('./Files/Firebase/initialize');
|
|
expect(initializeFirebase).toHaveBeenCalled();
|
|
|
|
expect(process.env.CDN_PROVIDER).toEqual(FileSources.firebase);
|
|
});
|
|
|
|
it('should load and format tools accurately with defined structure', async () => {
|
|
const { loadAndFormatTools } = require('./ToolService');
|
|
const { setCachedTools, getCachedTools } = require('./Config');
|
|
|
|
await AppService(app);
|
|
|
|
expect(loadAndFormatTools).toHaveBeenCalledWith({
|
|
adminFilter: undefined,
|
|
adminIncluded: undefined,
|
|
directory: expect.anything(),
|
|
});
|
|
|
|
// Verify setCachedTools was called with the tools
|
|
expect(setCachedTools).toHaveBeenCalledWith(
|
|
{
|
|
ExampleTool: {
|
|
type: 'function',
|
|
function: {
|
|
description: 'Example tool function',
|
|
name: 'exampleFunction',
|
|
parameters: {
|
|
type: 'object',
|
|
properties: {
|
|
param1: { type: 'string', description: 'An example parameter' },
|
|
},
|
|
required: ['param1'],
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{ isGlobal: true },
|
|
);
|
|
|
|
// Verify we can retrieve the tools from cache
|
|
const cachedTools = await getCachedTools({ includeGlobal: true });
|
|
expect(cachedTools.ExampleTool).toBeDefined();
|
|
expect(cachedTools.ExampleTool).toEqual({
|
|
type: 'function',
|
|
function: {
|
|
description: 'Example tool function',
|
|
name: 'exampleFunction',
|
|
parameters: {
|
|
type: 'object',
|
|
properties: {
|
|
param1: { type: 'string', description: 'An example parameter' },
|
|
},
|
|
required: ['param1'],
|
|
},
|
|
},
|
|
});
|
|
});
|
|
|
|
it('should correctly configure Assistants endpoint based on custom config', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
endpoints: {
|
|
[EModelEndpoint.assistants]: {
|
|
disableBuilder: true,
|
|
pollIntervalMs: 5000,
|
|
timeoutMs: 30000,
|
|
supportedIds: ['id1', 'id2'],
|
|
privateAssistants: false,
|
|
},
|
|
},
|
|
}),
|
|
);
|
|
|
|
await AppService(app);
|
|
|
|
expect(app.locals).toHaveProperty(EModelEndpoint.assistants);
|
|
expect(app.locals[EModelEndpoint.assistants]).toEqual(
|
|
expect.objectContaining({
|
|
disableBuilder: true,
|
|
pollIntervalMs: 5000,
|
|
timeoutMs: 30000,
|
|
supportedIds: expect.arrayContaining(['id1', 'id2']),
|
|
privateAssistants: false,
|
|
}),
|
|
);
|
|
});
|
|
|
|
it('should correctly configure Agents endpoint based on custom config', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
endpoints: {
|
|
[EModelEndpoint.agents]: {
|
|
disableBuilder: true,
|
|
recursionLimit: 10,
|
|
maxRecursionLimit: 20,
|
|
allowedProviders: ['openai', 'anthropic'],
|
|
capabilities: [AgentCapabilities.tools, AgentCapabilities.actions],
|
|
},
|
|
},
|
|
}),
|
|
);
|
|
|
|
await AppService(app);
|
|
|
|
expect(app.locals).toHaveProperty(EModelEndpoint.agents);
|
|
expect(app.locals[EModelEndpoint.agents]).toEqual(
|
|
expect.objectContaining({
|
|
disableBuilder: true,
|
|
recursionLimit: 10,
|
|
maxRecursionLimit: 20,
|
|
allowedProviders: expect.arrayContaining(['openai', 'anthropic']),
|
|
capabilities: expect.arrayContaining([AgentCapabilities.tools, AgentCapabilities.actions]),
|
|
}),
|
|
);
|
|
});
|
|
|
|
it('should configure Agents endpoint with defaults when no config is provided', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() => Promise.resolve({}));
|
|
|
|
await AppService(app);
|
|
|
|
expect(app.locals).toHaveProperty(EModelEndpoint.agents);
|
|
expect(app.locals[EModelEndpoint.agents]).toEqual(
|
|
expect.objectContaining({
|
|
disableBuilder: false,
|
|
capabilities: expect.arrayContaining([...defaultAgentCapabilities]),
|
|
}),
|
|
);
|
|
});
|
|
|
|
it('should configure Agents endpoint with defaults when endpoints exist but agents is not defined', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
endpoints: {
|
|
[EModelEndpoint.openAI]: {
|
|
titleConvo: true,
|
|
},
|
|
},
|
|
}),
|
|
);
|
|
|
|
await AppService(app);
|
|
|
|
expect(app.locals).toHaveProperty(EModelEndpoint.agents);
|
|
expect(app.locals[EModelEndpoint.agents]).toEqual(
|
|
expect.objectContaining({
|
|
disableBuilder: false,
|
|
capabilities: expect.arrayContaining([...defaultAgentCapabilities]),
|
|
}),
|
|
);
|
|
});
|
|
|
|
it('should correctly configure minimum Azure OpenAI Assistant values', async () => {
|
|
const assistantGroups = [azureGroups[0], { ...azureGroups[1], assistants: true }];
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
endpoints: {
|
|
[EModelEndpoint.azureOpenAI]: {
|
|
groups: assistantGroups,
|
|
assistants: true,
|
|
},
|
|
},
|
|
}),
|
|
);
|
|
|
|
process.env.WESTUS_API_KEY = 'westus-key';
|
|
process.env.EASTUS_API_KEY = 'eastus-key';
|
|
|
|
await AppService(app);
|
|
expect(app.locals).toHaveProperty(EModelEndpoint.azureAssistants);
|
|
expect(app.locals[EModelEndpoint.azureAssistants].capabilities.length).toEqual(3);
|
|
});
|
|
|
|
it('should correctly configure Azure OpenAI endpoint based on custom config', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
endpoints: {
|
|
[EModelEndpoint.azureOpenAI]: {
|
|
groups: azureGroups,
|
|
},
|
|
},
|
|
}),
|
|
);
|
|
|
|
process.env.WESTUS_API_KEY = 'westus-key';
|
|
process.env.EASTUS_API_KEY = 'eastus-key';
|
|
|
|
await AppService(app);
|
|
|
|
expect(app.locals).toHaveProperty(EModelEndpoint.azureOpenAI);
|
|
const azureConfig = app.locals[EModelEndpoint.azureOpenAI];
|
|
expect(azureConfig).toHaveProperty('modelNames');
|
|
expect(azureConfig).toHaveProperty('modelGroupMap');
|
|
expect(azureConfig).toHaveProperty('groupMap');
|
|
|
|
const { modelNames, modelGroupMap, groupMap } = validateAzureGroups(azureGroups);
|
|
expect(azureConfig.modelNames).toEqual(modelNames);
|
|
expect(azureConfig.modelGroupMap).toEqual(modelGroupMap);
|
|
expect(azureConfig.groupMap).toEqual(groupMap);
|
|
});
|
|
|
|
it('should not modify FILE_UPLOAD environment variables without rate limits', async () => {
|
|
// Setup initial environment variables
|
|
process.env.FILE_UPLOAD_IP_MAX = '10';
|
|
process.env.FILE_UPLOAD_IP_WINDOW = '15';
|
|
process.env.FILE_UPLOAD_USER_MAX = '5';
|
|
process.env.FILE_UPLOAD_USER_WINDOW = '20';
|
|
|
|
const initialEnv = { ...process.env };
|
|
|
|
await AppService(app);
|
|
|
|
// Expect environment variables to remain unchanged
|
|
expect(process.env.FILE_UPLOAD_IP_MAX).toEqual(initialEnv.FILE_UPLOAD_IP_MAX);
|
|
expect(process.env.FILE_UPLOAD_IP_WINDOW).toEqual(initialEnv.FILE_UPLOAD_IP_WINDOW);
|
|
expect(process.env.FILE_UPLOAD_USER_MAX).toEqual(initialEnv.FILE_UPLOAD_USER_MAX);
|
|
expect(process.env.FILE_UPLOAD_USER_WINDOW).toEqual(initialEnv.FILE_UPLOAD_USER_WINDOW);
|
|
});
|
|
|
|
it('should correctly set FILE_UPLOAD environment variables based on rate limits', async () => {
|
|
// Define and mock a custom configuration with rate limits
|
|
const rateLimitsConfig = {
|
|
rateLimits: {
|
|
fileUploads: {
|
|
ipMax: '100',
|
|
ipWindowInMinutes: '60',
|
|
userMax: '50',
|
|
userWindowInMinutes: '30',
|
|
},
|
|
},
|
|
};
|
|
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve(rateLimitsConfig),
|
|
);
|
|
|
|
await AppService(app);
|
|
|
|
// Verify that process.env has been updated according to the rate limits config
|
|
expect(process.env.FILE_UPLOAD_IP_MAX).toEqual('100');
|
|
expect(process.env.FILE_UPLOAD_IP_WINDOW).toEqual('60');
|
|
expect(process.env.FILE_UPLOAD_USER_MAX).toEqual('50');
|
|
expect(process.env.FILE_UPLOAD_USER_WINDOW).toEqual('30');
|
|
});
|
|
|
|
it('should fallback to default FILE_UPLOAD environment variables when rate limits are unspecified', async () => {
|
|
// Setup initial environment variables to non-default values
|
|
process.env.FILE_UPLOAD_IP_MAX = 'initialMax';
|
|
process.env.FILE_UPLOAD_IP_WINDOW = 'initialWindow';
|
|
process.env.FILE_UPLOAD_USER_MAX = 'initialUserMax';
|
|
process.env.FILE_UPLOAD_USER_WINDOW = 'initialUserWindow';
|
|
|
|
await AppService(app);
|
|
|
|
// Verify that process.env falls back to the initial values
|
|
expect(process.env.FILE_UPLOAD_IP_MAX).toEqual('initialMax');
|
|
expect(process.env.FILE_UPLOAD_IP_WINDOW).toEqual('initialWindow');
|
|
expect(process.env.FILE_UPLOAD_USER_MAX).toEqual('initialUserMax');
|
|
expect(process.env.FILE_UPLOAD_USER_WINDOW).toEqual('initialUserWindow');
|
|
});
|
|
|
|
it('should not modify IMPORT environment variables without rate limits', async () => {
|
|
// Setup initial environment variables
|
|
process.env.IMPORT_IP_MAX = '10';
|
|
process.env.IMPORT_IP_WINDOW = '15';
|
|
process.env.IMPORT_USER_MAX = '5';
|
|
process.env.IMPORT_USER_WINDOW = '20';
|
|
|
|
const initialEnv = { ...process.env };
|
|
|
|
await AppService(app);
|
|
|
|
// Expect environment variables to remain unchanged
|
|
expect(process.env.IMPORT_IP_MAX).toEqual(initialEnv.IMPORT_IP_MAX);
|
|
expect(process.env.IMPORT_IP_WINDOW).toEqual(initialEnv.IMPORT_IP_WINDOW);
|
|
expect(process.env.IMPORT_USER_MAX).toEqual(initialEnv.IMPORT_USER_MAX);
|
|
expect(process.env.IMPORT_USER_WINDOW).toEqual(initialEnv.IMPORT_USER_WINDOW);
|
|
});
|
|
|
|
it('should correctly set IMPORT environment variables based on rate limits', async () => {
|
|
// Define and mock a custom configuration with rate limits
|
|
const importLimitsConfig = {
|
|
rateLimits: {
|
|
conversationsImport: {
|
|
ipMax: '150',
|
|
ipWindowInMinutes: '60',
|
|
userMax: '50',
|
|
userWindowInMinutes: '30',
|
|
},
|
|
},
|
|
};
|
|
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve(importLimitsConfig),
|
|
);
|
|
|
|
await AppService(app);
|
|
|
|
// Verify that process.env has been updated according to the rate limits config
|
|
expect(process.env.IMPORT_IP_MAX).toEqual('150');
|
|
expect(process.env.IMPORT_IP_WINDOW).toEqual('60');
|
|
expect(process.env.IMPORT_USER_MAX).toEqual('50');
|
|
expect(process.env.IMPORT_USER_WINDOW).toEqual('30');
|
|
});
|
|
|
|
it('should fallback to default IMPORT environment variables when rate limits are unspecified', async () => {
|
|
// Setup initial environment variables to non-default values
|
|
process.env.IMPORT_IP_MAX = 'initialMax';
|
|
process.env.IMPORT_IP_WINDOW = 'initialWindow';
|
|
process.env.IMPORT_USER_MAX = 'initialUserMax';
|
|
process.env.IMPORT_USER_WINDOW = 'initialUserWindow';
|
|
|
|
await AppService(app);
|
|
|
|
// Verify that process.env falls back to the initial values
|
|
expect(process.env.IMPORT_IP_MAX).toEqual('initialMax');
|
|
expect(process.env.IMPORT_IP_WINDOW).toEqual('initialWindow');
|
|
expect(process.env.IMPORT_USER_MAX).toEqual('initialUserMax');
|
|
expect(process.env.IMPORT_USER_WINDOW).toEqual('initialUserWindow');
|
|
});
|
|
|
|
it('should correctly configure endpoint with titlePrompt, titleMethod, and titlePromptTemplate', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
endpoints: {
|
|
[EModelEndpoint.openAI]: {
|
|
titleConvo: true,
|
|
titleModel: 'gpt-3.5-turbo',
|
|
titleMethod: 'structured',
|
|
titlePrompt: 'Custom title prompt for conversation',
|
|
titlePromptTemplate: 'Summarize this conversation: {{conversation}}',
|
|
},
|
|
[EModelEndpoint.assistants]: {
|
|
titleMethod: 'functions',
|
|
titlePrompt: 'Generate a title for this assistant conversation',
|
|
titlePromptTemplate: 'Assistant conversation template: {{messages}}',
|
|
},
|
|
[EModelEndpoint.azureOpenAI]: {
|
|
groups: azureGroups,
|
|
titleConvo: true,
|
|
titleMethod: 'completion',
|
|
titleModel: 'gpt-4',
|
|
titlePrompt: 'Azure title prompt',
|
|
titlePromptTemplate: 'Azure conversation: {{context}}',
|
|
},
|
|
},
|
|
}),
|
|
);
|
|
|
|
await AppService(app);
|
|
|
|
// Check OpenAI endpoint configuration
|
|
expect(app.locals).toHaveProperty(EModelEndpoint.openAI);
|
|
expect(app.locals[EModelEndpoint.openAI]).toEqual(
|
|
expect.objectContaining({
|
|
titleConvo: true,
|
|
titleModel: 'gpt-3.5-turbo',
|
|
titleMethod: 'structured',
|
|
titlePrompt: 'Custom title prompt for conversation',
|
|
titlePromptTemplate: 'Summarize this conversation: {{conversation}}',
|
|
}),
|
|
);
|
|
|
|
// Check Assistants endpoint configuration
|
|
expect(app.locals).toHaveProperty(EModelEndpoint.assistants);
|
|
expect(app.locals[EModelEndpoint.assistants]).toMatchObject({
|
|
titleMethod: 'functions',
|
|
titlePrompt: 'Generate a title for this assistant conversation',
|
|
titlePromptTemplate: 'Assistant conversation template: {{messages}}',
|
|
});
|
|
|
|
// Check Azure OpenAI endpoint configuration
|
|
expect(app.locals).toHaveProperty(EModelEndpoint.azureOpenAI);
|
|
expect(app.locals[EModelEndpoint.azureOpenAI]).toEqual(
|
|
expect.objectContaining({
|
|
titleConvo: true,
|
|
titleMethod: 'completion',
|
|
titleModel: 'gpt-4',
|
|
titlePrompt: 'Azure title prompt',
|
|
titlePromptTemplate: 'Azure conversation: {{context}}',
|
|
}),
|
|
);
|
|
});
|
|
|
|
it('should configure Agent endpoint with title generation settings', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
endpoints: {
|
|
[EModelEndpoint.agents]: {
|
|
disableBuilder: false,
|
|
titleConvo: true,
|
|
titleModel: 'gpt-4',
|
|
titleMethod: 'structured',
|
|
titlePrompt: 'Generate a descriptive title for this agent conversation',
|
|
titlePromptTemplate: 'Agent conversation summary: {{content}}',
|
|
recursionLimit: 15,
|
|
capabilities: [AgentCapabilities.tools, AgentCapabilities.actions],
|
|
},
|
|
},
|
|
}),
|
|
);
|
|
|
|
await AppService(app);
|
|
|
|
expect(app.locals).toHaveProperty(EModelEndpoint.agents);
|
|
expect(app.locals[EModelEndpoint.agents]).toMatchObject({
|
|
disableBuilder: false,
|
|
titleConvo: true,
|
|
titleModel: 'gpt-4',
|
|
titleMethod: 'structured',
|
|
titlePrompt: 'Generate a descriptive title for this agent conversation',
|
|
titlePromptTemplate: 'Agent conversation summary: {{content}}',
|
|
recursionLimit: 15,
|
|
capabilities: expect.arrayContaining([AgentCapabilities.tools, AgentCapabilities.actions]),
|
|
});
|
|
});
|
|
|
|
it('should handle missing title configuration options with defaults', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
endpoints: {
|
|
[EModelEndpoint.openAI]: {
|
|
titleConvo: true,
|
|
// titlePrompt and titlePromptTemplate are not provided
|
|
},
|
|
},
|
|
}),
|
|
);
|
|
|
|
await AppService(app);
|
|
|
|
expect(app.locals).toHaveProperty(EModelEndpoint.openAI);
|
|
expect(app.locals[EModelEndpoint.openAI]).toMatchObject({
|
|
titleConvo: true,
|
|
});
|
|
// Check that the optional fields are undefined when not provided
|
|
expect(app.locals[EModelEndpoint.openAI].titlePrompt).toBeUndefined();
|
|
expect(app.locals[EModelEndpoint.openAI].titlePromptTemplate).toBeUndefined();
|
|
expect(app.locals[EModelEndpoint.openAI].titleMethod).toBeUndefined();
|
|
});
|
|
|
|
it('should correctly configure titleEndpoint when specified', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
endpoints: {
|
|
[EModelEndpoint.openAI]: {
|
|
titleConvo: true,
|
|
titleModel: 'gpt-3.5-turbo',
|
|
titleEndpoint: EModelEndpoint.anthropic,
|
|
titlePrompt: 'Generate a concise title',
|
|
},
|
|
[EModelEndpoint.agents]: {
|
|
titleEndpoint: 'custom-provider',
|
|
titleMethod: 'structured',
|
|
},
|
|
},
|
|
}),
|
|
);
|
|
|
|
await AppService(app);
|
|
|
|
// Check OpenAI endpoint has titleEndpoint
|
|
expect(app.locals).toHaveProperty(EModelEndpoint.openAI);
|
|
expect(app.locals[EModelEndpoint.openAI]).toMatchObject({
|
|
titleConvo: true,
|
|
titleModel: 'gpt-3.5-turbo',
|
|
titleEndpoint: EModelEndpoint.anthropic,
|
|
titlePrompt: 'Generate a concise title',
|
|
});
|
|
|
|
// Check Agents endpoint has titleEndpoint
|
|
expect(app.locals).toHaveProperty(EModelEndpoint.agents);
|
|
expect(app.locals[EModelEndpoint.agents]).toMatchObject({
|
|
titleEndpoint: 'custom-provider',
|
|
titleMethod: 'structured',
|
|
});
|
|
});
|
|
|
|
it('should correctly configure all endpoint when specified', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
endpoints: {
|
|
all: {
|
|
titleConvo: true,
|
|
titleModel: 'gpt-4o-mini',
|
|
titleMethod: 'structured',
|
|
titlePrompt: 'Default title prompt for all endpoints',
|
|
titlePromptTemplate: 'Default template: {{conversation}}',
|
|
titleEndpoint: EModelEndpoint.anthropic,
|
|
streamRate: 50,
|
|
},
|
|
[EModelEndpoint.openAI]: {
|
|
titleConvo: true,
|
|
titleModel: 'gpt-3.5-turbo',
|
|
},
|
|
},
|
|
}),
|
|
);
|
|
|
|
await AppService(app);
|
|
|
|
// Check that 'all' endpoint config is loaded
|
|
expect(app.locals).toHaveProperty('all');
|
|
expect(app.locals.all).toMatchObject({
|
|
titleConvo: true,
|
|
titleModel: 'gpt-4o-mini',
|
|
titleMethod: 'structured',
|
|
titlePrompt: 'Default title prompt for all endpoints',
|
|
titlePromptTemplate: 'Default template: {{conversation}}',
|
|
titleEndpoint: EModelEndpoint.anthropic,
|
|
streamRate: 50,
|
|
});
|
|
|
|
// Check that OpenAI endpoint has its own config
|
|
expect(app.locals).toHaveProperty(EModelEndpoint.openAI);
|
|
expect(app.locals[EModelEndpoint.openAI]).toMatchObject({
|
|
titleConvo: true,
|
|
titleModel: 'gpt-3.5-turbo',
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('AppService updating app.locals and issuing warnings', () => {
|
|
let app;
|
|
let initialEnv;
|
|
|
|
beforeEach(() => {
|
|
// Store initial environment variables to restore them after each test
|
|
initialEnv = { ...process.env };
|
|
|
|
app = { locals: {} };
|
|
process.env.CDN_PROVIDER = undefined;
|
|
});
|
|
|
|
afterEach(() => {
|
|
// Restore initial environment variables
|
|
process.env = { ...initialEnv };
|
|
});
|
|
|
|
it('should update app.locals with default values if loadCustomConfig returns undefined', async () => {
|
|
// Mock loadCustomConfig to return undefined
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() => Promise.resolve(undefined));
|
|
|
|
await AppService(app);
|
|
|
|
expect(app.locals).toBeDefined();
|
|
expect(app.locals.paths).toBeDefined();
|
|
expect(app.locals.fileStrategy).toEqual(FileSources.local);
|
|
expect(app.locals.socialLogins).toEqual(defaultSocialLogins);
|
|
expect(app.locals.balance).toEqual(
|
|
expect.objectContaining({
|
|
enabled: false,
|
|
startBalance: undefined,
|
|
}),
|
|
);
|
|
});
|
|
|
|
it('should update app.locals with values from loadCustomConfig', async () => {
|
|
// Mock loadCustomConfig to return a specific config object with a complete balance config
|
|
const customConfig = {
|
|
fileStrategy: 'firebase',
|
|
registration: { socialLogins: ['testLogin'] },
|
|
balance: {
|
|
enabled: false,
|
|
startBalance: 5000,
|
|
autoRefillEnabled: true,
|
|
refillIntervalValue: 15,
|
|
refillIntervalUnit: 'hours',
|
|
refillAmount: 5000,
|
|
},
|
|
};
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve(customConfig),
|
|
);
|
|
|
|
await AppService(app);
|
|
|
|
expect(app.locals).toBeDefined();
|
|
expect(app.locals.paths).toBeDefined();
|
|
expect(app.locals.fileStrategy).toEqual(customConfig.fileStrategy);
|
|
expect(app.locals.socialLogins).toEqual(customConfig.registration.socialLogins);
|
|
expect(app.locals.balance).toEqual(customConfig.balance);
|
|
});
|
|
|
|
it('should apply the assistants endpoint configuration correctly to app.locals', async () => {
|
|
const mockConfig = {
|
|
endpoints: {
|
|
assistants: {
|
|
disableBuilder: true,
|
|
pollIntervalMs: 5000,
|
|
timeoutMs: 30000,
|
|
supportedIds: ['id1', 'id2'],
|
|
},
|
|
},
|
|
};
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() => Promise.resolve(mockConfig));
|
|
|
|
const app = { locals: {} };
|
|
await AppService(app);
|
|
|
|
expect(app.locals).toHaveProperty('assistants');
|
|
const { assistants } = app.locals;
|
|
expect(assistants.disableBuilder).toBe(true);
|
|
expect(assistants.pollIntervalMs).toBe(5000);
|
|
expect(assistants.timeoutMs).toBe(30000);
|
|
expect(assistants.supportedIds).toEqual(['id1', 'id2']);
|
|
expect(assistants.excludedIds).toBeUndefined();
|
|
});
|
|
|
|
it('should log a warning when both supportedIds and excludedIds are provided', async () => {
|
|
const mockConfig = {
|
|
endpoints: {
|
|
assistants: {
|
|
disableBuilder: false,
|
|
pollIntervalMs: 3000,
|
|
timeoutMs: 20000,
|
|
supportedIds: ['id1', 'id2'],
|
|
excludedIds: ['id3'],
|
|
},
|
|
},
|
|
};
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() => Promise.resolve(mockConfig));
|
|
|
|
const app = { locals: {} };
|
|
await require('./AppService')(app);
|
|
|
|
const { logger } = require('~/config');
|
|
expect(logger.warn).toHaveBeenCalledWith(
|
|
expect.stringContaining(
|
|
"The 'assistants' endpoint has both 'supportedIds' and 'excludedIds' defined.",
|
|
),
|
|
);
|
|
});
|
|
|
|
it('should log a warning when privateAssistants and supportedIds or excludedIds are provided', async () => {
|
|
const mockConfig = {
|
|
endpoints: {
|
|
assistants: {
|
|
privateAssistants: true,
|
|
supportedIds: ['id1'],
|
|
},
|
|
},
|
|
};
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() => Promise.resolve(mockConfig));
|
|
|
|
const app = { locals: {} };
|
|
await require('./AppService')(app);
|
|
|
|
const { logger } = require('~/config');
|
|
expect(logger.warn).toHaveBeenCalledWith(
|
|
expect.stringContaining(
|
|
"The 'assistants' endpoint has both 'privateAssistants' and 'supportedIds' or 'excludedIds' defined.",
|
|
),
|
|
);
|
|
});
|
|
|
|
it('should issue expected warnings when loading Azure Groups with deprecated Environment Variables', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
endpoints: {
|
|
[EModelEndpoint.azureOpenAI]: {
|
|
groups: azureGroups,
|
|
},
|
|
},
|
|
}),
|
|
);
|
|
|
|
deprecatedAzureVariables.forEach((varInfo) => {
|
|
process.env[varInfo.key] = 'test';
|
|
});
|
|
|
|
const app = { locals: {} };
|
|
await require('./AppService')(app);
|
|
|
|
const { logger } = require('~/config');
|
|
deprecatedAzureVariables.forEach(({ key, description }) => {
|
|
expect(logger.warn).toHaveBeenCalledWith(
|
|
`The \`${key}\` environment variable (related to ${description}) should not be used in combination with the \`azureOpenAI\` endpoint configuration, as you will experience conflicts and errors.`,
|
|
);
|
|
});
|
|
});
|
|
|
|
it('should issue expected warnings when loading conflicting Azure Envrionment Variables', async () => {
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve({
|
|
endpoints: {
|
|
[EModelEndpoint.azureOpenAI]: {
|
|
groups: azureGroups,
|
|
},
|
|
},
|
|
}),
|
|
);
|
|
|
|
conflictingAzureVariables.forEach((varInfo) => {
|
|
process.env[varInfo.key] = 'test';
|
|
});
|
|
|
|
const app = { locals: {} };
|
|
await require('./AppService')(app);
|
|
|
|
const { logger } = require('~/config');
|
|
conflictingAzureVariables.forEach(({ key }) => {
|
|
expect(logger.warn).toHaveBeenCalledWith(
|
|
`The \`${key}\` environment variable should not be used in combination with the \`azureOpenAI\` endpoint configuration, as you may experience with the defined placeholders for mapping to the current model grouping using the same name.`,
|
|
);
|
|
});
|
|
});
|
|
|
|
it('should not parse environment variable references in OCR config', async () => {
|
|
// Mock custom configuration with env variable references in OCR config
|
|
const mockConfig = {
|
|
ocr: {
|
|
apiKey: '${OCR_API_KEY_CUSTOM_VAR_NAME}',
|
|
baseURL: '${OCR_BASEURL_CUSTOM_VAR_NAME}',
|
|
strategy: 'mistral_ocr',
|
|
mistralModel: 'mistral-medium',
|
|
},
|
|
};
|
|
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() => Promise.resolve(mockConfig));
|
|
|
|
// Set actual environment variables with different values
|
|
process.env.OCR_API_KEY_CUSTOM_VAR_NAME = 'actual-api-key';
|
|
process.env.OCR_BASEURL_CUSTOM_VAR_NAME = 'https://actual-ocr-url.com';
|
|
|
|
// Initialize app
|
|
const app = { locals: {} };
|
|
await AppService(app);
|
|
|
|
// Verify that the raw string references were preserved and not interpolated
|
|
expect(app.locals.ocr).toBeDefined();
|
|
expect(app.locals.ocr.apiKey).toEqual('${OCR_API_KEY_CUSTOM_VAR_NAME}');
|
|
expect(app.locals.ocr.baseURL).toEqual('${OCR_BASEURL_CUSTOM_VAR_NAME}');
|
|
expect(app.locals.ocr.strategy).toEqual('mistral_ocr');
|
|
expect(app.locals.ocr.mistralModel).toEqual('mistral-medium');
|
|
});
|
|
});
|