@lobehub/lobehub 2.0.0-next.67 → 2.0.0-next.69

package/src/services/chat/clientModelRuntime.test.ts

@@ -18,14 +18,10 @@ import {
   LobeZhipuAI,
   ModelRuntime,
 } from '@lobechat/model-runtime';
-import { merge } from 'lodash-es';
 import { ModelProvider } from 'model-bank';
 import OpenAI from 'openai';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { UserStore } from '@/store/user';
-import { UserSettingsState, initialSettingsState } from '@/store/user/slices/settings/initialState';
-
 import { initializeWithClientStore } from './clientModelRuntime';
 
 // Mocking external dependencies
@@ -62,21 +58,35 @@ vi.mock('@lobechat/model-runtime', async (importOriginal) => {
   };
 });
 
-afterEach(() => {
+// Mock version constants
+vi.mock('@/const/version', () => ({
+  isServerMode: false,
+  isDeprecatedEdition: true,
+  isDesktop: false,
+}));
+
+// Helper function to mock aiInfra store with provider keyVaults
+const mockProviderKeyVaults = async (provider: string, keyVaults: any) => {
+  const { useAiInfraStore } = await import('@/store/aiInfra');
+  // @ts-ignore
+  useAiInfraStore.setState((state) => ({
+    aiProviderRuntimeConfig: {
+      ...state.aiProviderRuntimeConfig,
+      [provider]: {
+        keyVaults,
+      },
+    },
+  }));
+};
+
+afterEach(async () => {
   vi.restoreAllMocks();
+  // Clean up store state
+  const { useAiInfraStore } = await import('@/store/aiInfra');
+  useAiInfraStore.setState({ aiProviderRuntimeConfig: {} } as any);
 });
 
 beforeEach(async () => {
-  // 清除所有模块的缓存
-  vi.resetModules();
-
-  // 默认设置 isServerMode 为 false
-  vi.mock('@/const/version', () => ({
-    isServerMode: false,
-    isDeprecatedEdition: true,
-    isDesktop: false,
-  }));
-
   // Reset all mocks
   vi.clearAllMocks();
 
@@ -97,17 +107,11 @@ describe('ModelRuntimeOnClient', () => {
   describe('initializeWithClientStore', () => {
     describe('should initialize with options correctly', () => {
       it('OpenAI provider: with apikey and endpoint', async () => {
-        // Mock the global store to return the user's OpenAI API key and endpoint
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              openai: {
-                apiKey: 'user-openai-key',
-                baseURL: 'user-openai-endpoint',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.OpenAI, {
+          apiKey: 'user-openai-key',
+          baseURL: 'user-openai-endpoint',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.OpenAI,
@@ -118,17 +122,11 @@ describe('ModelRuntimeOnClient', () => {
       });
 
       it('Azure provider: with apiKey, apiVersion, endpoint', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              azure: {
-                apiKey: 'user-azure-key',
-                endpoint: 'user-azure-endpoint',
-                apiVersion: '2024-06-01',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.Azure, {
+          apiKey: 'user-azure-key',
+          endpoint: 'user-azure-endpoint',
+          apiVersion: '2024-06-01',
+        });
 
         const runtime = await initializeWithClientStore({
           payload: {},
@@ -139,15 +137,10 @@ describe('ModelRuntimeOnClient', () => {
       });
 
       it('Google provider: with apiKey', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              google: {
-                apiKey: 'user-google-key',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.Google, {
+          apiKey: 'user-google-key',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.Google,
@@ -157,15 +150,10 @@ describe('ModelRuntimeOnClient', () => {
       });
 
       it('Moonshot AI provider: with apiKey', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              moonshot: {
-                apiKey: 'user-moonshot-key',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.Moonshot, {
+          apiKey: 'user-moonshot-key',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.Moonshot,
@@ -175,17 +163,12 @@ describe('ModelRuntimeOnClient', () => {
       });
 
       it('Bedrock provider: with accessKeyId, region, secretAccessKey', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              bedrock: {
-                accessKeyId: 'user-bedrock-access-key',
-                region: 'user-bedrock-region',
-                secretAccessKey: 'user-bedrock-secret',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.Bedrock, {
+          accessKeyId: 'user-bedrock-access-key',
+          region: 'user-bedrock-region',
+          secretAccessKey: 'user-bedrock-secret',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.Bedrock,
@@ -195,15 +178,10 @@ describe('ModelRuntimeOnClient', () => {
       });
 
       it('Ollama provider: with endpoint', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              ollama: {
-                baseURL: 'http://127.0.0.1:1234',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.Ollama, {
+          baseURL: 'http://127.0.0.1:1234',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.Ollama,
@@ -213,15 +191,10 @@ describe('ModelRuntimeOnClient', () => {
       });
 
       it('Perplexity provider: with apiKey', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              perplexity: {
-                apiKey: 'user-perplexity-key',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.Perplexity, {
+          apiKey: 'user-perplexity-key',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.Perplexity,
@@ -231,15 +204,10 @@ describe('ModelRuntimeOnClient', () => {
       });
 
       it('Anthropic provider: with apiKey', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              anthropic: {
-                apiKey: 'user-anthropic-key',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.Anthropic, {
+          apiKey: 'user-anthropic-key',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.Anthropic,
@@ -249,15 +217,10 @@ describe('ModelRuntimeOnClient', () => {
       });
 
       it('Mistral provider: with apiKey', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              mistral: {
-                apiKey: 'user-mistral-key',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.Mistral, {
+          apiKey: 'user-mistral-key',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.Mistral,
@@ -267,15 +230,10 @@ describe('ModelRuntimeOnClient', () => {
       });
 
       it('OpenRouter provider: with apiKey', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              openrouter: {
-                apiKey: 'user-openrouter-key',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.OpenRouter, {
+          apiKey: 'user-openrouter-key',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.OpenRouter,
@@ -285,15 +243,10 @@ describe('ModelRuntimeOnClient', () => {
       });
 
       it('TogetherAI provider: with apiKey', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              togetherai: {
-                apiKey: 'user-togetherai-key',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.TogetherAI, {
+          apiKey: 'user-togetherai-key',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.TogetherAI,
@@ -303,15 +256,10 @@ describe('ModelRuntimeOnClient', () => {
       });
 
       it('ZeroOneAI provider: with apiKey', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              zeroone: {
-                apiKey: 'user-zeroone-key',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.ZeroOne, {
+          apiKey: 'user-zeroone-key',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.ZeroOne,
@@ -321,16 +269,11 @@ describe('ModelRuntimeOnClient', () => {
       });
 
       it('Groq provider: with apiKey,endpoint', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              groq: {
-                apiKey: 'user-groq-key',
-                baseURL: 'user-groq-endpoint',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.Groq, {
+          apiKey: 'user-groq-key',
+          baseURL: 'user-groq-endpoint',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.Groq,
@@ -344,15 +287,10 @@ describe('ModelRuntimeOnClient', () => {
       });
 
       it('DeepSeek provider: with apiKey', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              deepseek: {
-                apiKey: 'user-deepseek-key',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.DeepSeek, {
+          apiKey: 'user-deepseek-key',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.DeepSeek,
@@ -362,15 +300,10 @@ describe('ModelRuntimeOnClient', () => {
       });
 
       it('Qwen provider: with apiKey', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              qwen: {
-                apiKey: 'user-qwen-key',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+        await mockProviderKeyVaults(ModelProvider.Qwen, {
+          apiKey: 'user-qwen-key',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.Qwen,
@@ -384,16 +317,23 @@ describe('ModelRuntimeOnClient', () => {
        * similar cases in server side
        */
       it('Unknown provider: with apiKey', async () => {
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              unknown: {
+        const { useAiInfraStore } = await import('@/store/aiInfra');
+        // @ts-ignore
+        useAiInfraStore.setState((state) => ({
+          aiProviderRuntimeConfig: {
+            ...state.aiProviderRuntimeConfig,
+            unknown: {
+              keyVaults: {
                 apiKey: 'user-unknown-key',
-                endpoint: 'user-unknown-endpoint',
+                baseURL: 'user-unknown-endpoint',
+              },
+              settings: {
+                sdkType: 'openai',
               },
             },
           },
-        } as any as UserSettingsState) as unknown as UserStore;
+        }));
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: 'unknown' as ModelProvider,
@@ -415,15 +355,11 @@ describe('ModelRuntimeOnClient', () => {
               'eyJhbGciOiJIUzI1NiIsInNpZ25fdHlwZSI6IlNJR04iLCJ0eXAiOiJKV1QifQ.eyJhcGlfa2V5IjoiemhpcHUiLCJleHAiOjE3MTU5MTc2NzMsImlhdCI6MTcxMzMyNTY3M30.gt8o-hUDvJFPJLYcH4EhrT1LAmTXI8YnybHeQjpD9oM',
             ),
         }));
-        merge(initialSettingsState, {
-          settings: {
-            keyVaults: {
-              zhipu: {
-                apiKey: 'zhipu.user-key',
-              },
-            },
-          },
-        } as UserSettingsState) as unknown as UserStore;
+
+        await mockProviderKeyVaults(ModelProvider.ZhiPu, {
+          apiKey: 'zhipu.user-key',
+        });
+
         const runtime = await initializeWithClientStore({
           payload: {},
           provider: ModelProvider.ZhiPu,

package/src/services/chat/contextEngineering.ts

@@ -1,4 +1,4 @@
-import { isDesktop, isServerMode } from '@lobechat/const';
+import { isDesktop } from '@lobechat/const';
 import {
   ContextEngine,
   GroupMessageFlattenProcessor,
@@ -88,7 +88,7 @@ export const contextEngineering = async ({
 
       // 8.5 Message content processing
       new MessageContentProcessor({
-        fileContext: { enabled: isServerMode, includeFileUrl: !isDesktop },
+        fileContext: { enabled: true, includeFileUrl: !isDesktop },
         isCanUseVideo,
         isCanUseVision,
         model,

package/src/services/config.ts

@@ -1,4 +1,4 @@
-import { BRANDING_NAME, isServerMode } from '@lobechat/const';
+import { BRANDING_NAME } from '@lobechat/const';
 import { downloadFile, exportJSONFile } from '@lobechat/utils/client';
 import dayjs from 'dayjs';
 
@@ -19,7 +19,7 @@ class ConfigService {
     }
 
     // or export to file with the data
-    const result = await this.createDataStructure(data, isServerMode ? 'postgres' : 'pglite');
+    const result = await this.createDataStructure(data, 'postgres');
 
     exportJSONFile(result, filename);
   };

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

@@ -1,4 +1,4 @@
-import { isDeprecatedEdition, isDesktop, isUsePgliteDB } from '@lobechat/const';
+import { isDesktop } from '@lobechat/const';
 import { getModelPropertyWithFallback, resolveImageSinglePrice } from '@lobechat/model-runtime';
 import { uniqBy } from 'lodash-es';
 import {
@@ -319,8 +319,7 @@ export const createAiProviderSlice: StateCreator<
     const isAuthLoaded = authSelectors.isLoaded(useUserStore.getState());
     // Only fetch when auth is loaded and login status is explicitly defined (true or false)
     // Prevents unnecessary requests when login state is null/undefined
-    const shouldFetch =
-      isAuthLoaded && !isDeprecatedEdition && isLogin !== null && isLogin !== undefined;
+    const shouldFetch = isAuthLoaded && isLogin !== null && isLogin !== undefined;
     return useClientDataSWR<AiProviderRuntimeStateWithBuiltinModels | undefined>(
       shouldFetch ? [AiProviderSwrKey.fetchAiProviderRuntimeState, isLogin] : null,
       async ([, isLogin]) => {
@@ -381,7 +380,7 @@ export const createAiProviderSlice: StateCreator<
         };
       },
       {
-        focusThrottleInterval: isDesktop || isUsePgliteDB ? 100 : undefined,
+        focusThrottleInterval: isDesktop ? 100 : undefined,
         onSuccess: (data) => {
           if (!data) return;
 

package/src/store/chat/slices/thread/action.ts

@@ -1,6 +1,6 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix, typescript-sort-keys/interface */
 // Disable the auto sort key eslint rule to make the code more logic and readable
-import { LOADING_FLAT, THREAD_DRAFT_ID, isDeprecatedEdition } from '@lobechat/const';
+import { LOADING_FLAT, THREAD_DRAFT_ID } from '@lobechat/const';
 import { chainSummaryTitle } from '@lobechat/prompts';
 import {
   CreateMessageParams,
@@ -222,7 +222,7 @@ export const chatThreadMessage: StateCreator<
 
   useFetchThreads: (enable, topicId) =>
     useClientDataSWR<ThreadItem[]>(
-      enable && !!topicId && !isDeprecatedEdition ? [SWR_USE_FETCH_THREADS, topicId] : null,
+      enable && !!topicId ? [SWR_USE_FETCH_THREADS, topicId] : null,
       async ([, topicId]: [string, string]) => threadService.getThreads(topicId),
       {
         onSuccess: (threads) => {

package/src/store/global/selectors/systemStatus.test.ts

@@ -1,6 +1,5 @@
 import { describe, expect, it, vi } from 'vitest';
 
-import { DatabaseLoadingState } from '@/types/clientDB';
 import { merge } from '@/utils/merge';
 
 import { GlobalState, INITIAL_STATUS, initialState } from '../initialState';
@@ -108,101 +107,4 @@ describe('systemStatusSelectors', () => {
       expect(systemStatusSelectors.themeMode(s)).toBe('auto');
     });
   });
-
-  describe('pglite status selectors', () => {
-    describe('isPgliteNotEnabled', () => {
-      it('should return true when conditions are met', () => {
-        const s: GlobalState = {
-          ...initialState,
-          isStatusInit: true,
-          status: {
-            ...initialState.status,
-            isEnablePglite: false,
-          },
-        };
-        expect(systemStatusSelectors.isPgliteNotEnabled(s)).toBe(true);
-      });
-
-      it('should return false when isStatusInit is false', () => {
-        const s: GlobalState = {
-          ...initialState,
-          isStatusInit: false,
-          status: {
-            ...initialState.status,
-            isEnablePglite: false,
-          },
-        };
-        expect(systemStatusSelectors.isPgliteNotEnabled(s)).toBe(false);
-      });
-    });
-
-    describe('isPgliteNotInited', () => {
-      it('should return true when pglite is enabled but not ready', () => {
-        const s: GlobalState = {
-          ...initialState,
-          isStatusInit: true,
-          status: {
-            ...initialState.status,
-            isEnablePglite: true,
-          },
-          initClientDBStage: DatabaseLoadingState.Initializing,
-        };
-        expect(systemStatusSelectors.isPgliteNotInited(s)).toBe(true);
-      });
-
-      it('should return false when pglite is ready', () => {
-        const s: GlobalState = {
-          ...initialState,
-          isStatusInit: true,
-          status: {
-            ...initialState.status,
-            isEnablePglite: true,
-          },
-          initClientDBStage: DatabaseLoadingState.Ready,
-        };
-        expect(systemStatusSelectors.isPgliteNotInited(s)).toBe(false);
-      });
-
-      it('should return false when pglite is not enabled', () => {
-        const s: GlobalState = {
-          ...initialState,
-          isStatusInit: true,
-          status: {
-            ...initialState.status,
-            isEnablePglite: false,
-          },
-          initClientDBStage: DatabaseLoadingState.Initializing,
-        };
-        expect(systemStatusSelectors.isPgliteNotInited(s)).toBe(false);
-      });
-    });
-
-    describe('isPgliteInited', () => {
-      it('should return true when pglite is enabled and ready', () => {
-        const s: GlobalState = {
-          ...initialState,
-          isStatusInit: true,
-          status: {
-            ...initialState.status,
-            isEnablePglite: true,
-          },
-          initClientDBStage: DatabaseLoadingState.Ready,
-        };
-        expect(systemStatusSelectors.isPgliteInited(s)).toBe(true);
-      });
-
-      it('should return false when not ready', () => {
-        const s: GlobalState = {
-          ...initialState,
-          isStatusInit: true,
-          status: {
-            ...initialState.status,
-            isEnablePglite: true,
-          },
-          initClientDBStage: DatabaseLoadingState.Initializing,
-        };
-        expect(systemStatusSelectors.isPgliteInited(s)).toBe(false);
-      });
-    });
-  });
 });

package/src/store/global/selectors/systemStatus.ts

@@ -1,6 +1,3 @@
-import { isServerMode, isUsePgliteDB } from '@/const/version';
-import { DatabaseLoadingState } from '@/types/clientDB';
-
 import { GlobalState, INITIAL_STATUS } from '../initialState';
 
 export const systemStatus = (s: GlobalState) => s.status;
@@ -32,29 +29,6 @@ const wideScreen = (s: GlobalState) => !s.status.noWideScreen;
 const chatInputHeight = (s: GlobalState) => s.status.chatInputHeight || 64;
 const expandInputActionbar = (s: GlobalState) => s.status.expandInputActionbar;
 const isStatusInit = (s: GlobalState) => !!s.isStatusInit;
-const isPgliteNotEnabled = (s: GlobalState) =>
-  isUsePgliteDB && !isServerMode && isStatusInit(s) && !s.status.isEnablePglite;
-
-/**
- * 当且仅当 client db 模式，且 pglite 未初始化完成时返回 true
- */
-const isPgliteNotInited = (s: GlobalState) =>
-  isUsePgliteDB &&
-  isStatusInit(s) &&
-  s.status.isEnablePglite &&
-  s.initClientDBStage !== DatabaseLoadingState.Ready;
-
-/**
- * 当且仅当 client db 模式，且 pglite 初始化完成时返回 true
- */
-const isPgliteInited = (s: GlobalState): boolean =>
-  (isStatusInit(s) &&
-    s.status.isEnablePglite &&
-    s.initClientDBStage === DatabaseLoadingState.Ready) ||
-  false;
-
-// 这个变量控制 clientdb 是否完成初始化，正常来说，只有 pgliteDB 模式下，才会存在变化，其他时候都是 true
-const isDBInited = (s: GlobalState): boolean => (isUsePgliteDB ? isPgliteInited(s) : true);
 
 const getAgentSystemRoleExpanded =
   (agentId: string) =>
@@ -80,10 +54,6 @@ export const systemStatusSelectors = {
   imagePanelWidth,
   imageTopicPanelWidth,
   inZenMode,
-  isDBInited,
-  isPgliteInited,
-  isPgliteNotEnabled,
-  isPgliteNotInited,
   isShowCredit,
   isStatusInit,
   language,

package/src/store/serverConfig/selectors.test.ts

@@ -11,7 +11,7 @@ describe('featureFlagsSelectors', () => {
       featureFlags: {
         ...mapFeatureFlagsEnvToState(DEFAULT_FEATURE_FLAGS),
         isAgentEditable: false,
-        showLLM: false,
+        showProvider: true,
         showMarket: true,
         showAiImage: true,
       },
@@ -20,7 +20,7 @@ describe('featureFlagsSelectors', () => {
     const result = featureFlagsSelectors(store.getState());
 
     expect(result.isAgentEditable).toBe(false);
-    expect(result.showLLM).toBe(false);
+    expect(result.showProvider).toBe(true);
     expect(result.showMarket).toBe(true);
     expect(result.showAiImage).toBe(true);
   });

package/src/store/serverConfig/store.test.ts

@@ -21,7 +21,6 @@ describe('createServerConfigStore', () => {
   it('should initialize store with default state', () => {
     const store = createServerConfigStore();
 
-    expect(store.getState().featureFlags).toHaveProperty('showLLM');
     expect(store.getState().featureFlags).toHaveProperty('enablePlugins');
     expect(store.getState()).toMatchObject({
       serverConfig: { telemetry: {}, aiProvider: {} },