{(_messagesTree && _messagesTree.length == 0) || _messagesTree === null ? (
- Nothing found
+ {localize('com_ui_nothing_found')}
) : (
<>
diff --git a/client/src/components/SidePanel/Agents/AgentPanel.tsx b/client/src/components/SidePanel/Agents/AgentPanel.tsx
index 7e0e80be7..23ede096a 100644
--- a/client/src/components/SidePanel/Agents/AgentPanel.tsx
+++ b/client/src/components/SidePanel/Agents/AgentPanel.tsx
@@ -4,6 +4,7 @@ import { useWatch, useForm, FormProvider } from 'react-hook-form';
import { useGetModelsQuery } from 'librechat-data-provider/react-query';
import {
Tools,
+ Constants,
SystemRoles,
EModelEndpoint,
isAssistantsEndpoint,
@@ -45,7 +46,7 @@ export default function AgentPanel({
const modelsQuery = useGetModelsQuery();
const agentQuery = useGetAgentByIdQuery(current_agent_id ?? '', {
- enabled: !!(current_agent_id ?? ''),
+ enabled: !!(current_agent_id ?? '') && current_agent_id !== Constants.EPHEMERAL_AGENT_ID,
});
const models = useMemo(() => modelsQuery.data ?? {}, [modelsQuery.data]);
diff --git a/client/src/hooks/Agents/useSelectAgent.ts b/client/src/hooks/Agents/useSelectAgent.ts
index abeda4c17..bda268062 100644
--- a/client/src/hooks/Agents/useSelectAgent.ts
+++ b/client/src/hooks/Agents/useSelectAgent.ts
@@ -18,7 +18,7 @@ export default function useSelectAgent() {
);
const agentQuery = useGetAgentByIdQuery(selectedAgentId ?? '', {
- enabled: !!(selectedAgentId ?? ''),
+ enabled: !!(selectedAgentId ?? '') && selectedAgentId !== Constants.EPHEMERAL_AGENT_ID,
});
const updateConversation = useCallback(
diff --git a/client/src/hooks/Chat/index.ts b/client/src/hooks/Chat/index.ts
index b9b286c8e..d70146a58 100644
--- a/client/src/hooks/Chat/index.ts
+++ b/client/src/hooks/Chat/index.ts
@@ -2,4 +2,5 @@ export { default as useChatHelpers } from './useChatHelpers';
export { default as useAddedHelpers } from './useAddedHelpers';
export { default as useAddedResponse } from './useAddedResponse';
export { default as useChatFunctions } from './useChatFunctions';
+export { default as useIdChangeEffect } from './useIdChangeEffect';
export { default as useFocusChatEffect } from './useFocusChatEffect';
diff --git a/client/src/hooks/Chat/useIdChangeEffect.ts b/client/src/hooks/Chat/useIdChangeEffect.ts
new file mode 100644
index 000000000..77b066ef3
--- /dev/null
+++ b/client/src/hooks/Chat/useIdChangeEffect.ts
@@ -0,0 +1,21 @@
+import { useEffect, useRef } from 'react';
+import { useResetRecoilState } from 'recoil';
+import { logger } from '~/utils';
+import store from '~/store';
+
+/**
+ * Hook to reset artifacts when the conversation ID changes
+ * @param conversationId - The current conversation ID
+ */
+export default function useIdChangeEffect(conversationId: string) {
+ const lastConvoId = useRef
(null);
+ const resetArtifacts = useResetRecoilState(store.artifactsState);
+
+ useEffect(() => {
+ if (conversationId !== lastConvoId.current) {
+ logger.log('conversation', 'Conversation ID change');
+ resetArtifacts();
+ }
+ lastConvoId.current = conversationId;
+ }, [conversationId, resetArtifacts]);
+}
diff --git a/client/src/hooks/Conversations/useNavigateToConvo.tsx b/client/src/hooks/Conversations/useNavigateToConvo.tsx
index c31fb08a3..2b2981f41 100644
--- a/client/src/hooks/Conversations/useNavigateToConvo.tsx
+++ b/client/src/hooks/Conversations/useNavigateToConvo.tsx
@@ -1,13 +1,7 @@
+import { useSetRecoilState } from 'recoil';
import { useNavigate } from 'react-router-dom';
import { useQueryClient } from '@tanstack/react-query';
-import { useSetRecoilState, useResetRecoilState } from 'recoil';
-import {
- QueryKeys,
- Constants,
- dataService,
- EModelEndpoint,
- LocalStorageKeys,
-} from 'librechat-data-provider';
+import { QueryKeys, Constants } from 'librechat-data-provider';
import type { TConversation, TEndpointsConfig, TModelsConfig } from 'librechat-data-provider';
import { buildDefaultConvo, getDefaultEndpoint, getEndpointField, logger } from '~/utils';
import store from '~/store';
@@ -16,48 +10,28 @@ const useNavigateToConvo = (index = 0) => {
const navigate = useNavigate();
const queryClient = useQueryClient();
const clearAllConversations = store.useClearConvoState();
- const resetArtifacts = useResetRecoilState(store.artifactsState);
const setSubmission = useSetRecoilState(store.submissionByIndex(index));
const clearAllLatestMessages = store.useClearLatestMessages(`useNavigateToConvo ${index}`);
const { hasSetConversation, setConversation } = store.useCreateConversationAtom(index);
- const fetchFreshData = async (conversationId?: string | null) => {
- if (!conversationId) {
- return;
- }
- try {
- const data = await queryClient.fetchQuery([QueryKeys.conversation, conversationId], () =>
- dataService.getConversationById(conversationId),
- );
- logger.log('conversation', 'Fetched fresh conversation data', data);
- await queryClient.invalidateQueries([QueryKeys.messages, conversationId]);
- setConversation(data);
- navigate(`/c/${conversationId ?? Constants.NEW_CONVO}`, { state: { focusChat: true } });
- } catch (error) {
- console.error('Error fetching conversation data on navigation', error);
- }
- };
-
const navigateToConvo = (
conversation?: TConversation | null,
- _resetLatestMessage = true,
- /** Likely need to remove this since it happens after fetching conversation data */
- invalidateMessages = false,
+ options?: {
+ resetLatestMessage?: boolean;
+ currentConvoId?: string;
+ },
) => {
if (!conversation) {
logger.warn('conversation', 'Conversation not provided to `navigateToConvo`');
return;
}
+ const { resetLatestMessage = true, currentConvoId } = options || {};
logger.log('conversation', 'Navigating to conversation', conversation);
hasSetConversation.current = true;
setSubmission(null);
- if (_resetLatestMessage) {
+ if (resetLatestMessage) {
clearAllLatestMessages();
}
- if (invalidateMessages && conversation.conversationId != null && conversation.conversationId) {
- queryClient.setQueryData([QueryKeys.messages, Constants.NEW_CONVO], []);
- queryClient.invalidateQueries([QueryKeys.messages, conversation.conversationId]);
- }
let convo = { ...conversation };
const endpointsConfig = queryClient.getQueryData([QueryKeys.endpoints]);
@@ -84,51 +58,13 @@ const useNavigateToConvo = (index = 0) => {
});
}
clearAllConversations(true);
- resetArtifacts();
setConversation(convo);
- if (convo.conversationId !== Constants.NEW_CONVO && convo.conversationId) {
- queryClient.invalidateQueries([QueryKeys.conversation, convo.conversationId]);
- fetchFreshData(convo.conversationId);
- } else {
- navigate(`/c/${convo.conversationId ?? Constants.NEW_CONVO}`, { state: { focusChat: true } });
- }
- };
-
- const navigateWithLastTools = (
- conversation?: TConversation | null,
- _resetLatestMessage?: boolean,
- invalidateMessages?: boolean,
- ) => {
- if (!conversation) {
- logger.warn('conversation', 'Conversation not provided to `navigateToConvo`');
- return;
- }
- // set conversation to the new conversation
- if (conversation.endpoint === EModelEndpoint.gptPlugins) {
- let lastSelectedTools = [];
- try {
- lastSelectedTools =
- JSON.parse(localStorage.getItem(LocalStorageKeys.LAST_TOOLS) ?? '') ?? [];
- } catch (e) {
- logger.error('conversation', 'Error parsing last selected tools', e);
- }
- const hasTools = (conversation.tools?.length ?? 0) > 0;
- navigateToConvo(
- {
- ...conversation,
- tools: hasTools ? conversation.tools : lastSelectedTools,
- },
- _resetLatestMessage,
- invalidateMessages,
- );
- } else {
- navigateToConvo(conversation, _resetLatestMessage, invalidateMessages);
- }
+ queryClient.setQueryData([QueryKeys.messages, currentConvoId], []);
+ navigate(`/c/${convo.conversationId ?? Constants.NEW_CONVO}`, { state: { focusChat: true } });
};
return {
navigateToConvo,
- navigateWithLastTools,
};
};
diff --git a/client/src/hooks/ThemeContext.tsx b/client/src/hooks/ThemeContext.tsx
index df516eec4..76b272598 100644
--- a/client/src/hooks/ThemeContext.tsx
+++ b/client/src/hooks/ThemeContext.tsx
@@ -58,10 +58,14 @@ export const ThemeProvider = ({ initialTheme, children }) => {
if (fontSize == null) {
setFontSize('text-base');
applyFontSize('text-base');
- localStorage.setItem('fontSize', 'text-base');
+ localStorage.setItem('fontSize', JSON.stringify('text-base'));
return;
}
- applyFontSize(JSON.parse(fontSize));
+ try {
+ applyFontSize(JSON.parse(fontSize));
+ } catch (error) {
+ console.log(error);
+ }
// Reason: This effect should only run once, and `setFontSize` is a stable function
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
diff --git a/client/src/routes/ChatRoute.tsx b/client/src/routes/ChatRoute.tsx
index 48382fc54..3ae8eb853 100644
--- a/client/src/routes/ChatRoute.tsx
+++ b/client/src/routes/ChatRoute.tsx
@@ -9,8 +9,8 @@ import {
useGetStartupConfig,
useGetEndpointsQuery,
} from '~/data-provider';
+import { useNewConvo, useAppStartup, useAssistantListMap, useIdChangeEffect } from '~/hooks';
import { getDefaultModelSpec, getModelSpecPreset, logger } from '~/utils';
-import { useNewConvo, useAppStartup, useAssistantListMap } from '~/hooks';
import { ToolCallsMapProvider } from '~/Providers';
import ChatView from '~/components/Chat/ChatView';
import useAuthRedirect from './useAuthRedirect';
@@ -34,7 +34,7 @@ export default function ChatRoute() {
const index = 0;
const { conversationId = '' } = useParams();
-
+ useIdChangeEffect(conversationId);
const { hasSetConversation, conversation } = store.useCreateConversationAtom(index);
const { newConversation } = useNewConvo();
diff --git a/client/src/utils/getDefaultEndpoint.ts b/client/src/utils/getDefaultEndpoint.ts
index a9267b339..5a93125d3 100644
--- a/client/src/utils/getDefaultEndpoint.ts
+++ b/client/src/utils/getDefaultEndpoint.ts
@@ -20,7 +20,7 @@ const getEndpointFromSetup = (
if (targetEndpoint && endpointsConfig?.[targetEndpoint]) {
return targetEndpoint as EModelEndpoint;
} else if (targetEndpoint) {
- console.warn(`Illegal target endpoint ${targetEndpoint} ${endpointsConfig}`);
+ console.warn(`Illegal target endpoint ${targetEndpoint}`, endpointsConfig);
}
return null;
};