@lobehub/lobehub 2.0.0-next.15 → 2.0.0-next.17

package/src/server/routers/lambda/config/index.test.ts

@@ -36,7 +36,7 @@ describe('configRouter', () => {
           const response = await router.getGlobalConfig();
 
           // Assert
-          const result = response.serverConfig.languageModel?.openai;
+          const result = response.serverConfig.aiProvider?.openai;
 
           expect(result).toMatchSnapshot();
           process.env.OPENAI_MODEL_LIST = '';
@@ -48,7 +48,7 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
+          const result = response.serverConfig.aiProvider?.openai?.serverModelLists;
 
           expect(result).toMatchSnapshot();
 
@@ -61,7 +61,7 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
+          const result = response.serverConfig.aiProvider?.openai?.serverModelLists;
 
           expect(result?.find((s) => s.id === 'gpt-4-0125-preview')?.displayName).toEqual(
             'gpt-4-32k',
@@ -75,7 +75,7 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
+          const result = response.serverConfig.aiProvider?.openai?.serverModelLists;
 
           expect(result?.find((r) => r.id === 'gpt-4')).toBeUndefined();
 
@@ -87,7 +87,7 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
+          const result = response.serverConfig.aiProvider?.openai?.serverModelLists;
 
           const model = result?.find((o) => o.id === 'gpt-4-1106-preview');
 
@@ -101,28 +101,36 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
-
-          expect(result).toContainEqual({
-            displayName: 'model1',
-            id: 'model1',
-            enabled: true,
-          });
-          expect(result).toContainEqual({
-            displayName: 'model2',
-            enabled: true,
-            id: 'model2',
-          });
-          expect(result).toContainEqual({
-            displayName: 'model3',
-            enabled: true,
-            id: 'model3',
-          });
-          expect(result).toContainEqual({
-            displayName: 'model4',
-            enabled: true,
-            id: 'model4',
-          });
+          const result = response.serverConfig.aiProvider?.openai?.serverModelLists;
+
+          expect(result).toContainEqual(
+            expect.objectContaining({
+              displayName: 'model1',
+              id: 'model1',
+              enabled: true,
+            }),
+          );
+          expect(result).toContainEqual(
+            expect.objectContaining({
+              displayName: 'model2',
+              enabled: true,
+              id: 'model2',
+            }),
+          );
+          expect(result).toContainEqual(
+            expect.objectContaining({
+              displayName: 'model3',
+              enabled: true,
+              id: 'model3',
+            }),
+          );
+          expect(result).toContainEqual(
+            expect.objectContaining({
+              displayName: 'model4',
+              enabled: true,
+              id: 'model4',
+            }),
+          );
 
           process.env.OPENAI_MODEL_LIST = '';
         });
@@ -136,7 +144,7 @@ describe('configRouter', () => {
           const response = await router.getGlobalConfig();
 
           // Assert
-          const result = response.serverConfig.languageModel?.openrouter;
+          const result = response.serverConfig.aiProvider?.openrouter;
 
           expect(result).toMatchSnapshot();
 

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

@@ -284,6 +284,9 @@ describe('ChatService', () => {
         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',
@@ -369,6 +372,9 @@ describe('ChatService', () => {
           mimeType: 'image/png',
         });
 
+        // Mock aiModelSelectors to return true for vision support
+        vi.spyOn(aiModelSelectors, 'isModelSupportVision').mockReturnValue(() => true);
+
         const messages = [
           {
             content: 'Hello',
@@ -441,6 +447,9 @@ describe('ChatService', () => {
         vi.mocked(isDesktopLocalStaticServerUrl).mockReturnValue(false); // This is NOT a local URL
         vi.mocked(imageUrlToBase64).mockClear(); // Clear to ensure it's not called
 
+        // Mock aiModelSelectors to return true for vision support
+        vi.spyOn(aiModelSelectors, 'isModelSupportVision').mockReturnValue(() => true);
+
         const messages = [
           {
             content: 'Hello',
@@ -518,6 +527,9 @@ describe('ChatService', () => {
           mimeType: 'image/jpeg',
         });
 
+        // Mock aiModelSelectors to return true for vision support
+        vi.spyOn(aiModelSelectors, 'isModelSupportVision').mockReturnValue(() => true);
+
         const messages = [
           {
             content: 'Multiple images',

package/src/services/chat/helper.ts

@@ -1,16 +1,9 @@
-import { isDeprecatedEdition } from '@lobechat/const';
 import { ModelProvider } from 'model-bank';
 
 import { getAiInfraStoreState } from '@/store/aiInfra';
 import { aiModelSelectors, aiProviderSelectors } from '@/store/aiInfra/selectors';
-import { getUserStoreState, useUserStore } from '@/store/user';
-import { modelConfigSelectors, modelProviderSelectors } from '@/store/user/selectors';
 
 export const isCanUseVision = (model: string, provider: string): boolean => {
-  // TODO: remove isDeprecatedEdition condition in V2.0
-  if (isDeprecatedEdition) {
-    return modelProviderSelectors.isModelEnabledVision(model)(getUserStoreState());
-  }
   return aiModelSelectors.isModelSupportVision(model, provider)(getAiInfraStoreState());
 };
 
@@ -24,40 +17,23 @@ export const isCanUseVideo = (model: string, provider: string): boolean => {
 export const findDeploymentName = (model: string, provider: string) => {
   let deploymentId = model;
 
-  // TODO: remove isDeprecatedEdition condition in V2.0
-  if (isDeprecatedEdition) {
-    const chatModelCards = modelProviderSelectors.getModelCardsById(ModelProvider.Azure)(
-      useUserStore.getState(),
-    );
-
-    const deploymentName = chatModelCards.find((i) => i.id === model)?.deploymentName;
-    if (deploymentName) deploymentId = deploymentName;
-  } else {
-    // find the model by id
-    const modelItem = getAiInfraStoreState().enabledAiModels?.find(
-      (i) => i.id === model && i.providerId === provider,
-    );
+  // find the model by id
+  const modelItem = getAiInfraStoreState().enabledAiModels?.find(
+    (i) => i.id === model && i.providerId === provider,
+  );
 
-    if (modelItem && modelItem.config?.deploymentName) {
-      deploymentId = modelItem.config?.deploymentName;
-    }
+  if (modelItem && modelItem.config?.deploymentName) {
+    deploymentId = modelItem.config?.deploymentName;
   }
 
   return deploymentId;
 };
 
 export const isEnableFetchOnClient = (provider: string) => {
-  // TODO: remove this condition in V2.0
-  if (isDeprecatedEdition) {
-    return modelConfigSelectors.isProviderFetchOnClient(provider)(useUserStore.getState());
-  } else {
-    return aiProviderSelectors.isProviderFetchOnClient(provider)(getAiInfraStoreState());
-  }
+  return aiProviderSelectors.isProviderFetchOnClient(provider)(getAiInfraStoreState());
 };
 
 export const resolveRuntimeProvider = (provider: string) => {
-  if (isDeprecatedEdition) return provider;
-
   const isBuiltin = Object.values(ModelProvider).includes(provider as any);
   if (isBuiltin) return provider;
 

package/src/services/models.ts

@@ -1,8 +1,5 @@
-import { isDeprecatedEdition } from '@/const/version';
 import { createHeaderWithAuth } from '@/services/_auth';
 import { aiProviderSelectors, getAiInfraStoreState } from '@/store/aiInfra';
-import { useUserStore } from '@/store/user';
-import { modelConfigSelectors } from '@/store/user/selectors';
 import { ChatModelCard } from '@/types/llm';
 import { getMessageError } from '@/utils/fetch';
 
@@ -10,14 +7,8 @@ import { API_ENDPOINTS } from './_url';
 import { initializeWithClientStore } from './chat/clientModelRuntime';
 import { resolveRuntimeProvider } from './chat/helper';
 
-const isEnableFetchOnClient = (provider: string) => {
-  // TODO: remove this condition in V2.0
-  if (isDeprecatedEdition) {
-    return modelConfigSelectors.isProviderFetchOnClient(provider)(useUserStore.getState());
-  } else {
-    return aiProviderSelectors.isProviderFetchOnClient(provider)(getAiInfraStoreState());
-  }
-};
+const isEnableFetchOnClient = (provider: string) =>
+  aiProviderSelectors.isProviderFetchOnClient(provider)(getAiInfraStoreState());
 
 // 进度信息接口
 export interface ModelProgressInfo {

package/src/store/chat/slices/aiChat/actions/generateAIChat.ts

@@ -11,8 +11,10 @@ import {
   TraceNameMap,
   UIChatMessage,
 } from '@lobechat/types';
+import isEqual from 'fast-deep-equal';
 import { t } from 'i18next';
 import { produce } from 'immer';
+import { throttle } from 'lodash-es';
 import { StateCreator } from 'zustand/vanilla';
 
 import { chatService } from '@/services/chat';
@@ -442,6 +444,19 @@ export const generateAIChat: StateCreator<
     // to upload image
     const uploadTasks: Map<string, Promise<{ id?: string; url?: string }>> = new Map();
 
+    // Throttle tool_calls updates to prevent excessive re-renders (max once per 300ms)
+    const throttledUpdateToolCalls = throttle(
+      (toolCalls: any[]) => {
+        internal_dispatchMessage({
+          id: messageId,
+          type: 'updateMessage',
+          value: { tools: get().internal_transformToolCalls(toolCalls) },
+        });
+      },
+      300,
+      { leading: true, trailing: true },
+    );
+
     const historySummary = chatConfig.enableCompressHistory
       ? topicSelectors.currentActiveTopicSummary(get())
       : undefined;
@@ -495,6 +510,8 @@ export const generateAIChat: StateCreator<
 
         let parsedToolCalls = toolCalls;
         if (parsedToolCalls && parsedToolCalls.length > 0) {
+          // Flush any pending throttled updates before finalizing
+          throttledUpdateToolCalls.flush();
           internal_toggleToolCallingStreaming(messageId, undefined);
           parsedToolCalls = parsedToolCalls.map((item) => ({
             ...item,
@@ -506,6 +523,8 @@ export const generateAIChat: StateCreator<
           isFunctionCall = true;
         }
 
+        internal_toggleChatReasoning(false, messageId, n('toggleChatReasoning/false') as string);
+
         // update the content after fetch result
         await internal_updateMessageContent(messageId, content, {
           toolCalls: parsedToolCalls,
@@ -615,12 +634,17 @@ export const generateAIChat: StateCreator<
           // is this message is just a tool call
           case 'tool_calls': {
             internal_toggleToolCallingStreaming(messageId, chunk.isAnimationActives);
-            internal_dispatchMessage({
-              id: messageId,
-              type: 'updateMessage',
-              value: { tools: get().internal_transformToolCalls(chunk.tool_calls) },
-            });
+            throttledUpdateToolCalls(chunk.tool_calls);
             isFunctionCall = true;
+            const isInChatReasoning =
+              messageStateSelectors.isMessageInChatReasoning(messageId)(get());
+            if (isInChatReasoning) {
+              internal_toggleChatReasoning(
+                false,
+                messageId,
+                n('toggleChatReasoning/false') as string,
+              );
+            }
           }
         }
       },
@@ -690,16 +714,19 @@ export const generateAIChat: StateCreator<
     return get().internal_toggleLoadingArrays('reasoningLoadingIds', loading, id, action);
   },
   internal_toggleToolCallingStreaming: (id, streaming) => {
+    const previous = get().toolCallingStreamIds;
+    const next = produce(previous, (draft) => {
+      if (!!streaming) {
+        draft[id] = streaming;
+      } else {
+        delete draft[id];
+      }
+    });
+
+    if (isEqual(previous, next)) return;
+
     set(
-      {
-        toolCallingStreamIds: produce(get().toolCallingStreamIds, (draft) => {
-          if (!!streaming) {
-            draft[id] = streaming;
-          } else {
-            delete draft[id];
-          }
-        }),
-      },
+      { toolCallingStreamIds: next },
 
       false,
       `toggleToolCallingStreaming/${!!streaming ? 'start' : 'end'}`,

package/src/store/global/store.ts

@@ -4,25 +4,19 @@ import { createWithEqualityFn } from 'zustand/traditional';
 import { StateCreator } from 'zustand/vanilla';
 
 import { createDevtools } from '../middleware/createDevtools';
-import { type GlobalClientDBAction, clientDBSlice } from './actions/clientDb';
 import { type GlobalGeneralAction, generalActionSlice } from './actions/general';
 import { type GlobalWorkspacePaneAction, globalWorkspaceSlice } from './actions/workspacePane';
 import { type GlobalState, initialState } from './initialState';
 
 //  ===============  聚合 createStoreFn ============ //
 
-export interface GlobalStore
-  extends GlobalState,
-    GlobalWorkspacePaneAction,
-    GlobalClientDBAction,
-    GlobalGeneralAction {
+export interface GlobalStore extends GlobalState, GlobalWorkspacePaneAction, GlobalGeneralAction {
   /* empty */
 }
 
 const createStore: StateCreator<GlobalStore, [['zustand/devtools', never]]> = (...parameters) => ({
   ...initialState,
   ...globalWorkspaceSlice(...parameters),
-  ...clientDBSlice(...parameters),
   ...generalActionSlice(...parameters),
 });
 

package/src/store/user/initialState.ts

@@ -1,19 +1,13 @@
 import { UserAuthState, initialAuthState } from './slices/auth/initialState';
 import { CommonState, initialCommonState } from './slices/common/initialState';
-import { ModelListState, initialModelListState } from './slices/modelList/initialState';
 import { UserPreferenceState, initialPreferenceState } from './slices/preference/initialState';
 import { UserSettingsState, initialSettingsState } from './slices/settings/initialState';
 
-export type UserState = UserSettingsState &
-  UserPreferenceState &
-  UserAuthState &
-  ModelListState &
-  CommonState;
+export type UserState = UserSettingsState & UserPreferenceState & UserAuthState & CommonState;
 
 export const initialState: UserState = {
   ...initialSettingsState,
   ...initialPreferenceState,
   ...initialAuthState,
   ...initialCommonState,
-  ...initialModelListState,
 };

package/src/store/user/selectors.ts

@@ -1,11 +1,7 @@
 export { authSelectors, userProfileSelectors } from './slices/auth/selectors';
-export {
-  keyVaultsConfigSelectors,
-  modelConfigSelectors,
-  modelProviderSelectors,
-} from './slices/modelList/selectors';
 export { preferenceSelectors } from './slices/preference/selectors';
 export {
+  keyVaultsConfigSelectors,
   settingsSelectors,
   systemAgentSelectors,
   userGeneralSettingsSelectors,

package/src/store/user/slices/common/action.ts

@@ -24,6 +24,7 @@ const GET_USER_STATE_KEY = 'initUserState';
 export interface CommonAction {
   refreshUserState: () => Promise<void>;
   updateAvatar: (avatar: string) => Promise<void>;
+  updateKeyVaultConfig: (provider: string, config: any) => Promise<void>;
   useCheckTrace: (shouldFetch: boolean) => SWRResponse;
   useInitUserState: (
     isLogin: boolean | undefined,
@@ -50,6 +51,10 @@ export const createCommonSlice: StateCreator<
     await get().refreshUserState();
   },
 
+  updateKeyVaultConfig: async (provider, config) => {
+    await get().setSettings({ keyVaults: { [provider]: config } });
+  },
+
   useCheckTrace: (shouldFetch) =>
     useSWR<boolean>(
       shouldFetch ? 'checkTrace' : null,
@@ -65,7 +70,6 @@ export const createCommonSlice: StateCreator<
         revalidateOnFocus: false,
       },
     ),
-
   useInitUserState: (isLogin, serverConfig, options) =>
     useOnlyFetchOnceSWR<UserInitializationState>(
       !!isLogin ? GET_USER_STATE_KEY : null,
@@ -79,7 +83,6 @@ export const createCommonSlice: StateCreator<
             const serverSettings: PartialDeep<UserSettings> = {
               defaultAgent: serverConfig.defaultAgent,
               image: serverConfig.image,
-              languageModel: serverConfig.languageModel,
               systemAgent: serverConfig.systemAgent,
             };
 
@@ -112,7 +115,6 @@ export const createCommonSlice: StateCreator<
                 isUserHasConversation: data.hasConversation,
                 isUserStateInit: true,
                 preference,
-                serverLanguageModel: serverConfig.languageModel,
                 settings: data.settings || {},
                 subscriptionPlan: data.subscriptionPlan,
                 user,
@@ -128,7 +130,6 @@ export const createCommonSlice: StateCreator<
               lastName: data.lastName,
               username: data.username,
             });
-            get().refreshDefaultModelProviderList({ trigger: 'fetchUserState' });
           }
         },
       },

package/src/store/user/slices/settings/selectors/index.ts

@@ -1,3 +1,4 @@
 export { userGeneralSettingsSelectors } from './general';
+export { keyVaultsConfigSelectors } from './keyVaults';
 export { settingsSelectors } from './settings';
 export { systemAgentSelectors } from './systemAgent';

package/src/store/user/slices/settings/selectors/keyVaults.ts

@@ -0,0 +1,21 @@
+import { UserStore } from '@/store/user';
+import { UserKeyVaults } from '@/types/user/settings';
+
+import { currentSettings } from './settings';
+
+export const keyVaultsSettings = (s: UserStore): UserKeyVaults =>
+  currentSettings(s).keyVaults || {};
+
+const getVaultByProvider = (provider: string) => (s: UserStore) =>
+  // @ts-ignore
+  (keyVaultsSettings(s)[provider] || {}) as any;
+
+const password = (s: UserStore) => keyVaultsSettings(s).password || '';
+
+export const keyVaultsConfigSelectors = {
+  getVaultByProvider,
+
+  keyVaultsSettings,
+
+  password,
+};

package/src/store/user/store.ts

@@ -7,7 +7,6 @@ import { createDevtools } from '../middleware/createDevtools';
 import { type UserState, initialState } from './initialState';
 import { type UserAuthAction, createAuthSlice } from './slices/auth/action';
 import { type CommonAction, createCommonSlice } from './slices/common/action';
-import { type ModelListAction, createModelListSlice } from './slices/modelList/action';
 import { type PreferenceAction, createPreferenceSlice } from './slices/preference/action';
 import { type UserSettingsAction, createSettingsSlice } from './slices/settings/action';
 
@@ -16,7 +15,6 @@ import { type UserSettingsAction, createSettingsSlice } from './slices/settings/
 export type UserStore = UserState &
   UserSettingsAction &
   PreferenceAction &
-  ModelListAction &
   UserAuthAction &
   CommonAction;
 
@@ -26,7 +24,6 @@ const createStore: StateCreator<UserStore, [['zustand/devtools', never]]> = (...
   ...createPreferenceSlice(...parameters),
   ...createAuthSlice(...parameters),
   ...createCommonSlice(...parameters),
-  ...createModelListSlice(...parameters),
 });
 
 //  ===============  实装 useStore ============ //

package/src/tools/web-browsing/Render/Search/ConfigForm/Form.tsx

@@ -23,7 +23,7 @@ const Form = memo<ProviderApiKeyFormProps>(({ provider, id }) => {
   const [apiKey, baseURL, setConfig] = useUserStore((s) => [
     keyVaultsConfigSelectors.getVaultByProvider(provider as any)(s)?.apiKey,
     keyVaultsConfigSelectors.getVaultByProvider(provider as any)(s)?.baseURL,
-    s.updateKeyVaultSettings,
+    s.updateKeyVaultConfig,
   ]);
 
   const [showKey, setShow] = useState(false);

package/packages/utils/src/_deprecated/__snapshots__/parseModels.test.ts.snap

@@ -1,104 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`parseModelString > custom deletion, addition, and renaming of models 1`] = `
-{
-  "add": [
-    {
-      "displayName": undefined,
-      "id": "llama",
-    },
-    {
-      "displayName": undefined,
-      "id": "claude-2",
-    },
-    {
-      "displayName": "gpt-4-32k",
-      "id": "gpt-4-1106-preview",
-    },
-  ],
-  "removeAll": true,
-  "removed": [
-    "all",
-    "gpt-3.5-turbo",
-  ],
-}
-`;
-
-exports[`parseModelString > duplicate naming model 1`] = `
-{
-  "add": [
-    {
-      "displayName": "gpt-4-32k",
-      "id": "gpt-4-1106-preview",
-    },
-  ],
-  "removeAll": false,
-  "removed": [],
-}
-`;
-
-exports[`parseModelString > empty string model 1`] = `
-{
-  "add": [
-    {
-      "displayName": "gpt-4-turbo",
-      "id": "gpt-4-1106-preview",
-    },
-    {
-      "displayName": undefined,
-      "id": "claude-2",
-    },
-  ],
-  "removeAll": false,
-  "removed": [],
-}
-`;
-
-exports[`parseModelString > only add the model 1`] = `
-{
-  "add": [
-    {
-      "displayName": undefined,
-      "id": "model1",
-    },
-    {
-      "displayName": undefined,
-      "id": "model2",
-    },
-    {
-      "displayName": undefined,
-      "id": "model3",
-    },
-    {
-      "displayName": undefined,
-      "id": "model4",
-    },
-  ],
-  "removeAll": false,
-  "removed": [],
-}
-`;
-
-exports[`transformToChatModelCards > should have file with builtin models like gpt-4-0125-preview 1`] = `
-[
-  {
-    "contextWindowTokens": 128000,
-    "description": "最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。",
-    "displayName": "ChatGPT-4",
-    "enabled": true,
-    "files": true,
-    "functionCall": true,
-    "id": "gpt-4-0125-preview",
-  },
-  {
-    "contextWindowTokens": 128000,
-    "description": "最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。",
-    "displayName": "ChatGPT-4 Vision",
-    "enabled": true,
-    "files": true,
-    "functionCall": true,
-    "id": "gpt-4-turbo-2024-04-09",
-    "vision": true,
-  },
-]
-`;