@lobehub/chat 1.1.1 → 1.1.3

package/src/store/user/slices/modelList/selectors/modelConfig.test.ts

@@ -32,6 +32,27 @@ describe('modelConfigSelectors', () => {
 
       expect(modelConfigSelectors.isProviderEnabled('perplexity')(s)).toBe(false);
     });
+
+    it('should follow the user settings if provider is in the whitelist', () => {
+      const s = merge(initialSettingsState, {
+        settings: {
+          languageModel: {
+            ollama: { enabled: false },
+          },
+        },
+      } as UserSettingsState) as unknown as UserStore;
+
+      expect(modelConfigSelectors.isProviderEnabled('ollama')(s)).toBe(false);
+    });
+
+    it('ollama should be enabled by default', () => {
+      const s = merge(initialSettingsState, {
+        settings: {
+          languageModel: {},
+        },
+      } as UserSettingsState) as unknown as UserStore;
+      expect(modelConfigSelectors.isProviderEnabled('ollama')(s)).toBe(true);
+    });
   });
 
   describe('isProviderFetchOnClient', () => {

package/src/store/user/slices/modelList/selectors/modelConfig.ts

@@ -7,6 +7,7 @@ import { keyVaultsConfigSelectors } from './keyVaults';
 const isProviderEnabled = (provider: GlobalLLMProviderKey) => (s: UserStore) =>
   getProviderConfigById(provider)(s)?.enabled || false;
 
+const providerWhitelist = new Set(['ollama']);
 /**
  * @description The conditions to enable client fetch
  * 1. If no baseUrl and apikey input, force on Server.
@@ -17,6 +18,10 @@ const isProviderEnabled = (provider: GlobalLLMProviderKey) => (s: UserStore) =>
 const isProviderFetchOnClient = (provider: GlobalLLMProviderKey | string) => (s: UserStore) => {
   const config = getProviderConfigById(provider)(s);
 
+  // If the provider in the whitelist, follow the user settings
+  if (providerWhitelist.has(provider) && typeof config?.fetchOnClient !== 'undefined')
+    return config?.fetchOnClient;
+
   // 1. If no baseUrl and apikey input, force on Server.
   const isProviderEndpointNotEmpty =
     keyVaultsConfigSelectors.isProviderEndpointNotEmpty(provider)(s);