@lobehub/chat 1.71.5 → 1.72.0

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

@@ -119,6 +119,13 @@
       "when": 1741844738677,
       "tag": "0016_add_message_index",
       "breakpoints": true
+    },
+    {
+      "idx": 17,
+      "version": "7",
+      "when": 1742269437903,
+      "tag": "0017_add_user_id_to_tables",
+      "breakpoints": true
     }
   ],
   "version": "6"

package/src/database/{server/models → models}/__tests__/_test_template.ts

@@ -4,8 +4,8 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { getTestDBInstance } from '@/database/server/core/dbForTest';
 
-import { sessionGroups, users } from '../../../schemas';
-import { SessionGroupModel } from '../sessionGroup';
+import { sessionGroups, users } from '../../schemas';
+import { SessionGroupModel } from '../../server/models/sessionGroup';
 
 let serverDB = await getTestDBInstance();
 

package/src/database/models/__tests__/_util.ts

@@ -0,0 +1,12 @@
+import { clientDB, initializeDB } from '@/database/client/db';
+import { getTestDBInstance } from '@/database/server/core/dbForTest';
+import { LobeChatDatabase } from '@/database/type';
+
+export const isServerDBMode = process.env.TEST_SERVER_DB === '1';
+
+export const getTestDB = async () => {
+  if (isServerDBMode) return await getTestDBInstance();
+
+  await initializeDB();
+  return clientDB as LobeChatDatabase;
+};

package/src/database/{server/models → models}/__tests__/agent.test.ts

@@ -2,7 +2,7 @@
 import { eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
-import { getTestDBInstance } from '@/database/server/core/dbForTest';
+import { LobeChatDatabase } from '@/database/type';
 
 import {
   agents,
@@ -13,10 +13,11 @@ import {
   knowledgeBases,
   sessions,
   users,
-} from '../../../schemas';
-import { AgentModel } from '../agent';
+} from '../../schemas';
+import { AgentModel } from '../../server/models/agent';
+import { getTestDB } from './_util';
 
-let serverDB = await getTestDBInstance();
+const serverDB: LobeChatDatabase = await getTestDB();
 
 const userId = 'agent-model-test-user-id';
 const agentModel = new AgentModel(serverDB, userId);
@@ -77,7 +78,7 @@ describe('AgentModel', () => {
       const sessionId = 'test-session-id';
       await serverDB.insert(agents).values({ id: agentId, userId });
       await serverDB.insert(sessions).values({ id: sessionId, userId });
-      await serverDB.insert(agentsToSessions).values({ agentId, sessionId });
+      await serverDB.insert(agentsToSessions).values({ agentId, sessionId, userId });
 
       const result = await agentModel.findBySessionId(sessionId);
 

package/src/database/{server/models → models}/__tests__/aiModel.test.ts

@@ -2,13 +2,14 @@
 import { eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
-import { getTestDBInstance } from '@/database/server/core/dbForTest';
+import { LobeChatDatabase } from '@/database/type';
 import { AiProviderModelListItem } from '@/types/aiModel';
 
-import { AiModelSelectItem, NewAiModelItem, aiModels, users } from '../../../schemas';
-import { AiModelModel } from '../aiModel';
+import { AiModelSelectItem, NewAiModelItem, aiModels, users } from '../../schemas';
+import { AiModelModel } from '../../server/models/aiModel';
+import { getTestDB } from './_util';
 
-let serverDB = await getTestDBInstance();
+const serverDB: LobeChatDatabase = await getTestDB();
 
 const userId = 'ai-model-test-user-id';
 const aiProviderModel = new AiModelModel(serverDB, userId);

package/src/database/{server/models → models}/__tests__/aiProvider.test.ts

@@ -2,13 +2,14 @@
 import { eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { getTestDBInstance } from '@/database/server/core/dbForTest';
+import { LobeChatDatabase } from '@/database/type';
 import { ModelProvider } from '@/libs/agent-runtime';
 
-import { aiProviders, users } from '../../../schemas';
-import { AiProviderModel } from '../aiProvider';
+import { aiProviders, users } from '../../schemas';
+import { AiProviderModel } from '../../server/models/aiProvider';
+import { getTestDB } from './_util';
 
-let serverDB = await getTestDBInstance();
+const serverDB: LobeChatDatabase = await getTestDB();
 
 const userId = 'session-group-model-test-user-id';
 const aiProviderModel = new AiProviderModel(serverDB, userId);

package/src/database/{server/models → models}/__tests__/asyncTask.test.ts

@@ -2,13 +2,14 @@
 import { eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { getTestDBInstance } from '@/database/server/core/dbForTest';
+import { LobeChatDatabase } from '@/database/type';
 import { AsyncTaskStatus, AsyncTaskType } from '@/types/asyncTask';
 
-import { asyncTasks, users } from '../../../schemas';
-import { ASYNC_TASK_TIMEOUT, AsyncTaskModel } from '../asyncTask';
+import { asyncTasks, users } from '../../schemas';
+import { ASYNC_TASK_TIMEOUT, AsyncTaskModel } from '../../server/models/asyncTask';
+import { getTestDB } from './_util';
 
-let serverDB = await getTestDBInstance();
+const serverDB: LobeChatDatabase = await getTestDB();
 
 const userId = 'async-task-model-test-user-id';
 const asyncTaskModel = new AsyncTaskModel(serverDB, userId);

package/src/database/{server/models → models}/__tests__/chunk.test.ts

@@ -2,14 +2,15 @@
 import { eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
-import { getTestDBInstance } from '@/database/server/core/dbForTest';
+import { LobeChatDatabase } from '@/database/type';
 import { uuid } from '@/utils/uuid';
 
-import { chunks, embeddings, fileChunks, files, unstructuredChunks, users } from '../../../schemas';
-import { ChunkModel } from '../chunk';
+import { chunks, embeddings, fileChunks, files, unstructuredChunks, users } from '../../schemas';
+import { ChunkModel } from '../../server/models/chunk';
+import { getTestDB } from './_util';
 import { codeEmbedding, designThinkingQuery, designThinkingQuery2 } from './fixtures/embedding';
 
-let serverDB = await getTestDBInstance();
+const serverDB: LobeChatDatabase = await getTestDB();
 
 const userId = 'chunk-model-test-user-id';
 const chunkModel = new ChunkModel(serverDB, userId);
@@ -124,7 +125,9 @@ describe('ChunkModel', () => {
         .values([{ text: 'Non-Orphan Chunk', userId }])
         .returning();
 
-      await serverDB.insert(fileChunks).values([{ fileId: '1', chunkId: nonOrphanChunk.id }]);
+      await serverDB
+        .insert(fileChunks)
+        .values([{ fileId: '1', chunkId: nonOrphanChunk.id, userId }]);
 
       // Execute the method
       await chunkModel.deleteOrphanChunks();
@@ -146,8 +149,8 @@ describe('ChunkModel', () => {
         .returning();
 
       await serverDB.insert(fileChunks).values([
-        { fileId: '1', chunkId: chunk1.id },
-        { fileId: '2', chunkId: chunk2.id },
+        { fileId: '1', chunkId: chunk1.id, userId },
+        { fileId: '2', chunkId: chunk2.id, userId },
       ]);
 
       // Execute the method
@@ -180,8 +183,8 @@ describe('ChunkModel', () => {
         .returning();
 
       await serverDB.insert(fileChunks).values([
-        { fileId, chunkId: chunk1.id },
-        { fileId, chunkId: chunk2.id },
+        { fileId, chunkId: chunk1.id, userId },
+        { fileId, chunkId: chunk2.id, userId },
       ]);
 
       await serverDB.insert(embeddings).values([
@@ -273,9 +276,9 @@ describe('ChunkModel', () => {
         .returning();
 
       await serverDB.insert(fileChunks).values([
-        { fileId, chunkId: chunk1.id },
-        { fileId, chunkId: chunk2.id },
-        { fileId, chunkId: chunk3.id },
+        { fileId, chunkId: chunk1.id, userId },
+        { fileId, chunkId: chunk2.id, userId },
+        { fileId, chunkId: chunk3.id, userId },
       ]);
 
       const result = await chunkModel.findByFileId(fileId, 0);
@@ -299,8 +302,8 @@ describe('ChunkModel', () => {
         .returning();
 
       await serverDB.insert(fileChunks).values([
-        { fileId, chunkId: chunk1.id },
-        { fileId, chunkId: chunk2.id },
+        { fileId, chunkId: chunk1.id, userId },
+        { fileId, chunkId: chunk2.id, userId },
       ]);
 
       const result = await chunkModel.getChunksTextByFileId(fileId);
@@ -324,9 +327,9 @@ describe('ChunkModel', () => {
         .returning();
 
       await serverDB.insert(fileChunks).values([
-        { fileId: '1', chunkId: chunk1.id },
-        { fileId: '1', chunkId: chunk2.id },
-        { fileId: '2', chunkId: chunk3.id },
+        { fileId: '1', chunkId: chunk1.id, userId },
+        { fileId: '1', chunkId: chunk2.id, userId },
+        { fileId: '2', chunkId: chunk3.id, userId },
       ]);
 
       const result = await chunkModel.countByFileIds(fileIds);
@@ -355,8 +358,8 @@ describe('ChunkModel', () => {
         .returning();
 
       await serverDB.insert(fileChunks).values([
-        { fileId, chunkId: chunk1.id },
-        { fileId, chunkId: chunk2.id },
+        { fileId, chunkId: chunk1.id, userId },
+        { fileId, chunkId: chunk2.id, userId },
       ]);
 
       const result = await chunkModel.countByFileId(fileId);
@@ -383,8 +386,8 @@ describe('ChunkModel', () => {
         .returning();
 
       await serverDB.insert(fileChunks).values([
-        { fileId, chunkId: chunk1.id },
-        { fileId, chunkId: chunk2.id },
+        { fileId, chunkId: chunk1.id, userId },
+        { fileId, chunkId: chunk2.id, userId },
       ]);
 
       await serverDB.insert(embeddings).values([
@@ -511,6 +514,7 @@ content in Table html is below:
         chunkResult.map((chunk) => ({
           fileId,
           chunkId: chunk.id,
+          userId,
         })),
       );
 

package/src/database/{server/models → models}/__tests__/file.test.ts

@@ -2,13 +2,14 @@
 import { eq, inArray } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { getTestDBInstance } from '@/database/server/core/dbForTest';
+import { LobeChatDatabase } from '@/database/type';
 import { FilesTabs, SortType } from '@/types/files';
 
-import { files, globalFiles, knowledgeBaseFiles, knowledgeBases, users } from '../../../schemas';
-import { FileModel } from '../file';
+import { files, globalFiles, knowledgeBaseFiles, knowledgeBases, users } from '../../schemas';
+import { FileModel } from '../../server/models/file';
+import { getTestDB } from './_util';
 
-const serverDB = await getTestDBInstance();
+const serverDB: LobeChatDatabase = await getTestDB();
 
 const userId = 'file-model-test-user-id';
 const fileModel = new FileModel(serverDB, userId);
@@ -95,6 +96,7 @@ describe('FileModel', () => {
         size: 100,
         url: 'https://example.com/global-file.txt',
         metadata: { key: 'value' },
+        creator: userId,
       };
 
       const result = await fileModel.createGlobalFile(globalFile);
@@ -115,6 +117,7 @@ describe('FileModel', () => {
         size: 100,
         url: 'https://example.com/existing-file.txt',
         metadata: { key: 'value' },
+        creator: userId,
       };
 
       await serverDB.insert(globalFiles).values(globalFile);
@@ -137,6 +140,7 @@ describe('FileModel', () => {
         url: 'https://example.com/file1.txt',
         size: 100,
         fileType: 'text/plain',
+        creator: userId,
       });
 
       const { id } = await fileModel.create({
@@ -163,6 +167,7 @@ describe('FileModel', () => {
         url: 'https://example.com/file1.txt',
         size: 100,
         fileType: 'text/plain',
+        creator: userId,
       });
 
       const { id } = await fileModel.create({
@@ -192,12 +197,14 @@ describe('FileModel', () => {
         url: 'https://example.com/file1.txt',
         size: 100,
         fileType: 'text/plain',
+        creator: userId,
       });
       await fileModel.createGlobalFile({
         hashId: '2',
         url: 'https://example.com/file2.txt',
         size: 200,
         fileType: 'text/plain',
+        creator: userId,
       });
 
       const file1 = await fileModel.create({
@@ -240,12 +247,14 @@ describe('FileModel', () => {
         url: 'https://example.com/file1.txt',
         size: 100,
         fileType: 'text/plain',
+        creator: userId,
       });
       await fileModel.createGlobalFile({
         hashId: '2',
         url: 'https://example.com/file2.txt',
         size: 200,
         fileType: 'text/plain',
+        creator: userId,
       });
 
       const file1 = await fileModel.create({
@@ -450,7 +459,7 @@ describe('FileModel', () => {
         ]);
         await serverDB
           .insert(knowledgeBaseFiles)
-          .values([{ fileId: 'file1', knowledgeBaseId: 'kb1' }]);
+          .values([{ fileId: 'file1', knowledgeBaseId: 'kb1', userId }]);
       });
 
       it('should query files in a specific knowledge base', async () => {
@@ -551,12 +560,14 @@ describe('FileModel', () => {
         url: 'https://example.com/document.pdf',
         size: 1000,
         fileType: 'application/pdf',
+        creator: userId,
       },
       {
         hashId: 'hash2',
         url: 'https://example.com/image.jpg',
         size: 500,
         fileType: 'image/jpeg',
+        creator: userId,
       },
     ]);
 
@@ -674,6 +685,7 @@ describe('FileModel', () => {
         size: 100,
         url: 'https://example.com/global-file.txt',
         metadata: { key: 'value' },
+        creator: userId,
       };
 
       await serverDB.insert(globalFiles).values(globalFile);
@@ -700,12 +712,14 @@ describe('FileModel', () => {
         fileType: 'text/plain',
         size: 100,
         url: 'https://example.com/file1.txt',
+        creator: userId,
       };
       const globalFiles2 = {
         hashId: 'hash2',
         fileType: 'text/plain',
         size: 200,
         url: 'https://example.com/file2.txt',
+        creator: userId,
       };
 
       await serverDB.insert(globalFiles).values([globalFiles1, globalFiles2]);

package/src/database/{server/models → models}/__tests__/knowledgeBase.test.ts

@@ -2,7 +2,7 @@
 import { and, eq } from 'drizzle-orm/expressions';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
-import { getTestDBInstance } from '@/database/server/core/dbForTest';
+import { LobeChatDatabase } from '@/database/type';
 
 import {
   NewKnowledgeBase,
@@ -11,10 +11,11 @@ import {
   knowledgeBaseFiles,
   knowledgeBases,
   users,
-} from '../../../schemas';
-import { KnowledgeBaseModel } from '../knowledgeBase';
+} from '../../schemas';
+import { KnowledgeBaseModel } from '../../server/models/knowledgeBase';
+import { getTestDB } from './_util';
 
-let serverDB = await getTestDBInstance();
+const serverDB: LobeChatDatabase = await getTestDB();
 
 const userId = 'session-group-model-test-user-id';
 const knowledgeBaseModel = new KnowledgeBaseModel(serverDB, userId);
@@ -160,12 +161,14 @@ describe('KnowledgeBaseModel', () => {
           url: 'https://example.com/document.pdf',
           size: 1000,
           fileType: 'application/pdf',
+          creator: userId,
         },
         {
           hashId: 'hash2',
           url: 'https://example.com/image.jpg',
           size: 500,
           fileType: 'image/jpeg',
+          creator: userId,
         },
       ]);
 
@@ -198,12 +201,14 @@ describe('KnowledgeBaseModel', () => {
           url: 'https://example.com/document.pdf',
           size: 1000,
           fileType: 'application/pdf',
+          creator: userId,
         },
         {
           hashId: 'hash2',
           url: 'https://example.com/image.jpg',
           size: 500,
           fileType: 'image/jpeg',
+          creator: userId,
         },
       ]);