@lobehub/chat 0.149.3 → 0.149.5

package/.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: lobehub
 patreon: # Replace with a single Patreon username
 open_collective: lobehub
 ko_fi: # Replace with a single Ko-fi username

package/CHANGELOG.md

@@ -2,6 +2,64 @@
 
 # Changelog
 
+### [Version 0.149.5](https://github.com/lobehub/lobe-chat/compare/v0.149.4...v0.149.5)
+
+<sup>Released on **2024-04-25**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Sperate SessionStore to a new AgentStore.
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix not handle ollama error correctly.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Sperate SessionStore to a new AgentStore, closes [#2197](https://github.com/lobehub/lobe-chat/issues/2197) ([49c0ba6](https://github.com/lobehub/lobe-chat/commit/49c0ba6))
+
+#### What's fixed
+
+- **misc**: Fix not handle ollama error correctly ([efdf174](https://github.com/lobehub/lobe-chat/commit/efdf174))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.149.4](https://github.com/lobehub/lobe-chat/compare/v0.149.3...v0.149.4)
+
+<sup>Released on **2024-04-25**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix chat client request not support abort.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix chat client request not support abort, closes [#2193](https://github.com/lobehub/lobe-chat/issues/2193) ([d22ef2c](https://github.com/lobehub/lobe-chat/commit/d22ef2c))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.149.3](https://github.com/lobehub/lobe-chat/compare/v0.149.2...v0.149.3)
 
 <sup>Released on **2024-04-25**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.149.3",
+  "version": "0.149.5",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/app/chat/(desktop)/features/ChatHeader/Main.tsx

@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { useSessionStore } from '@/store/session';
-import { agentSelectors, sessionSelectors } from '@/store/session/selectors';
+import { sessionMetaSelectors, sessionSelectors } from '@/store/session/selectors';
 import { pathString } from '@/utils/url';
 
 import Tags from './Tags';
@@ -19,10 +19,10 @@ const Main = memo(() => {
   const [init, isInbox, title, description, avatar, backgroundColor] = useSessionStore((s) => [
     sessionSelectors.isSomeSessionActive(s),
     sessionSelectors.isInboxSession(s),
-    agentSelectors.currentAgentTitle(s),
-    agentSelectors.currentAgentDescription(s),
-    agentSelectors.currentAgentAvatar(s),
-    agentSelectors.currentAgentBackgroundColor(s),
+    sessionMetaSelectors.currentAgentTitle(s),
+    sessionMetaSelectors.currentAgentDescription(s),
+    sessionMetaSelectors.currentAgentAvatar(s),
+    sessionMetaSelectors.currentAgentBackgroundColor(s),
   ]);
 
   const displayTitle = isInbox ? t('inbox.title') : title;

package/src/app/chat/(desktop)/features/ChatHeader/Tags.tsx

@@ -3,15 +3,15 @@ import { Flexbox } from 'react-layout-kit';
 
 import ModelTag from '@/components/ModelTag';
 import ModelSwitchPanel from '@/features/ModelSwitchPanel';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 import { useGlobalStore } from '@/store/global';
 import { modelProviderSelectors } from '@/store/global/selectors';
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
 
 import PluginTag from '../../../features/PluginTag';
 
 const TitleTags = memo(() => {
-  const [model, plugins] = useSessionStore((s) => [
+  const [model, plugins] = useAgentStore((s) => [
     agentSelectors.currentAgentModel(s),
     agentSelectors.currentAgentPlugins(s),
   ]);

package/src/app/chat/(desktop)/features/ChatInput/Footer/DragUpload.tsx

@@ -6,11 +6,11 @@ import { memo, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Center, Flexbox } from 'react-layout-kit';
 
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 import { useFileStore } from '@/store/file';
 import { useGlobalStore } from '@/store/global';
 import { modelProviderSelectors } from '@/store/global/selectors';
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
 
 const useStyles = createStyles(({ css, token, stylish }) => {
   return {
@@ -60,8 +60,6 @@ const useStyles = createStyles(({ css, token, stylish }) => {
   };
 });
 
-
-
 const handleDragOver = (e: DragEvent) => {
   e.preventDefault();
 };
@@ -77,7 +75,7 @@ const DragUpload = memo(() => {
 
   const uploadFile = useFileStore((s) => s.uploadFile);
 
-  const model = useSessionStore(agentSelectors.currentAgentModel);
+  const model = useAgentStore(agentSelectors.currentAgentModel);
 
   const enabledFiles = useGlobalStore(modelProviderSelectors.isModelEnabledFiles(model));
 
@@ -136,7 +134,6 @@ const DragUpload = memo(() => {
     uploadImages(files);
   };
 
-
   useEffect(() => {
     window.addEventListener('dragenter', handleDragEnter);
     window.addEventListener('dragover', handleDragOver);
@@ -164,8 +161,12 @@ const DragUpload = memo(() => {
               <Icon icon={FileText} size={{ fontSize: 64, strokeWidth: 1 }} />
             </Flexbox>
             <Flexbox align={'center'} gap={8} style={{ textAlign: 'center' }}>
-              <Flexbox className={styles.title}>{t(enabledFiles ? 'upload.dragFileTitle' : 'upload.dragTitle')}</Flexbox>
-              <Flexbox className={styles.desc}>{t(enabledFiles ? 'upload.dragFileDesc' : 'upload.dragDesc')}</Flexbox>
+              <Flexbox className={styles.title}>
+                {t(enabledFiles ? 'upload.dragFileTitle' : 'upload.dragTitle')}
+              </Flexbox>
+              <Flexbox className={styles.desc}>
+                {t(enabledFiles ? 'upload.dragFileDesc' : 'upload.dragDesc')}
+              </Flexbox>
             </Flexbox>
           </Center>
         </div>
@@ -175,4 +176,3 @@ const DragUpload = memo(() => {
 });
 
 export default DragUpload;
-

package/src/app/chat/(desktop)/features/ChatInput/Footer/index.tsx

@@ -10,11 +10,11 @@ import { Center, Flexbox } from 'react-layout-kit';
 import StopLoadingIcon from '@/components/StopLoading';
 import SaveTopic from '@/features/ChatInput/Topic';
 import { useSendMessage } from '@/features/ChatInput/useSend';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/slices/chat';
 import { useChatStore } from '@/store/chat';
 import { useGlobalStore } from '@/store/global';
 import { modelProviderSelectors, preferenceSelectors } from '@/store/global/selectors';
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
 import { isMacOS } from '@/utils/platform';
 
 import DragUpload from './DragUpload';
@@ -64,7 +64,7 @@ const Footer = memo<FooterProps>(({ setExpand }) => {
     s.stopGenerateMessage,
   ]);
 
-  const model = useSessionStore(agentSelectors.currentAgentModel);
+  const model = useAgentStore(agentSelectors.currentAgentModel);
 
   const [useCmdEnterToSend, canUpload] = useGlobalStore((s) => [
     preferenceSelectors.useCmdEnterToSend(s),

package/src/app/chat/(desktop)/features/SideBar/SystemRole/index.tsx

@@ -8,9 +8,11 @@ import { Flexbox } from 'react-layout-kit';
 import useMergeState from 'use-merge-value';
 
 import AgentInfo from '@/features/AgentInfo';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 import { useGlobalStore } from '@/store/global';
 import { useSessionStore } from '@/store/session';
-import { agentSelectors, sessionSelectors } from '@/store/session/selectors';
+import { sessionMetaSelectors, sessionSelectors } from '@/store/session/selectors';
 import { pathString } from '@/utils/url';
 
 import SidebarHeader from '../../../../components/SidebarHeader';
@@ -21,10 +23,13 @@ const SystemRole = memo(() => {
   const [editing, setEditing] = useState(false);
   const { styles } = useStyles();
 
-  const [init, systemRole, meta, updateAgentConfig] = useSessionStore((s) => [
+  const [init, meta] = useSessionStore((s) => [
     sessionSelectors.isSomeSessionActive(s),
+    sessionMetaSelectors.currentAgentMeta(s),
+  ]);
+
+  const [systemRole, updateAgentConfig] = useAgentStore((s) => [
     agentSelectors.currentAgentSystemRole(s),
-    agentSelectors.currentAgentMeta(s),
     s.updateAgentConfig,
   ]);
 

package/src/app/chat/(mobile)/mobile/ChatHeader/ChatHeaderTitle.tsx

@@ -9,7 +9,7 @@ import { useChatStore } from '@/store/chat';
 import { topicSelectors } from '@/store/chat/selectors';
 import { useGlobalStore } from '@/store/global';
 import { useSessionStore } from '@/store/session';
-import { agentSelectors, sessionSelectors } from '@/store/session/selectors';
+import { sessionMetaSelectors, sessionSelectors } from '@/store/session/selectors';
 
 const ChatHeaderTitle = memo(() => {
   const { t } = useTranslation('chat');
@@ -20,7 +20,7 @@ const ChatHeaderTitle = memo(() => {
   ]);
   const [isInbox, title] = useSessionStore((s) => [
     sessionSelectors.isInboxSession(s),
-    agentSelectors.currentAgentTitle(s),
+    sessionMetaSelectors.currentAgentTitle(s),
   ]);
   const theme = useTheme();
 

package/src/app/chat/(mobile)/mobile/page.tsx

@@ -5,7 +5,6 @@ import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import Conversation from '@/features/Conversation';
-import { useSessionStore } from '@/store/session';
 
 import SessionHydration from '../../components/SessionHydration';
 import TelemetryNotification from '../../features/TelemetryNotification';
@@ -15,11 +14,6 @@ import ChatHeader from './ChatHeader';
 const TopicList = dynamic(() => import('../features/TopicList'));
 
 const Chat = memo(() => {
-  // due to mobile side don't have sessionList, so we need to fetch sessions here
-  // refs: https://github.com/lobehub/lobe-chat/pull/541
-  const useFetchSessions = useSessionStore((s) => s.useFetchSessions);
-  useFetchSessions();
-
   return (
     <>
       <ChatHeader />

package/src/app/chat/_layout/Desktop/SessionList.tsx

@@ -34,4 +34,6 @@ const Sessions = memo(() => {
   );
 });
 
+Sessions.displayName = 'SessionsList';
+
 export default Sessions;

package/src/app/chat/features/PageTitle/index.tsx

@@ -4,12 +4,12 @@ import { memo } from 'react';
 
 import PageTitle from '@/components/PageTitle';
 import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
+import { sessionMetaSelectors } from '@/store/session/selectors';
 
 const Title = memo(() => {
   const [avatar, title] = useSessionStore((s) => [
-    agentSelectors.currentAgentAvatar(s),
-    agentSelectors.currentAgentTitle(s),
+    sessionMetaSelectors.currentAgentAvatar(s),
+    sessionMetaSelectors.currentAgentTitle(s),
   ]);
 
   return <PageTitle title={[avatar, title].filter(Boolean).join(' ')} />;

package/src/app/chat/features/PluginTag/PluginStatus.tsx

@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import ManifestPreviewer from '@/components/ManifestPreviewer';
-import { useSessionStore } from '@/store/session';
+import { useAgentStore } from '@/store/agent';
 import { useToolStore } from '@/store/tool';
 import { customPluginSelectors, toolSelectors } from '@/store/tool/selectors';
 
@@ -26,7 +26,7 @@ const PluginStatus = memo<PluginStatusProps>(({ title, id, deprecated }) => {
 
   const manifest = useToolStore(toolSelectors.getManifestById(id), isEqual);
 
-  const removePlugin = useSessionStore((s) => s.removePlugin);
+  const removePlugin = useAgentStore((s) => s.removePlugin);
 
   const renderStatus = useMemo(() => {
     switch (status) {

package/src/app/chat/features/SessionListContent/DefaultMode.tsx

@@ -16,7 +16,7 @@ import SessionList from './List';
 import ConfigGroupModal from './Modals/ConfigGroupModal';
 import RenameGroupModal from './Modals/RenameGroupModal';
 
-const SessionListContent = memo(() => {
+const SessionDefaultMode = memo(() => {
   const { t } = useTranslation('chat');
 
   const [activeGroupId, setActiveGroupId] = useState<string>();
@@ -98,4 +98,6 @@ const SessionListContent = memo(() => {
   );
 });
 
-export default SessionListContent;
+SessionDefaultMode.displayName = 'SessionDefaultMode';
+
+export default SessionDefaultMode;

package/src/app/chat/features/SessionListContent/List/Item/index.tsx

@@ -4,11 +4,9 @@ import { shallow } from 'zustand/shallow';
 
 import ModelTag from '@/components/ModelTag';
 import { useChatStore } from '@/store/chat';
-import { useGlobalStore } from '@/store/global';
-import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionHelpers } from '@/store/session/helpers';
-import { agentSelectors, sessionSelectors } from '@/store/session/selectors';
+import { sessionMetaSelectors, sessionSelectors } from '@/store/session/selectors';
 
 import ListItem from '../../ListItem';
 import CreateGroupModal from '../../Modals/CreateGroupModal';
@@ -22,31 +20,26 @@ const SessionItem = memo<SessionItemProps>(({ id }) => {
   const [open, setOpen] = useState(false);
   const [createGroupModalOpen, setCreateGroupModalOpen] = useState(false);
 
-  const [defaultModel] = useGlobalStore((s) => [settingsSelectors.defaultAgentConfig(s).model]);
   const [active] = useSessionStore((s) => [s.activeId === id]);
   const [loading] = useChatStore((s) => [!!s.chatLoadingId && id === s.activeId]);
 
-  const [pin, title, description, systemRole, avatar, avatarBackground, updateAt, model, group] =
+  const [pin, title, description, avatar, avatarBackground, updateAt, model, group] =
     useSessionStore((s) => {
       const session = sessionSelectors.getSessionById(id)(s);
       const meta = session.meta;
-      const systemRole = session.config.systemRole;
 
       return [
         sessionHelpers.getSessionPinned(session),
-        agentSelectors.getTitle(meta),
-        agentSelectors.getDescription(meta),
-        systemRole,
-        agentSelectors.getAvatar(meta),
+        sessionMetaSelectors.getTitle(meta),
+        sessionMetaSelectors.getDescription(meta),
+        sessionMetaSelectors.getAvatar(meta),
         meta.backgroundColor,
         session?.updatedAt,
-        session.config.model,
+        session.model,
         session?.group,
       ];
     });
 
-  const showModel = model !== defaultModel;
-
   const actions = useMemo(
     () => (
       <Actions
@@ -61,12 +54,12 @@ const SessionItem = memo<SessionItemProps>(({ id }) => {
 
   const addon = useMemo(
     () =>
-      !showModel ? undefined : (
+      model && (
         <Flexbox gap={4} horizontal style={{ flexWrap: 'wrap' }}>
-          {showModel && <ModelTag model={model} />}
+          <ModelTag model={model} />
         </Flexbox>
       ),
-    [showModel, model],
+    [model],
   );
 
   return (
@@ -78,7 +71,7 @@ const SessionItem = memo<SessionItemProps>(({ id }) => {
         avatar={avatar}
         avatarBackground={avatarBackground}
         date={updateAt}
-        description={description || systemRole}
+        description={description}
         loading={loading}
         pin={pin}
         showAction={open}

package/src/app/chat/features/SessionListContent/index.tsx

@@ -11,4 +11,6 @@ const SessionListContent = memo(() => {
   return isSearching ? <SearchMode /> : <DefaultMode />;
 });
 
+SessionListContent.displayName = 'SessionListContent';
+
 export default SessionListContent;

package/src/app/chat/features/ShareButton/Preview.tsx

@@ -6,8 +6,10 @@ import { Flexbox } from 'react-layout-kit';
 import pkg from '@/../package.json';
 import ModelTag from '@/components/ModelTag';
 import ChatList from '@/features/Conversation/components/ChatList';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 import { useSessionStore } from '@/store/session';
-import { agentSelectors, sessionSelectors } from '@/store/session/selectors';
+import { sessionMetaSelectors, sessionSelectors } from '@/store/session/selectors';
 
 import PluginTag from '../PluginTag';
 import { useStyles } from './style';
@@ -15,16 +17,18 @@ import { FieldType } from './type';
 
 const Preview = memo<FieldType & { title?: string }>(
   ({ title, withSystemRole, withBackground, withFooter }) => {
-    const [isInbox, description, avatar, backgroundColor, model, plugins, systemRole] =
-      useSessionStore((s) => [
-        sessionSelectors.isInboxSession(s),
-        agentSelectors.currentAgentDescription(s),
-        agentSelectors.currentAgentAvatar(s),
-        agentSelectors.currentAgentBackgroundColor(s),
-        agentSelectors.currentAgentModel(s),
-        agentSelectors.currentAgentPlugins(s),
-        agentSelectors.currentAgentSystemRole(s),
-      ]);
+    const [model, plugins, systemRole] = useAgentStore((s) => [
+      agentSelectors.currentAgentModel(s),
+      agentSelectors.currentAgentPlugins(s),
+      agentSelectors.currentAgentSystemRole(s),
+    ]);
+    const [isInbox, description, avatar, backgroundColor] = useSessionStore((s) => [
+      sessionSelectors.isInboxSession(s),
+      sessionMetaSelectors.currentAgentDescription(s),
+      sessionMetaSelectors.currentAgentAvatar(s),
+      sessionMetaSelectors.currentAgentBackgroundColor(s),
+    ]);
+
     const { t } = useTranslation('chat');
     const { styles } = useStyles(withBackground);
 

package/src/app/chat/features/ShareButton/useScreenshot.ts

@@ -3,13 +3,13 @@ import { domToJpeg, domToPng, domToSvg, domToWebp } from 'modern-screenshot';
 import { useCallback, useState } from 'react';
 
 import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
+import { sessionMetaSelectors } from '@/store/session/selectors';
 
 import { ImageType } from './type';
 
 export const useScreenshot = (imageType: ImageType) => {
   const [loading, setLoading] = useState(false);
-  const title = useSessionStore(agentSelectors.currentAgentTitle);
+  const title = useSessionStore(sessionMetaSelectors.currentAgentTitle);
 
   const handleDownload = useCallback(async () => {
     setLoading(true);

package/src/app/chat/settings/features/EditPage.tsx

@@ -6,18 +6,21 @@ import { useTranslation } from 'react-i18next';
 
 import PageTitle from '@/components/PageTitle';
 import AgentSetting from '@/features/AgentSetting';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
+import { sessionMetaSelectors } from '@/store/session/selectors';
 
 const EditPage = memo(() => {
   const { t } = useTranslation('setting');
   const id = useSessionStore((s) => s.activeId);
-  const config = useSessionStore(agentSelectors.currentAgentConfig, isEqual);
-  const meta = useSessionStore(agentSelectors.currentAgentMeta, isEqual);
-  const [updateAgentConfig, updateAgentMeta, title] = useSessionStore((s) => [
-    s.updateAgentConfig,
-    s.updateAgentMeta,
-    agentSelectors.currentAgentTitle(s),
+  const config = useAgentStore(agentSelectors.currentAgentConfig, isEqual);
+  const meta = useSessionStore(sessionMetaSelectors.currentAgentMeta, isEqual);
+  const [updateAgentConfig] = useAgentStore((s) => [s.updateAgentConfig]);
+
+  const [updateAgentMeta, title] = useSessionStore((s) => [
+    s.updateSessionMeta,
+    sessionMetaSelectors.currentAgentTitle(s),
   ]);
 
   return (

package/src/app/chat/settings/features/SubmitAgentButton/SubmitAgentModal.tsx

@@ -10,17 +10,19 @@ import { Flexbox } from 'react-layout-kit';
 
 import { AGENTS_INDEX_GITHUB_ISSUE } from '@/const/url';
 import AgentInfo from '@/features/AgentInfo';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 import { useGlobalStore } from '@/store/global';
 import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
+import { sessionMetaSelectors } from '@/store/session/selectors';
 
 const SubmitAgentModal = memo<ModalProps>(({ open, onCancel }) => {
   const { t } = useTranslation('setting');
   const [identifier, setIdentifier] = useState('');
-  const systemRole = useSessionStore(agentSelectors.currentAgentSystemRole);
+  const systemRole = useAgentStore(agentSelectors.currentAgentSystemRole);
   const theme = useTheme();
-  const meta = useSessionStore(agentSelectors.currentAgentMeta, isEqual);
+  const meta = useSessionStore(sessionMetaSelectors.currentAgentMeta, isEqual);
   const language = useGlobalStore((s) => settingsSelectors.currentSettings(s).language);
 
   const isMetaPass = Boolean(

package/src/app/metadata.ts

@@ -22,9 +22,9 @@ const metadata: Metadata = {
   },
   description,
   icons: {
-    apple:'icons/apple-touch-icon.png',
-    icon:'favicon.ico',
-    shortcut:'favicon-32x32.ico',
+    apple: '/icons/apple-touch-icon.png',
+    icon: '/favicon.ico',
+    shortcut: '/favicon-32x32.ico',
   },
   manifest: noManifest ? undefined : '/manifest.json',
   metadataBase: new URL(SITE_URL),

package/src/app/settings/(mobile)/features/AvatarBanner.tsx

@@ -55,6 +55,7 @@ const AvatarBanner = memo<AgentCardBannerProps>(
             className={styles.bannerImg}
             height={size}
             src={avatar || DEFAULT_USER_AVATAR_URL}
+            unoptimized
             width={size}
           />
         </Flexbox>

package/src/config/modelProviders/ollama.ts

@@ -2,6 +2,17 @@ import { ModelProviderCard } from '@/types/llm';
 
 const Ollama: ModelProviderCard = {
   chatModels: [
+    {
+      displayName: 'Llama3 8B',
+      enabled: true,
+      id: 'llama3',
+      tokens: 8000,
+    },
+    {
+      displayName: 'Llama3 70B',
+      id: 'llama3:70b',
+      tokens: 8000,
+    },
     {
       displayName: 'Command R 35B',
       enabled: true,
@@ -21,7 +32,6 @@ const Ollama: ModelProviderCard = {
     },
     {
       displayName: 'Gemma 2B',
-      enabled: true,
       id: 'gemma:2b',
       tokens: 4000,
     },
@@ -50,17 +60,6 @@ const Ollama: ModelProviderCard = {
       id: 'llama2-chinese',
       tokens: 4000,
     },
-    {
-      displayName: 'Llama3 8B',
-      enabled: true,
-      id: 'llama3',
-      tokens: 8000,
-    },
-    {
-      displayName: 'Llama3 70B',
-      id: 'llama3:70b',
-      tokens: 8000,
-    },
     {
       displayName: 'WizardLM 2 7B',
       enabled: true,

package/src/const/session.ts

@@ -10,6 +10,7 @@ export const DEFAULT_AGENT_LOBE_SESSION: LobeAgentSession = {
   createdAt: Date.now(),
   id: '',
   meta: DEFAULT_AGENT_META,
+  model: DEFAULT_AGENT_CONFIG.model,
   type: LobeSessionType.Agent,
   updatedAt: Date.now(),
 };

package/src/database/client/models/session.ts

@@ -254,6 +254,7 @@ class _SessionModel extends BaseModel {
   private DB_SessionToAgentSession(session: DBModel<DB_Session>) {
     return {
       ...session,
+      model: session.config.model,
       pinned: !!session.pinned,
     } as LobeAgentSession;
   }

package/src/database/client/models/user.ts

@@ -1,6 +1,7 @@
 import { DeepPartial } from 'utility-types';
 
 import { BaseModel } from '@/database/client/core';
+import { LobeAgentConfig } from '@/types/agent';
 import { GlobalSettings } from '@/types/settings';
 import { uuid } from '@/utils/uuid';
 
@@ -22,6 +23,11 @@ class _UserModel extends BaseModel {
     return list[0];
   };
 
+  getAgentConfig = async () => {
+    const user = await this.getUser();
+
+    return user.settings?.defaultAgent?.config as LobeAgentConfig;
+  };
   // **************** Create *************** //
 
   create = async (user: DB_User) => {