Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-17 00:40:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

🪰 fix: Azure Parsing and Assistants Payload (#2133)

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

* fix(assistants): pass relevant endpoint options to avoid sending them to API
This commit is contained in:
Danny Avila 2024-03-18 19:48:42 -04:00 • committed by GitHub
parent 7cddd943d0
commit f51ac74e12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/app/clients/ChatGPTClient.js
View file

@ -236,7 +236,7 @@ class ChatGPTClient extends BaseClient {
baseURL: this.langchainProxy, baseURL: this.langchainProxy,
azureOptions: this.azure, azureOptions: this.azure,
}) })
: this.azureEndpoint.split(/\/(chat|completion)/)[0]; : this.azureEndpoint.split(/(?<!\/)\/(chat|completion)\//)[0];
if (this.options.forcePrompt) { if (this.options.forcePrompt) {
baseURL += '/completions'; baseURL += '/completions';

8
api/app/clients/OpenAIClient.js
View file

@ -744,9 +744,10 @@ class OpenAIClient extends BaseClient {
/** @type {TAzureConfig | undefined} */ /** @type {TAzureConfig | undefined} */
const azureConfig = this.options?.req?.app?.locals?.[EModelEndpoint.azureOpenAI]; const azureConfig = this.options?.req?.app?.locals?.[EModelEndpoint.azureOpenAI];
const resetTitleOptions = const resetTitleOptions = !!(
(this.azure && azureConfig) || (this.azure && azureConfig) ||
(azureConfig && this.options.endpoint === EModelEndpoint.azureOpenAI); (azureConfig && this.options.endpoint === EModelEndpoint.azureOpenAI)
);
if (resetTitleOptions) { if (resetTitleOptions) {
const { modelGroupMap, groupMap } = azureConfig; const { modelGroupMap, groupMap } = azureConfig;
@ -1064,7 +1065,8 @@ ${convo}
baseURL: this.langchainProxy, baseURL: this.langchainProxy,
azureOptions: this.azure, azureOptions: this.azure,
}) })
: this.azureEndpoint.split(/\/(chat|completion)/)[0]; : this.azureEndpoint.split(/(?<!\/)\/(chat|completion)\//)[0];
opts.defaultQuery = { 'api-version': this.azure.azureOpenAIApiVersion }; opts.defaultQuery = { 'api-version': this.azure.azureOpenAIApiVersion };
opts.defaultHeaders = { ...opts.defaultHeaders, 'api-key': this.apiKey }; opts.defaultHeaders = { ...opts.defaultHeaders, 'api-key': this.apiKey };
} }

3
api/server/services/Endpoints/assistants/buildOptions.js
View file

@ -1,9 +1,10 @@
const buildOptions = (endpoint, parsedBody) => { const buildOptions = (endpoint, parsedBody) => {
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
const { promptPrefix, chatGptLabel, resendImages, imageDetail, ...rest } = parsedBody; const { promptPrefix, assistant_id, ...rest } = parsedBody;
const endpointOption = { const endpointOption = {
endpoint, endpoint,
promptPrefix, promptPrefix,
assistant_id,
modelOptions: { modelOptions: {
...rest, ...rest,
}, },