mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-21 02:40:14 +01:00
🏪 feat: Agent Marketplace
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
This commit is contained in:
“Praneeth
Danny Avila
parent
66bd419baa
commit
949682ef0f
95 changed files with 3770 additions and 2728 deletions
|
|
@ -271,22 +271,7 @@ describe('AclEntry Model Tests', () => {
|
|||
const effective = await methods.getEffectivePermissions(principalsList, 'agent', resourceId);
|
||||
|
||||
/** Combined permissions should be VIEW | EDIT */
|
||||
expect(effective.effectiveBits).toBe(PermissionBits.VIEW | PermissionBits.EDIT);
|
||||
|
||||
/** Should have 2 sources */
|
||||
expect(effective.sources).toHaveLength(2);
|
||||
|
||||
/** Check sources */
|
||||
const userSource = effective.sources.find((s) => s.from === 'user');
|
||||
const groupSource = effective.sources.find((s) => s.from === 'group');
|
||||
|
||||
expect(userSource).toBeDefined();
|
||||
expect(userSource?.permBits).toBe(PermissionBits.VIEW);
|
||||
expect(userSource?.direct).toBe(true);
|
||||
|
||||
expect(groupSource).toBeDefined();
|
||||
expect(groupSource?.permBits).toBe(PermissionBits.EDIT);
|
||||
expect(groupSource?.direct).toBe(true);
|
||||
expect(effective).toBe(PermissionBits.VIEW | PermissionBits.EDIT);
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -489,16 +474,15 @@ describe('AclEntry Model Tests', () => {
|
|||
inheritedFrom: projectId,
|
||||
});
|
||||
|
||||
/** Get effective permissions including sources */
|
||||
/** Get effective permissions */
|
||||
const effective = await methods.getEffectivePermissions(
|
||||
[{ principalType: 'user', principalId: userId }],
|
||||
'agent',
|
||||
childResourceId,
|
||||
);
|
||||
|
||||
expect(effective.sources).toHaveLength(1);
|
||||
expect(effective.sources[0].inheritedFrom?.toString()).toBe(projectId.toString());
|
||||
expect(effective.sources[0].direct).toBe(false);
|
||||
/** Should have VIEW permission from inherited entry */
|
||||
expect(effective).toBe(PermissionBits.VIEW);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
222
packages/data-schemas/src/methods/agentCategory.ts
Normal file
222
packages/data-schemas/src/methods/agentCategory.ts
Normal file
|
|
@ -0,0 +1,222 @@
|
|||
import type { Model, Types, DeleteResult } from 'mongoose';
|
||||
import type { IAgentCategory, AgentCategory } from '../types/agentCategory';
|
||||
|
||||
export function createAgentCategoryMethods(mongoose: typeof import('mongoose')) {
|
||||
/**
|
||||
* Get all active categories sorted by order
|
||||
* @returns Array of active categories
|
||||
*/
|
||||
async function getActiveCategories(): Promise<IAgentCategory[]> {
|
||||
const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
|
||||
return await AgentCategory.find({ isActive: true }).sort({ order: 1, label: 1 }).lean();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get categories with agent counts
|
||||
* @returns Categories with agent counts
|
||||
*/
|
||||
async function getCategoriesWithCounts(): Promise<(IAgentCategory & { agentCount: number })[]> {
|
||||
const Agent = mongoose.models.Agent;
|
||||
|
||||
const categoryCounts = await Agent.aggregate([
|
||||
{ $match: { category: { $exists: true, $ne: null } } },
|
||||
{ $group: { _id: '$category', count: { $sum: 1 } } },
|
||||
]);
|
||||
|
||||
const countMap = new Map(categoryCounts.map((c) => [c._id, c.count]));
|
||||
const categories = await getActiveCategories();
|
||||
|
||||
return categories.map((category) => ({
|
||||
...category,
|
||||
agentCount: countMap.get(category.value) || (0 as number),
|
||||
})) as (IAgentCategory & { agentCount: number })[];
|
||||
}
|
||||
|
||||
/**
|
||||
* Get valid category values for Agent model validation
|
||||
* @returns Array of valid category values
|
||||
*/
|
||||
async function getValidCategoryValues(): Promise<string[]> {
|
||||
const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
|
||||
return await AgentCategory.find({ isActive: true }).distinct('value').lean();
|
||||
}
|
||||
|
||||
/**
|
||||
* Seed initial categories from existing constants
|
||||
* @param categories - Array of category data to seed
|
||||
* @returns Bulk write result
|
||||
*/
|
||||
async function seedCategories(
|
||||
categories: Array<{
|
||||
value: string;
|
||||
label?: string;
|
||||
description?: string;
|
||||
order?: number;
|
||||
}>,
|
||||
): Promise<any> {
|
||||
const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
|
||||
|
||||
const operations = categories.map((category, index) => ({
|
||||
updateOne: {
|
||||
filter: { value: category.value },
|
||||
update: {
|
||||
$setOnInsert: {
|
||||
value: category.value,
|
||||
label: category.label || category.value,
|
||||
description: category.description || '',
|
||||
order: category.order || index,
|
||||
isActive: true,
|
||||
},
|
||||
},
|
||||
upsert: true,
|
||||
},
|
||||
}));
|
||||
|
||||
return await AgentCategory.bulkWrite(operations);
|
||||
}
|
||||
|
||||
/**
|
||||
* Find a category by value
|
||||
* @param value - The category value to search for
|
||||
* @returns The category document or null
|
||||
*/
|
||||
async function findCategoryByValue(value: string): Promise<IAgentCategory | null> {
|
||||
const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
|
||||
return await AgentCategory.findOne({ value }).lean();
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new category
|
||||
* @param categoryData - The category data to create
|
||||
* @returns The created category
|
||||
*/
|
||||
async function createCategory(categoryData: Partial<IAgentCategory>): Promise<IAgentCategory> {
|
||||
const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
|
||||
const category = await AgentCategory.create(categoryData);
|
||||
return category.toObject() as IAgentCategory;
|
||||
}
|
||||
|
||||
/**
|
||||
* Update a category by value
|
||||
* @param value - The category value to update
|
||||
* @param updateData - The data to update
|
||||
* @returns The updated category or null
|
||||
*/
|
||||
async function updateCategory(
|
||||
value: string,
|
||||
updateData: Partial<IAgentCategory>,
|
||||
): Promise<IAgentCategory | null> {
|
||||
const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
|
||||
return await AgentCategory.findOneAndUpdate(
|
||||
{ value },
|
||||
{ $set: updateData },
|
||||
{ new: true, runValidators: true },
|
||||
).lean();
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete a category by value
|
||||
* @param value - The category value to delete
|
||||
* @returns Whether the deletion was successful
|
||||
*/
|
||||
async function deleteCategory(value: string): Promise<boolean> {
|
||||
const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
|
||||
const result = await AgentCategory.deleteOne({ value });
|
||||
return result.deletedCount > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find a category by ID
|
||||
* @param id - The category ID to search for
|
||||
* @returns The category document or null
|
||||
*/
|
||||
async function findCategoryById(id: string | Types.ObjectId): Promise<IAgentCategory | null> {
|
||||
const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
|
||||
return await AgentCategory.findById(id).lean();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all categories (active and inactive)
|
||||
* @returns Array of all categories
|
||||
*/
|
||||
async function getAllCategories(): Promise<IAgentCategory[]> {
|
||||
const AgentCategory = mongoose.models.AgentCategory as Model<IAgentCategory>;
|
||||
return await AgentCategory.find({}).sort({ order: 1, label: 1 }).lean();
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensure default categories exist, seed them if none are present
|
||||
* @returns Promise<boolean> - true if categories were seeded, false if they already existed
|
||||
*/
|
||||
async function ensureDefaultCategories(): Promise<boolean> {
|
||||
const existingCategories = await getAllCategories();
|
||||
|
||||
if (existingCategories.length > 0) {
|
||||
return false; // Categories already exist
|
||||
}
|
||||
|
||||
const defaultCategories = [
|
||||
{
|
||||
value: 'general',
|
||||
label: 'General',
|
||||
description: 'General purpose agents for common tasks and inquiries',
|
||||
order: 0,
|
||||
},
|
||||
{
|
||||
value: 'hr',
|
||||
label: 'Human Resources',
|
||||
description: 'Agents specialized in HR processes, policies, and employee support',
|
||||
order: 1,
|
||||
},
|
||||
{
|
||||
value: 'rd',
|
||||
label: 'Research & Development',
|
||||
description: 'Agents focused on R&D processes, innovation, and technical research',
|
||||
order: 2,
|
||||
},
|
||||
{
|
||||
value: 'finance',
|
||||
label: 'Finance',
|
||||
description: 'Agents specialized in financial analysis, budgeting, and accounting',
|
||||
order: 3,
|
||||
},
|
||||
{
|
||||
value: 'it',
|
||||
label: 'IT',
|
||||
description: 'Agents for IT support, technical troubleshooting, and system administration',
|
||||
order: 4,
|
||||
},
|
||||
{
|
||||
value: 'sales',
|
||||
label: 'Sales',
|
||||
description: 'Agents focused on sales processes, customer relations.',
|
||||
order: 5,
|
||||
},
|
||||
{
|
||||
value: 'aftersales',
|
||||
label: 'After Sales',
|
||||
description: 'Agents specialized in post-sale support, maintenance, and customer service',
|
||||
order: 6,
|
||||
},
|
||||
];
|
||||
|
||||
await seedCategories(defaultCategories);
|
||||
return true; // Categories were seeded
|
||||
}
|
||||
|
||||
return {
|
||||
getActiveCategories,
|
||||
getCategoriesWithCounts,
|
||||
getValidCategoryValues,
|
||||
seedCategories,
|
||||
findCategoryByValue,
|
||||
createCategory,
|
||||
updateCategory,
|
||||
deleteCategory,
|
||||
findCategoryById,
|
||||
getAllCategories,
|
||||
ensureDefaultCategories,
|
||||
};
|
||||
}
|
||||
|
||||
export type AgentCategoryMethods = ReturnType<typeof createAgentCategoryMethods>;
|
||||
|
|
@ -4,6 +4,8 @@ import { createTokenMethods, type TokenMethods } from './token';
|
|||
import { createRoleMethods, type RoleMethods } from './role';
|
||||
/* Memories */
|
||||
import { createMemoryMethods, type MemoryMethods } from './memory';
|
||||
/* Agent Categories */
|
||||
import { createAgentCategoryMethods, type AgentCategoryMethods } from './agentCategory';
|
||||
/* Permissions */
|
||||
import { createAccessRoleMethods, type AccessRoleMethods } from './accessRole';
|
||||
import { createUserGroupMethods, type UserGroupMethods } from './userGroup';
|
||||
|
|
@ -22,6 +24,7 @@ export function createMethods(mongoose: typeof import('mongoose')) {
|
|||
...createTokenMethods(mongoose),
|
||||
...createRoleMethods(mongoose),
|
||||
...createMemoryMethods(mongoose),
|
||||
...createAgentCategoryMethods(mongoose),
|
||||
...createAccessRoleMethods(mongoose),
|
||||
...createUserGroupMethods(mongoose),
|
||||
...createAclEntryMethods(mongoose),
|
||||
|
|
@ -37,6 +40,7 @@ export type AllMethods = UserMethods &
|
|||
TokenMethods &
|
||||
RoleMethods &
|
||||
MemoryMethods &
|
||||
AgentCategoryMethods &
|
||||
AccessRoleMethods &
|
||||
UserGroupMethods &
|
||||
AclEntryMethods &
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue