From f51ac74e122bb57bef13c39ab819e680ef533860 Mon Sep 17 00:00:00 2001
From: Danny Avila <messagedaniel@protonmail.com>
Date: Mon, 18 Mar 2024 19:48:42 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=B0=20fix:=20Azure=20Parsing=20and=20A?=
 =?UTF-8?q?ssistants=20Payload=20(#2133)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(azure): fix regex to prevent edge cases

* fix(assistants): pass relevant endpoint options to avoid sending them to API
---
 api/app/clients/ChatGPTClient.js                         | 2 +-
 api/app/clients/OpenAIClient.js                          | 8 +++++---
 api/server/services/Endpoints/assistants/buildOptions.js | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/api/app/clients/ChatGPTClient.js b/api/app/clients/ChatGPTClient.js
index 802ba162d9..bac7849a15 100644
--- a/api/app/clients/ChatGPTClient.js
+++ b/api/app/clients/ChatGPTClient.js
@@ -236,7 +236,7 @@ class ChatGPTClient extends BaseClient {
           baseURL: this.langchainProxy,
           azureOptions: this.azure,
         })
-        : this.azureEndpoint.split(/\/(chat|completion)/)[0];
+        : this.azureEndpoint.split(/(?<!\/)\/(chat|completion)\//)[0];
 
       if (this.options.forcePrompt) {
         baseURL += '/completions';
diff --git a/api/app/clients/OpenAIClient.js b/api/app/clients/OpenAIClient.js
index 0abb71f1cc..bb4b5c6bb2 100644
--- a/api/app/clients/OpenAIClient.js
+++ b/api/app/clients/OpenAIClient.js
@@ -744,9 +744,10 @@ class OpenAIClient extends BaseClient {
     /** @type {TAzureConfig | undefined} */
     const azureConfig = this.options?.req?.app?.locals?.[EModelEndpoint.azureOpenAI];
 
-    const resetTitleOptions =
+    const resetTitleOptions = !!(
       (this.azure && azureConfig) ||
-      (azureConfig && this.options.endpoint === EModelEndpoint.azureOpenAI);
+      (azureConfig && this.options.endpoint === EModelEndpoint.azureOpenAI)
+    );
 
     if (resetTitleOptions) {
       const { modelGroupMap, groupMap } = azureConfig;
@@ -1064,7 +1065,8 @@ ${convo}
             baseURL: this.langchainProxy,
             azureOptions: this.azure,
           })
-          : this.azureEndpoint.split(/\/(chat|completion)/)[0];
+          : this.azureEndpoint.split(/(?<!\/)\/(chat|completion)\//)[0];
+
         opts.defaultQuery = { 'api-version': this.azure.azureOpenAIApiVersion };
         opts.defaultHeaders = { ...opts.defaultHeaders, 'api-key': this.apiKey };
       }
diff --git a/api/server/services/Endpoints/assistants/buildOptions.js b/api/server/services/Endpoints/assistants/buildOptions.js
index 4197d976be..c670953539 100644
--- a/api/server/services/Endpoints/assistants/buildOptions.js
+++ b/api/server/services/Endpoints/assistants/buildOptions.js
@@ -1,9 +1,10 @@
 const buildOptions = (endpoint, parsedBody) => {
   // eslint-disable-next-line no-unused-vars
-  const { promptPrefix, chatGptLabel, resendImages, imageDetail, ...rest } = parsedBody;
+  const { promptPrefix, assistant_id, ...rest } = parsedBody;
   const endpointOption = {
     endpoint,
     promptPrefix,
+    assistant_id,
     modelOptions: {
       ...rest,
     },