mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +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
298 lines
8.9 KiB
JavaScript
298 lines
8.9 KiB
JavaScript
const express = require('express');
|
|
const { Tokenizer, generateCheckAccess } = require('@librechat/api');
|
|
const { PermissionTypes, Permissions } = require('librechat-data-provider');
|
|
const {
|
|
getAllUserMemories,
|
|
toggleUserMemories,
|
|
createMemory,
|
|
deleteMemory,
|
|
setMemory,
|
|
} = require('~/models');
|
|
const { requireJwtAuth, configMiddleware } = require('~/server/middleware');
|
|
const { getRoleByName } = require('~/models/Role');
|
|
|
|
const router = express.Router();
|
|
|
|
const memoryPayloadLimit = express.json({ limit: '100kb' });
|
|
|
|
const checkMemoryRead = generateCheckAccess({
|
|
permissionType: PermissionTypes.MEMORIES,
|
|
permissions: [Permissions.USE, Permissions.READ],
|
|
getRoleByName,
|
|
});
|
|
const checkMemoryCreate = generateCheckAccess({
|
|
permissionType: PermissionTypes.MEMORIES,
|
|
permissions: [Permissions.USE, Permissions.CREATE],
|
|
getRoleByName,
|
|
});
|
|
const checkMemoryUpdate = generateCheckAccess({
|
|
permissionType: PermissionTypes.MEMORIES,
|
|
permissions: [Permissions.USE, Permissions.UPDATE],
|
|
getRoleByName,
|
|
});
|
|
const checkMemoryDelete = generateCheckAccess({
|
|
permissionType: PermissionTypes.MEMORIES,
|
|
permissions: [Permissions.USE, Permissions.UPDATE],
|
|
getRoleByName,
|
|
});
|
|
const checkMemoryOptOut = generateCheckAccess({
|
|
permissionType: PermissionTypes.MEMORIES,
|
|
permissions: [Permissions.USE, Permissions.OPT_OUT],
|
|
getRoleByName,
|
|
});
|
|
|
|
router.use(requireJwtAuth);
|
|
|
|
/**
|
|
* GET /memories
|
|
* Returns all memories for the authenticated user, sorted by updated_at (newest first).
|
|
* Also includes memory usage percentage based on token limit.
|
|
*/
|
|
router.get('/', checkMemoryRead, configMiddleware, async (req, res) => {
|
|
try {
|
|
const memories = await getAllUserMemories(req.user.id);
|
|
|
|
const sortedMemories = memories.sort(
|
|
(a, b) => new Date(b.updated_at).getTime() - new Date(a.updated_at).getTime(),
|
|
);
|
|
|
|
const totalTokens = memories.reduce((sum, memory) => {
|
|
return sum + (memory.tokenCount || 0);
|
|
}, 0);
|
|
|
|
const appConfig = req.config;
|
|
const memoryConfig = appConfig?.memory;
|
|
const tokenLimit = memoryConfig?.tokenLimit;
|
|
const charLimit = memoryConfig?.charLimit || 10000;
|
|
|
|
let usagePercentage = null;
|
|
if (tokenLimit && tokenLimit > 0) {
|
|
usagePercentage = Math.min(100, Math.round((totalTokens / tokenLimit) * 100));
|
|
}
|
|
|
|
res.json({
|
|
memories: sortedMemories,
|
|
totalTokens,
|
|
tokenLimit: tokenLimit || null,
|
|
charLimit,
|
|
usagePercentage,
|
|
});
|
|
} catch (error) {
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
});
|
|
|
|
/**
|
|
* POST /memories
|
|
* Creates a new memory entry for the authenticated user.
|
|
* Body: { key: string, value: string }
|
|
* Returns 201 and { created: true, memory: <createdDoc> } when successful.
|
|
*/
|
|
router.post('/', memoryPayloadLimit, checkMemoryCreate, configMiddleware, async (req, res) => {
|
|
const { key, value } = req.body;
|
|
|
|
if (typeof key !== 'string' || key.trim() === '') {
|
|
return res.status(400).json({ error: 'Key is required and must be a non-empty string.' });
|
|
}
|
|
|
|
if (typeof value !== 'string' || value.trim() === '') {
|
|
return res.status(400).json({ error: 'Value is required and must be a non-empty string.' });
|
|
}
|
|
|
|
const appConfig = req.config;
|
|
const memoryConfig = appConfig?.memory;
|
|
const charLimit = memoryConfig?.charLimit || 10000;
|
|
|
|
if (key.length > 1000) {
|
|
return res.status(400).json({
|
|
error: `Key exceeds maximum length of 1000 characters. Current length: ${key.length} characters.`,
|
|
});
|
|
}
|
|
|
|
if (value.length > charLimit) {
|
|
return res.status(400).json({
|
|
error: `Value exceeds maximum length of ${charLimit} characters. Current length: ${value.length} characters.`,
|
|
});
|
|
}
|
|
|
|
try {
|
|
const tokenCount = Tokenizer.getTokenCount(value, 'o200k_base');
|
|
|
|
const memories = await getAllUserMemories(req.user.id);
|
|
|
|
const appConfig = req.config;
|
|
const memoryConfig = appConfig?.memory;
|
|
const tokenLimit = memoryConfig?.tokenLimit;
|
|
|
|
if (tokenLimit) {
|
|
const currentTotalTokens = memories.reduce(
|
|
(sum, memory) => sum + (memory.tokenCount || 0),
|
|
0,
|
|
);
|
|
if (currentTotalTokens + tokenCount > tokenLimit) {
|
|
return res.status(400).json({
|
|
error: `Adding this memory would exceed the token limit of ${tokenLimit}. Current usage: ${currentTotalTokens} tokens.`,
|
|
});
|
|
}
|
|
}
|
|
|
|
const result = await createMemory({
|
|
userId: req.user.id,
|
|
key: key.trim(),
|
|
value: value.trim(),
|
|
tokenCount,
|
|
});
|
|
|
|
if (!result.ok) {
|
|
return res.status(500).json({ error: 'Failed to create memory.' });
|
|
}
|
|
|
|
const updatedMemories = await getAllUserMemories(req.user.id);
|
|
const newMemory = updatedMemories.find((m) => m.key === key.trim());
|
|
|
|
res.status(201).json({ created: true, memory: newMemory });
|
|
} catch (error) {
|
|
if (error.message && error.message.includes('already exists')) {
|
|
return res.status(409).json({ error: 'Memory with this key already exists.' });
|
|
}
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
});
|
|
|
|
/**
|
|
* PATCH /memories/preferences
|
|
* Updates the user's memory preferences (e.g., enabling/disabling memories).
|
|
* Body: { memories: boolean }
|
|
* Returns 200 and { updated: true, preferences: { memories: boolean } } when successful.
|
|
*/
|
|
router.patch('/preferences', checkMemoryOptOut, async (req, res) => {
|
|
const { memories } = req.body;
|
|
|
|
if (typeof memories !== 'boolean') {
|
|
return res.status(400).json({ error: 'memories must be a boolean value.' });
|
|
}
|
|
|
|
try {
|
|
const updatedUser = await toggleUserMemories(req.user.id, memories);
|
|
|
|
if (!updatedUser) {
|
|
return res.status(404).json({ error: 'User not found.' });
|
|
}
|
|
|
|
res.json({
|
|
updated: true,
|
|
preferences: {
|
|
memories: updatedUser.personalization?.memories ?? true,
|
|
},
|
|
});
|
|
} catch (error) {
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
});
|
|
|
|
/**
|
|
* PATCH /memories/:key
|
|
* Updates the value of an existing memory entry for the authenticated user.
|
|
* Body: { key?: string, value: string }
|
|
* Returns 200 and { updated: true, memory: <updatedDoc> } when successful.
|
|
*/
|
|
router.patch('/:key', memoryPayloadLimit, checkMemoryUpdate, configMiddleware, async (req, res) => {
|
|
const { key: urlKey } = req.params;
|
|
const { key: bodyKey, value } = req.body || {};
|
|
|
|
if (typeof value !== 'string' || value.trim() === '') {
|
|
return res.status(400).json({ error: 'Value is required and must be a non-empty string.' });
|
|
}
|
|
|
|
const newKey = bodyKey || urlKey;
|
|
const appConfig = req.config;
|
|
const memoryConfig = appConfig?.memory;
|
|
const charLimit = memoryConfig?.charLimit || 10000;
|
|
|
|
if (newKey.length > 1000) {
|
|
return res.status(400).json({
|
|
error: `Key exceeds maximum length of 1000 characters. Current length: ${newKey.length} characters.`,
|
|
});
|
|
}
|
|
|
|
if (value.length > charLimit) {
|
|
return res.status(400).json({
|
|
error: `Value exceeds maximum length of ${charLimit} characters. Current length: ${value.length} characters.`,
|
|
});
|
|
}
|
|
|
|
try {
|
|
const tokenCount = Tokenizer.getTokenCount(value, 'o200k_base');
|
|
|
|
const memories = await getAllUserMemories(req.user.id);
|
|
const existingMemory = memories.find((m) => m.key === urlKey);
|
|
|
|
if (!existingMemory) {
|
|
return res.status(404).json({ error: 'Memory not found.' });
|
|
}
|
|
|
|
if (newKey !== urlKey) {
|
|
const keyExists = memories.find((m) => m.key === newKey);
|
|
if (keyExists) {
|
|
return res.status(409).json({ error: 'Memory with this key already exists.' });
|
|
}
|
|
|
|
const createResult = await createMemory({
|
|
userId: req.user.id,
|
|
key: newKey,
|
|
value,
|
|
tokenCount,
|
|
});
|
|
|
|
if (!createResult.ok) {
|
|
return res.status(500).json({ error: 'Failed to create new memory.' });
|
|
}
|
|
|
|
const deleteResult = await deleteMemory({ userId: req.user.id, key: urlKey });
|
|
if (!deleteResult.ok) {
|
|
return res.status(500).json({ error: 'Failed to delete old memory.' });
|
|
}
|
|
} else {
|
|
const result = await setMemory({
|
|
userId: req.user.id,
|
|
key: newKey,
|
|
value,
|
|
tokenCount,
|
|
});
|
|
|
|
if (!result.ok) {
|
|
return res.status(500).json({ error: 'Failed to update memory.' });
|
|
}
|
|
}
|
|
|
|
const updatedMemories = await getAllUserMemories(req.user.id);
|
|
const updatedMemory = updatedMemories.find((m) => m.key === newKey);
|
|
|
|
res.json({ updated: true, memory: updatedMemory });
|
|
} catch (error) {
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
});
|
|
|
|
/**
|
|
* DELETE /memories/:key
|
|
* Deletes a memory entry for the authenticated user.
|
|
* Returns 200 and { deleted: true } when successful.
|
|
*/
|
|
router.delete('/:key', checkMemoryDelete, async (req, res) => {
|
|
const { key } = req.params;
|
|
|
|
try {
|
|
const result = await deleteMemory({ userId: req.user.id, key });
|
|
|
|
if (!result.ok) {
|
|
return res.status(404).json({ error: 'Memory not found.' });
|
|
}
|
|
|
|
res.json({ deleted: true });
|
|
} catch (error) {
|
|
res.status(500).json({ error: error.message });
|
|
}
|
|
});
|
|
|
|
module.exports = router;
|