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
⚠️ refactor: Use Error Content Part Instead Of Throwing Error for Agents (#6262)
Danny Avilad6ab769b8098
diff --git a/api/app/clients/prompts/formatAgentMessages.spec.js b/api/app/clients/prompts/formatAgentMessages.spec.jsindex 957409d6ab..360fa00a34 100644--- a/api/app/clients/prompts/formatAgentMessages.spec.js+++ b/api/app/clients/prompts/formatAgentMessages.spec.js@@ -325,4 +325,37 @@ describe('formatAgentMessages', () => {);expect(result[0].content).not.toContain('Analyzing the problem...');});++ it('should exclude ERROR type content parts', () => {+ const payload = [+ {+ role: 'assistant',+ content: [+ { type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Hello there' },+ {+ type: ContentTypes.ERROR,+ [ContentTypes.ERROR]:+ 'An error occurred while processing the request: Something went wrong',+ },+ { type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Final answer' },+ ],+ },+ ];++ const result = formatAgentMessages(payload);++ expect(result).toHaveLength(1);+ expect(result[0]).toBeInstanceOf(AIMessage);+ expect(result[0].content).toEqual([+ { type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Hello there' },+ { type: ContentTypes.TEXT, [ContentTypes.TEXT]: 'Final answer' },+ ]);++ // Make sure no error content exists in the result+ const hasErrorContent = result[0].content.some(+ (item) =>+ item.type === ContentTypes.ERROR || JSON.stringify(item).includes('An error occurred'),+ );+ expect(hasErrorContent).toBe(false);+ });});diff --git a/api/app/clients/prompts/formatMessages.js b/api/app/clients/prompts/formatMessages.jsindex 235e51e51f..4e8d3bd5a5 100644--- a/api/app/clients/prompts/formatMessages.js+++ b/api/app/clients/prompts/formatMessages.js@@ -211,6 +211,8 @@ const formatAgentMessages = (payload) => {} else if (part.type === ContentTypes.THINK) {hasReasoning = true;continue;+ } else if (part.type === ContentTypes.ERROR) {+ continue;} else {currentContent.push(part);}diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.jsindex fb2ba6999e..628b62e5ea 100644--- a/api/server/controllers/agents/client.js+++ b/api/server/controllers/agents/client.js@@ -812,7 +812,10 @@ class AgentClient extends BaseClient {'[api/server/controllers/agents/client.js #sendCompletion] Unhandled error type',err,);- throw err;+ this.contentParts.push({+ type: ContentTypes.ERROR,+ [ContentTypes.ERROR]: `An error occurred while processing the request${err?.message ? `: ${err.message}` : ''}`,+ });}}}diff --git a/client/src/components/Chat/Messages/Content/Part.tsx b/client/src/components/Chat/Messages/Content/Part.tsxindex ced80b1aa0..2430bee6f9 100644--- a/client/src/components/Chat/Messages/Content/Part.tsx+++ b/client/src/components/Chat/Messages/Content/Part.tsx@@ -32,7 +32,12 @@ const Part = memo(({ part, isSubmitting, attachments, showCursor, isCreatedByUse}if (part.type === ContentTypes.ERROR) {- return <ErrorMessage text={part[ContentTypes.TEXT].value} className="my-2" />;+ return (+ <ErrorMessage+ text={part[ContentTypes.ERROR] ?? part[ContentTypes.TEXT]?.value}+ className="my-2"+ />+ );} else if (part.type === ContentTypes.TEXT) {const text = typeof part.text === 'string' ? part.text : part.text.value;