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
🔧 style: Improve UI and UX with Style Fixes and Code Refactors (#2002)
Danny Avilaab66747e971d
diff --git a/client/src/components/Chat/Input/ChatForm.tsx b/client/src/components/Chat/Input/ChatForm.tsxindex bec33d7a6d..3c7ba42457 100644--- a/client/src/components/Chat/Input/ChatForm.tsx+++ b/client/src/components/Chat/Input/ChatForm.tsx@@ -43,7 +43,7 @@ export default function ChatForm({ index = 0 }) {><div className="relative flex h-full flex-1 items-stretch md:flex-col"><div className="flex w-full items-center">- <div className="[&:has(textarea:focus)]:border-token-border-xheavy border-token-border-heavy shadow-xs dark:shadow-xs relative flex w-full flex-grow flex-col overflow-hidden rounded-2xl border border-black/10 bg-white shadow-[0_0_0_2px_rgba(255,255,255,0.95)] dark:border-gray-600 dark:bg-gray-800 dark:text-white dark:shadow-[0_0_0_2px_rgba(33,33,33,1)] [&:has(textarea:focus)]:shadow-[0_2px_6px_rgba(0,0,0,0.3)]">+ <div className="[&:has(textarea:focus)]:border-token-border-xheavy dark:border-token-border-medium border-token-border-medium bg-token-main-surface-primary relative flex w-full flex-grow flex-col overflow-hidden rounded-2xl border dark:text-white [&:has(textarea:focus)]:shadow-[0_2px_6px_rgba(0,0,0,.05)]"><FileRowfiles={files}setFiles={setFiles}diff --git a/client/src/components/SidePanel/Nav.tsx b/client/src/components/SidePanel/Nav.tsxindex 496b3a6cfc..6f57c8da21 100644--- a/client/src/components/SidePanel/Nav.tsx+++ b/client/src/components/SidePanel/Nav.tsx@@ -20,7 +20,7 @@ export default function Nav({ links, isCollapsed, resize, defaultActive }: NavPrreturn (<divdata-collapsed={isCollapsed}- className="bg-token-sidebar-surface-primary group flex-shrink-0 overflow-x-hidden py-2 data-[collapsed=true]:py-2"+ className="bg-token-sidebar-surface-primary hide-scrollbar group flex-shrink-0 overflow-x-hidden py-2 data-[collapsed=true]:py-2"><div className="h-full"><div className="flex h-full min-h-0 flex-col">diff --git a/client/src/components/SidePanel/SidePanel.tsx b/client/src/components/SidePanel/SidePanel.tsxindex a0de890147..d122ca5a42 100644--- a/client/src/components/SidePanel/SidePanel.tsx+++ b/client/src/components/SidePanel/SidePanel.tsx@@ -172,7 +172,7 @@ export default function SidePanel({localStorage.setItem('react-resizable-panels:collapsed', 'true');}}className={cn(- 'sidenav border-l border-gray-200 bg-white dark:border-gray-800/50 dark:bg-gray-900',+ 'sidenav hide-scrollbar border-l border-gray-200 bg-white dark:border-gray-800/50 dark:bg-gray-900',isCollapsed ? 'min-w-[50px]' : 'min-w-[340px] sm:min-w-[352px]',minSize === 0 ? 'min-w-0' : '',)}diff --git a/client/src/hooks/SSE/useContentHandler.ts b/client/src/hooks/SSE/useContentHandler.tsindex a94e1db173..b0e015dab8 100644--- a/client/src/hooks/SSE/useContentHandler.ts+++ b/client/src/hooks/SSE/useContentHandler.ts@@ -6,6 +6,7 @@ import type {ContentPart,TMessageContentParts,} from 'librechat-data-provider';+import { useCallback, useMemo } from 'react';type TUseContentHandler = {setMessages: (messages: TMessage[]) => void;@@ -18,49 +19,53 @@ type TContentHandler = {};export default function useContentHandler({ setMessages, getMessages }: TUseContentHandler) {- const messageMap = new Map<string, TMessage>();- return ({ data, submission }: TContentHandler) => {- const { type, messageId, thread_id, conversationId, index, stream } = data;+ const messageMap = useMemo(() => new Map<string, TMessage>(), []);+ return useCallback(+ ({ data, submission }: TContentHandler) => {+ const { type, messageId, thread_id, conversationId, index, stream } = data;- const _messages = getMessages();- const messages =- _messages?.filter((m) => m.messageId !== messageId)?.map((msg) => ({ ...msg, thread_id })) ??- [];- const userMessage = messages[messages.length - 1];+ const _messages = getMessages();+ const messages =+ _messages+ ?.filter((m) => m.messageId !== messageId)+ ?.map((msg) => ({ ...msg, thread_id })) ?? [];+ const userMessage = messages[messages.length - 1];- const { initialResponse } = submission;+ const { initialResponse } = submission;- let response = messageMap.get(messageId);- if (!response) {- response = {- ...initialResponse,- parentMessageId: userMessage?.messageId,- conversationId,- messageId,- thread_id,- };- messageMap.set(messageId, response);- }+ let response = messageMap.get(messageId);+ if (!response) {+ response = {+ ...initialResponse,+ parentMessageId: userMessage?.messageId,+ conversationId,+ messageId,+ thread_id,+ };+ messageMap.set(messageId, response);+ }- // TODO: handle streaming for non-text- const part: ContentPart =- stream && data[ContentTypes.TEXT] ? { value: data[ContentTypes.TEXT] } : data[type];+ // TODO: handle streaming for non-text+ const part: ContentPart =+ stream && data[ContentTypes.TEXT] ? { value: data[ContentTypes.TEXT] } : data[type];- /* spreading the content array to avoid mutation */- response.content = [...(response.content ?? [])];+ /* spreading the content array to avoid mutation */+ response.content = [...(response.content ?? [])];- response.content[index] = { type, [type]: part } as TMessageContentParts;+ response.content[index] = { type, [type]: part } as TMessageContentParts;- if (- type !== ContentTypes.TEXT &&- initialResponse.content &&- ((response.content[response.content.length - 1].type === ContentTypes.TOOL_CALL &&- response.content[response.content.length - 1][ContentTypes.TOOL_CALL].progress === 1) ||- response.content[response.content.length - 1].type === ContentTypes.IMAGE_FILE)- ) {- response.content.push(initialResponse.content[0]);- }+ if (+ type !== ContentTypes.TEXT &&+ initialResponse.content &&+ ((response.content[response.content.length - 1].type === ContentTypes.TOOL_CALL &&+ response.content[response.content.length - 1][ContentTypes.TOOL_CALL].progress === 1) ||+ response.content[response.content.length - 1].type === ContentTypes.IMAGE_FILE)+ ) {+ response.content.push(initialResponse.content[0]);+ }- setMessages([...messages, response]);- };+ setMessages([...messages, response]);+ },+ [getMessages, messageMap, setMessages],+ );}diff --git a/client/src/hooks/SSE/useSSE.ts b/client/src/hooks/SSE/useSSE.tsindex 159520439b..638e9476fc 100644--- a/client/src/hooks/SSE/useSSE.ts+++ b/client/src/hooks/SSE/useSSE.ts@@ -1,8 +1,8 @@import { v4 } from 'uuid';import { useSetRecoilState } from 'recoil';-import { useEffect, useState } from 'react';import { useParams } from 'react-router-dom';import { useQueryClient } from '@tanstack/react-query';+import { useEffect, useState, useCallback } from 'react';import {/* @ts-ignore */SSE,@@ -83,392 +83,424 @@ export default function useSSE(submission: TSubmission | null, index = 0) {enabled: !!isAuthenticated && startupConfig?.checkBalance,});- const messageHandler = (data: string, submission: TSubmission) => {- const {- messages,- message,- plugin,- plugins,- initialResponse,- isRegenerate = false,- } = submission;-- if (isRegenerate) {- setMessages([- ...messages,- {- ...initialResponse,- text: data,- parentMessageId: message?.overrideParentMessageId ?? null,- messageId: message?.overrideParentMessageId + '_',- plugin: plugin ?? null,- plugins: plugins ?? [],- // unfinished: true- },- ]);- } else {- setMessages([- ...messages,+ const messageHandler = useCallback(+ (data: string, submission: TSubmission) => {+ const {+ messages,message,- {- ...initialResponse,- text: data,- parentMessageId: message?.messageId,- messageId: message?.messageId + '_',- plugin: plugin ?? null,- plugins: plugins ?? [],- // unfinished: true- },- ]);- }- };-- const cancelHandler = (data: TResData, submission: TSubmission) => {- const { requestMessage, responseMessage, conversation } = data;- const { messages, isRegenerate = false } = submission;+ plugin,+ plugins,+ initialResponse,+ isRegenerate = false,+ } = submission;++ if (isRegenerate) {+ setMessages([+ ...messages,+ {+ ...initialResponse,+ text: data,+ parentMessageId: message?.overrideParentMessageId ?? null,+ messageId: message?.overrideParentMessageId + '_',+ plugin: plugin ?? null,+ plugins: plugins ?? [],+ // unfinished: true+ },+ ]);+ } else {+ setMessages([+ ...messages,+ message,+ {+ ...initialResponse,+ text: data,+ parentMessageId: message?.messageId,+ messageId: message?.messageId + '_',+ plugin: plugin ?? null,+ plugins: plugins ?? [],+ // unfinished: true+ },+ ]);+ }+ },+ [setMessages],+ );- const convoUpdate = conversation ?? submission.conversation;+ const cancelHandler = useCallback(+ (data: TResData, submission: TSubmission) => {+ const { requestMessage, responseMessage, conversation } = data;+ const { messages, isRegenerate = false } = submission;- // update the messages- if (isRegenerate) {- const messagesUpdate = [...messages, responseMessage].filter((msg) => msg);- setMessages(messagesUpdate);- } else {- const messagesUpdate = [...messages, requestMessage, responseMessage].filter((msg) => msg);- setMessages(messagesUpdate);- }+ const convoUpdate = conversation ?? submission.conversation;- const isNewConvo = conversation.conversationId !== submission.conversation.conversationId;- if (isNewConvo) {- queryClient.setQueryData<ConversationData>([QueryKeys.allConversations], (convoData) => {- if (!convoData) {- return convoData;- }- return deleteConversation(convoData, submission.conversation.conversationId as string);- });- }-- // refresh title- if (isNewConvo && requestMessage?.parentMessageId === Constants.NO_PARENT) {- setTimeout(() => {- genTitle.mutate({ conversationId: convoUpdate.conversationId as string });- }, 2500);- }+ // update the messages+ if (isRegenerate) {+ const messagesUpdate = [...messages, responseMessage].filter((msg) => msg);+ setMessages(messagesUpdate);+ } else {+ const messagesUpdate = [...messages, requestMessage, responseMessage].filter((msg) => msg);+ setMessages(messagesUpdate);+ }- setConversation((prevState) => {- const update = {- ...prevState,- ...convoUpdate,- };+ const isNewConvo = conversation.conversationId !== submission.conversation.conversationId;+ if (isNewConvo) {+ queryClient.setQueryData<ConversationData>([QueryKeys.allConversations], (convoData) => {+ if (!convoData) {+ return convoData;+ }+ return deleteConversation(convoData, submission.conversation.conversationId as string);+ });+ }- setStorage(update);- return update;- });+ // refresh title+ if (isNewConvo && requestMessage?.parentMessageId === Constants.NO_PARENT) {+ setTimeout(() => {+ genTitle.mutate({ conversationId: convoUpdate.conversationId as string });+ }, 2500);+ }- setIsSubmitting(false);- };-- const syncHandler = (data: TSyncData, submission: TSubmission) => {- const { conversationId, thread_id, responseMessage, requestMessage } = data;- const { initialResponse, messages: _messages, message } = submission;-- const messages = _messages.filter((msg) => msg.messageId !== message.messageId);-- setMessages([- ...messages,- requestMessage,- {- ...initialResponse,- ...responseMessage,- },- ]);-- let update = {} as TConversation;- setConversation((prevState) => {- update = tConvoUpdateSchema.parse({- ...prevState,- conversationId,- thread_id,- messages: [requestMessage.messageId, responseMessage.messageId],- }) as TConversation;-- setStorage(update);- return update;- });+ setConversation((prevState) => {+ const update = {+ ...prevState,+ ...convoUpdate,+ };- queryClient.setQueryData<ConversationData>([QueryKeys.allConversations], (convoData) => {- if (!convoData) {- return convoData;- }- if (requestMessage.parentMessageId === Constants.NO_PARENT) {- return addConversation(convoData, update);- } else {- return updateConversation(convoData, update);- }- });+ setStorage(update);+ return update;+ });- setShowStopButton(true);+ setIsSubmitting(false);+ },+ [setMessages, setConversation, setStorage, genTitle, queryClient, setIsSubmitting],+ );- resetLatestMessage();- };+ const syncHandler = useCallback(+ (data: TSyncData, submission: TSubmission) => {+ const { conversationId, thread_id, responseMessage, requestMessage } = data;+ const { initialResponse, messages: _messages, message } = submission;- const createdHandler = (data: TResData, submission: TSubmission) => {- const { messages, message, initialResponse, isRegenerate = false } = submission;+ const messages = _messages.filter((msg) => msg.messageId !== message.messageId);- if (isRegenerate) {setMessages([...messages,+ requestMessage,{...initialResponse,- parentMessageId: message?.overrideParentMessageId ?? null,- messageId: message?.overrideParentMessageId + '_',+ ...responseMessage,},]);- } else {- setMessages([- ...messages,- message,- {- ...initialResponse,- parentMessageId: message?.messageId,- messageId: message?.messageId + '_',- },- ]);- }- const { conversationId, parentMessageId } = message;+ let update = {} as TConversation;+ setConversation((prevState) => {+ update = tConvoUpdateSchema.parse({+ ...prevState,+ conversationId,+ thread_id,+ messages: [requestMessage.messageId, responseMessage.messageId],+ }) as TConversation;++ setStorage(update);+ return update;+ });++ queryClient.setQueryData<ConversationData>([QueryKeys.allConversations], (convoData) => {+ if (!convoData) {+ return convoData;+ }+ if (requestMessage.parentMessageId === Constants.NO_PARENT) {+ return addConversation(convoData, update);+ } else {+ return updateConversation(convoData, update);+ }+ });- let update = {} as TConversation;- setConversation((prevState) => {- let title = prevState?.title;- if (parentMessageId !== Constants.NO_PARENT && title?.toLowerCase()?.includes('new chat')) {- const convos = queryClient.getQueryData<ConversationData>([QueryKeys.allConversations]);- const cachedConvo = getConversationById(convos, conversationId);- title = cachedConvo?.title;+ setShowStopButton(true);++ resetLatestMessage();+ },+ [setMessages, setConversation, setStorage, queryClient, setShowStopButton, resetLatestMessage],+ );++ const createdHandler = useCallback(+ (data: TResData, submission: TSubmission) => {+ const { messages, message, initialResponse, isRegenerate = false } = submission;++ if (isRegenerate) {+ setMessages([+ ...messages,+ {+ ...initialResponse,+ parentMessageId: message?.overrideParentMessageId ?? null,+ messageId: message?.overrideParentMessageId + '_',+ },+ ]);+ } else {+ setMessages([+ ...messages,+ message,+ {+ ...initialResponse,+ parentMessageId: message?.messageId,+ messageId: message?.messageId + '_',+ },+ ]);}- update = tConvoUpdateSchema.parse({- ...prevState,- conversationId,- title,- }) as TConversation;+ const { conversationId, parentMessageId } = message;- setStorage(update);- return update;- });+ let update = {} as TConversation;+ setConversation((prevState) => {+ let title = prevState?.title;+ if (parentMessageId !== Constants.NO_PARENT && title?.toLowerCase()?.includes('new chat')) {+ const convos = queryClient.getQueryData<ConversationData>([QueryKeys.allConversations]);+ const cachedConvo = getConversationById(convos, conversationId);+ title = cachedConvo?.title;+ }- queryClient.setQueryData<ConversationData>([QueryKeys.allConversations], (convoData) => {- if (!convoData) {- return convoData;- }- if (parentMessageId === Constants.NO_PARENT) {- return addConversation(convoData, update);- } else {- return updateConversation(convoData, update);- }- });- resetLatestMessage();- };-- const finalHandler = (data: TResData, submission: TSubmission) => {- const { requestMessage, responseMessage, conversation, runMessages } = data;- const { messages, conversation: submissionConvo, isRegenerate = false } = submission;-- setShowStopButton(false);- setCompleted((prev) => new Set(prev.add(submission?.initialResponse?.messageId)));-- // update the messages; if assistants endpoint, client doesn't receive responseMessage- if (runMessages) {- setMessages([...runMessages]);- } else if (isRegenerate && responseMessage) {- setMessages([...messages, responseMessage]);- } else if (responseMessage) {- setMessages([...messages, requestMessage, responseMessage]);- }+ update = tConvoUpdateSchema.parse({+ ...prevState,+ conversationId,+ title,+ }) as TConversation;++ setStorage(update);+ return update;+ });- const isNewConvo = conversation.conversationId !== submissionConvo.conversationId;- if (isNewConvo) {queryClient.setQueryData<ConversationData>([QueryKeys.allConversations], (convoData) => {if (!convoData) {return convoData;}- return deleteConversation(convoData, submissionConvo.conversationId as string);+ if (parentMessageId === Constants.NO_PARENT) {+ return addConversation(convoData, update);+ } else {+ return updateConversation(convoData, update);+ }});- }-- // refresh title- if (isNewConvo && requestMessage && requestMessage.parentMessageId === Constants.NO_PARENT) {- setTimeout(() => {- genTitle.mutate({ conversationId: conversation.conversationId as string });- }, 2500);- }+ resetLatestMessage();+ },+ [setMessages, setConversation, setStorage, queryClient, resetLatestMessage],+ );++ const finalHandler = useCallback(+ (data: TResData, submission: TSubmission) => {+ const { requestMessage, responseMessage, conversation, runMessages } = data;+ const { messages, conversation: submissionConvo, isRegenerate = false } = submission;++ setShowStopButton(false);+ setCompleted((prev) => new Set(prev.add(submission?.initialResponse?.messageId)));++ // update the messages; if assistants endpoint, client doesn't receive responseMessage+ if (runMessages) {+ setMessages([...runMessages]);+ } else if (isRegenerate && responseMessage) {+ setMessages([...messages, responseMessage]);+ } else if (responseMessage) {+ setMessages([...messages, requestMessage, responseMessage]);+ }- setConversation((prevState) => {- const update = {- ...prevState,- ...conversation,- };+ const isNewConvo = conversation.conversationId !== submissionConvo.conversationId;+ if (isNewConvo) {+ queryClient.setQueryData<ConversationData>([QueryKeys.allConversations], (convoData) => {+ if (!convoData) {+ return convoData;+ }+ return deleteConversation(convoData, submissionConvo.conversationId as string);+ });+ }- if (prevState?.model && prevState.model !== submissionConvo.model) {- update.model = prevState.model;+ // refresh title+ if (isNewConvo && requestMessage && requestMessage.parentMessageId === Constants.NO_PARENT) {+ setTimeout(() => {+ genTitle.mutate({ conversationId: conversation.conversationId as string });+ }, 2500);}- setStorage(update);- return update;- });+ setConversation((prevState) => {+ const update = {+ ...prevState,+ ...conversation,+ };- setIsSubmitting(false);- };+ if (prevState?.model && prevState.model !== submissionConvo.model) {+ update.model = prevState.model;+ }- const errorHandler = ({ data, submission }: { data?: TResData; submission: TSubmission }) => {- const { messages, message, initialResponse } = submission;+ setStorage(update);+ return update;+ });- setCompleted((prev) => new Set(prev.add(initialResponse.messageId)));+ setIsSubmitting(false);+ },+ [+ setMessages,+ setConversation,+ setStorage,+ genTitle,+ queryClient,+ setIsSubmitting,+ setShowStopButton,+ ],+ );++ const errorHandler = useCallback(+ ({ data, submission }: { data?: TResData; submission: TSubmission }) => {+ const { messages, message, initialResponse } = submission;++ setCompleted((prev) => new Set(prev.add(initialResponse.messageId)));++ const conversationId = message?.conversationId ?? submission?.conversationId;++ const parseErrorResponse = (data: TResData | Partial<TMessage>) => {+ const metadata = data['responseMessage'] ?? data;+ const errorMessage = {+ ...initialResponse,+ ...metadata,+ error: true,+ parentMessageId: message?.messageId,+ };- const conversationId = message?.conversationId ?? submission?.conversationId;+ if (!errorMessage.messageId) {+ errorMessage.messageId = v4();+ }- const parseErrorResponse = (data: TResData | Partial<TMessage>) => {- const metadata = data['responseMessage'] ?? data;- const errorMessage = {- ...initialResponse,- ...metadata,- error: true,- parentMessageId: message?.messageId,+ return tMessageSchema.parse(errorMessage);};- if (!errorMessage.messageId) {- errorMessage.messageId = v4();+ if (!data) {+ const convoId = conversationId ?? v4();+ const errorResponse = parseErrorResponse({+ text: 'Error connecting to server',+ ...submission,+ conversationId: convoId,+ });+ setMessages([...messages, message, errorResponse]);+ newConversation({+ template: { conversationId: convoId },+ preset: tPresetSchema.parse(submission?.conversation),+ });+ setIsSubmitting(false);+ return;}- return tMessageSchema.parse(errorMessage);- };+ if (!conversationId && !data.conversationId) {+ const convoId = v4();+ const errorResponse = parseErrorResponse(data);+ setMessages([...messages, message, errorResponse]);+ newConversation({+ template: { conversationId: convoId },+ preset: tPresetSchema.parse(submission?.conversation),+ });+ setIsSubmitting(false);+ return;+ }- if (!data) {- const convoId = conversationId ?? v4();- const errorResponse = parseErrorResponse({- text: 'Error connecting to server',- ...submission,- conversationId: convoId,- });- setMessages([...messages, message, errorResponse]);- newConversation({- template: { conversationId: convoId },- preset: tPresetSchema.parse(submission?.conversation),+ console.log('Error:', data);+ const errorResponse = tMessageSchema.parse({+ ...data,+ error: true,+ parentMessageId: message?.messageId,});- setIsSubmitting(false);- return;- }- if (!conversationId && !data.conversationId) {- const convoId = v4();- const errorResponse = parseErrorResponse(data);setMessages([...messages, message, errorResponse]);- newConversation({- template: { conversationId: convoId },- preset: tPresetSchema.parse(submission?.conversation),- });+ if (data.conversationId && paramId === 'new') {+ newConversation({+ template: { conversationId: data.conversationId },+ preset: tPresetSchema.parse(submission?.conversation),+ });+ }+setIsSubmitting(false);return;- }-- console.log('Error:', data);- const errorResponse = tMessageSchema.parse({- ...data,- error: true,- parentMessageId: message?.messageId,- });-- setMessages([...messages, message, errorResponse]);- if (data.conversationId && paramId === 'new') {- newConversation({- template: { conversationId: data.conversationId },- preset: tPresetSchema.parse(submission?.conversation),- });- }-- setIsSubmitting(false);- return;- };-- const abortConversation = async (conversationId = '', submission: TSubmission) => {- console.log(submission);- let runAbortKey = '';- try {- const conversation = (JSON.parse(localStorage.getItem('lastConversationSetup') ?? '') ??- {}) as TConversation;- const { conversationId, messages } = conversation;- runAbortKey = `${conversationId}:${messages?.[messages.length - 1]}`;- } catch (error) {- console.error('Error getting last conversation setup');- console.error(error);- }- const { endpoint: _endpoint, endpointType } = submission?.conversation || {};- const endpoint = endpointType ?? _endpoint;- try {- const response = await fetch(`${EndpointURLs[endpoint ?? '']}/abort`, {- method: 'POST',- headers: {- 'Content-Type': 'application/json',- Authorization: `Bearer ${token}`,- },- body: JSON.stringify({- abortKey: _endpoint === EModelEndpoint.assistants ? runAbortKey : conversationId,- endpoint,- }),- });+ },+ [setMessages, paramId, setIsSubmitting, newConversation],+ );++ const abortConversation = useCallback(+ async (conversationId = '', submission: TSubmission) => {+ console.log(submission);+ let runAbortKey = '';+ try {+ const conversation = (JSON.parse(localStorage.getItem('lastConversationSetup') ?? '') ??+ {}) as TConversation;+ const { conversationId, messages } = conversation;+ runAbortKey = `${conversationId}:${messages?.[messages.length - 1]}`;+ } catch (error) {+ console.error('Error getting last conversation setup');+ console.error(error);+ }+ const { endpoint: _endpoint, endpointType } = submission?.conversation || {};+ const endpoint = endpointType ?? _endpoint;+ try {+ const response = await fetch(`${EndpointURLs[endpoint ?? '']}/abort`, {+ method: 'POST',+ headers: {+ 'Content-Type': 'application/json',+ Authorization: `Bearer ${token}`,+ },+ body: JSON.stringify({+ abortKey: _endpoint === EModelEndpoint.assistants ? runAbortKey : conversationId,+ endpoint,+ }),+ });- // Check if the response is JSON- const contentType = response.headers.get('content-type');- if (contentType && contentType.includes('application/json')) {- const data = await response.json();- console.log('aborted', data);- if (response.status === 404) {- setIsSubmitting(false);- return;- }- if (data.final) {- finalHandler(data, submission);+ // Check if the response is JSON+ const contentType = response.headers.get('content-type');+ if (contentType && contentType.includes('application/json')) {+ const data = await response.json();+ console.log('aborted', data);+ if (response.status === 404) {+ setIsSubmitting(false);+ return;+ }+ if (data.final) {+ finalHandler(data, submission);+ } else {+ cancelHandler(data, submission);+ }+ } else if (response.status === 204) {+ const responseMessage = {+ ...submission.initialResponse,+ };++ const data = {+ requestMessage: submission.message,+ responseMessage: responseMessage,+ conversation: submission.conversation,+ };+ console.log('aborted', data);} else {- cancelHandler(data, submission);+ throw new Error(+ 'Unexpected response from server; Status: ' ++ response.status ++ ' ' ++ response.statusText,+ );}- } else if (response.status === 204) {- const responseMessage = {+ } catch (error) {+ console.error('Error cancelling request');+ console.error(error);+ const convoId = conversationId ?? v4();+ const text =+ submission.initialResponse?.text?.length > 45 ? submission.initialResponse?.text : '';+ const errorMessage = {+ ...submission,...submission.initialResponse,+ text: text ?? (error as Error).message ?? 'Error cancelling request',+ unfinished: !!text.length,+ error: true,};-- const data = {- requestMessage: submission.message,- responseMessage: responseMessage,- conversation: submission.conversation,- };- console.log('aborted', data);- } else {- throw new Error(- 'Unexpected response from server; Status: ' + response.status + ' ' + response.statusText,- );+ const errorResponse = tMessageSchema.parse(errorMessage);+ setMessages([...submission.messages, submission.message, errorResponse]);+ newConversation({+ template: { conversationId: convoId },+ preset: tPresetSchema.parse(submission?.conversation),+ });+ setIsSubmitting(false);}- } catch (error) {- console.error('Error cancelling request');- console.error(error);- const convoId = conversationId ?? v4();- const text =- submission.initialResponse?.text?.length > 45 ? submission.initialResponse?.text : '';- const errorMessage = {- ...submission,- ...submission.initialResponse,- text: text ?? (error as Error).message ?? 'Error cancelling request',- unfinished: !!text.length,- error: true,- };- const errorResponse = tMessageSchema.parse(errorMessage);- setMessages([...submission.messages, submission.message, errorResponse]);- newConversation({- template: { conversationId: convoId },- preset: tPresetSchema.parse(submission?.conversation),- });- setIsSubmitting(false);- }- };+ },+ [token, setIsSubmitting, finalHandler, cancelHandler, setMessages, newConversation],+ );useEffect(() => {if (submission === null) {diff --git a/client/src/style.css b/client/src/style.cssindex 41d3d9ca95..23ad2f11cf 100644--- a/client/src/style.css+++ b/client/src/style.css@@ -1410,7 +1410,7 @@ html {.dark body,.dark html {--tw-bg-opacity:1;- background-color:rgba(52,53,65,var(--tw-bg-opacity))+ background-color:rgba(33,33,33,var(--tw-bg-opacity))}#__next,#root {diff --git a/packages/data-provider/src/schemas.ts b/packages/data-provider/src/schemas.tsindex 63b7a69d88..69bb660da1 100644--- a/packages/data-provider/src/schemas.ts+++ b/packages/data-provider/src/schemas.ts@@ -22,7 +22,7 @@ export const defaultAssistantFormValues = {name: '',description: '',instructions: '',- model: 'gpt-3.5-turbo-1106',+ model: '',functions: [],code_interpreter: false,retrieval: false,