@lobehub/chat 0.147.21 → 0.148.0

package/src/store/chat/slices/message/reducer.ts

@@ -1,6 +1,7 @@
 import isEqual from 'fast-deep-equal';
 import { produce } from 'immer';
 
+import { CreateMessageParams } from '@/services/message';
 import { ChatMessage } from '@/types/message';
 import { merge } from '@/utils/merge';
 
@@ -10,6 +11,15 @@ interface UpdateMessage {
   type: 'updateMessage';
   value: ChatMessage[keyof ChatMessage];
 }
+interface CreateMessage {
+  id: string;
+  type: 'createMessage';
+  value: CreateMessageParams;
+}
+interface DeleteMessage {
+  id: string;
+  type: 'deleteMessage';
+}
 
 interface UpdatePluginState {
   id: string;
@@ -24,7 +34,12 @@ interface UpdateMessageExtra {
   value: any;
 }
 
-export type MessageDispatch = UpdateMessage | UpdatePluginState | UpdateMessageExtra;
+export type MessageDispatch =
+  | CreateMessage
+  | UpdateMessage
+  | UpdatePluginState
+  | UpdateMessageExtra
+  | DeleteMessage;
 
 export const messagesReducer = (state: ChatMessage[], payload: MessageDispatch): ChatMessage[] => {
   switch (payload.type) {
@@ -76,6 +91,22 @@ export const messagesReducer = (state: ChatMessage[], payload: MessageDispatch):
       });
     }
 
+    case 'createMessage': {
+      return produce(state, (draftState) => {
+        const { value, id } = payload;
+
+        draftState.push({ ...value, createdAt: Date.now(), id, meta: {}, updatedAt: Date.now() });
+      });
+    }
+    case 'deleteMessage': {
+      return produce(state, (draft) => {
+        const { id } = payload;
+
+        const index = draft.findIndex((m) => m.id === id);
+
+        if (index >= 0) draft.splice(index, 1);
+      });
+    }
     default: {
       throw new Error('暂未实现的 type，请检查 reducer');
     }

package/src/store/chat/slices/topic/action.test.ts

@@ -149,7 +149,9 @@ describe('topic action', () => {
       });
 
       // Check if mutate has been called with the active session ID
-      expect(mutate).toHaveBeenCalledWith(['SWR_USE_FETCH_TOPIC', activeId]);
+      expect(mutate).toHaveBeenCalledWith(['SWR_USE_FETCH_TOPIC', activeId], undefined, {
+        populateCache: false,
+      });
     });
 
     it('should handle errors during refreshing topics', async () => {
@@ -314,7 +316,7 @@ describe('topic action', () => {
       const activeId = 'test-session-id';
 
       await act(async () => {
-        useChatStore.setState({ activeId });
+        useChatStore.setState({ activeId, activeTopicId: topicId });
       });
 
       const refreshTopicSpy = vi.spyOn(result.current, 'refreshTopic');
@@ -329,6 +331,27 @@ describe('topic action', () => {
       expect(refreshTopicSpy).toHaveBeenCalled();
       expect(switchTopicSpy).toHaveBeenCalled();
     });
+    it('should remove a specific topic and its messages, then not refresh the topic list', async () => {
+      const topicId = 'topic-1';
+      const { result } = renderHook(() => useChatStore());
+      const activeId = 'test-session-id';
+
+      await act(async () => {
+        useChatStore.setState({ activeId });
+      });
+
+      const refreshTopicSpy = vi.spyOn(result.current, 'refreshTopic');
+      const switchTopicSpy = vi.spyOn(result.current, 'switchTopic');
+
+      await act(async () => {
+        await result.current.removeTopic(topicId);
+      });
+
+      expect(messageService.removeMessages).toHaveBeenCalledWith(activeId, topicId);
+      expect(topicService.removeTopic).toHaveBeenCalledWith(topicId);
+      expect(refreshTopicSpy).toHaveBeenCalled();
+      expect(switchTopicSpy).not.toHaveBeenCalled();
+    });
   });
   describe('removeUnstarredTopic', () => {
     it('should remove unstarred topics and refresh the topic list', async () => {

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

@@ -9,11 +9,11 @@ import { StateCreator } from 'zustand/vanilla';
 import { chainSummaryTitle } from '@/chains/summaryTitle';
 import { LOADING_FLAT } from '@/const/message';
 import { TraceNameMap } from '@/const/trace';
-import { useClientDataSWR } from '@/libs/swr';
+import { SWRefreshMethod, useClientDataSWR } from '@/libs/swr';
 import { chatService } from '@/services/chat';
 import { messageService } from '@/services/message';
 import { topicService } from '@/services/topic';
-import { ChatStore } from '@/store/chat';
+import type { ChatStore } from '@/store/chat';
 import { ChatMessage } from '@/types/message';
 import { ChatTopic } from '@/types/topic';
 import { setNamespace } from '@/utils/storeDebug';
@@ -29,7 +29,7 @@ const SWR_USE_SEARCH_TOPIC = 'SWR_USE_SEARCH_TOPIC';
 export interface ChatTopicAction {
   favoriteTopic: (id: string, favState: boolean) => Promise<void>;
   openNewTopicOrSaveTopic: () => Promise<void>;
-  refreshTopic: () => Promise<void>;
+  refreshTopic: SWRefreshMethod<ChatTopic[]>;
   removeAllTopics: () => Promise<void>;
   removeSessionTopics: () => Promise<void>;
   removeTopic: (id: string) => Promise<void>;
@@ -78,6 +78,17 @@ export const chatTopic: StateCreator<
       messages: messages.map((m) => m.id),
     });
     await refreshTopic();
+    // TODO: 优化为乐观更新
+    // const params: CreateTopicParams = {
+    //   sessionId: activeId,
+    //   title: t('topic.defaultTitle', { ns: 'chat' }),
+    //   messages: messages.map((m) => m.id),
+    // };
+
+    // const topicId = await refreshTopic({
+    //   action: async () => topicService.createTopic(params),
+    //   optimisticData: (data) => topicReducer(data, { type: 'addTopic', value: params }),
+    // });
 
     // 2. auto summary topic Title
     // we don't need to wait for summary, just let it run async
@@ -189,9 +200,10 @@ export const chatTopic: StateCreator<
     await refreshTopic();
   },
   removeTopic: async (id) => {
-    const { activeId, switchTopic, refreshTopic } = get();
+    const { activeId, activeTopicId, switchTopic, refreshTopic } = get();
 
     // remove messages in the topic
+    // TODO: Need to remove because server service don't need to call it
     await messageService.removeMessages(activeId, id);
 
     // remove topic
@@ -199,7 +211,7 @@ export const chatTopic: StateCreator<
     await refreshTopic();
 
     // switch bach to default topic
-    switchTopic();
+    if (activeTopicId === id) switchTopic();
   },
   removeUnstarredTopic: async () => {
     const { refreshTopic, switchTopic } = get();
@@ -226,7 +238,12 @@ export const chatTopic: StateCreator<
   updateTopicLoading: (id) => {
     set({ topicLoadingId: id }, false, n('updateTopicLoading'));
   },
-  refreshTopic: async () => {
-    await mutate([SWR_USE_FETCH_TOPIC, get().activeId]);
+  // TODO: I don't know why this ts error, so have to ignore it
+  // @ts-ignore
+  refreshTopic: async (params) => {
+    return mutate([SWR_USE_FETCH_TOPIC, get().activeId], params?.action, {
+      optimisticData: params?.optimisticData,
+      populateCache: false,
+    });
   },
 });

package/src/store/chat/slices/topic/reducer.test.ts

@@ -0,0 +1,141 @@
+import { produce } from 'immer';
+import { expect } from 'vitest';
+
+import { ChatTopic } from '@/types/topic';
+
+import { ChatTopicDispatch, topicReducer } from './reducer';
+
+describe('topicReducer', () => {
+  let state: ChatTopic[];
+
+  beforeEach(() => {
+    state = [];
+  });
+
+  describe('addTopic', () => {
+    it('should add a new ChatTopic object to state', () => {
+      const payload: ChatTopicDispatch = {
+        type: 'addTopic',
+        value: {
+          title: 'Test Topic',
+          sessionId: '',
+        },
+      };
+
+      const newState = topicReducer(state, payload);
+
+      expect(newState[0].id).toBeDefined();
+    });
+  });
+
+  describe('updateTopic', () => {
+    it('should update the ChatTopic object in state', () => {
+      const topic: ChatTopic = {
+        id: '1',
+        title: 'Test Topic',
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      };
+
+      state.push(topic);
+
+      const payload: ChatTopicDispatch = {
+        type: 'updateTopic',
+        id: '1',
+        key: 'title',
+        value: 'Updated Topic',
+      };
+
+      const newState = topicReducer(state, payload);
+
+      expect(newState[0].title).toBe('Updated Topic');
+    });
+
+    it('should update the ChatTopic object with correct properties', () => {
+      const topic: ChatTopic = {
+        id: '1',
+        title: 'Test Topic',
+        createdAt: Date.now() - 1,
+        updatedAt: Date.now() - 1, // 设定比当前时间前面一点
+      };
+
+      state.push(topic);
+
+      const payload: ChatTopicDispatch = {
+        type: 'updateTopic',
+        id: '1',
+        key: 'title',
+        value: 'Updated Topic',
+      };
+
+      const newState = topicReducer(state, payload);
+
+      expect(newState[0].updatedAt).toBeGreaterThan(topic.updatedAt);
+    });
+  });
+
+  describe('deleteTopic', () => {
+    it('should delete the specified ChatTopic object from state', () => {
+      const topic: ChatTopic = {
+        id: '1',
+        title: 'Test Topic',
+        createdAt: Date.now(),
+        updatedAt: Date.now(),
+      };
+
+      state.push(topic);
+
+      const payload: ChatTopicDispatch = {
+        type: 'deleteTopic',
+        id: '1',
+      };
+
+      const newState = topicReducer(state, payload);
+
+      expect(newState).toEqual([]);
+    });
+  });
+
+  describe('default', () => {
+    it('should return the original state object', () => {
+      const payload = {
+        type: 'unknown',
+      } as unknown as ChatTopicDispatch;
+
+      const newState = topicReducer(state, payload);
+
+      expect(newState).toBe(state);
+    });
+  });
+
+  describe('produce', () => {
+    it('should generate immutable state object', () => {
+      const payload: ChatTopicDispatch = {
+        type: 'addTopic',
+        value: {
+          title: 'Test Topic',
+          sessionId: '1',
+        },
+      };
+
+      const newState = topicReducer(state, payload);
+
+      expect(newState).not.toBe(state);
+    });
+
+    it('should not modify the original state object', () => {
+      const payload: ChatTopicDispatch = {
+        type: 'addTopic',
+        value: {
+          title: 'Test Topic',
+
+          sessionId: '123',
+        },
+      };
+
+      const newState = topicReducer(state, payload);
+
+      expect(state).toEqual([]);
+    });
+  });
+});

package/src/store/chat/slices/topic/reducer.ts

@@ -0,0 +1,67 @@
+import { produce } from 'immer';
+
+import { CreateTopicParams } from '@/services/topic/type';
+import { ChatTopic } from '@/types/topic';
+
+interface AddChatTopicAction {
+  type: 'addTopic';
+  value: CreateTopicParams;
+}
+
+interface UpdateChatTopicAction {
+  id: string;
+  key: keyof ChatTopic;
+  type: 'updateTopic';
+  value: any;
+}
+
+interface DeleteChatTopicAction {
+  id: string;
+  type: 'deleteTopic';
+}
+
+export type ChatTopicDispatch = AddChatTopicAction | UpdateChatTopicAction | DeleteChatTopicAction;
+
+export const topicReducer = (state: ChatTopic[] = [], payload: ChatTopicDispatch): ChatTopic[] => {
+  switch (payload.type) {
+    case 'addTopic': {
+      return produce(state, (draftState) => {
+        draftState.unshift({
+          ...payload.value,
+          createdAt: Date.now(),
+          id: Date.now().toString(),
+          sessionId: payload.value.sessionId ? payload.value.sessionId : undefined,
+          updatedAt: Date.now(),
+        });
+      });
+    }
+
+    case 'updateTopic': {
+      return produce(state, (draftState) => {
+        const { key, value, id } = payload;
+        const topicIndex = draftState.findIndex((topic) => topic.id === id);
+
+        if (topicIndex !== -1) {
+          const updatedTopic = { ...draftState[topicIndex] };
+          // @ts-ignore
+          updatedTopic[key] = value;
+          draftState[topicIndex] = updatedTopic;
+          updatedTopic.updatedAt = Date.now();
+        }
+      });
+    }
+
+    case 'deleteTopic': {
+      return produce(state, (draftState) => {
+        const topicIndex = draftState.findIndex((topic) => topic.id === payload.id);
+        if (topicIndex !== -1) {
+          draftState.splice(topicIndex, 1);
+        }
+      });
+    }
+
+    default: {
+      return state;
+    }
+  }
+};

package/src/store/global/slices/settings/selectors/modelConfig.ts

@@ -6,6 +6,16 @@ import { currentLLMSettings, getProviderConfigById } from './settings';
 const isProviderEnabled = (provider: GlobalLLMProviderKey) => (s: GlobalStore) =>
   getProviderConfigById(provider)(s)?.enabled || false;
 
+const isProviderEndpointNotEmpty = (provider: GlobalLLMProviderKey | string) => (s: GlobalStore) =>
+  !!getProviderConfigById(provider)(s)?.endpoint;
+
+const isProviderFetchOnClient = (provider: GlobalLLMProviderKey | string) => (s: GlobalStore) => {
+  const config = getProviderConfigById(provider)(s);
+  if (typeof config?.fetchOnClient !== 'undefined') return config?.fetchOnClient;
+
+  return isProviderEndpointNotEmpty(provider)(s);
+};
+
 const getCustomModelCard =
   ({ id, provider }: { id?: string; provider?: string }) =>
   (s: GlobalStore) => {
@@ -46,6 +56,9 @@ export const modelConfigSelectors = {
   isAutoFetchModelsEnabled,
   isAzureEnabled,
   isProviderEnabled,
+  isProviderEndpointNotEmpty,
+  isProviderFetchOnClient,
+
   ollamaConfig,
 
   openAIConfig,

package/src/store/session/slices/session/action.ts

@@ -6,7 +6,7 @@ import { StateCreator } from 'zustand/vanilla';
 
 import { message } from '@/components/AntdStaticMethods';
 import { INBOX_SESSION_ID } from '@/const/session';
-import { useClientDataSWR } from '@/libs/swr';
+import { SWRRefreshParams, useClientDataSWR } from '@/libs/swr';
 import { sessionService } from '@/services/session';
 import { useGlobalStore } from '@/store/global';
 import { settingsSelectors } from '@/store/global/selectors';
@@ -51,10 +51,7 @@ export interface SessionAction {
   /**
    * re-fetch the data
    */
-  refreshSessions: (params?: {
-    action: () => Promise<void>;
-    optimisticData?: (data: ChatSessionList) => ChatSessionList;
-  }) => Promise<void>;
+  refreshSessions: (params?: SWRRefreshParams<ChatSessionList>) => Promise<void>;
 
   /**
    * remove session
@@ -145,6 +142,8 @@ export const createSessionSlice: StateCreator<
       },
       // 乐观更新
       optimisticData: produce((draft) => {
+        if (!draft) return;
+
         const session = draft.all.find((i) => i.id === sessionId);
         if (!session) return;
 

package/src/types/settings/modelProvider.ts

@@ -16,6 +16,10 @@ export interface GeneralModelProviderConfig {
    */
   enabledModels?: string[] | null;
   endpoint?: string;
+  /**
+   * whether fetch on client
+   */
+  fetchOnClient?: boolean;
   /**
    * the latest fetch model list time
    */

package/vercel.json

@@ -1,3 +1,3 @@
 {
-  "installCommand": "npx bun@1.1.3 install"
+  "installCommand": "bun install"
 }