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
381 lines
13 KiB
TypeScript
381 lines
13 KiB
TypeScript
import { useMutation, useQueryClient } from '@tanstack/react-query';
|
|
import { dataService, MutationKeys, PERMISSION_BITS, QueryKeys } from 'librechat-data-provider';
|
|
import type * as t from 'librechat-data-provider';
|
|
import type { QueryClient, UseMutationResult } from '@tanstack/react-query';
|
|
|
|
/**
|
|
* AGENTS
|
|
*/
|
|
export const allAgentViewAndEditQueryKeys: t.AgentListParams[] = [
|
|
{ requiredPermission: PERMISSION_BITS.VIEW },
|
|
{ requiredPermission: PERMISSION_BITS.EDIT },
|
|
];
|
|
/**
|
|
* Create a new agent
|
|
*/
|
|
export const useCreateAgentMutation = (
|
|
options?: t.CreateAgentMutationOptions,
|
|
): UseMutationResult<t.Agent, Error, t.AgentCreateParams> => {
|
|
const queryClient = useQueryClient();
|
|
return useMutation((newAgentData: t.AgentCreateParams) => dataService.createAgent(newAgentData), {
|
|
onMutate: (variables) => options?.onMutate?.(variables),
|
|
onError: (error, variables, context) => options?.onError?.(error, variables, context),
|
|
onSuccess: (newAgent, variables, context) => {
|
|
((keys: t.AgentListParams[]) => {
|
|
keys.forEach((key) => {
|
|
const listRes = queryClient.getQueryData<t.AgentListResponse>([QueryKeys.agents, key]);
|
|
if (!listRes) {
|
|
return options?.onSuccess?.(newAgent, variables, context);
|
|
}
|
|
const currentAgents = [newAgent, ...JSON.parse(JSON.stringify(listRes.data))];
|
|
|
|
queryClient.setQueryData<t.AgentListResponse>([QueryKeys.agents, key], {
|
|
...listRes,
|
|
data: currentAgents,
|
|
});
|
|
});
|
|
})(allAgentViewAndEditQueryKeys);
|
|
invalidateAgentMarketplaceQueries(queryClient);
|
|
|
|
return options?.onSuccess?.(newAgent, variables, context);
|
|
},
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Hook for updating an agent
|
|
*/
|
|
export const useUpdateAgentMutation = (
|
|
options?: t.UpdateAgentMutationOptions,
|
|
): UseMutationResult<
|
|
t.Agent,
|
|
t.DuplicateVersionError,
|
|
{ agent_id: string; data: t.AgentUpdateParams }
|
|
> => {
|
|
const queryClient = useQueryClient();
|
|
return useMutation(
|
|
({ agent_id, data }: { agent_id: string; data: t.AgentUpdateParams }) => {
|
|
return dataService.updateAgent({
|
|
data,
|
|
agent_id,
|
|
});
|
|
},
|
|
{
|
|
onMutate: (variables) => options?.onMutate?.(variables),
|
|
onError: (error, variables, context) => {
|
|
const typedError = error as t.DuplicateVersionError;
|
|
return options?.onError?.(typedError, variables, context);
|
|
},
|
|
onSuccess: (updatedAgent, variables, context) => {
|
|
((keys: t.AgentListParams[]) => {
|
|
keys.forEach((key) => {
|
|
const listRes = queryClient.getQueryData<t.AgentListResponse>([QueryKeys.agents, key]);
|
|
|
|
if (!listRes) {
|
|
return options?.onSuccess?.(updatedAgent, variables, context);
|
|
}
|
|
|
|
queryClient.setQueryData<t.AgentListResponse>([QueryKeys.agents, key], {
|
|
...listRes,
|
|
data: listRes.data.map((agent) => {
|
|
if (agent.id === variables.agent_id) {
|
|
return updatedAgent;
|
|
}
|
|
return agent;
|
|
}),
|
|
});
|
|
});
|
|
})(allAgentViewAndEditQueryKeys);
|
|
|
|
queryClient.setQueryData<t.Agent>([QueryKeys.agent, variables.agent_id], updatedAgent);
|
|
queryClient.setQueryData<t.Agent>(
|
|
[QueryKeys.agent, variables.agent_id, 'expanded'],
|
|
updatedAgent,
|
|
);
|
|
invalidateAgentMarketplaceQueries(queryClient);
|
|
|
|
return options?.onSuccess?.(updatedAgent, variables, context);
|
|
},
|
|
},
|
|
);
|
|
};
|
|
|
|
/**
|
|
* Hook for deleting an agent
|
|
*/
|
|
export const useDeleteAgentMutation = (
|
|
options?: t.DeleteAgentMutationOptions,
|
|
): UseMutationResult<void, Error, t.DeleteAgentBody> => {
|
|
const queryClient = useQueryClient();
|
|
return useMutation(
|
|
({ agent_id }: t.DeleteAgentBody) => {
|
|
return dataService.deleteAgent({ agent_id });
|
|
},
|
|
{
|
|
onMutate: (variables) => options?.onMutate?.(variables),
|
|
onError: (error, variables, context) => options?.onError?.(error, variables, context),
|
|
onSuccess: (_data, variables, context) => {
|
|
const data = ((keys: t.AgentListParams[]) => {
|
|
let data: t.Agent[] = [];
|
|
keys.forEach((key) => {
|
|
const listRes = queryClient.getQueryData<t.AgentListResponse>([QueryKeys.agents, key]);
|
|
|
|
if (!listRes) {
|
|
return options?.onSuccess?.(_data, variables, context);
|
|
}
|
|
|
|
data = listRes.data.filter((agent) => agent.id !== variables.agent_id);
|
|
|
|
queryClient.setQueryData<t.AgentListResponse>([QueryKeys.agents, key], {
|
|
...listRes,
|
|
data,
|
|
});
|
|
});
|
|
return data;
|
|
})(allAgentViewAndEditQueryKeys);
|
|
|
|
queryClient.removeQueries([QueryKeys.agent, variables.agent_id]);
|
|
queryClient.removeQueries([QueryKeys.agent, variables.agent_id, 'expanded']);
|
|
invalidateAgentMarketplaceQueries(queryClient);
|
|
|
|
return options?.onSuccess?.(_data, variables, data);
|
|
},
|
|
},
|
|
);
|
|
};
|
|
|
|
/**
|
|
* Hook for duplicating an agent
|
|
*/
|
|
export const useDuplicateAgentMutation = (
|
|
options?: t.DuplicateAgentMutationOptions,
|
|
): UseMutationResult<{ agent: t.Agent; actions: t.Action[] }, Error, t.DuplicateAgentBody> => {
|
|
const queryClient = useQueryClient();
|
|
|
|
return useMutation<{ agent: t.Agent; actions: t.Action[] }, Error, t.DuplicateAgentBody>(
|
|
(params: t.DuplicateAgentBody) => dataService.duplicateAgent(params),
|
|
{
|
|
onMutate: options?.onMutate,
|
|
onError: options?.onError,
|
|
onSuccess: ({ agent, actions }, variables, context) => {
|
|
((keys: t.AgentListParams[]) => {
|
|
keys.forEach((key) => {
|
|
const listRes = queryClient.getQueryData<t.AgentListResponse>([QueryKeys.agents, key]);
|
|
if (listRes) {
|
|
const currentAgents = [agent, ...listRes.data];
|
|
queryClient.setQueryData<t.AgentListResponse>([QueryKeys.agents, key], {
|
|
...listRes,
|
|
data: currentAgents,
|
|
});
|
|
}
|
|
});
|
|
})(allAgentViewAndEditQueryKeys);
|
|
|
|
const existingActions = queryClient.getQueryData<t.Action[]>([QueryKeys.actions]) || [];
|
|
|
|
queryClient.setQueryData<t.Action[]>([QueryKeys.actions], existingActions.concat(actions));
|
|
invalidateAgentMarketplaceQueries(queryClient);
|
|
|
|
return options?.onSuccess?.({ agent, actions }, variables, context);
|
|
},
|
|
},
|
|
);
|
|
};
|
|
|
|
/**
|
|
* Hook for uploading an agent avatar
|
|
*/
|
|
export const useUploadAgentAvatarMutation = (
|
|
options?: t.UploadAgentAvatarOptions,
|
|
): UseMutationResult<
|
|
t.Agent, // response data
|
|
unknown, // error
|
|
t.AgentAvatarVariables, // request
|
|
unknown // context
|
|
> => {
|
|
return useMutation([MutationKeys.agentAvatarUpload], {
|
|
mutationFn: (variables: t.AgentAvatarVariables) => dataService.uploadAgentAvatar(variables),
|
|
...(options || {}),
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Hook for updating Agent Actions
|
|
*/
|
|
export const useUpdateAgentAction = (
|
|
options?: t.UpdateAgentActionOptions,
|
|
): UseMutationResult<
|
|
t.UpdateAgentActionResponse, // response data
|
|
unknown, // error
|
|
t.UpdateAgentActionVariables, // request
|
|
unknown // context
|
|
> => {
|
|
const queryClient = useQueryClient();
|
|
return useMutation([MutationKeys.updateAgentAction], {
|
|
mutationFn: (variables: t.UpdateAgentActionVariables) =>
|
|
dataService.updateAgentAction(variables),
|
|
|
|
onMutate: (variables) => options?.onMutate?.(variables),
|
|
onError: (error, variables, context) => options?.onError?.(error, variables, context),
|
|
onSuccess: (updateAgentActionResponse, variables, context) => {
|
|
const updatedAgent = updateAgentActionResponse[0];
|
|
((keys: t.AgentListParams[]) => {
|
|
keys.forEach((key) => {
|
|
const listRes = queryClient.getQueryData<t.AgentListResponse>([QueryKeys.agents, key]);
|
|
|
|
if (!listRes) {
|
|
return options?.onSuccess?.(updateAgentActionResponse, variables, context);
|
|
}
|
|
queryClient.setQueryData<t.AgentListResponse>([QueryKeys.agents, key], {
|
|
...listRes,
|
|
data: listRes.data.map((agent) => {
|
|
if (agent.id === variables.agent_id) {
|
|
return updatedAgent;
|
|
}
|
|
return agent;
|
|
}),
|
|
});
|
|
});
|
|
})(allAgentViewAndEditQueryKeys);
|
|
|
|
queryClient.setQueryData<t.Action[]>([QueryKeys.actions], (prev) => {
|
|
if (!prev) {
|
|
return [updateAgentActionResponse[1]];
|
|
}
|
|
|
|
if (variables.action_id) {
|
|
return prev.map((action) => {
|
|
if (action.action_id === variables.action_id) {
|
|
return updateAgentActionResponse[1];
|
|
}
|
|
return action;
|
|
});
|
|
}
|
|
|
|
return [...prev, updateAgentActionResponse[1]];
|
|
});
|
|
|
|
queryClient.setQueryData<t.Agent>([QueryKeys.agent, variables.agent_id], updatedAgent);
|
|
queryClient.setQueryData<t.Agent>(
|
|
[QueryKeys.agent, variables.agent_id, 'expanded'],
|
|
updatedAgent,
|
|
);
|
|
return options?.onSuccess?.(updateAgentActionResponse, variables, context);
|
|
},
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Hook for deleting an Agent Action
|
|
*/
|
|
|
|
export const useDeleteAgentAction = (
|
|
options?: t.DeleteAgentActionOptions,
|
|
): UseMutationResult<void, Error, t.DeleteAgentActionVariables, unknown> => {
|
|
const queryClient = useQueryClient();
|
|
return useMutation([MutationKeys.deleteAgentAction], {
|
|
mutationFn: (variables: t.DeleteAgentActionVariables) => {
|
|
return dataService.deleteAgentAction({
|
|
...variables,
|
|
});
|
|
},
|
|
|
|
onMutate: (variables) => options?.onMutate?.(variables),
|
|
onError: (error, variables, context) => options?.onError?.(error, variables, context),
|
|
onSuccess: (_data, variables, context) => {
|
|
let domain: string | undefined = '';
|
|
queryClient.setQueryData<t.Action[]>([QueryKeys.actions], (prev) => {
|
|
return prev?.filter((action) => {
|
|
domain = action.metadata.domain;
|
|
return action.action_id !== variables.action_id;
|
|
});
|
|
});
|
|
((keys: t.AgentListParams[]) => {
|
|
keys.forEach((key) => {
|
|
queryClient.setQueryData<t.AgentListResponse>([QueryKeys.agents, key], (prev) => {
|
|
if (!prev) {
|
|
return prev;
|
|
}
|
|
|
|
return {
|
|
...prev,
|
|
data: prev.data.map((agent) => {
|
|
if (agent.id === variables.agent_id) {
|
|
return {
|
|
...agent,
|
|
tools: agent.tools?.filter((tool) => !tool.includes(domain ?? '')),
|
|
};
|
|
}
|
|
return agent;
|
|
}),
|
|
};
|
|
});
|
|
});
|
|
})(allAgentViewAndEditQueryKeys);
|
|
const updaterFn = (prev) => {
|
|
if (!prev) {
|
|
return prev;
|
|
}
|
|
|
|
return {
|
|
...prev,
|
|
tools: prev.tools?.filter((tool) => !tool.includes(domain ?? '')),
|
|
};
|
|
};
|
|
queryClient.setQueryData<t.Agent>([QueryKeys.agent, variables.agent_id], updaterFn);
|
|
queryClient.setQueryData<t.Agent>(
|
|
[QueryKeys.agent, variables.agent_id, 'expanded'],
|
|
updaterFn,
|
|
);
|
|
return options?.onSuccess?.(_data, variables, context);
|
|
},
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Hook for reverting an agent to a previous version
|
|
*/
|
|
export const useRevertAgentVersionMutation = (
|
|
options?: t.RevertAgentVersionOptions,
|
|
): UseMutationResult<t.Agent, Error, { agent_id: string; version_index: number }> => {
|
|
const queryClient = useQueryClient();
|
|
return useMutation(
|
|
({ agent_id, version_index }: { agent_id: string; version_index: number }) => {
|
|
return dataService.revertAgentVersion({
|
|
agent_id,
|
|
version_index,
|
|
});
|
|
},
|
|
{
|
|
onMutate: (variables) => options?.onMutate?.(variables),
|
|
onError: (error, variables, context) => options?.onError?.(error, variables, context),
|
|
onSuccess: (revertedAgent, variables, context) => {
|
|
queryClient.setQueryData<t.Agent>([QueryKeys.agent, variables.agent_id], revertedAgent);
|
|
|
|
((keys: t.AgentListParams[]) => {
|
|
keys.forEach((key) => {
|
|
const listRes = queryClient.getQueryData<t.AgentListResponse>([QueryKeys.agents, key]);
|
|
|
|
if (listRes) {
|
|
queryClient.setQueryData<t.AgentListResponse>([QueryKeys.agents, key], {
|
|
...listRes,
|
|
data: listRes.data.map((agent) => {
|
|
if (agent.id === variables.agent_id) {
|
|
return revertedAgent;
|
|
}
|
|
return agent;
|
|
}),
|
|
});
|
|
}
|
|
});
|
|
})(allAgentViewAndEditQueryKeys);
|
|
|
|
return options?.onSuccess?.(revertedAgent, variables, context);
|
|
},
|
|
},
|
|
);
|
|
};
|
|
|
|
export const invalidateAgentMarketplaceQueries = (queryClient: QueryClient) => {
|
|
queryClient.invalidateQueries([QueryKeys.marketplaceAgents]);
|
|
};
|