Skip to content

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

⚓ refactor(loadConfigModels): Fallback to Default Models if Fetch Fails (#2236)

Danny Avila3a1d07136c81
diff --git a/api/server/services/Config/loadConfigModels.js b/api/server/services/Config/loadConfigModels.js
index b8e0f16f22..bfdb80b4ac 100644
--- a/api/server/services/Config/loadConfigModels.js
+++ b/api/server/services/Config/loadConfigModels.js
@@ -69,6 +69,8 @@ async function loadConfigModels(req) {
apiKey: API_KEY,
name,
userIdQuery: models.userIdQuery,
+ }).then((result) => {
+ return !result?.length ? models.default ?? [] : result;
});
uniqueKeyToNameMap[uniqueKey] = uniqueKeyToNameMap[uniqueKey] || [];
uniqueKeyToNameMap[uniqueKey].push(name);
diff --git a/api/server/services/Config/loadConfigModels.spec.js b/api/server/services/Config/loadConfigModels.spec.js
index b49a0121de..695a59b03f 100644
--- a/api/server/services/Config/loadConfigModels.spec.js
+++ b/api/server/services/Config/loadConfigModels.spec.js
@@ -262,4 +262,66 @@ describe('loadConfigModels', () => {
}),
);
});
+
+ it('falls back to default models if fetching returns an empty array', async () => {
+ getCustomConfig.mockResolvedValue({
+ endpoints: {
+ custom: [
+ {
+ name: 'EmptyFetchModel',
+ apiKey: 'API_KEY',
+ baseURL: 'http://example.com',
+ models: {
+ fetch: true,
+ default: ['defaultModel1', 'defaultModel2'],
+ },
+ },
+ ],
+ },
+ });
+
+ fetchModels.mockResolvedValue([]);
+
+ const result = await loadConfigModels(mockRequest);
+
+ expect(fetchModels).toHaveBeenCalledWith(
+ expect.objectContaining({
+ name: 'EmptyFetchModel',
+ apiKey: 'API_KEY',
+ }),
+ );
+
+ expect(result.EmptyFetchModel).toEqual(['defaultModel1', 'defaultModel2']);
+ });
+
+ it('falls back to default models if fetching returns a falsy value', async () => {
+ getCustomConfig.mockResolvedValue({
+ endpoints: {
+ custom: [
+ {
+ name: 'FalsyFetchModel',
+ apiKey: 'API_KEY',
+ baseURL: 'http://example.com',
+ models: {
+ fetch: true,
+ default: ['defaultModel1', 'defaultModel2'],
+ },
+ },
+ ],
+ },
+ });
+
+ fetchModels.mockResolvedValue(false);
+
+ const result = await loadConfigModels(mockRequest);
+
+ expect(fetchModels).toHaveBeenCalledWith(
+ expect.objectContaining({
+ name: 'FalsyFetchModel',
+ apiKey: 'API_KEY',
+ }),
+ );
+
+ expect(result.FalsyFetchModel).toEqual(['defaultModel1', 'defaultModel2']);
+ });
});