@lobehub/chat 0.105.2 → 0.107.0

package/src/store/session/initialState.ts

@@ -1,11 +1,30 @@
-import { ChatState, initialChatState } from './slices/chat/initialState';
-import { SessionState, initialSessionState } from './slices/session/initialState';
+import { AppRouterInstance } from 'next/dist/shared/lib/app-router-context.shared-runtime';
 
-export type SessionStoreState = SessionState & ChatState;
+import { LobeAgentSession } from '@/types/session';
+
+export type SessionStoreState = SessionState;
+
+export interface SessionState {
+  /**
+   * @title 当前活动的会话
+   * @description 当前正在编辑或查看的会话
+   */
+  activeId: string;
+  fetchSessionsLoading: boolean;
+  isMobile?: boolean;
+  isSearching: boolean;
+  router?: AppRouterInstance;
+  searchKeywords: string;
+  searchSessions: LobeAgentSession[];
+  sessions: LobeAgentSession[];
+}
 
 export const initialState: SessionStoreState = {
-  ...initialSessionState,
-  ...initialChatState,
+  activeId: 'inbox',
+  fetchSessionsLoading: true,
+  isMobile: false,
+  isSearching: false,
+  searchKeywords: '',
+  searchSessions: [],
+  sessions: [],
 };
-
-export { initLobeSession } from './slices/session/initialState';

package/src/store/session/selectors.ts

@@ -1,3 +1,2 @@
 export { agentSelectors } from './slices/agent/selectors';
-export { chatSelectors, topicSelectors } from './slices/chat/selectors';
-export { sessionSelectors } from './slices/session/selectors';
+export { sessionExportSelectors,sessionSelectors } from './slices/session/selectors';

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

@@ -1,9 +1,10 @@
 import { produce } from 'immer';
 import { StateCreator } from 'zustand/vanilla';
 
+import { sessionService } from '@/services/session';
 import { useGlobalStore } from '@/store/global';
+import { LobeAgentConfig } from '@/types/agent';
 import { MetaData } from '@/types/meta';
-import { LobeAgentConfig } from '@/types/session';
 
 import { SessionStore } from '../../store';
 import { sessionSelectors } from '../session/selectors';
@@ -13,10 +14,6 @@ import { sessionSelectors } from '../session/selectors';
  */
 export interface AgentAction {
   removePlugin: (id: string) => void;
-  /**
-   * 更新代理配置
-   * @param config - 部分 LobeAgentConfig 的配置
-   */
   updateAgentConfig: (config: Partial<LobeAgentConfig>) => void;
   updateAgentMeta: (meta: Partial<MetaData>) => void;
 }
@@ -27,51 +24,45 @@ export const createAgentSlice: StateCreator<
   [],
   AgentAction
 > = (set, get) => ({
-  removePlugin: (id) => {
-    const { activeId } = get();
+  removePlugin: async (id) => {
     const session = sessionSelectors.currentSession(get());
-    if (!activeId || !session) return;
+    if (!session) return;
+
+    const { activeId, refreshSessions } = get();
 
     const config = produce(session.config, (draft) => {
       draft.plugins = draft.plugins?.filter((i) => i !== id) || [];
     });
 
-    get().dispatchSession({ config, id: activeId, type: 'updateSessionConfig' });
+    await sessionService.updateSessionConfig(activeId, config);
+    await refreshSessions();
   },
 
-  updateAgentConfig: (config) => {
-    const { activeId, dispatchSession } = get();
-    const session = sessionSelectors.currentSession(get());
-    if (!activeId || !session) return;
-
+  updateAgentConfig: async (config) => {
     // if is the inbox session, update the global config
-    if (sessionSelectors.isInboxSession(get())) {
+    const isInbox = sessionSelectors.isInboxSession(get());
+    if (isInbox) {
       useGlobalStore.getState().updateDefaultAgent({ config });
-      // NOTE: DON'T ADD RETURN HERE.
-      // we need to use `dispatchSession` below to update inbox config to trigger the inbox config rerender
+    } else {
+      const session = sessionSelectors.currentSession(get());
+      if (!session) return;
+
+      const { activeId } = get();
+
+      await sessionService.updateSessionConfig(activeId, config);
     }
 
-    // Although we use global store to store the default agent config,
-    // due to the `currentAgentConfig` selector use `useGlobalStore.getState()`
-    // to get the default agent config which not rerender on global store update
-    // we need to update the session config here.
-    dispatchSession({ config, id: activeId, type: 'updateSessionConfig' });
+    // trigger store rerender
+    await get().refreshSessions();
   },
 
-  updateAgentMeta: (meta) => {
-    const { activeId } = get();
+  updateAgentMeta: async (meta) => {
     const session = sessionSelectors.currentSession(get());
-    if (!activeId || !session) return;
+    if (!session) return;
 
-    for (const [key, value] of Object.entries(meta)) {
-      if (value !== undefined) {
-        get().dispatchSession({
-          id: activeId,
-          key: key as keyof MetaData,
-          type: 'updateSessionMeta',
-          value,
-        });
-      }
-    }
+    const { activeId, refreshSessions } = get();
+
+    await sessionService.updateSessionMeta(activeId, meta);
+    await refreshSessions();
   },
 });

package/src/store/session/slices/agent/selectors.ts

@@ -1,25 +1,18 @@
 import { t } from 'i18next';
 
 import { DEFAULT_OPENAI_MODEL_LIST, VISION_MODEL_WHITE_LIST } from '@/const/llm';
-import { DEFAULT_AVATAR, DEFAULT_BACKGROUND_COLOR } from '@/const/meta';
+import { DEFAULT_AVATAR, DEFAULT_BACKGROUND_COLOR, DEFAULT_INBOX_AVATAR } from '@/const/meta';
 import { DEFAULT_AGENT_CONFIG, DEFAUTT_AGENT_TTS_CONFIG } from '@/const/settings';
 import { settingsSelectors, useGlobalStore } from '@/store/global';
 import { SessionStore } from '@/store/session';
+import { LobeAgentTTSConfig } from '@/types/agent';
 import { LanguageModel } from '@/types/llm';
 import { MetaData } from '@/types/meta';
-import { LobeAgentTTSConfig } from '@/types/session';
 import { merge } from '@/utils/merge';
 
 import { sessionSelectors } from '../session/selectors';
 
-const currentAgentMeta = (s: SessionStore): MetaData => {
-  const session = sessionSelectors.currentSession(s);
-
-  return { avatar: DEFAULT_AVATAR, backgroundColor: DEFAULT_BACKGROUND_COLOR, ...session?.meta };
-};
-
-const currentAgentTitle = (s: SessionStore) => currentAgentMeta(s)?.title || t('defaultSession');
-
+// ==========   Config   ============== //
 const currentAgentConfig = (s: SessionStore) => {
   const session = sessionSelectors.currentSession(s);
 
@@ -35,48 +28,47 @@ const currentAgentSystemRole = (s: SessionStore) => {
   return currentAgentConfig(s).systemRole;
 };
 
-const currentAgentDescription = (s: SessionStore) =>
-  currentAgentMeta(s)?.description || currentAgentSystemRole(s) || t('noDescription');
-
-const currentAgentBackgroundColor = (s: SessionStore) => {
-  const session = sessionSelectors.currentSession(s);
-  if (!session) return DEFAULT_BACKGROUND_COLOR;
-  return session.meta.backgroundColor || DEFAULT_BACKGROUND_COLOR;
-};
-
-const currentAgentAvatar = (s: SessionStore) => {
-  const session = sessionSelectors.currentSession(s);
-  if (!session) return DEFAULT_AVATAR;
-
-  return session.meta.avatar || DEFAULT_AVATAR;
-};
-
 const currentAgentModel = (s: SessionStore): LanguageModel | string => {
   const config = currentAgentConfig(s);
 
   return config?.model || LanguageModel.GPT3_5;
 };
 
-const modelHasVisionAbility = (s: SessionStore): boolean => {
-  const model = currentAgentModel(s);
-  return VISION_MODEL_WHITE_LIST.includes(model);
-};
-
 const currentAgentPlugins = (s: SessionStore) => {
   const config = currentAgentConfig(s);
 
   return config?.plugins || [];
 };
 
-const hasSystemRole = (s: SessionStore) => {
+const currentAgentTTS = (s: SessionStore): LobeAgentTTSConfig => {
   const config = currentAgentConfig(s);
 
-  return !!config.systemRole;
+  return config?.tts || DEFAUTT_AGENT_TTS_CONFIG;
+};
+
+// ==========   Meta   ============== //
+const currentAgentMeta = (s: SessionStore): MetaData => {
+  const isInbox = sessionSelectors.isInboxSession(s);
+
+  const defaultMeta = {
+    avatar: isInbox ? DEFAULT_INBOX_AVATAR : DEFAULT_AVATAR,
+    backgroundColor: DEFAULT_BACKGROUND_COLOR,
+    description: isInbox ? t('inbox.desc') : currentAgentSystemRole(s) || t('noDescription'),
+    title: isInbox ? t('inbox') : t('defaultSession'),
+  };
+
+  const session = sessionSelectors.currentSession(s);
+
+  return merge(defaultMeta, session?.meta);
 };
 
+const currentAgentTitle = (s: SessionStore) => currentAgentMeta(s).title;
+const currentAgentDescription = (s: SessionStore) => currentAgentMeta(s).description;
+const currentAgentAvatar = (s: SessionStore) => currentAgentMeta(s).avatar;
+const currentAgentBackgroundColor = (s: SessionStore) => currentAgentMeta(s).backgroundColor;
+
 const getAvatar = (s: MetaData) => s.avatar || DEFAULT_AVATAR;
 const getTitle = (s: MetaData) => s.title || t('defaultSession', { ns: 'common' });
-
 export const getDescription = (s: MetaData) =>
   s.description || t('noDescription', { ns: 'common' });
 
@@ -85,11 +77,14 @@ const showTokenTag = (s: SessionStore) => {
 
   return DEFAULT_OPENAI_MODEL_LIST.includes(model);
 };
-
-const currentAgentTTS = (s: SessionStore): LobeAgentTTSConfig => {
+const hasSystemRole = (s: SessionStore) => {
   const config = currentAgentConfig(s);
 
-  return config?.tts || DEFAUTT_AGENT_TTS_CONFIG;
+  return !!config.systemRole;
+};
+const modelHasVisionAbility = (s: SessionStore): boolean => {
+  const model = currentAgentModel(s);
+  return VISION_MODEL_WHITE_LIST.includes(model);
 };
 
 export const agentSelectors = {

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

@@ -1,68 +1,76 @@
-import { produce } from 'immer';
+import useSWR, { SWRResponse, mutate } from 'swr';
 import { DeepPartial } from 'utility-types';
 import { StateCreator } from 'zustand/vanilla';
 
 import { INBOX_SESSION_ID } from '@/const/session';
 import { SESSION_CHAT_URL } from '@/const/url';
+import { sessionService } from '@/services/session';
 import { settingsSelectors, useGlobalStore } from '@/store/global';
 import { SessionStore } from '@/store/session';
-import { LobeAgentSession, LobeAgentSettings, LobeSessions } from '@/types/session';
+import {
+  LobeAgentSession,
+  LobeAgentSettings,
+  LobeSessionType,
+  LobeSessions,
+} from '@/types/session';
 import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
-import { uuid } from '@/utils/uuid';
 
-import { initInbox, initLobeSession } from './initialState';
-import { SessionDispatch, sessionsReducer } from './reducers/session';
+import { initLobeSession } from './initialState';
 
 const t = setNamespace('session');
 
+const FETCH_SESSIONS_KEY = 'fetchSessions';
+
 export interface SessionAction {
-  activeSession: (sessionId: string) => void;
-  clearSessions: () => void;
   /**
-   * @title 添加会话
-   * @param session - 会话信息
-   * @returns void
+   * active the session
+   * @param sessionId
    */
-  createSession: (agent?: DeepPartial<LobeAgentSettings>) => Promise<string>;
+  activeSession: (sessionId: string) => void;
   /**
-   * 变更session
-   * @param payload - 聊天记录
+   * reset sessions to default
    */
-  dispatchSession: (payload: SessionDispatch) => void;
-  importInbox: (inbox: LobeAgentSession) => void;
+  clearSessions: () => Promise<void>;
   /**
-   * 导入会话
-   * @param sessions
+   * create a new session
+   * @param agent
+   * @returns sessionId
    */
-  importSessions: (sessions: LobeSessions) => void;
+  createSession: (agent?: DeepPartial<LobeAgentSettings>) => Promise<string>;
 
   /**
-   * 置顶会话
-   * @param sessionId
+   * Pins or unpins a session.
+   *
+   * @param {string} id - The ID of the session to pin or unpin.
+   * @param {boolean} [pinned] - Optional. If set to true, it pins the session. If set to false or omitted, it unpins the session.
+   * @returns {Promise<void>} A promise that resolves when the session is successfully pinned or unpinned.
    */
-  pinSession: (sessionId: string, pinned?: boolean) => void;
+  pinSession: (id: string, pinned?: boolean) => Promise<void>;
 
   /**
-   * 生成压缩后的消息
-   * @returns 压缩后的消息
+   * re-fetch the data
    */
-  // genShareUrl: () => string;
+  refreshSessions: () => Promise<void>;
+
   /**
-   * @title 删除会话
-   * @param index - 会话索引
-   * @returns void
+   * remove session
+   * @param id - sessionId
    */
-  removeSession: (sessionId: string) => void;
+  removeSession: (id: string) => void;
 
   switchBackToChat: () => void;
 
   /**
-   * @title 切换会话
-   * @param sessionId - 会话索引
-   * @returns void
+   * switch session url
    */
   switchSession: (sessionId?: string) => void;
+  /**
+   * A custom hook that uses SWR to fetch sessions data.
+   */
+  useFetchSessions: () => SWRResponse<any>;
+
+  useSearchSessions: (keyword?: string) => SWRResponse<any>;
 }
 
 export const createSessionSlice: StateCreator<
@@ -72,17 +80,17 @@ export const createSessionSlice: StateCreator<
   SessionAction
 > = (set, get) => ({
   activeSession: (sessionId) => {
-    set({ activeId: sessionId, activeTopicId: undefined }, false, t('activeSession'));
+    set({ activeId: sessionId }, false, t('activeSession'));
   },
 
-  clearSessions: () => {
-    set({ inbox: initInbox, sessions: {} }, false, t('clearSessions'));
+  clearSessions: async () => {
+    await sessionService.removeAllSessions();
+
+    get().refreshSessions();
   },
 
   createSession: async (agent) => {
-    const { dispatchSession, switchSession } = get();
-
-    const timestamp = Date.now();
+    const { switchSession, refreshSessions } = get();
 
     // 合并 settings 里的 defaultAgent
     const defaultAgent = merge(
@@ -90,66 +98,29 @@ export const createSessionSlice: StateCreator<
       settingsSelectors.defaultAgent(useGlobalStore.getState()),
     );
 
-    const newSession: LobeAgentSession = merge(defaultAgent, {
-      ...agent,
-      createAt: timestamp,
-      id: uuid(),
-      updateAt: timestamp,
-    });
+    const newSession: LobeAgentSession = merge(defaultAgent, agent);
 
-    dispatchSession({ session: newSession, type: 'addSession' });
+    const id = await sessionService.createNewSession(LobeSessionType.Agent, newSession);
+    await refreshSessions();
 
-    switchSession(newSession.id);
+    switchSession(id);
 
-    return newSession.id;
+    return id;
   },
 
-  dispatchSession: (payload) => {
-    const { type, ...res } = payload;
-
-    // 如果是 inbox 类型的 session
-    if ('id' in res && res.id === INBOX_SESSION_ID) {
-      const nextInbox = sessionsReducer({ inbox: get().inbox }, payload) as {
-        inbox: LobeAgentSession;
-      };
-      set({ inbox: nextInbox.inbox }, false, t(`dispatchInbox/${type}`, res));
-    } else {
-      // 常规类型的session
-      set(
-        { sessions: sessionsReducer(get().sessions, payload) },
-        false,
-        t(`dispatchSessions/${type}`, res),
-      );
-    }
-  },
-  // TODO：暂时先不实现导入 inbox 的功能
-  importInbox: () => {},
-  importSessions: (importSessions) => {
-    const { sessions } = get();
-    set(
-      {
-        sessions: produce(sessions, (draft) => {
-          for (const [id, session] of Object.entries(importSessions)) {
-            // 如果已经存在，则跳过
-            if (draft[id]) continue;
-
-            draft[id] = session;
-          }
-        }),
-      },
-      false,
-      t('importSessions', importSessions),
-    );
-  },
+  pinSession: async (sessionId, pinned) => {
+    await sessionService.updateSessionGroup(sessionId, pinned ? 'pinned' : 'default');
 
-  pinSession: (sessionId, pinned) => {
-    const nextValue = typeof pinned === 'boolean' ? pinned : !get().sessions[sessionId].pinned;
+    await get().refreshSessions();
+  },
 
-    get().dispatchSession({ id: sessionId, pinned: nextValue, type: 'toggleSessionPinned' });
+  refreshSessions: async () => {
+    await mutate(FETCH_SESSIONS_KEY);
   },
 
-  removeSession: (sessionId) => {
-    get().dispatchSession({ id: sessionId, type: 'removeSession' });
+  removeSession: async (sessionId) => {
+    await sessionService.removeSession(sessionId);
+    await get().refreshSessions();
 
     if (sessionId === get().activeId) {
       get().switchSession();
@@ -172,4 +143,26 @@ export const createSessionSlice: StateCreator<
 
     router?.push(SESSION_CHAT_URL(sessionId, isMobile));
   },
+
+  useFetchSessions: () =>
+    useSWR<LobeSessions>(FETCH_SESSIONS_KEY, sessionService.getSessions, {
+      onSuccess: (data) => {
+        set(
+          {
+            fetchSessionsLoading: false,
+            sessions: data,
+          },
+          false,
+          t('useFetchSessions/onSuccess', data),
+        );
+      },
+    }),
+
+  useSearchSessions: (keyword) =>
+    useSWR<LobeSessions>(keyword, sessionService.searchSessions, {
+      onSuccess: (data) => {
+        set({ searchSessions: data }, false, t('useSearchSessions(success)', data));
+      },
+      revalidateOnFocus: false,
+    }),
 });

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

@@ -0,0 +1,19 @@
+import { LobeAgentSession, LobeSessions, SessionGroupDefaultKeys } from '@/types/session';
+
+import { initLobeSession } from './initialState';
+
+export const getSessionPinned = (session: LobeAgentSession) =>
+  session.group === SessionGroupDefaultKeys.Pinned;
+
+const getSessionById = (id: string, sessions: LobeSessions): LobeAgentSession => {
+  const session = sessions.find((s) => s.id === id);
+
+  if (!session) return initLobeSession;
+
+  return session;
+};
+
+export const sessionHelpers = {
+  getSessionById,
+  getSessionPinned,
+};

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

@@ -11,26 +11,23 @@ export interface SessionState {
    * @description 当前正在编辑或查看的会话
    */
   activeId: string | undefined;
-  // 默认会话
-  inbox: LobeAgentSession;
+  fetchSessionsLoading: boolean;
   isMobile?: boolean;
   router?: AppRouterInstance;
   searchKeywords: string;
-  sessions: Record<string, LobeAgentSession>;
+  sessions: LobeAgentSession[];
   topicSearchKeywords: string;
 }
 
 export const initLobeSession: LobeAgentSession = {
-  chats: {},
   config: DEFAULT_AGENT_CONFIG,
-  createAt: Date.now(),
-  files: [],
+  createdAt: Date.now(),
   id: '',
   meta: DEFAULT_AGENT_META,
   type: LobeSessionType.Agent,
-  updateAt: Date.now(),
+  updatedAt: Date.now(),
 };
-export const initInbox: LobeAgentSession = merge(initLobeSession, {
+export const initInboxSession: LobeAgentSession = merge(initLobeSession, {
   id: 'inbox',
   meta: {
     avatar: DEFAULT_INBOX_AVATAR,
@@ -39,9 +36,9 @@ export const initInbox: LobeAgentSession = merge(initLobeSession, {
 
 export const initialSessionState: SessionState = {
   activeId: 'inbox',
-  inbox: initInbox,
+  fetchSessionsLoading: true,
   isMobile: false,
   searchKeywords: '',
-  sessions: {},
+  sessions: [],
   topicSearchKeywords: '',
 };

package/src/store/session/slices/session/selectors/export.ts

@@ -4,14 +4,13 @@ import { SessionStore } from '@/store/session';
 import { ConfigStateAgents, ConfigStateSessions } from '@/types/exportConfig';
 import { LobeAgentSession, LobeSessions } from '@/types/session';
 
-import { getSessionById } from './list';
+import { sessionHelpers } from '../helpers';
 
-export const exportSessions = (s: SessionStore): ConfigStateSessions => ({
-  inbox: s.inbox,
+const exportSessions = (s: SessionStore): Pick<ConfigStateSessions, 'sessions'> => ({
   sessions: s.sessions,
 });
 
-export const exportAgents = (s: SessionStore): ConfigStateAgents => {
+const exportAgents = (s: SessionStore): ConfigStateAgents => {
   return {
     sessions: transform(s.sessions, (result: LobeSessions, value, key) => {
       // 移除 chats 和 topics
@@ -20,9 +19,13 @@ export const exportAgents = (s: SessionStore): ConfigStateAgents => {
   };
 };
 
-export const getExportAgent =
+const getExportAgent =
   (id: string) =>
-  (s: SessionStore): LobeAgentSession => {
-    const session = getSessionById(id)(s);
-    return { ...session, chats: {}, topics: {} };
-  };
+  (s: SessionStore): LobeAgentSession =>
+    sessionHelpers.getSessionById(id, s.sessions);
+
+export const sessionExportSelectors = {
+  exportAgents,
+  exportSessions,
+  getExportAgent,
+};

package/src/store/session/slices/session/selectors/index.ts

@@ -1,35 +1,2 @@
-import { INBOX_SESSION_ID } from '@/const/session';
-import { SessionStore } from '@/store/session';
-
-import { exportAgents, exportSessions, getExportAgent } from './export';
-import {
-  currentSession,
-  currentSessionSafe,
-  getSessionById,
-  getSessionMetaById,
-  hasConversion,
-  hasPinnedSessionList,
-  hasSessionList,
-  pinnedSessionList,
-  sessionList,
-  unpinnedSessionList,
-} from './list';
-
-const isInboxSession = (s: SessionStore) => s.activeId === INBOX_SESSION_ID;
-
-export const sessionSelectors = {
-  currentSession,
-  currentSessionSafe,
-  exportAgents,
-  exportSessions,
-  getExportAgent,
-  getSessionById,
-  getSessionMetaById,
-  hasConversion,
-  hasPinnedSessionList,
-  hasSessionList,
-  isInboxSession,
-  pinnedSessionList,
-  sessionList,
-  unpinnedSessionList,
-};
+export * from './export';
+export * from './list';