@lobehub/chat 1.44.2 → 1.44.3

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 1.44.3](https://github.com/lobehub/lobe-chat/compare/v1.44.2...v1.44.3)
+
+<sup>Released on **2025-01-08**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix provider enabled issue.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix provider enabled issue, closes [#5337](https://github.com/lobehub/lobe-chat/issues/5337) ([8e0b634](https://github.com/lobehub/lobe-chat/commit/8e0b634))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.44.2](https://github.com/lobehub/lobe-chat/compare/v1.44.1...v1.44.2)
 
 <sup>Released on **2025-01-08**</sup>

package/changelog/v1.json

@@ -1,4 +1,13 @@
 [
+  {
+    "children": {
+      "fixes": [
+        "Fix provider enabled issue."
+      ]
+    },
+    "date": "2025-01-08",
+    "version": "1.44.3"
+  },
   {
     "children": {
       "fixes": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.44.2",
+  "version": "1.44.3",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/database/repositories/aiInfra/index.ts

@@ -69,19 +69,28 @@ export class AiInfraRepos {
     const providers = await this.getAiProviderList();
     const enabledProviders = providers.filter((item) => item.enabled);
 
-    const userEnabledModels = await this.aiModelModel.getEnabledModels();
+    const allModels = await this.aiModelModel.getAllModels();
+    const userEnabledModels = allModels.filter((item) => item.enabled);
+
     const modelList = await pMap(
       enabledProviders,
       async (provider) => {
         const aiModels = await this.fetchBuiltinModels(provider.id);
 
         return (aiModels || [])
-          .filter((i) => i.enabled)
-          .map<EnabledAiModel>((item) => ({
-            ...item,
-            abilities: item.abilities || {},
-            providerId: provider.id,
-          }));
+          .map<EnabledAiModel & { enabled?: boolean | null }>((item) => {
+            const user = allModels.find((m) => m.id === item.id && m.providerId === provider.id);
+
+            const enabled = !!user ? user.enabled : item.enabled;
+
+            return {
+              ...item,
+              abilities: item.abilities || {},
+              enabled,
+              providerId: provider.id,
+            };
+          })
+          .filter((i) => i.enabled);
       },
       { concurrency: 10 },
     );
@@ -100,6 +109,9 @@ export class AiInfraRepos {
     return mergeArrayById(defaultModels, aiModels) as AiProviderModelListItem[];
   };
 
+  /**
+   * Fetch builtin models from config
+   */
   private fetchBuiltinModels = async (
     providerId: string,
   ): Promise<AiProviderModelListItem[] | undefined> => {

package/src/database/server/models/__tests__/aiModel.test.ts

@@ -193,17 +193,15 @@ describe('AiModelModel', () => {
     });
   });
 
-  describe('getEnabledModels', () => {
+  describe('getAllModels', () => {
     it('should only return enabled models', async () => {
       await serverDB.insert(aiModels).values([
         { id: 'model1', providerId: 'openai', enabled: true, source: 'custom', userId },
-        { id: 'model2', providerId: 'openai', enabled: false, source: 'custom', userId },
+        { id: 'model2', providerId: 'b', enabled: false, source: 'custom', userId },
       ]);
 
-      const models = await aiProviderModel.getEnabledModels();
-      expect(models).toHaveLength(1);
-      expect(models[0].id).toBe('model1');
-      expect(models[0].enabled).toBe(true);
+      const models = await aiProviderModel.getAllModels();
+      expect(models).toHaveLength(2);
     });
   });
 

package/src/database/server/models/aiModel.ts

@@ -8,6 +8,7 @@ import {
   AiProviderModelListItem,
   ToggleAiModelEnableParams,
 } from '@/types/aiModel';
+import { EnabledAiModel } from '@/types/aiProvider';
 
 import { AiModelSelectItem, NewAiModelItem, aiModels } from '../../schemas';
 
@@ -83,8 +84,8 @@ export class AiModelModel {
     return result as AiProviderModelListItem[];
   };
 
-  getEnabledModels = async () => {
-    return this.db
+  getAllModels = async () => {
+    const data = await this.db
       .select({
         abilities: aiModels.abilities,
         config: aiModels.config,
@@ -98,7 +99,9 @@ export class AiModelModel {
         type: aiModels.type,
       })
       .from(aiModels)
-      .where(and(eq(aiModels.userId, this.userId), eq(aiModels.enabled, true)));
+      .where(and(eq(aiModels.userId, this.userId)));
+
+    return data as EnabledAiModel[];
   };
 
   findById = async (id: string) => {

package/src/store/aiInfra/slices/aiProvider/action.ts

@@ -215,7 +215,7 @@ export const createAiProviderSlice: StateCreator<
               enabledChatModelList,
             },
             false,
-            'useInitAiProviderKeyVaults',
+            'useFetchAiProviderRuntimeState',
           );
         },
       },

package/src/types/aiProvider.ts

@@ -192,6 +192,7 @@ export interface EnabledAiModel {
   config?: AiModelConfig;
   contextWindowTokens?: number;
   displayName?: string;
+  enabled?: boolean;
   id: string;
   providerId: string;
   sort?: number;