mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-18 16:35:31 +01: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
186 lines
5.2 KiB
TypeScript
186 lines
5.2 KiB
TypeScript
import {
|
|
QueryKeys,
|
|
dataService,
|
|
Permissions,
|
|
EModelEndpoint,
|
|
PERMISSION_BITS,
|
|
PermissionTypes,
|
|
} from 'librechat-data-provider';
|
|
import { useQuery, useInfiniteQuery, useQueryClient } from '@tanstack/react-query';
|
|
import type {
|
|
QueryObserverResult,
|
|
UseQueryOptions,
|
|
UseInfiniteQueryOptions,
|
|
} from '@tanstack/react-query';
|
|
import type t from 'librechat-data-provider';
|
|
import { useHasAccess } from '~/hooks';
|
|
|
|
/**
|
|
* Hook to determine the appropriate permission level for agent queries based on marketplace configuration
|
|
*/
|
|
export const useAgentListingDefaultPermissionLevel = () => {
|
|
const hasMarketplaceAccess = useHasAccess({
|
|
permissionType: PermissionTypes.MARKETPLACE,
|
|
permission: Permissions.USE,
|
|
});
|
|
|
|
// When marketplace is active: EDIT permissions (builder mode)
|
|
// When marketplace is not active: VIEW permissions (browse mode)
|
|
return hasMarketplaceAccess ? PERMISSION_BITS.EDIT : PERMISSION_BITS.VIEW;
|
|
};
|
|
|
|
/**
|
|
* AGENTS
|
|
*/
|
|
export const defaultAgentParams: t.AgentListParams = {
|
|
limit: 10,
|
|
requiredPermission: PERMISSION_BITS.EDIT,
|
|
};
|
|
/**
|
|
* Hook for getting all available tools for A
|
|
*/
|
|
export const useAvailableAgentToolsQuery = (): QueryObserverResult<t.TPlugin[]> => {
|
|
const queryClient = useQueryClient();
|
|
const endpointsConfig = queryClient.getQueryData<t.TEndpointsConfig>([QueryKeys.endpoints]);
|
|
|
|
const enabled = !!endpointsConfig?.[EModelEndpoint.agents];
|
|
return useQuery<t.TPlugin[]>([QueryKeys.tools], () => dataService.getAvailableAgentTools(), {
|
|
refetchOnWindowFocus: false,
|
|
refetchOnReconnect: false,
|
|
refetchOnMount: false,
|
|
enabled,
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Hook for listing all Agents, with optional parameters provided for pagination and sorting
|
|
*/
|
|
export const useListAgentsQuery = <TData = t.AgentListResponse>(
|
|
params: t.AgentListParams = defaultAgentParams,
|
|
config?: UseQueryOptions<t.AgentListResponse, unknown, TData>,
|
|
): QueryObserverResult<TData> => {
|
|
const queryClient = useQueryClient();
|
|
const endpointsConfig = queryClient.getQueryData<t.TEndpointsConfig>([QueryKeys.endpoints]);
|
|
|
|
const enabled = !!endpointsConfig?.[EModelEndpoint.agents];
|
|
return useQuery<t.AgentListResponse, unknown, TData>(
|
|
[QueryKeys.agents, params],
|
|
() => dataService.listAgents(params),
|
|
{
|
|
// Example selector to sort them by created_at
|
|
// select: (res) => {
|
|
// return res.data.sort((a, b) => a.created_at - b.created_at);
|
|
// },
|
|
staleTime: 1000 * 5,
|
|
refetchOnWindowFocus: false,
|
|
refetchOnReconnect: false,
|
|
refetchOnMount: false,
|
|
retry: false,
|
|
...config,
|
|
enabled: config?.enabled !== undefined ? config.enabled && enabled : enabled,
|
|
},
|
|
);
|
|
};
|
|
|
|
/**
|
|
* Hook for retrieving basic details about a single agent (VIEW permission)
|
|
*/
|
|
export const useGetAgentByIdQuery = (
|
|
agent_id: string,
|
|
config?: UseQueryOptions<t.Agent>,
|
|
): QueryObserverResult<t.Agent> => {
|
|
return useQuery<t.Agent>(
|
|
[QueryKeys.agent, agent_id],
|
|
() =>
|
|
dataService.getAgentById({
|
|
agent_id,
|
|
}),
|
|
{
|
|
refetchOnWindowFocus: false,
|
|
refetchOnReconnect: false,
|
|
refetchOnMount: false,
|
|
retry: false,
|
|
...config,
|
|
},
|
|
);
|
|
};
|
|
|
|
/**
|
|
* Hook for retrieving full agent details including sensitive configuration (EDIT permission)
|
|
*/
|
|
export const useGetExpandedAgentByIdQuery = (
|
|
agent_id: string,
|
|
config?: UseQueryOptions<t.Agent>,
|
|
): QueryObserverResult<t.Agent> => {
|
|
return useQuery<t.Agent>(
|
|
[QueryKeys.agent, agent_id, 'expanded'],
|
|
() =>
|
|
dataService.getExpandedAgentById({
|
|
agent_id,
|
|
}),
|
|
{
|
|
refetchOnWindowFocus: false,
|
|
refetchOnReconnect: false,
|
|
refetchOnMount: false,
|
|
retry: false,
|
|
...config,
|
|
},
|
|
);
|
|
};
|
|
|
|
/**
|
|
* MARKETPLACE
|
|
*/
|
|
/**
|
|
* Hook for getting agent categories for marketplace tabs
|
|
*/
|
|
export const useGetAgentCategoriesQuery = (
|
|
config?: UseQueryOptions<t.TMarketplaceCategory[]>,
|
|
): QueryObserverResult<t.TMarketplaceCategory[]> => {
|
|
return useQuery<t.TMarketplaceCategory[]>(
|
|
[QueryKeys.agentCategories],
|
|
() => dataService.getAgentCategories(),
|
|
{
|
|
refetchOnWindowFocus: false,
|
|
refetchOnReconnect: false,
|
|
refetchOnMount: false,
|
|
staleTime: 5 * 60 * 1000, // Cache for 5 minutes
|
|
...config,
|
|
},
|
|
);
|
|
};
|
|
|
|
/**
|
|
* Hook for infinite loading of marketplace agents with cursor-based pagination
|
|
*/
|
|
export const useMarketplaceAgentsInfiniteQuery = (
|
|
params: {
|
|
requiredPermission: number;
|
|
category?: string;
|
|
search?: string;
|
|
limit?: number;
|
|
promoted?: 0 | 1;
|
|
cursor?: string; // For pagination
|
|
},
|
|
config?: UseInfiniteQueryOptions<t.AgentListResponse, unknown>,
|
|
) => {
|
|
return useInfiniteQuery<t.AgentListResponse>({
|
|
queryKey: [QueryKeys.marketplaceAgents, params],
|
|
queryFn: ({ pageParam }) => {
|
|
const queryParams = { ...params };
|
|
if (pageParam) {
|
|
queryParams.cursor = pageParam.toString();
|
|
}
|
|
return dataService.getMarketplaceAgents(queryParams);
|
|
},
|
|
getNextPageParam: (lastPage) => lastPage?.after ?? undefined,
|
|
enabled: !!params.requiredPermission,
|
|
keepPreviousData: true,
|
|
staleTime: 2 * 60 * 1000, // 2 minutes
|
|
cacheTime: 10 * 60 * 1000, // 10 minutes
|
|
refetchOnWindowFocus: false,
|
|
refetchOnReconnect: false,
|
|
refetchOnMount: false,
|
|
...config,
|
|
});
|
|
};
|