@lobehub/chat 1.36.30 → 1.36.32

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 1.36.32](https://github.com/lobehub/lobe-chat/compare/v1.36.31...v1.36.32)
+
+<sup>Released on **2024-12-17**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor the drizzle code style.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor the drizzle code style, closes [#5058](https://github.com/lobehub/lobe-chat/issues/5058) ([4057ad3](https://github.com/lobehub/lobe-chat/commit/4057ad3))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.36.31](https://github.com/lobehub/lobe-chat/compare/v1.36.30...v1.36.31)
+
+<sup>Released on **2024-12-17**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor the data fetch with clientDB init check.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor the data fetch with clientDB init check, closes [#5049](https://github.com/lobehub/lobe-chat/issues/5049) ([e6d2e09](https://github.com/lobehub/lobe-chat/commit/e6d2e09))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.36.30](https://github.com/lobehub/lobe-chat/compare/v1.36.29...v1.36.30)
 
 <sup>Released on **2024-12-16**</sup>

package/changelog/v1.json

@@ -1,4 +1,22 @@
 [
+  {
+    "children": {
+      "improvements": [
+        "Refactor the drizzle code style."
+      ]
+    },
+    "date": "2024-12-17",
+    "version": "1.36.32"
+  },
+  {
+    "children": {
+      "improvements": [
+        "Refactor the data fetch with clientDB init check."
+      ]
+    },
+    "date": "2024-12-17",
+    "version": "1.36.31"
+  },
   {
     "children": {
       "improvements": [

package/docs/self-hosting/environment-variables/model-provider.mdx

@@ -288,6 +288,13 @@ If you need to use Azure OpenAI to provide model services, you can refer to the
 - Default: `https://api.Perplexity.ai`
 - Example: `https://my-Perplexity-proxy.com`
 
+### `PERPLEXITY_MODEL_LIST`
+
+- Type: Optional
+- Description: Used to control the model list, use `+` to add a model, use `-` to hide a model, use `model_name=display_name` to customize the display name of a model, separated by commas. Definition syntax rules see
+- Default: `-`
+- Example: `-all,+llama-3.1-sonar-small-128k-online,+llama-3.1-sonar-small-128k-chat`
+
 ## Minimax AI
 
 ### `MINIMAX_API_KEY`

package/docs/self-hosting/environment-variables/model-provider.zh-CN.mdx

@@ -279,6 +279,13 @@ LobeChat 在部署时提供了丰富的模型服务商相关的环境变量，
 - 默认值：-
 - 示例：`pplx-xxxxxx...xxxxxx`
 
+### `PERPLEXITY_MODEL_LIST`
+
+- 类型：可选
+- 描述：用于指定自定义 Perplexity 语言模型。模型定义语法规则见 [模型列表][model-list]
+- 默认值：-
+- 示例： `-all,+llama-3.1-sonar-small-128k-online,+llama-3.1-sonar-small-128k-chat`
+
 ### `PERPLEXITY_PROXY_URL`
 
 - 类型：可选

package/docs/self-hosting/server-database/dokploy.zh-CN.mdx

@@ -1,15 +1,15 @@
----
-title: 在 Dokploy 上部署 LobeChat 的服务端数据库版本
-description: 本文详细介绍如何在 Dokploy 中部署服务端数据库版 LobeChat，包括数据库配置、身份验证服务配置的设置步骤。
-tags:
-  - 服务端数据库
-  - Postgres
-  - Clerk
-  - Dokploy部署
-  - 数据库配置
-  - 身份验证服务
-  - 环境变量配置
----
+---
+title: 在 Dokploy 上部署 LobeChat 的服务端数据库版本
+description: 本文详细介绍如何在 Dokploy 中部署服务端数据库版 LobeChat，包括数据库配置、身份验证服务配置的设置步骤。
+tags:
+  - 服务端数据库
+  - Postgres
+  - Clerk
+  - Dokploy部署
+  - 数据库配置
+  - 身份验证服务
+  - 环境变量配置
+---
 
 # 在 Dokploy 上部署服务端数据库版
 本文将详细介绍如何在 Dokploy 中部署服务端数据库版 LobeChat。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.36.30",
+  "version": "1.36.32",
   "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/(main)/chat/(workspace)/@conversation/features/ChatList/Content.tsx

@@ -3,9 +3,9 @@
 import React, { memo, useCallback } from 'react';
 
 import { SkeletonList, VirtualizedList } from '@/features/Conversation';
+import { useFetchMessages } from '@/hooks/useFetchMessages';
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
-import { useSessionStore } from '@/store/session';
 
 import MainChatItem from './ChatItem';
 import Welcome from './WelcomeChatItem';
@@ -15,15 +15,9 @@ interface ListProps {
 }
 
 const Content = memo<ListProps>(({ mobile }) => {
-  const [activeTopicId, useFetchMessages, isCurrentChatLoaded] = useChatStore((s) => [
-    s.activeTopicId,
-    s.useFetchMessages,
-    chatSelectors.isCurrentChatLoaded(s),
-  ]);
-
-  const [sessionId] = useSessionStore((s) => [s.activeId]);
-  useFetchMessages(sessionId, activeTopicId);
+  const [isCurrentChatLoaded] = useChatStore((s) => [chatSelectors.isCurrentChatLoaded(s)]);
 
+  useFetchMessages();
   const data = useChatStore(chatSelectors.mainDisplayChatIDs);
 
   const itemContent = useCallback(

package/src/app/(main)/chat/(workspace)/@conversation/features/ThreadHydration.tsx

@@ -4,6 +4,7 @@ import { useQueryState } from 'nuqs';
 import { memo, useEffect, useLayoutEffect } from 'react';
 import { createStoreUpdater } from 'zustand-utils';
 
+import { useFetchThreads } from '@/hooks/useFetchThreads';
 import { useChatStore } from '@/store/chat';
 
 // sync outside state to useChatStore
@@ -34,10 +35,7 @@ const ThreadHydration = memo(() => {
     }
   }, [portalThread]);
 
-  const [activeTopicId, useFetchThreads] = useChatStore((s) => [
-    s.activeTopicId,
-    s.useFetchThreads,
-  ]);
+  const activeTopicId = useChatStore((s) => s.activeTopicId);
 
   useFetchThreads(activeTopicId);
 

package/src/app/(main)/chat/@session/features/SessionListContent/DefaultMode.tsx

@@ -3,12 +3,11 @@ import isEqual from 'fast-deep-equal';
 import { memo, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useFetchSessions } from '@/hooks/useFetchSessions';
 import { useGlobalStore } from '@/store/global';
 import { systemStatusSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionSelectors } from '@/store/session/selectors';
-import { useUserStore } from '@/store/user';
-import { authSelectors } from '@/store/user/selectors';
 import { SessionDefaultGroup } from '@/types/session';
 
 import Actions from '../SessionListContent/CollapseGroup/Actions';
@@ -25,9 +24,7 @@ const DefaultMode = memo(() => {
   const [renameGroupModalOpen, setRenameGroupModalOpen] = useState(false);
   const [configGroupModalOpen, setConfigGroupModalOpen] = useState(false);
 
-  const isLogin = useUserStore(authSelectors.isLogin);
-  const [useFetchSessions] = useSessionStore((s) => [s.useFetchSessions]);
-  useFetchSessions(isLogin);
+  useFetchSessions();
 
   const defaultSessions = useSessionStore(sessionSelectors.defaultSessions, isEqual);
   const customSessionGroups = useSessionStore(sessionSelectors.customSessionGroups, isEqual);

package/src/app/(main)/discover/(detail)/plugin/[slug]/features/InstallPlugin.tsx

@@ -5,6 +5,7 @@ import { createStyles } from 'antd-style';
 import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useFetchInstalledPlugins } from '@/hooks/useFetchInstalledPlugins';
 import { useToolStore } from '@/store/tool';
 import { pluginSelectors, pluginStoreSelectors } from '@/store/tool/selectors';
 
@@ -21,21 +22,15 @@ const InstallPlugin = memo<{ identifier: string }>(({ identifier }) => {
   const { t } = useTranslation(['discover', 'plugin']);
   const [loading, setLoading] = useState(false);
   const { modal } = App.useApp();
-  const [
-    useFetchPluginStore,
-    useFetchInstalledPlugins,
-    installed,
-    installing,
-    installPlugin,
-    unInstallPlugin,
-  ] = useToolStore((s) => [
-    s.useFetchPluginStore,
-    s.useFetchInstalledPlugins,
-    pluginSelectors.isPluginInstalled(identifier)(s),
-    pluginStoreSelectors.isPluginInstallLoading(identifier)(s),
-    s.installPlugin,
-    s.uninstallPlugin,
-  ]);
+  const [useFetchPluginStore, installed, installing, installPlugin, unInstallPlugin] = useToolStore(
+    (s) => [
+      s.useFetchPluginStore,
+      pluginSelectors.isPluginInstalled(identifier)(s),
+      pluginStoreSelectors.isPluginInstallLoading(identifier)(s),
+      s.installPlugin,
+      s.uninstallPlugin,
+    ],
+  );
 
   const { isLoading } = useFetchPluginStore();
   const { isLoading: installedPluginLoading } = useFetchInstalledPlugins();

package/src/database/repositories/dataImporter/__tests__/index.test.ts

@@ -1,8 +1,7 @@
 // @vitest-environment node
-import { eq, inArray } from 'drizzle-orm';
+import { eq, inArray } from 'drizzle-orm/expressions';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { getTestDBInstance } from '@/database/server/core/dbForTest';
 import {
   agents,
   agentsToSessions,
@@ -12,6 +11,7 @@ import {
   topics,
   users,
 } from '@/database/schemas';
+import { getTestDBInstance } from '@/database/server/core/dbForTest';
 import { CURRENT_CONFIG_VERSION } from '@/migrations';
 import { ImporterEntryData } from '@/types/importer';
 
@@ -60,8 +60,7 @@ describe('DataImporter', () => {
     it('should skip existing session groups and return correct result', async () => {
       await serverDB
         .insert(sessionGroups)
-        .values({ clientId: 'group1', name: 'Existing Group', userId })
-        .execute();
+        .values({ clientId: 'group1', name: 'Existing Group', userId });
 
       const data: ImporterEntryData = {
         version: CURRENT_CONFIG_VERSION,
@@ -141,7 +140,7 @@ describe('DataImporter', () => {
     });
 
     it('should skip existing sessions and return correct result', async () => {
-      await serverDB.insert(sessions).values({ clientId: 'session1', userId }).execute();
+      await serverDB.insert(sessions).values({ clientId: 'session1', userId });
 
       const data: ImporterEntryData = {
         version: CURRENT_CONFIG_VERSION,
@@ -477,10 +476,7 @@ describe('DataImporter', () => {
     });
 
     it('should skip existing topics and return correct result', async () => {
-      await serverDB
-        .insert(topics)
-        .values({ clientId: 'topic1', title: 'Existing Topic', userId })
-        .execute();
+      await serverDB.insert(topics).values({ clientId: 'topic1', title: 'Existing Topic', userId });
 
       const data: ImporterEntryData = {
         version: CURRENT_CONFIG_VERSION,
@@ -616,15 +612,12 @@ describe('DataImporter', () => {
     });
 
     it('should skip existing messages and return correct result', async () => {
-      await serverDB
-        .insert(messages)
-        .values({
-          clientId: 'msg1',
-          content: 'Existing Message',
-          role: 'user',
-          userId,
-        })
-        .execute();
+      await serverDB.insert(messages).values({
+        clientId: 'msg1',
+        content: 'Existing Message',
+        role: 'user',
+        userId,
+      });
 
       const data: ImporterEntryData = {
         version: CURRENT_CONFIG_VERSION,

package/src/database/repositories/dataImporter/index.ts

@@ -1,5 +1,5 @@
-import { eq, inArray, sql } from 'drizzle-orm';
-import { and } from 'drizzle-orm/expressions';
+import { sql } from 'drizzle-orm';
+import { and, eq, inArray } from 'drizzle-orm/expressions';
 
 import {
   agents,
@@ -71,8 +71,7 @@ export class DataImporterRepos {
             set: { updatedAt: new Date() },
             target: [sessionGroups.clientId, sessionGroups.userId],
           })
-          .returning({ clientId: sessionGroups.clientId, id: sessionGroups.id })
-          .execute();
+          .returning({ clientId: sessionGroups.clientId, id: sessionGroups.id });
 
         sessionGroupResult.added = mapArray.length - query.length;
 
@@ -109,8 +108,7 @@ export class DataImporterRepos {
             set: { updatedAt: new Date() },
             target: [sessions.clientId, sessions.userId],
           })
-          .returning({ clientId: sessions.clientId, id: sessions.id })
-          .execute();
+          .returning({ clientId: sessions.clientId, id: sessions.id });
 
         // get the session client-server id map
         sessionIdMap = Object.fromEntries(mapArray.map(({ clientId, id }) => [clientId, id]));
@@ -133,18 +131,14 @@ export class DataImporterRepos {
                 userId: this.userId,
               })),
             )
-            .returning({ id: agents.id })
-            .execute();
+            .returning({ id: agents.id });
 
-          await trx
-            .insert(agentsToSessions)
-            .values(
-              shouldInsertSessionAgents.map(({ id }, index) => ({
-                agentId: agentMapArray[index].id,
-                sessionId: sessionIdMap[id],
-              })),
-            )
-            .execute();
+          await trx.insert(agentsToSessions).values(
+            shouldInsertSessionAgents.map(({ id }, index) => ({
+              agentId: agentMapArray[index].id,
+              sessionId: sessionIdMap[id],
+            })),
+          );
         }
       }
 
@@ -178,8 +172,7 @@ export class DataImporterRepos {
             set: { updatedAt: new Date() },
             target: [topics.clientId, topics.userId],
           })
-          .returning({ clientId: topics.clientId, id: topics.id })
-          .execute();
+          .returning({ clientId: topics.clientId, id: topics.id });
 
         topicIdMap = Object.fromEntries(mapArray.map(({ clientId, id }) => [clientId, id]));
 
@@ -230,7 +223,7 @@ export class DataImporterRepos {
 
           for (let i = 0; i < inertValues.length; i += BATCH_SIZE) {
             const batch = inertValues.slice(i, i + BATCH_SIZE);
-            await trx.insert(messages).values(batch).execute();
+            await trx.insert(messages).values(batch);
           }
 
           console.timeEnd('insert messages');
@@ -265,7 +258,7 @@ export class DataImporterRepos {
             .filter(Boolean);
 
           if (parentIdUpdates.length > 0) {
-            const updateQuery = trx
+            await trx
               .update(messages)
               .set({
                 parentId: sql`CASE ${sql.join(parentIdUpdates)} END`,
@@ -281,42 +274,34 @@ export class DataImporterRepos {
             // const SQL = updateQuery.toSQL();
             // console.log('sql:', SQL.sql);
             // console.log('params:', SQL.params);
-
-            await updateQuery.execute();
           }
           console.timeEnd('execute updates parentId');
 
           // 4. insert message plugins
           const pluginInserts = shouldInsertMessages.filter((msg) => msg.plugin);
           if (pluginInserts.length > 0) {
-            await trx
-              .insert(messagePlugins)
-              .values(
-                pluginInserts.map((msg) => ({
-                  apiName: msg.plugin?.apiName,
-                  arguments: msg.plugin?.arguments,
-                  id: messageIdMap[msg.id],
-                  identifier: msg.plugin?.identifier,
-                  state: msg.pluginState,
-                  toolCallId: msg.tool_call_id,
-                  type: msg.plugin?.type,
-                })),
-              )
-              .execute();
+            await trx.insert(messagePlugins).values(
+              pluginInserts.map((msg) => ({
+                apiName: msg.plugin?.apiName,
+                arguments: msg.plugin?.arguments,
+                id: messageIdMap[msg.id],
+                identifier: msg.plugin?.identifier,
+                state: msg.pluginState,
+                toolCallId: msg.tool_call_id,
+                type: msg.plugin?.type,
+              })),
+            );
           }
 
           // 5. insert message translate
           const translateInserts = shouldInsertMessages.filter((msg) => msg.extra?.translate);
           if (translateInserts.length > 0) {
-            await trx
-              .insert(messageTranslates)
-              .values(
-                translateInserts.map((msg) => ({
-                  id: messageIdMap[msg.id],
-                  ...msg.extra?.translate,
-                })),
-              )
-              .execute();
+            await trx.insert(messageTranslates).values(
+              translateInserts.map((msg) => ({
+                id: messageIdMap[msg.id],
+                ...msg.extra?.translate,
+              })),
+            );
           }
 
           // TODO: 未来需要处理 TTS 和图片的插入 （目前存在 file 的部分，不方便处理）

package/src/database/server/models/__tests__/_test_template.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq } from 'drizzle-orm';
+import { eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { getTestDBInstance } from '@/database/server/core/dbForTest';

package/src/database/server/models/__tests__/agent.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq } from 'drizzle-orm';
+import { eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { getTestDBInstance } from '@/database/server/core/dbForTest';

package/src/database/server/models/__tests__/asyncTask.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq } from 'drizzle-orm';
+import { eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getTestDBInstance } from '@/database/server/core/dbForTest';

package/src/database/server/models/__tests__/chunk.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq } from 'drizzle-orm';
+import { eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { getTestDBInstance } from '@/database/server/core/dbForTest';

package/src/database/server/models/__tests__/file.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq, inArray } from 'drizzle-orm';
+import { eq, inArray } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getTestDBInstance } from '@/database/server/core/dbForTest';

package/src/database/server/models/__tests__/knowledgeBase.test.ts

@@ -1,6 +1,5 @@
 // @vitest-environment node
-import { eq } from 'drizzle-orm';
-import { and, desc } from 'drizzle-orm/expressions';
+import { and, eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { getTestDBInstance } from '@/database/server/core/dbForTest';