mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02:00

bugfix: Enhance Agent and AgentCategory schemas with new fields for category, support contact, and promotion status refactored and moved agent category methods and schema to data-schema package 🔧 fix: Merge and Rebase Conflicts - Move AgentCategory from api/models to @packages/data-schemas structure - Add schema, types, methods, and model following codebase conventions - Implement auto-seeding of default categories during AppService startup - Update marketplace controller to use new data-schemas methods - Remove old model file and standalone seed script refactor: unify agent marketplace to single endpoint with cursor pagination - Replace multiple marketplace routes with unified /marketplace endpoint - Add query string controls: category, search, limit, cursor, promoted, requiredPermission - Implement cursor-based pagination replacing page-based system - Integrate ACL permissions for proper access control - Fix ObjectId constructor error in Agent model - Update React components to use unified useGetMarketplaceAgentsQuery hook - Enhance type safety and remove deprecated useDynamicAgentQuery - Update tests for new marketplace architecture -Known issues: see more button after category switching + Unit tests feat: add icon property to ProcessedAgentCategory interface - Add useMarketplaceAgentsInfiniteQuery and useGetAgentCategoriesQuery to client/src/data-provider/Agents/ - Replace manual pagination in AgentGrid with infinite query pattern - Update imports to use local data provider instead of librechat-data-provider - Add proper permission handling with PERMISSION_BITS.VIEW/EDIT constants - Improve agent access control by adding requiredPermission validation in backend - Remove manual cursor/state management in favor of infinite query built-ins - Maintain existing search and category filtering functionality refactor: consolidate agent marketplace endpoints into main agents API and improve data management consistency - Remove dedicated marketplace controller and routes, merging functionality into main agents v1 API - Add countPromotedAgents function to Agent model for promoted agents count - Enhance getListAgents handler with marketplace filtering (category, search, promoted status) - Move getAgentCategories from marketplace to v1 controller with same functionality - Update agent mutations to invalidate marketplace queries and handle multiple permission levels - Improve cache management by updating all agent query variants (VIEW/EDIT permissions) - Consolidate agent data access patterns for better maintainability and consistency - Remove duplicate marketplace route definitions and middleware selected view only agents injected in the drop down fix: remove minlength validation for support contact name in agent schema feat: add validation and error messages for agent name in AgentConfig and AgentPanel fix: update agent permission check logic in AgentPanel to simplify condition Fix linting WIP Fix Unit tests WIP ESLint fixes eslint fix refactor: enhance isDuplicateVersion function in Agent model for improved comparison logic - Introduced handling for undefined/null values in array and object comparisons. - Normalized array comparisons to treat undefined/null as empty arrays. - Added deep comparison for objects and improved handling of primitive values. - Enhanced projectIds comparison to ensure consistent MongoDB ObjectId handling. refactor: remove redundant properties from IAgent interface in agent schema chore: update localization for agent detail component and clean up imports ci: update access middleware tests chore: remove unused PermissionTypes import from Role model ci: update AclEntry model tests ci: update button accessibility labels in AgentDetail tests refactor: update exhaustive dep. lint warning 🔧 fix: Fixed agent actions access feat: Add role-level permissions for agent sharing people picker - Add PEOPLE_PICKER permission type with VIEW_USERS and VIEW_GROUPS permissions - Create custom middleware for query-aware permission validation - Implement permission-based type filtering in PeoplePicker component - Hide people picker UI when user lacks permissions, show only public toggle - Support granular access: users-only, groups-only, or mixed search modes refactor: Replace marketplace interface config with permission-based system - Add MARKETPLACE permission type to handle marketplace access control - Update interface configuration to use role-based marketplace settings (admin/user) - Replace direct marketplace boolean config with permission-based checks - Modify frontend components to use marketplace permissions instead of interface config - Update agent query hooks to use marketplace permissions for determining permission levels - Add marketplace configuration structure similar to peoplePicker in YAML config - Backend now sets MARKETPLACE permissions based on interface configuration - When marketplace enabled: users get agents with EDIT permissions in dropdown lists (builder mode) - When marketplace disabled: users get agents with VIEW permissions in dropdown lists (browse mode) 🔧 fix: Redirect to New Chat if No Marketplace Access and Required Agent Name Placeholder (#8213) * Fix: Fix the redirect to new chat page if access to marketplace is denied * Fixed the required agent name placeholder --------- Co-authored-by: Atef Bellaaj <slalom.bellaaj@external.daimlertruck.com> chore: fix tests, remove unnecessary imports refactor: Implement permission checks for file access via agents - Updated `hasAccessToFilesViaAgent` to utilize permission checks for VIEW and EDIT access. - Replaced project-based access validation with permission-based checks. - Enhanced tests to cover new permission logic and ensure proper access control for files associated with agents. - Cleaned up imports and initialized models in test files for consistency. refactor: Enhance test setup and cleanup for file access control - Introduced modelsToCleanup array to track models added during tests for proper cleanup. - Updated afterAll hooks in test files to ensure all collections are cleared and only added models are deleted. - Improved consistency in model initialization across test files. - Added comments for clarity on cleanup processes and test data management. chore: Update Jest configuration and test setup for improved timeout handling - Added a global test timeout of 30 seconds in jest.config.js. - Configured jest.setTimeout in jestSetup.js to allow individual test overrides if needed. - Enhanced test reliability by ensuring consistent timeout settings across all tests. refactor: Implement file access filtering based on agent permissions - Introduced `filterFilesByAgentAccess` function to filter files based on user access through agents. - Updated `getFiles` and `primeFiles` functions to utilize the new filtering logic. - Moved `hasAccessToFilesViaAgent` function from the File model to permission services, adjusting imports accordingly - Enhanced tests to ensure proper access control and filtering behavior for files associated with agents. fix: make support_contact field a nested object rather than a sub-document refactor: Update support_contact field initialization in agent model - Removed handling for empty support_contact object in createAgent function. - Changed default value of support_contact in agent schema to undefined. test: Add comprehensive tests for support_contact field handling and versioning refactor: remove unused avatar upload mutation field and add informational toast for success chore: add missing SidePanelProvider for AgentMarketplace and organize imports fix: resolve agent selection race condition in marketplace HandleStartChat - Set agent in localStorage before newConversation to prevent useSelectorEffects from auto-selecting previous agent fix: resolve agent dropdown showing raw ID instead of agent info from URL - Add proactive agent fetching when agent_id is present in URL parameters - Inject fetched agent into agents cache so dropdowns display proper name/avatar - Use useAgentsMap dependency to ensure proper cache initialization timing - Prevents raw agent IDs from showing in UI when visiting shared agent links Fix: Agents endpoint renamed to "My Agent" for less confusion with the Marketplace agents. chore: fix ESLint issues and Test Mocks ci: update permissions structure in loadDefaultInterface tests - Refactored permissions for MEMORY and added new permissions for MARKETPLACE and PEOPLE_PICKER. - Ensured consistent structure for permissions across different types. feat: support_contact validation to allow empty email strings
179 lines
6 KiB
JavaScript
179 lines
6 KiB
JavaScript
const { logger } = require('@librechat/data-schemas');
|
|
const { EToolResources, FileContext } = require('librechat-data-provider');
|
|
const { File } = require('~/db/models');
|
|
|
|
/**
|
|
* Finds a file by its file_id with additional query options.
|
|
* @param {string} file_id - The unique identifier of the file.
|
|
* @param {object} options - Query options for filtering, projection, etc.
|
|
* @returns {Promise<MongoFile>} A promise that resolves to the file document or null.
|
|
*/
|
|
const findFileById = async (file_id, options = {}) => {
|
|
return await File.findOne({ file_id, ...options }).lean();
|
|
};
|
|
|
|
/**
|
|
* Retrieves files matching a given filter, sorted by the most recently updated.
|
|
* @param {Object} filter - The filter criteria to apply.
|
|
* @param {Object} [_sortOptions] - Optional sort parameters.
|
|
* @param {Object|String} [selectFields={ text: 0 }] - Fields to include/exclude in the query results.
|
|
* Default excludes the 'text' field.
|
|
* @returns {Promise<Array<MongoFile>>} A promise that resolves to an array of file documents.
|
|
*/
|
|
const getFiles = async (filter, _sortOptions, selectFields = { text: 0 }) => {
|
|
const sortOptions = { updatedAt: -1, ..._sortOptions };
|
|
return await File.find(filter).select(selectFields).sort(sortOptions).lean();
|
|
};
|
|
|
|
/**
|
|
* Retrieves tool files (files that are embedded or have a fileIdentifier) from an array of file IDs
|
|
* @param {string[]} fileIds - Array of file_id strings to search for
|
|
* @param {Set<EToolResources>} toolResourceSet - Optional filter for tool resources
|
|
* @returns {Promise<Array<MongoFile>>} Files that match the criteria
|
|
*/
|
|
const getToolFilesByIds = async (fileIds, toolResourceSet) => {
|
|
if (!fileIds || !fileIds.length || !toolResourceSet?.size) {
|
|
return [];
|
|
}
|
|
|
|
try {
|
|
const filter = {
|
|
file_id: { $in: fileIds },
|
|
$or: [],
|
|
};
|
|
|
|
if (toolResourceSet.has(EToolResources.ocr)) {
|
|
filter.$or.push({ text: { $exists: true, $ne: null }, context: FileContext.agents });
|
|
}
|
|
if (toolResourceSet.has(EToolResources.file_search)) {
|
|
filter.$or.push({ embedded: true });
|
|
}
|
|
if (toolResourceSet.has(EToolResources.execute_code)) {
|
|
filter.$or.push({ 'metadata.fileIdentifier': { $exists: true } });
|
|
}
|
|
|
|
const selectFields = { text: 0 };
|
|
const sortOptions = { updatedAt: -1 };
|
|
|
|
return await getFiles(filter, sortOptions, selectFields);
|
|
} catch (error) {
|
|
logger.error('[getToolFilesByIds] Error retrieving tool files:', error);
|
|
throw new Error('Error retrieving tool files');
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Creates a new file with a TTL of 1 hour.
|
|
* @param {MongoFile} data - The file data to be created, must contain file_id.
|
|
* @param {boolean} disableTTL - Whether to disable the TTL.
|
|
* @returns {Promise<MongoFile>} A promise that resolves to the created file document.
|
|
*/
|
|
const createFile = async (data, disableTTL) => {
|
|
const fileData = {
|
|
...data,
|
|
expiresAt: new Date(Date.now() + 3600 * 1000),
|
|
};
|
|
|
|
if (disableTTL) {
|
|
delete fileData.expiresAt;
|
|
}
|
|
|
|
return await File.findOneAndUpdate({ file_id: data.file_id }, fileData, {
|
|
new: true,
|
|
upsert: true,
|
|
}).lean();
|
|
};
|
|
|
|
/**
|
|
* Updates a file identified by file_id with new data and removes the TTL.
|
|
* @param {MongoFile} data - The data to update, must contain file_id.
|
|
* @returns {Promise<MongoFile>} A promise that resolves to the updated file document.
|
|
*/
|
|
const updateFile = async (data) => {
|
|
const { file_id, ...update } = data;
|
|
const updateOperation = {
|
|
$set: update,
|
|
$unset: { expiresAt: '' }, // Remove the expiresAt field to prevent TTL
|
|
};
|
|
return await File.findOneAndUpdate({ file_id }, updateOperation, { new: true }).lean();
|
|
};
|
|
|
|
/**
|
|
* Increments the usage of a file identified by file_id.
|
|
* @param {MongoFile} data - The data to update, must contain file_id and the increment value for usage.
|
|
* @returns {Promise<MongoFile>} A promise that resolves to the updated file document.
|
|
*/
|
|
const updateFileUsage = async (data) => {
|
|
const { file_id, inc = 1 } = data;
|
|
const updateOperation = {
|
|
$inc: { usage: inc },
|
|
$unset: { expiresAt: '', temp_file_id: '' },
|
|
};
|
|
return await File.findOneAndUpdate({ file_id }, updateOperation, { new: true }).lean();
|
|
};
|
|
|
|
/**
|
|
* Deletes a file identified by file_id.
|
|
* @param {string} file_id - The unique identifier of the file to delete.
|
|
* @returns {Promise<MongoFile>} A promise that resolves to the deleted file document or null.
|
|
*/
|
|
const deleteFile = async (file_id) => {
|
|
return await File.findOneAndDelete({ file_id }).lean();
|
|
};
|
|
|
|
/**
|
|
* Deletes a file identified by a filter.
|
|
* @param {object} filter - The filter criteria to apply.
|
|
* @returns {Promise<MongoFile>} A promise that resolves to the deleted file document or null.
|
|
*/
|
|
const deleteFileByFilter = async (filter) => {
|
|
return await File.findOneAndDelete(filter).lean();
|
|
};
|
|
|
|
/**
|
|
* Deletes multiple files identified by an array of file_ids.
|
|
* @param {Array<string>} file_ids - The unique identifiers of the files to delete.
|
|
* @returns {Promise<Object>} A promise that resolves to the result of the deletion operation.
|
|
*/
|
|
const deleteFiles = async (file_ids, user) => {
|
|
let deleteQuery = { file_id: { $in: file_ids } };
|
|
if (user) {
|
|
deleteQuery = { user: user };
|
|
}
|
|
return await File.deleteMany(deleteQuery);
|
|
};
|
|
|
|
/**
|
|
* Batch updates files with new signed URLs in MongoDB
|
|
*
|
|
* @param {MongoFile[]} updates - Array of updates in the format { file_id, filepath }
|
|
* @returns {Promise<void>}
|
|
*/
|
|
async function batchUpdateFiles(updates) {
|
|
if (!updates || updates.length === 0) {
|
|
return;
|
|
}
|
|
|
|
const bulkOperations = updates.map((update) => ({
|
|
updateOne: {
|
|
filter: { file_id: update.file_id },
|
|
update: { $set: { filepath: update.filepath } },
|
|
},
|
|
}));
|
|
|
|
const result = await File.bulkWrite(bulkOperations);
|
|
logger.info(`Updated ${result.modifiedCount} files with new S3 URLs`);
|
|
}
|
|
|
|
module.exports = {
|
|
findFileById,
|
|
getFiles,
|
|
getToolFilesByIds,
|
|
createFile,
|
|
updateFile,
|
|
updateFileUsage,
|
|
deleteFile,
|
|
deleteFiles,
|
|
deleteFileByFilter,
|
|
batchUpdateFiles,
|
|
};
|