2025-05-30 22:18:13 -04:00
|
|
|
import mongoose, { FilterQuery } from 'mongoose';
|
2025-08-23 06:18:31 +02:00
|
|
|
import type { IUser, BalanceConfig, CreateUserRequest, UserDeleteResult } from '~/types';
|
2025-05-30 22:18:13 -04:00
|
|
|
import { signPayload } from '~/crypto';
|
|
|
|
|
|
2025-12-25 12:25:41 -05:00
|
|
|
/** Default JWT session expiry: 15 minutes in milliseconds */
|
|
|
|
|
export const DEFAULT_SESSION_EXPIRY = 1000 * 60 * 15;
|
|
|
|
|
|
2025-05-30 22:18:13 -04:00
|
|
|
/** Factory function that takes mongoose instance and returns the methods */
|
|
|
|
|
export function createUserMethods(mongoose: typeof import('mongoose')) {
|
2025-12-01 09:41:25 -05:00
|
|
|
/**
|
|
|
|
|
* Normalizes email fields in search criteria to lowercase and trimmed.
|
|
|
|
|
* Handles both direct email fields and $or arrays containing email conditions.
|
|
|
|
|
*/
|
|
|
|
|
function normalizeEmailInCriteria<T extends FilterQuery<IUser>>(criteria: T): T {
|
|
|
|
|
const normalized = { ...criteria };
|
|
|
|
|
if (typeof normalized.email === 'string') {
|
|
|
|
|
normalized.email = normalized.email.trim().toLowerCase();
|
|
|
|
|
}
|
|
|
|
|
if (Array.isArray(normalized.$or)) {
|
|
|
|
|
normalized.$or = normalized.$or.map((condition) => {
|
|
|
|
|
if (typeof condition.email === 'string') {
|
|
|
|
|
return { ...condition, email: condition.email.trim().toLowerCase() };
|
|
|
|
|
}
|
|
|
|
|
return condition;
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
return normalized;
|
|
|
|
|
}
|
|
|
|
|
|
2025-05-30 22:18:13 -04:00
|
|
|
/**
|
|
|
|
|
* Search for a single user based on partial data and return matching user document as plain object.
|
2025-12-01 09:41:25 -05:00
|
|
|
* Email fields in searchCriteria are automatically normalized to lowercase for case-insensitive matching.
|
2025-05-30 22:18:13 -04:00
|
|
|
*/
|
|
|
|
|
async function findUser(
|
|
|
|
|
searchCriteria: FilterQuery<IUser>,
|
|
|
|
|
fieldsToSelect?: string | string[] | null,
|
|
|
|
|
): Promise<IUser | null> {
|
|
|
|
|
const User = mongoose.models.User;
|
2025-12-01 09:41:25 -05:00
|
|
|
const normalizedCriteria = normalizeEmailInCriteria(searchCriteria);
|
|
|
|
|
const query = User.findOne(normalizedCriteria);
|
2025-05-30 22:18:13 -04:00
|
|
|
if (fieldsToSelect) {
|
|
|
|
|
query.select(fieldsToSelect);
|
|
|
|
|
}
|
|
|
|
|
return (await query.lean()) as IUser | null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Count the number of user documents in the collection based on the provided filter.
|
|
|
|
|
*/
|
|
|
|
|
async function countUsers(filter: FilterQuery<IUser> = {}): Promise<number> {
|
|
|
|
|
const User = mongoose.models.User;
|
|
|
|
|
return await User.countDocuments(filter);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Creates a new user, optionally with a TTL of 1 week.
|
|
|
|
|
*/
|
|
|
|
|
async function createUser(
|
2025-08-23 06:18:31 +02:00
|
|
|
data: CreateUserRequest,
|
2025-05-30 22:18:13 -04:00
|
|
|
balanceConfig?: BalanceConfig,
|
|
|
|
|
disableTTL: boolean = true,
|
|
|
|
|
returnUser: boolean = false,
|
|
|
|
|
): Promise<mongoose.Types.ObjectId | Partial<IUser>> {
|
|
|
|
|
const User = mongoose.models.User;
|
|
|
|
|
const Balance = mongoose.models.Balance;
|
|
|
|
|
|
|
|
|
|
const userData: Partial<IUser> = {
|
|
|
|
|
...data,
|
|
|
|
|
expiresAt: disableTTL ? undefined : new Date(Date.now() + 604800 * 1000), // 1 week in milliseconds
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if (disableTTL) {
|
|
|
|
|
delete userData.expiresAt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const user = await User.create(userData);
|
|
|
|
|
|
|
|
|
|
// If balance is enabled, create or update a balance record for the user
|
|
|
|
|
if (balanceConfig?.enabled && balanceConfig?.startBalance) {
|
|
|
|
|
const update: {
|
|
|
|
|
$inc: { tokenCredits: number };
|
|
|
|
|
$set?: {
|
|
|
|
|
autoRefillEnabled: boolean;
|
|
|
|
|
refillIntervalValue: number;
|
|
|
|
|
refillIntervalUnit: string;
|
|
|
|
|
refillAmount: number;
|
|
|
|
|
};
|
|
|
|
|
} = {
|
|
|
|
|
$inc: { tokenCredits: balanceConfig.startBalance },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if (
|
|
|
|
|
balanceConfig.autoRefillEnabled &&
|
|
|
|
|
balanceConfig.refillIntervalValue != null &&
|
|
|
|
|
balanceConfig.refillIntervalUnit != null &&
|
|
|
|
|
balanceConfig.refillAmount != null
|
|
|
|
|
) {
|
|
|
|
|
update.$set = {
|
|
|
|
|
autoRefillEnabled: true,
|
|
|
|
|
refillIntervalValue: balanceConfig.refillIntervalValue,
|
|
|
|
|
refillIntervalUnit: balanceConfig.refillIntervalUnit,
|
|
|
|
|
refillAmount: balanceConfig.refillAmount,
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
await Balance.findOneAndUpdate({ user: user._id }, update, {
|
|
|
|
|
upsert: true,
|
|
|
|
|
new: true,
|
|
|
|
|
}).lean();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (returnUser) {
|
|
|
|
|
return user.toObject() as Partial<IUser>;
|
|
|
|
|
}
|
|
|
|
|
return user._id as mongoose.Types.ObjectId;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Update a user with new data without overwriting existing properties.
|
|
|
|
|
*/
|
|
|
|
|
async function updateUser(userId: string, updateData: Partial<IUser>): Promise<IUser | null> {
|
|
|
|
|
const User = mongoose.models.User;
|
|
|
|
|
const updateOperation = {
|
|
|
|
|
$set: updateData,
|
|
|
|
|
$unset: { expiresAt: '' }, // Remove the expiresAt field to prevent TTL
|
|
|
|
|
};
|
|
|
|
|
return (await User.findByIdAndUpdate(userId, updateOperation, {
|
|
|
|
|
new: true,
|
|
|
|
|
runValidators: true,
|
|
|
|
|
}).lean()) as IUser | null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Retrieve a user by ID and convert the found user document to a plain object.
|
|
|
|
|
*/
|
|
|
|
|
async function getUserById(
|
|
|
|
|
userId: string,
|
|
|
|
|
fieldsToSelect?: string | string[] | null,
|
|
|
|
|
): Promise<IUser | null> {
|
|
|
|
|
const User = mongoose.models.User;
|
|
|
|
|
const query = User.findById(userId);
|
|
|
|
|
if (fieldsToSelect) {
|
|
|
|
|
query.select(fieldsToSelect);
|
|
|
|
|
}
|
|
|
|
|
return (await query.lean()) as IUser | null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Delete a user by their unique ID.
|
|
|
|
|
*/
|
2025-08-23 06:18:31 +02:00
|
|
|
async function deleteUserById(userId: string): Promise<UserDeleteResult> {
|
2025-05-30 22:18:13 -04:00
|
|
|
try {
|
|
|
|
|
const User = mongoose.models.User;
|
|
|
|
|
const result = await User.deleteOne({ _id: userId });
|
|
|
|
|
if (result.deletedCount === 0) {
|
|
|
|
|
return { deletedCount: 0, message: 'No user found with that ID.' };
|
|
|
|
|
}
|
|
|
|
|
return { deletedCount: result.deletedCount, message: 'User was deleted successfully.' };
|
|
|
|
|
} catch (error: unknown) {
|
|
|
|
|
const errorMessage = error instanceof Error ? error.message : 'Unknown error';
|
|
|
|
|
throw new Error('Error deleting user: ' + errorMessage);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Generates a JWT token for a given user.
|
2025-12-25 12:25:41 -05:00
|
|
|
* @param user - The user object
|
|
|
|
|
* @param expiresIn - Optional expiry time in milliseconds. Default: 15 minutes
|
2025-05-30 22:18:13 -04:00
|
|
|
*/
|
2025-12-25 12:25:41 -05:00
|
|
|
async function generateToken(user: IUser, expiresIn?: number): Promise<string> {
|
2025-05-30 22:18:13 -04:00
|
|
|
if (!user) {
|
|
|
|
|
throw new Error('No user provided');
|
|
|
|
|
}
|
|
|
|
|
|
2025-12-25 12:25:41 -05:00
|
|
|
const expires = expiresIn ?? DEFAULT_SESSION_EXPIRY;
|
2025-05-30 22:18:13 -04:00
|
|
|
|
|
|
|
|
return await signPayload({
|
|
|
|
|
payload: {
|
|
|
|
|
id: user._id,
|
|
|
|
|
username: user.username,
|
|
|
|
|
provider: user.provider,
|
|
|
|
|
email: user.email,
|
|
|
|
|
},
|
|
|
|
|
secret: process.env.JWT_SECRET,
|
|
|
|
|
expirationTime: expires / 1000,
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
🧠 feat: User Memories for Conversational Context (#7760)
* 🧠 feat: User Memories for Conversational Context
chore: mcp typing, use `t`
WIP: first pass, Memories UI
- Added MemoryViewer component for displaying, editing, and deleting user memories.
- Integrated data provider hooks for fetching, updating, and deleting memories.
- Implemented pagination and loading states for better user experience.
- Created unit tests for MemoryViewer to ensure functionality and interaction with data provider.
- Updated translation files to include new UI strings related to memories.
chore: move mcp-related files to own directory
chore: rename librechat-mcp to librechat-api
WIP: first pass, memory processing and data schemas
chore: linting in fileSearch.js query description
chore: rename librechat-api to @librechat/api across the project
WIP: first pass, functional memory agent
feat: add MemoryEditDialog and MemoryViewer components for managing user memories
- Introduced MemoryEditDialog for editing memory entries with validation and toast notifications.
- Updated MemoryViewer to support editing and deleting memories, including pagination and loading states.
- Enhanced data provider to handle memory updates with optional original key for better management.
- Added new localization strings for memory-related UI elements.
feat: add memory permissions management
- Implemented memory permissions in the backend, allowing roles to have specific permissions for using, creating, updating, and reading memories.
- Added new API endpoints for updating memory permissions associated with roles.
- Created a new AdminSettings component for managing memory permissions in the frontend.
- Integrated memory permissions into the existing roles and permissions schemas.
- Updated the interface to include memory settings and permissions.
- Enhanced the MemoryViewer component to conditionally render admin settings based on user roles.
- Added localization support for memory permissions in the translation files.
feat: move AdminSettings component to a new position in MemoryViewer for better visibility
refactor: clean up commented code in MemoryViewer component
feat: enhance MemoryViewer with search functionality and improve MemoryEditDialog integration
- Added a search input to filter memories in the MemoryViewer component.
- Refactored MemoryEditDialog to accept children for better customization.
- Updated MemoryViewer to utilize the new EditMemoryButton and DeleteMemoryButton components for editing and deleting memories.
- Improved localization support by adding new strings for memory filtering and deletion confirmation.
refactor: optimize memory filtering in MemoryViewer using match-sorter
- Replaced manual filtering logic with match-sorter for improved search functionality.
- Enhanced performance and readability of the filteredMemories computation.
feat: enhance MemoryEditDialog with triggerRef and improve updateMemory mutation handling
feat: implement access control for MemoryEditDialog and MemoryViewer components
refactor: remove commented out code and create runMemory method
refactor: rename role based files
feat: implement access control for memory usage in AgentClient
refactor: simplify checkVisionRequest method in AgentClient by removing commented-out code
refactor: make `agents` dir in api package
refactor: migrate Azure utilities to TypeScript and consolidate imports
refactor: move sanitizeFilename function to a new file and update imports, add related tests
refactor: update LLM configuration types and consolidate Azure options in the API package
chore: linting
chore: import order
refactor: replace getLLMConfig with getOpenAIConfig and remove unused LLM configuration file
chore: update winston-daily-rotate-file to version 5.0.0 and add object-hash dependency in package-lock.json
refactor: move primeResources and optionalChainWithEmptyCheck functions to resources.ts and update imports
refactor: move createRun function to a new run.ts file and update related imports
fix: ensure safeAttachments is correctly typed as an array of TFile
chore: add node-fetch dependency and refactor fetch-related functions into packages/api/utils, removing the old generators file
refactor: enhance TEndpointOption type by using Pick to streamline endpoint fields and add new properties for model parameters and client options
feat: implement initializeOpenAIOptions function and update OpenAI types for enhanced configuration handling
fix: update types due to new TEndpointOption typing
fix: ensure safe access to group parameters in initializeOpenAIOptions function
fix: remove redundant API key validation comment in initializeOpenAIOptions function
refactor: rename initializeOpenAIOptions to initializeOpenAI for consistency and update related documentation
refactor: decouple req.body fields and tool loading from initializeAgentOptions
chore: linting
refactor: adjust column widths in MemoryViewer for improved layout
refactor: simplify agent initialization by creating loadAgent function and removing unused code
feat: add memory configuration loading and validation functions
WIP: first pass, memory processing with config
feat: implement memory callback and artifact handling
feat: implement memory artifacts display and processing updates
feat: add memory configuration options and schema validation for validKeys
fix: update MemoryEditDialog and MemoryViewer to handle memory state and display improvements
refactor: remove padding from BookmarkTable and MemoryViewer headers for consistent styling
WIP: initial tokenLimit config and move Tokenizer to @librechat/api
refactor: update mongoMeili plugin methods to use callback for better error handling
feat: enhance memory management with token tracking and usage metrics
- Added token counting for memory entries to enforce limits and provide usage statistics.
- Updated memory retrieval and update routes to include total token usage and limit.
- Enhanced MemoryEditDialog and MemoryViewer components to display memory usage and token information.
- Refactored memory processing functions to handle token limits and provide feedback on memory capacity.
feat: implement memory artifact handling in attachment handler
- Enhanced useAttachmentHandler to process memory artifacts when receiving updates.
- Introduced handleMemoryArtifact utility to manage memory updates and deletions.
- Updated query client to reflect changes in memory state based on incoming data.
refactor: restructure web search key extraction logic
- Moved the logic for extracting API keys from the webSearchAuth configuration into a dedicated function, getWebSearchKeys.
- Updated webSearchKeys to utilize the new function for improved clarity and maintainability.
- Prevents build time errors
feat: add personalization settings and memory preferences management
- Introduced a new Personalization tab in settings to manage user memory preferences.
- Implemented API endpoints and client-side logic for updating memory preferences.
- Enhanced user interface components to reflect personalization options and memory usage.
- Updated permissions to allow users to opt out of memory features.
- Added localization support for new settings and messages related to personalization.
style: personalization switch class
feat: add PersonalizationIcon and align Side Panel UI
feat: implement memory creation functionality
- Added a new API endpoint for creating memory entries, including validation for key and value.
- Introduced MemoryCreateDialog component for user interface to facilitate memory creation.
- Integrated token limit checks to prevent exceeding user memory capacity.
- Updated MemoryViewer to include a button for opening the memory creation dialog.
- Enhanced localization support for new messages related to memory creation.
feat: enhance message processing with configurable window size
- Updated AgentClient to use a configurable message window size for processing messages.
- Introduced messageWindowSize option in memory configuration schema with a default value of 5.
- Improved logic for selecting messages to process based on the configured window size.
chore: update librechat-data-provider version to 0.7.87 in package.json and package-lock.json
chore: remove OpenAPIPlugin and its associated tests
chore: remove MIGRATION_README.md as migration tasks are completed
ci: fix backend tests
chore: remove unused translation keys from localization file
chore: remove problematic test file and unused var in AgentClient
chore: remove unused import and import directly for JSDoc
* feat: add api package build stage in Dockerfile for improved modularity
* docs: reorder build steps in contributing guide for clarity
2025-06-07 18:52:22 -04:00
|
|
|
/**
|
|
|
|
|
* Update a user's personalization memories setting.
|
|
|
|
|
* Handles the edge case where the personalization object doesn't exist.
|
|
|
|
|
*/
|
|
|
|
|
async function toggleUserMemories(
|
|
|
|
|
userId: string,
|
|
|
|
|
memoriesEnabled: boolean,
|
|
|
|
|
): Promise<IUser | null> {
|
|
|
|
|
const User = mongoose.models.User;
|
|
|
|
|
|
|
|
|
|
// First, ensure the personalization object exists
|
|
|
|
|
const user = await User.findById(userId);
|
|
|
|
|
if (!user) {
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Use $set to update the nested field, which will create the personalization object if it doesn't exist
|
|
|
|
|
const updateOperation = {
|
|
|
|
|
$set: {
|
|
|
|
|
'personalization.memories': memoriesEnabled,
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
return (await User.findByIdAndUpdate(userId, updateOperation, {
|
|
|
|
|
new: true,
|
|
|
|
|
runValidators: true,
|
|
|
|
|
}).lean()) as IUser | null;
|
|
|
|
|
}
|
|
|
|
|
|
2025-06-23 10:22:27 -04:00
|
|
|
/**
|
|
|
|
|
* Search for users by pattern matching on name, email, or username (case-insensitive)
|
|
|
|
|
* @param searchPattern - The pattern to search for
|
|
|
|
|
* @param limit - Maximum number of results to return
|
|
|
|
|
* @param fieldsToSelect - The fields to include or exclude in the returned documents
|
|
|
|
|
* @returns Array of matching user documents
|
|
|
|
|
*/
|
|
|
|
|
const searchUsers = async function ({
|
|
|
|
|
searchPattern,
|
|
|
|
|
limit = 20,
|
|
|
|
|
fieldsToSelect = null,
|
|
|
|
|
}: {
|
|
|
|
|
searchPattern: string;
|
|
|
|
|
limit?: number;
|
|
|
|
|
fieldsToSelect?: string | string[] | null;
|
|
|
|
|
}) {
|
|
|
|
|
if (!searchPattern || searchPattern.trim().length === 0) {
|
|
|
|
|
return [];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const regex = new RegExp(searchPattern.trim(), 'i');
|
|
|
|
|
const User = mongoose.models.User;
|
|
|
|
|
|
|
|
|
|
const query = User.find({
|
|
|
|
|
$or: [{ email: regex }, { name: regex }, { username: regex }],
|
|
|
|
|
}).limit(limit * 2); // Get more results to allow for relevance sorting
|
|
|
|
|
|
|
|
|
|
if (fieldsToSelect) {
|
|
|
|
|
query.select(fieldsToSelect);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const users = await query.lean();
|
|
|
|
|
|
|
|
|
|
// Score results by relevance
|
|
|
|
|
const exactRegex = new RegExp(`^${searchPattern.trim()}$`, 'i');
|
|
|
|
|
const startsWithPattern = searchPattern.trim().toLowerCase();
|
|
|
|
|
|
|
|
|
|
const scoredUsers = users.map((user) => {
|
|
|
|
|
const searchableFields = [user.name, user.email, user.username].filter(Boolean);
|
|
|
|
|
let maxScore = 0;
|
|
|
|
|
|
|
|
|
|
for (const field of searchableFields) {
|
|
|
|
|
const fieldLower = field.toLowerCase();
|
|
|
|
|
let score = 0;
|
|
|
|
|
|
|
|
|
|
// Exact match gets highest score
|
|
|
|
|
if (exactRegex.test(field)) {
|
|
|
|
|
score = 100;
|
|
|
|
|
}
|
|
|
|
|
// Starts with query gets high score
|
|
|
|
|
else if (fieldLower.startsWith(startsWithPattern)) {
|
|
|
|
|
score = 80;
|
|
|
|
|
}
|
|
|
|
|
// Contains query gets medium score
|
|
|
|
|
else if (fieldLower.includes(startsWithPattern)) {
|
|
|
|
|
score = 50;
|
|
|
|
|
}
|
|
|
|
|
// Default score for regex match
|
|
|
|
|
else {
|
|
|
|
|
score = 10;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
maxScore = Math.max(maxScore, score);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return { ...user, _searchScore: maxScore };
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
/** Top results sorted by relevance */
|
|
|
|
|
return scoredUsers
|
|
|
|
|
.sort((a, b) => b._searchScore - a._searchScore)
|
|
|
|
|
.slice(0, limit)
|
|
|
|
|
.map((user) => {
|
|
|
|
|
// Remove the search score from final results
|
|
|
|
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
|
|
|
const { _searchScore, ...userWithoutScore } = user;
|
|
|
|
|
return userWithoutScore;
|
|
|
|
|
});
|
|
|
|
|
};
|
|
|
|
|
|
🧵 refactor: Migrate Endpoint Initialization to TypeScript (#10794)
* refactor: move endpoint initialization methods to typescript
* refactor: move agent init to packages/api
- Introduced `initialize.ts` for agent initialization, including file processing and tool loading.
- Updated `resources.ts` to allow optional appConfig parameter.
- Enhanced endpoint configuration handling in various initialization files to support model parameters.
- Added new artifacts and prompts for React component generation.
- Refactored existing code to improve type safety and maintainability.
* refactor: streamline endpoint initialization and enhance type safety
- Updated initialization functions across various endpoints to use a consistent request structure, replacing `unknown` types with `ServerResponse`.
- Simplified request handling by directly extracting keys from the request body.
- Improved type safety by ensuring user IDs are safely accessed with optional chaining.
- Removed unnecessary parameters and streamlined model options handling for better clarity and maintainability.
* refactor: moved ModelService and extractBaseURL to packages/api
- Added comprehensive tests for the models fetching functionality, covering scenarios for OpenAI, Anthropic, Google, and Ollama models.
- Updated existing endpoint index to include the new models module.
- Enhanced utility functions for URL extraction and model data processing.
- Improved type safety and error handling across the models fetching logic.
* refactor: consolidate utility functions and remove unused files
- Merged `deriveBaseURL` and `extractBaseURL` into the `@librechat/api` module for better organization.
- Removed redundant utility files and their associated tests to streamline the codebase.
- Updated imports across various client files to utilize the new consolidated functions.
- Enhanced overall maintainability by reducing the number of utility modules.
* refactor: replace ModelService references with direct imports from @librechat/api and remove ModelService file
* refactor: move encrypt/decrypt methods and key db methods to data-schemas, use `getProviderConfig` from `@librechat/api`
* chore: remove unused 'res' from options in AgentClient
* refactor: file model imports and methods
- Updated imports in various controllers and services to use the unified file model from '~/models' instead of '~/models/File'.
- Consolidated file-related methods into a new file methods module in the data-schemas package.
- Added comprehensive tests for file methods including creation, retrieval, updating, and deletion.
- Enhanced the initializeAgent function to accept dependency injection for file-related methods.
- Improved error handling and logging in file methods.
* refactor: streamline database method references in agent initialization
* refactor: enhance file method tests and update type references to IMongoFile
* refactor: consolidate database method imports in agent client and initialization
* chore: remove redundant import of initializeAgent from @librechat/api
* refactor: move checkUserKeyExpiry utility to @librechat/api and update references across endpoints
* refactor: move updateUserPlugins logic to user.ts and simplify UserController
* refactor: update imports for user key management and remove UserService
* refactor: remove unused Anthropics and Bedrock endpoint files and clean up imports
* refactor: consolidate and update encryption imports across various files to use @librechat/data-schemas
* chore: update file model mock to use unified import from '~/models'
* chore: import order
* refactor: remove migrated to TS agent.js file and its associated logic from the endpoints
* chore: add reusable function to extract imports from source code in unused-packages workflow
* chore: enhance unused-packages workflow to include @librechat/api dependencies and improve dependency extraction
* chore: improve dependency extraction in unused-packages workflow with enhanced error handling and debugging output
* chore: add detailed debugging output to unused-packages workflow for better visibility into unused dependencies and exclusion lists
* chore: refine subpath handling in unused-packages workflow to correctly process scoped and non-scoped package imports
* chore: clean up unused debug output in unused-packages workflow and reorganize type imports in initialize.ts
2025-12-03 17:21:41 -05:00
|
|
|
/**
|
|
|
|
|
* Updates the plugins for a user based on the action specified (install/uninstall).
|
|
|
|
|
* @param userId - The user ID whose plugins are to be updated
|
|
|
|
|
* @param plugins - The current plugins array
|
|
|
|
|
* @param pluginKey - The key of the plugin to install or uninstall
|
|
|
|
|
* @param action - The action to perform, 'install' or 'uninstall'
|
|
|
|
|
* @returns The result of the update operation or null if action is invalid
|
|
|
|
|
*/
|
|
|
|
|
async function updateUserPlugins(
|
|
|
|
|
userId: string,
|
|
|
|
|
plugins: string[] | undefined,
|
|
|
|
|
pluginKey: string,
|
|
|
|
|
action: 'install' | 'uninstall',
|
|
|
|
|
): Promise<IUser | null> {
|
|
|
|
|
const userPlugins = plugins ?? [];
|
|
|
|
|
if (action === 'install') {
|
|
|
|
|
return updateUser(userId, { plugins: [...userPlugins, pluginKey] });
|
|
|
|
|
}
|
|
|
|
|
if (action === 'uninstall') {
|
|
|
|
|
return updateUser(userId, {
|
|
|
|
|
plugins: userPlugins.filter((plugin) => plugin !== pluginKey),
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
2025-05-30 22:18:13 -04:00
|
|
|
return {
|
|
|
|
|
findUser,
|
|
|
|
|
countUsers,
|
|
|
|
|
createUser,
|
|
|
|
|
updateUser,
|
2025-06-23 10:22:27 -04:00
|
|
|
searchUsers,
|
2025-05-30 22:18:13 -04:00
|
|
|
getUserById,
|
|
|
|
|
generateToken,
|
2025-06-23 10:22:27 -04:00
|
|
|
deleteUserById,
|
🧵 refactor: Migrate Endpoint Initialization to TypeScript (#10794)
* refactor: move endpoint initialization methods to typescript
* refactor: move agent init to packages/api
- Introduced `initialize.ts` for agent initialization, including file processing and tool loading.
- Updated `resources.ts` to allow optional appConfig parameter.
- Enhanced endpoint configuration handling in various initialization files to support model parameters.
- Added new artifacts and prompts for React component generation.
- Refactored existing code to improve type safety and maintainability.
* refactor: streamline endpoint initialization and enhance type safety
- Updated initialization functions across various endpoints to use a consistent request structure, replacing `unknown` types with `ServerResponse`.
- Simplified request handling by directly extracting keys from the request body.
- Improved type safety by ensuring user IDs are safely accessed with optional chaining.
- Removed unnecessary parameters and streamlined model options handling for better clarity and maintainability.
* refactor: moved ModelService and extractBaseURL to packages/api
- Added comprehensive tests for the models fetching functionality, covering scenarios for OpenAI, Anthropic, Google, and Ollama models.
- Updated existing endpoint index to include the new models module.
- Enhanced utility functions for URL extraction and model data processing.
- Improved type safety and error handling across the models fetching logic.
* refactor: consolidate utility functions and remove unused files
- Merged `deriveBaseURL` and `extractBaseURL` into the `@librechat/api` module for better organization.
- Removed redundant utility files and their associated tests to streamline the codebase.
- Updated imports across various client files to utilize the new consolidated functions.
- Enhanced overall maintainability by reducing the number of utility modules.
* refactor: replace ModelService references with direct imports from @librechat/api and remove ModelService file
* refactor: move encrypt/decrypt methods and key db methods to data-schemas, use `getProviderConfig` from `@librechat/api`
* chore: remove unused 'res' from options in AgentClient
* refactor: file model imports and methods
- Updated imports in various controllers and services to use the unified file model from '~/models' instead of '~/models/File'.
- Consolidated file-related methods into a new file methods module in the data-schemas package.
- Added comprehensive tests for file methods including creation, retrieval, updating, and deletion.
- Enhanced the initializeAgent function to accept dependency injection for file-related methods.
- Improved error handling and logging in file methods.
* refactor: streamline database method references in agent initialization
* refactor: enhance file method tests and update type references to IMongoFile
* refactor: consolidate database method imports in agent client and initialization
* chore: remove redundant import of initializeAgent from @librechat/api
* refactor: move checkUserKeyExpiry utility to @librechat/api and update references across endpoints
* refactor: move updateUserPlugins logic to user.ts and simplify UserController
* refactor: update imports for user key management and remove UserService
* refactor: remove unused Anthropics and Bedrock endpoint files and clean up imports
* refactor: consolidate and update encryption imports across various files to use @librechat/data-schemas
* chore: update file model mock to use unified import from '~/models'
* chore: import order
* refactor: remove migrated to TS agent.js file and its associated logic from the endpoints
* chore: add reusable function to extract imports from source code in unused-packages workflow
* chore: enhance unused-packages workflow to include @librechat/api dependencies and improve dependency extraction
* chore: improve dependency extraction in unused-packages workflow with enhanced error handling and debugging output
* chore: add detailed debugging output to unused-packages workflow for better visibility into unused dependencies and exclusion lists
* chore: refine subpath handling in unused-packages workflow to correctly process scoped and non-scoped package imports
* chore: clean up unused debug output in unused-packages workflow and reorganize type imports in initialize.ts
2025-12-03 17:21:41 -05:00
|
|
|
updateUserPlugins,
|
🧠 feat: User Memories for Conversational Context (#7760)
* 🧠 feat: User Memories for Conversational Context
chore: mcp typing, use `t`
WIP: first pass, Memories UI
- Added MemoryViewer component for displaying, editing, and deleting user memories.
- Integrated data provider hooks for fetching, updating, and deleting memories.
- Implemented pagination and loading states for better user experience.
- Created unit tests for MemoryViewer to ensure functionality and interaction with data provider.
- Updated translation files to include new UI strings related to memories.
chore: move mcp-related files to own directory
chore: rename librechat-mcp to librechat-api
WIP: first pass, memory processing and data schemas
chore: linting in fileSearch.js query description
chore: rename librechat-api to @librechat/api across the project
WIP: first pass, functional memory agent
feat: add MemoryEditDialog and MemoryViewer components for managing user memories
- Introduced MemoryEditDialog for editing memory entries with validation and toast notifications.
- Updated MemoryViewer to support editing and deleting memories, including pagination and loading states.
- Enhanced data provider to handle memory updates with optional original key for better management.
- Added new localization strings for memory-related UI elements.
feat: add memory permissions management
- Implemented memory permissions in the backend, allowing roles to have specific permissions for using, creating, updating, and reading memories.
- Added new API endpoints for updating memory permissions associated with roles.
- Created a new AdminSettings component for managing memory permissions in the frontend.
- Integrated memory permissions into the existing roles and permissions schemas.
- Updated the interface to include memory settings and permissions.
- Enhanced the MemoryViewer component to conditionally render admin settings based on user roles.
- Added localization support for memory permissions in the translation files.
feat: move AdminSettings component to a new position in MemoryViewer for better visibility
refactor: clean up commented code in MemoryViewer component
feat: enhance MemoryViewer with search functionality and improve MemoryEditDialog integration
- Added a search input to filter memories in the MemoryViewer component.
- Refactored MemoryEditDialog to accept children for better customization.
- Updated MemoryViewer to utilize the new EditMemoryButton and DeleteMemoryButton components for editing and deleting memories.
- Improved localization support by adding new strings for memory filtering and deletion confirmation.
refactor: optimize memory filtering in MemoryViewer using match-sorter
- Replaced manual filtering logic with match-sorter for improved search functionality.
- Enhanced performance and readability of the filteredMemories computation.
feat: enhance MemoryEditDialog with triggerRef and improve updateMemory mutation handling
feat: implement access control for MemoryEditDialog and MemoryViewer components
refactor: remove commented out code and create runMemory method
refactor: rename role based files
feat: implement access control for memory usage in AgentClient
refactor: simplify checkVisionRequest method in AgentClient by removing commented-out code
refactor: make `agents` dir in api package
refactor: migrate Azure utilities to TypeScript and consolidate imports
refactor: move sanitizeFilename function to a new file and update imports, add related tests
refactor: update LLM configuration types and consolidate Azure options in the API package
chore: linting
chore: import order
refactor: replace getLLMConfig with getOpenAIConfig and remove unused LLM configuration file
chore: update winston-daily-rotate-file to version 5.0.0 and add object-hash dependency in package-lock.json
refactor: move primeResources and optionalChainWithEmptyCheck functions to resources.ts and update imports
refactor: move createRun function to a new run.ts file and update related imports
fix: ensure safeAttachments is correctly typed as an array of TFile
chore: add node-fetch dependency and refactor fetch-related functions into packages/api/utils, removing the old generators file
refactor: enhance TEndpointOption type by using Pick to streamline endpoint fields and add new properties for model parameters and client options
feat: implement initializeOpenAIOptions function and update OpenAI types for enhanced configuration handling
fix: update types due to new TEndpointOption typing
fix: ensure safe access to group parameters in initializeOpenAIOptions function
fix: remove redundant API key validation comment in initializeOpenAIOptions function
refactor: rename initializeOpenAIOptions to initializeOpenAI for consistency and update related documentation
refactor: decouple req.body fields and tool loading from initializeAgentOptions
chore: linting
refactor: adjust column widths in MemoryViewer for improved layout
refactor: simplify agent initialization by creating loadAgent function and removing unused code
feat: add memory configuration loading and validation functions
WIP: first pass, memory processing with config
feat: implement memory callback and artifact handling
feat: implement memory artifacts display and processing updates
feat: add memory configuration options and schema validation for validKeys
fix: update MemoryEditDialog and MemoryViewer to handle memory state and display improvements
refactor: remove padding from BookmarkTable and MemoryViewer headers for consistent styling
WIP: initial tokenLimit config and move Tokenizer to @librechat/api
refactor: update mongoMeili plugin methods to use callback for better error handling
feat: enhance memory management with token tracking and usage metrics
- Added token counting for memory entries to enforce limits and provide usage statistics.
- Updated memory retrieval and update routes to include total token usage and limit.
- Enhanced MemoryEditDialog and MemoryViewer components to display memory usage and token information.
- Refactored memory processing functions to handle token limits and provide feedback on memory capacity.
feat: implement memory artifact handling in attachment handler
- Enhanced useAttachmentHandler to process memory artifacts when receiving updates.
- Introduced handleMemoryArtifact utility to manage memory updates and deletions.
- Updated query client to reflect changes in memory state based on incoming data.
refactor: restructure web search key extraction logic
- Moved the logic for extracting API keys from the webSearchAuth configuration into a dedicated function, getWebSearchKeys.
- Updated webSearchKeys to utilize the new function for improved clarity and maintainability.
- Prevents build time errors
feat: add personalization settings and memory preferences management
- Introduced a new Personalization tab in settings to manage user memory preferences.
- Implemented API endpoints and client-side logic for updating memory preferences.
- Enhanced user interface components to reflect personalization options and memory usage.
- Updated permissions to allow users to opt out of memory features.
- Added localization support for new settings and messages related to personalization.
style: personalization switch class
feat: add PersonalizationIcon and align Side Panel UI
feat: implement memory creation functionality
- Added a new API endpoint for creating memory entries, including validation for key and value.
- Introduced MemoryCreateDialog component for user interface to facilitate memory creation.
- Integrated token limit checks to prevent exceeding user memory capacity.
- Updated MemoryViewer to include a button for opening the memory creation dialog.
- Enhanced localization support for new messages related to memory creation.
feat: enhance message processing with configurable window size
- Updated AgentClient to use a configurable message window size for processing messages.
- Introduced messageWindowSize option in memory configuration schema with a default value of 5.
- Improved logic for selecting messages to process based on the configured window size.
chore: update librechat-data-provider version to 0.7.87 in package.json and package-lock.json
chore: remove OpenAPIPlugin and its associated tests
chore: remove MIGRATION_README.md as migration tasks are completed
ci: fix backend tests
chore: remove unused translation keys from localization file
chore: remove problematic test file and unused var in AgentClient
chore: remove unused import and import directly for JSDoc
* feat: add api package build stage in Dockerfile for improved modularity
* docs: reorder build steps in contributing guide for clarity
2025-06-07 18:52:22 -04:00
|
|
|
toggleUserMemories,
|
2025-05-30 22:18:13 -04:00
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export type UserMethods = ReturnType<typeof createUserMethods>;
|