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: Endpoint Type Mismatch when Switching Conversations (#1834)
Danny Avila5291d18f38fc
diff --git a/api/server/services/Endpoints/assistant/initializeClient.js b/api/server/services/Endpoints/assistant/initializeClient.jsindex 886a037ad1..3ffba002cc 100644--- a/api/server/services/Endpoints/assistant/initializeClient.js+++ b/api/server/services/Endpoints/assistant/initializeClient.js@@ -32,7 +32,10 @@ const initializeClient = async ({ req, res, endpointOption, initAppClient = falslet userKey = null;if (isUserProvided) {- const expiresAt = getUserKeyExpiry({ userId: req.user.id, name: EModelEndpoint.assistants });+ const expiresAt = await getUserKeyExpiry({+ userId: req.user.id,+ name: EModelEndpoint.assistants,+ });checkUserKeyExpiry(expiresAt,'Your Assistants API key has expired. Please provide your API key again.',@@ -43,7 +46,7 @@ const initializeClient = async ({ req, res, endpointOption, initAppClient = falslet apiKey = isUserProvided ? userKey : credentials;if (!apiKey) {- throw new Error('API key not provided.');+ throw new Error(`${EModelEndpoint.assistants} API key not provided.`);}/** @type {OpenAIClient} */diff --git a/api/server/services/Endpoints/gptPlugins/initializeClient.js b/api/server/services/Endpoints/gptPlugins/initializeClient.jsindex cf15c66723..b667b2c0be 100644--- a/api/server/services/Endpoints/gptPlugins/initializeClient.js+++ b/api/server/services/Endpoints/gptPlugins/initializeClient.js@@ -66,7 +66,7 @@ const initializeClient = async ({ req, res, endpointOption }) => {}if (!apiKey) {- throw new Error('API key not provided.');+ throw new Error(`${endpoint} API key not provided.`);}const client = new PluginsClient(apiKey, clientOptions);diff --git a/api/server/services/Endpoints/gptPlugins/initializeClient.spec.js b/api/server/services/Endpoints/gptPlugins/initializeClient.spec.jsindex 5b772209c6..f3e7c89e30 100644--- a/api/server/services/Endpoints/gptPlugins/initializeClient.spec.js+++ b/api/server/services/Endpoints/gptPlugins/initializeClient.spec.js@@ -1,7 +1,8 @@// gptPlugins/initializeClient.spec.js-const { PluginsClient } = require('~/app');+const { EModelEndpoint } = require('librechat-data-provider');+const { getUserKey } = require('~/server/services/UserService');const initializeClient = require('./initializeClient');-const { getUserKey } = require('../../UserService');+const { PluginsClient } = require('~/app');// Mock getUserKey since it's the only function we want to mockjest.mock('~/server/services/UserService', () => ({@@ -112,7 +113,7 @@ describe('gptPlugins/initializeClient', () => {const endpointOption = { modelOptions: { model: 'default-model' } };await expect(initializeClient({ req, res, endpointOption })).rejects.toThrow(- 'API key not provided.',+ `${EModelEndpoint.openAI} API key not provided.`,);});diff --git a/api/server/services/Endpoints/openAI/initializeClient.js b/api/server/services/Endpoints/openAI/initializeClient.jsindex b6427823e1..329749bdd6 100644--- a/api/server/services/Endpoints/openAI/initializeClient.js+++ b/api/server/services/Endpoints/openAI/initializeClient.js@@ -58,7 +58,7 @@ const initializeClient = async ({ req, res, endpointOption }) => {}if (!apiKey) {- throw new Error('API key not provided.');+ throw new Error(`${endpoint} API key not provided.`);}const client = new OpenAIClient(apiKey, clientOptions);diff --git a/api/server/services/Endpoints/openAI/initializeClient.spec.js b/api/server/services/Endpoints/openAI/initializeClient.spec.jsindex 03f5677441..792b73c664 100644--- a/api/server/services/Endpoints/openAI/initializeClient.spec.js+++ b/api/server/services/Endpoints/openAI/initializeClient.spec.js@@ -1,6 +1,7 @@-const { OpenAIClient } = require('~/app');-const initializeClient = require('./initializeClient');+const { EModelEndpoint } = require('librechat-data-provider');const { getUserKey } = require('~/server/services/UserService');+const initializeClient = require('./initializeClient');+const { OpenAIClient } = require('~/app');// Mock getUserKey since it's the only function we want to mockjest.mock('~/server/services/UserService', () => ({@@ -145,7 +146,7 @@ describe('initializeClient', () => {const endpointOption = {};await expect(initializeClient({ req, res, endpointOption })).rejects.toThrow(- 'API key not provided.',+ `${EModelEndpoint.openAI} API key not provided.`,);});diff --git a/client/src/components/svg/Spinner.tsx b/client/src/components/svg/Spinner.tsxindex 32d05e8423..b32904224f 100644--- a/client/src/components/svg/Spinner.tsx+++ b/client/src/components/svg/Spinner.tsx@@ -3,7 +3,7 @@ import { cn } from '~/utils/';export default function Spinner({ className = 'm-auto', size = '1em' }) {return (<svg- stroke="#ffffff"+ stroke="currentColor"fill="none"strokeWidth="2"viewBox="0 0 24 24"diff --git a/client/src/hooks/useChatHelpers.ts b/client/src/hooks/useChatHelpers.tsindex e9708f1a2b..cf6a54e74b 100644--- a/client/src/hooks/useChatHelpers.ts+++ b/client/src/hooks/useChatHelpers.ts@@ -9,7 +9,7 @@ import {ContentTypes,} from 'librechat-data-provider';import { useRecoilState, useResetRecoilState, useSetRecoilState } from 'recoil';-import { useGetMessagesByConvoId, useGetEndpointsQuery } from 'librechat-data-provider/react-query';+import { useGetMessagesByConvoId } from 'librechat-data-provider/react-query';import type {TMessage,TSubmission,@@ -21,12 +21,12 @@ import useSetFilesToDelete from './Files/useSetFilesToDelete';import useGetSender from './Conversations/useGetSender';import { useAuthContext } from './AuthContext';import useUserKey from './Input/useUserKey';+import { getEndpointField } from '~/utils';import useNewConvo from './useNewConvo';import store from '~/store';// this to be set somewhere elseexport default function useChatHelpers(index = 0, paramId: string | undefined) {- const { data: endpointsConfig = {} as TEndpointsConfig } = useGetEndpointsQuery();const setShowStopButton = useSetRecoilState(store.showStopButtonByIndex(index));const [files, setFiles] = useRecoilState(store.filesByIndex(index));const [filesLoading, setFilesLoading] = useState(false);@@ -39,7 +39,7 @@ export default function useChatHelpers(index = 0, paramId: string | undefined) {const { newConversation } = useNewConvo(index);const { useCreateConversationAtom } = store;const { conversation, setConversation } = useCreateConversationAtom(index);- const { conversationId, endpoint, endpointType } = conversation ?? {};+ const { conversationId, endpoint } = conversation ?? {};const queryParam = paramId === 'new' ? paramId : conversationId ?? paramId ?? '';@@ -142,6 +142,9 @@ export default function useChatHelpers(index = 0, paramId: string | undefined) {const thread_id = parentMessage?.thread_id ?? latestMessage?.thread_id;+ const endpointsConfig = queryClient.getQueryData<TEndpointsConfig>([QueryKeys.endpoints]);+ const endpointType = getEndpointField(endpointsConfig, endpoint, 'type');+// set the endpoint optionconst convo = parseCompactConvo({endpoint,diff --git a/client/src/hooks/useNewConvo.ts b/client/src/hooks/useNewConvo.tsindex a7c12c21c8..58c11f1225 100644--- a/client/src/hooks/useNewConvo.ts+++ b/client/src/hooks/useNewConvo.ts@@ -77,6 +77,8 @@ const useNewConvo = (index = 0) => {const endpointType = getEndpointField(endpointsConfig, defaultEndpoint, 'type');if (!conversation.endpointType && endpointType) {conversation.endpointType = endpointType;+ } else if (conversation.endpointType && !endpointType) {+ conversation.endpointType = undefined;}if (!conversation.assistant_id && defaultEndpoint === EModelEndpoint.assistants) {diff --git a/client/src/routes/ChatRoute.tsx b/client/src/routes/ChatRoute.tsxindex 39baa8170f..dd00ef134c 100644--- a/client/src/routes/ChatRoute.tsx+++ b/client/src/routes/ChatRoute.tsx@@ -67,7 +67,7 @@ export default function ChatRoute() {}, [initialConvoQuery.data, modelsQuery.data, endpointsQuery.data]);if (endpointsQuery.isLoading || modelsQuery.isLoading) {- return <Spinner className="m-auto dark:text-white" />;+ return <Spinner className="m-auto text-black dark:text-white" />;}if (!isAuthenticated) {diff --git a/packages/data-provider/src/react-query/react-query-service.ts b/packages/data-provider/src/react-query/react-query-service.tsindex 159be64dc6..7e83df84ab 100644--- a/packages/data-provider/src/react-query/react-query-service.ts+++ b/packages/data-provider/src/react-query/react-query-service.ts@@ -117,8 +117,8 @@ export const useUpdateUserKeysMutation = (): UseMutationResult<> => {const queryClient = useQueryClient();return useMutation((payload: t.TUpdateUserKeyRequest) => dataService.updateUserKey(payload), {- onSuccess: () => {- queryClient.invalidateQueries([QueryKeys.name]);+ onSuccess: (data, variables) => {+ queryClient.invalidateQueries([QueryKeys.name, variables.name]);},});};@@ -136,7 +136,7 @@ export const useRevokeUserKeyMutation = (name: string): UseMutationResult<unknowconst queryClient = useQueryClient();return useMutation(() => dataService.revokeUserKey(name), {onSuccess: () => {- queryClient.invalidateQueries([QueryKeys.name]);+ queryClient.invalidateQueries([QueryKeys.name, name]);if (name === s.EModelEndpoint.assistants) {queryClient.invalidateQueries([QueryKeys.assistants, defaultOrderQuery]);queryClient.invalidateQueries([QueryKeys.assistantDocs]);