📊 refactor: use Parameters from Side Panel for OpenAI, Anthropic, and Custom endpoints

api/app/clients/AnthropicClient.js

@@ -17,8 +17,8 @@ const {
   parseParamFromPrompt,
   createContextHandlers,
 } = require('./prompts');
+const { getModelMaxTokens, getModelMaxOutputTokens, matchModelName } = require('~/utils');
 const { spendTokens, spendStructuredTokens } = require('~/models/spendTokens');
-const { getModelMaxTokens, matchModelName } = require('~/utils');
 const { sleep } = require('~/server/utils');
 const BaseClient = require('./BaseClient');
 const { logger } = require('~/config');
@@ -120,7 +120,14 @@ class AnthropicClient extends BaseClient {
       this.options.maxContextTokens ??
       getModelMaxTokens(this.modelOptions.model, EModelEndpoint.anthropic) ??
       100000;
-    this.maxResponseTokens = this.modelOptions.maxOutputTokens || 1500;
+    this.maxResponseTokens =
+      this.modelOptions.maxOutputTokens ??
+      getModelMaxOutputTokens(
+        this.modelOptions.model,
+        this.options.endpointType ?? this.options.endpoint,
+        this.options.endpointTokenConfig,
+      ) ??
+      1500;
     this.maxPromptTokens =
       this.options.maxPromptTokens || this.maxContextTokens - this.maxResponseTokens;
 
@@ -144,17 +151,6 @@ class AnthropicClient extends BaseClient {
     this.endToken = '';
     this.gptEncoder = this.constructor.getTokenizer('cl100k_base');
 
-    if (!this.modelOptions.stop) {
-      const stopTokens = [this.startToken];
-      if (this.endToken && this.endToken !== this.startToken) {
-        stopTokens.push(this.endToken);
-      }
-      stopTokens.push(`${this.userLabel}`);
-      stopTokens.push('<|diff_marker|>');
-
-      this.modelOptions.stop = stopTokens;
-    }
-
     return this;
   }
 

api/app/clients/BaseClient.js

@@ -3,7 +3,7 @@ const fetch = require('node-fetch');
 const {
   supportsBalanceCheck,
   isAgentsEndpoint,
-  paramEndpoints,
+  isParamEndpoint,
   ErrorTypes,
   Constants,
   CacheKeys,
@@ -588,7 +588,10 @@ class BaseClient {
 
     if (typeof completion === 'string') {
       responseMessage.text = addSpaceIfNeeded(generation) + completion;
-    } else if (Array.isArray(completion) && paramEndpoints.has(this.options.endpoint)) {
+    } else if (
+      Array.isArray(completion) &&
+      isParamEndpoint(this.options.endpoint, this.options.endpointType)
+    ) {
       responseMessage.text = '';
       responseMessage.content = completion;
     } else if (Array.isArray(completion)) {

api/app/clients/OpenAIClient.js

@@ -1295,6 +1295,7 @@ ${convo}
 
       if (modelOptions.stream && /\bo1\b/i.test(modelOptions.model)) {
         delete modelOptions.stream;
+        delete modelOptions.stop;
       }
 
       if (modelOptions.stream) {

api/server/controllers/AskController.js

@@ -16,7 +16,12 @@ const AskController = async (req, res, next, initializeClient, addTitle) => {
     overrideParentMessageId = null,
   } = req.body;
 
-  logger.debug('[AskController]', { text, conversationId, ...endpointOption });
+  logger.debug('[AskController]', {
+    text,
+    conversationId,
+    ...endpointOption,
+    modelsConfig: endpointOption.modelsConfig ? 'exists' : '',
+  });
 
   let userMessage;
   let userMessagePromise;

api/server/controllers/EditController.js

@@ -25,6 +25,7 @@ const EditController = async (req, res, next, initializeClient) => {
     isContinued,
     conversationId,
     ...endpointOption,
+    modelsConfig: endpointOption.modelsConfig ? 'exists' : '',
   });
 
   let userMessage;

api/utils/tokens.js

@@ -123,7 +123,16 @@ const modelMaxOutputs = {
   system_default: 1024,
 };
 
+const anthropicMaxOutputs = {
+  'claude-3-haiku': 4096,
+  'claude-3-sonnet': 4096,
+  'claude-3-opus': 4096,
+  'claude-3.5-sonnet': 8192,
+  'claude-3-5-sonnet': 8192,
+};
+
 const maxOutputTokensMap = {
+  [EModelEndpoint.anthropic]: anthropicMaxOutputs,
   [EModelEndpoint.azureOpenAI]: modelMaxOutputs,
   [EModelEndpoint.openAI]: modelMaxOutputs,
   [EModelEndpoint.custom]: modelMaxOutputs,

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

@@ -2,7 +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 { tPresetUpdateSchema, EModelEndpoint, paramEndpoints } from 'librechat-data-provider';
+import { tPresetUpdateSchema, EModelEndpoint, isParamEndpoint } from 'librechat-data-provider';
 import type { TPreset, TInterfaceConfig } from 'librechat-data-provider';
 import { EndpointSettings, SaveAsPresetDialog, AlternativeSettings } from '~/components/Endpoints';
 import { PluginStoreDialog, TooltipAnchor } from '~/components';
@@ -28,7 +28,7 @@ export default function HeaderOptions({
     useChatContext();
   const { setOption } = useSetIndexOptions();
 
-  const { endpoint, conversationId, jailbreak = false } = conversation ?? {};
+  const { endpoint, endpointType, conversationId, jailbreak = false } = conversation ?? {};
 
   const altConditions: { [key: string]: boolean } = {
     bingAI: !!(latestMessage && jailbreak && endpoint === 'bingAI'),
@@ -64,6 +64,8 @@ export default function HeaderOptions({
   const triggerAdvancedMode = altConditions[endpoint]
     ? altSettings[endpoint]
     : () => setShowPopover((prev) => !prev);
+
+  const paramEndpoint = isParamEndpoint(endpoint, endpointType);
   return (
     <Root
       open={showPopover}
@@ -83,7 +85,7 @@ export default function HeaderOptions({
               )}
               {!noSettings[endpoint] &&
                 interfaceConfig?.parameters === true &&
-                !paramEndpoints.has(endpoint) && (
+                paramEndpoint === false && (
                 <TooltipAnchor
                   id="parameters-button"
                   aria-label={localize('com_ui_model_parameters')}
@@ -98,7 +100,7 @@ export default function HeaderOptions({
                 </TooltipAnchor>
               )}
             </div>
-            {interfaceConfig?.parameters === true && !paramEndpoints.has(endpoint) && (
+            {interfaceConfig?.parameters === true && paramEndpoint === false && (
               <OptionsPopover
                 visible={showPopover}
                 saveAsPreset={saveAsPreset}