📂 refactor: Cleanup File Filtering Logic, Improve Validation (#10414)

* feat: add filterFilesByEndpointConfig to filter disabled file processing by provider

* chore: explicit define of endpointFileConfig for better debugging

* refactor: move `normalizeEndpointName` to data-provider as used app-wide

* chore: remove overrideEndpoint from useFileHandling

* refactor: improve endpoint file config selection

* refactor: update filterFilesByEndpointConfig to accept structured parameters and improve endpoint file config handling

* refactor: replace defaultFileConfig with getEndpointFileConfig for improved file configuration handling across components

* test: add comprehensive unit tests for getEndpointFileConfig to validate endpoint configuration handling

* refactor: streamline agent endpoint assignment and improve file filtering logic

* feat: add error handling for disabled file uploads in endpoint configuration

* refactor: update encodeAndFormat functions to accept structured parameters for provider and endpoint

* refactor: streamline requestFiles handling in initializeAgent function

* fix: getEndpointFileConfig partial config merging scenarios

* refactor: enhance mergeWithDefault function to support document-supported providers with comprehensive MIME types

* refactor: user-configured default file config in getEndpointFileConfig

* fix: prevent file handling when endpoint is disabled and file is dragged to chat

* refactor: move `getEndpointField` to `data-provider` and update usage across components and hooks

* fix: prioritize endpointType based on agent.endpoint in file filtering logic

* fix: prioritize agent.endpoint in file filtering logic and remove unnecessary endpointType defaulting

client/src/Providers/DragDropContext.tsx

@@ -1,7 +1,7 @@
 import React, { createContext, useContext, useMemo } from 'react';
+import { getEndpointField } from 'librechat-data-provider';
 import type { EModelEndpoint } from 'librechat-data-provider';
 import { useGetEndpointsQuery } from '~/data-provider';
-import { getEndpointField } from '~/utils/endpoints';
 import { useChatContext } from './ChatContext';
 
 interface DragDropContextValue {

client/src/components/Chat/Input/Files/AttachFileChat.tsx

@@ -5,12 +5,12 @@ import {
   EModelEndpoint,
   mergeFileConfig,
   isAgentsEndpoint,
+  getEndpointField,
   isAssistantsEndpoint,
-  fileConfig as defaultFileConfig,
+  getEndpointFileConfig,
 } from 'librechat-data-provider';
-import type { EndpointFileConfig, TConversation } from 'librechat-data-provider';
+import type { TConversation } from 'librechat-data-provider';
 import { useGetFileConfig, useGetEndpointsQuery } from '~/data-provider';
-import { getEndpointField } from '~/utils/endpoints';
 import AttachFileMenu from './AttachFileMenu';
 import AttachFile from './AttachFile';
 
@@ -26,7 +26,7 @@ function AttachFileChat({
   const isAgents = useMemo(() => isAgentsEndpoint(endpoint), [endpoint]);
   const isAssistants = useMemo(() => isAssistantsEndpoint(endpoint), [endpoint]);
 
-  const { data: fileConfig = defaultFileConfig } = useGetFileConfig({
+  const { data: fileConfig = null } = useGetFileConfig({
     select: (data) => mergeFileConfig(data),
   });
 
@@ -39,9 +39,23 @@ function AttachFileChat({
     );
   }, [endpoint, endpointsConfig]);
 
-  const endpointFileConfig = fileConfig.endpoints[endpoint ?? ''] as EndpointFileConfig | undefined;
-  const endpointSupportsFiles: boolean = supportsFiles[endpointType ?? endpoint ?? ''] ?? false;
-  const isUploadDisabled = (disableInputs || endpointFileConfig?.disabled) ?? false;
+  const endpointFileConfig = useMemo(
+    () =>
+      getEndpointFileConfig({
+        endpoint,
+        fileConfig,
+        endpointType,
+      }),
+    [endpoint, fileConfig, endpointType],
+  );
+  const endpointSupportsFiles: boolean = useMemo(
+    () => supportsFiles[endpointType ?? endpoint ?? ''] ?? false,
+    [endpointType, endpoint],
+  );
+  const isUploadDisabled = useMemo(
+    () => (disableInputs || endpointFileConfig?.disabled) ?? false,
+    [disableInputs, endpointFileConfig?.disabled],
+  );
 
   if (isAssistants && endpointSupportsFiles && !isUploadDisabled) {
     return <AttachFile disabled={disableInputs} />;

client/src/components/Chat/Input/Files/AttachFileMenu.tsx

@@ -61,13 +61,8 @@ const AttachFileMenu = ({
     ephemeralAgentByConvoId(conversationId),
   );
   const [toolResource, setToolResource] = useState<EToolResources | undefined>();
-  const { handleFileChange } = useFileHandling({
-    overrideEndpoint: EModelEndpoint.agents,
-    overrideEndpointFileConfig: endpointFileConfig,
-  });
+  const { handleFileChange } = useFileHandling();
   const { handleSharePointFiles, isProcessing, downloadProgress } = useSharePointFileHandling({
-    overrideEndpoint: EModelEndpoint.agents,
-    overrideEndpointFileConfig: endpointFileConfig,
     toolResource,
   });
 

client/src/components/Chat/Input/HeaderOptions.tsx

@@ -1,10 +1,8 @@
-import { useRecoilState } from 'recoil';
+import { useState } from 'react';
 import { Settings2 } from 'lucide-react';
-import { useState, useEffect, useMemo } from 'react';
+import { TooltipAnchor } from '@librechat/client';
 import { Root, Anchor } from '@radix-ui/react-popover';
-import { PluginStoreDialog, TooltipAnchor } from '@librechat/client';
-import { useUserKeyQuery } from 'librechat-data-provider/react-query';
-import { EModelEndpoint, isParamEndpoint, tConvoUpdateSchema } from 'librechat-data-provider';
+import { isParamEndpoint, getEndpointField, tConvoUpdateSchema } from 'librechat-data-provider';
 import type { TPreset, TInterfaceConfig } from 'librechat-data-provider';
 import { EndpointSettings, SaveAsPresetDialog, AlternativeSettings } from '~/components/Endpoints';
 import { useSetIndexOptions, useLocalize } from '~/hooks';
@@ -12,8 +10,6 @@ import { useGetEndpointsQuery } from '~/data-provider';
 import OptionsPopover from './OptionsPopover';
 import PopoverButtons from './PopoverButtons';
 import { useChatContext } from '~/Providers';
-import { getEndpointField } from '~/utils';
-import store from '~/store';
 
 export default function HeaderOptions({
   interfaceConfig,
@@ -23,36 +19,11 @@ export default function HeaderOptions({
   const { data: endpointsConfig } = useGetEndpointsQuery();
 
   const [saveAsDialogShow, setSaveAsDialogShow] = useState<boolean>(false);
-  const [showPluginStoreDialog, setShowPluginStoreDialog] = useRecoilState(
-    store.showPluginStoreDialog,
-  );
   const localize = useLocalize();
 
   const { showPopover, conversation, setShowPopover } = useChatContext();
   const { setOption } = useSetIndexOptions();
-  const { endpoint, conversationId } = conversation ?? {};
-  const { data: keyExpiry = { expiresAt: undefined } } = useUserKeyQuery(endpoint ?? '');
-  const userProvidesKey = useMemo(
-    () => !!(endpointsConfig?.[endpoint ?? '']?.userProvide ?? false),
-    [endpointsConfig, endpoint],
-  );
-  const keyProvided = useMemo(
-    () => (userProvidesKey ? !!(keyExpiry.expiresAt ?? '') : true),
-    [keyExpiry.expiresAt, userProvidesKey],
-  );
-
-  const noSettings = useMemo<{ [key: string]: boolean }>(
-    () => ({
-      [EModelEndpoint.chatGPTBrowser]: true,
-    }),
-    [conversationId],
-  );
-
-  useEffect(() => {
-    if (endpoint && noSettings[endpoint]) {
-      setShowPopover(false);
-    }
-  }, [endpoint, noSettings]);
+  const { endpoint } = conversation ?? {};
 
   const saveAsPreset = () => {
     setSaveAsDialogShow(true);
@@ -76,22 +47,20 @@ export default function HeaderOptions({
         <div className="my-auto lg:max-w-2xl xl:max-w-3xl">
           <span className="flex w-full flex-col items-center justify-center gap-0 md:order-none md:m-auto md:gap-2">
             <div className="z-[61] flex w-full items-center justify-center gap-2">
-              {!noSettings[endpoint] &&
-                interfaceConfig?.parameters === true &&
-                paramEndpoint === false && (
-                  <TooltipAnchor
-                    id="parameters-button"
-                    aria-label={localize('com_ui_model_parameters')}
-                    description={localize('com_ui_model_parameters')}
-                    tabIndex={0}
-                    role="button"
-                    onClick={triggerAdvancedMode}
-                    data-testid="parameters-button"
-                    className="inline-flex size-10 items-center justify-center rounded-lg border border-border-light bg-transparent text-text-primary transition-all ease-in-out hover:bg-surface-tertiary disabled:pointer-events-none disabled:opacity-50 radix-state-open:bg-surface-tertiary"
-                  >
-                    <Settings2 size={16} aria-label="Settings/Parameters Icon" />
-                  </TooltipAnchor>
-                )}
+              {interfaceConfig?.parameters === true && paramEndpoint === false && (
+                <TooltipAnchor
+                  id="parameters-button"
+                  aria-label={localize('com_ui_model_parameters')}
+                  description={localize('com_ui_model_parameters')}
+                  tabIndex={0}
+                  role="button"
+                  onClick={triggerAdvancedMode}
+                  data-testid="parameters-button"
+                  className="inline-flex size-10 items-center justify-center rounded-lg border border-border-light bg-transparent text-text-primary transition-all ease-in-out hover:bg-surface-tertiary disabled:pointer-events-none disabled:opacity-50 radix-state-open:bg-surface-tertiary"
+                >
+                  <Settings2 size={16} aria-label="Settings/Parameters Icon" />
+                </TooltipAnchor>
+              )}
             </div>
             {interfaceConfig?.parameters === true && paramEndpoint === false && (
               <OptionsPopover
@@ -122,12 +91,6 @@ export default function HeaderOptions({
                 }
               />
             )}
-            {interfaceConfig?.parameters === true && (
-              <PluginStoreDialog
-                isOpen={showPluginStoreDialog}
-                setIsOpen={setShowPluginStoreDialog}
-              />
-            )}
           </span>
         </div>
       </Anchor>

client/src/components/Chat/Menus/Endpoints/DialogManager.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
-import { EModelEndpoint } from 'librechat-data-provider';
+import { EModelEndpoint, getEndpointField } from 'librechat-data-provider';
 import { SetKeyDialog } from '~/components/Input/SetKeyDialog';
-import { getEndpointField } from '~/utils';
 
 interface DialogManagerProps {
   keyDialogOpen: boolean;

client/src/components/Chat/Menus/Endpoints/components/SpecIcon.tsx

@@ -1,7 +1,8 @@
 import React, { memo } from 'react';
+import { getEndpointField } from 'librechat-data-provider';
 import type { TModelSpec, TEndpointsConfig } from 'librechat-data-provider';
 import type { IconMapProps } from '~/common';
-import { getModelSpecIconURL, getIconKey, getEndpointField } from '~/utils';
+import { getModelSpecIconURL, getIconKey } from '~/utils';
 import { URLIcon } from '~/components/Endpoints/URLIcon';
 import { icons } from '~/hooks/Endpoint/Icons';
 

client/src/components/Chat/Menus/Presets/PresetItems.tsx

@@ -1,20 +1,21 @@
 import { useRecoilValue } from 'recoil';
 import { Close } from '@radix-ui/react-popover';
 import { Flipper, Flipped } from 'react-flip-toolkit';
+import { getEndpointField } from 'librechat-data-provider';
 import {
   Dialog,
-  DialogTrigger,
   Label,
-  DialogTemplate,
   PinIcon,
   EditIcon,
   TrashIcon,
+  DialogTrigger,
+  DialogTemplate,
 } from '@librechat/client';
 import type { TPreset } from 'librechat-data-provider';
 import type { FC } from 'react';
-import { getPresetTitle, getEndpointField, getIconKey } from '~/utils';
 import FileUpload from '~/components/Chat/Input/Files/FileUpload';
 import { useGetEndpointsQuery } from '~/data-provider';
+import { getPresetTitle, getIconKey } from '~/utils';
 import { MenuSeparator, MenuItem } from '../UI';
 import { icons } from '~/hooks/Endpoint/Icons';
 import { useLocalize } from '~/hooks';

client/src/components/Chat/Messages/MessageIcon.tsx

@@ -1,9 +1,10 @@
 import React, { useMemo, memo } from 'react';
+import { getEndpointField } from 'librechat-data-provider';
 import type { Assistant, Agent } from 'librechat-data-provider';
 import type { TMessageIcon } from '~/common';
-import { getEndpointField, getIconEndpoint, logger } from '~/utils';
 import ConvoIconURL from '~/components/Endpoints/ConvoIconURL';
 import { useGetEndpointsQuery } from '~/data-provider';
+import { getIconEndpoint, logger } from '~/utils';
 import Icon from '~/components/Endpoints/Icon';
 
 const MessageIcon = memo(

client/src/components/Endpoints/ConvoIcon.tsx

@@ -1,6 +1,7 @@
 import React, { useMemo } from 'react';
+import { getEndpointField } from 'librechat-data-provider';
 import type * as t from 'librechat-data-provider';
-import { getEndpointField, getIconKey, getEntity, getIconEndpoint } from '~/utils';
+import { getIconKey, getEntity, getIconEndpoint } from '~/utils';
 import ConvoIconURL from '~/components/Endpoints/ConvoIconURL';
 import { icons } from '~/hooks/Endpoint/Icons';
 

client/src/components/Endpoints/EndpointIcon.tsx

@@ -1,13 +1,13 @@
-import { isAssistantsEndpoint } from 'librechat-data-provider';
+import { getEndpointField, isAssistantsEndpoint } from 'librechat-data-provider';
 import type {
-  TConversation,
-  TEndpointsConfig,
   TPreset,
+  TConversation,
   TAssistantsMap,
+  TEndpointsConfig,
 } from 'librechat-data-provider';
 import ConvoIconURL from '~/components/Endpoints/ConvoIconURL';
 import MinimalIcon from '~/components/Endpoints/MinimalIcon';
-import { getEndpointField, getIconEndpoint } from '~/utils';
+import { getIconEndpoint } from '~/utils';
 
 export default function EndpointIcon({
   conversation,

client/src/components/Endpoints/EndpointSettings.tsx

@@ -1,10 +1,11 @@
 import { useRecoilValue } from 'recoil';
-import { SettingsViews, TConversation } from 'librechat-data-provider';
 import { useGetModelsQuery } from 'librechat-data-provider/react-query';
+import { getEndpointField, SettingsViews } from 'librechat-data-provider';
+import type { TConversation } from 'librechat-data-provider';
 import type { TSettingsProps } from '~/common';
 import { useGetEndpointsQuery } from '~/data-provider';
-import { cn, getEndpointField } from '~/utils';
 import { getSettings } from './Settings';
+import { cn } from '~/utils';
 import store from '~/store';
 
 export default function Settings({

client/src/components/SidePanel/Agents/AgentConfig.tsx

@@ -1,12 +1,11 @@
 import React, { useState, useMemo, useCallback } from 'react';
 import { useToastContext } from '@librechat/client';
-import { EModelEndpoint } from 'librechat-data-provider';
 import { Controller, useWatch, useFormContext } from 'react-hook-form';
+import { EModelEndpoint, getEndpointField } from 'librechat-data-provider';
 import type { AgentForm, AgentPanelProps, IconComponentTypes } from '~/common';
 import {
   removeFocusOutlines,
   processAgentOption,
-  getEndpointField,
   defaultTextProps,
   validateEmail,
   getIconKey,

client/src/components/SidePanel/Agents/Code/Files.tsx

@@ -6,9 +6,8 @@ import {
   EModelEndpoint,
   mergeFileConfig,
   AgentCapabilities,
-  fileConfig as defaultFileConfig,
+  getEndpointFileConfig,
 } from 'librechat-data-provider';
-import type { EndpointFileConfig } from 'librechat-data-provider';
 import type { ExtendedFile, AgentForm } from '~/common';
 import { useFileHandling, useLocalize, useLazyEffect } from '~/hooks';
 import FileRow from '~/components/Chat/Input/Files/FileRow';
@@ -30,12 +29,11 @@ export default function Files({
   const { watch } = useFormContext<AgentForm>();
   const fileInputRef = useRef<HTMLInputElement>(null);
   const [files, setFiles] = useState<Map<string, ExtendedFile>>(new Map());
-  const { data: fileConfig = defaultFileConfig } = useGetFileConfig({
+  const { data: fileConfig = null } = useGetFileConfig({
     select: (data) => mergeFileConfig(data),
   });
   const { abortUpload, handleFileChange } = useFileHandling({
     fileSetter: setFiles,
-    overrideEndpoint: EModelEndpoint.agents,
     additionalMetadata: { agent_id, tool_resource },
   });
 
@@ -51,9 +49,11 @@ export default function Files({
 
   const codeChecked = watch(AgentCapabilities.execute_code);
 
-  const endpointFileConfig = fileConfig.endpoints[EModelEndpoint.agents] as
-    | EndpointFileConfig
-    | undefined;
+  const endpointFileConfig = getEndpointFileConfig({
+    fileConfig,
+    endpoint: EModelEndpoint.agents,
+    endpointType: EModelEndpoint.agents,
+  });
   const isUploadDisabled = endpointFileConfig?.disabled ?? false;
 
   if (isUploadDisabled) {

client/src/components/SidePanel/Agents/FileContext.tsx

@@ -5,7 +5,7 @@ import {
   EModelEndpoint,
   EToolResources,
   mergeFileConfig,
-  fileConfig as defaultFileConfig,
+  getEndpointFileConfig,
 } from 'librechat-data-provider';
 import {
   HoverCard,
@@ -41,17 +41,15 @@ export default function FileContext({
   const { data: startupConfig } = useGetStartupConfig();
   const sharePointEnabled = startupConfig?.sharePointFilePickerEnabled;
 
-  const { data: fileConfig = defaultFileConfig } = useGetFileConfig({
+  const { data: fileConfig = null } = useGetFileConfig({
     select: (data) => mergeFileConfig(data),
   });
 
   const { handleFileChange } = useFileHandling({
-    overrideEndpoint: EModelEndpoint.agents,
     additionalMetadata: { agent_id, tool_resource: EToolResources.context },
     fileSetter: setFiles,
   });
   const { handleSharePointFiles, isProcessing, downloadProgress } = useSharePointFileHandling({
-    overrideEndpoint: EModelEndpoint.agents,
     additionalMetadata: { agent_id, tool_resource: EToolResources.file_search },
     fileSetter: setFiles,
   });
@@ -65,8 +63,12 @@ export default function FileContext({
     750,
   );
 
-  const endpointFileConfig = fileConfig.endpoints[EModelEndpoint.agents];
-  const isUploadDisabled = endpointFileConfig.disabled ?? false;
+  const endpointFileConfig = getEndpointFileConfig({
+    fileConfig,
+    endpoint: EModelEndpoint.agents,
+    endpointType: EModelEndpoint.agents,
+  });
+  const isUploadDisabled = endpointFileConfig?.disabled ?? false;
   const handleSharePointFilesSelected = async (sharePointFiles: any[]) => {
     try {
       await handleSharePointFiles(sharePointFiles);

client/src/components/SidePanel/Agents/FileSearch.tsx

@@ -8,7 +8,7 @@ import {
   EToolResources,
   mergeFileConfig,
   AgentCapabilities,
-  fileConfig as defaultFileConfig,
+  getEndpointFileConfig,
 } from 'librechat-data-provider';
 import type { ExtendedFile, AgentForm } from '~/common';
 import useSharePointFileHandling from '~/hooks/Files/useSharePointFileHandling';
@@ -38,18 +38,16 @@ export default function FileSearch({
   // Get startup configuration for SharePoint feature flag
   const { data: startupConfig } = useGetStartupConfig();
 
-  const { data: fileConfig = defaultFileConfig } = useGetFileConfig({
+  const { data: fileConfig = null } = useGetFileConfig({
     select: (data) => mergeFileConfig(data),
   });
 
   const { handleFileChange } = useFileHandling({
-    overrideEndpoint: EModelEndpoint.agents,
     additionalMetadata: { agent_id, tool_resource: EToolResources.file_search },
     fileSetter: setFiles,
   });
 
   const { handleSharePointFiles, isProcessing, downloadProgress } = useSharePointFileHandling({
-    overrideEndpoint: EModelEndpoint.agents,
     additionalMetadata: { agent_id, tool_resource: EToolResources.file_search },
     fileSetter: setFiles,
   });
@@ -66,8 +64,12 @@ export default function FileSearch({
 
   const fileSearchChecked = watch(AgentCapabilities.file_search);
 
-  const endpointFileConfig = fileConfig.endpoints[EModelEndpoint.agents];
-  const isUploadDisabled = endpointFileConfig.disabled ?? false;
+  const endpointFileConfig = getEndpointFileConfig({
+    fileConfig,
+    endpoint: EModelEndpoint.agents,
+    endpointType: EModelEndpoint.agents,
+  });
+  const isUploadDisabled = endpointFileConfig?.disabled ?? false;
 
   const sharePointEnabled = startupConfig?.sharePointFilePickerEnabled;
   const disabledUploadButton = isEphemeralAgent(agent_id) || fileSearchChecked === false;

client/src/components/SidePanel/Agents/ModelPanel.tsx

@@ -7,6 +7,7 @@ import { componentMapping } from '~/components/SidePanel/Parameters/components';
 import {
   alternateName,
   getSettingsKeys,
+  getEndpointField,
   LocalStorageKeys,
   SettingDefinition,
   agentParamSettings,
@@ -14,9 +15,9 @@ import {
 import type * as t from 'librechat-data-provider';
 import type { AgentForm, AgentModelPanelProps, StringOption } from '~/common';
 import { useGetEndpointsQuery } from '~/data-provider';
-import { getEndpointField, cn } from '~/utils';
 import { useLocalize } from '~/hooks';
 import { Panel } from '~/common';
+import { cn } from '~/utils';
 
 export default function ModelPanel({
   providers,

client/src/components/SidePanel/Builder/CodeFiles.tsx

@@ -1,10 +1,6 @@
 import { useState, useRef, useEffect } from 'react';
-import {
-  EToolResources,
-  mergeFileConfig,
-  fileConfig as defaultFileConfig,
-} from 'librechat-data-provider';
-import type { AssistantsEndpoint, EndpointFileConfig } from 'librechat-data-provider';
+import { EToolResources, mergeFileConfig, getEndpointFileConfig } from 'librechat-data-provider';
+import type { AssistantsEndpoint } from 'librechat-data-provider';
 import type { ExtendedFile } from '~/common';
 import FileRow from '~/components/Chat/Input/Files/FileRow';
 import { useGetFileConfig } from '~/data-provider';
@@ -28,11 +24,10 @@ export default function CodeFiles({
   const { setFilesLoading } = useChatContext();
   const fileInputRef = useRef<HTMLInputElement>(null);
   const [files, setFiles] = useState<Map<string, ExtendedFile>>(new Map());
-  const { data: fileConfig = defaultFileConfig } = useGetFileConfig({
+  const { data: fileConfig = null } = useGetFileConfig({
     select: (data) => mergeFileConfig(data),
   });
   const { handleFileChange } = useFileHandling({
-    overrideEndpoint: endpoint,
     additionalMetadata: { assistant_id, tool_resource },
     fileSetter: setFiles,
   });
@@ -43,7 +38,11 @@ export default function CodeFiles({
     }
   }, [_files]);
 
-  const endpointFileConfig = fileConfig.endpoints[endpoint] as EndpointFileConfig | undefined;
+  const endpointFileConfig = getEndpointFileConfig({
+    fileConfig,
+    endpoint,
+    endpointType: endpoint,
+  });
   const isUploadDisabled = endpointFileConfig?.disabled ?? false;
 
   if (isUploadDisabled) {

client/src/components/SidePanel/Builder/Knowledge.tsx

@@ -2,9 +2,9 @@ import { useState, useRef, useEffect } from 'react';
 import {
   mergeFileConfig,
   retrievalMimeTypes,
-  fileConfig as defaultFileConfig,
+  getEndpointFileConfig,
 } from 'librechat-data-provider';
-import type { AssistantsEndpoint, EndpointFileConfig } from 'librechat-data-provider';
+import type { AssistantsEndpoint } from 'librechat-data-provider';
 import type { ExtendedFile } from '~/common';
 import FileRow from '~/components/Chat/Input/Files/FileRow';
 import { useGetFileConfig } from '~/data-provider';
@@ -38,11 +38,10 @@ export default function Knowledge({
   const { setFilesLoading } = useChatContext();
   const fileInputRef = useRef<HTMLInputElement>(null);
   const [files, setFiles] = useState<Map<string, ExtendedFile>>(new Map());
-  const { data: fileConfig = defaultFileConfig } = useGetFileConfig({
+  const { data: fileConfig = null } = useGetFileConfig({
     select: (data) => mergeFileConfig(data),
   });
   const { handleFileChange } = useFileHandling({
-    overrideEndpoint: endpoint,
     additionalMetadata: { assistant_id },
     fileSetter: setFiles,
   });
@@ -53,7 +52,11 @@ export default function Knowledge({
     }
   }, [_files]);
 
-  const endpointFileConfig = fileConfig.endpoints[endpoint] as EndpointFileConfig | undefined;
+  const endpointFileConfig = getEndpointFileConfig({
+    fileConfig,
+    endpoint,
+    endpointType: endpoint,
+  });
   const isUploadDisabled = endpointFileConfig?.disabled ?? false;
 
   if (isUploadDisabled) {

client/src/components/SidePanel/Files/PanelTable.tsx

@@ -30,6 +30,7 @@ import {
   mergeFileConfig,
   megabyte,
   isAssistantsEndpoint,
+  getEndpointFileConfig,
   type TFile,
 } from 'librechat-data-provider';
 import { useFileMapContext, useChatContext } from '~/Providers';
@@ -86,7 +87,7 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro
   const fileMap = useFileMapContext();
   const { showToast } = useToastContext();
   const { setFiles, conversation } = useChatContext();
-  const { data: fileConfig = defaultFileConfig } = useGetFileConfig({
+  const { data: fileConfig = null } = useGetFileConfig({
     select: (data) => mergeFileConfig(data),
   });
   const { addFile } = useUpdateFiles(setFiles);
@@ -103,6 +104,7 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro
 
       const fileData = fileMap[file.file_id];
       const endpoint = conversation.endpoint;
+      const endpointType = conversation.endpointType;
 
       if (!fileData.source) {
         return;
@@ -126,20 +128,31 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro
         });
       }
 
-      const { fileSizeLimit, supportedMimeTypes } =
-        fileConfig.endpoints[endpoint] ?? fileConfig.endpoints.default;
+      const endpointFileConfig = getEndpointFileConfig({
+        fileConfig,
+        endpoint,
+        endpointType,
+      });
 
-      if (fileData.bytes > fileSizeLimit) {
+      if (endpointFileConfig.disabled === true) {
+        showToast({
+          message: localize('com_ui_attach_error_disabled'),
+          status: 'error',
+        });
+        return;
+      }
+
+      if (fileData.bytes > (endpointFileConfig.fileSizeLimit ?? Number.MAX_SAFE_INTEGER)) {
         showToast({
           message: `${localize('com_ui_attach_error_size')} ${
-            fileSizeLimit / megabyte
+            (endpointFileConfig.fileSizeLimit ?? 0) / megabyte
           } MB (${endpoint})`,
           status: 'error',
         });
         return;
       }
 
-      if (!defaultFileConfig.checkType(file.type, supportedMimeTypes)) {
+      if (!defaultFileConfig.checkType(file.type, endpointFileConfig.supportedMimeTypes ?? [])) {
         showToast({
           message: `${localize('com_ui_attach_error_type')} ${file.type} (${endpoint})`,
           status: 'error',
@@ -162,7 +175,7 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro
         metadata: fileData.metadata,
       });
     },
-    [addFile, fileMap, conversation, localize, showToast, fileConfig.endpoints],
+    [addFile, fileMap, conversation, localize, showToast, fileConfig],
   );
 
   const filenameFilter = table.getColumn('filename')?.getFilterValue() as string;

client/src/components/SidePanel/Parameters/Panel.tsx

@@ -5,6 +5,7 @@ import {
   excludedKeys,
   paramSettings,
   getSettingsKeys,
+  getEndpointField,
   SettingDefinition,
   tConvoUpdateSchema,
 } from 'librechat-data-provider';
@@ -12,9 +13,9 @@ import type { TPreset } from 'librechat-data-provider';
 import { SaveAsPresetDialog } from '~/components/Endpoints';
 import { useSetIndexOptions, useLocalize } from '~/hooks';
 import { useGetEndpointsQuery } from '~/data-provider';
-import { getEndpointField, logger } from '~/utils';
 import { componentMapping } from './components';
 import { useChatContext } from '~/Providers';
+import { logger } from '~/utils';
 
 export default function Parameters() {
   const localize = useLocalize();

client/src/components/SidePanel/SidePanel.tsx

@@ -1,4 +1,5 @@
 import { useState, useCallback, useMemo, memo } from 'react';
+import { getEndpointField } from 'librechat-data-provider';
 import { useUserKeyQuery } from 'librechat-data-provider/react-query';
 import { ResizableHandleAlt, ResizablePanel, useMediaQuery } from '@librechat/client';
 import type { TEndpointsConfig, TInterfaceConfig } from 'librechat-data-provider';
@@ -8,7 +9,7 @@ import { useLocalStorage, useLocalize } from '~/hooks';
 import { useGetEndpointsQuery } from '~/data-provider';
 import NavToggle from '~/components/Nav/NavToggle';
 import { useSidePanelContext } from '~/Providers';
-import { cn, getEndpointField } from '~/utils';
+import { cn } from '~/utils';
 import Nav from './Nav';
 
 const defaultMinSize = 20;

client/src/hooks/Chat/useChatFunctions.ts

@@ -6,6 +6,7 @@ import {
   QueryKeys,
   ContentTypes,
   EModelEndpoint,
+  getEndpointField,
   isAgentsEndpoint,
   parseCompactConvo,
   replaceSpecialVars,
@@ -25,10 +26,10 @@ import type { TAskFunction, ExtendedFile } from '~/common';
 import useSetFilesToDelete from '~/hooks/Files/useSetFilesToDelete';
 import useGetSender from '~/hooks/Conversations/useGetSender';
 import store, { useGetEphemeralAgent } from '~/store';
-import { getEndpointField, logger } from '~/utils';
 import useUserKey from '~/hooks/Input/useUserKey';
 import { useNavigate } from 'react-router-dom';
 import { useAuthContext } from '~/hooks';
+import { logger } from '~/utils';
 
 const logChatRequest = (request: Record<string, unknown>) => {
   logger.log('=====================================\nAsk function called with:');

client/src/hooks/Conversations/useGenerateConvo.ts

@@ -1,18 +1,18 @@
 import { useRecoilValue } from 'recoil';
 import { useCallback, useRef, useEffect } from 'react';
 import { useGetModelsQuery } from 'librechat-data-provider/react-query';
-import { LocalStorageKeys, isAssistantsEndpoint } from 'librechat-data-provider';
+import { getEndpointField, LocalStorageKeys, isAssistantsEndpoint } from 'librechat-data-provider';
 import type {
-  TPreset,
-  TModelsConfig,
-  TConversation,
   TEndpointsConfig,
   EModelEndpoint,
+  TModelsConfig,
+  TConversation,
+  TPreset,
 } from 'librechat-data-provider';
-import type { SetterOrUpdater } from 'recoil';
 import type { AssistantListItem } from '~/common';
-import { getEndpointField, buildDefaultConvo, getDefaultEndpoint, logger } from '~/utils';
+import type { SetterOrUpdater } from 'recoil';
 import useAssistantListMap from '~/hooks/Assistants/useAssistantListMap';
+import { buildDefaultConvo, getDefaultEndpoint, logger } from '~/utils';
 import { useGetEndpointsQuery } from '~/data-provider';
 import { mainTextareaId } from '~/common';
 import store from '~/store';

client/src/hooks/Conversations/useNavigateToConvo.tsx

@@ -2,20 +2,14 @@ import { useCallback } from 'react';
 import { useSetRecoilState } from 'recoil';
 import { useNavigate } from 'react-router-dom';
 import { useQueryClient } from '@tanstack/react-query';
-import { QueryKeys, Constants, dataService } from 'librechat-data-provider';
+import { QueryKeys, Constants, dataService, getEndpointField } from 'librechat-data-provider';
 import type {
   TEndpointsConfig,
   TStartupConfig,
   TModelsConfig,
   TConversation,
 } from 'librechat-data-provider';
-import {
-  getDefaultEndpoint,
-  clearMessagesCache,
-  buildDefaultConvo,
-  getEndpointField,
-  logger,
-} from '~/utils';
+import { getDefaultEndpoint, clearMessagesCache, buildDefaultConvo, logger } from '~/utils';
 import { useApplyModelSpecEffects } from '~/hooks/Agents';
 import store from '~/store';
 

client/src/hooks/Endpoint/useEndpoints.ts

@@ -5,6 +5,7 @@ import {
   alternateName,
   EModelEndpoint,
   PermissionTypes,
+  getEndpointField,
 } from 'librechat-data-provider';
 import type {
   TEndpointsConfig,
@@ -14,8 +15,8 @@ import type {
   Agent,
 } from 'librechat-data-provider';
 import type { Endpoint } from '~/common';
-import { mapEndpoints, getIconKey, getEndpointField } from '~/utils';
 import { useGetEndpointsQuery } from '~/data-provider';
+import { mapEndpoints, getIconKey } from '~/utils';
 import { useHasAccess } from '~/hooks';
 import { icons } from './Icons';
 

client/src/hooks/Files/useDragHelpers.ts

@@ -1,5 +1,6 @@
 import { useState, useMemo, useCallback, useRef } from 'react';
 import { useDrop } from 'react-dnd';
+import { useToastContext } from '@librechat/client';
 import { NativeTypes } from 'react-dnd-html5-backend';
 import { useQueryClient } from '@tanstack/react-query';
 import { useRecoilValue, useSetRecoilState } from 'recoil';
@@ -7,10 +8,12 @@ import {
   Tools,
   QueryKeys,
   Constants,
-  EModelEndpoint,
   EToolResources,
+  EModelEndpoint,
+  mergeFileConfig,
   AgentCapabilities,
   isAssistantsEndpoint,
+  getEndpointFileConfig,
   defaultAgentCapabilities,
 } from 'librechat-data-provider';
 import type { DropTargetMonitor } from 'react-dnd';
@@ -18,9 +21,12 @@ import type * as t from 'librechat-data-provider';
 import store, { ephemeralAgentByConvoId } from '~/store';
 import useFileHandling from './useFileHandling';
 import { isEphemeralAgent } from '~/common';
+import useLocalize from '../useLocalize';
 
 export default function useDragHelpers() {
   const queryClient = useQueryClient();
+  const { showToast } = useToastContext();
+  const localize = useLocalize();
   const [showModal, setShowModal] = useState(false);
   const [draggedFiles, setDraggedFiles] = useState<File[]>([]);
   const conversation = useRecoilValue(store.conversationByIndex(0)) || undefined;
@@ -33,9 +39,7 @@ export default function useDragHelpers() {
     [conversation?.endpoint],
   );
 
-  const { handleFiles } = useFileHandling({
-    overrideEndpoint: isAssistants ? undefined : EModelEndpoint.agents,
-  });
+  const { handleFiles } = useFileHandling();
 
   const handleOptionSelect = useCallback(
     (toolResource: EToolResources | undefined) => {
@@ -62,6 +66,26 @@ export default function useDragHelpers() {
 
   const handleDrop = useCallback(
     (item: { files: File[] }) => {
+      /** Early block: leverage endpoint file config to prevent drag/drop on disabled endpoints */
+      const currentEndpoint = conversationRef.current?.endpoint ?? 'default';
+      const currentEndpointType = conversationRef.current?.endpointType ?? undefined;
+      const cfg = queryClient.getQueryData<t.FileConfig>([QueryKeys.fileConfig]);
+      if (cfg) {
+        const mergedCfg = mergeFileConfig(cfg);
+        const endpointCfg = getEndpointFileConfig({
+          fileConfig: mergedCfg,
+          endpoint: currentEndpoint,
+          endpointType: currentEndpointType,
+        });
+        if (endpointCfg?.disabled === true) {
+          showToast({
+            message: localize('com_ui_attach_error_disabled'),
+            status: 'error',
+          });
+          return;
+        }
+      }
+
       if (isAssistants) {
         handleFilesRef.current(item.files);
         return;
@@ -110,7 +134,7 @@ export default function useDragHelpers() {
       setDraggedFiles(item.files);
       setShowModal(true);
     },
-    [isAssistants, queryClient],
+    [isAssistants, queryClient, showToast, localize],
   );
 
   const [{ canDrop, isOver }, drop] = useDrop(

client/src/hooks/Files/useFileHandling.ts

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useMemo, useState } from 'react';
 import { v4 } from 'uuid';
 import { useSetRecoilState } from 'recoil';
 import { useToastContext } from '@librechat/client';
@@ -6,16 +6,14 @@ import { useQueryClient } from '@tanstack/react-query';
 import {
   QueryKeys,
   Constants,
-  EModelEndpoint,
   EToolResources,
   mergeFileConfig,
-  isAgentsEndpoint,
   isAssistantsEndpoint,
+  getEndpointFileConfig,
   defaultAssistantsVersion,
-  fileConfig as defaultFileConfig,
 } from 'librechat-data-provider';
 import debounce from 'lodash/debounce';
-import type { EndpointFileConfig, TEndpointsConfig, TError } from 'librechat-data-provider';
+import type { TEndpointsConfig, TError } from 'librechat-data-provider';
 import type { ExtendedFile, FileSetter } from '~/common';
 import { useGetFileConfig, useUploadFileMutation } from '~/data-provider';
 import useLocalize, { TranslationKeys } from '~/hooks/useLocalize';
@@ -29,9 +27,7 @@ import useUpdateFiles from './useUpdateFiles';
 
 type UseFileHandling = {
   fileSetter?: FileSetter;
-  overrideEndpoint?: EModelEndpoint;
   fileFilter?: (file: File) => boolean;
-  overrideEndpointFileConfig?: EndpointFileConfig;
   additionalMetadata?: Record<string, string | undefined>;
 };
 
@@ -54,17 +50,13 @@ const useFileHandling = (params?: UseFileHandling) => {
 
   const agent_id = params?.additionalMetadata?.agent_id ?? '';
   const assistant_id = params?.additionalMetadata?.assistant_id ?? '';
+  const endpointType = useMemo(() => conversation?.endpointType, [conversation?.endpointType]);
+  const endpoint = useMemo(() => conversation?.endpoint ?? 'default', [conversation?.endpoint]);
 
   const { data: fileConfig = null } = useGetFileConfig({
     select: (data) => mergeFileConfig(data),
   });
 
-  const endpoint = useMemo(
-    () =>
-      params?.overrideEndpoint ?? conversation?.endpointType ?? conversation?.endpoint ?? 'default',
-    [params?.overrideEndpoint, conversation?.endpointType, conversation?.endpoint],
-  );
-
   const displayToast = useCallback(() => {
     if (errors.length > 1) {
       // TODO: this should not be a dynamic localize input!!
@@ -169,10 +161,7 @@ const useFileHandling = (params?: UseFileHandling) => {
 
     const formData = new FormData();
     formData.append('endpoint', endpoint);
-    formData.append(
-      'original_endpoint',
-      conversation?.endpointType || conversation?.endpoint || '',
-    );
+    formData.append('endpointType', endpointType ?? '');
     formData.append('file', extendedFile.file as File, encodeURIComponent(filename));
     formData.append('file_id', extendedFile.file_id);
 
@@ -194,7 +183,7 @@ const useFileHandling = (params?: UseFileHandling) => {
       }
     }
 
-    if (isAgentsEndpoint(endpoint)) {
+    if (!isAssistantsEndpoint(endpointType ?? endpoint)) {
       if (!agent_id) {
         formData.append('message_file', 'true');
       }
@@ -205,9 +194,7 @@ const useFileHandling = (params?: UseFileHandling) => {
       if (conversation?.agent_id != null && formData.get('agent_id') == null) {
         formData.append('agent_id', conversation.agent_id);
       }
-    }
 
-    if (!isAssistantsEndpoint(endpoint)) {
       uploadFile.mutate(formData);
       return;
     }
@@ -264,18 +251,19 @@ const useFileHandling = (params?: UseFileHandling) => {
     /* Validate files */
     let filesAreValid: boolean;
     try {
+      const endpointFileConfig = getEndpointFileConfig({
+        endpoint,
+        fileConfig,
+        endpointType,
+      });
+
       filesAreValid = validateFiles({
         files,
         fileList,
         setError,
-        endpointFileConfig:
-          params?.overrideEndpointFileConfig ??
-          fileConfig?.endpoints?.[endpoint] ??
-          fileConfig?.endpoints?.default ??
-          defaultFileConfig.endpoints[endpoint] ??
-          defaultFileConfig.endpoints.default,
+        fileConfig,
+        endpointFileConfig,
         toolResource: _toolResource,
-        fileConfig: fileConfig,
       });
     } catch (error) {
       console.error('file validation error', error);

client/src/hooks/Files/useSharePointFileHandling.ts

@@ -5,11 +5,9 @@ import type { SharePointFile } from '~/data-provider/Files/sharepoint';
 
 interface UseSharePointFileHandlingProps {
   fileSetter?: any;
+  toolResource?: string;
   fileFilter?: (file: File) => boolean;
   additionalMetadata?: Record<string, string | undefined>;
-  overrideEndpoint?: any;
-  overrideEndpointFileConfig?: any;
-  toolResource?: string;
 }
 
 interface UseSharePointFileHandlingReturn {

client/src/hooks/Input/useRequiresKey.ts

@@ -1,6 +1,6 @@
+import { getEndpointField } from 'librechat-data-provider';
 import { useChatContext } from '~/Providers/ChatContext';
 import { useGetEndpointsQuery } from '~/data-provider';
-import { getEndpointField } from '~/utils';
 import useUserKey from './useUserKey';
 
 export default function useRequiresKey() {

client/src/hooks/useNewConvo.ts

@@ -1,15 +1,16 @@
 import { useCallback } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { useGetModelsQuery } from 'librechat-data-provider/react-query';
+import { useRecoilState, useRecoilValue, useSetRecoilState, useRecoilCallback } from 'recoil';
 import {
   Constants,
   FileSources,
   EModelEndpoint,
   isParamEndpoint,
+  getEndpointField,
   LocalStorageKeys,
   isAssistantsEndpoint,
 } from 'librechat-data-provider';
-import { useRecoilState, useRecoilValue, useSetRecoilState, useRecoilCallback } from 'recoil';
 import type {
   TPreset,
   TSubmission,
@@ -19,19 +20,18 @@ import type {
 } from 'librechat-data-provider';
 import type { AssistantListItem } from '~/common';
 import {
-  getEndpointField,
-  buildDefaultConvo,
+  updateLastSelectedModel,
+  getDefaultModelSpec,
   getDefaultEndpoint,
   getModelSpecPreset,
-  getDefaultModelSpec,
-  updateLastSelectedModel,
+  buildDefaultConvo,
+  logger,
 } from '~/utils';
 import { useDeleteFilesMutation, useGetEndpointsQuery, useGetStartupConfig } from '~/data-provider';
 import useAssistantListMap from './Assistants/useAssistantListMap';
 import { useResetChatBadges } from './useChatBadges';
 import { useApplyModelSpecEffects } from './Agents';
 import { usePauseGlobalAudio } from './Audio';
-import { logger } from '~/utils';
 import store from '~/store';
 
 const useNewConvo = (index = 0) => {

client/src/locales/en/translation.json

@@ -716,6 +716,7 @@
   "com_ui_attach_error_openai": "Cannot attach Assistant files to other endpoints",
   "com_ui_attach_error_size": "File size limit exceeded for endpoint:",
   "com_ui_attach_error_type": "Unsupported file type for endpoint:",
+  "com_ui_attach_error_disabled": "File uploads are disabled for this endpoint",
   "com_ui_attach_remove": "Remove file",
   "com_ui_attach_warn_endpoint": "Non-Assistant files may be ignored without a compatible tool",
   "com_ui_attachment": "Attachment",

client/src/utils/endpoints.spec.ts

@@ -1,11 +1,6 @@
-import { EModelEndpoint } from 'librechat-data-provider';
+import { EModelEndpoint, getEndpointField } from 'librechat-data-provider';
 import type { TEndpointsConfig, TConfig } from 'librechat-data-provider';
-import {
-  getEndpointField,
-  getAvailableEndpoints,
-  getEndpointsFilter,
-  mapEndpoints,
-} from './endpoints';
+import { getAvailableEndpoints, getEndpointsFilter, mapEndpoints } from './endpoints';
 
 const mockEndpointsConfig: TEndpointsConfig = {
   [EModelEndpoint.openAI]: { type: undefined, iconURL: 'openAI_icon.png', order: 0 },

client/src/utils/endpoints.ts

@@ -4,6 +4,7 @@ import {
   defaultEndpoints,
   modularEndpoints,
   LocalStorageKeys,
+  getEndpointField,
   isAgentsEndpoint,
   isAssistantsEndpoint,
 } from 'librechat-data-provider';
@@ -58,24 +59,6 @@ export const getAvailableEndpoints = (
   return availableEndpoints;
 };
 
-/** Get the specified field from the endpoint config */
-export function getEndpointField<K extends keyof t.TConfig>(
-  endpointsConfig: t.TEndpointsConfig | undefined | null,
-  endpoint: EModelEndpoint | string | null | undefined,
-  property: K,
-): t.TConfig[K] | undefined {
-  if (!endpointsConfig || endpoint === null || endpoint === undefined) {
-    return undefined;
-  }
-
-  const config = endpointsConfig[endpoint];
-  if (!config) {
-    return undefined;
-  }
-
-  return config[property];
-}
-
 export function mapEndpoints(endpointsConfig: t.TEndpointsConfig) {
   const filter = getEndpointsFilter(endpointsConfig);
   return getAvailableEndpoints(filter, endpointsConfig).sort(

client/src/utils/files.ts

@@ -235,7 +235,13 @@ export const validateFiles = ({
   toolResource?: string;
   fileConfig: FileConfig | null;
 }) => {
-  const { fileLimit, fileSizeLimit, totalSizeLimit, supportedMimeTypes } = endpointFileConfig;
+  const { fileLimit, fileSizeLimit, totalSizeLimit, supportedMimeTypes, disabled } =
+    endpointFileConfig;
+  /** Block all uploads if the endpoint is explicitly disabled */
+  if (disabled === true) {
+    setError('com_ui_attach_error_disabled');
+    return false;
+  }
   const existingFiles = Array.from(files.values());
   const incomingTotalSize = fileList.reduce((total, file) => total + file.size, 0);
   if (incomingTotalSize === 0) {