Skip to content

Commit fa260be

Browse files
authored
🪰 fix: Azure Parsing and Assistants Payload (danny-avila#2133)
* fix(azure): fix regex to prevent edge cases * fix(assistants): pass relevant endpoint options to avoid sending them to API
1 parent 4607132 commit fa260be

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

api/app/clients/ChatGPTClient.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ class ChatGPTClient extends BaseClient {
236236
baseURL: this.langchainProxy,
237237
azureOptions: this.azure,
238238
})
239-
: this.azureEndpoint.split(/\/(chat|completion)/)[0];
239+
: this.azureEndpoint.split(/(?<!\/)\/(chat|completion)\//)[0];
240240

241241
if (this.options.forcePrompt) {
242242
baseURL += '/completions';

api/app/clients/OpenAIClient.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -744,9 +744,10 @@ class OpenAIClient extends BaseClient {
744744
/** @type {TAzureConfig | undefined} */
745745
const azureConfig = this.options?.req?.app?.locals?.[EModelEndpoint.azureOpenAI];
746746

747-
const resetTitleOptions =
747+
const resetTitleOptions = !!(
748748
(this.azure && azureConfig) ||
749-
(azureConfig && this.options.endpoint === EModelEndpoint.azureOpenAI);
749+
(azureConfig && this.options.endpoint === EModelEndpoint.azureOpenAI)
750+
);
750751

751752
if (resetTitleOptions) {
752753
const { modelGroupMap, groupMap } = azureConfig;
@@ -1064,7 +1065,8 @@ ${convo}
10641065
baseURL: this.langchainProxy,
10651066
azureOptions: this.azure,
10661067
})
1067-
: this.azureEndpoint.split(/\/(chat|completion)/)[0];
1068+
: this.azureEndpoint.split(/(?<!\/)\/(chat|completion)\//)[0];
1069+
10681070
opts.defaultQuery = { 'api-version': this.azure.azureOpenAIApiVersion };
10691071
opts.defaultHeaders = { ...opts.defaultHeaders, 'api-key': this.apiKey };
10701072
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
const buildOptions = (endpoint, parsedBody) => {
22
// eslint-disable-next-line no-unused-vars
3-
const { promptPrefix, chatGptLabel, resendImages, imageDetail, ...rest } = parsedBody;
3+
const { promptPrefix, assistant_id, ...rest } = parsedBody;
44
const endpointOption = {
55
endpoint,
66
promptPrefix,
7+
assistant_id,
78
modelOptions: {
89
...rest,
910
},

0 commit comments

Comments
 (0)