@lobehub/chat 0.12.0 → 0.12.1

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 0.12.1](https://github.com/lobehub/lobe-chat/compare/v0.12.0...v0.12.1)
+
+<sup>Released on **2023-07-23**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: 修正 message parentId 不正确的问题.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: 修正 message parentId 不正确的问题 ([f86852a](https://github.com/lobehub/lobe-chat/commit/f86852a))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 0.12.0](https://github.com/lobehub/lobe-chat/compare/v0.11.0...v0.12.0)
 
 <sup>Released on **2023-07-23**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Lobe Chat is an open-source chatbot client using LangChain, Typescript and Next.js",
   "keywords": [
     "chatbot",

package/src/pages/chat/[id]/Conversation/Input/Action.tsx

@@ -0,0 +1,24 @@
+import { ActionIcon } from '@lobehub/ui';
+import { Popconfirm } from 'antd';
+import { Eraser, Languages } from 'lucide-react';
+import { memo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { shallow } from 'zustand/shallow';
+
+import { useSessionStore } from '@/store/session';
+
+const InputActions = memo(() => {
+  const { t } = useTranslation();
+  const [clearMessage] = useSessionStore((s) => [s.clearMessage], shallow);
+
+  return (
+    <>
+      <ActionIcon icon={Languages} />
+      <Popconfirm onConfirm={() => clearMessage()} title={t('confirmClearCurrentMessages')}>
+        <ActionIcon icon={Eraser} title={t('clearCurrentMessages')} />
+      </Popconfirm>
+    </>
+  );
+});
+
+export default InputActions;

package/src/pages/chat/[id]/Conversation/Input/Token.tsx

@@ -0,0 +1,32 @@
+import { TokenTag, Tooltip } from '@lobehub/ui';
+import { encode } from 'gpt-tokenizer';
+import { memo, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { shallow } from 'zustand/shallow';
+
+import { ModelTokens } from '@/const/modelTokens';
+import { agentSelectors, chatSelectors, useSessionStore } from '@/store/session';
+
+const Token = memo<{ input: string }>(({ input }) => {
+  const { t } = useTranslation();
+
+  const inputTokenCount = useMemo(() => encode(input).length, [input]);
+
+  const [totalToken, systemRoleToken, chatsToken, model] = useSessionStore(
+    (s) => [
+      chatSelectors.totalTokenCount(s),
+      chatSelectors.systemRoleTokenCount(s),
+      chatSelectors.chatsTokenCount(s),
+      agentSelectors.currentAgentModel(s),
+    ],
+    shallow,
+  );
+
+  return (
+    <Tooltip title={t('tokenDetail', { chatsToken, systemRoleToken })}>
+      <TokenTag maxValue={ModelTokens[model]} value={totalToken + inputTokenCount} />
+    </Tooltip>
+  );
+});
+
+export default Token;

package/src/pages/chat/[id]/Conversation/Input/index.tsx

@@ -0,0 +1,62 @@
+import { ChatInputArea, DraggablePanel, Icon } from '@lobehub/ui';
+import { Button } from 'antd';
+import { Archive } from 'lucide-react';
+import { memo, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { shallow } from 'zustand/shallow';
+
+import { CHAT_TEXTAREA_HEIGHT, HEADER_HEIGHT } from '@/const/layoutTokens';
+import { useSessionStore } from '@/store/session';
+import { useSettings } from '@/store/settings';
+
+import InputActions from './Action';
+import Token from './Token';
+
+const ChatInput = () => {
+  const { t } = useTranslation();
+  const [expand, setExpand] = useState<boolean>(false);
+  const [text, setText] = useState('');
+
+  const [inputHeight] = useSettings((s) => [s.inputHeight], shallow);
+  const [sendMessage] = useSessionStore((s) => [s.createOrSendMsg], shallow);
+
+  const footer = useMemo(
+    () => <Button icon={<Icon icon={Archive} title={t('archiveCurrentMessages')} />} />,
+    [],
+  );
+
+  return (
+    <DraggablePanel
+      expandable={false}
+      fullscreen={expand}
+      headerHeight={HEADER_HEIGHT}
+      minHeight={CHAT_TEXTAREA_HEIGHT}
+      onSizeChange={(_, size) => {
+        if (!size) return;
+        useSettings.setState({
+          inputHeight: typeof size.height === 'string' ? Number.parseInt(size.height) : size.height,
+        });
+      }}
+      placement="bottom"
+      size={{ height: inputHeight, width: '100%' }}
+      style={{ zIndex: 10 }}
+    >
+      <ChatInputArea
+        actions={
+          <>
+            <InputActions />
+            <Token input={text} />
+          </>
+        }
+        expand={expand}
+        footer={footer}
+        minHeight={CHAT_TEXTAREA_HEIGHT}
+        onExpandChange={setExpand}
+        onInputChange={setText}
+        onSend={sendMessage}
+      />
+    </DraggablePanel>
+  );
+};
+
+export default memo(ChatInput);

package/src/pages/chat/[id]/Conversation/index.tsx

@@ -2,9 +2,9 @@ import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import HeaderSpacing from '@/components/HeaderSpacing';
-import ChatInput from '@/pages/chat/[id]/Conversation/Input';
 
 import ChatList from './ChatList';
+import ChatInput from './Input';
 
 const Conversation = () => {
   return (

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

@@ -50,7 +50,7 @@ export interface ChatAction {
    * @param messages - 聊天消息数组
    * @param parentId - 父消息 ID，可选
    */
-  realFetchAIResponse: (messages: ChatMessage[], parentId?: string) => Promise<void>;
+  realFetchAIResponse: (messages: ChatMessage[], parentId: string) => Promise<void>;
   /**
    * 重新发送消息
    * @param id - 消息 ID
@@ -116,7 +116,7 @@ export const createChatSlice: StateCreator<
     set({ editingMessageId: messageId });
   },
 
-  realFetchAIResponse: async (messages: ChatMessage[], parentId?: string) => {
+  realFetchAIResponse: async (messages, userMessageId) => {
     const { dispatchMessage, generateMessage } = get();
 
     // 添加 systemRole
@@ -128,12 +128,11 @@ export const createChatSlice: StateCreator<
     // 再添加一个空的信息用于放置 ai 响应，注意顺序不能反
     // 因为如果顺序反了，messages 中将包含新增的 ai message
     const assistantId = nanoid();
-    const userId = parentId ?? nanoid();
 
     dispatchMessage({
       id: assistantId,
       message: LOADING_FLAT,
-      parentId: userId,
+      parentId: userMessageId,
       role: 'assistant',
       type: 'addMessage',
     });
@@ -209,7 +208,7 @@ export const createChatSlice: StateCreator<
     // 先拿到当前的 messages
     const messages = chatSelectors.currentChats(get());
 
-    await realFetchAIResponse(messages);
+    await realFetchAIResponse(messages, userId);
 
     const chats = chatSelectors.currentChats(get());
     if (chats.length >= 4) {

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

@@ -5,57 +5,17 @@ import { ChatMessage } from '@/types/chatMessage';
 import type { SessionStore } from '../../../store';
 import { DEFAULT_AVATAR } from '../../agentConfig';
 import { sessionSelectors } from '../../session';
+import { organizeChats } from './utils';
 
 // 展示在聊天框中的消息
 export const currentChats = (s: SessionStore): ChatMessage[] => {
   const session = sessionSelectors.currentSession(s);
   if (!session) return [];
 
-  const basic = Object.values<ChatMessage>(session.chats)
-    // 首先按照时间顺序排序，越早的在越前面
-    .sort((pre, next) => pre.createAt - next.createAt)
-    // 过滤掉已归档的消息，归档消息不应该出现在聊天框中
-    .filter((m) => !m.archive)
-    // 映射头像关系
-    .map((m) => {
-      return {
-        ...m,
-        meta:
-          m.role === 'assistant'
-            ? {
-                avatar: agentSelectors.currentAgentAvatar(s),
-                title: session.meta.title,
-              }
-            : m.role === 'user'
-            ? {
-                avatar: useSettings.getState().settings.avatar || DEFAULT_AVATAR,
-              }
-            : m.meta,
-      };
-    });
-
-  const finalList: ChatMessage[] = [];
-
-  const addItem = (item: ChatMessage) => {
-    const isExist = finalList.findIndex((i) => item.id === i.id) > -1;
-    if (!isExist) {
-      finalList.push(item);
-    }
-  };
-
-  // 基于添加逻辑进行重排序
-  for (const item of basic) {
-    // 先判存在与否，不存在就加入
-    addItem(item);
-
-    for (const another of basic) {
-      if (another.parentId === item.id) {
-        addItem(another);
-      }
-    }
-  }
-
-  return finalList;
+  return organizeChats(session, {
+    assistant: agentSelectors.currentAgentAvatar(s),
+    user: useSettings.getState().settings.avatar || DEFAULT_AVATAR,
+  });
 };
 
 export const systemRoleSel = (s: SessionStore): string => {

package/src/store/session/slices/chat/selectors/utils.test.ts

@@ -0,0 +1,264 @@
+import { beforeEach } from 'vitest';
+
+import { LobeAgentSession } from '@/types/session';
+
+import { organizeChats } from './utils';
+
+let session: LobeAgentSession;
+
+beforeEach(() => {
+  session = {
+    chats: {
+      '1': {
+        id: '1',
+        createAt: 1639440000000,
+        updateAt: 1639440000000,
+        meta: {},
+        content: 'Message 1',
+        role: 'assistant',
+      },
+      '2': {
+        id: '2',
+        createAt: 1639450000000,
+        updateAt: 1639450000000,
+        meta: {},
+        content: 'Message 2',
+        role: 'user',
+      },
+      '3': {
+        id: '3',
+        createAt: 1639460000000,
+        updateAt: 1639460000000,
+        meta: {},
+        content: 'Message 3',
+        role: 'assistant',
+      },
+    },
+    config: {
+      model: 'gpt-4',
+      params: {
+        temperature: 0.6,
+      },
+      systemRole: '',
+    },
+    type: 'agent',
+    createAt: 1690110700808,
+    id: 'abc',
+    meta: {},
+    updateAt: 1690110700808,
+  } as LobeAgentSession;
+});
+
+describe('organizeChats', () => {
+  it('should return an array of chat messages', () => {
+    const result = organizeChats(session, { assistant: '', user: '' });
+    expect(Array.isArray(result)).toBe(true);
+    expect(result.length).toBe(3);
+    expect(result[0].id).toBe('1');
+    expect(result[1].id).toBe('2');
+    expect(result[2].id).toBe('3');
+  });
+
+  it('should sort chat messages in ascending order of createAt', () => {
+    const result = organizeChats(session, { assistant: '', user: '' });
+    expect(result[0].id).toBe('1');
+    expect(result[1].id).toBe('2');
+    expect(result[2].id).toBe('3');
+  });
+
+  it('should filter out archived messages', () => {
+    session.chats['2'].archive = true;
+    const result = organizeChats(session, { assistant: '', user: '' });
+    expect(result.length).toBe(2);
+    expect(result[0].id).toBe('1');
+    expect(result[1].id).toBe('3');
+  });
+
+  it('should map avatars correctly', () => {
+    const avatar = 'https://example.com/avatar.png';
+    const settings = {
+      avatar: 'https://example.com/user-avatar.png',
+    };
+
+    const result = organizeChats(session, {
+      assistant: avatar,
+      user: settings.avatar,
+    });
+
+    expect(result[0].meta.avatar).toBe(avatar);
+    expect(result[1].meta.avatar).toBe(settings.avatar);
+    expect(result[2].meta.avatar).toBe(avatar);
+  });
+
+  it('should reorder messages based on parent-child relationship', () => {
+    session.chats['2'].parentId = '1';
+    session.chats['3'].parentId = '2';
+    const result = organizeChats(session, { assistant: '', user: '' });
+    expect(result.length).toBe(3);
+    expect(result[0].id).toBe('1');
+    expect(result[1].id).toBe('2');
+    expect(result[2].id).toBe('3');
+  });
+
+  it('should remove duplicate messages', () => {
+    session.chats['2'].parentId = '1';
+    session.chats['3'].parentId = '2';
+    session.chats['3'].id = '2';
+    const result = organizeChats(session, { assistant: '', user: '' });
+    expect(result.length).toBe(2);
+    expect(result[0].id).toBe('1');
+    expect(result[1].id).toBe('2');
+  });
+
+  it('should return an empty array for empty session', () => {
+    const emptySession = {
+      chats: {},
+      config: {},
+      type: 'agent',
+    } as LobeAgentSession;
+    const result = organizeChats(emptySession, { assistant: '', user: '' });
+    expect(Array.isArray(result)).toBe(true);
+    expect(result.length).toBe(0);
+  });
+
+  it('should handle large number of chat messages', () => {
+    const largeSession = {
+      chats: {},
+      config: {},
+      type: 'agent',
+      meta: {},
+    } as LobeAgentSession;
+
+    const numMessages = 1000;
+
+    for (let i = 1; i <= numMessages; i++) {
+      largeSession.chats[i.toString()] = {
+        id: i.toString(),
+        createAt: i,
+        updateAt: i,
+        meta: {},
+        content: `Message ${i}`,
+        role: 'assistant',
+      };
+    }
+
+    const result = organizeChats(largeSession, { assistant: '', user: '' });
+    expect(result.length).toBe(numMessages);
+    expect(result[0].id).toBe('1');
+    expect(result[numMessages - 1].id).toBe(numMessages.toString());
+  });
+
+  it('按照预期进行排序', () => {
+    const realSession = {
+      chats: {
+        'Ftei28dF': {
+          content: '鲁迅为何暴打周树人',
+          createAt: 1690111354731,
+          id: 'Ftei28dF',
+          meta: {},
+          role: 'user',
+          updateAt: 1690111354731,
+        },
+        '9bQW9hTs': {
+          content:
+            '这是一种误解。鲁迅和周树人是同一人，指的都是现代文学家周樟寿。"鲁迅"是他的笔名，"周树人"则是他的原名。所以，鲁迅并没有暴打周树人，这只是一种说法上的误解。',
+          createAt: 1690111354734,
+          id: '9bQW9hTs',
+          meta: {},
+          parentId: 'Ftei28dF',
+          role: 'assistant',
+          updateAt: 1690111361514,
+          extra: {
+            fromModel: 'gpt-4',
+          },
+        },
+        'HRQGSszU': {
+          content:
+            '这个问题基于一个误解。实际上，鲁迅和周树人是同一个人，这是中国现代文学的开山鼻祖周树人的笔名。他的本名是周树人，鲁迅则是他在30岁时开始使用的笔名。因此，鲁迅不能暴打周树人，因为他们是同一个人。',
+          createAt: 1690111364344,
+          id: 'HRQGSszU',
+          meta: {},
+          parentId: 'Ftei28dF',
+          role: 'assistant',
+          updateAt: 1690111369519,
+          extra: {
+            fromModel: 'gpt-4',
+          },
+        },
+        '981qr9n0': {
+          content:
+            '这是一个误解。鲁迅和周树人是同一个人，是中国现代文学的奠基人。鲁迅是他的笔名，周树人是他的本名。所以，鲁迅不可能暴打周树人。这种说法可能是源于一些误解或误传。',
+          createAt: 1690111375456,
+          id: '981qr9n0',
+          meta: {},
+          parentId: 'Ftei28dF',
+          role: 'assistant',
+          updateAt: 1690111381458,
+          extra: {
+            fromModel: 'gpt-4',
+          },
+        },
+        'ddd': {
+          content: '鲁迅是谁',
+          createAt: 1690211354731,
+          id: 'ddd',
+          meta: {},
+          role: 'user',
+          updateAt: 1690211354731,
+        },
+      },
+      config: {
+        model: 'gpt-4',
+        params: {
+          temperature: 0.6,
+        },
+        systemRole: '',
+      },
+      createAt: 1690110700808,
+      id: '1515e861-0c64-49a3-bb85-2b24d65a19d6',
+      meta: {},
+      type: 'agent',
+      updateAt: 1690110700808,
+    } as LobeAgentSession;
+
+    const result = organizeChats(realSession, { assistant: '', user: '' });
+
+    expect(
+      result.map((i) => ({ id: i.id, content: i.content, role: i.role, createAt: i.createAt })),
+    ).toEqual([
+      {
+        content: '鲁迅为何暴打周树人',
+        createAt: 1690111354731,
+        id: 'Ftei28dF',
+        role: 'user',
+      },
+      {
+        content:
+          '这是一种误解。鲁迅和周树人是同一人，指的都是现代文学家周樟寿。"鲁迅"是他的笔名，"周树人"则是他的原名。所以，鲁迅并没有暴打周树人，这只是一种说法上的误解。',
+        createAt: 1690111354734,
+        id: '9bQW9hTs',
+        role: 'assistant',
+      },
+      {
+        content:
+          '这个问题基于一个误解。实际上，鲁迅和周树人是同一个人，这是中国现代文学的开山鼻祖周树人的笔名。他的本名是周树人，鲁迅则是他在30岁时开始使用的笔名。因此，鲁迅不能暴打周树人，因为他们是同一个人。',
+        createAt: 1690111364344,
+        id: 'HRQGSszU',
+        role: 'assistant',
+      },
+      {
+        content:
+          '这是一个误解。鲁迅和周树人是同一个人，是中国现代文学的奠基人。鲁迅是他的笔名，周树人是他的本名。所以，鲁迅不可能暴打周树人。这种说法可能是源于一些误解或误传。',
+        createAt: 1690111375456,
+        id: '981qr9n0',
+        role: 'assistant',
+      },
+      {
+        content: '鲁迅是谁',
+        createAt: 1690211354731,
+        id: 'ddd',
+        role: 'user',
+      },
+    ]);
+  });
+});

package/src/store/session/slices/chat/selectors/utils.ts

@@ -0,0 +1,53 @@
+import { ChatMessage } from '@/types/chatMessage';
+import { LobeAgentSession } from '@/types/session';
+
+export const organizeChats = (
+  session: LobeAgentSession,
+  avatar: { assistant: string; user: string },
+) => {
+  const basic = Object.values<ChatMessage>(session.chats)
+    // 首先按照时间顺序排序，越早的在越前面
+    .sort((pre, next) => pre.createAt - next.createAt)
+    // 过滤掉已归档的消息，归档消息不应该出现在聊天框中
+    .filter((m) => !m.archive)
+    // 映射头像关系
+    .map((m) => {
+      return {
+        ...m,
+        meta:
+          m.role === 'assistant'
+            ? {
+                avatar: avatar.assistant,
+                title: session.meta.title,
+              }
+            : m.role === 'user'
+            ? {
+                avatar: avatar.user,
+              }
+            : m.meta,
+      };
+    });
+
+  const finalList: ChatMessage[] = [];
+
+  const addItem = (item: ChatMessage) => {
+    const isExist = finalList.findIndex((i) => item.id === i.id) > -1;
+    if (!isExist) {
+      finalList.push(item);
+    }
+  };
+
+  // 基于添加逻辑进行重排序
+  for (const item of basic) {
+    // 先判存在与否，不存在就加入
+    addItem(item);
+
+    for (const another of basic) {
+      if (another.parentId === item.id) {
+        addItem(another);
+      }
+    }
+  }
+
+  return finalList;
+};

package/src/pages/chat/[id]/Conversation/Input.tsx

@@ -1,73 +0,0 @@
-import { ActionIcon, ChatInputArea, DraggablePanel, Icon, TokenTag, Tooltip } from '@lobehub/ui';
-import { Button, Popconfirm } from 'antd';
-import { encode } from 'gpt-tokenizer';
-import { Archive, Eraser, Languages } from 'lucide-react';
-import { memo, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { shallow } from 'zustand/shallow';
-
-import { CHAT_TEXTAREA_HEIGHT, HEADER_HEIGHT } from '@/const/layoutTokens';
-import { ModelTokens } from '@/const/modelTokens';
-import { agentSelectors, chatSelectors, useSessionStore } from '@/store/session';
-import { useSettings } from '@/store/settings';
-
-const ChatInput = () => {
-  const { t } = useTranslation();
-  const [expand, setExpand] = useState<boolean>(false);
-  const [text, setText] = useState('');
-  const inputTokenCount = useMemo(() => encode(text).length, [text]);
-
-  const [inputHeight] = useSettings((s) => [s.inputHeight], shallow);
-  const [totalToken, systemRoleToken, chatsToken, model, sendMessage, clearMessage] =
-    useSessionStore(
-      (s) => [
-        chatSelectors.totalTokenCount(s),
-        chatSelectors.systemRoleTokenCount(s),
-        chatSelectors.chatsTokenCount(s),
-        agentSelectors.currentAgentModel(s),
-        s.createOrSendMsg,
-        s.clearMessage,
-      ],
-      shallow,
-    );
-
-  return (
-    <DraggablePanel
-      expandable={false}
-      fullscreen={expand}
-      headerHeight={HEADER_HEIGHT}
-      minHeight={CHAT_TEXTAREA_HEIGHT}
-      onSizeChange={(_, size) => {
-        if (!size) return;
-        useSettings.setState({
-          inputHeight: typeof size.height === 'string' ? Number.parseInt(size.height) : size.height,
-        });
-      }}
-      placement="bottom"
-      size={{ height: inputHeight, width: '100%' }}
-      style={{ zIndex: 10 }}
-    >
-      <ChatInputArea
-        actions={
-          <>
-            <ActionIcon icon={Languages} />
-            <Popconfirm onConfirm={() => clearMessage()} title={t('confirmClearCurrentMessages')}>
-              <ActionIcon icon={Eraser} title={t('clearCurrentMessages')} />
-            </Popconfirm>
-            <Tooltip title={t('tokenDetail', { chatsToken, systemRoleToken })}>
-              <TokenTag maxValue={ModelTokens[model]} value={totalToken + inputTokenCount} />
-            </Tooltip>
-          </>
-        }
-        expand={expand}
-        footer={<Button icon={<Icon icon={Archive} title={t('archiveCurrentMessages')} />} />}
-        minHeight={CHAT_TEXTAREA_HEIGHT}
-        onExpandChange={setExpand}
-        onInputChange={setText}
-        onSend={sendMessage}
-      />
-    </DraggablePanel>
-  );
-};
-
-export default memo(ChatInput);