mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-20 18:30:15 +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
347 lines
10 KiB
TypeScript
347 lines
10 KiB
TypeScript
import { Plus } from 'lucide-react';
|
|
import React, { useMemo, useCallback, useRef } from 'react';
|
|
import { Button, useToastContext } from '@librechat/client';
|
|
import { useWatch, useForm, FormProvider } from 'react-hook-form';
|
|
import { useGetModelsQuery } from 'librechat-data-provider/react-query';
|
|
import {
|
|
Tools,
|
|
Constants,
|
|
SystemRoles,
|
|
EModelEndpoint,
|
|
PERMISSION_BITS,
|
|
isAssistantsEndpoint,
|
|
} from 'librechat-data-provider';
|
|
import type { AgentForm, StringOption } from '~/common';
|
|
import {
|
|
useCreateAgentMutation,
|
|
useUpdateAgentMutation,
|
|
useGetAgentByIdQuery,
|
|
useGetExpandedAgentByIdQuery,
|
|
} from '~/data-provider';
|
|
import { createProviderOption, getDefaultAgentFormValues } from '~/utils';
|
|
import { useResourcePermissions } from '~/hooks/useResourcePermissions';
|
|
import { useSelectAgent, useLocalize, useAuthContext } from '~/hooks';
|
|
import { useAgentPanelContext } from '~/Providers/AgentPanelContext';
|
|
import AgentPanelSkeleton from './AgentPanelSkeleton';
|
|
import AdvancedPanel from './Advanced/AdvancedPanel';
|
|
import AgentConfig from './AgentConfig';
|
|
import AgentSelect from './AgentSelect';
|
|
import AgentFooter from './AgentFooter';
|
|
import ModelPanel from './ModelPanel';
|
|
import { Panel } from '~/common';
|
|
|
|
export default function AgentPanel() {
|
|
const localize = useLocalize();
|
|
const { user } = useAuthContext();
|
|
const { showToast } = useToastContext();
|
|
const {
|
|
activePanel,
|
|
agentsConfig,
|
|
setActivePanel,
|
|
endpointsConfig,
|
|
setCurrentAgentId,
|
|
agent_id: current_agent_id,
|
|
} = useAgentPanelContext();
|
|
|
|
const { onSelect: onSelectAgent } = useSelectAgent();
|
|
|
|
const modelsQuery = useGetModelsQuery();
|
|
|
|
// Basic agent query for initial permission check
|
|
const basicAgentQuery = useGetAgentByIdQuery(current_agent_id ?? '', {
|
|
enabled: !!(current_agent_id ?? '') && current_agent_id !== Constants.EPHEMERAL_AGENT_ID,
|
|
});
|
|
|
|
const { hasPermission, isLoading: permissionsLoading } = useResourcePermissions(
|
|
'agent',
|
|
basicAgentQuery.data?._id || '',
|
|
);
|
|
|
|
const canEdit = hasPermission(PERMISSION_BITS.EDIT);
|
|
|
|
const expandedAgentQuery = useGetExpandedAgentByIdQuery(current_agent_id ?? '', {
|
|
enabled:
|
|
!!(current_agent_id ?? '') &&
|
|
current_agent_id !== Constants.EPHEMERAL_AGENT_ID &&
|
|
canEdit &&
|
|
!permissionsLoading,
|
|
});
|
|
|
|
const agentQuery = canEdit && expandedAgentQuery.data ? expandedAgentQuery : basicAgentQuery;
|
|
|
|
const models = useMemo(() => modelsQuery.data ?? {}, [modelsQuery.data]);
|
|
const methods = useForm<AgentForm>({
|
|
defaultValues: getDefaultAgentFormValues(),
|
|
});
|
|
|
|
const { control, handleSubmit, reset } = methods;
|
|
const agent_id = useWatch({ control, name: 'id' });
|
|
const previousVersionRef = useRef<number | undefined>();
|
|
|
|
const allowedProviders = useMemo(
|
|
() => new Set(agentsConfig?.allowedProviders),
|
|
[agentsConfig?.allowedProviders],
|
|
);
|
|
|
|
const providers = useMemo(
|
|
() =>
|
|
Object.keys(endpointsConfig ?? {})
|
|
.filter(
|
|
(key) =>
|
|
!isAssistantsEndpoint(key) &&
|
|
(allowedProviders.size > 0 ? allowedProviders.has(key) : true) &&
|
|
key !== EModelEndpoint.agents &&
|
|
key !== EModelEndpoint.chatGPTBrowser &&
|
|
key !== EModelEndpoint.gptPlugins,
|
|
)
|
|
.map((provider) => createProviderOption(provider)),
|
|
[endpointsConfig, allowedProviders],
|
|
);
|
|
|
|
/* Mutations */
|
|
const update = useUpdateAgentMutation({
|
|
onMutate: () => {
|
|
// Store the current version before mutation
|
|
previousVersionRef.current = agentQuery.data?.version;
|
|
},
|
|
onSuccess: (data) => {
|
|
// Check if agent version is the same (no changes were made)
|
|
if (previousVersionRef.current !== undefined && data.version === previousVersionRef.current) {
|
|
showToast({
|
|
message: localize('com_ui_no_changes'),
|
|
status: 'info',
|
|
});
|
|
} else {
|
|
showToast({
|
|
message: `${localize('com_assistants_update_success')} ${
|
|
data.name ?? localize('com_ui_agent')
|
|
}`,
|
|
});
|
|
}
|
|
// Clear the ref after use
|
|
previousVersionRef.current = undefined;
|
|
},
|
|
onError: (err) => {
|
|
const error = err as Error;
|
|
showToast({
|
|
message: `${localize('com_agents_update_error')}${
|
|
error.message ? ` ${localize('com_ui_error')}: ${error.message}` : ''
|
|
}`,
|
|
status: 'error',
|
|
});
|
|
},
|
|
});
|
|
|
|
const create = useCreateAgentMutation({
|
|
onSuccess: (data) => {
|
|
setCurrentAgentId(data.id);
|
|
showToast({
|
|
message: `${localize('com_assistants_create_success')} ${
|
|
data.name ?? localize('com_ui_agent')
|
|
}`,
|
|
});
|
|
},
|
|
onError: (err) => {
|
|
const error = err as Error;
|
|
showToast({
|
|
message: `${localize('com_agents_create_error')}${
|
|
error.message ? ` ${localize('com_ui_error')}: ${error.message}` : ''
|
|
}`,
|
|
status: 'error',
|
|
});
|
|
},
|
|
});
|
|
|
|
const onSubmit = useCallback(
|
|
(data: AgentForm) => {
|
|
const tools = data.tools ?? [];
|
|
|
|
if (data.execute_code === true) {
|
|
tools.push(Tools.execute_code);
|
|
}
|
|
if (data.file_search === true) {
|
|
tools.push(Tools.file_search);
|
|
}
|
|
if (data.web_search === true) {
|
|
tools.push(Tools.web_search);
|
|
}
|
|
|
|
const {
|
|
name,
|
|
artifacts,
|
|
description,
|
|
instructions,
|
|
model: _model,
|
|
model_parameters,
|
|
provider: _provider,
|
|
agent_ids,
|
|
end_after_tools,
|
|
hide_sequential_outputs,
|
|
recursion_limit,
|
|
category,
|
|
support_contact,
|
|
} = data;
|
|
|
|
const model = _model ?? '';
|
|
const provider =
|
|
(typeof _provider === 'string' ? _provider : (_provider as StringOption).value) ?? '';
|
|
|
|
if (agent_id) {
|
|
update.mutate({
|
|
agent_id,
|
|
data: {
|
|
name,
|
|
artifacts,
|
|
description,
|
|
instructions,
|
|
model,
|
|
tools,
|
|
provider,
|
|
model_parameters,
|
|
agent_ids,
|
|
end_after_tools,
|
|
hide_sequential_outputs,
|
|
recursion_limit,
|
|
category,
|
|
support_contact,
|
|
},
|
|
});
|
|
return;
|
|
}
|
|
|
|
if (!provider || !model) {
|
|
return showToast({
|
|
message: localize('com_agents_missing_provider_model'),
|
|
status: 'error',
|
|
});
|
|
}
|
|
if (!name) {
|
|
return showToast({
|
|
message: localize('com_agents_missing_name'),
|
|
status: 'error',
|
|
});
|
|
}
|
|
|
|
create.mutate({
|
|
name,
|
|
artifacts,
|
|
description,
|
|
instructions,
|
|
model,
|
|
tools,
|
|
provider,
|
|
model_parameters,
|
|
agent_ids,
|
|
end_after_tools,
|
|
hide_sequential_outputs,
|
|
recursion_limit,
|
|
category,
|
|
support_contact,
|
|
});
|
|
},
|
|
[agent_id, create, update, showToast, localize],
|
|
);
|
|
|
|
const handleSelectAgent = useCallback(() => {
|
|
if (agent_id) {
|
|
onSelectAgent(agent_id);
|
|
}
|
|
}, [agent_id, onSelectAgent]);
|
|
|
|
const canEditAgent = useMemo(() => {
|
|
if (!agentQuery.data?.id) {
|
|
return true;
|
|
}
|
|
|
|
if (user?.role === SystemRoles.ADMIN) {
|
|
return true;
|
|
}
|
|
|
|
return canEdit;
|
|
}, [agentQuery.data?.id, user?.role, canEdit]);
|
|
|
|
return (
|
|
<FormProvider {...methods}>
|
|
<form
|
|
onSubmit={handleSubmit(onSubmit)}
|
|
className="scrollbar-gutter-stable h-auto w-full flex-shrink-0 overflow-x-hidden"
|
|
aria-label="Agent configuration form"
|
|
>
|
|
<div className="mx-1 mt-2 flex w-full flex-wrap gap-2">
|
|
<div className="w-full">
|
|
<AgentSelect
|
|
createMutation={create}
|
|
agentQuery={agentQuery}
|
|
setCurrentAgentId={setCurrentAgentId}
|
|
// The following is required to force re-render the component when the form's agent ID changes
|
|
// Also maintains ComboBox Focus for Accessibility
|
|
selectedAgentId={agentQuery.isInitialLoading ? null : (current_agent_id ?? null)}
|
|
/>
|
|
</div>
|
|
{/* Create + Select Button */}
|
|
{agent_id && (
|
|
<div className="flex w-full gap-2">
|
|
<Button
|
|
type="button"
|
|
variant="outline"
|
|
className="w-full justify-center"
|
|
onClick={() => {
|
|
reset(getDefaultAgentFormValues());
|
|
setCurrentAgentId(undefined);
|
|
}}
|
|
disabled={agentQuery.isInitialLoading}
|
|
>
|
|
<Plus className="mr-1 h-4 w-4" />
|
|
{localize('com_ui_create') +
|
|
' ' +
|
|
localize('com_ui_new') +
|
|
' ' +
|
|
localize('com_ui_agent')}
|
|
</Button>
|
|
<Button
|
|
variant="submit"
|
|
disabled={!agent_id || agentQuery.isInitialLoading}
|
|
onClick={(e) => {
|
|
e.preventDefault();
|
|
handleSelectAgent();
|
|
}}
|
|
aria-label={localize('com_ui_select') + ' ' + localize('com_ui_agent')}
|
|
>
|
|
{localize('com_ui_select')}
|
|
</Button>
|
|
</div>
|
|
)}
|
|
</div>
|
|
{agentQuery.isInitialLoading && <AgentPanelSkeleton />}
|
|
{!canEditAgent && !agentQuery.isInitialLoading && (
|
|
<div className="flex h-[30vh] w-full items-center justify-center">
|
|
<div className="text-center">
|
|
<h2 className="text-token-text-primary m-2 text-xl font-semibold">
|
|
{localize('com_agents_not_available')}
|
|
</h2>
|
|
<p className="text-token-text-secondary">{localize('com_agents_no_access')}</p>
|
|
</div>
|
|
</div>
|
|
)}
|
|
{canEditAgent && !agentQuery.isInitialLoading && activePanel === Panel.model && (
|
|
<ModelPanel models={models} providers={providers} setActivePanel={setActivePanel} />
|
|
)}
|
|
{canEditAgent && !agentQuery.isInitialLoading && activePanel === Panel.builder && (
|
|
<AgentConfig createMutation={create} />
|
|
)}
|
|
{canEditAgent && !agentQuery.isInitialLoading && activePanel === Panel.advanced && (
|
|
<AdvancedPanel />
|
|
)}
|
|
{canEditAgent && !agentQuery.isInitialLoading && (
|
|
<AgentFooter
|
|
createMutation={create}
|
|
updateMutation={update}
|
|
activePanel={activePanel}
|
|
setActivePanel={setActivePanel}
|
|
setCurrentAgentId={setCurrentAgentId}
|
|
/>
|
|
)}
|
|
</form>
|
|
</FormProvider>
|
|
);
|
|
}
|