@lobehub/chat 0.107.14 → 0.107.15

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 0.107.15](https://github.com/lobehub/lobe-chat/compare/v0.107.14...v0.107.15)
+
+<sup>Released on **2023-12-03**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix messages flickering when creating topic.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix messages flickering when creating topic, closes [#565](https://github.com/lobehub/lobe-chat/issues/565) ([7127550](https://github.com/lobehub/lobe-chat/commit/7127550))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.107.14](https://github.com/lobehub/lobe-chat/compare/v0.107.13...v0.107.14)
 
 <sup>Released on **2023-12-03**</sup>

package/README.md

@@ -1,4 +1,6 @@
-<a name="readme-top"></a><div align="center">
+<a name="readme-top"></a>
+
+<div align="center">
 
 <img height="120" src="https://registry.npmmirror.com/@lobehub/assets-logo/1.0.0/files/assets/logo-3d.webp">
 <img height="120" src="https://gw.alipayobjects.com/zos/kitchen/qJ3l3EPsdW/split.svg">
@@ -24,7 +26,8 @@ Supports one-click free deployment of your private ChatGPT/LLM web application.
 [![][github-forks-shield]][github-forks-link]
 [![][github-stars-shield]][github-stars-link]
 [![][github-issues-shield]][github-issues-link]
-[![][github-license-shield]][github-license-link]
+[![][github-license-shield]][github-license-link]<br>
+[![](https://img.shields.io/badge/-Sponsor%20LobeHub-f04f88?logo=opencollective&logoColor=white&style=flat-square)](https://opencollective.com/lobehub 'Sponsor LobeHub on open-collective')
 
 **Share LobeChat Repository**
 
@@ -49,9 +52,8 @@ Supports one-click free deployment of your private ChatGPT/LLM web application.
 - [✨ Features](#-features)
 - [⚡️ Performance](#️-performance)
 - [🛳 Self Hosting](#-self-hosting)
-  - [`A` Deploying with Vercel](#a-deploying-with-vercel)
+  - [`A` Deploying with Vercel or Zeabur](#a-deploying-with-vercel-or-zeabur)
   - [`B` Deploying with Docker](#b-deploying-with-docker)
-  - [`C` Deploying with Zeabur](#c-deploying-with-zeabur)
   - [Environment Variable](#environment-variable)
 - [📦 Ecosystem](#-ecosystem)
 - [🧩 Plugins](#-plugins)
@@ -322,18 +324,20 @@ Beside these features, LobeChat also have much better basic technique undergroun
 
 LobeChat provides Self-Hosted Version with Vercel and [Docker Image][docker-release-link]. This allows you to deploy your own chatbot within a few minutes without any prior knowledge.
 
-### `A` Deploying with Vercel
+### `A` Deploying with Vercel or Zeabur
 
-If you want to deploy this service yourself on Vercel, you can follow these steps:
+If you want to deploy this service yourself on either Vercel or Zeabur, you can follow these steps:
 
 - Prepare your [OpenAI API Key](https://platform.openai.com/account/api-keys).
-- Click the button below to start deployment: Deploy with Vercel. Log in directly with your GitHub account, and remember to fill in the `OPENAI_API_KEY`(required) and `ACCESS_CODE` (recommended) on the environment variable section.
+- Click the button below to start deployment: Log in directly with your GitHub account, and remember to fill in the `OPENAI_API_KEY`(required) and `ACCESS_CODE` (recommended) on the environment variable section.
 - After deployment, you can start using it.
 - Bind a custom domain (optional): The DNS of the domain assigned by Vercel is polluted in some areas; binding a custom domain can connect directly.
 
 <div align="center">
 
-[![][deploy-button-image]][deploy-link]
+|           Deploy with Vercel            |                     Deploy with Zeabur                      |
+| :-------------------------------------: | :---------------------------------------------------------: |
+| [![][deploy-button-image]][deploy-link] | [![][deploy-on-zeabur-button-image]][deploy-on-zeabur-link] |
 
 </div>
 
@@ -380,23 +384,6 @@ $ docker run -d -p 3210:3210 \
 
 <br/>
 
-### `C` Deploying with Zeabur
-
-If you want to deploy this service yourself on Zeabur, you can follow these steps:
-
-- Prepare your [OpenAI API Key](https://platform.openai.com/account/api-keys).
-- Click the button below to start deployment: Deploy with Zeabur.
-- You can start using it after the deployment.
-- You can bind a custom domain or use the subdomain provided by Zeabur.
-
-<div align="center">
-
-[![][deploy-on-zeabur-button-image]][deploy-on-zeabur-link]
-
-</div>
-
-<br/>
-
 ### Environment Variable
 
 This project provides some additional configuration items set with environment variables:

package/README.zh-CN.md

@@ -25,7 +25,8 @@ LobeChat 是开源的高性能聊天机器人框架，支持语音合成、多
 [![][github-forks-shield]][github-forks-link]
 [![][github-stars-shield]][github-stars-link]
 [![][github-issues-shield]][github-issues-link]
-[![][github-license-shield]][github-license-link]
+[![][github-license-shield]][github-license-link]<br>
+[![](https://img.shields.io/badge/-Sponsor%20LobeHub-f04f88?logo=opencollective&logoColor=white&style=flat-square)](https://opencollective.com/lobehub 'Sponsor LobeHub on open-collective')
 
 **分享 LobeChat 给你的好友**
 
@@ -48,9 +49,8 @@ LobeChat 是开源的高性能聊天机器人框架，支持语音合成、多
 - [✨ 特性一览](#-特性一览)
 - [⚡️ 性能测试](#️-性能测试)
 - [🛳 开箱即用](#-开箱即用)
-  - [`A` 使用 Vercel 部署](#a-使用-vercel-部署)
+  - [`A` 使用 Vercel 或 Zeabur 部署](#a-使用-vercel-或-zeabur-部署)
   - [`B` 使用 Docker 部署](#b-使用-docker-部署)
-  - [`C` 使用 Zeabur 部署](#c-使用-zeabur-部署)
   - [环境变量](#环境变量)
 - [📦 生态系统](#-生态系统)
 - [🧩 插件体系](#-插件体系)
@@ -296,18 +296,20 @@ LobeChat 提供了 Vercel 的 自托管版本 和 [Docker 镜像][docker-release
 
 <br/>
 
-### `A` 使用 Vercel 部署
+### `A` 使用 Vercel 或 Zeabur 部署
 
-如果想在 Vercel 上部署该服务，可以按照以下步骤进行操作：
+如果想在 Vercel 或 Zeabur 上部署该服务，可以按照以下步骤进行操作：
 
 - 准备好你的 [OpenAI API Key](https://platform.openai.com/account/api-keys) 。
-- 点击下方按钮开始部署： Deploy with Vercel，直接使用 GitHub 账号登录即可，记得在环境变量页填入 `OPENAI_API_KEY` （必填） and `ACCESS_CODE`（推荐）；
+- 点击下方按钮开始部署： 直接使用 GitHub 账号登录即可，记得在环境变量页填入 `OPENAI_API_KEY` （必填） and `ACCESS_CODE`（推荐）；
 - 部署完毕后，即可开始使用；
-- 绑定自定义域名（可选）：Vercel 分配的域名 DNS 在某些区域被污染了，绑定自定义域名即可直连。
+- 绑定自定义域名（可选）：Vercel 分配的域名 DNS 在某些区域被污染了，绑定自定义域名即可直连。目前 Zeabur 提供的域名还未被污染，大多数地区都可以直连。
 
 <div align="center">
 
-[![][deploy-button-image]][deploy-link]
+|            使用 Vercel 部署             |                      使用 Zeabur 部署                       |
+| :-------------------------------------: | :---------------------------------------------------------: |
+| [![][deploy-button-image]][deploy-link] | [![][deploy-on-zeabur-button-image]][deploy-on-zeabur-link] |
 
 </div>
 
@@ -354,23 +356,6 @@ $ docker run -d -p 3210:3210 \
 
 <br/>
 
-### `C` 使用 Zeabur 部署
-
-如果想在 Zeabur 上部署该服务，可以按照以下步骤进行操作：
-
-- 准备好你的 [OpenAI API Key](https://platform.openai.com/account/api-keys) 。
-- 点击下方按钮开始部署： Deploy to Zeabur
-- 部署完毕后，即可开始使用；
-- 绑定自定义域名（可选）：你可以使用 Zeabur 提供的子域名，也可以选择绑定自定义域名。目前 Zeabur 提供的域名还未被污染，大多数地区都可以直连。
-
-<div align="center">
-
-[![][deploy-on-zeabur-button-image]][deploy-on-zeabur-link]
-
-</div>
-
-<br/>
-
 ### 环境变量
 
 本项目提供了一些额外的配置项，使用环境变量进行设置：

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.107.14",
+  "version": "0.107.15",
   "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",
@@ -111,7 +111,7 @@
     "remark-gfm": "^3",
     "remark-html": "^15",
     "semver": "^7",
-    "sharp": "^0.32.6",
+    "sharp": "^0.33.0",
     "swr": "^2",
     "systemjs": "^6",
     "ts-md5": "^1",
@@ -151,7 +151,7 @@
     "eslint": "^8",
     "fake-indexeddb": "^5",
     "husky": "^8",
-    "jsdom": "^22",
+    "jsdom": "^23.0.0",
     "lint-staged": "^15",
     "lodash": "^4",
     "markdown-table": "^3",

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

@@ -1,6 +1,9 @@
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { CreateMessageParams, MessageModel } from '@/database/models/message';
+import { DB_Message } from '@/database/schemas/message';
+import { nanoid } from '@/utils/uuid';
+import * as uuidUtils from '@/utils/uuid';
 
 import { CreateTopicParams, QueryTopicParams, TopicModel } from '../topic';
 
@@ -54,6 +57,43 @@ describe('TopicModel', () => {
         }),
       );
     });
+
+    it('should update messages with the new topic id when messages are provided', async () => {
+      const messagesToUpdate = [nanoid(), nanoid()];
+      // 假设这些消息存在于数据库中
+      for (const messageId of messagesToUpdate) {
+        await MessageModel.table.add({ id: messageId, text: 'Sample message', topicId: null });
+      }
+
+      const topicDataWithMessages = {
+        ...topicData,
+        messages: messagesToUpdate,
+      };
+
+      const topic = await TopicModel.create(topicDataWithMessages);
+      expect(topic).toHaveProperty('id');
+
+      // 验证数据库中的消息是否已更新
+      const updatedMessages: DB_Message[] = await MessageModel.table
+        .where('id')
+        .anyOf(messagesToUpdate)
+        .toArray();
+
+      expect(updatedMessages).toHaveLength(messagesToUpdate.length);
+      for (const message of updatedMessages) {
+        expect(message.topicId).toEqual(topic.id);
+      }
+    });
+
+    it('should create a topic with a unique id when no id is provided', async () => {
+      const spy = vi.spyOn(uuidUtils, 'nanoid'); // 使用 Vitest 的 spy 功能来监视 nanoid 调用
+      const result = await TopicModel.create(topicData);
+
+      expect(spy).toHaveBeenCalled(); // 验证 nanoid 被调用来生成 id
+      expect(result).toHaveProperty('id');
+      expect(typeof result.id).toBe('string');
+      spy.mockRestore(); // 测试结束后恢复原始行为
+    });
   });
   describe('batch create', () => {
     it('should batch create topic records', async () => {

package/src/database/models/topic.ts

@@ -5,6 +5,7 @@ import { nanoid } from '@/utils/uuid';
 
 export interface CreateTopicParams {
   favorite?: boolean;
+  messages?: string[];
   sessionId: string;
   title: string;
 }
@@ -20,8 +21,14 @@ class _TopicModel extends BaseModel {
     super('topics', DB_TopicSchema);
   }
 
-  async create({ title, favorite, sessionId }: CreateTopicParams, id = nanoid()) {
-    return this._add({ favorite: favorite ? 1 : 0, sessionId, title: title }, id);
+  async create({ title, favorite, sessionId, messages }: CreateTopicParams, id = nanoid()) {
+    const topic = await this._add({ favorite: favorite ? 1 : 0, sessionId, title: title }, id);
+
+    // add topicId to these messages
+    if (messages) {
+      await this.db.messages.where('id').anyOf(messages).modify({ topicId: topic.id });
+    }
+    return topic;
   }
 
   async batchCreate(topics: CreateTopicParams[]) {

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

@@ -60,23 +60,17 @@ export const chatTopic: StateCreator<
     const messages = chatSelectors.currentChats(get());
     if (messages.length === 0) return;
 
-    const { activeId, summaryTopicTitle, refreshTopic, refreshMessages } = get();
+    const { activeId, summaryTopicTitle, refreshTopic } = get();
 
-    // 1. create topic
+    // 1. create topic and bind these messages
     const topicId = await topicService.createTopic({
       sessionId: activeId,
       title: t('topic.defaultTitle', { ns: 'chat' }),
+      messages: messages.map((m) => m.id),
     });
     await refreshTopic();
 
-    // 2.add topicId to these message
-    await messageService.bindMessagesToTopic(
-      topicId,
-      messages.map((m) => m.id),
-    );
-    await refreshMessages();
-
-    // 3. auto summary topic Title
+    // 2. auto summary topic Title
     // we don't need to wait for summary, just let it run async
     summaryTopicTitle(topicId, messages);