mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 00:40:14 +01:00
* WIP: app.locals refactoring
WIP: appConfig
fix: update memory configuration retrieval to use getAppConfig based on user role
fix: update comment for AppConfig interface to clarify purpose
🏷️ refactor: Update tests to use getAppConfig for endpoint configurations
ci: Update AppService tests to initialize app config instead of app.locals
ci: Integrate getAppConfig into remaining tests
refactor: Update multer storage destination to use promise-based getAppConfig and improve error handling in tests
refactor: Rename initializeAppConfig to setAppConfig and update related tests
ci: Mock getAppConfig in various tests to provide default configurations
refactor: Update convertMCPToolsToPlugins to use mcpManager for server configuration and adjust related tests
chore: rename `Config/getAppConfig` -> `Config/app`
fix: streamline OpenAI image tools configuration by removing direct appConfig dependency and using function parameters
chore: correct parameter documentation for imageOutputType in ToolService.js
refactor: remove `getCustomConfig` dependency in config route
refactor: update domain validation to use appConfig for allowed domains
refactor: use appConfig registration property
chore: remove app parameter from AppService invocation
refactor: update AppConfig interface to correct registration and turnstile configurations
refactor: remove getCustomConfig dependency and use getAppConfig in PluginController, multer, and MCP services
refactor: replace getCustomConfig with getAppConfig in STTService, TTSService, and related files
refactor: replace getCustomConfig with getAppConfig in Conversation and Message models, update tempChatRetention functions to use AppConfig type
refactor: update getAppConfig calls in Conversation and Message models to include user role for temporary chat expiration
ci: update related tests
refactor: update getAppConfig call in getCustomConfigSpeech to include user role
fix: update appConfig usage to access allowedDomains from actions instead of registration
refactor: enhance AppConfig to include fileStrategies and update related file strategy logic
refactor: update imports to use normalizeEndpointName from @librechat/api and remove redundant definitions
chore: remove deprecated unused RunManager
refactor: get balance config primarily from appConfig
refactor: remove customConfig dependency for appConfig and streamline loadConfigModels logic
refactor: remove getCustomConfig usage and use app config in file citations
refactor: consolidate endpoint loading logic into loadEndpoints function
refactor: update appConfig access to use endpoints structure across various services
refactor: implement custom endpoints configuration and streamline endpoint loading logic
refactor: update getAppConfig call to include user role parameter
refactor: streamline endpoint configuration and enhance appConfig usage across services
refactor: replace getMCPAuthMap with getUserMCPAuthMap and remove unused getCustomConfig file
refactor: add type annotation for loadedEndpoints in loadEndpoints function
refactor: move /services/Files/images/parse to TS API
chore: add missing FILE_CITATIONS permission to IRole interface
refactor: restructure toolkits to TS API
refactor: separate manifest logic into its own module
refactor: consolidate tool loading logic into a new tools module for startup logic
refactor: move interface config logic to TS API
refactor: migrate checkEmailConfig to TypeScript and update imports
refactor: add FunctionTool interface and availableTools to AppConfig
refactor: decouple caching and DB operations from AppService, make part of consolidated `getAppConfig`
WIP: fix tests
* fix: rebase conflicts
* refactor: remove app.locals references
* refactor: replace getBalanceConfig with getAppConfig in various strategies and middleware
* refactor: replace appConfig?.balance with getBalanceConfig in various controllers and clients
* test: add balance configuration to titleConvo method in AgentClient tests
* chore: remove unused `openai-chat-tokens` package
* chore: remove unused imports in initializeMCPs.js
* refactor: update balance configuration to use getAppConfig instead of getBalanceConfig
* refactor: integrate configMiddleware for centralized configuration handling
* refactor: optimize email domain validation by removing unnecessary async calls
* refactor: simplify multer storage configuration by removing async calls
* refactor: reorder imports for better readability in user.js
* refactor: replace getAppConfig calls with req.config for improved performance
* chore: replace getAppConfig calls with req.config in tests for centralized configuration handling
* chore: remove unused override config
* refactor: add configMiddleware to endpoint route and replace getAppConfig with req.config
* chore: remove customConfig parameter from TTSService constructor
* refactor: pass appConfig from request to processFileCitations for improved configuration handling
* refactor: remove configMiddleware from endpoint route and retrieve appConfig directly in getEndpointsConfig if not in `req.config`
* test: add mockAppConfig to processFileCitations tests for improved configuration handling
* fix: pass req.config to hasCustomUserVars and call without await after synchronous refactor
* fix: type safety in useExportConversation
* refactor: retrieve appConfig using getAppConfig in PluginController and remove configMiddleware from plugins route, to avoid always retrieving when plugins are cached
* chore: change `MongoUser` typedef to `IUser`
* fix: Add `user` and `config` fields to ServerRequest and update JSDoc type annotations from Express.Request to ServerRequest
* fix: remove unused setAppConfig mock from Server configuration tests
431 lines
13 KiB
JavaScript
431 lines
13 KiB
JavaScript
jest.mock('~/cache/getLogStores', () => ({
|
|
getLogStores: jest.fn().mockReturnValue({
|
|
get: jest.fn().mockResolvedValue({
|
|
openAI: { apiKey: 'test-key' },
|
|
}),
|
|
set: jest.fn(),
|
|
delete: jest.fn(),
|
|
}),
|
|
}));
|
|
|
|
const { EModelEndpoint, ErrorTypes, validateAzureGroups } = require('librechat-data-provider');
|
|
const { getUserKey, getUserKeyValues } = require('~/server/services/UserService');
|
|
const initializeClient = require('./initialize');
|
|
const { OpenAIClient } = require('~/app');
|
|
|
|
// Mock getUserKey since it's the only function we want to mock
|
|
jest.mock('~/server/services/UserService', () => ({
|
|
getUserKey: jest.fn(),
|
|
getUserKeyValues: jest.fn(),
|
|
checkUserKeyExpiry: jest.requireActual('~/server/services/UserService').checkUserKeyExpiry,
|
|
}));
|
|
|
|
const mockAppConfig = {
|
|
endpoints: {
|
|
openAI: {
|
|
apiKey: 'test-key',
|
|
},
|
|
azureOpenAI: {
|
|
apiKey: 'test-azure-key',
|
|
modelNames: ['gpt-4-vision-preview', 'gpt-3.5-turbo', 'gpt-4'],
|
|
modelGroupMap: {
|
|
'gpt-4-vision-preview': {
|
|
group: 'librechat-westus',
|
|
deploymentName: 'gpt-4-vision-preview',
|
|
version: '2024-02-15-preview',
|
|
},
|
|
},
|
|
groupMap: {
|
|
'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',
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
};
|
|
|
|
describe('initializeClient', () => {
|
|
// Set up environment variables
|
|
const originalEnvironment = process.env;
|
|
const app = {
|
|
locals: {},
|
|
};
|
|
|
|
const validAzureConfigs = [
|
|
{
|
|
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,
|
|
},
|
|
baseURL: 'https://eastus.example.com',
|
|
additionalHeaders: {
|
|
'x-api-key': 'x-api-key-value',
|
|
},
|
|
},
|
|
{
|
|
group: 'mistral-inference',
|
|
apiKey: 'AZURE_MISTRAL_API_KEY',
|
|
baseURL:
|
|
'https://Mistral-large-vnpet-serverless.region.inference.ai.azure.com/v1/chat/completions',
|
|
serverless: true,
|
|
models: {
|
|
'mistral-large': true,
|
|
},
|
|
},
|
|
{
|
|
group: 'llama-70b-chat',
|
|
apiKey: 'AZURE_LLAMA2_70B_API_KEY',
|
|
baseURL:
|
|
'https://Llama-2-70b-chat-qmvyb-serverless.region.inference.ai.azure.com/v1/chat/completions',
|
|
serverless: true,
|
|
models: {
|
|
'llama-70b-chat': true,
|
|
},
|
|
},
|
|
];
|
|
|
|
const { modelNames } = validateAzureGroups(validAzureConfigs);
|
|
|
|
beforeEach(() => {
|
|
jest.resetModules(); // Clears the cache
|
|
process.env = { ...originalEnvironment }; // Make a copy
|
|
});
|
|
|
|
afterAll(() => {
|
|
process.env = originalEnvironment; // Restore original env vars
|
|
});
|
|
|
|
test('should initialize client with OpenAI API key and default options', async () => {
|
|
process.env.OPENAI_API_KEY = 'test-openai-api-key';
|
|
process.env.DEBUG_OPENAI = 'false';
|
|
process.env.OPENAI_SUMMARIZE = 'false';
|
|
|
|
const req = {
|
|
body: { key: null, endpoint: EModelEndpoint.openAI },
|
|
user: { id: '123' },
|
|
app,
|
|
config: mockAppConfig,
|
|
};
|
|
const res = {};
|
|
const endpointOption = {};
|
|
|
|
const result = await initializeClient({ req, res, endpointOption });
|
|
|
|
expect(result.openAIApiKey).toBe('test-openai-api-key');
|
|
expect(result.client).toBeInstanceOf(OpenAIClient);
|
|
});
|
|
|
|
test('should initialize client with Azure credentials when endpoint is azureOpenAI', async () => {
|
|
process.env.AZURE_API_KEY = 'test-azure-api-key';
|
|
(process.env.AZURE_OPENAI_API_INSTANCE_NAME = 'some-value'),
|
|
(process.env.AZURE_OPENAI_API_DEPLOYMENT_NAME = 'some-value'),
|
|
(process.env.AZURE_OPENAI_API_VERSION = 'some-value'),
|
|
(process.env.AZURE_OPENAI_API_COMPLETIONS_DEPLOYMENT_NAME = 'some-value'),
|
|
(process.env.AZURE_OPENAI_API_EMBEDDINGS_DEPLOYMENT_NAME = 'some-value'),
|
|
(process.env.OPENAI_API_KEY = 'test-openai-api-key');
|
|
process.env.DEBUG_OPENAI = 'false';
|
|
process.env.OPENAI_SUMMARIZE = 'false';
|
|
|
|
const req = {
|
|
body: {
|
|
key: null,
|
|
endpoint: 'azureOpenAI',
|
|
model: 'gpt-4-vision-preview',
|
|
},
|
|
user: { id: '123' },
|
|
app,
|
|
config: mockAppConfig,
|
|
};
|
|
const res = {};
|
|
const endpointOption = {};
|
|
|
|
const client = await initializeClient({ req, res, endpointOption });
|
|
|
|
expect(client.openAIApiKey).toBe('WESTUS_API_KEY');
|
|
expect(client.client).toBeInstanceOf(OpenAIClient);
|
|
});
|
|
|
|
test('should use the debug option when DEBUG_OPENAI is enabled', async () => {
|
|
process.env.OPENAI_API_KEY = 'test-openai-api-key';
|
|
process.env.DEBUG_OPENAI = 'true';
|
|
|
|
const req = {
|
|
body: { key: null, endpoint: EModelEndpoint.openAI },
|
|
user: { id: '123' },
|
|
app,
|
|
config: mockAppConfig,
|
|
};
|
|
const res = {};
|
|
const endpointOption = {};
|
|
|
|
const client = await initializeClient({ req, res, endpointOption });
|
|
|
|
expect(client.client.options.debug).toBe(true);
|
|
});
|
|
|
|
test('should set contextStrategy to summarize when OPENAI_SUMMARIZE is enabled', async () => {
|
|
process.env.OPENAI_API_KEY = 'test-openai-api-key';
|
|
process.env.OPENAI_SUMMARIZE = 'true';
|
|
|
|
const req = {
|
|
body: { key: null, endpoint: EModelEndpoint.openAI },
|
|
user: { id: '123' },
|
|
app,
|
|
config: mockAppConfig,
|
|
};
|
|
const res = {};
|
|
const endpointOption = {};
|
|
|
|
const client = await initializeClient({ req, res, endpointOption });
|
|
|
|
expect(client.client.options.contextStrategy).toBe('summarize');
|
|
});
|
|
|
|
test('should set reverseProxyUrl and proxy when they are provided in the environment', async () => {
|
|
process.env.OPENAI_API_KEY = 'test-openai-api-key';
|
|
process.env.OPENAI_REVERSE_PROXY = 'http://reverse.proxy';
|
|
process.env.PROXY = 'http://proxy';
|
|
|
|
const req = {
|
|
body: { key: null, endpoint: EModelEndpoint.openAI },
|
|
user: { id: '123' },
|
|
app,
|
|
config: mockAppConfig,
|
|
};
|
|
const res = {};
|
|
const endpointOption = {};
|
|
|
|
const client = await initializeClient({ req, res, endpointOption });
|
|
|
|
expect(client.client.options.reverseProxyUrl).toBe('http://reverse.proxy');
|
|
expect(client.client.options.proxy).toBe('http://proxy');
|
|
});
|
|
|
|
test('should throw an error if the user-provided key has expired', async () => {
|
|
process.env.OPENAI_API_KEY = 'user_provided';
|
|
process.env.AZURE_API_KEY = 'user_provided';
|
|
process.env.DEBUG_OPENAI = 'false';
|
|
process.env.OPENAI_SUMMARIZE = 'false';
|
|
|
|
const expiresAt = new Date(Date.now() - 10000).toISOString(); // Expired
|
|
const req = {
|
|
body: { key: expiresAt, endpoint: EModelEndpoint.openAI },
|
|
user: { id: '123' },
|
|
app,
|
|
config: mockAppConfig,
|
|
};
|
|
const res = {};
|
|
const endpointOption = {};
|
|
|
|
await expect(initializeClient({ req, res, endpointOption })).rejects.toThrow(
|
|
/expired_user_key/,
|
|
);
|
|
});
|
|
|
|
test('should throw an error if no API keys are provided in the environment', async () => {
|
|
// Clear the environment variables for API keys
|
|
delete process.env.OPENAI_API_KEY;
|
|
delete process.env.AZURE_API_KEY;
|
|
|
|
const req = {
|
|
body: { key: null, endpoint: EModelEndpoint.openAI },
|
|
user: { id: '123' },
|
|
app,
|
|
config: mockAppConfig,
|
|
};
|
|
const res = {};
|
|
const endpointOption = {};
|
|
|
|
await expect(initializeClient({ req, res, endpointOption })).rejects.toThrow(
|
|
`${EModelEndpoint.openAI} API Key not provided.`,
|
|
);
|
|
});
|
|
|
|
it('should handle user-provided keys and check expiry', async () => {
|
|
// Set up the req.body to simulate user-provided key scenario
|
|
const req = {
|
|
body: {
|
|
key: new Date(Date.now() + 10000).toISOString(),
|
|
endpoint: EModelEndpoint.openAI,
|
|
},
|
|
user: {
|
|
id: '123',
|
|
},
|
|
app,
|
|
config: mockAppConfig,
|
|
};
|
|
|
|
const res = {};
|
|
const endpointOption = {};
|
|
|
|
// Ensure the environment variable is set to 'user_provided' to match the isUserProvided condition
|
|
process.env.OPENAI_API_KEY = 'user_provided';
|
|
|
|
// Mock getUserKey to return the expected key
|
|
getUserKeyValues.mockResolvedValue({ apiKey: 'test-user-provided-openai-api-key' });
|
|
|
|
// Call the initializeClient function
|
|
const result = await initializeClient({ req, res, endpointOption });
|
|
|
|
// Assertions
|
|
expect(result.openAIApiKey).toBe('test-user-provided-openai-api-key');
|
|
});
|
|
|
|
test('should throw an error if the user-provided key is invalid', async () => {
|
|
const invalidKey = new Date(Date.now() - 100000).toISOString();
|
|
const req = {
|
|
body: { key: invalidKey, endpoint: EModelEndpoint.openAI },
|
|
user: { id: '123' },
|
|
app,
|
|
config: mockAppConfig,
|
|
};
|
|
const res = {};
|
|
const endpointOption = {};
|
|
|
|
// Ensure the environment variable is set to 'user_provided' to match the isUserProvided condition
|
|
process.env.OPENAI_API_KEY = 'user_provided';
|
|
|
|
// Mock getUserKey to return an invalid key
|
|
getUserKey.mockResolvedValue(invalidKey);
|
|
|
|
await expect(initializeClient({ req, res, endpointOption })).rejects.toThrow(
|
|
/expired_user_key/,
|
|
);
|
|
});
|
|
|
|
test('should throw an error when user-provided values are not valid JSON', async () => {
|
|
process.env.OPENAI_API_KEY = 'user_provided';
|
|
const req = {
|
|
body: { key: new Date(Date.now() + 10000).toISOString(), endpoint: EModelEndpoint.openAI },
|
|
user: { id: '123' },
|
|
app,
|
|
config: mockAppConfig,
|
|
};
|
|
const res = {};
|
|
const endpointOption = {};
|
|
|
|
// Mock getUserKey to return a non-JSON string
|
|
getUserKey.mockResolvedValue('not-a-json');
|
|
getUserKeyValues.mockImplementation(() => {
|
|
let userValues = getUserKey();
|
|
try {
|
|
userValues = JSON.parse(userValues);
|
|
} catch {
|
|
throw new Error(
|
|
JSON.stringify({
|
|
type: ErrorTypes.INVALID_USER_KEY,
|
|
}),
|
|
);
|
|
}
|
|
return userValues;
|
|
});
|
|
|
|
await expect(initializeClient({ req, res, endpointOption })).rejects.toThrow(
|
|
/invalid_user_key/,
|
|
);
|
|
});
|
|
|
|
test('should initialize client correctly for Azure OpenAI with valid configuration', async () => {
|
|
// Set up Azure environment variables
|
|
process.env.WESTUS_API_KEY = 'test-westus-key';
|
|
|
|
const req = {
|
|
body: {
|
|
key: null,
|
|
endpoint: EModelEndpoint.azureOpenAI,
|
|
model: modelNames[0],
|
|
},
|
|
user: { id: '123' },
|
|
config: mockAppConfig,
|
|
};
|
|
const res = {};
|
|
const endpointOption = {};
|
|
|
|
const client = await initializeClient({ req, res, endpointOption });
|
|
expect(client.client.options.azure).toBeDefined();
|
|
});
|
|
|
|
test('should initialize client with default options when certain env vars are not set', async () => {
|
|
delete process.env.DEBUG_OPENAI;
|
|
delete process.env.OPENAI_SUMMARIZE;
|
|
process.env.OPENAI_API_KEY = 'some-api-key';
|
|
|
|
const req = {
|
|
body: { key: null, endpoint: EModelEndpoint.openAI },
|
|
user: { id: '123' },
|
|
app,
|
|
config: mockAppConfig,
|
|
};
|
|
const res = {};
|
|
const endpointOption = {};
|
|
|
|
const client = await initializeClient({ req, res, endpointOption });
|
|
|
|
expect(client.client.options.debug).toBe(false);
|
|
expect(client.client.options.contextStrategy).toBe(null);
|
|
});
|
|
|
|
test('should correctly use user-provided apiKey and baseURL when provided', async () => {
|
|
process.env.OPENAI_API_KEY = 'user_provided';
|
|
process.env.OPENAI_REVERSE_PROXY = 'user_provided';
|
|
const req = {
|
|
body: {
|
|
key: new Date(Date.now() + 10000).toISOString(),
|
|
endpoint: EModelEndpoint.openAI,
|
|
},
|
|
user: {
|
|
id: '123',
|
|
},
|
|
app,
|
|
config: mockAppConfig,
|
|
};
|
|
const res = {};
|
|
const endpointOption = {};
|
|
|
|
getUserKeyValues.mockResolvedValue({
|
|
apiKey: 'test',
|
|
baseURL: 'https://user-provided-url.com',
|
|
});
|
|
|
|
const result = await initializeClient({ req, res, endpointOption });
|
|
|
|
expect(result.openAIApiKey).toBe('test');
|
|
expect(result.client.options.reverseProxyUrl).toBe('https://user-provided-url.com');
|
|
});
|
|
});
|