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

package/src/hooks/useInterceptingRoutes.ts

@@ -1,11 +1,9 @@
 import { useMemo } from 'react';
 
-import { INBOX_SESSION_ID } from '@/const/session';
-import { isDeprecatedEdition } from '@/const/version';
 import { useIsMobile } from '@/hooks/useIsMobile';
 import { useQueryRoute } from '@/hooks/useQueryRoute';
 import { useAgentStore } from '@/store/agent';
-import { ChatSettingsTabs, SettingsTabs } from '@/store/global/initialState';
+import { ChatSettingsTabs } from '@/store/global/initialState';
 import { useSessionStore } from '@/store/session';
 
 export const useOpenChatSettings = (tab: ChatSettingsTabs = ChatSettingsTabs.Meta) => {
@@ -15,10 +13,6 @@ export const useOpenChatSettings = (tab: ChatSettingsTabs = ChatSettingsTabs.Met
   const router = useQueryRoute();
 
   return useMemo(() => {
-    if (isDeprecatedEdition && activeId === INBOX_SESSION_ID) {
-      return () => router.push(`/settings?active=${SettingsTabs.Agent}`);
-    }
-
     if (isMobile) return () => router.push('/chat/settings', { query: { session: activeId } });
 
     return () => {

package/src/layout/GlobalProvider/StoreInitialization.tsx

@@ -1,16 +1,15 @@
 'use client';
 
+import { enableNextAuth } from '@lobechat/const';
 import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { createStoreUpdater } from 'zustand-utils';
 
-import { enableNextAuth } from '@/const/auth';
 import { useIsMobile } from '@/hooks/useIsMobile';
 import { useAgentStore } from '@/store/agent';
 import { useAiInfraStore } from '@/store/aiInfra';
 import { useGlobalStore } from '@/store/global';
-import { systemStatusSelectors } from '@/store/global/selectors';
 import { useServerConfigStore } from '@/store/serverConfig';
 import { serverConfigSelectors } from '@/store/serverConfig/selectors';
 import { useUserStore } from '@/store/user';
@@ -54,8 +53,7 @@ const StoreInitialization = memo(() => {
    * IMPORTANT: Explicitly convert to boolean to avoid passing null/undefined downstream,
    * which would cause unnecessary API requests with invalid login state.
    */
-  const isDBInited = useGlobalStore(systemStatusSelectors.isDBInited);
-  const isLoginOnInit = isDBInited ? Boolean(enableNextAuth ? isSignedIn : isLogin) : false;
+  const isLoginOnInit = Boolean(enableNextAuth ? isSignedIn : isLogin);
 
   // init inbox agent and default agent config
   useInitAgentStore(isLoginOnInit, serverConfig.defaultAgent?.config);

package/src/services/_auth.ts

@@ -1,4 +1,4 @@
-import { LOBE_CHAT_AUTH_HEADER, isDeprecatedEdition } from '@lobechat/const';
+import { LOBE_CHAT_AUTH_HEADER } from '@lobechat/const';
 import {
   AWSBedrockKeyVault,
   AzureOpenAIKeyVault,
@@ -119,16 +119,7 @@ interface AuthParams {
 }
 
 export const createPayloadWithKeyVaults = (provider: string) => {
-  let keyVaults = {};
-
-  // TODO: remove this condition in V2.0
-  if (isDeprecatedEdition) {
-    keyVaults = keyVaultsConfigSelectors.getVaultByProvider(provider as any)(
-      useUserStore.getState(),
-    );
-  } else {
-    keyVaults = aiProviderSelectors.providerKeyVaults(provider)(useAiInfraStore.getState()) || {};
-  }
+  let keyVaults = aiProviderSelectors.providerKeyVaults(provider)(useAiInfraStore.getState()) || {};
 
   const runtimeProvider = resolveRuntimeProvider(provider);
 

package/src/services/_header.ts

@@ -4,7 +4,6 @@ import {
   OPENAI_API_KEY_HEADER_KEY,
   OPENAI_END_POINT,
 } from '@/const/fetch';
-import { isDeprecatedEdition } from '@/const/version';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { useUserStore } from '@/store/user';
 import { keyVaultsConfigSelectors } from '@/store/user/selectors';
@@ -17,16 +16,9 @@ import { keyVaultsConfigSelectors } from '@/store/user/selectors';
 export const createHeaderWithOpenAI = (header?: HeadersInit): HeadersInit => {
   const state = useUserStore.getState();
 
-  let keyVaults: Record<string, any> = {};
+  const keyVaults: Record<string, any> =
+    aiProviderSelectors.providerKeyVaults('openai')(useAiInfraStore.getState()) || {};
 
-  // TODO: remove this condition in V2.0
-  if (isDeprecatedEdition) {
-    keyVaults = keyVaultsConfigSelectors.getVaultByProvider('openai' as any)(
-      useUserStore.getState(),
-    );
-  } else {
-    keyVaults = aiProviderSelectors.providerKeyVaults('openai')(useAiInfraStore.getState()) || {};
-  }
   // eslint-disable-next-line no-undef
   return {
     ...header,

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

@@ -278,15 +278,16 @@ describe('ChatService', () => {
 
     describe('should handle content correctly for vision models', () => {
       it('should include image content when with vision model', async () => {
+        // Mock helpers to return true for vision support (must be first)
+        const helpers = await import('./helper');
+        vi.spyOn(helpers, 'isCanUseVision').mockReturnValue(true);
+
         // Mock utility functions used in processImageList
         const { parseDataUri } = await import('@lobechat/utils/uriParser');
         const { isDesktopLocalStaticServerUrl } = await import('@lobechat/utils/url');
         vi.mocked(parseDataUri).mockReturnValue({ type: 'url', base64: null, mimeType: null });
         vi.mocked(isDesktopLocalStaticServerUrl).mockReturnValue(false); // Not a local URL
 
-        // Mock aiModelSelectors to return true for vision support
-        vi.spyOn(aiModelSelectors, 'isModelSupportVision').mockReturnValue(() => true);
-
         const messages = [
           {
             content: 'Hello',
@@ -315,13 +316,23 @@ describe('ChatService', () => {
               {
                 content: [
                   {
-                    text: 'Hello',
+                    text: `Hello
+
+<!-- SYSTEM CONTEXT (NOT PART OF USER QUERY) -->
+<context.instruction>following part contains context information injected by the system. Please follow these instructions:
+
+1. Always prioritize handling user-visible content.
+2. the context is only required when user's queries rely on it.
+</context.instruction>
+<files_info>
+<images>
+<images_docstring>here are user upload images you can refer to</images_docstring>
+<image name="abc.png" url="http://example.com/image.jpg"></image>
+</images>
+</files_info>
+<!-- END SYSTEM CONTEXT -->`,
                     type: 'text',
                   },
-                  {
-                    image_url: { detail: 'auto', url: 'http://example.com/image.jpg' },
-                    type: 'image_url',
-                  },
                 ],
                 role: 'user',
               },
@@ -417,7 +428,21 @@ describe('ChatService', () => {
               {
                 content: [
                   {
-                    text: 'Hello',
+                    text: `Hello
+
+<!-- SYSTEM CONTEXT (NOT PART OF USER QUERY) -->
+<context.instruction>following part contains context information injected by the system. Please follow these instructions:
+
+1. Always prioritize handling user-visible content.
+2. the context is only required when user's queries rely on it.
+</context.instruction>
+<files_info>
+<images>
+<images_docstring>here are user upload images you can refer to</images_docstring>
+<image name="local-image.png" url="http://127.0.0.1:3000/uploads/image.png"></image>
+</images>
+</files_info>
+<!-- END SYSTEM CONTEXT -->`,
                     type: 'text',
                   },
                   {
@@ -432,6 +457,8 @@ describe('ChatService', () => {
               },
             ],
             model: 'gpt-4-vision-preview',
+            enabledSearch: undefined,
+            tools: undefined,
           },
           undefined,
         );
@@ -491,7 +518,21 @@ describe('ChatService', () => {
               {
                 content: [
                   {
-                    text: 'Hello',
+                    text: `Hello
+
+<!-- SYSTEM CONTEXT (NOT PART OF USER QUERY) -->
+<context.instruction>following part contains context information injected by the system. Please follow these instructions:
+
+1. Always prioritize handling user-visible content.
+2. the context is only required when user's queries rely on it.
+</context.instruction>
+<files_info>
+<images>
+<images_docstring>here are user upload images you can refer to</images_docstring>
+<image name="remote-image.jpg" url="https://example.com/remote-image.jpg"></image>
+</images>
+</files_info>
+<!-- END SYSTEM CONTEXT -->`,
                     type: 'text',
                   },
                   {
@@ -503,6 +544,8 @@ describe('ChatService', () => {
               },
             ],
             model: 'gpt-4-vision-preview',
+            enabledSearch: undefined,
+            tools: undefined,
           },
           undefined,
         );

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);
   };