diff --git a/api/app/clients/OpenAIClient.js b/api/app/clients/OpenAIClient.js index e4c12ee58..d2762ca1d 100644 --- a/api/app/clients/OpenAIClient.js +++ b/api/app/clients/OpenAIClient.js @@ -842,27 +842,27 @@ class OpenAIClient extends BaseClient { } const titleChatCompletion = async () => { - modelOptions.model = model; + try { + modelOptions.model = model; - if (this.azure) { - modelOptions.model = process.env.AZURE_OPENAI_DEFAULT_MODEL ?? modelOptions.model; - this.azureEndpoint = genAzureChatCompletion(this.azure, modelOptions.model, this); - } + if (this.azure) { + modelOptions.model = process.env.AZURE_OPENAI_DEFAULT_MODEL ?? modelOptions.model; + this.azureEndpoint = genAzureChatCompletion(this.azure, modelOptions.model, this); + } - const instructionsPayload = [ - { - role: this.options.titleMessageRole ?? (this.isOllama ? 'user' : 'system'), - content: `Please generate ${titleInstruction} + const instructionsPayload = [ + { + role: this.options.titleMessageRole ?? (this.isOllama ? 'user' : 'system'), + content: `Please generate ${titleInstruction} ${convo} ||>Title:`, - }, - ]; + }, + ]; - const promptTokens = this.getTokenCountForMessage(instructionsPayload[0]); + const promptTokens = this.getTokenCountForMessage(instructionsPayload[0]); - try { let useChatCompletion = true; if (this.options.reverseProxyUrl === CohereConstants.API_URL) { diff --git a/api/server/services/Runs/StreamRunManager.js b/api/server/services/Runs/StreamRunManager.js index 951818bb6..ab1217939 100644 --- a/api/server/services/Runs/StreamRunManager.js +++ b/api/server/services/Runs/StreamRunManager.js @@ -329,7 +329,7 @@ class StreamRunManager { } } else if (typeof delta[key] === 'string' && typeof data[key] === 'string') { // Concatenate strings - data[key] += delta[key]; + // data[key] += delta[key]; } else if ( typeof delta[key] === 'object' && delta[key] !== null && diff --git a/client/src/data-provider/Files/mutations.ts b/client/src/data-provider/Files/mutations.ts index b46e43544..5cdd22651 100644 --- a/client/src/data-provider/Files/mutations.ts +++ b/client/src/data-provider/Files/mutations.ts @@ -1,6 +1,12 @@ import { EToolResources } from 'librechat-data-provider'; import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { dataService, MutationKeys, QueryKeys, defaultOrderQuery } from 'librechat-data-provider'; +import { + QueryKeys, + dataService, + MutationKeys, + defaultOrderQuery, + isAssistantsEndpoint, +} from 'librechat-data-provider'; import type * as t from 'librechat-data-provider'; import type { UseMutationResult } from '@tanstack/react-query'; @@ -27,8 +33,12 @@ export const useUploadFileMutation = ( const width = body.get('width') ?? ''; const height = body.get('height') ?? ''; const version = body.get('version') ?? ''; + const endpoint = (body.get('endpoint') ?? '') as string; + if (isAssistantsEndpoint(endpoint) && version === '2') { + return dataService.uploadFile(body, signal); + } - if (width !== '' && height !== '' && (version !== '' || version.toString() !== '2')) { + if (width !== '' && height !== '') { return dataService.uploadImage(body, signal); }