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
170 lines
8.1 KiB
JavaScript
170 lines
8.1 KiB
JavaScript
const {
|
|
SystemRoles,
|
|
Permissions,
|
|
PermissionTypes,
|
|
removeNullishValues,
|
|
} = require('librechat-data-provider');
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const { isMemoryEnabled } = require('@librechat/api');
|
|
const { updateAccessPermissions } = require('~/models/Role');
|
|
|
|
/**
|
|
* Loads the default interface object.
|
|
* @param {TCustomConfig | undefined} config - The loaded custom configuration.
|
|
* @param {TConfigDefaults} configDefaults - The custom configuration default values.
|
|
* @param {SystemRoles} [roleName] - The role to load the default interface for, defaults to `'USER'`.
|
|
* @returns {Promise<TCustomConfig['interface']>} The default interface object.
|
|
*/
|
|
async function loadDefaultInterface(config, configDefaults, roleName = SystemRoles.USER) {
|
|
const { interface: interfaceConfig } = config ?? {};
|
|
const { interface: defaults } = configDefaults;
|
|
const hasModelSpecs = config?.modelSpecs?.list?.length > 0;
|
|
const includesAddedEndpoints = config?.modelSpecs?.addedEndpoints?.length > 0;
|
|
|
|
const memoryConfig = config?.memory;
|
|
const memoryEnabled = isMemoryEnabled(memoryConfig);
|
|
/** Only disable memories if memory config is present but disabled/invalid */
|
|
const shouldDisableMemories = memoryConfig && !memoryEnabled;
|
|
/** Check if personalization is enabled (defaults to true if memory is configured and enabled) */
|
|
const isPersonalizationEnabled =
|
|
memoryConfig && memoryEnabled && memoryConfig.personalize !== false;
|
|
|
|
/** @type {TCustomConfig['interface']} */
|
|
const loadedInterface = removeNullishValues({
|
|
endpointsMenu:
|
|
interfaceConfig?.endpointsMenu ?? (hasModelSpecs ? false : defaults.endpointsMenu),
|
|
modelSelect:
|
|
interfaceConfig?.modelSelect ??
|
|
(hasModelSpecs ? includesAddedEndpoints : defaults.modelSelect),
|
|
parameters: interfaceConfig?.parameters ?? (hasModelSpecs ? false : defaults.parameters),
|
|
presets: interfaceConfig?.presets ?? (hasModelSpecs ? false : defaults.presets),
|
|
sidePanel: interfaceConfig?.sidePanel ?? defaults.sidePanel,
|
|
privacyPolicy: interfaceConfig?.privacyPolicy ?? defaults.privacyPolicy,
|
|
termsOfService: interfaceConfig?.termsOfService ?? defaults.termsOfService,
|
|
mcpServers: interfaceConfig?.mcpServers ?? defaults.mcpServers,
|
|
bookmarks: interfaceConfig?.bookmarks ?? defaults.bookmarks,
|
|
memories: shouldDisableMemories ? false : (interfaceConfig?.memories ?? defaults.memories),
|
|
prompts: interfaceConfig?.prompts ?? defaults.prompts,
|
|
multiConvo: interfaceConfig?.multiConvo ?? defaults.multiConvo,
|
|
agents: interfaceConfig?.agents ?? defaults.agents,
|
|
temporaryChat: interfaceConfig?.temporaryChat ?? defaults.temporaryChat,
|
|
runCode: interfaceConfig?.runCode ?? defaults.runCode,
|
|
webSearch: interfaceConfig?.webSearch ?? defaults.webSearch,
|
|
fileSearch: interfaceConfig?.fileSearch ?? defaults.fileSearch,
|
|
fileCitations: interfaceConfig?.fileCitations ?? defaults.fileCitations,
|
|
customWelcome: interfaceConfig?.customWelcome ?? defaults.customWelcome,
|
|
peoplePicker: {
|
|
admin: {
|
|
users: interfaceConfig?.peoplePicker?.admin?.users ?? defaults.peoplePicker?.admin.users,
|
|
groups: interfaceConfig?.peoplePicker?.admin?.groups ?? defaults.peoplePicker?.admin.groups,
|
|
},
|
|
user: {
|
|
users: interfaceConfig?.peoplePicker?.user?.users ?? defaults.peoplePicker?.user.users,
|
|
groups: interfaceConfig?.peoplePicker?.user?.groups ?? defaults.peoplePicker?.user.groups,
|
|
},
|
|
},
|
|
marketplace: {
|
|
admin: {
|
|
use: interfaceConfig?.marketplace?.admin?.use ?? defaults.marketplace?.admin.use,
|
|
},
|
|
user: {
|
|
use: interfaceConfig?.marketplace?.user?.use ?? defaults.marketplace?.user.use,
|
|
},
|
|
},
|
|
});
|
|
|
|
await updateAccessPermissions(roleName, {
|
|
[PermissionTypes.PROMPTS]: { [Permissions.USE]: loadedInterface.prompts },
|
|
[PermissionTypes.BOOKMARKS]: { [Permissions.USE]: loadedInterface.bookmarks },
|
|
[PermissionTypes.MEMORIES]: {
|
|
[Permissions.USE]: loadedInterface.memories,
|
|
[Permissions.OPT_OUT]: isPersonalizationEnabled,
|
|
},
|
|
[PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: loadedInterface.multiConvo },
|
|
[PermissionTypes.AGENTS]: { [Permissions.USE]: loadedInterface.agents },
|
|
[PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: loadedInterface.temporaryChat },
|
|
[PermissionTypes.RUN_CODE]: { [Permissions.USE]: loadedInterface.runCode },
|
|
[PermissionTypes.WEB_SEARCH]: { [Permissions.USE]: loadedInterface.webSearch },
|
|
[PermissionTypes.PEOPLE_PICKER]: {
|
|
[Permissions.VIEW_USERS]: loadedInterface.peoplePicker.user?.users,
|
|
[Permissions.VIEW_GROUPS]: loadedInterface.peoplePicker.user?.groups,
|
|
},
|
|
[PermissionTypes.MARKETPLACE]: {
|
|
[Permissions.USE]: loadedInterface.marketplace.user?.use,
|
|
},
|
|
[PermissionTypes.FILE_SEARCH]: { [Permissions.USE]: loadedInterface.fileSearch },
|
|
[PermissionTypes.FILE_CITATIONS]: { [Permissions.USE]: loadedInterface.fileCitations },
|
|
});
|
|
await updateAccessPermissions(SystemRoles.ADMIN, {
|
|
[PermissionTypes.PROMPTS]: { [Permissions.USE]: loadedInterface.prompts },
|
|
[PermissionTypes.BOOKMARKS]: { [Permissions.USE]: loadedInterface.bookmarks },
|
|
[PermissionTypes.MEMORIES]: {
|
|
[Permissions.USE]: loadedInterface.memories,
|
|
[Permissions.OPT_OUT]: isPersonalizationEnabled,
|
|
},
|
|
[PermissionTypes.MULTI_CONVO]: { [Permissions.USE]: loadedInterface.multiConvo },
|
|
[PermissionTypes.AGENTS]: { [Permissions.USE]: loadedInterface.agents },
|
|
[PermissionTypes.TEMPORARY_CHAT]: { [Permissions.USE]: loadedInterface.temporaryChat },
|
|
[PermissionTypes.RUN_CODE]: { [Permissions.USE]: loadedInterface.runCode },
|
|
[PermissionTypes.WEB_SEARCH]: { [Permissions.USE]: loadedInterface.webSearch },
|
|
[PermissionTypes.PEOPLE_PICKER]: {
|
|
[Permissions.VIEW_USERS]: loadedInterface.peoplePicker.admin?.users,
|
|
[Permissions.VIEW_GROUPS]: loadedInterface.peoplePicker.admin?.groups,
|
|
},
|
|
[PermissionTypes.MARKETPLACE]: {
|
|
[Permissions.USE]: loadedInterface.marketplace.admin?.use,
|
|
},
|
|
[PermissionTypes.FILE_SEARCH]: { [Permissions.USE]: loadedInterface.fileSearch },
|
|
[PermissionTypes.FILE_CITATIONS]: { [Permissions.USE]: loadedInterface.fileCitations },
|
|
});
|
|
|
|
let i = 0;
|
|
const logSettings = () => {
|
|
// log interface object and model specs object (without list) for reference
|
|
logger.warn(`\`interface\` settings:\n${JSON.stringify(loadedInterface, null, 2)}`);
|
|
logger.warn(
|
|
`\`modelSpecs\` settings:\n${JSON.stringify(
|
|
{ ...(config?.modelSpecs ?? {}), list: undefined },
|
|
null,
|
|
2,
|
|
)}`,
|
|
);
|
|
};
|
|
|
|
// warn about config.modelSpecs.prioritize if true and presets are enabled, that default presets will conflict with prioritizing model specs.
|
|
if (config?.modelSpecs?.prioritize && loadedInterface.presets) {
|
|
logger.warn(
|
|
"Note: Prioritizing model specs can conflict with default presets if a default preset is set. It's recommended to disable presets from the interface or disable use of a default preset.",
|
|
);
|
|
i === 0 && i++;
|
|
}
|
|
|
|
// warn about config.modelSpecs.enforce if true and if any of these, endpointsMenu, modelSelect, presets, or parameters are enabled, that enforcing model specs can conflict with these options.
|
|
if (
|
|
config?.modelSpecs?.enforce &&
|
|
(loadedInterface.endpointsMenu ||
|
|
loadedInterface.modelSelect ||
|
|
loadedInterface.presets ||
|
|
loadedInterface.parameters)
|
|
) {
|
|
logger.warn(
|
|
"Note: Enforcing model specs can conflict with the interface options: endpointsMenu, modelSelect, presets, and parameters. It's recommended to disable these options from the interface or disable enforcing model specs.",
|
|
);
|
|
i === 0 && i++;
|
|
}
|
|
// warn if enforce is true and prioritize is not, that enforcing model specs without prioritizing them can lead to unexpected behavior.
|
|
if (config?.modelSpecs?.enforce && !config?.modelSpecs?.prioritize) {
|
|
logger.warn(
|
|
"Note: Enforcing model specs without prioritizing them can lead to unexpected behavior. It's recommended to enable prioritizing model specs if enforcing them.",
|
|
);
|
|
i === 0 && i++;
|
|
}
|
|
|
|
if (i > 0) {
|
|
logSettings();
|
|
}
|
|
|
|
return loadedInterface;
|
|
}
|
|
|
|
module.exports = { loadDefaultInterface };
|