🤖 refactor: Remove Default Model Params for All Endpoints (#3682)

* refactor: use parseCompactConvo in buildOptions, and generate no default values for the API to avoid weird model behavior with defaults

* refactor: OTHER - always show cursor when markdown component is empty (preferable to not)

* refactor(OpenAISettings): use config object for setting defaults app-wide

* refactor: Use removeNullishValues in buildOptions for ALL  endpoints

* fix: add missing conversationId to title methods for transactions; refactor(GoogleClient): model options, set no default, add todo note for recording token usage

* fix: at minimum set a model default, as is required by API (edge case)

api/server/middleware/buildEndpointOption.js

@@ -1,4 +1,4 @@
-const { parseConvo, EModelEndpoint } = require('librechat-data-provider');
+const { parseCompactConvo, EModelEndpoint } = require('librechat-data-provider');
 const { getModelsConfig } = require('~/server/controllers/ModelController');
 const azureAssistants = require('~/server/services/Endpoints/azureAssistants');
 const assistants = require('~/server/services/Endpoints/assistants');
@@ -24,7 +24,7 @@ const buildFunction = {
 
 async function buildEndpointOption(req, res, next) {
   const { endpoint, endpointType } = req.body;
-  const parsedBody = parseConvo({ endpoint, endpointType, conversation: req.body });
+  const parsedBody = parseCompactConvo({ endpoint, endpointType, conversation: req.body });
 
   if (req.app.locals.modelSpecs?.list && req.app.locals.modelSpecs?.enforce) {
     /** @type {{ list: TModelSpec[] }}*/

api/server/services/Endpoints/anthropic/addTitle.js

@@ -21,7 +21,11 @@ const addTitle = async (req, { text, response, client }) => {
   const titleCache = getLogStores(CacheKeys.GEN_TITLE);
   const key = `${req.user.id}-${response.conversationId}`;
 
-  const title = await client.titleConvo({ text, responseText: response?.text });
+  const title = await client.titleConvo({
+    text,
+    responseText: response?.text,
+    conversationId: response.conversationId,
+  });
   await titleCache.set(key, title, 120000);
   await saveConvo(
     req,

api/server/services/Endpoints/anthropic/buildOptions.js

@@ -1,15 +1,18 @@
+const { removeNullishValues } = require('librechat-data-provider');
+
 const buildOptions = (endpoint, parsedBody) => {
   const {
     modelLabel,
     promptPrefix,
     maxContextTokens,
-    resendFiles,
+    resendFiles = true,
     iconURL,
     greeting,
     spec,
-    ...rest
+    ...modelOptions
   } = parsedBody;
-  const endpointOption = {
+
+  const endpointOption = removeNullishValues({
     endpoint,
     modelLabel,
     promptPrefix,
@@ -18,10 +21,8 @@ const buildOptions = (endpoint, parsedBody) => {
     greeting,
     spec,
     maxContextTokens,
-    modelOptions: {
-      ...rest,
-    },
-  };
+    modelOptions,
+  });
 
   return endpointOption;
 };

api/server/services/Endpoints/assistants/buildOptions.js

@@ -1,17 +1,17 @@
+const { removeNullishValues } = require('librechat-data-provider');
+
 const buildOptions = (endpoint, parsedBody) => {
   // eslint-disable-next-line no-unused-vars
-  const { promptPrefix, assistant_id, iconURL, greeting, spec, ...rest } = parsedBody;
-  const endpointOption = {
+  const { promptPrefix, assistant_id, iconURL, greeting, spec, ...modelOptions } = parsedBody;
+  const endpointOption = removeNullishValues({
     endpoint,
     promptPrefix,
     assistant_id,
     iconURL,
     greeting,
     spec,
-    modelOptions: {
-      ...rest,
-    },
-  };
+    modelOptions,
+  });
 
   return endpointOption;
 };

api/server/services/Endpoints/azureAssistants/buildOptions.js

@@ -1,17 +1,17 @@
+const { removeNullishValues } = require('librechat-data-provider');
+
 const buildOptions = (endpoint, parsedBody) => {
   // eslint-disable-next-line no-unused-vars
-  const { promptPrefix, assistant_id, iconURL, greeting, spec, ...rest } = parsedBody;
-  const endpointOption = {
+  const { promptPrefix, assistant_id, iconURL, greeting, spec, ...modelOptions } = parsedBody;
+  const endpointOption = removeNullishValues({
     endpoint,
     promptPrefix,
     assistant_id,
     iconURL,
     greeting,
     spec,
-    modelOptions: {
-      ...rest,
-    },
-  };
+    modelOptions,
+  });
 
   return endpointOption;
 };

api/server/services/Endpoints/custom/buildOptions.js

@@ -1,16 +1,18 @@
+const { removeNullishValues } = require('librechat-data-provider');
+
 const buildOptions = (endpoint, parsedBody, endpointType) => {
   const {
     chatGptLabel,
     promptPrefix,
     maxContextTokens,
-    resendFiles,
+    resendFiles = true,
     imageDetail,
     iconURL,
     greeting,
     spec,
-    ...rest
+    ...modelOptions
   } = parsedBody;
-  const endpointOption = {
+  const endpointOption = removeNullishValues({
     endpoint,
     endpointType,
     chatGptLabel,
@@ -21,10 +23,8 @@ const buildOptions = (endpoint, parsedBody, endpointType) => {
     greeting,
     spec,
     maxContextTokens,
-    modelOptions: {
-      ...rest,
-    },
-  };
+    modelOptions,
+  });
 
   return endpointOption;
 };

api/server/services/Endpoints/google/addTitle.js

@@ -47,7 +47,11 @@ const addTitle = async (req, { text, response, client }) => {
   const titleCache = getLogStores(CacheKeys.GEN_TITLE);
   const key = `${req.user.id}-${response.conversationId}`;
 
-  const title = await titleClient.titleConvo({ text, responseText: response?.text });
+  const title = await titleClient.titleConvo({
+    text,
+    responseText: response?.text,
+    conversationId: response.conversationId,
+  });
   await titleCache.set(key, title, 120000);
   await saveConvo(
     req,

api/server/services/Endpoints/google/buildOptions.js

@@ -1,17 +1,27 @@
+const { removeNullishValues } = require('librechat-data-provider');
+
 const buildOptions = (endpoint, parsedBody) => {
-  const { examples, modelLabel, promptPrefix, iconURL, greeting, spec, ...rest } = parsedBody;
-  const endpointOption = {
+  const {
     examples,
-    endpoint,
     modelLabel,
+    resendFiles = true,
     promptPrefix,
     iconURL,
     greeting,
     spec,
-    modelOptions: {
-      ...rest,
-    },
-  };
+    ...modelOptions
+  } = parsedBody;
+  const endpointOption = removeNullishValues({
+    examples,
+    endpoint,
+    modelLabel,
+    resendFiles,
+    promptPrefix,
+    iconURL,
+    greeting,
+    spec,
+    modelOptions,
+  });
 
   return endpointOption;
 };

api/server/services/Endpoints/gptPlugins/buildOptions.js

@@ -1,3 +1,5 @@
+const { removeNullishValues } = require('librechat-data-provider');
+
 const buildOptions = (endpoint, parsedBody) => {
   const {
     chatGptLabel,
@@ -10,7 +12,7 @@ const buildOptions = (endpoint, parsedBody) => {
     maxContextTokens,
     ...modelOptions
   } = parsedBody;
-  const endpointOption = {
+  const endpointOption = removeNullishValues({
     endpoint,
     tools:
       tools
@@ -24,7 +26,7 @@ const buildOptions = (endpoint, parsedBody) => {
     spec,
     maxContextTokens,
     modelOptions,
-  };
+  });
 
   return endpointOption;
 };

api/server/services/Endpoints/openAI/addTitle.js

@@ -21,7 +21,11 @@ const addTitle = async (req, { text, response, client }) => {
   const titleCache = getLogStores(CacheKeys.GEN_TITLE);
   const key = `${req.user.id}-${response.conversationId}`;
 
-  const title = await client.titleConvo({ text, responseText: response?.text });
+  const title = await client.titleConvo({
+    text,
+    responseText: response?.text,
+    conversationId: response.conversationId,
+  });
   await titleCache.set(key, title, 120000);
   await saveConvo(
     req,

api/server/services/Endpoints/openAI/buildOptions.js

@@ -1,16 +1,18 @@
+const { removeNullishValues } = require('librechat-data-provider');
+
 const buildOptions = (endpoint, parsedBody) => {
   const {
     chatGptLabel,
     promptPrefix,
     maxContextTokens,
-    resendFiles,
+    resendFiles = true,
     imageDetail,
     iconURL,
     greeting,
     spec,
-    ...rest
+    ...modelOptions
   } = parsedBody;
-  const endpointOption = {
+  const endpointOption = removeNullishValues({
     endpoint,
     chatGptLabel,
     promptPrefix,
@@ -20,10 +22,8 @@ const buildOptions = (endpoint, parsedBody) => {
     greeting,
     spec,
     maxContextTokens,
-    modelOptions: {
-      ...rest,
-    },
-  };
+    modelOptions,
+  });
 
   return endpointOption;
 };