mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-21 21:50:49 +02: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
216 lines
6.1 KiB
JavaScript
216 lines
6.1 KiB
JavaScript
const OpenAI = require('openai');
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const DALLE3 = require('../DALLE3');
|
|
|
|
jest.mock('openai');
|
|
jest.mock('@librechat/data-schemas', () => {
|
|
return {
|
|
logger: {
|
|
info: jest.fn(),
|
|
warn: jest.fn(),
|
|
debug: jest.fn(),
|
|
error: jest.fn(),
|
|
},
|
|
};
|
|
});
|
|
|
|
jest.mock('tiktoken', () => {
|
|
return {
|
|
encoding_for_model: jest.fn().mockReturnValue({
|
|
encode: jest.fn(),
|
|
decode: jest.fn(),
|
|
}),
|
|
};
|
|
});
|
|
|
|
const processFileURL = jest.fn();
|
|
|
|
const generate = jest.fn();
|
|
OpenAI.mockImplementation(() => ({
|
|
images: {
|
|
generate,
|
|
},
|
|
}));
|
|
|
|
jest.mock('fs', () => {
|
|
return {
|
|
existsSync: jest.fn(),
|
|
mkdirSync: jest.fn(),
|
|
promises: {
|
|
writeFile: jest.fn(),
|
|
readFile: jest.fn(),
|
|
unlink: jest.fn(),
|
|
},
|
|
};
|
|
});
|
|
|
|
jest.mock('path', () => {
|
|
return {
|
|
resolve: jest.fn(),
|
|
join: jest.fn(),
|
|
relative: jest.fn(),
|
|
extname: jest.fn().mockImplementation((filename) => {
|
|
return filename.slice(filename.lastIndexOf('.'));
|
|
}),
|
|
};
|
|
});
|
|
|
|
describe('DALLE3', () => {
|
|
let originalEnv;
|
|
let dalle; // Keep this declaration if you need to use dalle in other tests
|
|
const mockApiKey = 'mock_api_key';
|
|
|
|
beforeAll(() => {
|
|
// Save the original process.env
|
|
originalEnv = { ...process.env };
|
|
});
|
|
|
|
beforeEach(() => {
|
|
// Reset the process.env before each test
|
|
jest.resetModules();
|
|
process.env = { ...originalEnv, DALLE_API_KEY: mockApiKey };
|
|
// Instantiate DALLE3 for tests that do not depend on DALLE3_SYSTEM_PROMPT
|
|
dalle = new DALLE3({ processFileURL });
|
|
});
|
|
|
|
afterEach(() => {
|
|
jest.clearAllMocks();
|
|
// Restore the original process.env after each test
|
|
process.env = originalEnv;
|
|
});
|
|
|
|
it('should throw an error if all potential API keys are missing', () => {
|
|
delete process.env.DALLE3_API_KEY;
|
|
delete process.env.DALLE_API_KEY;
|
|
expect(() => new DALLE3()).toThrow('Missing DALLE_API_KEY environment variable.');
|
|
});
|
|
|
|
it('should replace unwanted characters in input string', () => {
|
|
const input = 'This is a test\nstring with "quotes" and new lines.';
|
|
const expectedOutput = 'This is a test string with quotes and new lines.';
|
|
expect(dalle.replaceUnwantedChars(input)).toBe(expectedOutput);
|
|
});
|
|
|
|
it('should generate markdown image URL correctly', () => {
|
|
const imageName = 'test.png';
|
|
const markdownImage = dalle.wrapInMarkdown(imageName);
|
|
expect(markdownImage).toBe('');
|
|
});
|
|
|
|
it('should call OpenAI API with correct parameters', async () => {
|
|
const mockData = {
|
|
prompt: 'A test prompt',
|
|
quality: 'standard',
|
|
size: '1024x1024',
|
|
style: 'vivid',
|
|
};
|
|
|
|
const mockResponse = {
|
|
data: [
|
|
{
|
|
url: 'http://example.com/img-test.png',
|
|
},
|
|
],
|
|
};
|
|
|
|
generate.mockResolvedValue(mockResponse);
|
|
processFileURL.mockResolvedValue({
|
|
filepath: 'http://example.com/img-test.png',
|
|
});
|
|
|
|
const result = await dalle._call(mockData);
|
|
|
|
expect(generate).toHaveBeenCalledWith({
|
|
model: 'dall-e-3',
|
|
quality: mockData.quality,
|
|
style: mockData.style,
|
|
size: mockData.size,
|
|
prompt: mockData.prompt,
|
|
n: 1,
|
|
});
|
|
|
|
expect(result).toContain('![generated image]');
|
|
});
|
|
|
|
it('should use the system prompt if provided', () => {
|
|
process.env.DALLE3_SYSTEM_PROMPT = 'System prompt for testing';
|
|
jest.resetModules(); // This will ensure the module is fresh and will read the new env var
|
|
const DALLE3 = require('../DALLE3'); // Re-require after setting the env var
|
|
const dalleWithSystemPrompt = new DALLE3();
|
|
expect(dalleWithSystemPrompt.description_for_model).toBe('System prompt for testing');
|
|
});
|
|
|
|
it('should not use the system prompt if not provided', async () => {
|
|
delete process.env.DALLE3_SYSTEM_PROMPT;
|
|
const dalleWithoutSystemPrompt = new DALLE3();
|
|
expect(dalleWithoutSystemPrompt.description_for_model).not.toBe('System prompt for testing');
|
|
});
|
|
|
|
it('should throw an error if prompt is missing', async () => {
|
|
const mockData = {
|
|
quality: 'standard',
|
|
size: '1024x1024',
|
|
style: 'vivid',
|
|
};
|
|
await expect(dalle._call(mockData)).rejects.toThrow('Missing required field: prompt');
|
|
});
|
|
|
|
it('should log appropriate debug values', async () => {
|
|
const mockData = {
|
|
prompt: 'A test prompt',
|
|
};
|
|
const mockResponse = {
|
|
data: [
|
|
{
|
|
url: 'http://example.com/invalid-url',
|
|
},
|
|
],
|
|
};
|
|
|
|
generate.mockResolvedValue(mockResponse);
|
|
await dalle._call(mockData);
|
|
expect(logger.debug).toHaveBeenCalledWith('[DALL-E-3]', {
|
|
data: { url: 'http://example.com/invalid-url' },
|
|
theImageUrl: 'http://example.com/invalid-url',
|
|
extension: expect.any(String),
|
|
imageBasename: expect.any(String),
|
|
imageExt: expect.any(String),
|
|
imageName: expect.any(String),
|
|
});
|
|
});
|
|
|
|
it('should log an error and return the image URL if there is an error saving the image', async () => {
|
|
const mockData = {
|
|
prompt: 'A test prompt',
|
|
};
|
|
const mockResponse = {
|
|
data: [
|
|
{
|
|
url: 'http://example.com/img-test.png',
|
|
},
|
|
],
|
|
};
|
|
const error = new Error('Error while saving the image');
|
|
generate.mockResolvedValue(mockResponse);
|
|
processFileURL.mockRejectedValue(error);
|
|
const result = await dalle._call(mockData);
|
|
expect(logger.error).toHaveBeenCalledWith('Error while saving the image:', error);
|
|
expect(result).toBe('Failed to save the image locally. Error while saving the image');
|
|
});
|
|
|
|
it('should handle error when saving image to Firebase Storage fails', async () => {
|
|
const mockData = {
|
|
prompt: 'A test prompt',
|
|
};
|
|
const mockImageUrl = 'http://example.com/img-test.png';
|
|
const mockResponse = { data: [{ url: mockImageUrl }] };
|
|
const error = new Error('Error while saving to Firebase');
|
|
generate.mockResolvedValue(mockResponse);
|
|
processFileURL.mockRejectedValue(error);
|
|
|
|
const result = await dalle._call(mockData);
|
|
|
|
expect(logger.error).toHaveBeenCalledWith('Error while saving the image:', error);
|
|
expect(result).toContain('Failed to save the image');
|
|
});
|
|
});
|