From bc7d95cf9d6c4a095fab5dcede8328ab7f9f945e Mon Sep 17 00:00:00 2001 From: chungyau97 Date: Thu, 14 Sep 2023 14:50:56 +0800 Subject: [PATCH] add migration query for chat history --- packages/server/src/Interface.ts | 5 ++++- .../src/database/entities/ChatMessage.ts | 9 +++++++++ .../mysql/1694099200729-AddApiConfig.ts | 3 ++- .../mysql/1694432361423-AddAnalytic.ts | 3 ++- .../mysql/1694658767766-AddChatHistory.ts | 19 +++++++++++++++++++ .../src/database/migrations/mysql/index.ts | 4 +++- .../postgres/1694099183389-AddApiConfig.ts | 2 +- .../postgres/1694432361423-AddAnalytic.ts | 2 +- .../postgres/1694658756136-AddChatHistory.ts | 13 +++++++++++++ .../src/database/migrations/postgres/index.ts | 4 +++- .../sqlite/1694657778173-AddChatHistory.ts | 15 +++++++++++++++ .../src/database/migrations/sqlite/index.ts | 4 +++- 12 files changed, 75 insertions(+), 8 deletions(-) create mode 100644 packages/server/src/database/migrations/mysql/1694658767766-AddChatHistory.ts create mode 100644 packages/server/src/database/migrations/postgres/1694658756136-AddChatHistory.ts create mode 100644 packages/server/src/database/migrations/sqlite/1694657778173-AddChatHistory.ts diff --git a/packages/server/src/Interface.ts b/packages/server/src/Interface.ts index 58740b86..f57c8311 100644 --- a/packages/server/src/Interface.ts +++ b/packages/server/src/Interface.ts @@ -24,8 +24,11 @@ export interface IChatMessage { role: MessageType content: string chatflowid: string - createdDate: Date sourceDocuments?: string + chatType: string + memoryType?: string + sessionId?: string + createdDate: Date } export interface ITool { diff --git a/packages/server/src/database/entities/ChatMessage.ts b/packages/server/src/database/entities/ChatMessage.ts index 4b5306ee..d1fdee72 100644 --- a/packages/server/src/database/entities/ChatMessage.ts +++ b/packages/server/src/database/entities/ChatMessage.ts @@ -20,6 +20,15 @@ export class ChatMessage implements IChatMessage { @Column({ nullable: true, type: 'text' }) sourceDocuments?: string + @Column() + chatType: string + + @Column({ nullable: true }) + memoryType?: string + + @Column({ nullable: true }) + sessionId?: string + @CreateDateColumn() createdDate: Date } diff --git a/packages/server/src/database/migrations/mysql/1694099200729-AddApiConfig.ts b/packages/server/src/database/migrations/mysql/1694099200729-AddApiConfig.ts index c82b36ea..4509c5bb 100644 --- a/packages/server/src/database/migrations/mysql/1694099200729-AddApiConfig.ts +++ b/packages/server/src/database/migrations/mysql/1694099200729-AddApiConfig.ts @@ -2,7 +2,8 @@ import { MigrationInterface, QueryRunner } from 'typeorm' export class AddApiConfig1694099200729 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE \`chat_flow\` ADD COLUMN \`apiConfig\` TEXT;`) + const columnExists = await queryRunner.hasColumn('chat_flow', 'apiConfig') + if (!columnExists) queryRunner.query(`ALTER TABLE \`chat_flow\` ADD COLUMN \`apiConfig\` TEXT;`) } public async down(queryRunner: QueryRunner): Promise { diff --git a/packages/server/src/database/migrations/mysql/1694432361423-AddAnalytic.ts b/packages/server/src/database/migrations/mysql/1694432361423-AddAnalytic.ts index a5e088fa..5fed5753 100644 --- a/packages/server/src/database/migrations/mysql/1694432361423-AddAnalytic.ts +++ b/packages/server/src/database/migrations/mysql/1694432361423-AddAnalytic.ts @@ -2,7 +2,8 @@ import { MigrationInterface, QueryRunner } from 'typeorm' export class AddAnalytic1694432361423 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE \`chat_flow\` ADD COLUMN \`analytic\` TEXT;`) + const columnExists = await queryRunner.hasColumn('chat_flow', 'analytic') + if (!columnExists) queryRunner.query(`ALTER TABLE \`chat_flow\` ADD COLUMN \`analytic\` TEXT;`) } public async down(queryRunner: QueryRunner): Promise { diff --git a/packages/server/src/database/migrations/mysql/1694658767766-AddChatHistory.ts b/packages/server/src/database/migrations/mysql/1694658767766-AddChatHistory.ts new file mode 100644 index 00000000..43d0fd3d --- /dev/null +++ b/packages/server/src/database/migrations/mysql/1694658767766-AddChatHistory.ts @@ -0,0 +1,19 @@ +import { MigrationInterface, QueryRunner } from 'typeorm' + +export class AddChatHistory1694658767766 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + const chatTypeColumnExists = await queryRunner.hasColumn('chat_message', 'chatType') + if (!chatTypeColumnExists) + await queryRunner.query(`ALTER TABLE \`chat_message\` ADD COLUMN \`chatType\` VARCHAR(255) NOT NULL DEFAULT 'INTERNAL';`) + const memoryTypeColumnExists = await queryRunner.hasColumn('chat_message', 'memoryType') + if (!memoryTypeColumnExists) await queryRunner.query(`ALTER TABLE \`chat_message\` ADD COLUMN \`memoryType\` VARCHAR(255);`) + const sessionIdColumnExists = await queryRunner.hasColumn('chat_message', 'sessionId') + if (!sessionIdColumnExists) await queryRunner.query(`ALTER TABLE \`chat_message\` ADD COLUMN \`sessionId\` VARCHAR(255);`) + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE \`chat_message\` DROP COLUMN \`chatType\`, DROP COLUMN \`memoryType\`, DROP COLUMN \`sessionId\`;` + ) + } +} diff --git a/packages/server/src/database/migrations/mysql/index.ts b/packages/server/src/database/migrations/mysql/index.ts index ea26789e..aa34fa55 100644 --- a/packages/server/src/database/migrations/mysql/index.ts +++ b/packages/server/src/database/migrations/mysql/index.ts @@ -5,6 +5,7 @@ import { ModifyCredential1693999261583 } from './1693999261583-ModifyCredential' import { ModifyTool1694001465232 } from './1694001465232-ModifyTool' import { AddApiConfig1694099200729 } from './1694099200729-AddApiConfig' import { AddAnalytic1694432361423 } from './1694432361423-AddAnalytic' +import { AddChatHistory1694658767766 } from './1694658767766-AddChatHistory' export const mysqlMigrations = [ Init1693840429259, @@ -13,5 +14,6 @@ export const mysqlMigrations = [ ModifyCredential1693999261583, ModifyTool1694001465232, AddApiConfig1694099200729, - AddAnalytic1694432361423 + AddAnalytic1694432361423, + AddChatHistory1694658767766 ] diff --git a/packages/server/src/database/migrations/postgres/1694099183389-AddApiConfig.ts b/packages/server/src/database/migrations/postgres/1694099183389-AddApiConfig.ts index 832c2fa3..840bcc24 100644 --- a/packages/server/src/database/migrations/postgres/1694099183389-AddApiConfig.ts +++ b/packages/server/src/database/migrations/postgres/1694099183389-AddApiConfig.ts @@ -2,7 +2,7 @@ import { MigrationInterface, QueryRunner } from 'typeorm' export class AddApiConfig1694099183389 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "chat_flow" ADD COLUMN "apiConfig" TEXT;`) + await queryRunner.query(`ALTER TABLE "chat_flow" ADD COLUMN IF NOT EXISTS "apiConfig" TEXT;`) } public async down(queryRunner: QueryRunner): Promise { diff --git a/packages/server/src/database/migrations/postgres/1694432361423-AddAnalytic.ts b/packages/server/src/database/migrations/postgres/1694432361423-AddAnalytic.ts index ed83c833..e95bd68c 100644 --- a/packages/server/src/database/migrations/postgres/1694432361423-AddAnalytic.ts +++ b/packages/server/src/database/migrations/postgres/1694432361423-AddAnalytic.ts @@ -2,7 +2,7 @@ import { MigrationInterface, QueryRunner } from 'typeorm' export class AddAnalytic1694432361423 implements MigrationInterface { public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "chat_flow" ADD COLUMN "analytic" TEXT;`) + await queryRunner.query(`ALTER TABLE "chat_flow" ADD COLUMN IF NOT EXISTS "analytic" TEXT;`) } public async down(queryRunner: QueryRunner): Promise { diff --git a/packages/server/src/database/migrations/postgres/1694658756136-AddChatHistory.ts b/packages/server/src/database/migrations/postgres/1694658756136-AddChatHistory.ts new file mode 100644 index 00000000..f5862ebe --- /dev/null +++ b/packages/server/src/database/migrations/postgres/1694658756136-AddChatHistory.ts @@ -0,0 +1,13 @@ +import { MigrationInterface, QueryRunner } from 'typeorm' + +export class AddChatHistory1694658756136 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "chat_message" ADD COLUMN IF NOT EXISTS "chatType" VARCHAR NOT NULL DEFAULT 'INTERNAL', ADD COLUMN IF NOT EXISTS "memoryType" VARCHAR, ADD COLUMN IF NOT EXISTS "sessionId" VARCHAR;` + ) + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "chat_message" DROP COLUMN "chatType", DROP COLUMN "memoryType", DROP COLUMN "sessionId";`) + } +} diff --git a/packages/server/src/database/migrations/postgres/index.ts b/packages/server/src/database/migrations/postgres/index.ts index 4a78556b..e16d9107 100644 --- a/packages/server/src/database/migrations/postgres/index.ts +++ b/packages/server/src/database/migrations/postgres/index.ts @@ -5,6 +5,7 @@ import { ModifyCredential1693997070000 } from './1693997070000-ModifyCredential' import { ModifyTool1693997339912 } from './1693997339912-ModifyTool' import { AddApiConfig1694099183389 } from './1694099183389-AddApiConfig' import { AddAnalytic1694432361423 } from './1694432361423-AddAnalytic' +import { AddChatHistory1694658756136 } from './1694658756136-AddChatHistory' export const postgresMigrations = [ Init1693891895163, @@ -13,5 +14,6 @@ export const postgresMigrations = [ ModifyCredential1693997070000, ModifyTool1693997339912, AddApiConfig1694099183389, - AddAnalytic1694432361423 + AddAnalytic1694432361423, + AddChatHistory1694658756136 ] diff --git a/packages/server/src/database/migrations/sqlite/1694657778173-AddChatHistory.ts b/packages/server/src/database/migrations/sqlite/1694657778173-AddChatHistory.ts new file mode 100644 index 00000000..3a6887e5 --- /dev/null +++ b/packages/server/src/database/migrations/sqlite/1694657778173-AddChatHistory.ts @@ -0,0 +1,15 @@ +import { MigrationInterface, QueryRunner } from 'typeorm' + +export class AddChatHistory1694657778173 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "chat_message" ADD COLUMN "chatType" VARCHAR NOT NULL DEFAULT 'INTERNAL';`) + await queryRunner.query(`ALTER TABLE "chat_message" ADD COLUMN "memoryType" VARCHAR;`) + await queryRunner.query(`ALTER TABLE "chat_message" ADD COLUMN "sessionId" VARCHAR;`) + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "chat_message" DROP COLUMN "chatType";`) + await queryRunner.query(`ALTER TABLE "chat_message" DROP COLUMN "memoryType";`) + await queryRunner.query(`ALTER TABLE "chat_message" DROP COLUMN "sessionId";`) + } +} diff --git a/packages/server/src/database/migrations/sqlite/index.ts b/packages/server/src/database/migrations/sqlite/index.ts index bff926b0..680f762b 100644 --- a/packages/server/src/database/migrations/sqlite/index.ts +++ b/packages/server/src/database/migrations/sqlite/index.ts @@ -5,6 +5,7 @@ import { ModifyCredential1693923551694 } from './1693923551694-ModifyCredential' import { ModifyTool1693924207475 } from './1693924207475-ModifyTool' import { AddApiConfig1694090982460 } from './1694090982460-AddApiConfig' import { AddAnalytic1694432361423 } from './1694432361423-AddAnalytic' +import { AddChatHistory1694657778173 } from './1694657778173-AddChatHistory' export const sqliteMigrations = [ Init1693835579790, @@ -13,5 +14,6 @@ export const sqliteMigrations = [ ModifyCredential1693923551694, ModifyTool1693924207475, AddApiConfig1694090982460, - AddAnalytic1694432361423 + AddAnalytic1694432361423, + AddChatHistory1694657778173 ]