♻️ refactor: update sql and types (#4979)

arvinxx · web-flow · commit 8243f0102c1f · 2024-12-11T22:34:31.000+08:00
diff --git a/src/database/migrations/0006_add_knowledge_base.sql b/src/database/migrations/0006_add_knowledge_base.sql
@@ -121,7 +121,7 @@ CREATE TABLE IF NOT EXISTS "unstructured_chunks" (
 	"file_id" varchar
 );
 --> statement-breakpoint
-ALTER TABLE "files_to_messages" RENAME TO "messages_files";
+ALTER TABLE "files_to_messages" RENAME TO "messages_files";--> statement-breakpoint
 DROP TABLE "files_to_agents";--> statement-breakpoint
 ALTER TABLE "files" ADD COLUMN "file_hash" varchar(64);--> statement-breakpoint
 ALTER TABLE "files" ADD COLUMN "chunk_task_id" uuid;--> statement-breakpoint
diff --git a/src/database/migrations/0007_fix_embedding_table.sql b/src/database/migrations/0007_fix_embedding_table.sql
@@ -3,16 +3,20 @@ CREATE TEMP TABLE embeddings_temp AS
 SELECT DISTINCT ON (chunk_id) *
 FROM embeddings
 ORDER BY chunk_id, random();
+--> statement-breakpoint
 
 -- step 2: delete all rows from the original table
 DELETE FROM embeddings;
+--> statement-breakpoint
 
 -- step 3: insert the rows we want to keep back into the original table
 INSERT INTO embeddings
 SELECT * FROM embeddings_temp;
+--> statement-breakpoint
 
 -- step 4: drop the temporary table
 DROP TABLE embeddings_temp;
+--> statement-breakpoint
 
 -- step 5: now it's safe to add the unique constraint
 ALTER TABLE "embeddings" ADD CONSTRAINT "embeddings_chunk_id_unique" UNIQUE("chunk_id");
diff --git a/src/database/server/models/topic.ts b/src/database/server/models/topic.ts
@@ -2,9 +2,9 @@ import { Column, count, inArray, sql } from 'drizzle-orm';
 import { and, desc, eq, exists, isNull, like, or } from 'drizzle-orm/expressions';
 
 import { LobeChatDatabase } from '@/database/type';
+import { idGenerator } from '@/database/utils/idGenerator';
 
 import { NewMessage, TopicItem, messages, topics } from '../../schemas';
-import { idGenerator } from '@/database/utils/idGenerator';
 
 export interface CreateTopicParams {
   favorite?: boolean;
diff --git a/src/services/import/client.ts b/src/services/import/client.ts
@@ -32,7 +32,7 @@ export class ClientService {
     }
 
     if (sessionGroups.length > 0) {
-      const res = await SessionGroupModel.batchCreate(sessionGroups);
+      const res = await SessionGroupModel.batchCreate(sessionGroups as any);
       sessionGroupResult = this.mapImportResult(res);
     }
 
diff --git a/src/types/importer.ts b/src/types/importer.ts
@@ -8,7 +8,7 @@ import {
   MessageRoleType,
 } from '@/types/message';
 import { MetaData } from '@/types/meta';
-import { SessionGroupId, SessionGroupItem } from '@/types/session';
+import { SessionGroupId } from '@/types/session';
 import { ChatTopic } from '@/types/topic';
 
 interface ImportSession {
@@ -64,9 +64,17 @@ interface ImportMessage {
   updatedAt: number;
 }
 
+interface ImportSessionGroup {
+  createdAt: number;
+  id: string;
+  name: string;
+  sort?: number | null;
+  updatedAt: number;
+}
+
 export interface ImporterEntryData {
   messages?: ImportMessage[];
-  sessionGroups?: SessionGroupItem[];
+  sessionGroups?: ImportSessionGroup[];
   sessions?: ImportSession[];
   topics?: ChatTopic[];
   version: number;

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export class ClientService {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`if (sessionGroups.length > 0) {`
`35`		`- const res = await SessionGroupModel.batchCreate(sessionGroups);`
	`35`	`+ const res = await SessionGroupModel.batchCreate(sessionGroups as any);`
`36`	`36`	`sessionGroupResult = this.mapImportResult(res);`
`37`	`37`	`}`
`38`	`38`