@lobehub/chat 0.120.5 → 0.121.0

package/src/database/models/__tests__/topic.test.ts

@@ -25,6 +25,7 @@ describe('TopicModel', () => {
     // Clean up the database after each test
     await TopicModel.clearTable();
   });
+
   describe('create', () => {
     it('should create a topic record', async () => {
       const result = await TopicModel.create(topicData);
@@ -395,7 +396,7 @@ describe('TopicModel', () => {
     it('should fail if the database transaction fails', async () => {
       // 强制数据库事务失败，例如通过在复制过程中抛出异常
       const dbTransactionFailedError = new Error('DB transaction failed');
-      vi.spyOn(TopicModel['db'], 'transaction').mockImplementation((async () => {
+      const spyOn = vi.spyOn(TopicModel['db'], 'transaction').mockImplementation((async () => {
         throw dbTransactionFailedError;
       }) as any);
 
@@ -403,6 +404,7 @@ describe('TopicModel', () => {
       await expect(TopicModel.duplicateTopic(originalTopic.id)).rejects.toThrow(
         dbTransactionFailedError,
       );
+      spyOn.mockRestore();
     });
 
     it('should not create partial duplicates if the process fails at some point', async () => {
@@ -422,4 +424,77 @@ describe('TopicModel', () => {
       expect(messages).toHaveLength(originalMessages.length); // 只有原始消息
     });
   });
+
+  describe('clearTable', () => {
+    it('should clear the table', async () => {
+      // Create a topic to ensure the table is not empty
+      await TopicModel.create(topicData);
+
+      // Clear the table
+      await TopicModel.clearTable();
+
+      // Verify the table is empty
+      const topics = await TopicModel.queryAll();
+      expect(topics).toHaveLength(0);
+    });
+  });
+
+  describe('update', () => {
+    it('should update a topic', async () => {
+      // Create a topic
+      const createdTopic = await TopicModel.create(topicData);
+
+      // Update the topic
+      const newTitle = 'Updated Title';
+      await TopicModel.update(createdTopic.id, { title: newTitle });
+
+      // Verify the topic is updated
+      const updatedTopic = await TopicModel.findById(createdTopic.id);
+      expect(updatedTopic.title).toBe(newTitle);
+    });
+  });
+
+  describe('batchDelete', () => {
+    it('should batch delete topics', async () => {
+      // Create multiple topics
+      const topic1 = await TopicModel.create(topicData);
+      const topic2 = await TopicModel.create(topicData);
+
+      await TopicModel.create(topicData);
+
+      const ids = [topic1.id, topic2.id];
+      // Batch delete the topics
+      await TopicModel.batchDelete(ids);
+
+      expect(await TopicModel.table.count()).toEqual(1);
+    });
+  });
+
+  describe('queryAll', () => {
+    it('should query all topics', async () => {
+      // Create multiple topics
+      await TopicModel.batchCreate([topicData, topicData]);
+
+      // Query all topics
+      const topics = await TopicModel.queryAll();
+
+      // Verify all topics are queried
+      expect(topics).toHaveLength(2);
+    });
+  });
+
+  describe('queryByKeyword', () => {
+    it('should query topics by keyword', async () => {
+      // Create a topic with a unique title
+      const uniqueTitle = 'Unique Title';
+      await TopicModel.create({ ...topicData, title: uniqueTitle });
+
+      // Query topics by the unique title
+      const topics = await TopicModel.queryByKeyword(uniqueTitle);
+
+      // Verify the correct topic is queried
+      expect(topics).toHaveLength(1);
+      expect(topics[0].title).toBe(uniqueTitle);
+    });
+  });
 });

package/src/database/models/message.ts

@@ -132,7 +132,7 @@ class _MessageModel extends BaseModel {
 
   /**
    * Deletes multiple messages based on the assistantId and optionally the topicId.
-   * If topicId is not provided, it deletes messages where topicId is undefined.
+   * If topicId is not provided, it deletes messages where topicId is undefined or null.
    * If topicId is provided, it deletes messages with that specific topicId.
    *
    * @param {string} sessionId - The identifier of the assistant associated with the messages.
@@ -142,13 +142,12 @@ class _MessageModel extends BaseModel {
   async batchDelete(sessionId: string, topicId: string | undefined): Promise<void> {
     // If topicId is specified, use both assistantId and topicId as the filter criteria in the query.
     // Otherwise, filter by assistantId and require that topicId is undefined.
-    const query =
-      topicId !== undefined
-        ? this.table.where({ sessionId, topicId }) // Use a compound index
-        : this.table
-            .where('sessionId')
-            .equals(sessionId)
-            .and((message) => message.topicId === undefined);
+    const query = !!topicId
+      ? this.table.where({ sessionId, topicId }) // Use a compound index
+      : this.table
+          .where('sessionId')
+          .equals(sessionId)
+          .and((message) => !message.topicId);
 
     // Retrieve a collection of message IDs that satisfy the criteria
     const messageIds = await query.primaryKeys();

package/src/database/models/session.ts

@@ -3,9 +3,16 @@ import { DeepPartial } from 'utility-types';
 import { DEFAULT_AGENT_LOBE_SESSION } from '@/const/session';
 import { BaseModel } from '@/database/core';
 import { DBModel } from '@/database/core/types/db';
+import { SessionGroupModel } from '@/database/models/sessionGroup';
 import { DB_Session, DB_SessionSchema } from '@/database/schemas/session';
 import { LobeAgentConfig } from '@/types/agent';
-import { LobeAgentSession, LobeSessions, SessionGroupKey } from '@/types/session';
+import {
+  ChatSessionList,
+  LobeAgentSession,
+  LobeSessions,
+  SessionDefaultGroup,
+  SessionGroupId,
+} from '@/types/session';
 import { merge } from '@/utils/merge';
 import { uuid } from '@/utils/uuid';
 
@@ -20,7 +27,21 @@ class _SessionModel extends BaseModel {
   }
 
   async batchCreate(sessions: LobeAgentSession[]) {
-    return this._batchAdd(sessions, { idGenerator: uuid });
+    const DB_Sessions = await Promise.all(
+      sessions.map(async (s) => {
+        if (s.group && s.group !== SessionDefaultGroup.Default) {
+          // Check if the group exists in the SessionGroup table
+          const groupExists = await SessionGroupModel.findById(s.group);
+          // If the group does not exist, set it to default
+          if (!groupExists) {
+            s.group = SessionDefaultGroup.Default;
+          }
+        }
+        return this.mapToDB_Session(s);
+      }),
+    );
+
+    return this._batchAdd<DB_Session>(DB_Sessions, { idGenerator: uuid });
   }
 
   async query({
@@ -29,21 +50,66 @@ class _SessionModel extends BaseModel {
   }: { current?: number; pageSize?: number } = {}): Promise<LobeSessions> {
     const offset = current * pageSize;
 
-    return this.table.orderBy('updatedAt').reverse().offset(offset).limit(pageSize).toArray();
+    const items: DBModel<DB_Session>[] = await this.table
+      .orderBy('updatedAt')
+      .reverse()
+      .offset(offset)
+      .limit(pageSize)
+      .toArray();
+
+    return this.mapToAgentSessions(items);
+  }
+
+  async queryWithGroups(): Promise<ChatSessionList> {
+    const groups = await SessionGroupModel.query();
+    const customGroups = await this.queryByGroupIds(groups.map((item) => item.id));
+    const defaultItems = await this.querySessionsByGroupId(SessionDefaultGroup.Default);
+    const pinnedItems = await this.getPinnedSessions();
+
+    const all = await this.query();
+    return {
+      all,
+      customGroup: groups.map((group) => ({
+        ...group,
+        children: customGroups[group.id],
+      })),
+      default: defaultItems,
+      pinned: pinnedItems,
+    };
   }
 
   /**
    * get sessions by group
    * @param group
    */
-  async queryByGroup(group: SessionGroupKey) {
-    return this.table.where('group').equals(group).toArray();
+  async querySessionsByGroupId(group: SessionGroupId): Promise<LobeSessions> {
+    const items: DBModel<DB_Session>[] = await this.table
+      .where('group')
+      .equals(group)
+      .and((session) => !session.pinned)
+      .reverse()
+      .sortBy('updatedAt');
+
+    return this.mapToAgentSessions(items);
+  }
+
+  async queryByGroupIds(groups: string[]) {
+    const pools = groups.map(async (id) => {
+      return [id, await this.querySessionsByGroupId(id)] as const;
+    });
+    const groupItems = await Promise.all(pools);
+
+    return Object.fromEntries(groupItems);
   }
 
   async update(id: string, data: Partial<DB_Session>) {
     return super._update(id, data);
   }
 
+  async updatePinned(id: string, pinned: boolean) {
+    return this.update(id, { pinned: pinned ? 1 : 0 });
+  }
+
   async updateConfig(id: string, data: DeepPartial<LobeAgentConfig>) {
     const session = await this.findById(id);
     if (!session) return;
@@ -52,6 +118,7 @@ class _SessionModel extends BaseModel {
 
     return this.update(id, { config });
   }
+
   /**
    * Delete a session , also delete all messages and topic associated with it.
    */
@@ -148,13 +215,13 @@ class _SessionModel extends BaseModel {
     ]);
 
     // Retrieve unique sessions by IDs
-    const data = await this.table
+    const items: DBModel<DB_Session>[] = await this.table
       .where('id')
       .anyOf([...combinedSessionIds])
       .toArray();
 
     console.timeEnd('queryByKeyword');
-    return data;
+    return this.mapToAgentSessions(items);
   }
 
   async duplicate(id: string, newTitle?: string) {
@@ -165,6 +232,35 @@ class _SessionModel extends BaseModel {
 
     return this._add(newSession, uuid());
   }
+
+  async getPinnedSessions(): Promise<LobeSessions> {
+    const items: DBModel<DB_Session>[] = await this.table
+      .where('pinned')
+      .equals(1)
+      .reverse()
+      .sortBy('updatedAt');
+
+    return this.mapToAgentSessions(items);
+  }
+
+  private mapToDB_Session(session: LobeAgentSession): DBModel<DB_Session> {
+    return {
+      ...session,
+      group: session.group || SessionDefaultGroup.Default,
+      pinned: session.pinned ? 1 : 0,
+    };
+  }
+
+  private DB_SessionToAgentSession(session: DBModel<DB_Session>) {
+    return {
+      ...session,
+      pinned: !!session.pinned,
+    } as LobeAgentSession;
+  }
+
+  private mapToAgentSessions(session: DBModel<DB_Session>[]) {
+    return session.map((item) => this.DB_SessionToAgentSession(item));
+  }
 }
 
 export const SessionModel = new _SessionModel();

package/src/database/models/sessionGroup.ts

@@ -0,0 +1,76 @@
+import { BaseModel } from '@/database/core';
+import { DB_SessionGroup, DB_SessionGroupSchema } from '@/database/schemas/sessionGroup';
+import { SessionGroups } from '@/types/session';
+import { nanoid } from '@/utils/uuid';
+
+class _SessionGroupModel extends BaseModel {
+  constructor() {
+    super('sessionGroups', DB_SessionGroupSchema);
+  }
+
+  async create(name: string, sort?: number, id = nanoid()) {
+    return this._add({ name, sort }, id);
+  }
+  async batchCreate(groups: SessionGroups) {
+    return this._batchAdd(groups, { idGenerator: nanoid });
+  }
+
+  async findById(id: string): Promise<DB_SessionGroup> {
+    return this.table.get(id);
+  }
+
+  async update(id: string, data: Partial<DB_SessionGroup>) {
+    return super._update(id, data);
+  }
+
+  async delete(id: string, removeGroupItem: boolean = false) {
+    this.db.sessions.toCollection().modify((session) => {
+      //  update all session associated with the sessionGroup to default
+      if (session.group === id) session.group = 'default';
+    });
+    if (!removeGroupItem) {
+      return this.table.delete(id);
+    } else {
+      return this.db.sessions.where('group').equals(id).delete();
+    }
+  }
+
+  async query(): Promise<SessionGroups> {
+    const allGroups = await this.table.toArray();
+
+    // 自定义排序，先按 sort 存在与否分组，然后分别排序
+    return allGroups.sort((a, b) => {
+      // 如果两个项都有 sort，则按 sort 排序
+      if (a.sort !== undefined && b.sort !== undefined) {
+        // 如果sort 一样，按时间倒序排序
+        if (a.sort === b.sort) return b.createdAt - a.createdAt;
+
+        return a.sort - b.sort;
+      }
+      // 如果 a 有 sort 而 b 没有，则 a 排在前面
+      if (a.sort !== undefined) {
+        return -1;
+      }
+      // 如果 b 有 sort 而 a 没有，则 b 排在前面
+      if (b.sort !== undefined) {
+        return 1;
+      }
+      // 如果两个项都没有 sort，则按 createdAt 倒序排序
+      return b.createdAt - a.createdAt;
+    });
+  }
+
+  async updateOrder(sortMap: { id: string; sort: number }[]) {
+    return this.db.transaction('rw', this.table, async () => {
+      for (const { id, sort } of sortMap) {
+        await this.table.update(id, { sort });
+      }
+    });
+  }
+
+  async clear() {
+    this.table.clear();
+  }
+}
+
+export const SessionGroupModel = new _SessionGroupModel();

package/src/database/schemas/session.ts

@@ -50,6 +50,7 @@ export const DB_SessionSchema = z.object({
   config: AgentSchema,
   group: z.string().default('default'),
   meta: LobeMetaDataSchema,
+  pinned: z.number().int().min(0).max(1).optional(),
   type: z.enum(['agent', 'group']).default('agent'),
 });
 

package/src/database/schemas/sessionGroup.ts

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+
+export const DB_SessionGroupSchema = z.object({
+  name: z.string(),
+  sort: z.number().optional(),
+});
+
+export type DB_SessionGroup = z.infer<typeof DB_SessionGroupSchema>;

package/src/features/ChatInput/ActionBar/Clear.tsx

@@ -22,7 +22,8 @@ const Clear = memo(() => {
 
   return (
     <Popconfirm
-      okButtonProps={{ danger: true }}
+      arrow={false}
+      okButtonProps={{ danger: true, type: 'primary' }}
       onConfirm={() => {
         resetConversation();
       }}

package/src/features/Conversation/Actions/Assistant.tsx

@@ -19,11 +19,11 @@ export const AssistantActionsBar: RenderAction = memo(({ id, onActionClick, erro
       dropdownMenu={[
         edit,
         copy,
-        regenerate,
         divider,
         tts,
         translate,
         divider,
+        regenerate,
         delAndRegenerate,
         del,
       ]}

package/src/features/Conversation/Actions/Function.tsx

@@ -5,10 +5,10 @@ import { useChatListActionsBar } from '../hooks/useChatListActionsBar';
 import { RenderAction } from '../types';
 
 export const FunctionActionsBar: RenderAction = memo(({ onActionClick }) => {
-  const { regenerate, divider, delAndRegenerate, del } = useChatListActionsBar();
+  const { regenerate, delAndRegenerate, del } = useChatListActionsBar();
   return (
     <ActionIconGroup
-      dropdownMenu={[regenerate, divider, delAndRegenerate, del]}
+      dropdownMenu={[regenerate, delAndRegenerate, del]}
       items={[regenerate]}
       onActionClick={onActionClick}
       type="ghost"

package/src/features/Conversation/Actions/User.tsx

@@ -11,7 +11,7 @@ export const UserActionsBar: RenderAction = memo(({ onActionClick }) => {
 
   return (
     <ActionIconGroup
-      dropdownMenu={[edit, copy, regenerate, divider, tts, translate, divider, del]}
+      dropdownMenu={[edit, copy, divider, tts, translate, divider, regenerate, del]}
       items={[regenerate, edit]}
       onActionClick={onActionClick}
       type="ghost"

package/src/features/Conversation/hooks/useChatListActionsBar.tsx

@@ -1,5 +1,5 @@
 import { ActionIconGroupItems } from '@lobehub/ui/es/ActionIconGroup';
-import { Copy, Edit, RotateCw, Trash } from 'lucide-react';
+import { Copy, Edit, ListRestart, RotateCcw, Trash } from 'lucide-react';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -29,7 +29,7 @@ export const useChatListActionsBar = (): ChatListActionsBar => {
         label: t('delete', { defaultValue: 'Delete' }),
       },
       delAndRegenerate: {
-        icon: RotateCw,
+        icon: ListRestart,
         key: 'delAndRegenerate',
         label: t('messageAction.delAndRegenerate', {
           defaultValue: 'Delete and regenerate',
@@ -45,7 +45,7 @@ export const useChatListActionsBar = (): ChatListActionsBar => {
         label: t('edit', { defaultValue: 'Edit' }),
       },
       regenerate: {
-        icon: RotateCw,
+        icon: RotateCcw,
         key: 'regenerate',
         label: t('regenerate', { defaultValue: 'Regenerate' }),
       },

package/src/features/PluginDevModal/index.tsx

@@ -41,10 +41,13 @@ const DevModal = memo<DevModalProps>(
       <Flexbox flex={1} gap={12} horizontal justify={'flex-end'}>
         {isEditMode ? (
           <Popconfirm
+            arrow={false}
+            cancelText={t('cancel', { ns: 'common' })}
             okButtonProps={{
               danger: true,
               type: 'primary',
             }}
+            okText={t('ok', { ns: 'common' })}
             onConfirm={() => {
               onDelete?.();
               message.success(t('dev.deleteSuccess'));

package/src/features/PluginStore/PluginItem/Action.tsx

@@ -69,7 +69,9 @@ const Actions = memo<ActionsProps>(({ identifier, type }) => {
                     label: (
                       <Popconfirm
                         arrow={false}
+                        cancelText={t('cancel', { ns: 'common' })}
                         okButtonProps={{ danger: true }}
+                        okText={t('ok', { ns: 'common' })}
                         onConfirm={() => {
                           unInstallPlugin(identifier);
                         }}

package/src/locales/default/chat.ts

@@ -7,6 +7,7 @@ export default {
   confirmClearCurrentMessages: '即将清空当前会话消息，清空后将无法找回，请确认你的操作',
   confirmRemoveSessionItemAlert: '即将删除该助手，删除后该将无法找回，请确认你的操作',
   defaultAgent: '自定义助手',
+  defaultList: '默认列表',
   defaultSession: '自定义助手',
   duplicateTitle: '{{title}} 副本',
   historyRange: '历史范围',
@@ -36,7 +37,18 @@ export default {
   roleAndArchive: '角色与记录',
   searchAgentPlaceholder: '搜索助手和对话...',
   sendPlaceholder: '输入聊天内容...',
-  sessionList: '助手列表',
+  sessionGroup: {
+    config: '分组管理',
+    confirmRemoveGroupAlert: '即将删除该分组，删除后该分组的助手将移动到默认列表，请确认你的操作',
+    createGroup: '添加新分组',
+    createSuccess: '创建成功',
+    inputPlaceholder: '请输入分组名称...',
+    moveGroup: '移动到分组',
+    newGroup: '新分组',
+    rename: '重命名分组',
+    renameSuccess: '重命名成功',
+    tooLong: '分组名称长度需在 1-20 之内',
+  },
   shareModal: {
     download: '下载截图',
     imageType: '图片格式',

package/src/locales/default/common.ts

@@ -44,6 +44,7 @@ export default {
       added: '导入成功',
       errors: '导入出错',
       messages: '消息',
+      sessionGroups: '分组',
       sessions: '助手',
       skips: '重复跳过',
       topics: '话题',

package/src/migrations/FromV2ToV3/fixtures/input-v2-session.json

@@ -0,0 +1,72 @@
+{
+  "exportType": "sessions",
+  "state": {
+    "sessions": [
+      {
+        "config": {
+          "displayMode": "chat",
+          "historyCount": 1,
+          "model": "gpt-3.5-turbo",
+          "params": {
+            "frequency_penalty": 0,
+            "presence_penalty": 0,
+            "temperature": 0.6,
+            "top_p": 1,
+            "max_tokens": 2200
+          },
+          "plugins": [],
+          "systemRole": "你是一名 Postgresql 的数据库专家。用户是一名数据库小白，你需要使用简单直白的方式告诉用户如何使用 ostgresql 和它相应的 orm 工具 primsa",
+          "enableCompressThreshold": false,
+          "enableMaxTokens": false,
+          "inputTemplate": ""
+        },
+        "createdAt": 1698463356269,
+        "id": "06cc3e20-e870-4099-a619-c07a849d742d",
+        "meta": {
+          "avatar": "🐘",
+          "backgroundColor": "rgba(0,0,0,0)",
+          "title": "Postgresql 指南",
+          "description": "PostgreSQL 数据库和 Prisma ORM 工具的简单使用指南",
+          "tags": ["数据库", "PostgreSQL", "教程", "ORM", "Prisma"]
+        },
+        "type": "agent",
+        "updatedAt": 1698463356269,
+        "group": "pinned"
+      },
+      {
+        "config": {
+          "displayMode": "chat",
+          "historyCount": 1,
+          "model": "gpt-3.5-turbo",
+          "params": {
+            "frequency_penalty": 0,
+            "presence_penalty": 0,
+            "temperature": 0.6,
+            "top_p": 1,
+            "max_tokens": 2200
+          },
+          "plugins": [],
+          "systemRole": "你是一名 Postgresql 的数据库专家。用户是一名数据库小白，你需要使用简单直白的方式告诉用户如何使用 ostgresql 和它相应的 orm 工具 primsa",
+          "enableCompressThreshold": false,
+          "enableMaxTokens": false,
+          "inputTemplate": ""
+        },
+        "createdAt": 1698463356269,
+        "id": "06cc3e20-e870-4098-a619-c07a849d74dd",
+        "meta": {
+          "avatar": "🐘",
+          "backgroundColor": "rgba(0,0,0,0)",
+          "title": "Postgresql 指南",
+          "description": "PostgreSQL 数据库和 Prisma ORM 工具的简单使用指南",
+          "tags": ["数据库", "PostgreSQL", "教程", "ORM", "Prisma"]
+        },
+        "type": "agent",
+        "updatedAt": 1698463356269,
+        "group": "default"
+      }
+    ],
+    "topics": [],
+    "messages": []
+  },
+  "version": 2
+}