@lobehub/chat 1.36.30 → 1.36.32

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

@@ -1,4 +1,4 @@
-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';
@@ -514,11 +514,7 @@ describe('MessageModel', () => {
       await messageModel.create({ role: 'user', content: 'new message', sessionId: '1' });
 
       // 断言结果
-      const result = await serverDB
-        .select()
-        .from(messages)
-        .where(eq(messages.userId, userId))
-        .execute();
+      const result = await serverDB.select().from(messages).where(eq(messages.userId, userId));
       expect(result).toHaveLength(1);
       expect(result[0].content).toBe('new message');
     });
@@ -549,11 +545,7 @@ describe('MessageModel', () => {
       });
 
       // 断言结果
-      const result = await serverDB
-        .select()
-        .from(messages)
-        .where(eq(messages.userId, userId))
-        .execute();
+      const result = await serverDB.select().from(messages).where(eq(messages.userId, userId));
       expect(result[0].id).toBeDefined();
       expect(result[0].id).toHaveLength(18);
     });
@@ -582,8 +574,7 @@ describe('MessageModel', () => {
       const pluginResult = await serverDB
         .select()
         .from(messagePlugins)
-        .where(eq(messagePlugins.id, result.id))
-        .execute();
+        .where(eq(messagePlugins.id, result.id));
       expect(pluginResult).toHaveLength(1);
       expect(pluginResult[0].identifier).toBe('plugin1');
     });
@@ -650,8 +641,7 @@ describe('MessageModel', () => {
       const pluginResult = await serverDB
         .select()
         .from(messagePlugins)
-        .where(eq(messagePlugins.id, result.id))
-        .execute();
+        .where(eq(messagePlugins.id, result.id));
       expect(pluginResult).toHaveLength(1);
       expect(pluginResult[0].identifier).toBe('lobe-web-browsing');
       expect(pluginResult[0].state!).toMatchObject(state);
@@ -670,11 +660,7 @@ describe('MessageModel', () => {
       await messageModel.batchCreate(newMessages);
 
       // 断言结果
-      const result = await serverDB
-        .select()
-        .from(messages)
-        .where(eq(messages.userId, userId))
-        .execute();
+      const result = await serverDB.select().from(messages).where(eq(messages.userId, userId));
       expect(result).toHaveLength(2);
       expect(result[0].content).toBe('message 1');
       expect(result[1].content).toBe('message 2');
@@ -692,7 +678,7 @@ describe('MessageModel', () => {
       await messageModel.update('1', { content: 'updated message' });
 
       // 断言结果
-      const result = await serverDB.select().from(messages).where(eq(messages.id, '1')).execute();
+      const result = await serverDB.select().from(messages).where(eq(messages.id, '1'));
       expect(result[0].content).toBe('updated message');
     });
 
@@ -706,7 +692,7 @@ describe('MessageModel', () => {
       await messageModel.update('1', { content: 'updated message' });
 
       // 断言结果
-      const result = await serverDB.select().from(messages).where(eq(messages.id, '1')).execute();
+      const result = await serverDB.select().from(messages).where(eq(messages.id, '1'));
       expect(result[0].content).toBe('message 1');
     });
 
@@ -745,7 +731,7 @@ describe('MessageModel', () => {
       });
 
       // 断言结果
-      const result = await serverDB.select().from(messages).where(eq(messages.id, '1')).execute();
+      const result = await serverDB.select().from(messages).where(eq(messages.id, '1'));
       expect(result[0].tools[0].arguments).toBe(
         '{"query":"2024 杭州暴雨","searchEngines":["duckduckgo","google","brave"]}',
       );
@@ -763,7 +749,7 @@ describe('MessageModel', () => {
       await messageModel.deleteMessage('1');
 
       // 断言结果
-      const result = await serverDB.select().from(messages).where(eq(messages.id, '1')).execute();
+      const result = await serverDB.select().from(messages).where(eq(messages.id, '1'));
       expect(result).toHaveLength(0);
     });
 
@@ -783,14 +769,13 @@ describe('MessageModel', () => {
       await messageModel.deleteMessage('1');
 
       // 断言结果
-      const result = await serverDB.select().from(messages).where(eq(messages.id, '1')).execute();
+      const result = await serverDB.select().from(messages).where(eq(messages.id, '1'));
       expect(result).toHaveLength(0);
 
       const result2 = await serverDB
         .select()
         .from(messagePlugins)
-        .where(eq(messagePlugins.id, '2'))
-        .execute();
+        .where(eq(messagePlugins.id, '2'));
 
       expect(result2).toHaveLength(0);
     });
@@ -805,7 +790,7 @@ describe('MessageModel', () => {
       await messageModel.deleteMessage('1');
 
       // 断言结果
-      const result = await serverDB.select().from(messages).where(eq(messages.id, '1')).execute();
+      const result = await serverDB.select().from(messages).where(eq(messages.id, '1'));
       expect(result).toHaveLength(1);
     });
   });
@@ -822,9 +807,9 @@ describe('MessageModel', () => {
       await messageModel.deleteMessages(['1', '2']);
 
       // 断言结果
-      const result = await serverDB.select().from(messages).where(eq(messages.id, '1')).execute();
+      const result = await serverDB.select().from(messages).where(eq(messages.id, '1'));
       expect(result).toHaveLength(0);
-      const result2 = await serverDB.select().from(messages).where(eq(messages.id, '2')).execute();
+      const result2 = await serverDB.select().from(messages).where(eq(messages.id, '2'));
       expect(result2).toHaveLength(0);
     });
 
@@ -839,7 +824,7 @@ describe('MessageModel', () => {
       await messageModel.deleteMessages(['1', '2']);
 
       // 断言结果
-      const result = await serverDB.select().from(messages).where(eq(messages.id, '1')).execute();
+      const result = await serverDB.select().from(messages).where(eq(messages.id, '1'));
       expect(result).toHaveLength(1);
     });
   });
@@ -857,18 +842,12 @@ describe('MessageModel', () => {
       await messageModel.deleteAllMessages();
 
       // 断言结果
-      const result = await serverDB
-        .select()
-        .from(messages)
-        .where(eq(messages.userId, userId))
-        .execute();
+      const result = await serverDB.select().from(messages).where(eq(messages.userId, userId));
+
       expect(result).toHaveLength(0);
 
-      const otherResult = await serverDB
-        .select()
-        .from(messages)
-        .where(eq(messages.userId, '456'))
-        .execute();
+      const otherResult = await serverDB.select().from(messages).where(eq(messages.userId, '456'));
+
       expect(otherResult).toHaveLength(1);
     });
   });
@@ -887,11 +866,8 @@ describe('MessageModel', () => {
       await messageModel.updatePluginState('1', { key2: 'value2' });
 
       // 断言结果
-      const result = await serverDB
-        .select()
-        .from(messagePlugins)
-        .where(eq(messagePlugins.id, '1'))
-        .execute();
+      const result = await serverDB.select().from(messagePlugins).where(eq(messagePlugins.id, '1'));
+
       expect(result[0].state).toEqual({ key1: 'value1', key2: 'value2' });
     });
 
@@ -916,11 +892,8 @@ describe('MessageModel', () => {
       await messageModel.updateMessagePlugin('1', { identifier: 'plugin2' });
 
       // 断言结果
-      const result = await serverDB
-        .select()
-        .from(messagePlugins)
-        .where(eq(messagePlugins.id, '1'))
-        .execute();
+      const result = await serverDB.select().from(messagePlugins).where(eq(messagePlugins.id, '1'));
+
       expect(result[0].identifier).toEqual('plugin2');
     });
 
@@ -950,8 +923,8 @@ describe('MessageModel', () => {
       const result = await serverDB
         .select()
         .from(messageTranslates)
-        .where(eq(messageTranslates.id, '1'))
-        .execute();
+        .where(eq(messageTranslates.id, '1'));
+
       expect(result).toHaveLength(1);
       expect(result[0].content).toBe('translated message 1');
     });
@@ -974,8 +947,8 @@ describe('MessageModel', () => {
       const result = await serverDB
         .select()
         .from(messageTranslates)
-        .where(eq(messageTranslates.id, '1'))
-        .execute();
+        .where(eq(messageTranslates.id, '1'));
+
       expect(result[0].content).toBe('updated translated message 1');
     });
   });
@@ -991,11 +964,8 @@ describe('MessageModel', () => {
       await messageModel.updateTTS('1', { contentMd5: 'md5', file: 'f1', voice: 'voice1' });
 
       // 断言结果
-      const result = await serverDB
-        .select()
-        .from(messageTTS)
-        .where(eq(messageTTS.id, '1'))
-        .execute();
+      const result = await serverDB.select().from(messageTTS).where(eq(messageTTS.id, '1'));
+
       expect(result).toHaveLength(1);
       expect(result[0].voice).toBe('voice1');
     });
@@ -1015,11 +985,8 @@ describe('MessageModel', () => {
       await messageModel.updateTTS('1', { voice: 'updated voice1' });
 
       // 断言结果
-      const result = await serverDB
-        .select()
-        .from(messageTTS)
-        .where(eq(messageTTS.id, '1'))
-        .execute();
+      const result = await serverDB.select().from(messageTTS).where(eq(messageTTS.id, '1'));
+
       expect(result[0].voice).toBe('updated voice1');
     });
   });
@@ -1037,8 +1004,8 @@ describe('MessageModel', () => {
       const result = await serverDB
         .select()
         .from(messageTranslates)
-        .where(eq(messageTranslates.id, '1'))
-        .execute();
+        .where(eq(messageTranslates.id, '1'));
+
       expect(result).toHaveLength(0);
     });
   });
@@ -1053,11 +1020,7 @@ describe('MessageModel', () => {
       await messageModel.deleteMessageTTS('1');
 
       // 断言结果
-      const result = await serverDB
-        .select()
-        .from(messageTTS)
-        .where(eq(messageTTS.id, '1'))
-        .execute();
+      const result = await serverDB.select().from(messageTTS).where(eq(messageTTS.id, '1'));
       expect(result).toHaveLength(0);
     });
   });

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

@@ -5,7 +5,7 @@ import type {
   AdapterUser,
   VerificationToken,
 } from '@auth/core/adapters';
-import { eq } from 'drizzle-orm';
+import { eq } from 'drizzle-orm/expressions';
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import {

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

@@ -1,4 +1,4 @@
-import { and, eq, inArray } from 'drizzle-orm';
+import { and, eq, inArray } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';

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

@@ -1,6 +1,5 @@
 // @vitest-environment node
-import { eq } from 'drizzle-orm';
-import { desc } from 'drizzle-orm/expressions';
+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__/topic.test.ts

@@ -1,4 +1,4 @@
-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__/user.test.ts

@@ -1,4 +1,4 @@
-import { eq } from 'drizzle-orm';
+import { eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { INBOX_SESSION_ID } from '@/const/session';

package/src/database/server/models/_template.ts

@@ -45,10 +45,10 @@ export class TemplateModel {
     });
   };
 
-  async update(id: string, value: Partial<SessionGroupItem>) {
+  update = async (id: string, value: Partial<SessionGroupItem>) => {
     return this.db
       .update(sessionGroups)
       .set({ ...value, updatedAt: new Date() })
       .where(and(eq(sessionGroups.id, id), eq(sessionGroups.userId, this.userId)));
-  }
+  };
 }

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

@@ -19,15 +19,15 @@ export class AgentModel {
     this.db = db;
   }
 
-  async getAgentConfigById(id: string) {
+  getAgentConfigById = async (id: string) => {
     const agent = await this.db.query.agents.findFirst({ where: eq(agents.id, id) });
 
     const knowledge = await this.getAgentAssignedKnowledge(id);
 
     return { ...agent, ...knowledge };
-  }
+  };
 
-  async getAgentAssignedKnowledge(id: string) {
+  getAgentAssignedKnowledge = async (id: string) => {
     const knowledgeBaseResult = await this.db
       .select({ enabled: agentsKnowledgeBases.enabled, knowledgeBases })
       .from(agentsKnowledgeBases)
@@ -52,12 +52,12 @@ export class AgentModel {
         enabled: item.enabled,
       })),
     };
-  }
+  };
 
   /**
    * Find agent by session id
    */
-  async findBySessionId(sessionId: string) {
+  findBySessionId = async (sessionId: string) => {
     const item = await this.db.query.agentsToSessions.findFirst({
       where: eq(agentsToSessions.sessionId, sessionId),
     });
@@ -66,22 +66,19 @@ export class AgentModel {
     const agentId = item.agentId;
 
     return this.getAgentConfigById(agentId);
-  }
+  };
 
   createAgentKnowledgeBase = async (
     agentId: string,
     knowledgeBaseId: string,
     enabled: boolean = true,
   ) => {
-    return this.db
-      .insert(agentsKnowledgeBases)
-      .values({
-        agentId,
-        enabled,
-        knowledgeBaseId,
-        userId: this.userId,
-      })
-      .execute();
+    return this.db.insert(agentsKnowledgeBases).values({
+      agentId,
+      enabled,
+      knowledgeBaseId,
+      userId: this.userId,
+    });
   };
 
   deleteAgentKnowledgeBase = async (agentId: string, knowledgeBaseId: string) => {
@@ -93,8 +90,7 @@ export class AgentModel {
           eq(agentsKnowledgeBases.knowledgeBaseId, knowledgeBaseId),
           eq(agentsKnowledgeBases.userId, this.userId),
         ),
-      )
-      .execute();
+      );
   };
 
   toggleKnowledgeBase = async (agentId: string, knowledgeBaseId: string, enabled?: boolean) => {
@@ -107,8 +103,7 @@ export class AgentModel {
           eq(agentsKnowledgeBases.knowledgeBaseId, knowledgeBaseId),
           eq(agentsKnowledgeBases.userId, this.userId),
         ),
-      )
-      .execute();
+      );
   };
 
   createAgentFiles = async (agentId: string, fileIds: string[], enabled: boolean = true) => {
@@ -134,8 +129,7 @@ export class AgentModel {
       .insert(agentsFiles)
       .values(
         needToInsertFileIds.map((fileId) => ({ agentId, enabled, fileId, userId: this.userId })),
-      )
-      .execute();
+      );
   };
 
   deleteAgentFile = async (agentId: string, fileId: string) => {
@@ -147,8 +141,7 @@ export class AgentModel {
           eq(agentsFiles.fileId, fileId),
           eq(agentsFiles.userId, this.userId),
         ),
-      )
-      .execute();
+      );
   };
 
   toggleFile = async (agentId: string, fileId: string, enabled?: boolean) => {
@@ -161,7 +154,6 @@ export class AgentModel {
           eq(agentsFiles.fileId, fileId),
           eq(agentsFiles.userId, this.userId),
         ),
-      )
-      .execute();
+      );
   };
 }

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

@@ -64,7 +64,7 @@ export class AsyncTaskModel {
   /**
    * make the task status to be `error` if the task is not finished in 20 seconds
    */
-  async checkTimeoutTasks(ids: string[]) {
+  checkTimeoutTasks = async (ids: string[]) => {
     const tasks = await this.db
       .select({ id: asyncTasks.id })
       .from(asyncTasks)
@@ -93,5 +93,5 @@ export class AsyncTaskModel {
           ),
         );
     }
-  }
+  };
 }

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

@@ -76,7 +76,7 @@ export class ChunkModel {
     });
   };
 
-  async findByFileId(id: string, page = 0) {
+  findByFileId = async (id: string, page = 0) => {
     const data = await this.db
       .select({
         abstract: chunks.abstract,
@@ -100,9 +100,9 @@ export class ChunkModel {
 
       return { ...item, metadata, pageNumber: metadata?.pageNumber } as FileChunk;
     });
-  }
+  };
 
-  async getChunksTextByFileId(id: string): Promise<{ id: string; text: string }[]> {
+  getChunksTextByFileId = async (id: string): Promise<{ id: string; text: string }[]> => {
     const data = await this.db
       .select()
       .from(chunks)
@@ -113,9 +113,9 @@ export class ChunkModel {
       .map((item) => item.chunks)
       .map((chunk) => ({ id: chunk.id, text: this.mapChunkText(chunk) }))
       .filter((chunk) => chunk.text) as { id: string; text: string }[];
-  }
+  };
 
-  async countByFileIds(ids: string[]) {
+  countByFileIds = async (ids: string[]) => {
     if (ids.length === 0) return [];
 
     return this.db
@@ -126,9 +126,9 @@ export class ChunkModel {
       .from(fileChunks)
       .where(inArray(fileChunks.fileId, ids))
       .groupBy(fileChunks.fileId);
-  }
+  };
 
-  async countByFileId(ids: string) {
+  countByFileId = async (ids: string) => {
     const data = await this.db
       .select({
         count: count(fileChunks.chunkId),
@@ -139,16 +139,16 @@ export class ChunkModel {
       .groupBy(fileChunks.fileId);
 
     return data[0]?.count ?? 0;
-  }
+  };
 
-  async semanticSearch({
+  semanticSearch = async ({
     embedding,
     fileIds,
   }: {
     embedding: number[];
     fileIds: string[] | undefined;
     query: string;
-  }) {
+  }) => {
     const similarity = sql<number>`1 - (${cosineDistance(embeddings.embeddings, embedding)})`;
 
     const data = await this.db
@@ -174,16 +174,16 @@ export class ChunkModel {
       ...item,
       metadata: item.metadata as ChunkMetadata,
     }));
-  }
+  };
 
-  async semanticSearchForChat({
+  semanticSearchForChat = async ({
     embedding,
     fileIds,
   }: {
     embedding: number[];
     fileIds: string[] | undefined;
     query: string;
-  }) {
+  }) => {
     const similarity = sql<number>`1 - (${cosineDistance(embeddings.embeddings, embedding)})`;
 
     const hasFiles = fileIds && fileIds.length > 0;
@@ -219,7 +219,7 @@ export class ChunkModel {
         text: this.mapChunkText(item),
       };
     });
-  }
+  };
 
   private mapChunkText = (chunk: { metadata: any; text: string | null; type: string | null }) => {
     let text = chunk.text;

package/src/database/server/models/embedding.ts

@@ -50,7 +50,7 @@ export class EmbeddingModel {
     });
   };
 
-  countUsage = async () => {
+  countUsage = async (): Promise<number> => {
     const result = await this.db
       .select({
         count: count(),

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

@@ -1,5 +1,5 @@
-import { asc, count, eq, ilike, inArray, notExists, or, sum } from 'drizzle-orm';
-import { and, desc, like } from 'drizzle-orm/expressions';
+import { count, sum } from 'drizzle-orm';
+import { and, asc, desc, eq, ilike, inArray, like, notExists, or } from 'drizzle-orm/expressions';
 import type { PgTransaction } from 'drizzle-orm/pg-core';
 
 import { LobeChatDatabase } from '@/database/type';
@@ -276,12 +276,11 @@ export class FileModel {
     return result[0].count;
   };
 
-  async update(id: string, value: Partial<FileItem>) {
-    return this.db
+  update = async (id: string, value: Partial<FileItem>) =>
+    this.db
       .update(files)
       .set({ ...value, updatedAt: new Date() })
       .where(and(eq(files.id, id), eq(files.userId, this.userId)));
-  }
 
   /**
    * get the corresponding file type prefix according to FilesTabs
@@ -306,17 +305,16 @@ export class FileModel {
     }
   };
 
-  async findByNames(fileNames: string[]) {
-    return this.db.query.files.findMany({
+  findByNames = async (fileNames: string[]) =>
+    this.db.query.files.findMany({
       where: and(
         or(...fileNames.map((name) => like(files.name, `${name}%`))),
         eq(files.userId, this.userId),
       ),
     });
-  }
 
   // 抽象出通用的删除 chunks 方法
-  private async deleteFileChunks(trx: PgTransaction<any>, fileIds: string[]) {
+  private deleteFileChunks = async (trx: PgTransaction<any>, fileIds: string[]) => {
     const BATCH_SIZE = 1000; // 每批处理的数量
 
     // 1. 获取所有关联的 chunk IDs
@@ -339,5 +337,5 @@ export class FileModel {
     }
 
     return chunkIds;
-  }
+  };
 }

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

@@ -80,16 +80,14 @@ export class KnowledgeBaseModel {
   };
 
   // update
-  async update(id: string, value: Partial<KnowledgeBaseItem>) {
-    return this.db
+  update = async (id: string, value: Partial<KnowledgeBaseItem>) =>
+    this.db
       .update(knowledgeBases)
       .set({ ...value, updatedAt: new Date() })
       .where(and(eq(knowledgeBases.id, id), eq(knowledgeBases.userId, this.userId)));
-  }
 
-  static async findById(db: LobeChatDatabase, id: string) {
-    return db.query.knowledgeBases.findFirst({
+  static findById = async (db: LobeChatDatabase, id: string) =>
+    db.query.knowledgeBases.findFirst({
       where: eq(knowledgeBases.id, id),
     });
-  }
 }