Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🔄 fix: Assistants Endpoint & Minor Issues (#7274)
Danny Avila71105cd49c8d
diff --git a/api/app/clients/OpenAIClient.js b/api/app/clients/OpenAIClient.jsindex 091a36919e..280db89284 100644--- a/api/app/clients/OpenAIClient.js+++ b/api/app/clients/OpenAIClient.js@@ -1285,6 +1285,14 @@ ${convo}modelOptions.messages[0].role = 'user';}+ if (+ (this.options.endpoint === EModelEndpoint.openAI ||+ this.options.endpoint === EModelEndpoint.azureOpenAI) &&+ modelOptions.stream === true+ ) {+ modelOptions.stream_options = { include_usage: true };+ }+if (this.options.addParams && typeof this.options.addParams === 'object') {const addParams = { ...this.options.addParams };modelOptions = {@@ -1387,12 +1395,6 @@ ${convo}...modelOptions,stream: true,};- if (- this.options.endpoint === EModelEndpoint.openAI ||- this.options.endpoint === EModelEndpoint.azureOpenAI- ) {- params.stream_options = { include_usage: true };- }const stream = await openai.beta.chat.completions.stream(params).on('abort', () => {diff --git a/api/server/controllers/agents/callbacks.js b/api/server/controllers/agents/callbacks.jsindex d926398708..3f507f7d0b 100644--- a/api/server/controllers/agents/callbacks.js+++ b/api/server/controllers/agents/callbacks.js@@ -14,15 +14,6 @@ const { loadAuthValues } = require('~/server/services/Tools/credentials');const { saveBase64Image } = require('~/server/services/Files/process');const { logger, sendEvent } = require('~/config');-/** @typedef {import('@librechat/agents').Graph} Graph */-/** @typedef {import('@librechat/agents').EventHandler} EventHandler */-/** @typedef {import('@librechat/agents').ModelEndData} ModelEndData */-/** @typedef {import('@librechat/agents').ToolEndData} ToolEndData */-/** @typedef {import('@librechat/agents').ToolEndCallback} ToolEndCallback */-/** @typedef {import('@librechat/agents').ChatModelStreamHandler} ChatModelStreamHandler */-/** @typedef {import('@librechat/agents').ContentAggregatorResult['aggregateContent']} ContentAggregator */-/** @typedef {import('@librechat/agents').GraphEvents} GraphEvents */-class ModelEndHandler {/*** @param {Array<UsageMetadata>} collectedUsage@@ -38,7 +29,7 @@ class ModelEndHandler {* @param {string} event* @param {ModelEndData | undefined} data* @param {Record<string, unknown> | undefined} metadata- * @param {Graph} graph+ * @param {StandardGraph} graph* @returns*/handle(event, data, metadata, graph) {diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.jsindex 9649e0cde7..210224d89a 100644--- a/api/server/controllers/agents/client.js+++ b/api/server/controllers/agents/client.js@@ -58,7 +58,7 @@ const payloadParser = ({ req, agent, endpoint }) => {const legacyContentEndpoints = new Set([KnownEndpoints.groq, KnownEndpoints.deepseek]);-const noSystemModelRegex = [/\b(o1-preview|o1-mini)\b/gi];+const noSystemModelRegex = [/\b(o1-preview|o1-mini|amazon\.titan-text)\b/gi];// const { processMemory, memoryInstructions } = require('~/server/services/Endpoints/agents/memory');// const { getFormattedMemories } = require('~/models/Memory');diff --git a/api/server/controllers/assistants/chatV1.js b/api/server/controllers/assistants/chatV1.jsindex 2f10d31a6b..5fa10e9e37 100644--- a/api/server/controllers/assistants/chatV1.js+++ b/api/server/controllers/assistants/chatV1.js@@ -119,7 +119,7 @@ const chatV1 = async (req, res) => {} else if (/Files.*are invalid/.test(error.message)) {const errorMessage = `Files are invalid, or may not have uploaded yet.${endpoint === EModelEndpoint.azureAssistants- ? ' If using Azure OpenAI, files are only available in the region of the assistant\'s model at the time of upload.'+ ? " If using Azure OpenAI, files are only available in the region of the assistant's model at the time of upload.": ''}`;return sendResponse(req, res, messageData, errorMessage);@@ -379,8 +379,8 @@ const chatV1 = async (req, res) => {body.additional_instructions ? `${body.additional_instructions}\n` : ''}The user has uploaded ${imageCount} image${pluralized}.Use the \`${ImageVisionTool.function.name}\` tool to retrieve ${- plural ? '' : 'a '-}detailed text description${pluralized} for ${plural ? 'each' : 'the'} image${pluralized}.`;+ plural ? '' : 'a '+ }detailed text description${pluralized} for ${plural ? 'each' : 'the'} image${pluralized}.`;return files;};@@ -576,6 +576,8 @@ const chatV1 = async (req, res) => {thread_id,model: assistant_id,endpoint,+ spec: endpointOption.spec,+ iconURL: endpointOption.iconURL,};sendMessage(res, {diff --git a/api/server/controllers/assistants/chatV2.js b/api/server/controllers/assistants/chatV2.jsindex 799326aea9..309e5a86c4 100644--- a/api/server/controllers/assistants/chatV2.js+++ b/api/server/controllers/assistants/chatV2.js@@ -428,6 +428,8 @@ const chatV2 = async (req, res) => {thread_id,model: assistant_id,endpoint,+ spec: endpointOption.spec,+ iconURL: endpointOption.iconURL,};sendMessage(res, {diff --git a/api/server/routes/files/files.js b/api/server/routes/files/files.jsindex 9040c2824c..5a520bdb65 100644--- a/api/server/routes/files/files.js+++ b/api/server/routes/files/files.js@@ -21,6 +21,7 @@ const { getOpenAIClient } = require('~/server/controllers/assistants/helpers');const { loadAuthValues } = require('~/server/services/Tools/credentials');const { refreshS3FileUrls } = require('~/server/services/Files/S3/crud');const { getFiles, batchUpdateFiles } = require('~/models/File');+const { getAssistant } = require('~/models/Assistant');const { getAgent } = require('~/models/Agent');const { getLogStores } = require('~/cache');const { logger } = require('~/config');@@ -94,7 +95,7 @@ router.delete('/', async (req, res) => {});}- /* Handle entity unlinking even if no valid files to delete */+ /* Handle agent unlinking even if no valid files to delete */if (req.body.agent_id && req.body.tool_resource && dbFiles.length === 0) {const agent = await getAgent({id: req.body.agent_id,@@ -104,7 +105,21 @@ router.delete('/', async (req, res) => {const agentFiles = files.filter((f) => toolResourceFiles.includes(f.file_id));await processDeleteRequest({ req, files: agentFiles });- res.status(200).json({ message: 'File associations removed successfully' });+ res.status(200).json({ message: 'File associations removed successfully from agent' });+ return;+ }++ /* Handle assistant unlinking even if no valid files to delete */+ if (req.body.assistant_id && req.body.tool_resource && dbFiles.length === 0) {+ const assistant = await getAssistant({+ id: req.body.assistant_id,+ });++ const toolResourceFiles = assistant.tool_resources?.[req.body.tool_resource]?.file_ids ?? [];+ const assistantFiles = files.filter((f) => toolResourceFiles.includes(f.file_id));++ await processDeleteRequest({ req, files: assistantFiles });+ res.status(200).json({ message: 'File associations removed successfully from assistant' });return;}diff --git a/api/server/services/Endpoints/agents/initialize.js b/api/server/services/Endpoints/agents/initialize.jsindex d0d29fa75e..c9e363e815 100644--- a/api/server/services/Endpoints/agents/initialize.js+++ b/api/server/services/Endpoints/agents/initialize.js@@ -233,6 +233,13 @@ const initializeAgentOptions = async ({endpointOption: _endpointOption,});+ if (+ agent.endpoint === EModelEndpoint.azureOpenAI &&+ options.llmConfig?.azureOpenAIApiInstanceName == null+ ) {+ agent.provider = Providers.OPENAI;+ }+if (options.provider != null) {agent.provider = options.provider;}diff --git a/api/server/services/Endpoints/assistants/build.js b/api/server/services/Endpoints/assistants/build.jsindex 544567dd01..00a2abf606 100644--- a/api/server/services/Endpoints/assistants/build.js+++ b/api/server/services/Endpoints/assistants/build.js@@ -3,7 +3,6 @@ const generateArtifactsPrompt = require('~/app/clients/prompts/artifacts');const { getAssistant } = require('~/models/Assistant');const buildOptions = async (endpoint, parsedBody) => {-const { promptPrefix, assistant_id, iconURL, greeting, spec, artifacts, ...modelOptions } =parsedBody;const endpointOption = removeNullishValues({diff --git a/api/server/services/Threads/manage.js b/api/server/services/Threads/manage.jsindex f99dca7534..5eace214c3 100644--- a/api/server/services/Threads/manage.js+++ b/api/server/services/Threads/manage.js@@ -132,6 +132,8 @@ async function saveUserMessage(req, params) {* @param {string} params.endpoint - The conversation endpoint* @param {string} params.parentMessageId - The latest user message that triggered this response.* @param {string} [params.instructions] - Optional: from preset for `instructions` field.+ * @param {string} [params.spec] - Optional: Model spec identifier.+ * @param {string} [params.iconURL]* Overrides the instructions of the assistant.* @param {string} [params.promptPrefix] - Optional: from preset for `additional_instructions` field.* @return {Promise<Run>} A promise that resolves to the created run object.@@ -154,6 +156,8 @@ async function saveAssistantMessage(req, params) {text: params.text,unfinished: false,// tokenCount,+ iconURL: params.iconURL,+ spec: params.spec,});await saveConvo(@@ -165,6 +169,8 @@ async function saveAssistantMessage(req, params) {instructions: params.instructions,assistant_id: params.assistant_id,model: params.model,+ iconURL: params.iconURL,+ spec: params.spec,},{ context: 'api/server/services/Threads/manage.js #saveAssistantMessage' },);diff --git a/api/typedefs.js b/api/typedefs.jsindex 0aab97c42e..d65d8c9191 100644--- a/api/typedefs.js+++ b/api/typedefs.js@@ -43,6 +43,60 @@* @memberof typedefs*/+/**+ * @exports Graph+ * @typedef {import('@librechat/agents').Graph} Graph+ * @memberof typedefs+ */++/**+ * @exports StandardGraph+ * @typedef {import('@librechat/agents').StandardGraph} StandardGraph+ * @memberof typedefs+ */++/**+ * @exports EventHandler+ * @typedef {import('@librechat/agents').EventHandler} EventHandler+ * @memberof typedefs+ */++/**+ * @exports ModelEndData+ * @typedef {import('@librechat/agents').ModelEndData} ModelEndData+ * @memberof typedefs+ */++/**+ * @exports ToolEndData+ * @typedef {import('@librechat/agents').ToolEndData} ToolEndData+ * @memberof typedefs+ */++/**+ * @exports ToolEndCallback+ * @typedef {import('@librechat/agents').ToolEndCallback} ToolEndCallback+ * @memberof typedefs+ */++/**+ * @exports ChatModelStreamHandler+ * @typedef {import('@librechat/agents').ChatModelStreamHandler} ChatModelStreamHandler+ * @memberof typedefs+ */++/**+ * @exports ContentAggregator+ * @typedef {import('@librechat/agents').ContentAggregatorResult['aggregateContent']} ContentAggregator+ * @memberof typedefs+ */++/**+ * @exports GraphEvents+ * @typedef {import('@librechat/agents').GraphEvents} GraphEvents+ * @memberof typedefs+ */+/*** @exports AgentRun* @typedef {import('@librechat/agents').Run} AgentRun@@ -97,12 +151,6 @@* @memberof typedefs*/-/**- * @exports ToolEndData- * @typedef {import('@librechat/agents').ToolEndData} ToolEndData- * @memberof typedefs- */-/*** @exports BaseMessage* @typedef {import('@langchain/core/messages').BaseMessage} BaseMessagediff --git a/client/src/hooks/Nav/useSideNavLinks.ts b/client/src/hooks/Nav/useSideNavLinks.tsindex 167983a7ec..c5516b9477 100644--- a/client/src/hooks/Nav/useSideNavLinks.ts+++ b/client/src/hooks/Nav/useSideNavLinks.ts@@ -55,8 +55,12 @@ export default function useSideNavLinks({const links: NavLink[] = [];if (isAssistantsEndpoint(endpoint) &&- endpointsConfig?.[EModelEndpoint.assistants] &&- endpointsConfig[EModelEndpoint.assistants].disableBuilder !== true &&+ ((endpoint === EModelEndpoint.assistants &&+ endpointsConfig?.[EModelEndpoint.assistants] &&+ endpointsConfig[EModelEndpoint.assistants].disableBuilder !== true) ||+ (endpoint === EModelEndpoint.azureAssistants &&+ endpointsConfig?.[EModelEndpoint.azureAssistants] &&+ endpointsConfig[EModelEndpoint.azureAssistants].disableBuilder !== true)) &&keyProvided) {links.push({diff --git a/client/src/hooks/SSE/useEventHandlers.ts b/client/src/hooks/SSE/useEventHandlers.tsindex cacd749131..b5e1321095 100644--- a/client/src/hooks/SSE/useEventHandlers.ts+++ b/client/src/hooks/SSE/useEventHandlers.ts@@ -467,6 +467,14 @@ export default function useEventHandlers({[QueryKeys.messages, conversation.conversationId],finalMessages,);+ } else if (+ isAssistantsEndpoint(submissionConvo.endpoint) &&+ (!submissionConvo.conversationId || submissionConvo.conversationId === Constants.NEW_CONVO)+ ) {+ queryClient.setQueryData<TMessage[]>(+ [QueryKeys.messages, conversation.conversationId],+ [...currentMessages],+ );}const isNewConvo = conversation.conversationId !== submissionConvo.conversationId;diff --git a/client/src/utils/buildDefaultConvo.ts b/client/src/utils/buildDefaultConvo.tsindex 7d60aecfda..dd1e356032 100644--- a/client/src/utils/buildDefaultConvo.ts+++ b/client/src/utils/buildDefaultConvo.ts@@ -4,7 +4,7 @@ import {isAssistantsEndpoint,isAgentsEndpoint,} from 'librechat-data-provider';-import type { TConversation } from 'librechat-data-provider';+import type { TConversation, EndpointSchemaKey } from 'librechat-data-provider';import { getLocalStorageItems } from './localStorage';const buildDefaultConvo = ({@@ -51,8 +51,8 @@ const buildDefaultConvo = ({}const convo = parseConvo({- endpoint,- endpointType,+ endpoint: endpoint as EndpointSchemaKey,+ endpointType: endpointType as EndpointSchemaKey,conversation: lastConversationSetup,possibleValues: {models: possibleModels,@@ -68,7 +68,7 @@ const buildDefaultConvo = ({};// Ensures assistant_id is always defined- const assistantId = convo?.assistant_id ?? '';+ const assistantId = convo?.assistant_id ?? conversation?.assistant_id ?? '';const defaultAssistantId = lastConversationSetup?.assistant_id ?? '';if (isAssistantsEndpoint(endpoint) && !defaultAssistantId && assistantId) {defaultConvo.assistant_id = assistantId;