@lobehub/chat 0.107.4 → 0.107.6

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 0.107.6](https://github.com/lobehub/lobe-chat/compare/v0.107.5...v0.107.6)
+
+<sup>Released on **2023-11-30**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: 修正调用插件查询的显示问题.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: 修正调用插件查询的显示问题 ([671ccef](https://github.com/lobehub/lobe-chat/commit/671ccef))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.107.5](https://github.com/lobehub/lobe-chat/compare/v0.107.4...v0.107.5)
+
+<sup>Released on **2023-11-30**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: 修正调用插件查询的显示问题.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: 修正调用插件查询的显示问题 ([1457fe8](https://github.com/lobehub/lobe-chat/commit/1457fe8))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.107.4](https://github.com/lobehub/lobe-chat/compare/v0.107.3...v0.107.4)
 
 <sup>Released on **2023-11-30**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.107.4",
+  "version": "0.107.6",
   "description": "An open-source, extensible (Function Calling), high-performance chatbot framework. It supports one-click free deployment of your private ChatGPT/LLM web application",
   "keywords": [
     "chatbot",

package/src/database/models/__DEBUG.ts

@@ -34,7 +34,12 @@ class _DEBUG_MODEL extends BaseModel<'sessions'> {
     return array[randomIndex];
   }
 
-  createRandomData = async ({ sessionCount = 10, topicCount = 2000, messageCount = 10_000 }) => {
+  createRandomData = async ({
+    sessionCount = 10,
+    topicCount = 2000,
+    messageCount = 10_000,
+    startIndex = 1,
+  }) => {
     const numberOfSessions = sessionCount;
     const numberOfTopics = topicCount;
     const numberOfMessages = messageCount;
@@ -45,7 +50,7 @@ class _DEBUG_MODEL extends BaseModel<'sessions'> {
     const messagesData: DBModel<DB_Message>[] = [];
 
     // Prepare sessions
-    for (let i = 1; i <= numberOfSessions; i++) {
+    for (let i = startIndex; i < numberOfSessions + startIndex; i++) {
       sessionsData.push({
         config: DEFAULT_AGENT_CONFIG,
         createdAt: this.randomDate(new Date(2020, 0, 1), new Date()),
@@ -61,30 +66,30 @@ class _DEBUG_MODEL extends BaseModel<'sessions'> {
     }
 
     // Prepare topics
-    for (let i = 1; i <= numberOfTopics; i++) {
+    for (let i = startIndex; i < numberOfTopics + startIndex; i++) {
       topicsData.push({
         createdAt: this.randomDate(new Date(2020, 0, 1), new Date()),
         favorite: this.getRandomInt(0, 1),
         id: `topic_${i}`,
-        sessionId: `sess_${this.getRandomInt(1, numberOfSessions)}`,
+        sessionId: `sess_${this.getRandomInt(startIndex, numberOfSessions)}`,
         title: `Topic Title ${i}`,
         updatedAt: this.randomDate(new Date(2020, 0, 1), new Date()),
       });
     }
 
     // Prepare messages
-    for (let i = 1; i <= numberOfMessages; i++) {
+    for (let i = startIndex; i < numberOfMessages + startIndex; i++) {
       messagesData.push({
         content: this.randomString(300),
         createdAt: this.randomDate(new Date(2020, 0, 1), new Date()),
         favorite: this.getRandomInt(0, 1),
         fromModel: 'model',
         id: `msg_${i}`,
-        parentId: `msg_${this.getRandomInt(1, numberOfMessages)}`,
-        quotaId: `msg_${this.getRandomInt(1, numberOfMessages)}`,
+        parentId: `msg_${this.getRandomInt(startIndex, numberOfMessages)}`,
+        quotaId: `msg_${this.getRandomInt(startIndex, numberOfMessages)}`,
         role: this.randomPick(['user', 'assistant']),
-        sessionId: `sess_${this.getRandomInt(1, numberOfSessions)}`,
-        topicId: `topic_${this.getRandomInt(1, numberOfTopics)}`,
+        sessionId: `sess_${this.getRandomInt(startIndex, numberOfSessions)}`,
+        topicId: `topic_${this.getRandomInt(startIndex, numberOfTopics)}`,
         updatedAt: this.randomDate(new Date(2020, 0, 1), new Date()),
       });
     }

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

@@ -260,6 +260,19 @@ describe('MessageModel', () => {
 
       expect(updatedMessage).toHaveProperty('content', 'Updated content');
     });
+
+    it('should update a role and plugins', async () => {
+      const createdMessage = await MessageModel.create(messageData);
+      const updateData = {
+        role: 'function' as const,
+        plugin: { apiName: 'a', identifier: 'b', arguments: 'abc' },
+      };
+
+      await MessageModel.update(createdMessage.id, updateData);
+      const updatedMessage = await MessageModel.findById(createdMessage.id);
+
+      expect(updatedMessage).toHaveProperty('role', 'function');
+    });
   });
 
   describe('batchUpdate', () => {

package/src/services/debug.ts

@@ -2,11 +2,38 @@ import { DEBUG_MODEL } from '@/database/models/__DEBUG';
 
 class DebugService {
   async insertLargeDataToDB() {
-    return DEBUG_MODEL.createRandomData({
-      messageCount: 400_000,
+    await DEBUG_MODEL.createRandomData({
+      messageCount: 100_000,
       sessionCount: 40,
+      startIndex: 0,
       topicCount: 200,
     });
+
+    console.log('已插入10w');
+
+    await DEBUG_MODEL.createRandomData({
+      messageCount: 300_000,
+      sessionCount: 40,
+      startIndex: 100_001,
+      topicCount: 200,
+    });
+    console.log('已插入40w');
+
+    await DEBUG_MODEL.createRandomData({
+      messageCount: 300_000,
+      sessionCount: 40,
+      startIndex: 400_001,
+      topicCount: 200,
+    });
+    console.log('已插入70w');
+
+    await DEBUG_MODEL.createRandomData({
+      messageCount: 300_000,
+      sessionCount: 40,
+      startIndex: 700_001,
+      topicCount: 200,
+    });
+    console.log('已插入100w');
   }
 }
 

package/src/services/message.ts

@@ -1,4 +1,5 @@
 import { CreateMessageParams, MessageModel } from '@/database/models/message';
+import { DB_Message } from '@/database/schemas/message';
 import {
   ChatMessage,
   ChatMessageError,
@@ -64,6 +65,10 @@ export class MessageService {
     return MessageModel.batchUpdate(messageIds, { topicId });
   }
 
+  async updateMessage(id: string, message: Partial<DB_Message>) {
+    return MessageModel.update(id, message);
+  }
+
   async updateMessageRole(id: string, role: LLMRoleType) {
     return MessageModel.update(id, { role });
   }

package/src/store/chat/actions/message.ts

@@ -271,9 +271,9 @@ export const chatMessage: StateCreator<
           topicId: activeTopicId,
         };
         functionId = await messageService.create(functionMessage);
-        await refreshMessages();
       }
 
+      await refreshMessages();
       triggerFunctionCall(functionId);
     }
   },
@@ -287,7 +287,7 @@ export const chatMessage: StateCreator<
     set({ messages }, false, t(`dispatchMessage/${payload.type}`, payload));
   },
   fetchAIChatMessage: async (messages, assistantId) => {
-    const { dispatchMessage, toggleChatLoading, refreshMessages } = get();
+    const { toggleChatLoading, refreshMessages } = get();
 
     const abortController = toggleChatLoading(
       true,
@@ -360,12 +360,13 @@ export const chatMessage: StateCreator<
       onFinish: async (content) => {
         // update the content after fetch result
         await messageService.updateMessageContent(assistantId, content);
+        await refreshMessages();
       },
-      onMessageHandle: (text) => {
+      onMessageHandle: async (text) => {
         output += text;
-        // Note: Don't need change this to  `messageService.updateMessageContent`
-        // because we don't need to update the message content to the database in the middle of the process
-        dispatchMessage({ id: assistantId, key: 'content', type: 'updateMessage', value: output });
+
+        await messageService.updateMessageContent(assistantId, output);
+        await refreshMessages();
 
         // is this message is just a function call
         if (isFunctionMessageAtStart(output)) isFunctionCall = true;

package/src/store/chat/actions/plugin.ts

@@ -81,14 +81,14 @@ export const chatPlugin: StateCreator<
       };
 
       await messageService.updateMessageContent(id, '');
+      await refreshMessages();
     } else {
       if (message.plugin) payload = message.plugin;
     }
 
     if (!payload.apiName) return;
 
-    await messageService.updateMessageRole(id, 'function');
-    await messageService.updateMessagePlugin(id, payload);
+    await messageService.updateMessage(id, { plugin: payload, role: 'function' });
     await refreshMessages();
 
     if (payload.type === 'standalone') {

package/src/store/chat/actions/topic.ts

@@ -97,7 +97,7 @@ export const chatTopic: StateCreator<
       onError: () => {
         updateTopicTitleInSummary(topicId, topic.title);
       },
-      onFinish: (text) => {
+      onFinish: async (text) => {
         topicService.updateTitle(topicId, text);
       },
       onLoadingChange: (loading) => {

package/src/utils/fetch.ts

@@ -27,7 +27,7 @@ export const getMessageError = async (response: Response) => {
 
 export interface FetchSSEOptions {
   onErrorHandle?: (error: ChatMessageError) => void;
-  onFinish?: (text: string) => void;
+  onFinish?: (text: string) => Promise<void>;
   onMessageHandle?: (text: string) => void;
 }
 
@@ -67,7 +67,7 @@ export const fetchSSE = async (fetchFn: () => Promise<Response>, options: FetchS
     options.onMessageHandle?.(chunkValue);
   }
 
-  options?.onFinish?.(output);
+  await options?.onFinish?.(output);
 
   return returnRes;
 };
@@ -78,7 +78,7 @@ interface FetchAITaskResultParams<T> {
    * 错误处理函数
    */
   onError?: (e: Error, rawError?: any) => void;
-  onFinish?: (text: string) => void;
+  onFinish?: (text: string) => Promise<void>;
   /**
    * 加载状态变化处理函数
    * @param loading - 是否处于加载状态