@lobehub/chat 1.36.31 → 1.36.32

package/src/database/server/models/ragEval/evaluationRecord.ts

@@ -1,7 +1,7 @@
-import { and, eq } from 'drizzle-orm';
+import { and, eq } from 'drizzle-orm/expressions';
 
-import { serverDB } from '@/database/server';
 import { NewEvaluationRecordsItem, evaluationRecords } from '@/database/schemas';
+import { serverDB } from '@/database/server';
 
 export class EvaluationRecordModel {
   private userId: string;

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

@@ -31,7 +31,7 @@ export class SessionModel {
   }
   // **************** Query *************** //
 
-  async query({ current = 0, pageSize = 9999 } = {}) {
+  query = async ({ current = 0, pageSize = 9999 } = {}) => {
     const offset = current * pageSize;
 
     return this.db.query.sessions.findMany({
@@ -41,9 +41,9 @@ export class SessionModel {
       where: and(eq(sessions.userId, this.userId), not(eq(sessions.slug, INBOX_SESSION_ID))),
       with: { agentsToSessions: { columns: {}, with: { agent: true } }, group: true },
     });
-  }
+  };
 
-  async queryWithGroups(): Promise<ChatSessionList> {
+  queryWithGroups = async (): Promise<ChatSessionList> => {
     // 查询所有会话
     const result = await this.query();
 
@@ -56,9 +56,9 @@ export class SessionModel {
       sessionGroups: groups as unknown as ChatSessionList['sessionGroups'],
       sessions: result.map((item) => this.mapSessionItem(item as any)),
     };
-  }
+  };
 
-  async queryByKeyword(keyword: string) {
+  queryByKeyword = async (keyword: string) => {
     if (!keyword) return [];
 
     const keywordLowerCase = keyword.toLowerCase();
@@ -66,11 +66,11 @@ export class SessionModel {
     const data = await this.findSessionsByKeywords({ keyword: keywordLowerCase });
 
     return data.map((item) => this.mapSessionItem(item as any));
-  }
+  };
 
-  async findByIdOrSlug(
+  findByIdOrSlug = async (
     idOrSlug: string,
-  ): Promise<(SessionItem & { agent: AgentItem }) | undefined> {
+  ): Promise<(SessionItem & { agent: AgentItem }) | undefined> => {
     const result = await this.db.query.sessions.findFirst({
       where: and(
         or(eq(sessions.id, idOrSlug), eq(sessions.slug, idOrSlug)),
@@ -82,23 +82,22 @@ export class SessionModel {
     if (!result) return;
 
     return { ...result, agent: (result?.agentsToSessions?.[0] as any)?.agent } as any;
-  }
+  };
 
-  async count() {
+  count = async (): Promise<number> => {
     const result = await this.db
       .select({
-        count: count(),
+        count: count(sessions.id),
       })
       .from(sessions)
-      .where(eq(sessions.userId, this.userId))
-      .execute();
+      .where(eq(sessions.userId, this.userId));
 
     return result[0].count;
-  }
+  };
 
   // **************** Create *************** //
 
-  async create({
+  create = async ({
     id = idGenerator('sessions'),
     type = 'agent',
     session = {},
@@ -110,7 +109,7 @@ export class SessionModel {
     session?: Partial<NewSession>;
     slug?: string;
     type: 'agent' | 'group';
-  }): Promise<SessionItem> {
+  }): Promise<SessionItem> => {
     return this.db.transaction(async (trx) => {
       const newAgents = await trx
         .insert(agents)
@@ -143,9 +142,9 @@ export class SessionModel {
 
       return result[0];
     });
-  }
+  };
 
-  async createInbox() {
+  createInbox = async () => {
     const item = await this.db.query.sessions.findFirst({
       where: and(eq(sessions.userId, this.userId), eq(sessions.slug, INBOX_SESSION_ID)),
     });
@@ -158,9 +157,9 @@ export class SessionModel {
       slug: INBOX_SESSION_ID,
       type: 'agent',
     });
-  }
+  };
 
-  async batchCreate(newSessions: NewSession[]) {
+  batchCreate = async (newSessions: NewSession[]) => {
     const sessionsToInsert = newSessions.map((s) => {
       return {
         ...s,
@@ -170,9 +169,9 @@ export class SessionModel {
     });
 
     return this.db.insert(sessions).values(sessionsToInsert);
-  }
+  };
 
-  async duplicate(id: string, newTitle?: string) {
+  duplicate = async (id: string, newTitle?: string) => {
     const result = await this.findByIdOrSlug(id);
 
     if (!result) return;
@@ -193,49 +192,49 @@ export class SessionModel {
       },
       type: 'agent',
     });
-  }
+  };
 
   // **************** Delete *************** //
 
   /**
    * Delete a session, also delete all messages and topics associated with it.
    */
-  async delete(id: string) {
+  delete = async (id: string) => {
     return this.db
       .delete(sessions)
       .where(and(eq(sessions.id, id), eq(sessions.userId, this.userId)));
-  }
+  };
 
   /**
    * Batch delete sessions, also delete all messages and topics associated with them.
    */
-  async batchDelete(ids: string[]) {
+  batchDelete = async (ids: string[]) => {
     return this.db
       .delete(sessions)
       .where(and(inArray(sessions.id, ids), eq(sessions.userId, this.userId)));
-  }
+  };
 
-  async deleteAll() {
+  deleteAll = async () => {
     return this.db.delete(sessions).where(eq(sessions.userId, this.userId));
-  }
+  };
   // **************** Update *************** //
 
-  async update(id: string, data: Partial<SessionItem>) {
+  update = async (id: string, data: Partial<SessionItem>) => {
     return this.db
       .update(sessions)
       .set(data)
       .where(and(eq(sessions.id, id), eq(sessions.userId, this.userId)))
       .returning();
-  }
+  };
 
-  async updateConfig(id: string, data: Partial<AgentItem>) {
+  updateConfig = async (id: string, data: Partial<AgentItem>) => {
     if (Object.keys(data).length === 0) return;
 
     return this.db
       .update(agents)
       .set(data)
       .where(and(eq(agents.id, id), eq(agents.userId, this.userId)));
-  }
+  };
 
   // **************** Helper *************** //
 
@@ -266,7 +265,11 @@ export class SessionModel {
     } as any;
   };
 
-  async findSessionsByKeywords(params: { current?: number; keyword: string; pageSize?: number }) {
+  findSessionsByKeywords = async (params: {
+    current?: number;
+    keyword: string;
+    pageSize?: number;
+  }) => {
     const { keyword, pageSize = 9999, current = 0 } = params;
     const offset = current * pageSize;
     const results = await this.db.query.agents.findMany({
@@ -290,5 +293,5 @@ export class SessionModel {
       return results.map((item) => item.agentsToSessions[0].session);
     } catch {}
     return [];
-  }
+  };
 }

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

@@ -46,14 +46,14 @@ export class SessionGroupModel {
     });
   };
 
-  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)));
-  }
+  };
 
-  async updateOrder(sortMap: { id: string; sort: number }[]) {
+  updateOrder = async (sortMap: { id: string; sort: number }[]) => {
     await this.db.transaction(async (tx) => {
       const updates = sortMap.map(({ id, sort }) => {
         return tx
@@ -64,7 +64,7 @@ export class SessionGroupModel {
 
       await Promise.all(updates);
     });
-  }
+  };
 
   private genId = () => idGenerator('sessionGroups');
 }

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

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

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

@@ -29,46 +29,42 @@ export class TopicModel {
   }
   // **************** Query *************** //
 
-  async query({ current = 0, pageSize = 9999, sessionId }: QueryTopicParams = {}) {
+  query = async ({ current = 0, pageSize = 9999, sessionId }: QueryTopicParams = {}) => {
     const offset = current * pageSize;
-
-    return (
-      this.db
-        .select({
-          createdAt: topics.createdAt,
-          favorite: topics.favorite,
-          historySummary: topics.historySummary,
-          id: topics.id,
-          metadata: topics.metadata,
-          title: topics.title,
-          updatedAt: topics.updatedAt,
-        })
-        .from(topics)
-        .where(and(eq(topics.userId, this.userId), this.matchSession(sessionId)))
-        // In boolean sorting, false is considered "smaller" than true.
-        // So here we use desc to ensure that topics with favorite as true are in front.
-        .orderBy(desc(topics.favorite), desc(topics.updatedAt))
-        .limit(pageSize)
-        .offset(offset)
-    );
-  }
-
-  async findById(id: string) {
+    return this.db
+      .select({
+        createdAt: topics.createdAt,
+        favorite: topics.favorite,
+        historySummary: topics.historySummary,
+        id: topics.id,
+        metadata: topics.metadata,
+        title: topics.title,
+        updatedAt: topics.updatedAt,
+      })
+      .from(topics)
+      .where(and(eq(topics.userId, this.userId), this.matchSession(sessionId)))
+      // In boolean sorting, false is considered "smaller" than true.
+      // So here we use desc to ensure that topics with favorite as true are in front.
+      .orderBy(desc(topics.favorite), desc(topics.updatedAt))
+      .limit(pageSize)
+      .offset(offset);
+  };
+
+  findById = async (id: string) => {
     return this.db.query.topics.findFirst({
       where: and(eq(topics.id, id), eq(topics.userId, this.userId)),
     });
-  }
+  };
 
-  async queryAll(): Promise<TopicItem[]> {
+  queryAll = async (): Promise<TopicItem[]> => {
     return this.db
       .select()
       .from(topics)
       .orderBy(topics.updatedAt)
-      .where(eq(topics.userId, this.userId))
-      .execute();
-  }
+      .where(eq(topics.userId, this.userId));
+  };
 
-  async queryByKeyword(keyword: string, sessionId?: string | null): Promise<TopicItem[]> {
+  queryByKeyword = async (keyword: string, sessionId?: string | null): Promise<TopicItem[]> => {
     if (!keyword) return [];
 
     const keywordLowerCase = keyword.toLowerCase();
@@ -92,26 +88,25 @@ export class TopicModel {
         ),
       ),
     });
-  }
+  };
 
-  async count() {
+  count = async (): Promise<number> => {
     const result = await this.db
       .select({
-        count: count(),
+        count: count(topics.id),
       })
       .from(topics)
-      .where(eq(topics.userId, this.userId))
-      .execute();
+      .where(eq(topics.userId, this.userId));
 
     return result[0].count;
-  }
+  };
 
   // **************** Create *************** //
 
-  async create(
+  create = async (
     { messages: messageIds, ...params }: CreateTopicParams,
     id: string = this.genId(),
-  ): Promise<TopicItem> {
+  ): Promise<TopicItem> => {
     return this.db.transaction(async (tx) => {
       // 在 topics 表中插入新的 topic
       const [topic] = await tx
@@ -133,9 +128,9 @@ export class TopicModel {
 
       return topic;
     });
-  }
+  };
 
-  async batchCreate(topicParams: (CreateTopicParams & { id?: string })[]) {
+  batchCreate = async (topicParams: (CreateTopicParams & { id?: string })[]) => {
     // 开始一个事务
     return this.db.transaction(async (tx) => {
       // 在 topics 表中批量插入新的 topics
@@ -167,9 +162,9 @@ export class TopicModel {
 
       return createdTopics;
     });
-  }
+  };
 
-  async duplicate(topicId: string, newTitle?: string) {
+  duplicate = async (topicId: string, newTitle?: string) => {
     return this.db.transaction(async (tx) => {
       // find original topic
       const originalTopic = await tx.query.topics.findFirst({
@@ -217,48 +212,48 @@ export class TopicModel {
         topic: duplicatedTopic,
       };
     });
-  }
+  };
 
   // **************** Delete *************** //
 
   /**
    * Delete a session, also delete all messages and topics associated with it.
    */
-  async delete(id: string) {
+  delete = async (id: string) => {
     return this.db.delete(topics).where(and(eq(topics.id, id), eq(topics.userId, this.userId)));
-  }
+  };
 
   /**
    * Deletes multiple topics based on the sessionId.
    */
-  async batchDeleteBySessionId(sessionId?: string | null) {
+  batchDeleteBySessionId = async (sessionId?: string | null) => {
     return this.db
       .delete(topics)
       .where(and(this.matchSession(sessionId), eq(topics.userId, this.userId)));
-  }
+  };
 
   /**
    * Deletes multiple topics and all messages associated with them in a transaction.
    */
-  async batchDelete(ids: string[]) {
+  batchDelete = async (ids: string[]) => {
     return this.db
       .delete(topics)
       .where(and(inArray(topics.id, ids), eq(topics.userId, this.userId)));
-  }
+  };
 
-  async deleteAll() {
+  deleteAll = async () => {
     return this.db.delete(topics).where(eq(topics.userId, this.userId));
-  }
+  };
 
   // **************** Update *************** //
 
-  async update(id: string, data: Partial<TopicItem>) {
+  update = async (id: string, data: Partial<TopicItem>) => {
     return this.db
       .update(topics)
       .set({ ...data, updatedAt: new Date() })
       .where(and(eq(topics.id, id), eq(topics.userId, this.userId)))
       .returning();
-  }
+  };
 
   // **************** Helper *************** //
 

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

@@ -26,7 +26,7 @@ export class UserModel {
     this.db = db;
   }
 
-  async getUserState() {
+  getUserState = async () => {
     const result = await this.db
       .select({
         isOnboarded: users.isOnboarded,
@@ -81,20 +81,20 @@ export class UserModel {
       settings,
       userId: this.userId,
     };
-  }
+  };
 
-  async updateUser(value: Partial<UserItem>) {
+  updateUser = async (value: Partial<UserItem>) => {
     return this.db
       .update(users)
       .set({ ...value, updatedAt: new Date() })
       .where(eq(users.id, this.userId));
-  }
+  };
 
-  async deleteSetting() {
+  deleteSetting = async () => {
     return this.db.delete(userSettings).where(eq(userSettings.id, this.userId));
-  }
+  };
 
-  async updateSetting(value: Partial<UserSettings>) {
+  updateSetting = async (value: Partial<UserSettings>) => {
     const { keyVaults, ...res } = value;
 
     // Encrypt keyVaults
@@ -120,9 +120,9 @@ export class UserModel {
     }
 
     return this.db.update(userSettings).set(newValue).where(eq(userSettings.id, this.userId));
-  }
+  };
 
-  async updatePreference(value: Partial<UserPreference>) {
+  updatePreference = async (value: Partial<UserPreference>) => {
     const user = await this.db.query.users.findFirst({ where: eq(users.id, this.userId) });
     if (!user) return;
 
@@ -130,9 +130,9 @@ export class UserModel {
       .update(users)
       .set({ preference: merge(user.preference, value) })
       .where(eq(users.id, this.userId));
-  }
+  };
 
-  async updateGuide(value: Partial<UserGuide>) {
+  updateGuide = async (value: Partial<UserGuide>) => {
     const user = await this.db.query.users.findFirst({ where: eq(users.id, this.userId) });
     if (!user) return;
 
@@ -141,7 +141,7 @@ export class UserModel {
       .update(users)
       .set({ preference: { ...prevPreference, guide: merge(prevPreference.guide || {}, value) } })
       .where(eq(users.id, this.userId));
-  }
+  };
 
   // Static method
 

package/src/libs/agent-runtime/utils/streams/azureOpenai.test.ts

@@ -1,4 +1,3 @@
-import { desc } from 'drizzle-orm/expressions';
 import { describe, expect, it, vi } from 'vitest';
 
 import { AzureOpenAIStream } from './azureOpenai';

package/src/libs/next-auth/adapter/index.ts

@@ -4,7 +4,7 @@ import type {
   AdapterUser,
   VerificationToken,
 } from '@auth/core/adapters';
-import { and, eq } from 'drizzle-orm';
+import { and, eq } from 'drizzle-orm/expressions';
 import type { NeonDatabase } from 'drizzle-orm/neon-serverless';
 import { Adapter, AdapterAccount } from 'next-auth/adapters';
 

package/src/server/routers/lambda/chunk.ts

@@ -1,14 +1,14 @@
-import { inArray } from 'drizzle-orm';
+import { inArray } from 'drizzle-orm/expressions';
 import { z } from 'zod';
 
 import { DEFAULT_EMBEDDING_MODEL } from '@/const/settings';
+import { knowledgeBaseFiles } from '@/database/schemas';
 import { serverDB } from '@/database/server';
 import { AsyncTaskModel } from '@/database/server/models/asyncTask';
 import { ChunkModel } from '@/database/server/models/chunk';
 import { EmbeddingModel } from '@/database/server/models/embedding';
 import { FileModel } from '@/database/server/models/file';
 import { MessageModel } from '@/database/server/models/message';
-import { knowledgeBaseFiles } from '@/database/schemas';
 import { ModelProvider } from '@/libs/agent-runtime';
 import { authedProcedure, router } from '@/libs/trpc';
 import { keyVaults } from '@/libs/trpc/middleware/keyVaults';

package/vercel.json

@@ -1,3 +1,3 @@
 {
-  "installCommand": "bun install"
+  "installCommand": "npx bun@1.1.38 install"
 }