@lobehub/chat 0.149.3 → 0.149.5

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

@@ -0,0 +1,45 @@
+import { t } from 'i18next';
+
+import { DEFAULT_AVATAR, DEFAULT_BACKGROUND_COLOR, DEFAULT_INBOX_AVATAR } from '@/const/meta';
+import { SessionStore } from '@/store/session';
+import { MetaData } from '@/types/meta';
+import { merge } from '@/utils/merge';
+
+import { sessionSelectors } from './list';
+
+// ==========   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', { ns: 'chat' }) : t('noDescription'),
+    title: isInbox ? t('inbox.title', { ns: 'chat' }) : 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' });
+
+export const sessionMetaSelectors = {
+  currentAgentAvatar,
+  currentAgentBackgroundColor,
+  currentAgentDescription,
+  currentAgentMeta,
+  currentAgentTitle,
+  getAvatar,
+  getDescription,
+  getTitle,
+};

package/src/store/session/store.ts

@@ -6,21 +6,15 @@ import { StateCreator } from 'zustand/vanilla';
 import { isDev } from '@/utils/env';
 
 import { SessionStoreState, initialState } from './initialState';
-import { AgentAction, createAgentSlice } from './slices/agent/action';
 import { SessionAction, createSessionSlice } from './slices/session/action';
 import { SessionGroupAction, createSessionGroupSlice } from './slices/sessionGroup/action';
 
 //  ===============  聚合 createStoreFn ============ //
 
-export interface SessionStore
-  extends SessionAction,
-    AgentAction,
-    SessionGroupAction,
-    SessionStoreState {}
+export interface SessionStore extends SessionAction, SessionGroupAction, SessionStoreState {}
 
 const createStore: StateCreator<SessionStore, [['zustand/devtools', never]]> = (...parameters) => ({
   ...initialState,
-  ...createAgentSlice(...parameters),
   ...createSessionSlice(...parameters),
   ...createSessionGroupSlice(...parameters),
 });

package/src/types/session.ts

@@ -30,6 +30,7 @@ export type SessionGroups = SessionGroupItem[];
 export interface LobeAgentSession extends BaseDataModel {
   config: LobeAgentConfig;
   group?: SessionGroupId;
+  model: string;
   pinned?: boolean;
   type: LobeSessionType.Agent;
 }

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

@@ -1,84 +0,0 @@
-import { produce } from 'immer';
-import { StateCreator } from 'zustand/vanilla';
-
-import { sessionService } from '@/services/session';
-import { useGlobalStore } from '@/store/global';
-import { agentSelectors } from '@/store/session/selectors';
-import { LobeAgentConfig } from '@/types/agent';
-import { MetaData } from '@/types/meta';
-
-import { SessionStore } from '../../store';
-import { sessionSelectors } from '../session/selectors';
-
-/**
- * 助手接口
- */
-export interface AgentAction {
-  removePlugin: (id: string) => void;
-  togglePlugin: (id: string, open?: boolean) => Promise<void>;
-  updateAgentConfig: (config: Partial<LobeAgentConfig>) => void;
-  updateAgentMeta: (meta: Partial<MetaData>) => void;
-}
-
-export const createAgentSlice: StateCreator<
-  SessionStore,
-  [['zustand/devtools', never]],
-  [],
-  AgentAction
-> = (set, get) => ({
-  removePlugin: async (id) => {
-    await get().togglePlugin(id, false);
-  },
-
-  togglePlugin: async (id, open) => {
-    const originConfig = agentSelectors.currentAgentConfig(get());
-
-    const config = produce(originConfig, (draft) => {
-      draft.plugins = produce(draft.plugins || [], (plugins) => {
-        const index = plugins.indexOf(id);
-        const shouldOpen = open !== undefined ? open : index === -1;
-
-        if (shouldOpen) {
-          // 如果 open 为 true 或者 id 不存在于 plugins 中，则添加它
-          if (index === -1) {
-            plugins.push(id);
-          }
-        } else {
-          // 如果 open 为 false 或者 id 存在于 plugins 中，则移除它
-          if (index !== -1) {
-            plugins.splice(index, 1);
-          }
-        }
-      });
-    });
-
-    get().updateAgentConfig(config);
-  },
-  updateAgentConfig: async (config) => {
-    // if is the inbox session, update the global config
-    const isInbox = sessionSelectors.isInboxSession(get());
-    if (isInbox) {
-      await useGlobalStore.getState().updateDefaultAgent({ config });
-    } else {
-      const session = sessionSelectors.currentSession(get());
-      if (!session) return;
-
-      const { activeId } = get();
-
-      await sessionService.updateSessionConfig(activeId, config);
-    }
-
-    // trigger store rerender
-    await get().refreshSessions();
-  },
-
-  updateAgentMeta: async (meta) => {
-    const session = sessionSelectors.currentSession(get());
-    if (!session) return;
-
-    const { activeId, refreshSessions } = get();
-
-    await sessionService.updateSession(activeId, { meta });
-    await refreshSessions();
-  },
-});

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

@@ -1,180 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import { DEFAULT_AVATAR } from '@/const/meta';
-import { DEFAULT_AGENT_CONFIG, DEFAUTT_AGENT_TTS_CONFIG } from '@/const/settings';
-import { SessionStore } from '@/store/session';
-import { MetaData } from '@/types/meta';
-import { LobeAgentSession, LobeSessionType } from '@/types/session';
-
-import { agentSelectors } from '../agent';
-
-vi.mock('i18next', () => ({
-  t: vi.fn((key) => key), // Simplified mock return value
-}));
-
-const mockSessionStore = {
-  activeId: '1',
-  sessions: [
-    {
-      id: '1',
-      config: DEFAULT_AGENT_CONFIG,
-      meta: {
-        title: 'title1',
-        description: 'description1',
-      },
-      type: LobeSessionType.Agent,
-    } as LobeAgentSession,
-    {
-      id: '2',
-      meta: {
-        title: 'title2',
-        description: 'description2',
-      },
-      config: DEFAULT_AGENT_CONFIG,
-      type: LobeSessionType.Agent,
-    } as LobeAgentSession,
-  ],
-} as unknown as SessionStore;
-
-describe('agentSelectors', () => {
-  describe('currentAgentConfig', () => {
-    it('should return the merged default and session-specific agent config', () => {
-      const config = agentSelectors.currentAgentConfig(mockSessionStore);
-      expect(config).toEqual(expect.objectContaining(mockSessionStore.sessions[0].config));
-    });
-  });
-
-  describe('currentAgentModel', () => {
-    it('should return the model from the agent config', () => {
-      const model = agentSelectors.currentAgentModel(mockSessionStore);
-      expect(model).toBe(mockSessionStore.sessions[0].config.model);
-    });
-  });
-
-  describe('currentAgentMeta', () => {
-    it('should return the merged default and session-specific meta data', () => {
-      const meta = agentSelectors.currentAgentMeta(mockSessionStore);
-      expect(meta).toEqual(expect.objectContaining(mockSessionStore.sessions[0].meta));
-    });
-
-    it('should return inbox defaults if it is an inbox session', () => {
-      // Assume sessionSelectors.isInboxSession() is mocked to return true for this test
-      const meta = agentSelectors.currentAgentMeta(mockSessionStore);
-      expect(meta.avatar).toBe(DEFAULT_AVATAR);
-    });
-  });
-
-  describe('currentAgentTitle', () => {
-    it('should return the title from the session meta data', () => {
-      const title = agentSelectors.currentAgentTitle(mockSessionStore);
-      expect(title).toBe(mockSessionStore.sessions[0].meta.title);
-    });
-  });
-
-  describe('currentAgentDescription', () => {
-    it('should return the description from the session meta data', () => {
-      const description = agentSelectors.currentAgentDescription(mockSessionStore);
-      expect(description).toBe(mockSessionStore.sessions[0].meta.description);
-    });
-  });
-
-  // ... More tests for other selectors
-
-  describe('hasSystemRole', () => {
-    it('should return true if the system role is defined in the agent config', () => {
-      const hasRole = agentSelectors.hasSystemRole(mockSessionStore);
-      expect(hasRole).toBe(false);
-    });
-
-    it('should return false if the system role is not defined in the agent config', () => {
-      const modifiedSessionStore = {
-        ...mockSessionStore,
-        sessions: [
-          {
-            ...mockSessionStore.sessions[0],
-            config: {
-              ...mockSessionStore.sessions[0].config,
-              systemRole: 'test',
-            },
-          },
-        ],
-      };
-      const hasRole = agentSelectors.hasSystemRole(modifiedSessionStore);
-      expect(hasRole).toBe(true);
-    });
-  });
-
-  describe('currentAgentTTS', () => {
-    it('should return the TTS config from the agent config', () => {
-      const ttsConfig = agentSelectors.currentAgentTTS(mockSessionStore);
-      expect(ttsConfig).toEqual(mockSessionStore.sessions[0].config.tts);
-    });
-
-    it('should return the default TTS config if none is defined in the agent config', () => {
-      const modifiedSessionStore = {
-        ...mockSessionStore,
-        sessions: [
-          {
-            ...mockSessionStore.sessions[0],
-            config: {
-              ...mockSessionStore.sessions[0].config,
-              tts: DEFAUTT_AGENT_TTS_CONFIG,
-            },
-          },
-        ],
-      };
-      const ttsConfig = agentSelectors.currentAgentTTS(modifiedSessionStore);
-      expect(ttsConfig).toEqual(DEFAUTT_AGENT_TTS_CONFIG);
-    });
-  });
-
-  describe('currentAgentTTSVoice', () => {
-    it('should return the appropriate TTS voice based on the service and language', () => {
-      const lang = 'en';
-      const ttsVoice = agentSelectors.currentAgentTTSVoice(lang)(mockSessionStore);
-      expect(ttsVoice).toBe(mockSessionStore.sessions[0].config.tts.voice.openai);
-    });
-  });
-
-  describe('getAvatar', () => {
-    it('should return the avatar from the meta data', () => {
-      const meta: MetaData = { avatar: 'custom-avatar.png' };
-      const avatar = agentSelectors.getAvatar(meta);
-      expect(avatar).toBe(meta.avatar);
-    });
-
-    it('should return the default avatar if none is defined in the meta data', () => {
-      const meta: MetaData = {};
-      const avatar = agentSelectors.getAvatar(meta);
-      expect(avatar).toBe(DEFAULT_AVATAR);
-    });
-  });
-
-  describe('getTitle', () => {
-    it('should return the title from the meta data', () => {
-      const meta: MetaData = { title: 'Custom Title' };
-      const title = agentSelectors.getTitle(meta);
-      expect(title).toBe(meta.title);
-    });
-
-    it('should return the default title if none is defined in the meta data', () => {
-      const meta: MetaData = {};
-      const title = agentSelectors.getTitle(meta);
-      expect(title).toBe('defaultSession'); // Assuming translation returns this key
-    });
-  });
-
-  describe('getDescription', () => {
-    it('should return the description from the meta data', () => {
-      const meta: MetaData = { description: 'Custom Description' };
-      const description = agentSelectors.getDescription(meta);
-      expect(description).toBe(meta.description);
-    });
-
-    it('should return the default description if none is defined in the meta data', () => {
-      const meta: MetaData = {};
-      const description = agentSelectors.getDescription(meta);
-      expect(description).toBe('noDescription'); // Assuming translation returns this key
-    });
-  });
-});

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

@@ -1,129 +0,0 @@
-import { VoiceList } from '@lobehub/tts';
-import { t } from 'i18next';
-
-import { DEFAULT_AVATAR, DEFAULT_BACKGROUND_COLOR, DEFAULT_INBOX_AVATAR } from '@/const/meta';
-import { DEFAULT_AGENT_CONFIG, DEFAUTT_AGENT_TTS_CONFIG } from '@/const/settings';
-import { useGlobalStore } from '@/store/global';
-import { settingsSelectors } from '@/store/global/selectors';
-import { SessionStore } from '@/store/session';
-import { LobeAgentTTSConfig } from '@/types/agent';
-import { MetaData } from '@/types/meta';
-import { merge } from '@/utils/merge';
-
-import { sessionSelectors } from '../session/selectors';
-
-// ==========   Config   ============== //
-const currentAgentConfig = (s: SessionStore) => {
-  const session = sessionSelectors.currentSession(s);
-
-  // if is the inbox session, use the default agent config in global store
-  if (sessionSelectors.isInboxSession(s)) {
-    return settingsSelectors.defaultAgentConfig(useGlobalStore.getState());
-  }
-
-  return merge(DEFAULT_AGENT_CONFIG, session?.config);
-};
-
-const currentAgentSystemRole = (s: SessionStore) => {
-  return currentAgentConfig(s).systemRole;
-};
-
-const currentAgentModel = (s: SessionStore): string => {
-  const config = currentAgentConfig(s);
-
-  return config?.model || 'gpt-3.5-turbo';
-};
-
-const currentAgentModelProvider = (s: SessionStore) => {
-  const config = currentAgentConfig(s);
-
-  return config?.provider;
-};
-
-const currentAgentPlugins = (s: SessionStore) => {
-  const config = currentAgentConfig(s);
-
-  return config?.plugins || [];
-};
-
-const currentAgentTTS = (s: SessionStore): LobeAgentTTSConfig => {
-  const config = currentAgentConfig(s);
-
-  return config?.tts || DEFAUTT_AGENT_TTS_CONFIG;
-};
-
-const currentAgentTTSVoice =
-  (lang: string) =>
-  (s: SessionStore): string => {
-    const { voice, ttsService } = currentAgentTTS(s);
-    const voiceList = new VoiceList(lang);
-    let currentVoice;
-    switch (ttsService) {
-      case 'openai': {
-        currentVoice = voice.openai || (VoiceList.openaiVoiceOptions?.[0].value as string);
-        break;
-      }
-      case 'edge': {
-        currentVoice = voice.edge || (voiceList.edgeVoiceOptions?.[0].value as string);
-        break;
-      }
-      case 'microsoft': {
-        currentVoice = voice.microsoft || (voiceList.microsoftVoiceOptions?.[0].value as string);
-        break;
-      }
-    }
-    return currentVoice || 'alloy';
-  };
-
-// ==========   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', { ns: 'chat' })
-      : currentAgentSystemRole(s) || t('noDescription'),
-    title: isInbox ? t('inbox.title', { ns: 'chat' }) : 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' });
-
-const hasSystemRole = (s: SessionStore) => {
-  const config = currentAgentConfig(s);
-
-  return !!config.systemRole;
-};
-
-export const agentSelectors = {
-  currentAgentAvatar,
-  currentAgentBackgroundColor,
-  currentAgentConfig,
-  currentAgentDescription,
-  currentAgentMeta,
-  currentAgentModel,
-  currentAgentModelProvider,
-  currentAgentPlugins,
-  currentAgentSystemRole,
-  currentAgentTTS,
-  currentAgentTTSVoice,
-  currentAgentTitle,
-  getAvatar,
-  getDescription,
-  getTitle,
-  hasSystemRole,
-};