🐛 fix: Correct Endpoint/Icon Handling, Update Module Resolutions (dan…

…ny-avila#5205)

* fix: agent modelSpec iconURLs not being recorded

* fix: prioritize message properties over conversation defaults in icon data

* fix: determine endpoint type from endpointsConfig

* chore: type issue with setting.columnSpan

* chore: remove redundant key indexing for keySchema

* chore: bump version to 0.7.691 in package.json

* chore: add stricter remark-gfm and mdast-util-gfm resolutions/overrides

* chore: remove rollup override and bump vite-plugin-pwa

* chore: reinstall remark-gfm for correct module resolution

* chore: reinstall vite-plugun-pwa

api/models/schema/key.js

@@ -16,7 +16,6 @@ const keySchema = mongoose.Schema({
   },
   expiresAt: {
     type: Date,
-    expires: 0,
   },
 });
 

api/server/controllers/agents/client.js

@@ -193,6 +193,7 @@ class AgentClient extends BaseClient {
           resendFiles: this.options.resendFiles,
           imageDetail: this.options.imageDetail,
           spec: this.options.spec,
+          iconURL: this.options.iconURL,
         },
         // TODO: PARSE OPTIONS BY PROVIDER, MAY CONTAIN SENSITIVE DATA
         runOptions,

api/server/services/Endpoints/agents/build.js

@@ -3,9 +3,10 @@ const { logger } = require('~/config');
 
 const buildOptions = (req, endpoint, parsedBody) => {
   const {
+    spec,
+    iconURL,
     agent_id,
     instructions,
-    spec,
     maxContextTokens,
     resendFiles = true,
     ...model_parameters
@@ -20,6 +21,7 @@ const buildOptions = (req, endpoint, parsedBody) => {
 
   const endpointOption = {
     spec,
+    iconURL,
     endpoint,
     agent_id,
     resendFiles,

api/server/services/Endpoints/agents/initialize.js

@@ -225,6 +225,7 @@ const initializeClient = async ({ req, res, endpointOption }) => {
     collectedUsage,
     artifactPromises,
     spec: endpointOption.spec,
+    iconURL: endpointOption.iconURL,
     agentConfigs,
     endpoint: EModelEndpoint.agents,
     maxContextTokens: primaryConfig.maxContextTokens,

client/package.json

@@ -139,6 +139,6 @@
     "typescript": "^5.0.4",
     "vite": "^5.1.1",
     "vite-plugin-node-polyfills": "^0.17.0",
-    "vite-plugin-pwa": "^0.20.5"
+    "vite-plugin-pwa": "^0.21.1"
   }
 }

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

@@ -2,6 +2,7 @@ import { useRecoilState } from 'recoil';
 import { Settings2 } from 'lucide-react';
 import { Root, Anchor } from '@radix-ui/react-popover';
 import { useState, useEffect, useMemo } from 'react';
+import { useGetEndpointsQuery } from 'librechat-data-provider/react-query';
 import { tConvoUpdateSchema, EModelEndpoint, isParamEndpoint } from 'librechat-data-provider';
 import type { TPreset, TInterfaceConfig } from 'librechat-data-provider';
 import { EndpointSettings, SaveAsPresetDialog, AlternativeSettings } from '~/components/Endpoints';
@@ -11,13 +12,15 @@ import { useSetIndexOptions, useLocalize } from '~/hooks';
 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,
 }: {
   interfaceConfig?: Partial<TInterfaceConfig>;
 }) {
+  const { data: endpointsConfig } = useGetEndpointsQuery();
   const [saveAsDialogShow, setSaveAsDialogShow] = useState<boolean>(false);
   const [showPluginStoreDialog, setShowPluginStoreDialog] = useRecoilState(
     store.showPluginStoreDialog,
@@ -27,8 +30,7 @@ export default function HeaderOptions({
   const { showPopover, conversation, latestMessage, setShowPopover, setShowBingToneSetting } =
     useChatContext();
   const { setOption } = useSetIndexOptions();
-
-  const { endpoint, endpointType, conversationId, jailbreak = false } = conversation ?? {};
+  const { endpoint, conversationId, jailbreak = false } = conversation ?? {};
 
   const altConditions: { [key: string]: boolean } = {
     bingAI: !!(latestMessage && jailbreak && endpoint === 'bingAI'),
@@ -65,7 +67,9 @@ export default function HeaderOptions({
     ? altSettings[endpoint]
     : () => setShowPopover((prev) => !prev);
 
+  const endpointType = getEndpointField(endpointsConfig, endpoint, 'type');
   const paramEndpoint = isParamEndpoint(endpoint, endpointType);
+
   return (
     <Root
       open={showPopover}

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

@@ -39,9 +39,9 @@ export default function Message(props: TMessageProps) {
   const iconData = useMemo(
     () =>
       ({
-        endpoint: conversation?.endpoint,
-        model: conversation?.model ?? message?.model,
-        iconURL: conversation?.iconURL ?? message?.iconURL ?? '',
+        endpoint: message?.endpoint ?? conversation?.endpoint,
+        model: message?.model ?? conversation?.model,
+        iconURL: message?.iconURL ?? conversation?.iconURL,
         modelLabel: conversation?.chatGptLabel ?? conversation?.modelLabel,
         isCreatedByUser: message?.isCreatedByUser,
       } as TMessage & { modelLabel?: string }),
@@ -53,6 +53,7 @@ export default function Message(props: TMessageProps) {
       conversation?.model,
       message?.model,
       message?.iconURL,
+      message?.endpoint,
       message?.isCreatedByUser,
     ],
   );

client/src/components/Chat/Messages/ui/MessageRender.tsx

@@ -69,9 +69,9 @@ const MessageRender = memo(
     const iconData = useMemo(
       () =>
         ({
-          endpoint: conversation?.endpoint,
-          model: conversation?.model ?? msg?.model,
-          iconURL: conversation?.iconURL ?? msg?.iconURL ?? '',
+          endpoint: msg?.endpoint ?? conversation?.endpoint,
+          model: msg?.model ?? conversation?.model,
+          iconURL: msg?.iconURL ?? conversation?.iconURL,
           modelLabel: conversation?.chatGptLabel ?? conversation?.modelLabel,
           isCreatedByUser: msg?.isCreatedByUser,
         } as TMessage & { modelLabel?: string }),
@@ -83,6 +83,7 @@ const MessageRender = memo(
         conversation?.model,
         msg?.model,
         msg?.iconURL,
+        msg?.endpoint,
         msg?.isCreatedByUser,
       ],
     );

client/src/components/Messages/ContentRender.tsx

@@ -68,9 +68,9 @@ const ContentRender = memo(
     const iconData = useMemo(
       () =>
         ({
-          endpoint: conversation?.endpoint,
-          model: conversation?.model ?? msg?.model,
-          iconURL: conversation?.iconURL ?? msg?.iconURL ?? '',
+          endpoint: msg?.endpoint ?? conversation?.endpoint,
+          model: msg?.model ?? conversation?.model,
+          iconURL: msg?.iconURL ?? conversation?.iconURL,
           modelLabel: conversation?.chatGptLabel ?? conversation?.modelLabel,
           isCreatedByUser: msg?.isCreatedByUser,
         } as TMessage & { modelLabel?: string }),
@@ -82,6 +82,7 @@ const ContentRender = memo(
         conversation?.model,
         msg?.model,
         msg?.iconURL,
+        msg?.endpoint,
         msg?.isCreatedByUser,
       ],
     );