From 8bef084bfcd0056a735bf8b5c7a6dd901ebdafe6 Mon Sep 17 00:00:00 2001 From: Danny Avila Date: Mon, 4 Mar 2024 17:07:30 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=A9=20fix(Plugins):=20Keep=20User=20`a?= =?UTF-8?q?gentModel`=20and=20Model=20Validation=20(#1972)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: do not override model * temp fix for secondary model validation --- api/app/clients/PluginsClient.js | 4 ---- api/server/middleware/validateModel.js | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/api/app/clients/PluginsClient.js b/api/app/clients/PluginsClient.js index 8a19ab4a27..033c122664 100644 --- a/api/app/clients/PluginsClient.js +++ b/api/app/clients/PluginsClient.js @@ -31,10 +31,6 @@ class PluginsClient extends OpenAIClient { super.setOptions(options); - if (this.functionsAgent && this.agentOptions.model && !this.useOpenRouter && !this.azure) { - this.agentOptions.model = this.getFunctionModelName(this.agentOptions.model); - } - this.isGpt3 = this.modelOptions?.model?.includes('gpt-3'); if (this.options.reverseProxyUrl) { diff --git a/api/server/middleware/validateModel.js b/api/server/middleware/validateModel.js index dc069b4ae3..04aab869ba 100644 --- a/api/server/middleware/validateModel.js +++ b/api/server/middleware/validateModel.js @@ -1,4 +1,4 @@ -const { EModelEndpoint, CacheKeys, ViolationTypes } = require('librechat-data-provider'); +const { CacheKeys, ViolationTypes } = require('librechat-data-provider'); const { loadModels } = require('~/server/controllers/ModelController'); const { logViolation, getLogStores } = require('~/cache'); const { handleError } = require('~/server/utils'); @@ -33,9 +33,6 @@ const validateModel = async (req, res, next) => { } let validModel = !!availableModels.find((availableModel) => availableModel === model); - if (endpoint === EModelEndpoint.gptPlugins) { - validModel = validModel && availableModels.includes(req.body.agentOptions?.model); - } if (validModel) { return next();