@lobehub/chat 1.134.4 → 1.134.5

package/packages/database/migrations/meta/_journal.json

@@ -252,6 +252,13 @@
       "when": 1759116400580,
       "tag": "0035_add_virtual",
       "breakpoints": true
+    },
+    {
+      "idx": 36,
+      "version": "7",
+      "when": 1759666151079,
+      "tag": "0036_add_group_messages",
+      "breakpoints": true
     }
   ],
   "version": "6"

package/packages/database/package.json

@@ -18,7 +18,7 @@
     "@lobechat/types": "workspace:*",
     "@lobechat/utils": "workspace:*",
     "dayjs": "^1.11.18",
-    "drizzle-orm": "^0.44.4",
+    "drizzle-orm": "^0.44.5",
     "nanoid": "^5.1.5",
     "pg": "^8.16.3",
     "random-words": "^2.0.1",

package/packages/database/src/core/migrations.json

@@ -632,5 +632,20 @@
     "bps": true,
     "folderMillis": 1759116400580,
     "hash": "433ddae88e785f2db734e49a4c115eee93e60afe389f7919d66e5ba9aa159a37"
+  },
+  {
+    "sql": [
+      "CREATE TABLE IF NOT EXISTS \"message_groups\" (\n\t\"id\" varchar(255) PRIMARY KEY NOT NULL,\n\t\"topic_id\" text,\n\t\"user_id\" text NOT NULL,\n\t\"parent_group_id\" varchar(255),\n\t\"parent_message_id\" text,\n\t\"title\" varchar(255),\n\t\"description\" text,\n\t\"client_id\" varchar(255),\n\t\"accessed_at\" timestamp with time zone DEFAULT now() NOT NULL,\n\t\"created_at\" timestamp with time zone DEFAULT now() NOT NULL,\n\t\"updated_at\" timestamp with time zone DEFAULT now() NOT NULL\n);\n",
+      "\nALTER TABLE \"messages\" ADD COLUMN IF NOT EXISTS \"message_group_id\" varchar(255);",
+      "\nALTER TABLE \"message_groups\" ADD CONSTRAINT \"message_groups_topic_id_topics_id_fk\" FOREIGN KEY (\"topic_id\") REFERENCES \"public\".\"topics\"(\"id\") ON DELETE cascade ON UPDATE no action;",
+      "\nALTER TABLE \"message_groups\" ADD CONSTRAINT \"message_groups_user_id_users_id_fk\" FOREIGN KEY (\"user_id\") REFERENCES \"public\".\"users\"(\"id\") ON DELETE cascade ON UPDATE no action;",
+      "\nALTER TABLE \"message_groups\" ADD CONSTRAINT \"message_groups_parent_group_id_message_groups_id_fk\" FOREIGN KEY (\"parent_group_id\") REFERENCES \"public\".\"message_groups\"(\"id\") ON DELETE cascade ON UPDATE no action;",
+      "\nALTER TABLE \"message_groups\" ADD CONSTRAINT \"message_groups_parent_message_id_messages_id_fk\" FOREIGN KEY (\"parent_message_id\") REFERENCES \"public\".\"messages\"(\"id\") ON DELETE cascade ON UPDATE no action;",
+      "\nCREATE UNIQUE INDEX IF NOT EXISTS \"message_groups_client_id_user_id_unique\" ON \"message_groups\" USING btree (\"client_id\",\"user_id\");",
+      "\nALTER TABLE \"messages\" ADD CONSTRAINT \"messages_message_group_id_message_groups_id_fk\" FOREIGN KEY (\"message_group_id\") REFERENCES \"public\".\"message_groups\"(\"id\") ON DELETE cascade ON UPDATE no action;\n"
+    ],
+    "bps": true,
+    "folderMillis": 1759666151079,
+    "hash": "3a787841eede425d972f2a00cf2f7f8d0b27b391c46ed525c6dceaa79d58d887"
   }
 ]

package/packages/database/src/models/__tests__/aiModel.test.ts

@@ -254,6 +254,15 @@ describe('AiModelModel', () => {
       expect(allModels.find((m) => m.id === 'existing-model')?.displayName).toBe('Old Name');
       expect(allModels.find((m) => m.id === 'new-model')?.displayName).toBe('New Model');
     });
+
+    it('should return empty array when models array is empty', async () => {
+      const result = await aiProviderModel.batchUpdateAiModels('openai', []);
+      expect(result).toEqual([]);
+
+      // Verify no models were created
+      const allModels = await aiProviderModel.query();
+      expect(allModels).toHaveLength(0);
+    });
   });
 
   describe('batchToggleAiModels', () => {
@@ -274,6 +283,23 @@ describe('AiModelModel', () => {
       const models = await aiProviderModel.query();
       expect(models.every((m) => m.enabled)).toBe(true);
     });
+
+    it('should return early when models array is empty', async () => {
+      // Create an initial model to verify it's not affected
+      await aiProviderModel.create({
+        id: 'model1',
+        providerId: 'openai',
+        enabled: false,
+      });
+
+      const result = await aiProviderModel.batchToggleAiModels('openai', [], true);
+      expect(result).toBeUndefined();
+
+      // Verify existing models were not affected
+      const models = await aiProviderModel.query();
+      expect(models).toHaveLength(1);
+      expect(models[0].enabled).toBe(false);
+    });
   });
 
   describe('clearRemoteModels', () => {
@@ -324,5 +350,22 @@ describe('AiModelModel', () => {
       const model = await aiProviderModel.findById('image-model');
       expect(model?.type).toBe('image');
     });
+
+    it('should return early when sortMap array is empty', async () => {
+      // Create an initial model to verify it's not affected
+      await aiProviderModel.create({
+        id: 'model1',
+        providerId: 'openai',
+        sort: 1,
+      });
+
+      const result = await aiProviderModel.updateModelsOrder('openai', []);
+      expect(result).toBeUndefined();
+
+      // Verify existing models were not affected (check by querying the created model directly)
+      const models = await aiProviderModel.getModelListByProviderId('openai');
+      expect(models).toHaveLength(1);
+      expect(models[0].id).toBe('model1');
+    });
   });
 });

package/packages/database/src/models/aiModel.ts

@@ -19,12 +19,21 @@ export class AiModelModel {
     this.db = db;
   }
 
+  /**
+   * Helper method to validate if array is empty and return early if needed
+   * @param array - Array to validate
+   * @returns true if array is empty, false otherwise
+   */
+  private isEmptyArray(array: unknown[]): boolean {
+    return array.length === 0;
+  }
+
   create = async (params: NewAiModelItem) => {
     const [result] = await this.db
       .insert(aiModels)
       .values({
         ...params,
-        enabled: true, // enabled by default
+        enabled: params.enabled ?? true, // enabled by default, but respect explicit value
         source: AiModelSourceEnum.Custom,
         userId: this.userId,
       })
@@ -148,6 +157,11 @@ export class AiModelModel {
   };
 
   batchUpdateAiModels = async (providerId: string, models: AiProviderModelListItem[]) => {
+    // Early return if models array is empty to prevent database insertion error
+    if (this.isEmptyArray(models)) {
+      return [];
+    }
+
     const records = models.map(({ id, ...model }) => ({
       ...model,
       id,
@@ -166,6 +180,11 @@ export class AiModelModel {
   };
 
   batchToggleAiModels = async (providerId: string, models: string[], enabled: boolean) => {
+    // Early return if models array is empty to prevent database insertion error
+    if (this.isEmptyArray(models)) {
+      return;
+    }
+
     return this.db.transaction(async (trx) => {
       // 1. insert models that are not in the db
       const insertedRecords = await trx
@@ -222,6 +241,11 @@ export class AiModelModel {
   }
 
   updateModelsOrder = async (providerId: string, sortMap: AiModelSortMap[]) => {
+    // Early return if sortMap array is empty
+    if (this.isEmptyArray(sortMap)) {
+      return;
+    }
+
     await this.db.transaction(async (tx) => {
       const updates = sortMap.map(({ id, sort, type }) => {
         const now = new Date();

package/packages/database/src/repositories/tableViewer/index.test.ts

@@ -23,7 +23,7 @@ describe('TableViewerRepo', () => {
     it('should return all tables with counts', async () => {
       const result = await repo.getAllTables();
 
-      expect(result.length).toEqual(62);
+      expect(result.length).toEqual(63);
       expect(result[0]).toEqual({ name: 'agents', count: 0, type: 'BASE TABLE' });
     });
 

package/packages/database/src/schemas/_helpers.ts

@@ -1,7 +1,9 @@
-import { timestamp } from 'drizzle-orm/pg-core';
+import { timestamp, varchar } from 'drizzle-orm/pg-core';
 
 export const timestamptz = (name: string) => timestamp(name, { withTimezone: true });
 
+export const varchar255 = (name: string) => varchar(name, { length: 255 });
+
 export const createdAt = () => timestamptz('created_at').notNull().defaultNow();
 export const updatedAt = () =>
   timestamptz('updated_at')

package/packages/database/src/schemas/message.ts

@@ -9,15 +9,14 @@ import {
   text,
   uniqueIndex,
   uuid,
-  varchar,
 } from 'drizzle-orm/pg-core';
-import { createSelectSchema } from 'drizzle-zod';
+import { createInsertSchema, createSelectSchema } from 'drizzle-zod';
 
 import { ModelReasoning } from '@/types/message';
 import { GroundingSearch } from '@/types/search';
 
 import { idGenerator } from '../utils/idGenerator';
-import { timestamps } from './_helpers';
+import { timestamps, varchar255 } from './_helpers';
 import { agents } from './agent';
 import { chatGroups } from './chatGroup';
 import { files } from './file';
@@ -26,6 +25,53 @@ import { sessions } from './session';
 import { threads, topics } from './topic';
 import { users } from './user';
 
+/**
+ * Message groups table for multi-models parallel conversations
+ * Allows multiple AI models to respond to the same user message in parallel
+ */
+// @ts-ignore
+export const messageGroups = pgTable(
+  'message_groups',
+  {
+    id: varchar255('id')
+      .primaryKey()
+      .$defaultFn(() => idGenerator('messageGroups'))
+      .notNull(),
+
+    // 关联关系 - 只需要 topic 层级
+    topicId: text('topic_id').references(() => topics.id, { onDelete: 'cascade' }),
+    userId: text('user_id')
+      .references(() => users.id, { onDelete: 'cascade' })
+      .notNull(),
+
+    // 支持嵌套结构
+    // @ts-ignore
+    parentGroupId: varchar255('parent_group_id').references(() => messageGroups.id, {
+      onDelete: 'cascade',
+    }),
+
+    // 关联的用户消息
+    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+    parentMessageId: text('parent_message_id').references(() => messages.id, {
+      onDelete: 'cascade',
+    }),
+
+    // 元数据
+    title: varchar255('title'),
+    description: text('description'),
+
+    clientId: varchar255('client_id'),
+
+    ...timestamps,
+  },
+  (t) => [uniqueIndex('message_groups_client_id_user_id_unique').on(t.clientId, t.userId)],
+);
+
+export const insertMessageGroupSchema = createInsertSchema(messageGroups);
+
+export type NewMessageGroup = typeof messageGroups.$inferInsert;
+export type MessageGroupItem = typeof messageGroups.$inferSelect;
+
 // @ts-ignore
 export const messages = pgTable(
   'messages',
@@ -34,7 +80,7 @@ export const messages = pgTable(
       .$defaultFn(() => idGenerator('messages'))
       .primaryKey(),
 
-    role: varchar('role', { length: 255 }).notNull(),
+    role: varchar255('role').notNull(),
     content: text('content'),
     reasoning: jsonb('reasoning').$type<ModelReasoning>(),
     search: jsonb('search').$type<GroundingSearch>(),
@@ -69,6 +115,11 @@ export const messages = pgTable(
     groupId: text('group_id').references(() => chatGroups.id, { onDelete: 'set null' }),
     // targetId can be an agent ID, "user", or null - no FK constraint
     targetId: text('target_id'),
+
+    // used for multi-models parallel
+    messageGroupId: varchar255('message_group_id').references(() => messageGroups.id, {
+      onDelete: 'cascade',
+    }),
     ...timestamps,
   },
   (table) => [

package/packages/database/src/schemas/relations.ts

@@ -9,7 +9,7 @@ import { chatGroups, chatGroupsAgents } from './chatGroup';
 import { documentChunks, documents } from './document';
 import { files, knowledgeBases } from './file';
 import { generationBatches, generationTopics, generations } from './generation';
-import { messages, messagesFiles } from './message';
+import { messageGroups, messages, messagesFiles } from './message';
 import { chunks, unstructuredChunks } from './rag';
 import { sessionGroups, sessions } from './session';
 import { threads, topicDocuments, topics } from './topic';
@@ -104,6 +104,11 @@ export const messagesRelations = relations(messages, ({ many, one }) => ({
     fields: [messages.threadId],
     references: [threads.id],
   }),
+
+  messageGroup: one(messageGroups, {
+    fields: [messages.messageGroupId],
+    references: [messageGroups.id],
+  }),
 }));
 
 export const agentsRelations = relations(agents, ({ many }) => ({
@@ -306,3 +311,21 @@ export const chatGroupsAgentsRelations = relations(chatGroupsAgents, ({ one }) =
     references: [users.id],
   }),
 }));
+
+// Message Groups 相关关系定义
+export const messageGroupsRelations = relations(messageGroups, ({ many, one }) => ({
+  user: one(users, {
+    fields: [messageGroups.userId],
+    references: [users.id],
+  }),
+  topic: one(topics, {
+    fields: [messageGroups.topicId],
+    references: [topics.id],
+  }),
+  parentGroup: one(messageGroups, {
+    fields: [messageGroups.parentGroupId],
+    references: [messageGroups.id],
+  }),
+  childGroups: many(messageGroups),
+  messages: many(messages),
+}));

package/packages/database/src/utils/idGenerator.ts

@@ -14,6 +14,7 @@ const prefixes = {
   generationTopics: 'gt',
   generations: 'gen',
   knowledgeBases: 'kb',
+  messageGroups: 'mg',
   messages: 'msg',
   plugins: 'plg',
   sessionGroups: 'sg',