mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-02 00:28:51 +01:00
* WIP: first pass ModelSpecs * refactor(onSelectEndpoint): use `getConvoSwitchLogic` * feat: introduce iconURL, greeting, frontend fields for conversations/presets/messages * feat: conversation.iconURL & greeting in Landing * feat: conversation.iconURL & greeting in New Chat button * feat: message.iconURL * refactor: ConversationIcon -> ConvoIconURL * WIP: add spec as a conversation field * refactor: useAppStartup, set spec on initial load for new chat, allow undefined spec, add localStorage keys enum, additional type fields for spec * feat: handle `showIconInMenu`, `showIconInHeader`, undefined `iconURL` and no specs on initial load * chore: handle undefined or empty modelSpecs * WIP: first pass, modelSpec schema for custom config * refactor: move default filtered tools definition to ToolService * feat: pass modelSpecs from backend via startupConfig * refactor: modelSpecs config, return and define list * fix: react error and include iconURL in responseMessage * refactor: add iconURL to responseMessage only * refactor: getIconEndpoint * refactor: pass TSpecsConfig * fix(assistants): differentiate compactAssistantSchema, correctly resets shared conversation state with other endpoints * refactor: assistant id prefix localStorage key * refactor: add more LocalStorageKeys and replace hardcoded values * feat: prioritize spec on new chat behavior: last selected modelSpec behavior (localStorage) * feat: first pass, interface config * chore: WIP, todo: add warnings based on config.modelSpecs settings. * feat: enforce modelSpecs if configured * feat: show config file yaml errors * chore: delete unused legacy Plugins component * refactor: set tools to localStorage from recoil store * chore: add stable recoil setter to useEffect deps * refactor: save tools to conversation documents * style(MultiSelectPop): dynamic height, remove unused import * refactor(react-query): use localstorage keys and pass config to useAvailablePluginsQuery * feat(utils): add mapPlugins * refactor(Convo): use conversation.tools if defined, lastSelectedTools if not * refactor: remove unused legacy code using `useSetOptions`, remove conditional flag `isMultiChat` for using legacy settings * refactor(PluginStoreDialog): add exhaustive-deps which are stable react state setters * fix(HeaderOptions): pass `popover` as true * refactor(useSetStorage): use project enums * refactor: use LocalStorageKeys enum * fix: prevent setConversation from setting falsy values in lastSelectedTools * refactor: use map for availableTools state and available Plugins query * refactor(updateLastSelectedModel): organize logic better and add note on purpose * fix(setAgentOption): prevent reseting last model to secondary model for gptPlugins * refactor(buildDefaultConvo): use enum * refactor: remove `useSetStorage` and consolidate areas where conversation state is saved to localStorage * fix: conversations retain tools on refresh * fix(gptPlugins): prevent nullish tools from being saved * chore: delete useServerStream * refactor: move initial plugins logic to useAppStartup * refactor(MultiSelectDropDown): add more pass-in className props * feat: use tools in presets * chore: delete unused usePresetOptions * refactor: new agentOptions default handling * chore: note * feat: add label and custom instructions to agents * chore: remove 'disabled with tools' message * style: move plugins to 2nd column in parameters * fix: TPreset type for agentOptions * fix: interface controls * refactor: add interfaceConfig, use Separator within Switcher * refactor: hide Assistants panel if interface.parameters are disabled * fix(Header): only modelSpecs if list is greater than 0 * refactor: separate MessageIcon logic from useMessageHelpers for better react rule-following * fix(AppService): don't use reserved keyword 'interface' * feat: set existing Icon for custom endpoints through iconURL * fix(ci): tests passing for App Service * docs: refactor custom_config.md for readability and better organization, also include missing values * docs: interface section and re-organize docs * docs: update modelSpecs info * chore: remove unused files * chore: remove unused files * chore: move useSetIndexOptions * chore: remove unused file * chore: move useConversation(s) * chore: move useDefaultConvo * chore: move useNavigateToConvo * refactor: use plugin install hook so it can be used elsewhere * chore: import order * update docs * refactor(OpenAI/Plugins): allow modelLabel as an initial value for chatGptLabel * chore: remove unused EndpointOptionsPopover and hide 'Save as Preset' button if preset UI visibility disabled * feat(loadDefaultInterface): issue warnings based on values * feat: changelog for custom config file * docs: add additional changelog note * fix: prevent unavailable tool selection from preset and update availableTools on Plugin installations * feat: add `filteredTools` option in custom config * chore: changelog * fix(MessageIcon): always overwrite conversation.iconURL in messageSettings * fix(ModelSpecsMenu): icon edge cases * fix(NewChat): dynamic icon * fix(PluginsClient): always include endpoint in responseMessage * fix: always include endpoint and iconURL in responseMessage across different response methods * feat: interchangeable keys for modelSpec enforcing
500 lines
16 KiB
JavaScript
500 lines
16 KiB
JavaScript
const {
|
|
FileSources,
|
|
EModelEndpoint,
|
|
EImageOutputType,
|
|
defaultSocialLogins,
|
|
validateAzureGroups,
|
|
deprecatedAzureVariables,
|
|
conflictingAzureVariables,
|
|
} = require('librechat-data-provider');
|
|
|
|
const AppService = require('./AppService');
|
|
|
|
jest.mock('./Config/loadCustomConfig', () => {
|
|
return jest.fn(() =>
|
|
Promise.resolve({
|
|
registration: { socialLogins: ['testLogin'] },
|
|
fileStrategy: 'testStrategy',
|
|
}),
|
|
);
|
|
});
|
|
jest.mock('./Files/Firebase/initialize', () => ({
|
|
initializeFirebase: jest.fn(),
|
|
}));
|
|
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'],
|
|
},
|
|
},
|
|
},
|
|
}),
|
|
}));
|
|
|
|
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;
|
|
|
|
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({
|
|
privacyPolicy: undefined,
|
|
termsOfService: undefined,
|
|
endpointsMenu: true,
|
|
modelSelect: true,
|
|
parameters: true,
|
|
sidePanel: true,
|
|
presets: true,
|
|
}),
|
|
modelSpecs: undefined,
|
|
availableTools: {
|
|
ExampleTool: {
|
|
type: 'function',
|
|
function: expect.objectContaining({
|
|
description: 'Example tool function',
|
|
name: 'exampleFunction',
|
|
parameters: expect.objectContaining({
|
|
type: 'object',
|
|
properties: expect.any(Object),
|
|
required: expect.arrayContaining(['param1']),
|
|
}),
|
|
}),
|
|
},
|
|
},
|
|
paths: expect.anything(),
|
|
imageOutputType: expect.any(String),
|
|
fileConfig: undefined,
|
|
secureImageLinks: undefined,
|
|
});
|
|
});
|
|
|
|
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');
|
|
await AppService(app);
|
|
|
|
expect(loadAndFormatTools).toHaveBeenCalledWith({
|
|
directory: expect.anything(),
|
|
});
|
|
|
|
expect(app.locals.availableTools.ExampleTool).toBeDefined();
|
|
expect(app.locals.availableTools.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'],
|
|
},
|
|
},
|
|
}),
|
|
);
|
|
|
|
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']),
|
|
}),
|
|
);
|
|
});
|
|
|
|
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.assistants);
|
|
expect(app.locals[EModelEndpoint.assistants].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';
|
|
|
|
// Mock a custom configuration without specific rate limits
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() => Promise.resolve({}));
|
|
|
|
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');
|
|
});
|
|
});
|
|
|
|
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.availableTools).toBeDefined();
|
|
expect(app.locals.fileStrategy).toEqual(FileSources.local);
|
|
expect(app.locals.socialLogins).toEqual(defaultSocialLogins);
|
|
});
|
|
|
|
it('should update app.locals with values from loadCustomConfig', async () => {
|
|
// Mock loadCustomConfig to return a specific config object
|
|
const customConfig = {
|
|
fileStrategy: 'firebase',
|
|
registration: { socialLogins: ['testLogin'] },
|
|
};
|
|
require('./Config/loadCustomConfig').mockImplementationOnce(() =>
|
|
Promise.resolve(customConfig),
|
|
);
|
|
|
|
await AppService(app);
|
|
|
|
expect(app.locals).toBeDefined();
|
|
expect(app.locals.paths).toBeDefined();
|
|
expect(app.locals.availableTools).toBeDefined();
|
|
expect(app.locals.fileStrategy).toEqual(customConfig.fileStrategy);
|
|
expect(app.locals.socialLogins).toEqual(customConfig.registration.socialLogins);
|
|
});
|
|
|
|
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('Both `supportedIds` and `excludedIds` are 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.`,
|
|
);
|
|
});
|
|
});
|
|
});
|