@lobehub/chat 1.36.15 → 1.36.16

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 1.36.16](https://github.com/lobehub/lobe-chat/compare/v1.36.15...v1.36.16)
+
+<sup>Released on **2024-12-12**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor the file model method.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor the file model method, closes [#4998](https://github.com/lobehub/lobe-chat/issues/4998) ([00af34e](https://github.com/lobehub/lobe-chat/commit/00af34e))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.36.15](https://github.com/lobehub/lobe-chat/compare/v1.36.14...v1.36.15)
 
 <sup>Released on **2024-12-12**</sup>

package/changelog/v1.json

@@ -1,4 +1,13 @@
 [
+  {
+    "children": {
+      "improvements": [
+        "Refactor the file model method."
+      ]
+    },
+    "date": "2024-12-12",
+    "version": "1.36.16"
+  },
   {
     "children": {
       "improvements": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.36.15",
+  "version": "1.36.16",
   "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/database/repositories/dataImporter/index.ts

@@ -41,8 +41,8 @@ export class DataImporterRepos {
     let sessionIdMap: Record<string, string> = {};
     let topicIdMap: Record<string, string> = {};
 
-    // import sessionGroups
     await this.db.transaction(async (trx) => {
+      // import sessionGroups
       if (data.sessionGroups && data.sessionGroups.length > 0) {
         const query = await trx.query.sessionGroups.findMany({
           where: and(
@@ -164,10 +164,11 @@ export class DataImporterRepos {
         const mapArray = await trx
           .insert(topics)
           .values(
-            data.topics.map(({ id, createdAt, updatedAt, sessionId, ...res }) => ({
+            data.topics.map(({ id, createdAt, updatedAt, sessionId, favorite, ...res }) => ({
               ...res,
               clientId: id,
               createdAt: new Date(createdAt),
+              favorite: Boolean(favorite),
               sessionId: sessionId ? sessionIdMap[sessionId] : null,
               updatedAt: new Date(updatedAt),
               userId: this.userId,

package/src/database/schemas/file.ts

@@ -12,9 +12,9 @@ import {
 import { createInsertSchema } from 'drizzle-zod';
 
 import { idGenerator } from '@/database/utils/idGenerator';
+
 import { accessedAt, createdAt, timestamps } from './_helpers';
 import { asyncTasks } from './asyncTask';
-import { chunks } from './rag';
 import { users } from './user';
 
 export const globalFiles = pgTable('global_files', {
@@ -59,20 +59,6 @@ export const files = pgTable('files', {
 export type NewFile = typeof files.$inferInsert;
 export type FileItem = typeof files.$inferSelect;
 
-export const fileChunks = pgTable(
-  'file_chunks',
-  {
-    fileId: varchar('file_id').references(() => files.id, { onDelete: 'cascade' }),
-    chunkId: uuid('chunk_id').references(() => chunks.id, { onDelete: 'cascade' }),
-    createdAt: createdAt(),
-  },
-  (t) => ({
-    pk: primaryKey({ columns: [t.fileId, t.chunkId] }),
-  }),
-);
-
-export type NewFileChunkItem = typeof fileChunks.$inferInsert;
-
 export const knowledgeBases = pgTable('knowledge_bases', {
   id: text('id')
     .$defaultFn(() => idGenerator('knowledgeBases'))

package/src/database/schemas/relations.ts

@@ -1,12 +1,14 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix  */
 import { relations } from 'drizzle-orm';
-import { pgTable, primaryKey, text } from 'drizzle-orm/pg-core';
+import { pgTable, primaryKey, text, uuid, varchar } from 'drizzle-orm/pg-core';
+
+import { createdAt } from '@/database/schemas/_helpers';
 
 import { agents, agentsFiles, agentsKnowledgeBases } from './agent';
 import { asyncTasks } from './asyncTask';
 import { files, knowledgeBases } from './file';
 import { messages, messagesFiles } from './message';
-import { unstructuredChunks } from './rag';
+import { chunks, unstructuredChunks } from './rag';
 import { sessionGroups, sessions } from './session';
 import { threads, topics } from './topic';
 
@@ -40,6 +42,19 @@ export const filesToSessions = pgTable(
   }),
 );
 
+export const fileChunks = pgTable(
+  'file_chunks',
+  {
+    fileId: varchar('file_id').references(() => files.id, { onDelete: 'cascade' }),
+    chunkId: uuid('chunk_id').references(() => chunks.id, { onDelete: 'cascade' }),
+    createdAt: createdAt(),
+  },
+  (t) => ({
+    pk: primaryKey({ columns: [t.fileId, t.chunkId] }),
+  }),
+);
+export type NewFileChunkItem = typeof fileChunks.$inferInsert;
+
 export const topicRelations = relations(topics, ({ one }) => ({
   session: one(sessions, {
     fields: [topics.sessionId],

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

@@ -59,6 +59,32 @@ describe('FileModel', () => {
       });
       expect(kbFile).toMatchObject({ fileId: id, knowledgeBaseId: 'kb1' });
     });
+
+    it('should create a new file with hash', async () => {
+      const params = {
+        name: 'test-file.txt',
+        url: 'https://example.com/test-file.txt',
+        size: 100,
+        fileHash: 'abc',
+        fileType: 'text/plain',
+      };
+
+      const { id } = await fileModel.create(params, true);
+      expect(id).toBeDefined();
+
+      const file = await serverDB.query.files.findFirst({ where: eq(files.id, id) });
+      expect(file).toMatchObject({ ...params, userId });
+
+      const globalFile = await serverDB.query.globalFiles.findFirst({
+        where: eq(globalFiles.hashId, params.fileHash),
+      });
+      expect(globalFile).toMatchObject({
+        url: 'https://example.com/test-file.txt',
+        size: 100,
+        hashId: 'abc',
+        fileType: 'text/plain',
+      });
+    });
   });
 
   describe('createGlobalFile', () => {

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

@@ -26,8 +26,21 @@ export class FileModel {
     this.db = db;
   }
 
-  create = async (params: Omit<NewFile, 'id' | 'userId'> & { knowledgeBaseId?: string }) => {
+  create = async (
+    params: Omit<NewFile, 'id' | 'userId'> & { knowledgeBaseId?: string },
+    insertToGlobalFiles?: boolean,
+  ) => {
     const result = await this.db.transaction(async (trx) => {
+      if (insertToGlobalFiles) {
+        await trx.insert(globalFiles).values({
+          fileType: params.fileType,
+          hashId: params.fileHash!,
+          metadata: params.metadata,
+          size: params.size,
+          url: params.url,
+        });
+      }
+
       const result = await trx
         .insert(files)
         .values({ ...params, userId: this.userId })

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

@@ -38,26 +38,19 @@ export const fileRouter = router({
     .mutation(async ({ ctx, input }) => {
       const { isExist } = await ctx.fileModel.checkHash(input.hash!);
 
-      // if the file is not exist in global file, create a new one
-      if (!isExist) {
-        await ctx.fileModel.createGlobalFile({
+      const { id } = await ctx.fileModel.create(
+        {
+          fileHash: input.hash,
           fileType: input.fileType,
-          hashId: input.hash!,
+          knowledgeBaseId: input.knowledgeBaseId,
           metadata: input.metadata,
+          name: input.name,
           size: input.size,
           url: input.url,
-        });
-      }
-
-      const { id } = await ctx.fileModel.create({
-        fileHash: input.hash,
-        fileType: input.fileType,
-        knowledgeBaseId: input.knowledgeBaseId,
-        metadata: input.metadata,
-        name: input.name,
-        size: input.size,
-        url: input.url,
-      });
+        },
+        // if the file is not exist in global file, create a new one
+        !isExist,
+      );
 
       return { id, url: await getFullFileUrl(input.url) };
     }),