From bc7d95cf9d6c4a095fab5dcede8328ab7f9f945e Mon Sep 17 00:00:00 2001 From: chungyau97 Date: Thu, 14 Sep 2023 14:50:56 +0800 Subject: [PATCH 01/35] 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 ] From 7b54f17a58d5c50c21849dfc06a5522399d7d0bb Mon Sep 17 00:00:00 2001 From: chungyau97 Date: Fri, 15 Sep 2023 21:25:28 +0800 Subject: [PATCH 02/35] modify addChatMessage --- packages/server/src/Interface.ts | 4 ++ packages/server/src/index.ts | 38 +++++++++++++++---- packages/ui/src/api/chatmessage.js | 3 -- .../ui/src/views/chatmessage/ChatMessage.js | 19 ---------- 4 files changed, 35 insertions(+), 29 deletions(-) diff --git a/packages/server/src/Interface.ts b/packages/server/src/Interface.ts index f57c8311..36e02bee 100644 --- a/packages/server/src/Interface.ts +++ b/packages/server/src/Interface.ts @@ -2,6 +2,10 @@ import { ICommonObject, INode, INodeData as INodeDataFromComponent, INodeParams export type MessageType = 'apiMessage' | 'userMessage' +export enum chatType { + INTERNAL = 'INTERNAL', + EXTERNAL = 'EXTERNAL' +} /** * Databases */ diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index db5ecf38..78efe657 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -16,7 +16,8 @@ import { IReactFlowObject, INodeData, IDatabaseExport, - ICredentialReturnResponse + ICredentialReturnResponse, + chatType } from './Interface' import { getNodeModulesPackagePath, @@ -404,12 +405,7 @@ export class App { // Add chatmessages for chatflowid this.app.post('/api/v1/chatmessage/:id', async (req: Request, res: Response) => { const body = req.body - const newChatMessage = new ChatMessage() - Object.assign(newChatMessage, body) - - const chatmessage = this.AppDataSource.getRepository(ChatMessage).create(newChatMessage) - const results = await this.AppDataSource.getRepository(ChatMessage).save(chatmessage) - + const results = await this.addChatMessage(body) return res.json(results) }) @@ -818,6 +814,18 @@ export class App { } } + /** + * Add Chat Message + * @param {any} chatMessage + */ + async addChatMessage(chatMessage: any) { + const newChatMessage = new ChatMessage() + Object.assign(newChatMessage, chatMessage) + + const chatmessage = this.AppDataSource.getRepository(ChatMessage).create(newChatMessage) + return await this.AppDataSource.getRepository(ChatMessage).save(chatmessage) + } + /** * Process Prediction * @param {Request} req @@ -844,6 +852,13 @@ export class App { await this.validateKey(req, res, chatflow) } + await this.addChatMessage({ + role: 'userMessage', + content: incomingInput.question, + chatflowid: chatflowid, + chatType: isInternal ? chatType.INTERNAL : chatType.EXTERNAL + }) + let isStreamValid = false const files = (req.files as any[]) || [] @@ -991,6 +1006,15 @@ export class App { analytic: chatflow.analytic }) + const apiMessage: any = { + role: 'apiMessage', + content: typeof result === 'string' ? result : result.text, + chatflowid: chatflowid, + chatType: isInternal ? chatType.INTERNAL : chatType.EXTERNAL + } + if (result?.sourceDocuments) apiMessage.sourceDocuments = JSON.stringify(result.sourceDocuments) + await this.addChatMessage(apiMessage) + logger.debug(`[server]: Finished running ${nodeToExecuteData.label} (${nodeToExecuteData.id})`) return res.json(result) } catch (e: any) { diff --git a/packages/ui/src/api/chatmessage.js b/packages/ui/src/api/chatmessage.js index d93068e6..72a186a6 100644 --- a/packages/ui/src/api/chatmessage.js +++ b/packages/ui/src/api/chatmessage.js @@ -2,12 +2,9 @@ import client from './client' const getChatmessageFromChatflow = (id) => client.get(`/chatmessage/${id}`) -const createNewChatmessage = (id, body) => client.post(`/chatmessage/${id}`, body) - const deleteChatmessage = (id) => client.delete(`/chatmessage/${id}`) export default { getChatmessageFromChatflow, - createNewChatmessage, deleteChatmessage } diff --git a/packages/ui/src/views/chatmessage/ChatMessage.js b/packages/ui/src/views/chatmessage/ChatMessage.js index 7a15d9ff..cf5cea6c 100644 --- a/packages/ui/src/views/chatmessage/ChatMessage.js +++ b/packages/ui/src/views/chatmessage/ChatMessage.js @@ -104,20 +104,6 @@ export const ChatMessage = ({ open, chatflowid, isDialog }) => { const onChange = useCallback((e) => setUserInput(e.target.value), [setUserInput]) - const addChatMessage = async (message, type, sourceDocuments) => { - try { - const newChatMessageBody = { - role: type, - content: message, - chatflowid: chatflowid - } - if (sourceDocuments) newChatMessageBody.sourceDocuments = JSON.stringify(sourceDocuments) - await chatmessageApi.createNewChatmessage(chatflowid, newChatMessageBody) - } catch (error) { - console.error(error) - } - } - const updateLastMessage = (text) => { setMessages((prevMessages) => { let allMessages = [...cloneDeep(prevMessages)] @@ -140,7 +126,6 @@ export const ChatMessage = ({ open, chatflowid, isDialog }) => { const handleError = (message = 'Oops! There seems to be an error. Please try again.') => { message = message.replace(`Unable to parse JSON response from chat agent.\n\n`, '') setMessages((prevMessages) => [...prevMessages, { message, type: 'apiMessage' }]) - addChatMessage(message, 'apiMessage') setLoading(false) setUserInput('') setTimeout(() => { @@ -158,8 +143,6 @@ export const ChatMessage = ({ open, chatflowid, isDialog }) => { setLoading(true) setMessages((prevMessages) => [...prevMessages, { message: userInput, type: 'userMessage' }]) - // waiting for first chatmessage saved, the first chatmessage will be used in sendMessageAndGetPrediction - await addChatMessage(userInput, 'userMessage') // Send user question and history to API try { @@ -183,12 +166,10 @@ export const ChatMessage = ({ open, chatflowid, isDialog }) => { { message: data.text, sourceDocuments: data.sourceDocuments, type: 'apiMessage' } ]) } - addChatMessage(data.text, 'apiMessage', data.sourceDocuments) } else { if (!isChatFlowAvailableToStream) { setMessages((prevMessages) => [...prevMessages, { message: data, type: 'apiMessage' }]) } - addChatMessage(data, 'apiMessage') } setLoading(false) setUserInput('') From d6cf5fed4222c26070b9bce65eef1af278cac2fd Mon Sep 17 00:00:00 2001 From: chungyau97 Date: Mon, 18 Sep 2023 21:45:51 +0800 Subject: [PATCH 03/35] add chatId column --- packages/server/src/Interface.ts | 2 ++ .../src/database/entities/ChatMessage.ts | 3 ++ .../mysql/1694658767766-AddChatHistory.ts | 24 +++++++++++++- .../postgres/1694658756136-AddChatHistory.ts | 23 ++++++++++++-- .../sqlite/1694657778173-AddChatHistory.ts | 31 +++++++++++++++++-- 5 files changed, 77 insertions(+), 6 deletions(-) diff --git a/packages/server/src/Interface.ts b/packages/server/src/Interface.ts index 36e02bee..120c07be 100644 --- a/packages/server/src/Interface.ts +++ b/packages/server/src/Interface.ts @@ -30,6 +30,7 @@ export interface IChatMessage { chatflowid: string sourceDocuments?: string chatType: string + chatId: string memoryType?: string sessionId?: string createdDate: Date @@ -153,6 +154,7 @@ export interface IncomingInput { history: IMessage[] overrideConfig?: ICommonObject socketIOClientId?: string + chatId?: string } export interface IActiveChatflows { diff --git a/packages/server/src/database/entities/ChatMessage.ts b/packages/server/src/database/entities/ChatMessage.ts index d1fdee72..3efd7fbb 100644 --- a/packages/server/src/database/entities/ChatMessage.ts +++ b/packages/server/src/database/entities/ChatMessage.ts @@ -23,6 +23,9 @@ export class ChatMessage implements IChatMessage { @Column() chatType: string + @Column() + chatId: string + @Column({ nullable: true }) memoryType?: string diff --git a/packages/server/src/database/migrations/mysql/1694658767766-AddChatHistory.ts b/packages/server/src/database/migrations/mysql/1694658767766-AddChatHistory.ts index 43d0fd3d..317d6188 100644 --- a/packages/server/src/database/migrations/mysql/1694658767766-AddChatHistory.ts +++ b/packages/server/src/database/migrations/mysql/1694658767766-AddChatHistory.ts @@ -5,15 +5,37 @@ export class AddChatHistory1694658767766 implements MigrationInterface { 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 chatIdColumnExists = await queryRunner.hasColumn('chat_message', 'chatId') + if (!chatIdColumnExists) await queryRunner.query(`ALTER TABLE \`chat_message\` ADD COLUMN \`chatId\` VARCHAR(255);`) + const results: { id: string; chatflowid: string }[] = await queryRunner.query(`WITH RankedMessages AS ( + SELECT + \`chatflowid\`, + \`id\`, + \`createdDate\`, + ROW_NUMBER() OVER (PARTITION BY \`chatflowid\` ORDER BY \`createdDate\`) AS row_num + FROM \`chat_message\` + ) + SELECT \`chatflowid\`, \`id\` + FROM RankedMessages + WHERE row_num = 1;`) + for (const chatMessage of results) { + await queryRunner.query( + `UPDATE \`chat_message\` SET \`chatId\` = '${chatMessage.id}' WHERE \`chatflowid\` = '${chatMessage.chatflowid}'` + ) + } + await queryRunner.query(`ALTER TABLE \`chat_message\` MODIFY \`chatId\` VARCHAR(255) NOT NULL;`) + 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\`;` + `ALTER TABLE \`chat_message\` DROP COLUMN \`chatType\`, DROP COLUMN \`chatId\`, DROP COLUMN \`memoryType\`, DROP COLUMN \`sessionId\`;` ) } } diff --git a/packages/server/src/database/migrations/postgres/1694658756136-AddChatHistory.ts b/packages/server/src/database/migrations/postgres/1694658756136-AddChatHistory.ts index f5862ebe..cba0e1e4 100644 --- a/packages/server/src/database/migrations/postgres/1694658756136-AddChatHistory.ts +++ b/packages/server/src/database/migrations/postgres/1694658756136-AddChatHistory.ts @@ -3,11 +3,30 @@ 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;` + `ALTER TABLE "chat_message" ADD COLUMN IF NOT EXISTS "chatType" VARCHAR NOT NULL DEFAULT 'INTERNAL', ADD COLUMN IF NOT EXISTS "chatId" VARCHAR, ADD COLUMN IF NOT EXISTS "memoryType" VARCHAR, ADD COLUMN IF NOT EXISTS "sessionId" VARCHAR;` ) + const results: { id: string; chatflowid: string }[] = await queryRunner.query(`WITH RankedMessages AS ( + SELECT + "chatflowid", + "id", + "createdDate", + ROW_NUMBER() OVER (PARTITION BY "chatflowid" ORDER BY "createdDate") AS row_num + FROM "chat_message" + ) + SELECT "chatflowid", "id" + FROM RankedMessages + WHERE row_num = 1;`) + for (const chatMessage of results) { + await queryRunner.query( + `UPDATE "chat_message" SET "chatId" = '${chatMessage.id}' WHERE "chatflowid" = '${chatMessage.chatflowid}'` + ) + } + await queryRunner.query(`ALTER TABLE "chat_message" ALTER COLUMN "chatId" SET NOT NULL;`) } public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "chat_message" DROP COLUMN "chatType", DROP COLUMN "memoryType", DROP COLUMN "sessionId";`) + await queryRunner.query( + `ALTER TABLE "chat_message" DROP COLUMN "chatType", DROP COLUMN "chatId", DROP COLUMN "memoryType", DROP COLUMN "sessionId";` + ) } } diff --git a/packages/server/src/database/migrations/sqlite/1694657778173-AddChatHistory.ts b/packages/server/src/database/migrations/sqlite/1694657778173-AddChatHistory.ts index 3a6887e5..67703ae0 100644 --- a/packages/server/src/database/migrations/sqlite/1694657778173-AddChatHistory.ts +++ b/packages/server/src/database/migrations/sqlite/1694657778173-AddChatHistory.ts @@ -2,13 +2,38 @@ 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;`) + await queryRunner.query(`ALTER TABLE "chat_message" ADD COLUMN "chatId" VARCHAR;`) + const results: { id: string; chatflowid: string }[] = await queryRunner.query(`WITH RankedMessages AS ( + SELECT + "chatflowid", + "id", + "createdDate", + ROW_NUMBER() OVER (PARTITION BY "chatflowid" ORDER BY "createdDate") AS row_num + FROM "chat_message" + ) + SELECT "chatflowid", "id" + FROM RankedMessages + WHERE row_num = 1;`) + for (const chatMessage of results) { + await queryRunner.query( + `UPDATE "chat_message" SET "chatId" = '${chatMessage.id}' WHERE "chatflowid" = '${chatMessage.chatflowid}'` + ) + } + await queryRunner.query( + `CREATE TABLE "temp_chat_message" ("id" varchar PRIMARY KEY NOT NULL, "role" varchar NOT NULL, "chatflowid" varchar NOT NULL, "content" text NOT NULL, "sourceDocuments" text, "createdDate" datetime NOT NULL DEFAULT (datetime('now')), "chatType" VARCHAR NOT NULL DEFAULT 'INTERNAL', "chatId" VARCHAR NOT NULL, "memoryType" VARCHAR, "sessionId" VARCHAR);` + ) + await queryRunner.query( + `INSERT INTO "temp_chat_message" ("id", "role", "chatflowid", "content", "sourceDocuments", "createdDate", "chatId") SELECT "id", "role", "chatflowid", "content", "sourceDocuments", "createdDate", "chatId" FROM "chat_message";` + ) + await queryRunner.query(`DROP TABLE "chat_message";`) + await queryRunner.query(`ALTER TABLE "temp_chat_message" RENAME TO "chat_message";`) + await queryRunner.query(`CREATE INDEX "IDX_e574527322272fd838f4f0f3d3" ON "chat_message" ("chatflowid") ;`) } public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`DROP TABLE IF EXISTS "temp_chat_message";`) await queryRunner.query(`ALTER TABLE "chat_message" DROP COLUMN "chatType";`) + await queryRunner.query(`ALTER TABLE "chat_message" DROP COLUMN "chatId";`) await queryRunner.query(`ALTER TABLE "chat_message" DROP COLUMN "memoryType";`) await queryRunner.query(`ALTER TABLE "chat_message" DROP COLUMN "sessionId";`) } From f7178074ad05ecb2516f513aaedcb0cb91237e48 Mon Sep 17 00:00:00 2001 From: chungyau97 Date: Tue, 19 Sep 2023 14:07:33 +0800 Subject: [PATCH 04/35] add retrieve internal chat message --- packages/server/package.json | 1 + packages/server/src/index.ts | 96 ++++++++++++++----- packages/server/src/utils/index.ts | 3 +- packages/ui/src/api/chatmessage.js | 2 +- .../ui/src/views/chatmessage/ChatMessage.js | 32 +++---- 5 files changed, 92 insertions(+), 42 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 4d4293b0..4fcdfc9d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -64,6 +64,7 @@ "socket.io": "^4.6.1", "sqlite3": "^5.1.6", "typeorm": "^0.3.6", + "uuid": "^9.0.1", "winston": "^3.9.0" }, "devDependencies": { diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index 78efe657..6da37330 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -8,6 +8,7 @@ import basicAuth from 'express-basic-auth' import { Server } from 'socket.io' import logger from './utils/logger' import { expressRequestLogger } from './utils/logger' +import { v4 as uuidv4 } from 'uuid' import { IChatFlow, @@ -391,14 +392,13 @@ export class App { // Get all chatmessages from chatflowid this.app.get('/api/v1/chatmessage/:id', async (req: Request, res: Response) => { - const chatmessages = await this.AppDataSource.getRepository(ChatMessage).find({ - where: { - chatflowid: req.params.id - }, - order: { - createdDate: 'ASC' - } - }) + const chatmessages = await this.getChatMessage(req.params.id, undefined) + return res.json(chatmessages) + }) + + // Get internal chatmessages from chatflowid + this.app.get('/api/v1/internal-chatmessage/:id', async (req: Request, res: Response) => { + const chatmessages = await this.getChatMessage(req.params.id, chatType.INTERNAL) return res.json(chatmessages) }) @@ -815,10 +815,31 @@ export class App { } /** - * Add Chat Message - * @param {any} chatMessage + * Method that get chat messages. + * + * @param chatflowid - + * @param chatType - + * */ - async addChatMessage(chatMessage: any) { + async getChatMessage(chatflowid: string, chatType: chatType | undefined): Promise { + return await this.AppDataSource.getRepository(ChatMessage).find({ + where: { + chatflowid: chatflowid, + chatType: chatType + }, + order: { + createdDate: 'ASC' + } + }) + } + + /** + * Method that add chat messages. + * + * @param chatMessage - + * + */ + async addChatMessage(chatMessage: any): Promise { const newChatMessage = new ChatMessage() Object.assign(newChatMessage, chatMessage) @@ -826,6 +847,20 @@ export class App { return await this.AppDataSource.getRepository(ChatMessage).save(chatmessage) } + /** + * Method that find memory label. + * + * @param nodes - + * + */ + findMemoryLabel(nodes: any[]): string | undefined { + const memoryNode = nodes.find((node) => { + return node.data.category === 'Memory' + }) + + return memoryNode ? memoryNode.data.label : undefined + } + /** * Process Prediction * @param {Request} req @@ -845,20 +880,13 @@ export class App { }) if (!chatflow) return res.status(404).send(`Chatflow ${chatflowid} not found`) - let chatId = await getChatId(chatflow.id) - if (!chatId) chatId = chatflowid + const chatId = incomingInput.chatId ?? uuidv4() + const userMessageDateTime = new Date() if (!isInternal) { await this.validateKey(req, res, chatflow) } - await this.addChatMessage({ - role: 'userMessage', - content: incomingInput.question, - chatflowid: chatflowid, - chatType: isInternal ? chatType.INTERNAL : chatType.EXTERNAL - }) - let isStreamValid = false const files = (req.files as any[]) || [] @@ -986,9 +1014,12 @@ export class App { logger.debug(`[server]: Running ${nodeToExecuteData.label} (${nodeToExecuteData.id})`) - if (nodeToExecuteData.instance) checkMemorySessionId(nodeToExecuteData.instance, chatId) + let sessionId = undefined + let memoryLabel = undefined + if (nodeToExecuteData.instance) sessionId = checkMemorySessionId(nodeToExecuteData.instance, chatId) + if (sessionId) memoryLabel = this.findMemoryLabel(nodes) - const result = isStreamValid + let result = isStreamValid ? await nodeInstance.run(nodeToExecuteData, incomingInput.question, { chatHistory: incomingInput.history, socketIO, @@ -1006,16 +1037,33 @@ export class App { analytic: chatflow.analytic }) + result = typeof result === 'string' ? { text: result } : result + + await this.addChatMessage({ + role: 'userMessage', + content: incomingInput.question, + chatflowid: chatflowid, + chatType: isInternal ? chatType.INTERNAL : chatType.EXTERNAL, + chatId: chatId, + memoryType: memoryLabel ? memoryLabel : undefined, + sessionId: sessionId ? sessionId : undefined, + createdDate: userMessageDateTime + }) + const apiMessage: any = { role: 'apiMessage', - content: typeof result === 'string' ? result : result.text, + content: result.text, chatflowid: chatflowid, - chatType: isInternal ? chatType.INTERNAL : chatType.EXTERNAL + chatType: isInternal ? chatType.INTERNAL : chatType.EXTERNAL, + chatId: chatId, + memoryType: memoryLabel ? memoryLabel : undefined, + sessionId: sessionId ? sessionId : undefined } if (result?.sourceDocuments) apiMessage.sourceDocuments = JSON.stringify(result.sourceDocuments) await this.addChatMessage(apiMessage) logger.debug(`[server]: Finished running ${nodeToExecuteData.label} (${nodeToExecuteData.id})`) + result.chatId = chatId return res.json(result) } catch (e: any) { logger.error('[server]: Error:', e) diff --git a/packages/server/src/utils/index.ts b/packages/server/src/utils/index.ts index b1f7e5a2..0ece0a22 100644 --- a/packages/server/src/utils/index.ts +++ b/packages/server/src/utils/index.ts @@ -922,8 +922,9 @@ export const redactCredentialWithPasswordType = ( * @param {any} instance * @param {string} chatId */ -export const checkMemorySessionId = (instance: any, chatId: string) => { +export const checkMemorySessionId = (instance: any, chatId: string): string => { if (instance.memory && instance.memory.isSessionIdUsingChatMessageId && chatId) { instance.memory.sessionId = chatId } + return instance.memory.sessionId } diff --git a/packages/ui/src/api/chatmessage.js b/packages/ui/src/api/chatmessage.js index 72a186a6..4dcc7c88 100644 --- a/packages/ui/src/api/chatmessage.js +++ b/packages/ui/src/api/chatmessage.js @@ -1,6 +1,6 @@ import client from './client' -const getChatmessageFromChatflow = (id) => client.get(`/chatmessage/${id}`) +const getChatmessageFromChatflow = (id) => client.get(`/internal-chatmessage/${id}`) const deleteChatmessage = (id) => client.delete(`/chatmessage/${id}`) diff --git a/packages/ui/src/views/chatmessage/ChatMessage.js b/packages/ui/src/views/chatmessage/ChatMessage.js index cf5cea6c..f5940932 100644 --- a/packages/ui/src/views/chatmessage/ChatMessage.js +++ b/packages/ui/src/views/chatmessage/ChatMessage.js @@ -50,6 +50,7 @@ export const ChatMessage = ({ open, chatflowid, isDialog }) => { const [isChatFlowAvailableToStream, setIsChatFlowAvailableToStream] = useState(false) const [sourceDialogOpen, setSourceDialogOpen] = useState(false) const [sourceDialogProps, setSourceDialogProps] = useState({}) + const [chatId, setChatId] = useState(undefined) const inputRef = useRef(null) const getChatmessageApi = useApi(chatmessageApi.getChatmessageFromChatflow) @@ -148,7 +149,8 @@ export const ChatMessage = ({ open, chatflowid, isDialog }) => { try { const params = { question: userInput, - history: messages.filter((msg) => msg.message !== 'Hi there! How can I help?') + history: messages.filter((msg) => msg.message !== 'Hi there! How can I help?'), + chatId } if (isChatFlowAvailableToStream) params.socketIOClientId = socketIOClientId @@ -159,18 +161,16 @@ export const ChatMessage = ({ open, chatflowid, isDialog }) => { data = handleVectaraMetadata(data) - if (typeof data === 'object' && data.text && data.sourceDocuments) { - if (!isChatFlowAvailableToStream) { - setMessages((prevMessages) => [ - ...prevMessages, - { message: data.text, sourceDocuments: data.sourceDocuments, type: 'apiMessage' } - ]) - } - } else { - if (!isChatFlowAvailableToStream) { - setMessages((prevMessages) => [...prevMessages, { message: data, type: 'apiMessage' }]) - } + if (!chatId) { + setChatId(data.chatId) } + if (!isChatFlowAvailableToStream) { + setMessages((prevMessages) => [ + ...prevMessages, + { message: data.text, sourceDocuments: data?.sourceDocuments, type: 'apiMessage' } + ]) + } + setLoading(false) setUserInput('') setTimeout(() => { @@ -201,15 +201,15 @@ export const ChatMessage = ({ open, chatflowid, isDialog }) => { // Get chatmessages successful useEffect(() => { if (getChatmessageApi.data) { - const loadedMessages = [] - for (const message of getChatmessageApi.data) { + setChatId(getChatmessageApi.data[0]?.chatId) + const loadedMessages = getChatmessageApi.data.map((message) => { const obj = { message: message.content, type: message.role } if (message.sourceDocuments) obj.sourceDocuments = JSON.parse(message.sourceDocuments) - loadedMessages.push(obj) - } + return obj + }) setMessages((prevMessages) => [...prevMessages, ...loadedMessages]) } From 51f9f0be0468a10e59b06223297a42fbf200b7c3 Mon Sep 17 00:00:00 2001 From: chungyau97 Date: Tue, 19 Sep 2023 21:39:37 +0800 Subject: [PATCH 05/35] modify delete chat message method --- packages/server/src/index.ts | 19 +++++++++++++------ .../ui/src/views/chatmessage/ChatMessage.js | 7 +++++-- .../ui/src/views/chatmessage/ChatPopUp.js | 4 +++- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index 6da37330..c2f3cb38 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -409,22 +409,29 @@ export class App { return res.json(results) }) - // Delete all chatmessages from chatflowid + // Delete all chatmessages from chatId this.app.delete('/api/v1/chatmessage/:id', async (req: Request, res: Response) => { + const chatId = req.params.id + const chatMessage = await this.AppDataSource.getRepository(ChatMessage).findOneBy({ + chatId: chatId + }) + if (!chatMessage) { + res.status(404).send(`chatmessage ${chatId} not found`) + return + } const chatflow = await this.AppDataSource.getRepository(ChatFlow).findOneBy({ - id: req.params.id + id: chatMessage.chatflowid }) if (!chatflow) { - res.status(404).send(`Chatflow ${req.params.id} not found`) + res.status(404).send(`Chatflow ${chatMessage.chatflowid} not found`) return } const flowData = chatflow.flowData const parsedFlowData: IReactFlowObject = JSON.parse(flowData) const nodes = parsedFlowData.nodes - let chatId = await getChatId(chatflow.id) - if (!chatId) chatId = chatflow.id + clearSessionMemory(nodes, this.nodesPool.componentNodes, chatId, this.AppDataSource, req.query.sessionId as string) - const results = await this.AppDataSource.getRepository(ChatMessage).delete({ chatflowid: req.params.id }) + const results = await this.AppDataSource.getRepository(ChatMessage).delete({ chatId: chatId }) return res.json(results) }) diff --git a/packages/ui/src/views/chatmessage/ChatMessage.js b/packages/ui/src/views/chatmessage/ChatMessage.js index f5940932..836a29c3 100644 --- a/packages/ui/src/views/chatmessage/ChatMessage.js +++ b/packages/ui/src/views/chatmessage/ChatMessage.js @@ -163,6 +163,7 @@ export const ChatMessage = ({ open, chatflowid, isDialog }) => { if (!chatId) { setChatId(data.chatId) + localStorage.setItem(`${chatflowid}_INTERNAL`, data.chatId) } if (!isChatFlowAvailableToStream) { setMessages((prevMessages) => [ @@ -200,8 +201,10 @@ export const ChatMessage = ({ open, chatflowid, isDialog }) => { // Get chatmessages successful useEffect(() => { - if (getChatmessageApi.data) { - setChatId(getChatmessageApi.data[0]?.chatId) + if (getChatmessageApi.data?.length) { + const chatId = getChatmessageApi.data[0]?.chatId + setChatId(chatId) + localStorage.setItem(`${chatflowid}_INTERNAL`, chatId) const loadedMessages = getChatmessageApi.data.map((message) => { const obj = { message: message.content, diff --git a/packages/ui/src/views/chatmessage/ChatPopUp.js b/packages/ui/src/views/chatmessage/ChatPopUp.js index 93050c3a..5f1d413c 100644 --- a/packages/ui/src/views/chatmessage/ChatPopUp.js +++ b/packages/ui/src/views/chatmessage/ChatPopUp.js @@ -85,7 +85,9 @@ export const ChatPopUp = ({ chatflowid }) => { if (isConfirmed) { try { - await chatmessageApi.deleteChatmessage(chatflowid) + const chatId = localStorage.getItem(`${chatflowid}_INTERNAL`) + await chatmessageApi.deleteChatmessage(chatId) + localStorage.removeItem(`${chatflowid}_INTERNAL`) resetChatDialog() enqueueSnackbar({ message: 'Succesfully cleared all chat history', From ea1f3f67890ef8ca28193709ecc816d23caa3af5 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 17 Oct 2023 16:24:21 +0100 Subject: [PATCH 06/35] add fix for backed chat message --- packages/server/src/index.ts | 2 +- packages/server/src/utils/index.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index 7dc8cb8c..c4594efa 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -1077,7 +1077,7 @@ export class App { await this.addChatMessage(apiMessage) logger.debug(`[server]: Finished running ${nodeToExecuteData.label} (${nodeToExecuteData.id})`) - result.chatId = chatId + if (incomingInput.chatId) result.chatId = chatId return res.json(result) } catch (e: any) { logger.error('[server]: Error:', e) diff --git a/packages/server/src/utils/index.ts b/packages/server/src/utils/index.ts index 749d8c55..d636a6cd 100644 --- a/packages/server/src/utils/index.ts +++ b/packages/server/src/utils/index.ts @@ -931,6 +931,7 @@ export const redactCredentialWithPasswordType = ( export const checkMemorySessionId = (instance: any, chatId: string): string => { if (instance.memory && instance.memory.isSessionIdUsingChatMessageId && chatId) { instance.memory.sessionId = chatId + instance.memory.chatHistory.sessionId = chatId } return instance.memory.sessionId } From 4bc827ca6891c243728cb96469006b09d13343d0 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 18 Oct 2023 12:30:56 +0100 Subject: [PATCH 07/35] update share chatbot config --- .../ui/src/views/chatflows/ShareChatbot.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/packages/ui/src/views/chatflows/ShareChatbot.js b/packages/ui/src/views/chatflows/ShareChatbot.js index 0f05c28a..dc6c0621 100644 --- a/packages/ui/src/views/chatflows/ShareChatbot.js +++ b/packages/ui/src/views/chatflows/ShareChatbot.js @@ -57,6 +57,9 @@ const ShareChatbot = ({ isSessionMemory }) => { const [isPublicChatflow, setChatflowIsPublic] = useState(chatflow.isPublic ?? false) const [generateNewSession, setGenerateNewSession] = useState(chatbotConfig?.generateNewSession ?? false) + const [title, setTitle] = useState(chatbotConfig?.title ?? '') + const [titleAvatarSrc, setTitleAvatarSrc] = useState(chatbotConfig?.titleAvatarSrc ?? '') + const [welcomeMessage, setWelcomeMessage] = useState(chatbotConfig?.welcomeMessage ?? '') const [backgroundColor, setBackgroundColor] = useState(chatbotConfig?.backgroundColor ?? defaultConfig.backgroundColor) const [fontSize, setFontSize] = useState(chatbotConfig?.fontSize ?? defaultConfig.fontSize) @@ -108,6 +111,8 @@ const ShareChatbot = ({ isSessionMemory }) => { textInput: {}, overrideConfig: {} } + if (title) obj.title = title + if (titleAvatarSrc) obj.titleAvatarSrc = titleAvatarSrc if (welcomeMessage) obj.welcomeMessage = welcomeMessage if (backgroundColor) obj.backgroundColor = backgroundColor if (fontSize) obj.fontSize = fontSize @@ -252,6 +257,12 @@ const ShareChatbot = ({ isSessionMemory }) => { const onTextChanged = (value, fieldName) => { switch (fieldName) { + case 'title': + setTitle(value) + break + case 'titleAvatarSrc': + setTitleAvatarSrc(value) + break case 'welcomeMessage': setWelcomeMessage(value) break @@ -395,6 +406,14 @@ const ShareChatbot = ({ isSessionMemory }) => { /> + {textField(title, 'title', 'Title', 'string', 'Flowise Assistant')} + {textField( + titleAvatarSrc, + 'titleAvatarSrc', + 'Title Avatar Link', + 'string', + `https://raw.githubusercontent.com/FlowiseAI/Flowise/main/assets/FloWiseAI_dark.png` + )} {textField(welcomeMessage, 'welcomeMessage', 'Welcome Message', 'string', 'Hello! This is custom welcome message')} {colorField(backgroundColor, 'backgroundColor', 'Background Color')} {textField(fontSize, 'fontSize', 'Font Size', 'number')} From b3603d7d08775cbdaf1aeb98a417096e91df219b Mon Sep 17 00:00:00 2001 From: Antonio Rodriguez <42835728+rodzanto@users.noreply.github.com> Date: Thu, 19 Oct 2023 14:51:48 +0200 Subject: [PATCH 08/35] Update AWSBedrockEmbedding.ts Corrected the version of the titan embeddings model v2 --- .../nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts b/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts index 0ac26d85..e5012372 100644 --- a/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts +++ b/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts @@ -79,7 +79,7 @@ class AWSBedrockEmbedding_Embeddings implements INode { label: 'Model Name', name: 'model', type: 'options', - options: [{ label: 'amazon.titan-embed-text-v1', name: 'amazon.titan-embed-text-v1' }], + options: [{ label: 'amazon.titan-embed-text-v1', name: 'amazon.titan-embed-text-v2' }], default: 'amazon.titan-embed-text-v1' } ] From b40b41bdbc046c4540ab244e7fa057c16ce37053 Mon Sep 17 00:00:00 2001 From: vinodkiran Date: Fri, 20 Oct 2023 16:33:32 +0530 Subject: [PATCH 09/35] Redis Credential : Additional Redis URL based credential --- .../RedisCacheUrlApi.credential.ts | 25 ++++++++++++++++ .../nodes/cache/RedisCache/RedisCache.ts | 29 +++++++++++------- .../cache/RedisCache/RedisEmbeddingsCache.ts | 30 ++++++++++++------- 3 files changed, 62 insertions(+), 22 deletions(-) create mode 100644 packages/components/credentials/RedisCacheUrlApi.credential.ts diff --git a/packages/components/credentials/RedisCacheUrlApi.credential.ts b/packages/components/credentials/RedisCacheUrlApi.credential.ts new file mode 100644 index 00000000..fc2e2eb2 --- /dev/null +++ b/packages/components/credentials/RedisCacheUrlApi.credential.ts @@ -0,0 +1,25 @@ +import { INodeParams, INodeCredential } from '../src/Interface' + +class RedisCacheUrlApi implements INodeCredential { + label: string + name: string + version: number + description: string + inputs: INodeParams[] + + constructor() { + this.label = 'Redis Cache URL' + this.name = 'redisCacheUrlApi' + this.version = 1.0 + this.inputs = [ + { + label: 'Redis URL', + name: 'redisUrl', + type: 'string', + default: '127.0.0.1' + } + ] + } +} + +module.exports = { credClass: RedisCacheUrlApi } diff --git a/packages/components/nodes/cache/RedisCache/RedisCache.ts b/packages/components/nodes/cache/RedisCache/RedisCache.ts index 38998a46..3b68cf12 100644 --- a/packages/components/nodes/cache/RedisCache/RedisCache.ts +++ b/packages/components/nodes/cache/RedisCache/RedisCache.ts @@ -30,7 +30,7 @@ class RedisCache implements INode { name: 'credential', type: 'credential', optional: true, - credentialNames: ['redisCacheApi'] + credentialNames: ['redisCacheApi', 'redisCacheUrlApi'] } this.inputs = [ { @@ -48,17 +48,24 @@ class RedisCache implements INode { const ttl = nodeData.inputs?.ttl as string const credentialData = await getCredentialData(nodeData.credential ?? '', options) - const username = getCredentialParam('redisCacheUser', credentialData, nodeData) - const password = getCredentialParam('redisCachePwd', credentialData, nodeData) - const portStr = getCredentialParam('redisCachePort', credentialData, nodeData) - const host = getCredentialParam('redisCacheHost', credentialData, nodeData) + const redisUrl = getCredentialParam('redisUrl', credentialData, nodeData) - const client = new Redis({ - port: portStr ? parseInt(portStr) : 6379, - host, - username, - password - }) + let client: Redis + if (!redisUrl || redisUrl === '') { + const username = getCredentialParam('redisCacheUser', credentialData, nodeData) + const password = getCredentialParam('redisCachePwd', credentialData, nodeData) + const portStr = getCredentialParam('redisCachePort', credentialData, nodeData) + const host = getCredentialParam('redisCacheHost', credentialData, nodeData) + + client = new Redis({ + port: portStr ? parseInt(portStr) : 6379, + host, + username, + password + }) + } else { + client = new Redis(redisUrl) + } const redisClient = new LangchainRedisCache(client) diff --git a/packages/components/nodes/cache/RedisCache/RedisEmbeddingsCache.ts b/packages/components/nodes/cache/RedisCache/RedisEmbeddingsCache.ts index 4eecb1f5..f15869d7 100644 --- a/packages/components/nodes/cache/RedisCache/RedisEmbeddingsCache.ts +++ b/packages/components/nodes/cache/RedisCache/RedisEmbeddingsCache.ts @@ -30,7 +30,7 @@ class RedisEmbeddingsCache implements INode { name: 'credential', type: 'credential', optional: true, - credentialNames: ['redisCacheApi'] + credentialNames: ['redisCacheApi', 'redisCacheUrlApi'] } this.inputs = [ { @@ -63,17 +63,25 @@ class RedisEmbeddingsCache implements INode { const underlyingEmbeddings = nodeData.inputs?.embeddings as Embeddings const credentialData = await getCredentialData(nodeData.credential ?? '', options) - const username = getCredentialParam('redisCacheUser', credentialData, nodeData) - const password = getCredentialParam('redisCachePwd', credentialData, nodeData) - const portStr = getCredentialParam('redisCachePort', credentialData, nodeData) - const host = getCredentialParam('redisCacheHost', credentialData, nodeData) + const redisUrl = getCredentialParam('redisUrl', credentialData, nodeData) + + let client: Redis + if (!redisUrl || redisUrl === '') { + const username = getCredentialParam('redisCacheUser', credentialData, nodeData) + const password = getCredentialParam('redisCachePwd', credentialData, nodeData) + const portStr = getCredentialParam('redisCachePort', credentialData, nodeData) + const host = getCredentialParam('redisCacheHost', credentialData, nodeData) + + client = new Redis({ + port: portStr ? parseInt(portStr) : 6379, + host, + username, + password + }) + } else { + client = new Redis(redisUrl) + } - const client = new Redis({ - port: portStr ? parseInt(portStr) : 6379, - host, - username, - password - }) ttl ??= '3600' let ttlNumber = parseInt(ttl, 10) const redisStore = new RedisByteStore({ From 31d0facde78b24cb5f7c1d998832311734428fe0 Mon Sep 17 00:00:00 2001 From: Antonio Rodriguez <42835728+rodzanto@users.noreply.github.com> Date: Fri, 20 Oct 2023 13:16:10 +0200 Subject: [PATCH 10/35] Update AWSBedrockEmbedding.ts Added the newer v2 for the Amazon Titan Embed model --- .../nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts b/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts index e5012372..f092cbec 100644 --- a/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts +++ b/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts @@ -79,7 +79,7 @@ class AWSBedrockEmbedding_Embeddings implements INode { label: 'Model Name', name: 'model', type: 'options', - options: [{ label: 'amazon.titan-embed-text-v1', name: 'amazon.titan-embed-text-v2' }], + options: [{ label: 'amazon.titan-embed-text-v1', name: 'amazon.titan-embed-text-v1' }, { label: 'amazon.titan-embed-g1-text-02', name: 'amazon.titan-embed-g1-text-02' }], default: 'amazon.titan-embed-text-v1' } ] From 9e07a1ba7cc43fce1c325b068f7719c88a72a87e Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 20 Oct 2023 12:41:49 +0100 Subject: [PATCH 11/35] add additional config --- .../Postgres_Existing/Postgres_Exisiting.ts | 18 ++++++++++++++++++ .../Postgres_Upsert/Postgres_Upsert.ts | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/packages/components/nodes/vectorstores/Postgres_Existing/Postgres_Exisiting.ts b/packages/components/nodes/vectorstores/Postgres_Existing/Postgres_Exisiting.ts index 91e371da..c0887432 100644 --- a/packages/components/nodes/vectorstores/Postgres_Existing/Postgres_Exisiting.ts +++ b/packages/components/nodes/vectorstores/Postgres_Existing/Postgres_Exisiting.ts @@ -65,6 +65,13 @@ class Postgres_Existing_VectorStores implements INode { additionalParams: true, optional: true }, + { + label: 'Additional Configuration', + name: 'additionalConfig', + type: 'json', + additionalParams: true, + optional: true + }, { label: 'Top K', name: 'topK', @@ -96,11 +103,22 @@ class Postgres_Existing_VectorStores implements INode { const _tableName = nodeData.inputs?.tableName as string const tableName = _tableName ? _tableName : 'documents' const embeddings = nodeData.inputs?.embeddings as Embeddings + const additionalConfig = nodeData.inputs?.additionalConfig as string const output = nodeData.outputs?.output as string const topK = nodeData.inputs?.topK as string const k = topK ? parseFloat(topK) : 4 + let additionalConfiguration = {} + if (additionalConfig) { + try { + additionalConfiguration = typeof additionalConfig === 'object' ? additionalConfig : JSON.parse(additionalConfig) + } catch (exception) { + throw new Error('Invalid JSON in the Additional Configuration: ' + exception) + } + } + const postgresConnectionOptions = { + ...additionalConfiguration, type: 'postgres', host: nodeData.inputs?.host as string, port: nodeData.inputs?.port as number, diff --git a/packages/components/nodes/vectorstores/Postgres_Upsert/Postgres_Upsert.ts b/packages/components/nodes/vectorstores/Postgres_Upsert/Postgres_Upsert.ts index 7df0ecb1..bc16a052 100644 --- a/packages/components/nodes/vectorstores/Postgres_Upsert/Postgres_Upsert.ts +++ b/packages/components/nodes/vectorstores/Postgres_Upsert/Postgres_Upsert.ts @@ -72,6 +72,13 @@ class PostgresUpsert_VectorStores implements INode { additionalParams: true, optional: true }, + { + label: 'Additional Configuration', + name: 'additionalConfig', + type: 'json', + additionalParams: true, + optional: true + }, { label: 'Top K', name: 'topK', @@ -104,11 +111,22 @@ class PostgresUpsert_VectorStores implements INode { const tableName = _tableName ? _tableName : 'documents' const docs = nodeData.inputs?.document as Document[] const embeddings = nodeData.inputs?.embeddings as Embeddings + const additionalConfig = nodeData.inputs?.additionalConfig as string const output = nodeData.outputs?.output as string const topK = nodeData.inputs?.topK as string const k = topK ? parseFloat(topK) : 4 + let additionalConfiguration = {} + if (additionalConfig) { + try { + additionalConfiguration = typeof additionalConfig === 'object' ? additionalConfig : JSON.parse(additionalConfig) + } catch (exception) { + throw new Error('Invalid JSON in the Additional Configuration: ' + exception) + } + } + const postgresConnectionOptions = { + ...additionalConfiguration, type: 'postgres', host: nodeData.inputs?.host as string, port: nodeData.inputs?.port as number, From 931e14c0829ec673c1cb84c39af1117cf0f335d4 Mon Sep 17 00:00:00 2001 From: vinodkiran Date: Fri, 20 Oct 2023 20:03:38 +0530 Subject: [PATCH 12/35] New Feature : Redis Vector Store --- .../vectorstores/Redis/RedisSearchBase.ts | 115 ++++++++++++++++++ .../vectorstores/Redis/Redis_Existing.ts | 32 +++++ .../nodes/vectorstores/Redis/Redis_Upsert.ts | 46 +++++++ .../nodes/vectorstores/Redis/redis.svg | 1 + 4 files changed, 194 insertions(+) create mode 100644 packages/components/nodes/vectorstores/Redis/RedisSearchBase.ts create mode 100644 packages/components/nodes/vectorstores/Redis/Redis_Existing.ts create mode 100644 packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts create mode 100644 packages/components/nodes/vectorstores/Redis/redis.svg diff --git a/packages/components/nodes/vectorstores/Redis/RedisSearchBase.ts b/packages/components/nodes/vectorstores/Redis/RedisSearchBase.ts new file mode 100644 index 00000000..c47c1e51 --- /dev/null +++ b/packages/components/nodes/vectorstores/Redis/RedisSearchBase.ts @@ -0,0 +1,115 @@ +import { + getBaseClasses, + getCredentialData, + getCredentialParam, + ICommonObject, + INodeData, + INodeOutputsValue, + INodeParams +} from '../../../src' + +import { Embeddings } from 'langchain/embeddings/base' +import { VectorStore } from 'langchain/vectorstores/base' +import { Document } from 'langchain/document' +import { createClient } from 'redis' +import { RedisVectorStore } from 'langchain/vectorstores/redis' + +export abstract class RedisSearchBase { + label: string + name: string + version: number + description: string + type: string + icon: string + category: string + baseClasses: string[] + inputs: INodeParams[] + credential: INodeParams + outputs: INodeOutputsValue[] + redisClient: ReturnType + + protected constructor() { + this.type = 'Redis' + this.icon = 'redis.svg' + this.category = 'Vector Stores' + this.baseClasses = [this.type, 'VectorStoreRetriever', 'BaseRetriever'] + this.credential = { + label: 'Connect Credential', + name: 'credential', + type: 'credential', + credentialNames: ['redisCacheUrlApi', 'redisCacheApi'] + } + this.inputs = [ + { + label: 'Embeddings', + name: 'embeddings', + type: 'Embeddings' + }, + { + label: 'Index Name', + name: 'indexName', + placeholder: '', + type: 'string' + }, + { + label: 'Top K', + name: 'topK', + description: 'Number of top results to fetch. Default to 4', + placeholder: '4', + type: 'number', + additionalParams: true, + optional: true + } + ] + this.outputs = [ + { + label: 'Redis Retriever', + name: 'retriever', + baseClasses: this.baseClasses + }, + { + label: 'Redis Vector Store', + name: 'vectorStore', + baseClasses: [this.type, ...getBaseClasses(RedisVectorStore)] + } + ] + } + + abstract constructVectorStore( + embeddings: Embeddings, + indexName: string, + docs: Document>[] | undefined + ): Promise + + async init(nodeData: INodeData, _: string, options: ICommonObject, docs: Document>[] | undefined): Promise { + const credentialData = await getCredentialData(nodeData.credential ?? '', options) + const indexName = nodeData.inputs?.indexName as string + const embeddings = nodeData.inputs?.embeddings as Embeddings + const topK = nodeData.inputs?.topK as string + const k = topK ? parseFloat(topK) : 4 + const output = nodeData.outputs?.output as string + + let redisUrl = getCredentialParam('redisUrl', credentialData, nodeData) + if (!redisUrl || redisUrl === '') { + const username = getCredentialParam('redisCacheUser', credentialData, nodeData) + const password = getCredentialParam('redisCachePwd', credentialData, nodeData) + const portStr = getCredentialParam('redisCachePort', credentialData, nodeData) + const host = getCredentialParam('redisCacheHost', credentialData, nodeData) + + redisUrl = 'redis://' + username + ':' + password + '@' + host + ':' + portStr + } + + this.redisClient = createClient({ url: redisUrl }) + await this.redisClient.connect() + + const vectorStore = await this.constructVectorStore(embeddings, indexName, docs) + + if (output === 'retriever') { + return vectorStore.asRetriever(k) + } else if (output === 'vectorStore') { + ;(vectorStore as any).k = k + return vectorStore + } + return vectorStore + } +} diff --git a/packages/components/nodes/vectorstores/Redis/Redis_Existing.ts b/packages/components/nodes/vectorstores/Redis/Redis_Existing.ts new file mode 100644 index 00000000..88166659 --- /dev/null +++ b/packages/components/nodes/vectorstores/Redis/Redis_Existing.ts @@ -0,0 +1,32 @@ +import { ICommonObject, INode, INodeData } from '../../../src/Interface' +import { Embeddings } from 'langchain/embeddings/base' +import { VectorStore } from 'langchain/vectorstores/base' +import { RedisVectorStore, RedisVectorStoreConfig } from 'langchain/vectorstores/redis' +import { Document } from 'langchain/document' + +import { RedisSearchBase } from './RedisSearchBase' + +class RedisExisting_VectorStores extends RedisSearchBase implements INode { + constructor() { + super() + this.label = 'Redis Load Existing Index' + this.name = 'RedisIndex' + this.version = 1.0 + this.description = 'Load existing index from Redis (i.e: Document has been upserted)' + } + + async constructVectorStore(embeddings: Embeddings, indexName: string, _: Document>[]): Promise { + const storeConfig: RedisVectorStoreConfig = { + redisClient: this.redisClient, + indexName: indexName + } + + return new RedisVectorStore(embeddings, storeConfig) + } + + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { + return super.init(nodeData, _, options, undefined) + } +} + +module.exports = { nodeClass: RedisExisting_VectorStores } diff --git a/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts b/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts new file mode 100644 index 00000000..2af445eb --- /dev/null +++ b/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts @@ -0,0 +1,46 @@ +import { ICommonObject, INode, INodeData } from '../../../src/Interface' +import { Embeddings } from 'langchain/embeddings/base' +import { Document } from 'langchain/document' + +import { flatten } from 'lodash' +import { RedisSearchBase } from './RedisSearchBase' +import { VectorStore } from 'langchain/vectorstores/base' +import { RedisVectorStore, RedisVectorStoreConfig } from 'langchain/vectorstores/redis' + +class RedisUpsert_VectorStores extends RedisSearchBase implements INode { + constructor() { + super() + this.label = 'Redis Upsert Document' + this.name = 'RedisUpsert' + this.version = 1.0 + this.description = 'Upsert documents to Redis' + this.inputs.unshift({ + label: 'Document', + name: 'document', + type: 'Document', + list: true + }) + } + + async constructVectorStore(embeddings: Embeddings, indexName: string, docs: Document>[]): Promise { + const storeConfig: RedisVectorStoreConfig = { + redisClient: this.redisClient, + indexName: indexName + } + return await RedisVectorStore.fromDocuments(docs, embeddings, storeConfig) + } + + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { + const docs = nodeData.inputs?.document as Document[] + + const flattenDocs = docs && docs.length ? flatten(docs) : [] + const finalDocs = [] + for (let i = 0; i < flattenDocs.length; i += 1) { + finalDocs.push(new Document(flattenDocs[i])) + } + + return super.init(nodeData, _, options, flattenDocs) + } +} + +module.exports = { nodeClass: RedisUpsert_VectorStores } diff --git a/packages/components/nodes/vectorstores/Redis/redis.svg b/packages/components/nodes/vectorstores/Redis/redis.svg new file mode 100644 index 00000000..90359069 --- /dev/null +++ b/packages/components/nodes/vectorstores/Redis/redis.svg @@ -0,0 +1 @@ + \ No newline at end of file From 23c62bdc0b0a7b7465737c851b3d4681d969eaea Mon Sep 17 00:00:00 2001 From: vinodkiran Date: Sun, 22 Oct 2023 11:52:06 +0530 Subject: [PATCH 13/35] Redis Vector Store - addition of similaritySearchVectorWithScore method and other updates --- .../vectorstores/Redis/RedisSearchBase.ts | 104 +++++++++++++++++- .../vectorstores/Redis/Redis_Existing.ts | 12 +- .../nodes/vectorstores/Redis/Redis_Upsert.ts | 19 +++- .../nodes/vectorstores/Redis/utils.ts | 25 +++++ 4 files changed, 155 insertions(+), 5 deletions(-) create mode 100644 packages/components/nodes/vectorstores/Redis/utils.ts diff --git a/packages/components/nodes/vectorstores/Redis/RedisSearchBase.ts b/packages/components/nodes/vectorstores/Redis/RedisSearchBase.ts index c47c1e51..e7fb5f11 100644 --- a/packages/components/nodes/vectorstores/Redis/RedisSearchBase.ts +++ b/packages/components/nodes/vectorstores/Redis/RedisSearchBase.ts @@ -11,8 +11,9 @@ import { import { Embeddings } from 'langchain/embeddings/base' import { VectorStore } from 'langchain/vectorstores/base' import { Document } from 'langchain/document' -import { createClient } from 'redis' +import { createClient, SearchOptions } from 'redis' import { RedisVectorStore } from 'langchain/vectorstores/redis' +import { escapeSpecialChars, unEscapeSpecialChars } from './utils' export abstract class RedisSearchBase { label: string @@ -51,6 +52,40 @@ export abstract class RedisSearchBase { placeholder: '', type: 'string' }, + { + label: 'Delete and Recreate the Index (will remove all contents as well) ?', + name: 'deleteIndex', + description: 'Delete the index if it already exists', + default: false, + type: 'boolean' + }, + { + label: 'Content Field', + name: 'contentKey', + description: 'Name of the field (column) that contains the actual content', + type: 'string', + default: 'content', + additionalParams: true, + optional: true + }, + { + label: 'Metadata Field', + name: 'metadataKey', + description: 'Name of the field (column) that contains the metadata of the document', + type: 'string', + default: 'metadata', + additionalParams: true, + optional: true + }, + { + label: 'Vector Field', + name: 'vectorKey', + description: 'Name of the field (column) that contains the vector', + type: 'string', + default: 'content_vector', + additionalParams: true, + optional: true + }, { label: 'Top K', name: 'topK', @@ -78,14 +113,19 @@ export abstract class RedisSearchBase { abstract constructVectorStore( embeddings: Embeddings, indexName: string, + deleteIndex: boolean, docs: Document>[] | undefined ): Promise async init(nodeData: INodeData, _: string, options: ICommonObject, docs: Document>[] | undefined): Promise { const credentialData = await getCredentialData(nodeData.credential ?? '', options) const indexName = nodeData.inputs?.indexName as string + let contentKey = nodeData.inputs?.contentKey as string + let metadataKey = nodeData.inputs?.metadataKey as string + let vectorKey = nodeData.inputs?.vectorKey as string const embeddings = nodeData.inputs?.embeddings as Embeddings const topK = nodeData.inputs?.topK as string + const deleteIndex = nodeData.inputs?.deleteIndex as boolean const k = topK ? parseFloat(topK) : 4 const output = nodeData.outputs?.output as string @@ -102,7 +142,67 @@ export abstract class RedisSearchBase { this.redisClient = createClient({ url: redisUrl }) await this.redisClient.connect() - const vectorStore = await this.constructVectorStore(embeddings, indexName, docs) + const vectorStore = await this.constructVectorStore(embeddings, indexName, deleteIndex, docs) + if (!contentKey || contentKey === '') contentKey = 'content' + if (!metadataKey || metadataKey === '') metadataKey = 'metadata' + if (!vectorKey || vectorKey === '') vectorKey = 'content_vector' + + const buildQuery = (query: number[], k: number, filter?: string[]): [string, SearchOptions] => { + const vectorScoreField = 'vector_score' + + let hybridFields = '*' + // if a filter is set, modify the hybrid query + if (filter && filter.length) { + // `filter` is a list of strings, then it's applied using the OR operator in the metadata key + hybridFields = `@${metadataKey}:(${filter.map(escapeSpecialChars).join('|')})` + } + + const baseQuery = `${hybridFields} => [KNN ${k} @${vectorKey} $vector AS ${vectorScoreField}]` + const returnFields = [metadataKey, contentKey, vectorScoreField] + + const options: SearchOptions = { + PARAMS: { + vector: Buffer.from(new Float32Array(query).buffer) + }, + RETURN: returnFields, + SORTBY: vectorScoreField, + DIALECT: 2, + LIMIT: { + from: 0, + size: k + } + } + + return [baseQuery, options] + } + + vectorStore.similaritySearchVectorWithScore = async ( + query: number[], + k: number, + filter?: string[] + ): Promise<[Document, number][]> => { + const results = await this.redisClient.ft.search(indexName, ...buildQuery(query, k, filter)) + const result: [Document, number][] = [] + + if (results.total) { + for (const res of results.documents) { + if (res.value) { + const document = res.value + if (document.vector_score) { + const metadataString = unEscapeSpecialChars(document[metadataKey] as string) + result.push([ + new Document({ + pageContent: document[contentKey] as string, + metadata: JSON.parse(metadataString) + }), + Number(document.vector_score) + ]) + } + } + } + } + return result + } if (output === 'retriever') { return vectorStore.asRetriever(k) diff --git a/packages/components/nodes/vectorstores/Redis/Redis_Existing.ts b/packages/components/nodes/vectorstores/Redis/Redis_Existing.ts index 88166659..754e46c8 100644 --- a/packages/components/nodes/vectorstores/Redis/Redis_Existing.ts +++ b/packages/components/nodes/vectorstores/Redis/Redis_Existing.ts @@ -13,9 +13,19 @@ class RedisExisting_VectorStores extends RedisSearchBase implements INode { this.name = 'RedisIndex' this.version = 1.0 this.description = 'Load existing index from Redis (i.e: Document has been upserted)' + + // Remove deleteIndex from inputs as it is not applicable while fetching data from Redis + let input = this.inputs.find((i) => i.name === 'deleteIndex') + if (input) this.inputs.splice(this.inputs.indexOf(input), 1) } - async constructVectorStore(embeddings: Embeddings, indexName: string, _: Document>[]): Promise { + async constructVectorStore( + embeddings: Embeddings, + indexName: string, + // eslint-disable-next-line unused-imports/no-unused-vars + deleteIndex: boolean, + _: Document>[] + ): Promise { const storeConfig: RedisVectorStoreConfig = { redisClient: this.redisClient, indexName: indexName diff --git a/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts b/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts index 2af445eb..6637e703 100644 --- a/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts +++ b/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts @@ -6,6 +6,7 @@ import { flatten } from 'lodash' import { RedisSearchBase } from './RedisSearchBase' import { VectorStore } from 'langchain/vectorstores/base' import { RedisVectorStore, RedisVectorStoreConfig } from 'langchain/vectorstores/redis' +import { escapeAllStrings } from './utils' class RedisUpsert_VectorStores extends RedisSearchBase implements INode { constructor() { @@ -22,11 +23,23 @@ class RedisUpsert_VectorStores extends RedisSearchBase implements INode { }) } - async constructVectorStore(embeddings: Embeddings, indexName: string, docs: Document>[]): Promise { + async constructVectorStore( + embeddings: Embeddings, + indexName: string, + deleteIndex: boolean, + docs: Document>[] + ): Promise { const storeConfig: RedisVectorStoreConfig = { redisClient: this.redisClient, indexName: indexName } + if (deleteIndex) { + let response = await this.redisClient.ft.dropIndex(indexName) + if (process.env.DEBUG === 'true') { + // eslint-disable-next-line no-console + console.log(`Redis Vector Store :: Dropping index [${indexName}], Received Response [${response}]`) + } + } return await RedisVectorStore.fromDocuments(docs, embeddings, storeConfig) } @@ -36,7 +49,9 @@ class RedisUpsert_VectorStores extends RedisSearchBase implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + const document = new Document(flattenDocs[i]) + escapeAllStrings(document.metadata) + finalDocs.push(document) } return super.init(nodeData, _, options, flattenDocs) diff --git a/packages/components/nodes/vectorstores/Redis/utils.ts b/packages/components/nodes/vectorstores/Redis/utils.ts new file mode 100644 index 00000000..acef03ef --- /dev/null +++ b/packages/components/nodes/vectorstores/Redis/utils.ts @@ -0,0 +1,25 @@ +/* + * Escapes all '-' characters. + * Redis Search considers '-' as a negative operator, hence we need + * to escape it + */ +export const escapeSpecialChars = (str: string) => { + return str.replaceAll('-', '\\-') +} + +export const escapeAllStrings = (obj: object) => { + Object.keys(obj).forEach((key: string) => { + // @ts-ignore + let item = obj[key] + if (typeof item === 'object') { + escapeAllStrings(item) + } else if (typeof item === 'string') { + // @ts-ignore + obj[key] = escapeSpecialChars(item) + } + }) +} + +export const unEscapeSpecialChars = (str: string) => { + return str.replaceAll('\\-', '-') +} From f3bd81839766ca49f46ae5bb84d684398afc76ed Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 23 Oct 2023 11:10:45 +0100 Subject: [PATCH 14/35] add additional config --- .../Qdrant_Existing/Qdrant_Existing.ts | 46 +++++++++++++++++-- .../Qdrant_Upsert/Qdrant_Upsert.ts | 42 ++++++++++++++++- 2 files changed, 83 insertions(+), 5 deletions(-) diff --git a/packages/components/nodes/vectorstores/Qdrant_Existing/Qdrant_Existing.ts b/packages/components/nodes/vectorstores/Qdrant_Existing/Qdrant_Existing.ts index 58ef6df5..c16e8f54 100644 --- a/packages/components/nodes/vectorstores/Qdrant_Existing/Qdrant_Existing.ts +++ b/packages/components/nodes/vectorstores/Qdrant_Existing/Qdrant_Existing.ts @@ -23,7 +23,7 @@ class Qdrant_Existing_VectorStores implements INode { constructor() { this.label = 'Qdrant Load Existing Index' this.name = 'qdrantExistingIndex' - this.version = 1.0 + this.version = 2.0 this.type = 'Qdrant' this.icon = 'qdrant.png' this.category = 'Vector Stores' @@ -55,8 +55,39 @@ class Qdrant_Existing_VectorStores implements INode { type: 'string' }, { - label: 'Qdrant Collection Cofiguration', + label: 'Vector Dimension', + name: 'qdrantVectorDimension', + type: 'number', + default: 1536, + additionalParams: true + }, + { + label: 'Similarity', + name: 'qdrantSimilarity', + description: 'Similarity measure used in Qdrant.', + type: 'options', + default: 'Cosine', + options: [ + { + label: 'Cosine', + name: 'Cosine' + }, + { + label: 'Euclid', + name: 'Euclid' + }, + { + label: 'Dot', + name: 'Dot' + } + ], + additionalParams: true + }, + { + label: 'Additional Collection Cofiguration', name: 'qdrantCollectionConfiguration', + description: + 'Refer to collection docs for more reference', type: 'json', optional: true, additionalParams: true @@ -98,6 +129,8 @@ class Qdrant_Existing_VectorStores implements INode { const collectionName = nodeData.inputs?.qdrantCollection as string let qdrantCollectionConfiguration = nodeData.inputs?.qdrantCollectionConfiguration const embeddings = nodeData.inputs?.embeddings as Embeddings + const qdrantSimilarity = nodeData.inputs?.qdrantSimilarity + const qdrantVectorDimension = nodeData.inputs?.qdrantVectorDimension const output = nodeData.outputs?.output as string const topK = nodeData.inputs?.topK as string let queryFilter = nodeData.inputs?.queryFilter @@ -126,7 +159,14 @@ class Qdrant_Existing_VectorStores implements INode { typeof qdrantCollectionConfiguration === 'object' ? qdrantCollectionConfiguration : JSON.parse(qdrantCollectionConfiguration) - dbConfig.collectionConfig = qdrantCollectionConfiguration + dbConfig.collectionConfig = { + ...qdrantCollectionConfiguration, + vectors: { + ...qdrantCollectionConfiguration.vectors, + size: qdrantVectorDimension ? parseInt(qdrantVectorDimension, 10) : 1536, + distance: qdrantSimilarity ?? 'Cosine' + } + } } if (queryFilter) { diff --git a/packages/components/nodes/vectorstores/Qdrant_Upsert/Qdrant_Upsert.ts b/packages/components/nodes/vectorstores/Qdrant_Upsert/Qdrant_Upsert.ts index 6f3773ff..407a8d22 100644 --- a/packages/components/nodes/vectorstores/Qdrant_Upsert/Qdrant_Upsert.ts +++ b/packages/components/nodes/vectorstores/Qdrant_Upsert/Qdrant_Upsert.ts @@ -25,7 +25,7 @@ class QdrantUpsert_VectorStores implements INode { constructor() { this.label = 'Qdrant Upsert Document' this.name = 'qdrantUpsert' - this.version = 1.0 + this.version = 2.0 this.type = 'Qdrant' this.icon = 'qdrant.png' this.category = 'Vector Stores' @@ -62,6 +62,35 @@ class QdrantUpsert_VectorStores implements INode { name: 'qdrantCollection', type: 'string' }, + { + label: 'Vector Dimension', + name: 'qdrantVectorDimension', + type: 'number', + default: 1536, + additionalParams: true + }, + { + label: 'Similarity', + name: 'qdrantSimilarity', + description: 'Similarity measure used in Qdrant.', + type: 'options', + default: 'Cosine', + options: [ + { + label: 'Cosine', + name: 'Cosine' + }, + { + label: 'Euclid', + name: 'Euclid' + }, + { + label: 'Dot', + name: 'Dot' + } + ], + additionalParams: true + }, { label: 'Top K', name: 'topK', @@ -99,6 +128,9 @@ class QdrantUpsert_VectorStores implements INode { const collectionName = nodeData.inputs?.qdrantCollection as string const docs = nodeData.inputs?.document as Document[] const embeddings = nodeData.inputs?.embeddings as Embeddings + const qdrantSimilarity = nodeData.inputs?.qdrantSimilarity + const qdrantVectorDimension = nodeData.inputs?.qdrantVectorDimension + const output = nodeData.outputs?.output as string const topK = nodeData.inputs?.topK as string const k = topK ? parseFloat(topK) : 4 @@ -121,7 +153,13 @@ class QdrantUpsert_VectorStores implements INode { const dbConfig: QdrantLibArgs = { client, url: qdrantServerUrl, - collectionName + collectionName, + collectionConfig: { + vectors: { + size: qdrantVectorDimension ? parseInt(qdrantVectorDimension, 10) : 1536, + distance: qdrantSimilarity ?? 'Cosine' + } + } } const retrieverConfig: RetrieverConfig = { From d9e6fcda56917cc869c12d49566d6bbcc7c70f67 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 23 Oct 2023 14:43:18 +0100 Subject: [PATCH 15/35] add redis backed chat message fix --- .../credentials/RedisApi.credential.ts | 43 +++++++++++++ .../RedisBackedChatMemory.ts | 63 ++++++++++++++----- 2 files changed, 90 insertions(+), 16 deletions(-) create mode 100644 packages/components/credentials/RedisApi.credential.ts diff --git a/packages/components/credentials/RedisApi.credential.ts b/packages/components/credentials/RedisApi.credential.ts new file mode 100644 index 00000000..f65f3f44 --- /dev/null +++ b/packages/components/credentials/RedisApi.credential.ts @@ -0,0 +1,43 @@ +import { INodeParams, INodeCredential } from '../src/Interface' + +class RedisApi implements INodeCredential { + label: string + name: string + version: number + description: string + inputs: INodeParams[] + + constructor() { + this.label = 'Redis API' + this.name = 'redisApi' + this.version = 1.0 + this.inputs = [ + { + label: 'Redis Host', + name: 'redisHost', + type: 'string', + default: '127.0.0.1' + }, + { + label: 'Port', + name: 'redisPort', + type: 'number', + default: '6789' + }, + { + label: 'User', + name: 'redisUser', + type: 'string', + placeholder: '' + }, + { + label: 'Password', + name: 'redisPwd', + type: 'password', + placeholder: '' + } + ] + } +} + +module.exports = { credClass: RedisApi } diff --git a/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts b/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts index f10f25ce..5d72336e 100644 --- a/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts +++ b/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts @@ -1,9 +1,9 @@ -import { INode, INodeData, INodeParams } from '../../../src/Interface' -import { getBaseClasses } from '../../../src/utils' -import { ICommonObject } from '../../../src' +import { INode, INodeData, INodeParams, ICommonObject } from '../../../src/Interface' +import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' import { BufferMemory, BufferMemoryInput } from 'langchain/memory' -import { RedisChatMessageHistory, RedisChatMessageHistoryInput } from 'langchain/stores/message/redis' -import { createClient } from 'redis' +import { RedisChatMessageHistory, RedisChatMessageHistoryInput } from 'langchain/stores/message/ioredis' +import { mapStoredMessageToChatMessage, BaseMessage } from 'langchain/schema' +import { Redis } from 'ioredis' class RedisBackedChatMemory_Memory implements INode { label: string @@ -15,6 +15,7 @@ class RedisBackedChatMemory_Memory implements INode { category: string baseClasses: string[] inputs: INodeParams[] + credential: INodeParams constructor() { this.label = 'Redis-Backed Chat Memory' @@ -25,13 +26,14 @@ class RedisBackedChatMemory_Memory implements INode { this.category = 'Memory' this.description = 'Summarizes the conversation and stores the memory in Redis server' this.baseClasses = [this.type, ...getBaseClasses(BufferMemory)] + this.credential = { + label: 'Connect Credential', + name: 'credential', + type: 'credential', + optional: true, + credentialNames: ['redisApi'] + } this.inputs = [ - { - label: 'Base URL', - name: 'baseURL', - type: 'string', - default: 'redis://localhost:6379' - }, { label: 'Session Id', name: 'sessionId', @@ -60,11 +62,11 @@ class RedisBackedChatMemory_Memory implements INode { } async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { - return initalizeRedis(nodeData, options) + return await initalizeRedis(nodeData, options) } async clearSessionMemory(nodeData: INodeData, options: ICommonObject): Promise { - const redis = initalizeRedis(nodeData, options) + const redis = await initalizeRedis(nodeData, options) const sessionId = nodeData.inputs?.sessionId as string const chatId = options?.chatId as string options.logger.info(`Clearing Redis memory session ${sessionId ? sessionId : chatId}`) @@ -73,17 +75,28 @@ class RedisBackedChatMemory_Memory implements INode { } } -const initalizeRedis = (nodeData: INodeData, options: ICommonObject): BufferMemory => { - const baseURL = nodeData.inputs?.baseURL as string +const initalizeRedis = async (nodeData: INodeData, options: ICommonObject): Promise => { const sessionId = nodeData.inputs?.sessionId as string const sessionTTL = nodeData.inputs?.sessionTTL as number const memoryKey = nodeData.inputs?.memoryKey as string const chatId = options?.chatId as string + const credentialData = await getCredentialData(nodeData.credential ?? '', options) + const username = getCredentialParam('redisUser', credentialData, nodeData) + const password = getCredentialParam('redisPwd', credentialData, nodeData) + const portStr = getCredentialParam('redisPort', credentialData, nodeData) + const host = getCredentialParam('redisHost', credentialData, nodeData) + let isSessionIdUsingChatMessageId = false if (!sessionId && chatId) isSessionIdUsingChatMessageId = true - const redisClient = createClient({ url: baseURL }) + const redisClient = new Redis({ + port: portStr ? parseInt(portStr) : 6379, + host, + username, + password + }) + let obj: RedisChatMessageHistoryInput = { sessionId: sessionId ? sessionId : chatId, client: redisClient @@ -98,6 +111,24 @@ const initalizeRedis = (nodeData: INodeData, options: ICommonObject): BufferMemo const redisChatMessageHistory = new RedisChatMessageHistory(obj) + redisChatMessageHistory.getMessages = async (): Promise => { + const rawStoredMessages = await redisClient.lrange(sessionId ? sessionId : chatId, 0, -1) + const orderedMessages = rawStoredMessages.reverse().map((message) => JSON.parse(message)) + return orderedMessages.map(mapStoredMessageToChatMessage) + } + + redisChatMessageHistory.addMessage = async (message: BaseMessage): Promise => { + const messageToAdd = [message].map((msg) => msg.toDict()) + await redisClient.lpush(sessionId ? sessionId : chatId, JSON.stringify(messageToAdd[0])) + if (sessionTTL) { + await redisClient.expire(sessionId ? sessionId : chatId, sessionTTL) + } + } + + redisChatMessageHistory.clear = async (): Promise => { + await redisClient.del(sessionId ? sessionId : chatId) + } + const memory = new BufferMemoryExtended({ memoryKey, chatHistory: redisChatMessageHistory, From eb02163e0e338081ffc613088d08e942fe3858c9 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 23 Oct 2023 14:45:05 +0100 Subject: [PATCH 16/35] update version --- .../nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts b/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts index 5d72336e..f192fd12 100644 --- a/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts +++ b/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts @@ -20,7 +20,7 @@ class RedisBackedChatMemory_Memory implements INode { constructor() { this.label = 'Redis-Backed Chat Memory' this.name = 'RedisBackedChatMemory' - this.version = 1.0 + this.version = 2.0 this.type = 'RedisBackedChatMemory' this.icon = 'redis.svg' this.category = 'Memory' From 9900228eeb7a5b59eb16525657537c39a554e929 Mon Sep 17 00:00:00 2001 From: Henry Heng Date: Mon, 23 Oct 2023 15:24:55 +0100 Subject: [PATCH 17/35] Update AWSBedrockEmbedding.ts --- .../embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts b/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts index f092cbec..ba2aa5e7 100644 --- a/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts +++ b/packages/components/nodes/embeddings/AWSBedrockEmbedding/AWSBedrockEmbedding.ts @@ -79,7 +79,10 @@ class AWSBedrockEmbedding_Embeddings implements INode { label: 'Model Name', name: 'model', type: 'options', - options: [{ label: 'amazon.titan-embed-text-v1', name: 'amazon.titan-embed-text-v1' }, { label: 'amazon.titan-embed-g1-text-02', name: 'amazon.titan-embed-g1-text-02' }], + options: [ + { label: 'amazon.titan-embed-text-v1', name: 'amazon.titan-embed-text-v1' }, + { label: 'amazon.titan-embed-g1-text-02', name: 'amazon.titan-embed-g1-text-02' } + ], default: 'amazon.titan-embed-text-v1' } ] From f8130fdff99cbf526b203c2dd2267e8f10fdaffc Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 23 Oct 2023 15:46:27 +0100 Subject: [PATCH 18/35] fix Chatflow API Authentication --- packages/server/src/index.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index 9d3f7052..8d4592b5 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -809,18 +809,18 @@ export class App { * @param {Response} res * @param {ChatFlow} chatflow */ - async validateKey(req: Request, res: Response, chatflow: ChatFlow) { + async validateKey(req: Request, chatflow: ChatFlow) { const chatFlowApiKeyId = chatflow.apikeyid const authorizationHeader = (req.headers['Authorization'] as string) ?? (req.headers['authorization'] as string) ?? '' - - if (chatFlowApiKeyId && !authorizationHeader) return res.status(401).send(`Unauthorized`) - + if (chatFlowApiKeyId && !authorizationHeader) return false const suppliedKey = authorizationHeader.split(`Bearer `).pop() if (chatFlowApiKeyId && suppliedKey) { const keys = await getAPIKeys() const apiSecret = keys.find((key) => key.id === chatFlowApiKeyId)?.apiSecret - if (!compareKeys(apiSecret, suppliedKey)) return res.status(401).send(`Unauthorized`) + if (!compareKeys(apiSecret, suppliedKey)) return false + return true } + return false } /** @@ -846,7 +846,8 @@ export class App { if (!chatId) chatId = chatflowid if (!isInternal) { - await this.validateKey(req, res, chatflow) + const isKeyValidated = await this.validateKey(req, chatflow) + if (!isKeyValidated) return res.status(401).send('Unauthorized') } let isStreamValid = false From 2f0b4e18f478d3c9c2d8019e199344290016658b Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 23 Oct 2023 15:52:28 +0100 Subject: [PATCH 19/35] update fix when no chatflow apikey is set --- packages/server/src/index.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index 8d4592b5..89b36ad1 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -811,10 +811,13 @@ export class App { */ async validateKey(req: Request, chatflow: ChatFlow) { const chatFlowApiKeyId = chatflow.apikeyid + if (!chatFlowApiKeyId) return true + const authorizationHeader = (req.headers['Authorization'] as string) ?? (req.headers['authorization'] as string) ?? '' if (chatFlowApiKeyId && !authorizationHeader) return false + const suppliedKey = authorizationHeader.split(`Bearer `).pop() - if (chatFlowApiKeyId && suppliedKey) { + if (suppliedKey) { const keys = await getAPIKeys() const apiSecret = keys.find((key) => key.id === chatFlowApiKeyId)?.apiSecret if (!compareKeys(apiSecret, suppliedKey)) return false From 23d39300cb9b2899572294abbb1c3a5c4010d26b Mon Sep 17 00:00:00 2001 From: Ziyi Chen Date: Tue, 24 Oct 2023 11:04:35 -0400 Subject: [PATCH 20/35] fix Cannot read properties of undefined (reading 'replace') --- .../nodes/vectorstores/InMemory/InMemoryVectorStore.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts b/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts index 55a01e2b..fd2246c9 100644 --- a/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts +++ b/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts @@ -71,7 +71,9 @@ class InMemoryVectorStore_VectorStores implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + if (flattenDocs[i] !== undefined) { + finalDocs.push(new Document(flattenDocs[i])) + } } const vectorStore = await MemoryVectorStore.fromDocuments(finalDocs, embeddings) From ac12aa641c8c0df945317b1a186f1e81bd7aba93 Mon Sep 17 00:00:00 2001 From: vinodkiran Date: Wed, 25 Oct 2023 10:35:50 +0530 Subject: [PATCH 21/35] Redis Vector Store - Minor Updates to Options to better reflect the intent. --- .../nodes/vectorstores/Redis/RedisSearchBase.ts | 12 ++++++------ .../nodes/vectorstores/Redis/Redis_Existing.ts | 2 +- .../nodes/vectorstores/Redis/Redis_Upsert.ts | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/components/nodes/vectorstores/Redis/RedisSearchBase.ts b/packages/components/nodes/vectorstores/Redis/RedisSearchBase.ts index e7fb5f11..9d1c2ea1 100644 --- a/packages/components/nodes/vectorstores/Redis/RedisSearchBase.ts +++ b/packages/components/nodes/vectorstores/Redis/RedisSearchBase.ts @@ -53,9 +53,9 @@ export abstract class RedisSearchBase { type: 'string' }, { - label: 'Delete and Recreate the Index (will remove all contents as well) ?', - name: 'deleteIndex', - description: 'Delete the index if it already exists', + label: 'Replace Index?', + name: 'replaceIndex', + description: 'Selecting this option will delete the existing index and recreate a new one', default: false, type: 'boolean' }, @@ -113,7 +113,7 @@ export abstract class RedisSearchBase { abstract constructVectorStore( embeddings: Embeddings, indexName: string, - deleteIndex: boolean, + replaceIndex: boolean, docs: Document>[] | undefined ): Promise @@ -125,7 +125,7 @@ export abstract class RedisSearchBase { let vectorKey = nodeData.inputs?.vectorKey as string const embeddings = nodeData.inputs?.embeddings as Embeddings const topK = nodeData.inputs?.topK as string - const deleteIndex = nodeData.inputs?.deleteIndex as boolean + const replaceIndex = nodeData.inputs?.replaceIndex as boolean const k = topK ? parseFloat(topK) : 4 const output = nodeData.outputs?.output as string @@ -142,7 +142,7 @@ export abstract class RedisSearchBase { this.redisClient = createClient({ url: redisUrl }) await this.redisClient.connect() - const vectorStore = await this.constructVectorStore(embeddings, indexName, deleteIndex, docs) + const vectorStore = await this.constructVectorStore(embeddings, indexName, replaceIndex, docs) if (!contentKey || contentKey === '') contentKey = 'content' if (!metadataKey || metadataKey === '') metadataKey = 'metadata' if (!vectorKey || vectorKey === '') vectorKey = 'content_vector' diff --git a/packages/components/nodes/vectorstores/Redis/Redis_Existing.ts b/packages/components/nodes/vectorstores/Redis/Redis_Existing.ts index 754e46c8..9ad472a8 100644 --- a/packages/components/nodes/vectorstores/Redis/Redis_Existing.ts +++ b/packages/components/nodes/vectorstores/Redis/Redis_Existing.ts @@ -23,7 +23,7 @@ class RedisExisting_VectorStores extends RedisSearchBase implements INode { embeddings: Embeddings, indexName: string, // eslint-disable-next-line unused-imports/no-unused-vars - deleteIndex: boolean, + replaceIndex: boolean, _: Document>[] ): Promise { const storeConfig: RedisVectorStoreConfig = { diff --git a/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts b/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts index 6637e703..0ed431fb 100644 --- a/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts +++ b/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts @@ -26,14 +26,14 @@ class RedisUpsert_VectorStores extends RedisSearchBase implements INode { async constructVectorStore( embeddings: Embeddings, indexName: string, - deleteIndex: boolean, + replaceIndex: boolean, docs: Document>[] ): Promise { const storeConfig: RedisVectorStoreConfig = { redisClient: this.redisClient, indexName: indexName } - if (deleteIndex) { + if (replaceIndex) { let response = await this.redisClient.ft.dropIndex(indexName) if (process.env.DEBUG === 'true') { // eslint-disable-next-line no-console From 2653cb62da9d51b877d63ed126d97f489f145d99 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 25 Oct 2023 12:39:35 +0100 Subject: [PATCH 22/35] update credentials --- .../credentials/RedisApi.credential.ts | 43 ------------------- .../RedisBackedChatMemory.ts | 43 +++++++++++-------- 2 files changed, 25 insertions(+), 61 deletions(-) delete mode 100644 packages/components/credentials/RedisApi.credential.ts diff --git a/packages/components/credentials/RedisApi.credential.ts b/packages/components/credentials/RedisApi.credential.ts deleted file mode 100644 index f65f3f44..00000000 --- a/packages/components/credentials/RedisApi.credential.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { INodeParams, INodeCredential } from '../src/Interface' - -class RedisApi implements INodeCredential { - label: string - name: string - version: number - description: string - inputs: INodeParams[] - - constructor() { - this.label = 'Redis API' - this.name = 'redisApi' - this.version = 1.0 - this.inputs = [ - { - label: 'Redis Host', - name: 'redisHost', - type: 'string', - default: '127.0.0.1' - }, - { - label: 'Port', - name: 'redisPort', - type: 'number', - default: '6789' - }, - { - label: 'User', - name: 'redisUser', - type: 'string', - placeholder: '' - }, - { - label: 'Password', - name: 'redisPwd', - type: 'password', - placeholder: '' - } - ] - } -} - -module.exports = { credClass: RedisApi } diff --git a/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts b/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts index f192fd12..3e3697d1 100644 --- a/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts +++ b/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts @@ -31,7 +31,7 @@ class RedisBackedChatMemory_Memory implements INode { name: 'credential', type: 'credential', optional: true, - credentialNames: ['redisApi'] + credentialNames: ['redisCacheApi', 'redisCacheUrlApi'] } this.inputs = [ { @@ -81,25 +81,32 @@ const initalizeRedis = async (nodeData: INodeData, options: ICommonObject): Prom const memoryKey = nodeData.inputs?.memoryKey as string const chatId = options?.chatId as string - const credentialData = await getCredentialData(nodeData.credential ?? '', options) - const username = getCredentialParam('redisUser', credentialData, nodeData) - const password = getCredentialParam('redisPwd', credentialData, nodeData) - const portStr = getCredentialParam('redisPort', credentialData, nodeData) - const host = getCredentialParam('redisHost', credentialData, nodeData) - let isSessionIdUsingChatMessageId = false if (!sessionId && chatId) isSessionIdUsingChatMessageId = true - const redisClient = new Redis({ - port: portStr ? parseInt(portStr) : 6379, - host, - username, - password - }) + const credentialData = await getCredentialData(nodeData.credential ?? '', options) + const redisUrl = getCredentialParam('redisUrl', credentialData, nodeData) + + let client: Redis + if (!redisUrl || redisUrl === '') { + const username = getCredentialParam('redisCacheUser', credentialData, nodeData) + const password = getCredentialParam('redisCachePwd', credentialData, nodeData) + const portStr = getCredentialParam('redisCachePort', credentialData, nodeData) + const host = getCredentialParam('redisCacheHost', credentialData, nodeData) + + client = new Redis({ + port: portStr ? parseInt(portStr) : 6379, + host, + username, + password + }) + } else { + client = new Redis(redisUrl) + } let obj: RedisChatMessageHistoryInput = { sessionId: sessionId ? sessionId : chatId, - client: redisClient + client } if (sessionTTL) { @@ -112,21 +119,21 @@ const initalizeRedis = async (nodeData: INodeData, options: ICommonObject): Prom const redisChatMessageHistory = new RedisChatMessageHistory(obj) redisChatMessageHistory.getMessages = async (): Promise => { - const rawStoredMessages = await redisClient.lrange(sessionId ? sessionId : chatId, 0, -1) + const rawStoredMessages = await client.lrange(sessionId ? sessionId : chatId, 0, -1) const orderedMessages = rawStoredMessages.reverse().map((message) => JSON.parse(message)) return orderedMessages.map(mapStoredMessageToChatMessage) } redisChatMessageHistory.addMessage = async (message: BaseMessage): Promise => { const messageToAdd = [message].map((msg) => msg.toDict()) - await redisClient.lpush(sessionId ? sessionId : chatId, JSON.stringify(messageToAdd[0])) + await client.lpush(sessionId ? sessionId : chatId, JSON.stringify(messageToAdd[0])) if (sessionTTL) { - await redisClient.expire(sessionId ? sessionId : chatId, sessionTTL) + await client.expire(sessionId ? sessionId : chatId, sessionTTL) } } redisChatMessageHistory.clear = async (): Promise => { - await redisClient.del(sessionId ? sessionId : chatId) + await client.del(sessionId ? sessionId : chatId) } const memory = new BufferMemoryExtended({ From 57bfd5f1b1d5e1cd41812012e9f1db02110eb0cd Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 25 Oct 2023 13:53:33 +0100 Subject: [PATCH 23/35] add json parse fix --- .../prompts/ChatPromptTemplate/ChatPromptTemplate.ts | 8 ++++++-- .../FewShotPromptTemplate/FewShotPromptTemplate.ts | 12 ++++++++++-- .../nodes/prompts/PromptTemplate/PromptTemplate.ts | 8 ++++++-- .../RecursiveCharacterTextSplitter.ts | 4 ++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/packages/components/nodes/prompts/ChatPromptTemplate/ChatPromptTemplate.ts b/packages/components/nodes/prompts/ChatPromptTemplate/ChatPromptTemplate.ts index 83e1a857..de86413c 100644 --- a/packages/components/nodes/prompts/ChatPromptTemplate/ChatPromptTemplate.ts +++ b/packages/components/nodes/prompts/ChatPromptTemplate/ChatPromptTemplate.ts @@ -51,7 +51,7 @@ class ChatPromptTemplate_Prompts implements INode { async init(nodeData: INodeData): Promise { const systemMessagePrompt = nodeData.inputs?.systemMessagePrompt as string const humanMessagePrompt = nodeData.inputs?.humanMessagePrompt as string - const promptValuesStr = nodeData.inputs?.promptValues as string + const promptValuesStr = nodeData.inputs?.promptValues const prompt = ChatPromptTemplate.fromMessages([ SystemMessagePromptTemplate.fromTemplate(systemMessagePrompt), @@ -60,7 +60,11 @@ class ChatPromptTemplate_Prompts implements INode { let promptValues: ICommonObject = {} if (promptValuesStr) { - promptValues = JSON.parse(promptValuesStr) + try { + promptValues = typeof promptValuesStr === 'object' ? promptValuesStr : JSON.parse(promptValuesStr) + } catch (exception) { + throw new Error("Invalid JSON in the ChatPromptTemplate's promptValues: " + exception) + } } // @ts-ignore prompt.promptValues = promptValues diff --git a/packages/components/nodes/prompts/FewShotPromptTemplate/FewShotPromptTemplate.ts b/packages/components/nodes/prompts/FewShotPromptTemplate/FewShotPromptTemplate.ts index ed1d3cb2..482d8745 100644 --- a/packages/components/nodes/prompts/FewShotPromptTemplate/FewShotPromptTemplate.ts +++ b/packages/components/nodes/prompts/FewShotPromptTemplate/FewShotPromptTemplate.ts @@ -80,7 +80,7 @@ class FewShotPromptTemplate_Prompts implements INode { } async init(nodeData: INodeData): Promise { - const examplesStr = nodeData.inputs?.examples as string + const examplesStr = nodeData.inputs?.examples const prefix = nodeData.inputs?.prefix as string const suffix = nodeData.inputs?.suffix as string const exampleSeparator = nodeData.inputs?.exampleSeparator as string @@ -88,7 +88,15 @@ class FewShotPromptTemplate_Prompts implements INode { const examplePrompt = nodeData.inputs?.examplePrompt as PromptTemplate const inputVariables = getInputVariables(suffix) - const examples: Example[] = JSON.parse(examplesStr) + + let examples: Example[] = [] + if (examplesStr) { + try { + examples = typeof examplesStr === 'object' ? examplesStr : JSON.parse(examplesStr) + } catch (exception) { + throw new Error("Invalid JSON in the FewShotPromptTemplate's examples: " + exception) + } + } try { const obj: FewShotPromptTemplateInput = { diff --git a/packages/components/nodes/prompts/PromptTemplate/PromptTemplate.ts b/packages/components/nodes/prompts/PromptTemplate/PromptTemplate.ts index a401e282..f28d6976 100644 --- a/packages/components/nodes/prompts/PromptTemplate/PromptTemplate.ts +++ b/packages/components/nodes/prompts/PromptTemplate/PromptTemplate.ts @@ -43,11 +43,15 @@ class PromptTemplate_Prompts implements INode { async init(nodeData: INodeData): Promise { const template = nodeData.inputs?.template as string - const promptValuesStr = nodeData.inputs?.promptValues as string + const promptValuesStr = nodeData.inputs?.promptValues let promptValues: ICommonObject = {} if (promptValuesStr) { - promptValues = JSON.parse(promptValuesStr) + try { + promptValues = typeof promptValuesStr === 'object' ? promptValuesStr : JSON.parse(promptValuesStr) + } catch (exception) { + throw new Error("Invalid JSON in the PromptTemplate's promptValues: " + exception) + } } const inputVariables = getInputVariables(template) diff --git a/packages/components/nodes/textsplitters/RecursiveCharacterTextSplitter/RecursiveCharacterTextSplitter.ts b/packages/components/nodes/textsplitters/RecursiveCharacterTextSplitter/RecursiveCharacterTextSplitter.ts index ec9095b6..63f71267 100644 --- a/packages/components/nodes/textsplitters/RecursiveCharacterTextSplitter/RecursiveCharacterTextSplitter.ts +++ b/packages/components/nodes/textsplitters/RecursiveCharacterTextSplitter/RecursiveCharacterTextSplitter.ts @@ -51,7 +51,7 @@ class RecursiveCharacterTextSplitter_TextSplitters implements INode { async init(nodeData: INodeData): Promise { const chunkSize = nodeData.inputs?.chunkSize as string const chunkOverlap = nodeData.inputs?.chunkOverlap as string - const separators = nodeData.inputs?.separators as string + const separators = nodeData.inputs?.separators const obj = {} as RecursiveCharacterTextSplitterParams @@ -59,7 +59,7 @@ class RecursiveCharacterTextSplitter_TextSplitters implements INode { if (chunkOverlap) obj.chunkOverlap = parseInt(chunkOverlap, 10) if (separators) { try { - obj.separators = JSON.parse(separators) + obj.separators = typeof separators === 'object' ? separators : JSON.parse(separators) } catch (e) { throw new Error(e) } From 6c7734302d2d6257f133e9535b025a7aab7339d0 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 25 Oct 2023 17:34:24 +0100 Subject: [PATCH 24/35] fix redis chat sessionId --- .../RedisBackedChatMemory/RedisBackedChatMemory.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts b/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts index 3e3697d1..c65d729b 100644 --- a/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts +++ b/packages/components/nodes/memory/RedisBackedChatMemory/RedisBackedChatMemory.ts @@ -119,27 +119,26 @@ const initalizeRedis = async (nodeData: INodeData, options: ICommonObject): Prom const redisChatMessageHistory = new RedisChatMessageHistory(obj) redisChatMessageHistory.getMessages = async (): Promise => { - const rawStoredMessages = await client.lrange(sessionId ? sessionId : chatId, 0, -1) + const rawStoredMessages = await client.lrange((redisChatMessageHistory as any).sessionId, 0, -1) const orderedMessages = rawStoredMessages.reverse().map((message) => JSON.parse(message)) return orderedMessages.map(mapStoredMessageToChatMessage) } redisChatMessageHistory.addMessage = async (message: BaseMessage): Promise => { const messageToAdd = [message].map((msg) => msg.toDict()) - await client.lpush(sessionId ? sessionId : chatId, JSON.stringify(messageToAdd[0])) + await client.lpush((redisChatMessageHistory as any).sessionId, JSON.stringify(messageToAdd[0])) if (sessionTTL) { - await client.expire(sessionId ? sessionId : chatId, sessionTTL) + await client.expire((redisChatMessageHistory as any).sessionId, sessionTTL) } } redisChatMessageHistory.clear = async (): Promise => { - await client.del(sessionId ? sessionId : chatId) + await client.del((redisChatMessageHistory as any).sessionId) } const memory = new BufferMemoryExtended({ memoryKey, chatHistory: redisChatMessageHistory, - returnMessages: true, isSessionIdUsingChatMessageId }) return memory From cd6538c5f2acffb5f018523eec11802389be96cd Mon Sep 17 00:00:00 2001 From: vinodkiran Date: Thu, 26 Oct 2023 11:11:10 +0530 Subject: [PATCH 25/35] Spelling Corrections. --- packages/components/nodes/agents/CSVAgent/CSVAgent.ts | 2 +- .../nodes/memory/BufferWindowMemory/BufferWindowMemory.ts | 4 ++-- packages/components/nodes/memory/ZepMemory/ZepMemory.ts | 2 +- .../prompts/FewShotPromptTemplate/FewShotPromptTemplate.ts | 2 +- .../CharacterTextSplitter/CharacterTextSplitter.ts | 2 +- .../RecursiveCharacterTextSplitter.ts | 2 +- packages/components/src/utils.ts | 4 ++-- packages/server/marketplaces/chatflows/Antonym.json | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/components/nodes/agents/CSVAgent/CSVAgent.ts b/packages/components/nodes/agents/CSVAgent/CSVAgent.ts index 905bef02..5baad2ec 100644 --- a/packages/components/nodes/agents/CSVAgent/CSVAgent.ts +++ b/packages/components/nodes/agents/CSVAgent/CSVAgent.ts @@ -131,7 +131,7 @@ json.dumps(my_dict)` const code = `import pandas as pd\n${pythonCode}` finalResult = await pyodide.runPythonAsync(code) } catch (error) { - throw new Error(`Sorry, I'm unable to find answer for question: "${input}" using follwoing code: "${pythonCode}"`) + throw new Error(`Sorry, I'm unable to find answer for question: "${input}" using following code: "${pythonCode}"`) } } diff --git a/packages/components/nodes/memory/BufferWindowMemory/BufferWindowMemory.ts b/packages/components/nodes/memory/BufferWindowMemory/BufferWindowMemory.ts index cf8e7f1d..84e607e5 100644 --- a/packages/components/nodes/memory/BufferWindowMemory/BufferWindowMemory.ts +++ b/packages/components/nodes/memory/BufferWindowMemory/BufferWindowMemory.ts @@ -20,7 +20,7 @@ class BufferWindowMemory_Memory implements INode { this.type = 'BufferWindowMemory' this.icon = 'memory.svg' this.category = 'Memory' - this.description = 'Uses a window of size k to surface the last k back-and-forths to use as memory' + this.description = 'Uses a window of size k to surface the last k back-and-forth to use as memory' this.baseClasses = [this.type, ...getBaseClasses(BufferWindowMemory)] this.inputs = [ { @@ -40,7 +40,7 @@ class BufferWindowMemory_Memory implements INode { name: 'k', type: 'number', default: '4', - description: 'Window of size k to surface the last k back-and-forths to use as memory.' + description: 'Window of size k to surface the last k back-and-forth to use as memory.' } ] } diff --git a/packages/components/nodes/memory/ZepMemory/ZepMemory.ts b/packages/components/nodes/memory/ZepMemory/ZepMemory.ts index 0c05563a..c4498644 100644 --- a/packages/components/nodes/memory/ZepMemory/ZepMemory.ts +++ b/packages/components/nodes/memory/ZepMemory/ZepMemory.ts @@ -60,7 +60,7 @@ class ZepMemory_Memory implements INode { name: 'k', type: 'number', default: '10', - description: 'Window of size k to surface the last k back-and-forths to use as memory.' + description: 'Window of size k to surface the last k back-and-forth to use as memory.' }, { label: 'Auto Summary Template', diff --git a/packages/components/nodes/prompts/FewShotPromptTemplate/FewShotPromptTemplate.ts b/packages/components/nodes/prompts/FewShotPromptTemplate/FewShotPromptTemplate.ts index 482d8745..a1a2afc2 100644 --- a/packages/components/nodes/prompts/FewShotPromptTemplate/FewShotPromptTemplate.ts +++ b/packages/components/nodes/prompts/FewShotPromptTemplate/FewShotPromptTemplate.ts @@ -55,7 +55,7 @@ class FewShotPromptTemplate_Prompts implements INode { placeholder: `Word: {input}\nAntonym:` }, { - label: 'Example Seperator', + label: 'Example Separator', name: 'exampleSeparator', type: 'string', placeholder: `\n\n` diff --git a/packages/components/nodes/textsplitters/CharacterTextSplitter/CharacterTextSplitter.ts b/packages/components/nodes/textsplitters/CharacterTextSplitter/CharacterTextSplitter.ts index ed972ad6..76c5cfb2 100644 --- a/packages/components/nodes/textsplitters/CharacterTextSplitter/CharacterTextSplitter.ts +++ b/packages/components/nodes/textsplitters/CharacterTextSplitter/CharacterTextSplitter.ts @@ -41,7 +41,7 @@ class CharacterTextSplitter_TextSplitters implements INode { name: 'separator', type: 'string', placeholder: `" "`, - description: 'Seperator to determine when to split the text, will override the default separator', + description: 'Separator to determine when to split the text, will override the default separator', optional: true } ] diff --git a/packages/components/nodes/textsplitters/RecursiveCharacterTextSplitter/RecursiveCharacterTextSplitter.ts b/packages/components/nodes/textsplitters/RecursiveCharacterTextSplitter/RecursiveCharacterTextSplitter.ts index 63f71267..d7dbc1c3 100644 --- a/packages/components/nodes/textsplitters/RecursiveCharacterTextSplitter/RecursiveCharacterTextSplitter.ts +++ b/packages/components/nodes/textsplitters/RecursiveCharacterTextSplitter/RecursiveCharacterTextSplitter.ts @@ -41,7 +41,7 @@ class RecursiveCharacterTextSplitter_TextSplitters implements INode { name: 'separators', type: 'string', rows: 4, - description: 'Array of custom seperators to determine when to split the text, will override the default separators', + description: 'Array of custom separators to determine when to split the text, will override the default separators', placeholder: `["|", "##", ">", "-"]`, optional: true } diff --git a/packages/components/src/utils.ts b/packages/components/src/utils.ts index 8f33683c..3c3c6ee2 100644 --- a/packages/components/src/utils.ts +++ b/packages/components/src/utils.ts @@ -301,7 +301,7 @@ async function crawl(baseURL: string, currentURL: string, pages: string[], limit } /** - * Prep URL before passing into recursive carwl function + * Prep URL before passing into recursive crawl function * @param {string} stringURL * @param {number} limit * @returns {Promise} @@ -445,7 +445,7 @@ export const getCredentialData = async (selectedCredentialId: string, options: I if (!credential) return {} - // Decrpyt credentialData + // Decrypt credentialData const decryptedCredentialData = await decryptCredentialData(credential.encryptedData) return decryptedCredentialData diff --git a/packages/server/marketplaces/chatflows/Antonym.json b/packages/server/marketplaces/chatflows/Antonym.json index 5f8ff7a8..54342d8f 100644 --- a/packages/server/marketplaces/chatflows/Antonym.json +++ b/packages/server/marketplaces/chatflows/Antonym.json @@ -45,7 +45,7 @@ "id": "fewShotPromptTemplate_1-input-suffix-string" }, { - "label": "Example Seperator", + "label": "Example Separator", "name": "exampleSeparator", "type": "string", "placeholder": "\n\n", From 60ac08413a79636091972aecf286edab34e4a509 Mon Sep 17 00:00:00 2001 From: talha Date: Thu, 26 Oct 2023 20:44:35 +0500 Subject: [PATCH 26/35] Replaced INDEX_NOT_EXIST with IndexNotExist --- packages/components/nodes/vectorstores/Milvus/Milvus_Upsert.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/nodes/vectorstores/Milvus/Milvus_Upsert.ts b/packages/components/nodes/vectorstores/Milvus/Milvus_Upsert.ts index ca69cb39..40afe9a4 100644 --- a/packages/components/nodes/vectorstores/Milvus/Milvus_Upsert.ts +++ b/packages/components/nodes/vectorstores/Milvus/Milvus_Upsert.ts @@ -252,7 +252,7 @@ class MilvusUpsert extends Milvus { collection_name: this.collectionName }) - if (descIndexResp.status.error_code === ErrorCode.INDEX_NOT_EXIST) { + if (descIndexResp.status.error_code === ErrorCode.IndexNotExist) { const resp = await this.client.createIndex({ collection_name: this.collectionName, field_name: this.vectorField, From 7aa2e1516e5729cd1dd8ebbc1745198df5671203 Mon Sep 17 00:00:00 2001 From: Ziyi Chen Date: Fri, 27 Oct 2023 19:57:01 -0400 Subject: [PATCH 27/35] should validate .pageContent --- .../nodes/vectorstores/InMemory/InMemoryVectorStore.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts b/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts index fd2246c9..a480ace0 100644 --- a/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts +++ b/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts @@ -71,7 +71,7 @@ class InMemoryVectorStore_VectorStores implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - if (flattenDocs[i] !== undefined) { + if (flattenDocs[i] !== undefined && flattenDocs[i].pageContent !== undefined) { finalDocs.push(new Document(flattenDocs[i])) } } From 206394bd80ed1ae4ce6ccd50b6022915f2d96e39 Mon Sep 17 00:00:00 2001 From: tirongi Date: Mon, 30 Oct 2023 17:33:27 +0100 Subject: [PATCH 28/35] Add OpenAIEmbeddingCustom This feature allow to select a customised modelName or the default one. --- .../OpenAIEmbeddingCustom.ts | 94 ++++++++++++++++++ .../OpenAIEmbeddingCustom/openai.png | Bin 0 -> 3991 bytes 2 files changed, 94 insertions(+) create mode 100644 packages/components/nodes/embeddings/OpenAIEmbeddingCustom/OpenAIEmbeddingCustom.ts create mode 100644 packages/components/nodes/embeddings/OpenAIEmbeddingCustom/openai.png diff --git a/packages/components/nodes/embeddings/OpenAIEmbeddingCustom/OpenAIEmbeddingCustom.ts b/packages/components/nodes/embeddings/OpenAIEmbeddingCustom/OpenAIEmbeddingCustom.ts new file mode 100644 index 00000000..185236b1 --- /dev/null +++ b/packages/components/nodes/embeddings/OpenAIEmbeddingCustom/OpenAIEmbeddingCustom.ts @@ -0,0 +1,94 @@ +import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { OpenAIEmbeddings, OpenAIEmbeddingsParams } from 'langchain/embeddings/openai' + +class OpenAIEmbeddingCustom_Embeddings implements INode { + label: string + name: string + version: number + type: string + icon: string + category: string + description: string + baseClasses: string[] + credential: INodeParams + inputs: INodeParams[] + + constructor() { + this.label = 'OpenAI Embeddings Custom' + this.name = 'openAIEmbeddingsCustom' + this.version = 1.0 + this.type = 'OpenAIEmbeddingsCustom' + this.icon = 'openai.png' + this.category = 'Embeddings' + this.description = 'OpenAI API to generate embeddings for a given text' + this.baseClasses = [this.type, ...getBaseClasses(OpenAIEmbeddings)] + this.credential = { + label: 'Connect Credential', + name: 'credential', + type: 'credential', + credentialNames: ['openAIApi'] + } + this.inputs = [ + { + label: 'Strip New Lines', + name: 'stripNewLines', + type: 'boolean', + optional: true, + additionalParams: true + }, + { + label: 'Batch Size', + name: 'batchSize', + type: 'number', + optional: true, + additionalParams: true + }, + { + label: 'Timeout', + name: 'timeout', + type: 'number', + optional: true, + additionalParams: true + }, + { + label: 'BasePath', + name: 'basepath', + type: 'string', + optional: true, + additionalParams: true + }, + { + label: 'Model Name', + name: 'modelName', + type: 'string', + optional: true + } + ] + } + + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { + const stripNewLines = nodeData.inputs?.stripNewLines as boolean + const batchSize = nodeData.inputs?.batchSize as string + const timeout = nodeData.inputs?.timeout as string + const basePath = nodeData.inputs?.basepath as string + const modelName = nodeData.inputs?.modelName as string + + const credentialData = await getCredentialData(nodeData.credential ?? '', options) + const openAIApiKey = getCredentialParam('openAIApiKey', credentialData, nodeData) + + const obj: Partial & { openAIApiKey?: string } = { + openAIApiKey + } + + if (stripNewLines) obj.stripNewLines = stripNewLines + if (batchSize) obj.batchSize = parseInt(batchSize, 10) + if (timeout) obj.timeout = parseInt(timeout, 10) + if (modelName) obj.modelName = modelName + + const model = new OpenAIEmbeddings(obj, { basePath }) + return model + } +} + +module.exports = { nodeClass: OpenAIEmbeddingCustom_Embeddings } diff --git a/packages/components/nodes/embeddings/OpenAIEmbeddingCustom/openai.png b/packages/components/nodes/embeddings/OpenAIEmbeddingCustom/openai.png new file mode 100644 index 0000000000000000000000000000000000000000..de08a05b28979826c4cc669c4899789763a938a1 GIT binary patch literal 3991 zcmV;I4`}d-P)gjhf~eq#s7M4i1UD8XqJW~vA_xftNZ1L8K*&N!(&?H%y1G)Gbam|=aK3jA=g{eX z@7=H7a^Jo8-Gcvf2q9|6MLi;kA{=m2P6cQ2)V1)TAs~(pT*(!*p&9W+1Lr8@H};dw zHug~X$0Z<~j`Sm$E?i7hfWKF8n(eG&Ik{BUEe-a=MOQM|iyKj+xXEW0-3hDfF58I& z#*>GLh)0tE?>F`_krs8`ZF?Zli!3TN1+P64R?{bBi?U;gWH|YTh4+>Hq!L-zB3MBb zV>qpA;HyoBGo%q+*J7AOBx5KtExwO}V$uTc8RtC&hEr%s{OVDVdLga_y~wvLzK??a z^sQ@gj3R+7Tg3NKu$q>k>9{@Whl|Gh`>Pxu-Wg^SlVy}NwlLW4Twghj6#mHhirCmm~&>D3b&!V;S94?d=RK$ zm*UB~=s*f7bfqyD1^9jm$Joe9zT=R}sBsiYlGd-CA*uv8` zKMGwKhufy*PekMhFLJ3|cWa(uw}INL_=N{(5K8gm_}Vt%i};Y<^0aKgz5Hn6RB@I? zbPgQ>S5aV#@Rh7(5HV7%5!}cUN=(wUoD6&QPY6>=!9usII*OSN;4%;Yvb;%^wNdhi0 zr39VgO}gQd>S)X({7RL@S+7<~8R;YeZP;h9LuD+dzpT*K<95F0oFmWPS2oesE^#A? zCxJw|a3xI*65v6kimg0EL#Z|wSMxTf9Ti?g#7&yINO})Ljp#&oy3m&9G$4{NGMHkB zJb^m0!|Z!DK@i3u7IE0@&m-x^1lDq*hLgi9zTOc~NG8|Iib*^p*`&j1 zVploKP_x`!!)y)&T%0EBCZL>e_$&3LI-|ISFDMO}@ZR#C8C!Ep(m9}7r9J{Y#1yf(U)Cd3yJ5ZTF_yw7nmxtCOht;i^v5v`AaL5#Oie195@ zL7;#|%wrb-N14WQ9^!AZwa^&i1CO7YA700^G_+BC^ETRIRx+FQQtXI;h{z7c@EM~? zHZh)}1Di+u324j&5^*AM##oJRe&RKjQw%@^y-8*nKT<^nS#0D^9yJ_OqN4`_PZ%(7 z>DvbLxCDR~b=T`}9)nI~P=LrGCeuOwv<(vto z1WXJ1tvx&=eGlMLUgU^I>-jvZI7)Y55(k5Rzm&U!i(j9`hQ!xPz#dHke&=<%$g{o) zkFi~sdCbj5Mi4LkE{q<$#~Iac@28X20=Q43K_>_(<#TS4BZBI4Cs~HfW2JmfisJVJ zSgo>;Es>AoD!AM53Ec<*0@DLL!A*>mpI{U{SU{n{K8T2%U^Z9CBd8hwBDGL=bYeygf8|aRgNq-z z@iu~PyunFR;){q>@;&#+9)Jk?vY2A&ZyqLT9j4=05h4Q0Si!9UqdXv*ek{|us|PB@ zd`w>=q}pN`!Vgp;lFQ{<6QH392bVqqauozr@r%MJuGW(W`Ne{h?bXV6Z z{&r{`XvjK;2-syh;ITdf_|}4}+}{(S3h(OZ=8Va1I)_r0Fqo& zy~6A2VG=$CA%_x22(SZ{tY$c)*kCd$xE@1UpcXaeBOsdslikxAoYuxb6bT4G5t$4k zoqUt^bZ0Ju11*U@0*>;tsfw#8cTjw|m{)mR+SLy-nSspXw268|+K|DZV2^7kXH9H_ z5!}VvAkmyT7B9mkkV7R|+#wsnjhMk|DoH`3##$LvhGxjWY(W~ijuEg!+STWCjh`88 zn_-1HVANRktSBO$8x6Q1TM$V;B|tIj`4$iD0_a{RSYT;+jb#{3fM~jsLOcg31j^V% z7H4UvW$E>U03;B{sz5F>fOc#)#HN3AZxqRVR?DoCO@amSm0@@uMBHpv7*WFL$s)rF zb1A9n&7~T)3l;G`H^}~_ct+F+eX);#Y5|mHuxjJE{>iXeJu)el_Y5yCB8Qo(u(-4( zU2#6JN0LVL7MI||o5g<~@ItEG>ph<@M8Z>H5;2sK0QBc#` z*M!GeOmm9_1ov0wO3!k#!JcLYbCiW~kD)o`U-FnJ2SE!YSiA?UMZkWkEu#eF(k@uD z0?7up#M+CDG7R1tT51rm&m;jw+~#c{u;L@Kiu+l}SyP=3<67o0U*YLJ{}AJ|6sv1~ z*^J^bw&KCek)}R(vWRJ1ZaLb-nM*GMiQdN(O!Y11Z3Z%#gC;xCl*jmlCoC?5PNA81 z8PwAK^GIh9nI>(90+%s`4;Uyb%;yiJs4?xsPZb*&#c;k+J3?q6g1)@P8wSndJ?MuE z5FESr744NhH~|-vhzls?Q-&~(Y|L3`8!&_qd0r9Z6b$W2XEC>!XvYY2MUADA!!ruC zu_G^W)YR7KyD##vZr4}_0?WBm#oRmzyVGg?7}~Bv~CU<`e#`@VgFXorz1$zH*YebeC)Mwbq?C{es?{ zCg5Ey9W}9r4t9*0ia47VJgG4_gG~mJb$<7|+cL3M`X#3cn5Z=YM)~>Wynfdl#jY;U znOFJE1O*|#*1Q4c9YH(zhwl4B(;OvWvDK(CB0O^{~(@5xY5g*h@jj>*H7jcq+Y%QmGGz)Z9q$hN_ zf;9@`d8F>t7%w?SfQRR_qsCV1t}a;UvWK0Fm92sTNxaN)o%MPN(7K&&hJc+~3m`P& zM?*s@aOmCZBf=`GoXjf-)XBYs3!7yk^;GpBY2>%at5u-8(9;q>MP)7PEdY~(e* z0I(?myTE>)W1+sQvtDFVV$qOkR{XuZ!vZb&D!V6f?^G5?ug(>yjyw|PvxWLQkFqzl%f#=ONpHAVts zCG(iIQtoWFNaZLow*`7JpLxvr%hcIh#i>4)=Ng|Qv#1oA` zIYpcxpKP{sKuUt;!&NNd66{UTmd{;mwXr^vh@t_FXi8HW6R&DN2xFp!kea|#?BAi# z0PI6cR@*lJJ&0tT7rq8V=xdWo?Lj1uUUe;waR{W^^eV2?48IUx#RXA}qu3G!9z=>5 za~_A`Yap6&7Dj>h>5sWE-$my`BqI$c?W!($47+fjz7GO@SZ!ictR#zG7v|irjTTIh z{Qi1h%9_Xc3vc5K1{d9!NuI9P^5&62SEtmTx*SsBbfiDYT%r16=2L9vYgUkp+o?{} z{hX@#YHpEo3i*wF>|h&volfvm_XK!x-oBju50C!=Nj{KH?md;N0000bbVXQnWMOn= zI%9HWVRU5xGB7eSEigGPF*Z~%IXW;nIx#mZFfckWFtzvO1ONa4C3HntbYx+4Wjbwd xWNBu305UK#GA%GUEipD!FgZFfI65&mD=;uRFfhcbT(|%L002ovPDHLkV1j%(J<0$8 literal 0 HcmV?d00001 From 7bc41939e4ad99c6f1daef02755df9a6a3b12bf2 Mon Sep 17 00:00:00 2001 From: SebastjanPrachovskij Date: Tue, 31 Oct 2023 16:27:37 +0200 Subject: [PATCH 29/35] Add SearchApi documentloader, tool & podcast QA example --- .../credentials/SearchApi.credential.ts | 24 + .../documentloaders/SearchApi/SearchAPI.ts | 109 +++ .../documentloaders/SearchApi/searchapi.svg | 1 + .../nodes/tools/SearchApi/SearchAPI.ts | 42 ++ .../nodes/tools/SearchApi/searchapi.svg | 1 + .../chatflows/Chat with a Podcast.json | 702 ++++++++++++++++++ 6 files changed, 879 insertions(+) create mode 100644 packages/components/credentials/SearchApi.credential.ts create mode 100644 packages/components/nodes/documentloaders/SearchApi/SearchAPI.ts create mode 100644 packages/components/nodes/documentloaders/SearchApi/searchapi.svg create mode 100644 packages/components/nodes/tools/SearchApi/SearchAPI.ts create mode 100644 packages/components/nodes/tools/SearchApi/searchapi.svg create mode 100644 packages/server/marketplaces/chatflows/Chat with a Podcast.json diff --git a/packages/components/credentials/SearchApi.credential.ts b/packages/components/credentials/SearchApi.credential.ts new file mode 100644 index 00000000..ccc65a6c --- /dev/null +++ b/packages/components/credentials/SearchApi.credential.ts @@ -0,0 +1,24 @@ +import { INodeParams, INodeCredential } from '../src/Interface' + +class SearchApi implements INodeCredential { + label: string + name: string + version: number + description: string + inputs: INodeParams[] + + constructor() { + this.label = 'Search API' + this.name = 'searchApi' + this.version = 1.0 + this.inputs = [ + { + label: 'SearchApi API Key', + name: 'searchApiKey', + type: 'password' + } + ] + } +} + +module.exports = { credClass: SearchApi } diff --git a/packages/components/nodes/documentloaders/SearchApi/SearchAPI.ts b/packages/components/nodes/documentloaders/SearchApi/SearchAPI.ts new file mode 100644 index 00000000..9d14dc5a --- /dev/null +++ b/packages/components/nodes/documentloaders/SearchApi/SearchAPI.ts @@ -0,0 +1,109 @@ +import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { TextSplitter } from 'langchain/text_splitter' +import { SearchApiLoader } from 'langchain/document_loaders/web/searchapi' +import { getCredentialData, getCredentialParam } from '../../../src' + +// Provides access to multiple search engines using the SearchApi. +// For available parameters & engines, refer to: https://www.searchapi.io/docs/google +class SearchAPI_DocumentLoaders implements INode { + label: string + name: string + version: number + description: string + type: string + icon: string + category: string + baseClasses: string[] + credential: INodeParams + inputs: INodeParams[] + + constructor() { + this.label = 'SearchApi For Web Search' + this.name = 'searchApi' + this.version = 1.0 + this.type = 'Document' + this.icon = 'searchapi.svg' + this.category = 'Document Loaders' + this.description = 'Load data from real-time search results' + this.baseClasses = [this.type] + this.credential = { + label: 'Connect Credential', + name: 'credential', + type: 'credential', + optional: false, + credentialNames: ['searchApi'] + } + this.inputs = [ + { + label: 'Query', + name: 'query', + type: 'string', + optional: true + }, + { + label: 'Custom Parameters', + name: 'customParameters', + type: 'json', + optional: true, + additionalParams: true + }, + { + label: 'Text Splitter', + name: 'textSplitter', + type: 'TextSplitter', + optional: true + }, + { + label: 'Metadata', + name: 'metadata', + type: 'json', + optional: true, + additionalParams: true + } + ] + } + + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { + const textSplitter = nodeData.inputs?.textSplitter as TextSplitter + const query = nodeData.inputs?.query as string + const customParameters = nodeData.inputs?.customParameters + const metadata = nodeData.inputs?.metadata + + // Fetch the API credentials for this node + const credentialData = await getCredentialData(nodeData.credential ?? '', options) + const searchApiKey = getCredentialParam('searchApiKey', credentialData, nodeData) + + // Check and parse custom parameters (should be JSON or object) + const parsedParameters = typeof customParameters === 'object' ? customParameters : JSON.parse(customParameters || '{}'); + + // Prepare the configuration for the SearchApiLoader + const loaderConfig = { + q: query, + apiKey: searchApiKey, + ...parsedParameters + }; + + // Initialize the loader with the given configuration + const loader = new SearchApiLoader(loaderConfig); + + // Fetch documents, split if a text splitter is provided + const docs = textSplitter ? await loader.loadAndSplit() : await loader.load() + + if (metadata) { + const parsedMetadata = typeof metadata === 'object' ? metadata : JSON.parse(metadata) + return docs.map((doc) => { + return { + ...doc, + metadata: { + ...doc.metadata, + ...parsedMetadata + } + } + }) + } + + return docs + } +} + +module.exports = { nodeClass: SearchAPI_DocumentLoaders } diff --git a/packages/components/nodes/documentloaders/SearchApi/searchapi.svg b/packages/components/nodes/documentloaders/SearchApi/searchapi.svg new file mode 100644 index 00000000..c44c29c4 --- /dev/null +++ b/packages/components/nodes/documentloaders/SearchApi/searchapi.svg @@ -0,0 +1 @@ +0479_octopus_verti diff --git a/packages/components/nodes/tools/SearchApi/SearchAPI.ts b/packages/components/nodes/tools/SearchApi/SearchAPI.ts new file mode 100644 index 00000000..3f760087 --- /dev/null +++ b/packages/components/nodes/tools/SearchApi/SearchAPI.ts @@ -0,0 +1,42 @@ +import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface' +import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils' +import { SearchApi } from 'langchain/tools' + +class SearchAPI_Tools implements INode { + label: string + name: string + version: number + description: string + type: string + icon: string + category: string + baseClasses: string[] + credential: INodeParams + inputs: INodeParams[] + + constructor() { + this.label = 'SearchApi' + this.name = 'searchAPI' + this.version = 1.0 + this.type = 'SearchAPI' + this.icon = 'searchapi.svg' + this.category = 'Tools' + this.description = 'Real-time API for accessing Google Search data' + this.inputs = [] + this.credential = { + label: 'Connect Credential', + name: 'credential', + type: 'credential', + credentialNames: ['searchApi'] + } + this.baseClasses = [this.type, ...getBaseClasses(SearchApi)] + } + + async init(nodeData: INodeData, _: string, options: ICommonObject): Promise { + const credentialData = await getCredentialData(nodeData.credential ?? '', options) + const searchApiKey = getCredentialParam('searchApiKey', credentialData, nodeData) + return new SearchApi(searchApiKey) + } +} + +module.exports = { nodeClass: SearchAPI_Tools } diff --git a/packages/components/nodes/tools/SearchApi/searchapi.svg b/packages/components/nodes/tools/SearchApi/searchapi.svg new file mode 100644 index 00000000..c44c29c4 --- /dev/null +++ b/packages/components/nodes/tools/SearchApi/searchapi.svg @@ -0,0 +1 @@ +0479_octopus_verti diff --git a/packages/server/marketplaces/chatflows/Chat with a Podcast.json b/packages/server/marketplaces/chatflows/Chat with a Podcast.json new file mode 100644 index 00000000..e91bf50f --- /dev/null +++ b/packages/server/marketplaces/chatflows/Chat with a Podcast.json @@ -0,0 +1,702 @@ +{ + "description": "Engage with data sources such as YouTube Transcripts, Google, and more through intelligent Q&A interactions", + "nodes": [ + { + "width": 300, + "height": 483, + "id": "conversationalRetrievalQAChain_0", + "position": { + "x": 1499.2693059023254, + "y": 430.03911199833317 + }, + "type": "customNode", + "data": { + "id": "conversationalRetrievalQAChain_0", + "label": "Conversational Retrieval QA Chain", + "version": 1, + "name": "conversationalRetrievalQAChain", + "type": "ConversationalRetrievalQAChain", + "baseClasses": [ + "ConversationalRetrievalQAChain", + "BaseChain", + "Runnable" + ], + "category": "Chains", + "description": "Document QA - built on RetrievalQAChain to provide a chat history component", + "inputParams": [ + { + "label": "Return Source Documents", + "name": "returnSourceDocuments", + "type": "boolean", + "optional": true, + "id": "conversationalRetrievalQAChain_0-input-returnSourceDocuments-boolean" + }, + { + "label": "System Message", + "name": "systemMessagePrompt", + "type": "string", + "rows": 4, + "additionalParams": true, + "optional": true, + "placeholder": "I want you to act as a document that I am having a conversation with. Your name is \"AI Assistant\". You will provide me with answers from the given info. If the answer is not included, say exactly \"Hmm, I am not sure.\" and stop after that. Refuse to answer any question not about the info. Never break character.", + "id": "conversationalRetrievalQAChain_0-input-systemMessagePrompt-string" + }, + { + "label": "Chain Option", + "name": "chainOption", + "type": "options", + "options": [ + { + "label": "MapReduceDocumentsChain", + "name": "map_reduce", + "description": "Suitable for QA tasks over larger documents and can run the preprocessing step in parallel, reducing the running time" + }, + { + "label": "RefineDocumentsChain", + "name": "refine", + "description": "Suitable for QA tasks over a large number of documents." + }, + { + "label": "StuffDocumentsChain", + "name": "stuff", + "description": "Suitable for QA tasks over a small number of documents." + } + ], + "additionalParams": true, + "optional": true, + "id": "conversationalRetrievalQAChain_0-input-chainOption-options" + } + ], + "inputAnchors": [ + { + "label": "Language Model", + "name": "model", + "type": "BaseLanguageModel", + "id": "conversationalRetrievalQAChain_0-input-model-BaseLanguageModel" + }, + { + "label": "Vector Store Retriever", + "name": "vectorStoreRetriever", + "type": "BaseRetriever", + "id": "conversationalRetrievalQAChain_0-input-vectorStoreRetriever-BaseRetriever" + }, + { + "label": "Memory", + "name": "memory", + "type": "BaseMemory", + "optional": true, + "description": "If left empty, a default BufferMemory will be used", + "id": "conversationalRetrievalQAChain_0-input-memory-BaseMemory" + } + ], + "inputs": { + "model": "{{chatOpenAI_0.data.instance}}", + "vectorStoreRetriever": "{{memoryVectorStore_0.data.instance}}", + "memory": "", + "returnSourceDocuments": "", + "systemMessagePrompt": "", + "chainOption": "" + }, + "outputAnchors": [ + { + "id": "conversationalRetrievalQAChain_0-output-conversationalRetrievalQAChain-ConversationalRetrievalQAChain|BaseChain|Runnable", + "name": "conversationalRetrievalQAChain", + "label": "ConversationalRetrievalQAChain", + "type": "ConversationalRetrievalQAChain | BaseChain | Runnable" + } + ], + "outputs": {}, + "selected": false + }, + "selected": false, + "positionAbsolute": { + "x": 1499.2693059023254, + "y": 430.03911199833317 + }, + "dragging": false + }, + { + "width": 300, + "height": 408, + "id": "memoryVectorStore_0", + "position": { + "x": 1082.0280622332507, + "y": 589.9990964387842 + }, + "type": "customNode", + "data": { + "id": "memoryVectorStore_0", + "label": "In-Memory Vector Store", + "version": 1, + "name": "memoryVectorStore", + "type": "Memory", + "baseClasses": [ + "Memory", + "VectorStoreRetriever", + "BaseRetriever" + ], + "category": "Vector Stores", + "description": "In-memory vectorstore that stores embeddings and does an exact, linear search for the most similar embeddings.", + "inputParams": [ + { + "label": "Top K", + "name": "topK", + "description": "Number of top results to fetch. Default to 4", + "placeholder": "4", + "type": "number", + "optional": true, + "id": "memoryVectorStore_0-input-topK-number" + } + ], + "inputAnchors": [ + { + "label": "Document", + "name": "document", + "type": "Document", + "list": true, + "id": "memoryVectorStore_0-input-document-Document" + }, + { + "label": "Embeddings", + "name": "embeddings", + "type": "Embeddings", + "id": "memoryVectorStore_0-input-embeddings-Embeddings" + } + ], + "inputs": { + "document": [ + "{{searchApi_0.data.instance}}", + "{{searchApi_0.data.instance}}", + "{{searchApi_0.data.instance}}" + ], + "embeddings": "{{openAIEmbeddings_0.data.instance}}", + "topK": "" + }, + "outputAnchors": [ + { + "name": "output", + "label": "Output", + "type": "options", + "options": [ + { + "id": "memoryVectorStore_0-output-retriever-Memory|VectorStoreRetriever|BaseRetriever", + "name": "retriever", + "label": "Memory Retriever", + "type": "Memory | VectorStoreRetriever | BaseRetriever" + }, + { + "id": "memoryVectorStore_0-output-vectorStore-Memory|VectorStore", + "name": "vectorStore", + "label": "Memory Vector Store", + "type": "Memory | VectorStore" + } + ], + "default": "retriever" + } + ], + "outputs": { + "output": "retriever" + }, + "selected": false + }, + "positionAbsolute": { + "x": 1082.0280622332507, + "y": 589.9990964387842 + }, + "selected": false, + "dragging": false + }, + { + "width": 300, + "height": 577, + "id": "chatOpenAI_0", + "position": { + "x": 1056.2788608917747, + "y": -60.59149112477064 + }, + "type": "customNode", + "data": { + "id": "chatOpenAI_0", + "label": "ChatOpenAI", + "version": 2, + "name": "chatOpenAI", + "type": "ChatOpenAI", + "baseClasses": [ + "ChatOpenAI", + "BaseChatModel", + "BaseLanguageModel", + "Runnable" + ], + "category": "Chat Models", + "description": "Wrapper around OpenAI large language models that use the Chat endpoint", + "inputParams": [ + { + "label": "Connect Credential", + "name": "credential", + "type": "credential", + "credentialNames": [ + "openAIApi" + ], + "id": "chatOpenAI_0-input-credential-credential" + }, + { + "label": "Model Name", + "name": "modelName", + "type": "options", + "options": [ + { + "label": "gpt-4", + "name": "gpt-4" + }, + { + "label": "gpt-4-0613", + "name": "gpt-4-0613" + }, + { + "label": "gpt-4-32k", + "name": "gpt-4-32k" + }, + { + "label": "gpt-4-32k-0613", + "name": "gpt-4-32k-0613" + }, + { + "label": "gpt-3.5-turbo", + "name": "gpt-3.5-turbo" + }, + { + "label": "gpt-3.5-turbo-0613", + "name": "gpt-3.5-turbo-0613" + }, + { + "label": "gpt-3.5-turbo-16k", + "name": "gpt-3.5-turbo-16k" + }, + { + "label": "gpt-3.5-turbo-16k-0613", + "name": "gpt-3.5-turbo-16k-0613" + } + ], + "default": "gpt-3.5-turbo", + "optional": true, + "id": "chatOpenAI_0-input-modelName-options" + }, + { + "label": "Temperature", + "name": "temperature", + "type": "number", + "step": 0.1, + "default": 0.9, + "optional": true, + "id": "chatOpenAI_0-input-temperature-number" + }, + { + "label": "Max Tokens", + "name": "maxTokens", + "type": "number", + "step": 1, + "optional": true, + "additionalParams": true, + "id": "chatOpenAI_0-input-maxTokens-number" + }, + { + "label": "Top Probability", + "name": "topP", + "type": "number", + "step": 0.1, + "optional": true, + "additionalParams": true, + "id": "chatOpenAI_0-input-topP-number" + }, + { + "label": "Frequency Penalty", + "name": "frequencyPenalty", + "type": "number", + "step": 0.1, + "optional": true, + "additionalParams": true, + "id": "chatOpenAI_0-input-frequencyPenalty-number" + }, + { + "label": "Presence Penalty", + "name": "presencePenalty", + "type": "number", + "step": 0.1, + "optional": true, + "additionalParams": true, + "id": "chatOpenAI_0-input-presencePenalty-number" + }, + { + "label": "Timeout", + "name": "timeout", + "type": "number", + "step": 1, + "optional": true, + "additionalParams": true, + "id": "chatOpenAI_0-input-timeout-number" + }, + { + "label": "BasePath", + "name": "basepath", + "type": "string", + "optional": true, + "additionalParams": true, + "id": "chatOpenAI_0-input-basepath-string" + }, + { + "label": "BaseOptions", + "name": "baseOptions", + "type": "json", + "optional": true, + "additionalParams": true, + "id": "chatOpenAI_0-input-baseOptions-json" + } + ], + "inputAnchors": [ + { + "label": "Cache", + "name": "cache", + "type": "BaseCache", + "optional": true, + "id": "chatOpenAI_0-input-cache-BaseCache" + } + ], + "inputs": { + "cache": "", + "modelName": "gpt-3.5-turbo", + "temperature": "0.5", + "maxTokens": "", + "topP": "", + "frequencyPenalty": "", + "presencePenalty": "", + "timeout": "", + "basepath": "", + "baseOptions": "" + }, + "outputAnchors": [ + { + "id": "chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable", + "name": "chatOpenAI", + "label": "ChatOpenAI", + "type": "ChatOpenAI | BaseChatModel | BaseLanguageModel | Runnable" + } + ], + "outputs": {}, + "selected": false + }, + "selected": false, + "positionAbsolute": { + "x": 1056.2788608917747, + "y": -60.59149112477064 + }, + "dragging": false + }, + { + "width": 300, + "height": 478, + "id": "characterTextSplitter_0", + "position": { + "x": 260.5475803279806, + "y": -65.1647664861618 + }, + "type": "customNode", + "data": { + "id": "characterTextSplitter_0", + "label": "Character Text Splitter", + "version": 1, + "name": "characterTextSplitter", + "type": "CharacterTextSplitter", + "baseClasses": [ + "CharacterTextSplitter", + "TextSplitter", + "BaseDocumentTransformer", + "Runnable" + ], + "category": "Text Splitters", + "description": "splits only on one type of character (defaults to \"\\n\\n\").", + "inputParams": [ + { + "label": "Chunk Size", + "name": "chunkSize", + "type": "number", + "default": 1000, + "optional": true, + "id": "characterTextSplitter_0-input-chunkSize-number" + }, + { + "label": "Chunk Overlap", + "name": "chunkOverlap", + "type": "number", + "optional": true, + "id": "characterTextSplitter_0-input-chunkOverlap-number" + }, + { + "label": "Custom Separator", + "name": "separator", + "type": "string", + "placeholder": "\" \"", + "description": "Seperator to determine when to split the text, will override the default separator", + "optional": true, + "id": "characterTextSplitter_0-input-separator-string" + } + ], + "inputAnchors": [], + "inputs": { + "chunkSize": "2000", + "chunkOverlap": "200", + "separator": "" + }, + "outputAnchors": [ + { + "id": "characterTextSplitter_0-output-characterTextSplitter-CharacterTextSplitter|TextSplitter|BaseDocumentTransformer|Runnable", + "name": "characterTextSplitter", + "label": "CharacterTextSplitter", + "type": "CharacterTextSplitter | TextSplitter | BaseDocumentTransformer | Runnable" + } + ], + "outputs": {}, + "selected": false + }, + "selected": false, + "positionAbsolute": { + "x": 260.5475803279806, + "y": -65.1647664861618 + }, + "dragging": false + }, + { + "width": 300, + "height": 332, + "id": "openAIEmbeddings_0", + "position": { + "x": 666.3950526535211, + "y": 777.4191705193945 + }, + "type": "customNode", + "data": { + "id": "openAIEmbeddings_0", + "label": "OpenAI Embeddings", + "version": 1, + "name": "openAIEmbeddings", + "type": "OpenAIEmbeddings", + "baseClasses": [ + "OpenAIEmbeddings", + "Embeddings" + ], + "category": "Embeddings", + "description": "OpenAI API to generate embeddings for a given text", + "inputParams": [ + { + "label": "Connect Credential", + "name": "credential", + "type": "credential", + "credentialNames": [ + "openAIApi" + ], + "id": "openAIEmbeddings_0-input-credential-credential" + }, + { + "label": "Strip New Lines", + "name": "stripNewLines", + "type": "boolean", + "optional": true, + "additionalParams": true, + "id": "openAIEmbeddings_0-input-stripNewLines-boolean" + }, + { + "label": "Batch Size", + "name": "batchSize", + "type": "number", + "optional": true, + "additionalParams": true, + "id": "openAIEmbeddings_0-input-batchSize-number" + }, + { + "label": "Timeout", + "name": "timeout", + "type": "number", + "optional": true, + "additionalParams": true, + "id": "openAIEmbeddings_0-input-timeout-number" + }, + { + "label": "BasePath", + "name": "basepath", + "type": "string", + "optional": true, + "additionalParams": true, + "id": "openAIEmbeddings_0-input-basepath-string" + } + ], + "inputAnchors": [], + "inputs": { + "stripNewLines": "", + "batchSize": "", + "timeout": "", + "basepath": "" + }, + "outputAnchors": [ + { + "id": "openAIEmbeddings_0-output-openAIEmbeddings-OpenAIEmbeddings|Embeddings", + "name": "openAIEmbeddings", + "label": "OpenAIEmbeddings", + "type": "OpenAIEmbeddings | Embeddings" + } + ], + "outputs": {}, + "selected": false + }, + "selected": false, + "dragging": false, + "positionAbsolute": { + "x": 666.3950526535211, + "y": 777.4191705193945 + } + }, + { + "width": 300, + "height": 482, + "id": "searchApi_0", + "position": { + "x": 680.1258121447145, + "y": 144.9905217023999 + }, + "type": "customNode", + "data": { + "id": "searchApi_0", + "label": "SearchApi", + "version": 1, + "name": "searchApi", + "type": "Document", + "baseClasses": [ + "Document" + ], + "category": "Document Loaders", + "description": "Load data from real-time search results", + "inputParams": [ + { + "label": "Connect Credential", + "name": "credential", + "type": "credential", + "optional": false, + "credentialNames": [ + "searchApi" + ], + "id": "searchApi_0-input-credential-credential" + }, + { + "label": "Query", + "name": "query", + "type": "string", + "optional": true, + "id": "searchApi_0-input-query-string" + }, + { + "label": "Custom Parameters", + "name": "customParameters", + "type": "json", + "optional": true, + "additionalParams": true, + "id": "searchApi_0-input-customParameters-json" + }, + { + "label": "Metadata", + "name": "metadata", + "type": "json", + "optional": true, + "additionalParams": true, + "id": "searchApi_0-input-metadata-json" + } + ], + "inputAnchors": [ + { + "label": "Text Splitter", + "name": "textSplitter", + "type": "TextSplitter", + "optional": true, + "id": "searchApi_0-input-textSplitter-TextSplitter" + } + ], + "inputs": { + "query": "", + "customParameters": "{\"engine\":\"youtube_transcripts\",\"video_id\":\"0e3GPea1Tyg\"}", + "textSplitter": "{{characterTextSplitter_0.data.instance}}", + "metadata": "" + }, + "outputAnchors": [ + { + "id": "searchApi_0-output-searchApi-Document", + "name": "searchApi", + "label": "Document", + "type": "Document" + } + ], + "outputs": {}, + "selected": false + }, + "selected": false, + "positionAbsolute": { + "x": 680.1258121447145, + "y": 144.9905217023999 + }, + "dragging": false + } + ], + "edges": [ + { + "source": "memoryVectorStore_0", + "sourceHandle": "memoryVectorStore_0-output-retriever-Memory|VectorStoreRetriever|BaseRetriever", + "target": "conversationalRetrievalQAChain_0", + "targetHandle": "conversationalRetrievalQAChain_0-input-vectorStoreRetriever-BaseRetriever", + "type": "buttonedge", + "id": "memoryVectorStore_0-memoryVectorStore_0-output-retriever-Memory|VectorStoreRetriever|BaseRetriever-conversationalRetrievalQAChain_0-conversationalRetrievalQAChain_0-input-vectorStoreRetriever-BaseRetriever", + "data": { + "label": "" + } + }, + { + "source": "chatOpenAI_0", + "sourceHandle": "chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable", + "target": "conversationalRetrievalQAChain_0", + "targetHandle": "conversationalRetrievalQAChain_0-input-model-BaseLanguageModel", + "type": "buttonedge", + "id": "chatOpenAI_0-chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable-conversationalRetrievalQAChain_0-conversationalRetrievalQAChain_0-input-model-BaseLanguageModel", + "data": { + "label": "" + } + }, + { + "source": "openAIEmbeddings_0", + "sourceHandle": "openAIEmbeddings_0-output-openAIEmbeddings-OpenAIEmbeddings|Embeddings", + "target": "memoryVectorStore_0", + "targetHandle": "memoryVectorStore_0-input-embeddings-Embeddings", + "type": "buttonedge", + "id": "openAIEmbeddings_0-openAIEmbeddings_0-output-openAIEmbeddings-OpenAIEmbeddings|Embeddings-memoryVectorStore_0-memoryVectorStore_0-input-embeddings-Embeddings", + "data": { + "label": "" + } + }, + { + "source": "characterTextSplitter_0", + "sourceHandle": "characterTextSplitter_0-output-characterTextSplitter-CharacterTextSplitter|TextSplitter|BaseDocumentTransformer|Runnable", + "target": "searchApi_0", + "targetHandle": "searchApi_0-input-textSplitter-TextSplitter", + "type": "buttonedge", + "id": "characterTextSplitter_0-characterTextSplitter_0-output-characterTextSplitter-CharacterTextSplitter|TextSplitter|BaseDocumentTransformer|Runnable-searchApi_0-searchApi_0-input-textSplitter-TextSplitter", + "data": { + "label": "" + } + }, + { + "source": "searchApi_0", + "sourceHandle": "searchApi_0-output-searchApi-Document", + "target": "memoryVectorStore_0", + "targetHandle": "memoryVectorStore_0-input-document-Document", + "type": "buttonedge", + "id": "searchApi_0-searchApi_0-output-searchApi-Document-memoryVectorStore_0-memoryVectorStore_0-input-document-Document", + "data": { + "label": "" + } + } + ] +} From 039d8d26be95d19ba014d4e716820b6e984bc3e2 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 31 Oct 2023 16:32:33 +0000 Subject: [PATCH 30/35] expand text file supported file types --- .../nodes/documentloaders/Text/Text.ts | 5 +++-- .../RecursiveCharacterTextSplitter.ts | 1 + .../Conversational Retrieval QA Chain.json | 17 ++++++++++++++--- .../marketplaces/chatflows/Local QnA.json | 17 ++++++++++++++--- .../chatflows/Metadata Filter Upsert.json | 17 ++++++++++++++--- 5 files changed, 46 insertions(+), 11 deletions(-) diff --git a/packages/components/nodes/documentloaders/Text/Text.ts b/packages/components/nodes/documentloaders/Text/Text.ts index c3e3b61e..3f12e490 100644 --- a/packages/components/nodes/documentloaders/Text/Text.ts +++ b/packages/components/nodes/documentloaders/Text/Text.ts @@ -19,7 +19,7 @@ class Text_DocumentLoaders implements INode { constructor() { this.label = 'Text File' this.name = 'textFile' - this.version = 2.0 + this.version = 3.0 this.type = 'Document' this.icon = 'textFile.svg' this.category = 'Document Loaders' @@ -30,7 +30,8 @@ class Text_DocumentLoaders implements INode { label: 'Txt File', name: 'txtFile', type: 'file', - fileType: '.txt' + fileType: + '.txt, .html, .aspx, .asp, .cpp, .c, .cs, .css, .go, .h, .java, .js, .less, .ts, .php, .proto, .python, .py, .rst, .ruby, .rb, .rs, .scala, .sc, .scss, .sol, .sql, .swift, .markdown, .md, .tex, .ltx, .vb, .xml' }, { label: 'Text Splitter', diff --git a/packages/components/nodes/textsplitters/RecursiveCharacterTextSplitter/RecursiveCharacterTextSplitter.ts b/packages/components/nodes/textsplitters/RecursiveCharacterTextSplitter/RecursiveCharacterTextSplitter.ts index d7dbc1c3..13386bd9 100644 --- a/packages/components/nodes/textsplitters/RecursiveCharacterTextSplitter/RecursiveCharacterTextSplitter.ts +++ b/packages/components/nodes/textsplitters/RecursiveCharacterTextSplitter/RecursiveCharacterTextSplitter.ts @@ -43,6 +43,7 @@ class RecursiveCharacterTextSplitter_TextSplitters implements INode { rows: 4, description: 'Array of custom separators to determine when to split the text, will override the default separators', placeholder: `["|", "##", ">", "-"]`, + additionalParams: true, optional: true } ] diff --git a/packages/server/marketplaces/chatflows/Conversational Retrieval QA Chain.json b/packages/server/marketplaces/chatflows/Conversational Retrieval QA Chain.json index 8bbb904e..38e780cc 100644 --- a/packages/server/marketplaces/chatflows/Conversational Retrieval QA Chain.json +++ b/packages/server/marketplaces/chatflows/Conversational Retrieval QA Chain.json @@ -368,7 +368,7 @@ "id": "recursiveCharacterTextSplitter_0", "label": "Recursive Character Text Splitter", "name": "recursiveCharacterTextSplitter", - "version": 1, + "version": 2, "type": "RecursiveCharacterTextSplitter", "baseClasses": ["RecursiveCharacterTextSplitter", "TextSplitter"], "category": "Text Splitters", @@ -388,6 +388,17 @@ "type": "number", "optional": true, "id": "recursiveCharacterTextSplitter_0-input-chunkOverlap-number" + }, + { + "label": "Custom Separators", + "name": "separators", + "type": "string", + "rows": 4, + "description": "Array of custom separators to determine when to split the text, will override the default separators", + "placeholder": "[\"|\", \"##\", \">\", \"-\"]", + "additionalParams": true, + "optional": true, + "id": "recursiveCharacterTextSplitter_0-input-separators-string" } ], "inputAnchors": [], @@ -426,7 +437,7 @@ "id": "textFile_0", "label": "Text File", "name": "textFile", - "version": 2, + "version": 3, "type": "Document", "baseClasses": ["Document"], "category": "Document Loaders", @@ -436,7 +447,7 @@ "label": "Txt File", "name": "txtFile", "type": "file", - "fileType": ".txt", + "fileType": ".txt, .html, .aspx, .asp, .cpp, .c, .cs, .css, .go, .h, .java, .js, .less, .ts, .php, .proto, .python, .py, .rst, .ruby, .rb, .rs, .scala, .sc, .scss, .sol, .sql, .swift, .markdown, .md, .tex, .ltx, .vb, .xml", "id": "textFile_0-input-txtFile-file" }, { diff --git a/packages/server/marketplaces/chatflows/Local QnA.json b/packages/server/marketplaces/chatflows/Local QnA.json index fb13ba21..78ce16f6 100644 --- a/packages/server/marketplaces/chatflows/Local QnA.json +++ b/packages/server/marketplaces/chatflows/Local QnA.json @@ -14,7 +14,7 @@ "id": "recursiveCharacterTextSplitter_1", "label": "Recursive Character Text Splitter", "name": "recursiveCharacterTextSplitter", - "version": 1, + "version": 2, "type": "RecursiveCharacterTextSplitter", "baseClasses": ["RecursiveCharacterTextSplitter", "TextSplitter"], "category": "Text Splitters", @@ -34,6 +34,17 @@ "type": "number", "optional": true, "id": "recursiveCharacterTextSplitter_1-input-chunkOverlap-number" + }, + { + "label": "Custom Separators", + "name": "separators", + "type": "string", + "rows": 4, + "description": "Array of custom separators to determine when to split the text, will override the default separators", + "placeholder": "[\"|\", \"##\", \">\", \"-\"]", + "additionalParams": true, + "optional": true, + "id": "recursiveCharacterTextSplitter_1-input-separators-string" } ], "inputAnchors": [], @@ -373,7 +384,7 @@ "id": "textFile_0", "label": "Text File", "name": "textFile", - "version": 1, + "version": 3, "type": "Document", "baseClasses": ["Document"], "category": "Document Loaders", @@ -383,7 +394,7 @@ "label": "Txt File", "name": "txtFile", "type": "file", - "fileType": ".txt", + "fileType": ".txt, .html, .aspx, .asp, .cpp, .c, .cs, .css, .go, .h, .java, .js, .less, .ts, .php, .proto, .python, .py, .rst, .ruby, .rb, .rs, .scala, .sc, .scss, .sol, .sql, .swift, .markdown, .md, .tex, .ltx, .vb, .xml", "id": "textFile_0-input-txtFile-file" }, { diff --git a/packages/server/marketplaces/chatflows/Metadata Filter Upsert.json b/packages/server/marketplaces/chatflows/Metadata Filter Upsert.json index 6e79301e..38cec6dd 100644 --- a/packages/server/marketplaces/chatflows/Metadata Filter Upsert.json +++ b/packages/server/marketplaces/chatflows/Metadata Filter Upsert.json @@ -14,7 +14,7 @@ "id": "recursiveCharacterTextSplitter_1", "label": "Recursive Character Text Splitter", "name": "recursiveCharacterTextSplitter", - "version": 1, + "version": 2, "type": "RecursiveCharacterTextSplitter", "baseClasses": ["RecursiveCharacterTextSplitter", "TextSplitter"], "category": "Text Splitters", @@ -34,6 +34,17 @@ "type": "number", "optional": true, "id": "recursiveCharacterTextSplitter_1-input-chunkOverlap-number" + }, + { + "label": "Custom Separators", + "name": "separators", + "type": "string", + "rows": 4, + "description": "Array of custom separators to determine when to split the text, will override the default separators", + "placeholder": "[\"|\", \"##\", \">\", \"-\"]", + "additionalParams": true, + "optional": true, + "id": "recursiveCharacterTextSplitter_1-input-separators-string" } ], "inputAnchors": [], @@ -72,7 +83,7 @@ "id": "textFile_0", "label": "Text File", "name": "textFile", - "version": 1, + "version": 3, "type": "Document", "baseClasses": ["Document"], "category": "Document Loaders", @@ -82,7 +93,7 @@ "label": "Txt File", "name": "txtFile", "type": "file", - "fileType": ".txt", + "fileType": ".txt, .html, .aspx, .asp, .cpp, .c, .cs, .css, .go, .h, .java, .js, .less, .ts, .php, .proto, .python, .py, .rst, .ruby, .rb, .rs, .scala, .sc, .scss, .sol, .sql, .swift, .markdown, .md, .tex, .ltx, .vb, .xml", "id": "textFile_0-input-txtFile-file" }, { From 83947dc55d242938e195945bf4391d94c424f3a0 Mon Sep 17 00:00:00 2001 From: SebastjanPrachovskij Date: Wed, 1 Nov 2023 18:19:05 +0200 Subject: [PATCH 31/35] Add SearchApi credentials description --- packages/components/credentials/SearchApi.credential.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/components/credentials/SearchApi.credential.ts b/packages/components/credentials/SearchApi.credential.ts index ccc65a6c..96d3dc01 100644 --- a/packages/components/credentials/SearchApi.credential.ts +++ b/packages/components/credentials/SearchApi.credential.ts @@ -11,6 +11,8 @@ class SearchApi implements INodeCredential { this.label = 'Search API' this.name = 'searchApi' this.version = 1.0 + this.description = + 'Sign in to SearchApi to obtain a free API key from the dashboard.' this.inputs = [ { label: 'SearchApi API Key', From 6cc08110852544fe327271ee121dc821bc115b1d Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 1 Nov 2023 16:20:13 +0000 Subject: [PATCH 32/35] add check before adding new document --- .../nodes/chains/ConversationChain/ConversationChain.ts | 4 +++- .../components/nodes/vectorstores/Chroma/Chroma_Upsert.ts | 4 +++- .../vectorstores/Elasticsearch/Elasticsearch_Upsert.ts | 4 +++- .../nodes/vectorstores/Faiss_Upsert/Faiss_Upsert.ts | 4 +++- .../nodes/vectorstores/InMemory/InMemoryVectorStore.ts | 2 +- .../components/nodes/vectorstores/Milvus/Milvus_Upsert.ts | 4 +++- .../vectorstores/OpenSearch_Upsert/OpenSearch_Upsert.ts | 4 +++- .../nodes/vectorstores/Pinecone/Pinecone_Upsert.ts | 4 +++- .../nodes/vectorstores/Postgres_Upsert/Postgres_Upsert.ts | 4 +++- .../nodes/vectorstores/Qdrant_Upsert/Qdrant_Upsert.ts | 4 +++- .../components/nodes/vectorstores/Redis/Redis_Upsert.ts | 8 +++++--- .../vectorstores/Singlestore_Upsert/Singlestore_Upsert.ts | 4 +++- .../nodes/vectorstores/Vectara/Vectara_Upsert.ts | 4 +++- .../nodes/vectorstores/Weaviate_Upsert/Weaviate_Upsert.ts | 4 +++- packages/components/nodes/vectorstores/Zep/Zep_Upsert.ts | 4 +++- 15 files changed, 45 insertions(+), 17 deletions(-) diff --git a/packages/components/nodes/chains/ConversationChain/ConversationChain.ts b/packages/components/nodes/chains/ConversationChain/ConversationChain.ts index f12cd30b..92a0b5ea 100644 --- a/packages/components/nodes/chains/ConversationChain/ConversationChain.ts +++ b/packages/components/nodes/chains/ConversationChain/ConversationChain.ts @@ -71,7 +71,9 @@ class ConversationChain_Chains implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + if (flattenDocs[i] && flattenDocs[i].pageContent) { + finalDocs.push(new Document(flattenDocs[i])) + } } let finalText = '' diff --git a/packages/components/nodes/vectorstores/Chroma/Chroma_Upsert.ts b/packages/components/nodes/vectorstores/Chroma/Chroma_Upsert.ts index 0527b729..951338ba 100644 --- a/packages/components/nodes/vectorstores/Chroma/Chroma_Upsert.ts +++ b/packages/components/nodes/vectorstores/Chroma/Chroma_Upsert.ts @@ -98,7 +98,9 @@ class ChromaUpsert_VectorStores implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + if (flattenDocs[i] && flattenDocs[i].pageContent) { + finalDocs.push(new Document(flattenDocs[i])) + } } const obj: { diff --git a/packages/components/nodes/vectorstores/Elasticsearch/Elasticsearch_Upsert.ts b/packages/components/nodes/vectorstores/Elasticsearch/Elasticsearch_Upsert.ts index d4b79a5d..d3965786 100644 --- a/packages/components/nodes/vectorstores/Elasticsearch/Elasticsearch_Upsert.ts +++ b/packages/components/nodes/vectorstores/Elasticsearch/Elasticsearch_Upsert.ts @@ -38,7 +38,9 @@ class ElasicsearchUpsert_VectorStores extends ElasticSearchBase implements INode const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + if (flattenDocs[i] && flattenDocs[i].pageContent) { + finalDocs.push(new Document(flattenDocs[i])) + } } // The following code is a workaround for a bug (Langchain Issue #1589) in the underlying library. diff --git a/packages/components/nodes/vectorstores/Faiss_Upsert/Faiss_Upsert.ts b/packages/components/nodes/vectorstores/Faiss_Upsert/Faiss_Upsert.ts index c234a4f5..a84b9da4 100644 --- a/packages/components/nodes/vectorstores/Faiss_Upsert/Faiss_Upsert.ts +++ b/packages/components/nodes/vectorstores/Faiss_Upsert/Faiss_Upsert.ts @@ -80,7 +80,9 @@ class FaissUpsert_VectorStores implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + if (flattenDocs[i] && flattenDocs[i].pageContent) { + finalDocs.push(new Document(flattenDocs[i])) + } } const vectorStore = await FaissStore.fromDocuments(finalDocs, embeddings) diff --git a/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts b/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts index a480ace0..a827e3ee 100644 --- a/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts +++ b/packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts @@ -71,7 +71,7 @@ class InMemoryVectorStore_VectorStores implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - if (flattenDocs[i] !== undefined && flattenDocs[i].pageContent !== undefined) { + if (flattenDocs[i] && flattenDocs[i].pageContent) { finalDocs.push(new Document(flattenDocs[i])) } } diff --git a/packages/components/nodes/vectorstores/Milvus/Milvus_Upsert.ts b/packages/components/nodes/vectorstores/Milvus/Milvus_Upsert.ts index 40afe9a4..371fd16f 100644 --- a/packages/components/nodes/vectorstores/Milvus/Milvus_Upsert.ts +++ b/packages/components/nodes/vectorstores/Milvus/Milvus_Upsert.ts @@ -110,7 +110,9 @@ class Milvus_Upsert_VectorStores implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + if (flattenDocs[i] && flattenDocs[i].pageContent) { + finalDocs.push(new Document(flattenDocs[i])) + } } const vectorStore = await MilvusUpsert.fromDocuments(finalDocs, embeddings, milVusArgs) diff --git a/packages/components/nodes/vectorstores/OpenSearch_Upsert/OpenSearch_Upsert.ts b/packages/components/nodes/vectorstores/OpenSearch_Upsert/OpenSearch_Upsert.ts index c11d8b11..da123581 100644 --- a/packages/components/nodes/vectorstores/OpenSearch_Upsert/OpenSearch_Upsert.ts +++ b/packages/components/nodes/vectorstores/OpenSearch_Upsert/OpenSearch_Upsert.ts @@ -86,7 +86,9 @@ class OpenSearchUpsert_VectorStores implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + if (flattenDocs[i] && flattenDocs[i].pageContent) { + finalDocs.push(new Document(flattenDocs[i])) + } } const client = new Client({ diff --git a/packages/components/nodes/vectorstores/Pinecone/Pinecone_Upsert.ts b/packages/components/nodes/vectorstores/Pinecone/Pinecone_Upsert.ts index 4a12f27b..0851fa3e 100644 --- a/packages/components/nodes/vectorstores/Pinecone/Pinecone_Upsert.ts +++ b/packages/components/nodes/vectorstores/Pinecone/Pinecone_Upsert.ts @@ -106,7 +106,9 @@ class PineconeUpsert_VectorStores implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + if (flattenDocs[i] && flattenDocs[i].pageContent) { + finalDocs.push(new Document(flattenDocs[i])) + } } const obj: PineconeLibArgs = { diff --git a/packages/components/nodes/vectorstores/Postgres_Upsert/Postgres_Upsert.ts b/packages/components/nodes/vectorstores/Postgres_Upsert/Postgres_Upsert.ts index bc16a052..8ea3501d 100644 --- a/packages/components/nodes/vectorstores/Postgres_Upsert/Postgres_Upsert.ts +++ b/packages/components/nodes/vectorstores/Postgres_Upsert/Postgres_Upsert.ts @@ -143,7 +143,9 @@ class PostgresUpsert_VectorStores implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + if (flattenDocs[i] && flattenDocs[i].pageContent) { + finalDocs.push(new Document(flattenDocs[i])) + } } const vectorStore = await TypeORMVectorStore.fromDocuments(finalDocs, embeddings, args) diff --git a/packages/components/nodes/vectorstores/Qdrant_Upsert/Qdrant_Upsert.ts b/packages/components/nodes/vectorstores/Qdrant_Upsert/Qdrant_Upsert.ts index 407a8d22..183271f7 100644 --- a/packages/components/nodes/vectorstores/Qdrant_Upsert/Qdrant_Upsert.ts +++ b/packages/components/nodes/vectorstores/Qdrant_Upsert/Qdrant_Upsert.ts @@ -147,7 +147,9 @@ class QdrantUpsert_VectorStores implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + if (flattenDocs[i] && flattenDocs[i].pageContent) { + finalDocs.push(new Document(flattenDocs[i])) + } } const dbConfig: QdrantLibArgs = { diff --git a/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts b/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts index 0ed431fb..9d1a4f45 100644 --- a/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts +++ b/packages/components/nodes/vectorstores/Redis/Redis_Upsert.ts @@ -49,9 +49,11 @@ class RedisUpsert_VectorStores extends RedisSearchBase implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - const document = new Document(flattenDocs[i]) - escapeAllStrings(document.metadata) - finalDocs.push(document) + if (flattenDocs[i] && flattenDocs[i].pageContent) { + const document = new Document(flattenDocs[i]) + escapeAllStrings(document.metadata) + finalDocs.push(document) + } } return super.init(nodeData, _, options, flattenDocs) diff --git a/packages/components/nodes/vectorstores/Singlestore_Upsert/Singlestore_Upsert.ts b/packages/components/nodes/vectorstores/Singlestore_Upsert/Singlestore_Upsert.ts index 9889a154..d8edc8d4 100644 --- a/packages/components/nodes/vectorstores/Singlestore_Upsert/Singlestore_Upsert.ts +++ b/packages/components/nodes/vectorstores/Singlestore_Upsert/Singlestore_Upsert.ts @@ -140,7 +140,9 @@ class SingleStoreUpsert_VectorStores implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + if (flattenDocs[i] && flattenDocs[i].pageContent) { + finalDocs.push(new Document(flattenDocs[i])) + } } let vectorStore: SingleStoreVectorStore diff --git a/packages/components/nodes/vectorstores/Vectara/Vectara_Upsert.ts b/packages/components/nodes/vectorstores/Vectara/Vectara_Upsert.ts index 3e035a51..376668de 100644 --- a/packages/components/nodes/vectorstores/Vectara/Vectara_Upsert.ts +++ b/packages/components/nodes/vectorstores/Vectara/Vectara_Upsert.ts @@ -132,7 +132,9 @@ class VectaraUpsert_VectorStores implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + if (flattenDocs[i] && flattenDocs[i].pageContent) { + finalDocs.push(new Document(flattenDocs[i])) + } } const vectorStore = await VectaraStore.fromDocuments(finalDocs, embeddings, vectaraArgs) diff --git a/packages/components/nodes/vectorstores/Weaviate_Upsert/Weaviate_Upsert.ts b/packages/components/nodes/vectorstores/Weaviate_Upsert/Weaviate_Upsert.ts index a2f82831..0b7f2393 100644 --- a/packages/components/nodes/vectorstores/Weaviate_Upsert/Weaviate_Upsert.ts +++ b/packages/components/nodes/vectorstores/Weaviate_Upsert/Weaviate_Upsert.ts @@ -143,7 +143,9 @@ class WeaviateUpsert_VectorStores implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + if (flattenDocs[i] && flattenDocs[i].pageContent) { + finalDocs.push(new Document(flattenDocs[i])) + } } const obj: WeaviateLibArgs = { diff --git a/packages/components/nodes/vectorstores/Zep/Zep_Upsert.ts b/packages/components/nodes/vectorstores/Zep/Zep_Upsert.ts index 0f976d2b..915513b9 100644 --- a/packages/components/nodes/vectorstores/Zep/Zep_Upsert.ts +++ b/packages/components/nodes/vectorstores/Zep/Zep_Upsert.ts @@ -106,7 +106,9 @@ class Zep_Upsert_VectorStores implements INode { const flattenDocs = docs && docs.length ? flatten(docs) : [] const finalDocs = [] for (let i = 0; i < flattenDocs.length; i += 1) { - finalDocs.push(new Document(flattenDocs[i])) + if (flattenDocs[i] && flattenDocs[i].pageContent) { + finalDocs.push(new Document(flattenDocs[i])) + } } const zepConfig: IZepConfig = { From 689612b0d6f79fcc72539453da697dd65877f124 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 2 Nov 2023 19:46:52 +0000 Subject: [PATCH 33/35] add query to vec2doc --- .../VectorStoreToDocument.ts | 13 +- .../Prompt Chaining with VectorStore.json | 467 +++++++++--------- packages/ui/src/ui-component/input/Input.js | 76 ++- .../ui/src/views/canvas/NodeInputHandler.js | 3 + 4 files changed, 330 insertions(+), 229 deletions(-) diff --git a/packages/components/nodes/documentloaders/VectorStoreToDocument/VectorStoreToDocument.ts b/packages/components/nodes/documentloaders/VectorStoreToDocument/VectorStoreToDocument.ts index b3f320ce..becd0ac6 100644 --- a/packages/components/nodes/documentloaders/VectorStoreToDocument/VectorStoreToDocument.ts +++ b/packages/components/nodes/documentloaders/VectorStoreToDocument/VectorStoreToDocument.ts @@ -17,7 +17,7 @@ class VectorStoreToDocument_DocumentLoaders implements INode { constructor() { this.label = 'VectorStore To Document' this.name = 'vectorStoreToDocument' - this.version = 1.0 + this.version = 2.0 this.type = 'Document' this.icon = 'vectorretriever.svg' this.category = 'Document Loaders' @@ -29,6 +29,14 @@ class VectorStoreToDocument_DocumentLoaders implements INode { name: 'vectorStore', type: 'VectorStore' }, + { + label: 'Query', + name: 'query', + type: 'string', + description: 'Query to retrieve documents from vector database. If not specified, user question will be used', + optional: true, + acceptVariable: true + }, { label: 'Minimum Score (%)', name: 'minScore', @@ -56,11 +64,12 @@ class VectorStoreToDocument_DocumentLoaders implements INode { async init(nodeData: INodeData, input: string): Promise { const vectorStore = nodeData.inputs?.vectorStore as VectorStore const minScore = nodeData.inputs?.minScore as number + const query = nodeData.inputs?.query as string const output = nodeData.outputs?.output as string const topK = (vectorStore as any)?.k ?? 4 - const docs = await vectorStore.similaritySearchWithScore(input, topK) + const docs = await vectorStore.similaritySearchWithScore(query ?? input, topK) // eslint-disable-next-line no-console console.log('\x1b[94m\x1b[1m\n*****VectorStore Documents*****\n\x1b[0m\x1b[0m') // eslint-disable-next-line no-console diff --git a/packages/server/marketplaces/chatflows/Prompt Chaining with VectorStore.json b/packages/server/marketplaces/chatflows/Prompt Chaining with VectorStore.json index 2af61190..0f270c7b 100644 --- a/packages/server/marketplaces/chatflows/Prompt Chaining with VectorStore.json +++ b/packages/server/marketplaces/chatflows/Prompt Chaining with VectorStore.json @@ -3,120 +3,11 @@ "nodes": [ { "width": 300, - "height": 503, - "id": "pineconeExistingIndex_0", - "position": { - "x": 1062.7418678410986, - "y": -109.27680365777141 - }, - "type": "customNode", - "data": { - "id": "pineconeExistingIndex_0", - "label": "Pinecone Load Existing Index", - "version": 1, - "name": "pineconeExistingIndex", - "type": "Pinecone", - "baseClasses": ["Pinecone", "VectorStoreRetriever", "BaseRetriever"], - "category": "Vector Stores", - "description": "Load existing index from Pinecone (i.e: Document has been upserted)", - "inputParams": [ - { - "label": "Connect Credential", - "name": "credential", - "type": "credential", - "credentialNames": ["pineconeApi"], - "id": "pineconeExistingIndex_0-input-credential-credential" - }, - { - "label": "Pinecone Index", - "name": "pineconeIndex", - "type": "string", - "id": "pineconeExistingIndex_0-input-pineconeIndex-string" - }, - { - "label": "Pinecone Namespace", - "name": "pineconeNamespace", - "type": "string", - "placeholder": "my-first-namespace", - "additionalParams": true, - "optional": true, - "id": "pineconeExistingIndex_0-input-pineconeNamespace-string" - }, - { - "label": "Pinecone Metadata Filter", - "name": "pineconeMetadataFilter", - "type": "json", - "optional": true, - "additionalParams": true, - "id": "pineconeExistingIndex_0-input-pineconeMetadataFilter-json" - }, - { - "label": "Top K", - "name": "topK", - "description": "Number of top results to fetch. Default to 4", - "placeholder": "4", - "type": "number", - "additionalParams": true, - "optional": true, - "id": "pineconeExistingIndex_0-input-topK-number" - } - ], - "inputAnchors": [ - { - "label": "Embeddings", - "name": "embeddings", - "type": "Embeddings", - "id": "pineconeExistingIndex_0-input-embeddings-Embeddings" - } - ], - "inputs": { - "embeddings": "{{openAIEmbeddings_0.data.instance}}", - "pineconeIndex": "newindex", - "pineconeNamespace": "", - "pineconeMetadataFilter": "{}", - "topK": "" - }, - "outputAnchors": [ - { - "name": "output", - "label": "Output", - "type": "options", - "options": [ - { - "id": "pineconeExistingIndex_0-output-retriever-Pinecone|VectorStoreRetriever|BaseRetriever", - "name": "retriever", - "label": "Pinecone Retriever", - "type": "Pinecone | VectorStoreRetriever | BaseRetriever" - }, - { - "id": "pineconeExistingIndex_0-output-vectorStore-Pinecone|VectorStore", - "name": "vectorStore", - "label": "Pinecone Vector Store", - "type": "Pinecone | VectorStore" - } - ], - "default": "retriever" - } - ], - "outputs": { - "output": "vectorStore" - }, - "selected": false - }, - "selected": false, - "positionAbsolute": { - "x": 1062.7418678410986, - "y": -109.27680365777141 - }, - "dragging": false - }, - { - "width": 300, - "height": 327, + "height": 329, "id": "openAIEmbeddings_0", "position": { - "x": 711.3971966563331, - "y": 7.7184225021727 + "x": 1198.6643452533754, + "y": -584.4233173804803 }, "type": "customNode", "data": { @@ -189,18 +80,18 @@ }, "selected": false, "positionAbsolute": { - "x": 711.3971966563331, - "y": 7.7184225021727 + "x": 1198.6643452533754, + "y": -584.4233173804803 }, "dragging": false }, { "width": 300, - "height": 473, + "height": 475, "id": "promptTemplate_0", "position": { - "x": 348.2881107399286, - "y": -97.74510214137423 + "x": 354.2706973608643, + "y": -122.34815000085804 }, "type": "customNode", "data": { @@ -249,18 +140,18 @@ }, "selected": false, "positionAbsolute": { - "x": 348.2881107399286, - "y": -97.74510214137423 + "x": 354.2706973608643, + "y": -122.34815000085804 }, "dragging": false }, { "width": 300, - "height": 522, + "height": 574, "id": "chatOpenAI_0", "position": { - "x": 335.7621848973805, - "y": -721.7411273245009 + "x": 353.5672832154869, + "y": -730.6436764835541 }, "type": "customNode", "data": { @@ -396,7 +287,7 @@ ], "inputs": { "modelName": "gpt-3.5-turbo-16k", - "temperature": 0.9, + "temperature": "0", "maxTokens": "", "topP": "", "frequencyPenalty": "", @@ -418,17 +309,17 @@ "selected": false, "dragging": false, "positionAbsolute": { - "x": 335.7621848973805, - "y": -721.7411273245009 + "x": 353.5672832154869, + "y": -730.6436764835541 } }, { "width": 300, - "height": 522, + "height": 574, "id": "chatOpenAI_1", "position": { - "x": 1765.2801848172305, - "y": -737.9261054149061 + "x": 2281.9246645710673, + "y": -778.8379360672121 }, "type": "customNode", "data": { @@ -564,7 +455,7 @@ ], "inputs": { "modelName": "gpt-3.5-turbo-16k", - "temperature": 0.9, + "temperature": "0", "maxTokens": "", "topP": "", "frequencyPenalty": "", @@ -586,36 +477,153 @@ "selected": false, "dragging": false, "positionAbsolute": { - "x": 1765.2801848172305, - "y": -737.9261054149061 + "x": 2281.9246645710673, + "y": -778.8379360672121 } }, { "width": 300, - "height": 473, - "id": "promptTemplate_1", + "height": 505, + "id": "pineconeExistingIndex_0", "position": { - "x": 1773.720934090435, - "y": -116.71323227575395 + "x": 1544.4998097474581, + "y": -628.8477510577202 }, "type": "customNode", "data": { - "id": "promptTemplate_1", - "label": "Prompt Template", + "id": "pineconeExistingIndex_0", + "label": "Pinecone Load Existing Index", "version": 1, - "name": "promptTemplate", - "type": "PromptTemplate", - "baseClasses": ["PromptTemplate", "BaseStringPromptTemplate", "BasePromptTemplate", "Runnable"], - "category": "Prompts", - "description": "Schema to represent a basic prompt for an LLM", + "name": "pineconeExistingIndex", + "type": "Pinecone", + "baseClasses": ["Pinecone", "VectorStoreRetriever", "BaseRetriever"], + "category": "Vector Stores", + "description": "Load existing index from Pinecone (i.e: Document has been upserted)", "inputParams": [ { - "label": "Template", - "name": "template", + "label": "Connect Credential", + "name": "credential", + "type": "credential", + "credentialNames": ["pineconeApi"], + "id": "pineconeExistingIndex_0-input-credential-credential" + }, + { + "label": "Pinecone Index", + "name": "pineconeIndex", + "type": "string", + "id": "pineconeExistingIndex_0-input-pineconeIndex-string" + }, + { + "label": "Pinecone Namespace", + "name": "pineconeNamespace", + "type": "string", + "placeholder": "my-first-namespace", + "additionalParams": true, + "optional": true, + "id": "pineconeExistingIndex_0-input-pineconeNamespace-string" + }, + { + "label": "Pinecone Metadata Filter", + "name": "pineconeMetadataFilter", + "type": "json", + "optional": true, + "additionalParams": true, + "id": "pineconeExistingIndex_0-input-pineconeMetadataFilter-json" + }, + { + "label": "Top K", + "name": "topK", + "description": "Number of top results to fetch. Default to 4", + "placeholder": "4", + "type": "number", + "additionalParams": true, + "optional": true, + "id": "pineconeExistingIndex_0-input-topK-number" + } + ], + "inputAnchors": [ + { + "label": "Embeddings", + "name": "embeddings", + "type": "Embeddings", + "id": "pineconeExistingIndex_0-input-embeddings-Embeddings" + } + ], + "inputs": { + "embeddings": "{{openAIEmbeddings_0.data.instance}}", + "pineconeIndex": "", + "pineconeNamespace": "", + "pineconeMetadataFilter": "", + "topK": "" + }, + "outputAnchors": [ + { + "name": "output", + "label": "Output", + "type": "options", + "options": [ + { + "id": "pineconeExistingIndex_0-output-retriever-Pinecone|VectorStoreRetriever|BaseRetriever", + "name": "retriever", + "label": "Pinecone Retriever", + "type": "Pinecone | VectorStoreRetriever | BaseRetriever" + }, + { + "id": "pineconeExistingIndex_0-output-vectorStore-Pinecone|VectorStore", + "name": "vectorStore", + "label": "Pinecone Vector Store", + "type": "Pinecone | VectorStore" + } + ], + "default": "retriever" + } + ], + "outputs": { + "output": "vectorStore" + }, + "selected": false + }, + "selected": false, + "positionAbsolute": { + "x": 1544.4998097474581, + "y": -628.8477510577202 + }, + "dragging": false + }, + { + "width": 300, + "height": 652, + "id": "chatPromptTemplate_0", + "position": { + "x": 2290.8365353040026, + "y": -168.49082887954518 + }, + "type": "customNode", + "data": { + "id": "chatPromptTemplate_0", + "label": "Chat Prompt Template", + "version": 1, + "name": "chatPromptTemplate", + "type": "ChatPromptTemplate", + "baseClasses": ["ChatPromptTemplate", "BaseChatPromptTemplate", "BasePromptTemplate", "Runnable"], + "category": "Prompts", + "description": "Schema to represent a chat prompt", + "inputParams": [ + { + "label": "System Message", + "name": "systemMessagePrompt", "type": "string", "rows": 4, - "placeholder": "What is a good name for a company that makes {product}?", - "id": "promptTemplate_1-input-template-string" + "placeholder": "You are a helpful assistant that translates {input_language} to {output_language}.", + "id": "chatPromptTemplate_0-input-systemMessagePrompt-string" + }, + { + "label": "Human Message", + "name": "humanMessagePrompt", + "type": "string", + "rows": 4, + "placeholder": "{text}", + "id": "chatPromptTemplate_0-input-humanMessagePrompt-string" }, { "label": "Format Prompt Values", @@ -624,20 +632,21 @@ "optional": true, "acceptVariable": true, "list": true, - "id": "promptTemplate_1-input-promptValues-json" + "id": "chatPromptTemplate_0-input-promptValues-json" } ], "inputAnchors": [], "inputs": { - "template": "Use the following pieces of context to answer the question at the end.\n\n{context}\n\nQuestion: {question}\nHelpful Answer:", - "promptValues": "{\"context\":\"{{vectorStoreToDocument_0.data.instance}}\",\"question\":\"{{llmChain_0.data.instance}}\"}" + "systemMessagePrompt": "Using the provided context, answer the user's question to the best of your ability using the resources provided. If there is nothing in the context relevant to the question at hand, just say \"Hmm, I'm not sure.\" Don't try to make up an answer.\n\nAnything between the following \\`context\\` html blocks is retrieved from a knowledge bank, not part of the conversation with the user.\n\n\n {context}\n\n\nREMEMBER: If there is no relevant information within the context, just say \"Hmm, I'm not sure.\" Don't try to make up an answer. Anything between the preceding 'context' html blocks is retrieved from a knowledge bank, not part of the conversation with the user.", + "humanMessagePrompt": "{text}", + "promptValues": "{\"context\":\"{{vectorStoreToDocument_0.data.instance}}\",\"text\":\"{{question}}\"}" }, "outputAnchors": [ { - "id": "promptTemplate_1-output-promptTemplate-PromptTemplate|BaseStringPromptTemplate|BasePromptTemplate|Runnable", - "name": "promptTemplate", - "label": "PromptTemplate", - "type": "PromptTemplate | BaseStringPromptTemplate | BasePromptTemplate | Runnable" + "id": "chatPromptTemplate_0-output-chatPromptTemplate-ChatPromptTemplate|BaseChatPromptTemplate|BasePromptTemplate|Runnable", + "name": "chatPromptTemplate", + "label": "ChatPromptTemplate", + "type": "ChatPromptTemplate | BaseChatPromptTemplate | BasePromptTemplate | Runnable" } ], "outputs": {}, @@ -645,18 +654,18 @@ }, "selected": false, "positionAbsolute": { - "x": 1773.720934090435, - "y": -116.71323227575395 + "x": 2290.8365353040026, + "y": -168.49082887954518 }, "dragging": false }, { "width": 300, - "height": 404, + "height": 405, "id": "llmChain_0", "position": { - "x": 756.1670091985342, - "y": -592.5151355056942 + "x": 747.1299875516488, + "y": -267.01184813798244 }, "type": "customNode", "data": { @@ -695,7 +704,7 @@ "inputs": { "model": "{{chatOpenAI_0.data.instance}}", "prompt": "{{promptTemplate_0.data.instance}}", - "chainName": "QuestionChain" + "chainName": "RephraseQuestion" }, "outputAnchors": [ { @@ -726,18 +735,18 @@ }, "selected": false, "positionAbsolute": { - "x": 756.1670091985342, - "y": -592.5151355056942 + "x": 747.1299875516488, + "y": -267.01184813798244 }, "dragging": false }, { "width": 300, - "height": 404, + "height": 405, "id": "llmChain_1", "position": { - "x": 2200.1274896215496, - "y": -144.29167974642334 + "x": 2694.8707655351186, + "y": -308.59150355411236 }, "type": "customNode", "data": { @@ -775,8 +784,8 @@ ], "inputs": { "model": "{{chatOpenAI_1.data.instance}}", - "prompt": "{{promptTemplate_1.data.instance}}", - "chainName": "" + "prompt": "{{chatPromptTemplate_0.data.instance}}", + "chainName": "FinalResponse" }, "outputAnchors": [ { @@ -807,30 +816,39 @@ }, "selected": false, "positionAbsolute": { - "x": 2200.1274896215496, - "y": -144.29167974642334 + "x": 2694.8707655351186, + "y": -308.59150355411236 }, "dragging": false }, { "width": 300, - "height": 353, + "height": 454, "id": "vectorStoreToDocument_0", "position": { - "x": 1407.7038120189868, - "y": -26.16468811205081 + "x": 1906.6871314089658, + "y": -157.0046189166955 }, "type": "customNode", "data": { "id": "vectorStoreToDocument_0", "label": "VectorStore To Document", - "version": 1, + "version": 2, "name": "vectorStoreToDocument", "type": "Document", "baseClasses": ["Document"], "category": "Document Loaders", "description": "Search documents with scores from vector store", "inputParams": [ + { + "label": "Query", + "name": "query", + "type": "string", + "description": "Query to retrieve documents from vector database. If not specified, user question will be used", + "optional": true, + "acceptVariable": true, + "id": "vectorStoreToDocument_0-input-query-string" + }, { "label": "Minimum Score (%)", "name": "minScore", @@ -852,6 +870,7 @@ ], "inputs": { "vectorStore": "{{pineconeExistingIndex_0.data.instance}}", + "query": "{{llmChain_0.data.instance}}", "minScore": "" }, "outputAnchors": [ @@ -883,8 +902,8 @@ }, "selected": false, "positionAbsolute": { - "x": 1407.7038120189868, - "y": -26.16468811205081 + "x": 1906.6871314089658, + "y": -157.0046189166955 }, "dragging": false } @@ -901,6 +920,50 @@ "label": "" } }, + { + "source": "promptTemplate_0", + "sourceHandle": "promptTemplate_0-output-promptTemplate-PromptTemplate|BaseStringPromptTemplate|BasePromptTemplate|Runnable", + "target": "llmChain_0", + "targetHandle": "llmChain_0-input-prompt-BasePromptTemplate", + "type": "buttonedge", + "id": "promptTemplate_0-promptTemplate_0-output-promptTemplate-PromptTemplate|BaseStringPromptTemplate|BasePromptTemplate|Runnable-llmChain_0-llmChain_0-input-prompt-BasePromptTemplate", + "data": { + "label": "" + } + }, + { + "source": "chatOpenAI_0", + "sourceHandle": "chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable", + "target": "llmChain_0", + "targetHandle": "llmChain_0-input-model-BaseLanguageModel", + "type": "buttonedge", + "id": "chatOpenAI_0-chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable-llmChain_0-llmChain_0-input-model-BaseLanguageModel", + "data": { + "label": "" + } + }, + { + "source": "chatPromptTemplate_0", + "sourceHandle": "chatPromptTemplate_0-output-chatPromptTemplate-ChatPromptTemplate|BaseChatPromptTemplate|BasePromptTemplate|Runnable", + "target": "llmChain_1", + "targetHandle": "llmChain_1-input-prompt-BasePromptTemplate", + "type": "buttonedge", + "id": "chatPromptTemplate_0-chatPromptTemplate_0-output-chatPromptTemplate-ChatPromptTemplate|BaseChatPromptTemplate|BasePromptTemplate|Runnable-llmChain_1-llmChain_1-input-prompt-BasePromptTemplate", + "data": { + "label": "" + } + }, + { + "source": "chatOpenAI_1", + "sourceHandle": "chatOpenAI_1-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable", + "target": "llmChain_1", + "targetHandle": "llmChain_1-input-model-BaseLanguageModel", + "type": "buttonedge", + "id": "chatOpenAI_1-chatOpenAI_1-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable-llmChain_1-llmChain_1-input-model-BaseLanguageModel", + "data": { + "label": "" + } + }, { "source": "pineconeExistingIndex_0", "sourceHandle": "pineconeExistingIndex_0-output-vectorStore-Pinecone|VectorStore", @@ -915,32 +978,10 @@ { "source": "vectorStoreToDocument_0", "sourceHandle": "vectorStoreToDocument_0-output-text-string|json", - "target": "promptTemplate_1", - "targetHandle": "promptTemplate_1-input-promptValues-json", + "target": "chatPromptTemplate_0", + "targetHandle": "chatPromptTemplate_0-input-promptValues-json", "type": "buttonedge", - "id": "vectorStoreToDocument_0-vectorStoreToDocument_0-output-text-string|json-promptTemplate_1-promptTemplate_1-input-promptValues-json", - "data": { - "label": "" - } - }, - { - "source": "chatOpenAI_0", - "sourceHandle": "chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable", - "target": "llmChain_0", - "targetHandle": "llmChain_0-input-model-BaseLanguageModel", - "type": "buttonedge", - "id": "chatOpenAI_0-chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable-llmChain_0-llmChain_0-input-model-BaseLanguageModel", - "data": { - "label": "" - } - }, - { - "source": "promptTemplate_0", - "sourceHandle": "promptTemplate_0-output-promptTemplate-PromptTemplate|BaseStringPromptTemplate|BasePromptTemplate|Runnable", - "target": "llmChain_0", - "targetHandle": "llmChain_0-input-prompt-BasePromptTemplate", - "type": "buttonedge", - "id": "promptTemplate_0-promptTemplate_0-output-promptTemplate-PromptTemplate|BaseStringPromptTemplate|BasePromptTemplate|Runnable-llmChain_0-llmChain_0-input-prompt-BasePromptTemplate", + "id": "vectorStoreToDocument_0-vectorStoreToDocument_0-output-text-string|json-chatPromptTemplate_0-chatPromptTemplate_0-input-promptValues-json", "data": { "label": "" } @@ -948,32 +989,10 @@ { "source": "llmChain_0", "sourceHandle": "llmChain_0-output-outputPrediction-string|json", - "target": "promptTemplate_1", - "targetHandle": "promptTemplate_1-input-promptValues-json", + "target": "vectorStoreToDocument_0", + "targetHandle": "vectorStoreToDocument_0-input-query-string", "type": "buttonedge", - "id": "llmChain_0-llmChain_0-output-outputPrediction-string|json-promptTemplate_1-promptTemplate_1-input-promptValues-json", - "data": { - "label": "" - } - }, - { - "source": "chatOpenAI_1", - "sourceHandle": "chatOpenAI_1-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable", - "target": "llmChain_1", - "targetHandle": "llmChain_1-input-model-BaseLanguageModel", - "type": "buttonedge", - "id": "chatOpenAI_1-chatOpenAI_1-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel|Runnable-llmChain_1-llmChain_1-input-model-BaseLanguageModel", - "data": { - "label": "" - } - }, - { - "source": "promptTemplate_1", - "sourceHandle": "promptTemplate_1-output-promptTemplate-PromptTemplate|BaseStringPromptTemplate|BasePromptTemplate|Runnable", - "target": "llmChain_1", - "targetHandle": "llmChain_1-input-prompt-BasePromptTemplate", - "type": "buttonedge", - "id": "promptTemplate_1-promptTemplate_1-output-promptTemplate-PromptTemplate|BaseStringPromptTemplate|BasePromptTemplate|Runnable-llmChain_1-llmChain_1-input-prompt-BasePromptTemplate", + "id": "llmChain_0-llmChain_0-output-outputPrediction-string|json-vectorStoreToDocument_0-vectorStoreToDocument_0-input-query-string", "data": { "label": "" } diff --git a/packages/ui/src/ui-component/input/Input.js b/packages/ui/src/ui-component/input/Input.js index 95bf968d..6993847b 100644 --- a/packages/ui/src/ui-component/input/Input.js +++ b/packages/ui/src/ui-component/input/Input.js @@ -1,10 +1,39 @@ -import { useState } from 'react' +import { useState, useEffect, useRef } from 'react' import PropTypes from 'prop-types' -import { FormControl, OutlinedInput } from '@mui/material' +import { FormControl, OutlinedInput, Popover } from '@mui/material' import ExpandTextDialog from 'ui-component/dialog/ExpandTextDialog' +import SelectVariable from 'ui-component/json/SelectVariable' +import { getAvailableNodesForVariable } from 'utils/genericHelper' -export const Input = ({ inputParam, value, onChange, disabled = false, showDialog, dialogProps, onDialogCancel, onDialogConfirm }) => { +export const Input = ({ + inputParam, + value, + nodes, + edges, + nodeId, + onChange, + disabled = false, + showDialog, + dialogProps, + onDialogCancel, + onDialogConfirm +}) => { const [myValue, setMyValue] = useState(value ?? '') + const [anchorEl, setAnchorEl] = useState(null) + const [availableNodesForVariable, setAvailableNodesForVariable] = useState([]) + const ref = useRef(null) + + const openPopOver = Boolean(anchorEl) + + const handleClosePopOver = () => { + setAnchorEl(null) + } + + const setNewVal = (val) => { + const newVal = myValue + val.substring(2) + onChange(newVal) + setMyValue(newVal) + } const getInputType = (type) => { switch (type) { @@ -19,6 +48,19 @@ export const Input = ({ inputParam, value, onChange, disabled = false, showDialo } } + useEffect(() => { + if (!disabled && nodes && edges && nodeId && inputParam) { + const nodesForVariable = inputParam?.acceptVariable ? getAvailableNodesForVariable(nodes, edges, nodeId, inputParam.id) : [] + setAvailableNodesForVariable(nodesForVariable) + } + }, [disabled, inputParam, nodes, edges, nodeId]) + + useEffect(() => { + if (typeof myValue === 'string' && myValue && myValue.endsWith('{{')) { + setAnchorEl(ref.current) + } + }, [myValue]) + return ( <> @@ -55,6 +97,31 @@ export const Input = ({ inputParam, value, onChange, disabled = false, showDialo }} > )} +
+ {inputParam?.acceptVariable && ( + + { + setNewVal(val) + handleClosePopOver() + }} + /> + + )} ) } @@ -66,6 +133,9 @@ Input.propTypes = { disabled: PropTypes.bool, showDialog: PropTypes.bool, dialogProps: PropTypes.object, + nodes: PropTypes.array, + edges: PropTypes.array, + nodeId: PropTypes.string, onDialogCancel: PropTypes.func, onDialogConfirm: PropTypes.func } diff --git a/packages/ui/src/views/canvas/NodeInputHandler.js b/packages/ui/src/views/canvas/NodeInputHandler.js index 3a13a3b5..028c0d36 100644 --- a/packages/ui/src/views/canvas/NodeInputHandler.js +++ b/packages/ui/src/views/canvas/NodeInputHandler.js @@ -265,6 +265,9 @@ const NodeInputHandler = ({ inputAnchor, inputParam, data, disabled = false, isA inputParam={inputParam} onChange={(newValue) => (data.inputs[inputParam.name] = newValue)} value={data.inputs[inputParam.name] ?? inputParam.default ?? ''} + nodes={inputParam?.acceptVariable && reactFlowInstance ? reactFlowInstance.getNodes() : []} + edges={inputParam?.acceptVariable && reactFlowInstance ? reactFlowInstance.getEdges() : []} + nodeId={data.id} showDialog={showExpandDialog} dialogProps={expandDialogProps} onDialogCancel={() => setShowExpandDialog(false)} From a240333e794b950c1e7c98d2a48be631c885fc67 Mon Sep 17 00:00:00 2001 From: SebastjanPrachovskij Date: Thu, 2 Nov 2023 22:17:36 +0200 Subject: [PATCH 34/35] Run yarn lint-fix --- .../credentials/SearchApi.credential.ts | 2 +- .../documentloaders/SearchApi/SearchAPI.ts | 6 +-- .../chatflows/Chat with a Podcast.json | 53 ++++--------------- 3 files changed, 14 insertions(+), 47 deletions(-) diff --git a/packages/components/credentials/SearchApi.credential.ts b/packages/components/credentials/SearchApi.credential.ts index 96d3dc01..f23577a1 100644 --- a/packages/components/credentials/SearchApi.credential.ts +++ b/packages/components/credentials/SearchApi.credential.ts @@ -12,7 +12,7 @@ class SearchApi implements INodeCredential { this.name = 'searchApi' this.version = 1.0 this.description = - 'Sign in to SearchApi to obtain a free API key from the dashboard.' + 'Sign in to SearchApi to obtain a free API key from the dashboard.' this.inputs = [ { label: 'SearchApi API Key', diff --git a/packages/components/nodes/documentloaders/SearchApi/SearchAPI.ts b/packages/components/nodes/documentloaders/SearchApi/SearchAPI.ts index 9d14dc5a..b7f0b0b5 100644 --- a/packages/components/nodes/documentloaders/SearchApi/SearchAPI.ts +++ b/packages/components/nodes/documentloaders/SearchApi/SearchAPI.ts @@ -74,17 +74,17 @@ class SearchAPI_DocumentLoaders implements INode { const searchApiKey = getCredentialParam('searchApiKey', credentialData, nodeData) // Check and parse custom parameters (should be JSON or object) - const parsedParameters = typeof customParameters === 'object' ? customParameters : JSON.parse(customParameters || '{}'); + const parsedParameters = typeof customParameters === 'object' ? customParameters : JSON.parse(customParameters || '{}') // Prepare the configuration for the SearchApiLoader const loaderConfig = { q: query, apiKey: searchApiKey, ...parsedParameters - }; + } // Initialize the loader with the given configuration - const loader = new SearchApiLoader(loaderConfig); + const loader = new SearchApiLoader(loaderConfig) // Fetch documents, split if a text splitter is provided const docs = textSplitter ? await loader.loadAndSplit() : await loader.load() diff --git a/packages/server/marketplaces/chatflows/Chat with a Podcast.json b/packages/server/marketplaces/chatflows/Chat with a Podcast.json index e91bf50f..2a9e05b5 100644 --- a/packages/server/marketplaces/chatflows/Chat with a Podcast.json +++ b/packages/server/marketplaces/chatflows/Chat with a Podcast.json @@ -16,11 +16,7 @@ "version": 1, "name": "conversationalRetrievalQAChain", "type": "ConversationalRetrievalQAChain", - "baseClasses": [ - "ConversationalRetrievalQAChain", - "BaseChain", - "Runnable" - ], + "baseClasses": ["ConversationalRetrievalQAChain", "BaseChain", "Runnable"], "category": "Chains", "description": "Document QA - built on RetrievalQAChain to provide a chat history component", "inputParams": [ @@ -130,11 +126,7 @@ "version": 1, "name": "memoryVectorStore", "type": "Memory", - "baseClasses": [ - "Memory", - "VectorStoreRetriever", - "BaseRetriever" - ], + "baseClasses": ["Memory", "VectorStoreRetriever", "BaseRetriever"], "category": "Vector Stores", "description": "In-memory vectorstore that stores embeddings and does an exact, linear search for the most similar embeddings.", "inputParams": [ @@ -164,11 +156,7 @@ } ], "inputs": { - "document": [ - "{{searchApi_0.data.instance}}", - "{{searchApi_0.data.instance}}", - "{{searchApi_0.data.instance}}" - ], + "document": ["{{searchApi_0.data.instance}}", "{{searchApi_0.data.instance}}", "{{searchApi_0.data.instance}}"], "embeddings": "{{openAIEmbeddings_0.data.instance}}", "topK": "" }, @@ -221,12 +209,7 @@ "version": 2, "name": "chatOpenAI", "type": "ChatOpenAI", - "baseClasses": [ - "ChatOpenAI", - "BaseChatModel", - "BaseLanguageModel", - "Runnable" - ], + "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel", "Runnable"], "category": "Chat Models", "description": "Wrapper around OpenAI large language models that use the Chat endpoint", "inputParams": [ @@ -234,9 +217,7 @@ "label": "Connect Credential", "name": "credential", "type": "credential", - "credentialNames": [ - "openAIApi" - ], + "credentialNames": ["openAIApi"], "id": "chatOpenAI_0-input-credential-credential" }, { @@ -406,12 +387,7 @@ "version": 1, "name": "characterTextSplitter", "type": "CharacterTextSplitter", - "baseClasses": [ - "CharacterTextSplitter", - "TextSplitter", - "BaseDocumentTransformer", - "Runnable" - ], + "baseClasses": ["CharacterTextSplitter", "TextSplitter", "BaseDocumentTransformer", "Runnable"], "category": "Text Splitters", "description": "splits only on one type of character (defaults to \"\\n\\n\").", "inputParams": [ @@ -479,10 +455,7 @@ "version": 1, "name": "openAIEmbeddings", "type": "OpenAIEmbeddings", - "baseClasses": [ - "OpenAIEmbeddings", - "Embeddings" - ], + "baseClasses": ["OpenAIEmbeddings", "Embeddings"], "category": "Embeddings", "description": "OpenAI API to generate embeddings for a given text", "inputParams": [ @@ -490,9 +463,7 @@ "label": "Connect Credential", "name": "credential", "type": "credential", - "credentialNames": [ - "openAIApi" - ], + "credentialNames": ["openAIApi"], "id": "openAIEmbeddings_0-input-credential-credential" }, { @@ -568,9 +539,7 @@ "version": 1, "name": "searchApi", "type": "Document", - "baseClasses": [ - "Document" - ], + "baseClasses": ["Document"], "category": "Document Loaders", "description": "Load data from real-time search results", "inputParams": [ @@ -579,9 +548,7 @@ "name": "credential", "type": "credential", "optional": false, - "credentialNames": [ - "searchApi" - ], + "credentialNames": ["searchApi"], "id": "searchApi_0-input-credential-credential" }, { From 4f6cab47f82be2cf5ca8e20cfee4e921e1b102e7 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 3 Nov 2023 01:33:08 +0000 Subject: [PATCH 35/35] code cleanup --- packages/server/src/index.ts | 190 +++-- packages/server/src/utils/index.ts | 45 +- packages/ui/package.json | 2 +- packages/ui/src/api/chatmessage.js | 11 +- .../ui/src/assets/images/message_empty.svg | 1 + .../MainLayout/Header/ProfileSection/index.js | 2 +- packages/ui/src/menu-items/settings.js | 11 +- packages/ui/src/themes/palette.js | 3 + .../ui-component/dialog/ViewMessagesDialog.js | 695 ++++++++++++++++++ .../ui-component/dropdown/MultiDropdown.js | 5 +- packages/ui/src/utils/genericHelper.js | 17 + packages/ui/src/views/canvas/CanvasHeader.js | 16 +- .../ui/src/views/chatmessage/ChatMessage.css | 10 + .../ui/src/views/chatmessage/ChatMessage.js | 19 +- .../ui/src/views/chatmessage/ChatPopUp.js | 2 +- packages/ui/src/views/tools/ToolDialog.js | 2 +- 16 files changed, 942 insertions(+), 89 deletions(-) create mode 100644 packages/ui/src/assets/images/message_empty.svg create mode 100644 packages/ui/src/ui-component/dialog/ViewMessagesDialog.js diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index 98ed89d1..ad82675b 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -9,7 +9,7 @@ import { Server } from 'socket.io' import logger from './utils/logger' import { expressRequestLogger } from './utils/logger' import { v4 as uuidv4 } from 'uuid' - +import { Between, IsNull, FindOptionsWhere } from 'typeorm' import { IChatFlow, IncomingInput, @@ -18,7 +18,9 @@ import { INodeData, IDatabaseExport, ICredentialReturnResponse, - chatType + chatType, + IChatMessage, + IReactFlowEdge } from './Interface' import { getNodeModulesPackagePath, @@ -42,10 +44,11 @@ import { getApiKey, transformToCredentialEntity, decryptCredentialData, - clearSessionMemory, + clearAllSessionMemory, replaceInputsWithConfig, getEncryptionKey, - checkMemorySessionId + checkMemorySessionId, + clearSessionMemoryFromViewMessageDialog } from './utils' import { cloneDeep, omit } from 'lodash' import { getDataSource } from './DataSource' @@ -397,7 +400,39 @@ export class App { // Get all chatmessages from chatflowid this.app.get('/api/v1/chatmessage/:id', async (req: Request, res: Response) => { - const chatmessages = await this.getChatMessage(req.params.id, undefined) + const sortOrder = req.query?.order as string | undefined + const chatId = req.query?.chatId as string | undefined + const memoryType = req.query?.memoryType as string | undefined + const sessionId = req.query?.sessionId as string | undefined + const startDate = req.query?.startDate as string | undefined + const endDate = req.query?.endDate as string | undefined + let chatTypeFilter = req.query?.chatType as chatType | undefined + + if (chatTypeFilter) { + try { + const chatTypeFilterArray = JSON.parse(chatTypeFilter) + if (chatTypeFilterArray.includes(chatType.EXTERNAL) && chatTypeFilterArray.includes(chatType.INTERNAL)) { + chatTypeFilter = undefined + } else if (chatTypeFilterArray.includes(chatType.EXTERNAL)) { + chatTypeFilter = chatType.EXTERNAL + } else if (chatTypeFilterArray.includes(chatType.INTERNAL)) { + chatTypeFilter = chatType.INTERNAL + } + } catch (e) { + return res.status(500).send(e) + } + } + + const chatmessages = await this.getChatMessage( + req.params.id, + chatTypeFilter, + sortOrder, + chatId, + memoryType, + sessionId, + startDate, + endDate + ) return res.json(chatmessages) }) @@ -416,27 +451,41 @@ export class App { // Delete all chatmessages from chatId this.app.delete('/api/v1/chatmessage/:id', async (req: Request, res: Response) => { - const chatId = req.params.id - const chatMessage = await this.AppDataSource.getRepository(ChatMessage).findOneBy({ - chatId: chatId - }) - if (!chatMessage) { - res.status(404).send(`chatmessage ${chatId} not found`) - return - } + const chatflowid = req.params.id const chatflow = await this.AppDataSource.getRepository(ChatFlow).findOneBy({ - id: chatMessage.chatflowid + id: chatflowid }) if (!chatflow) { - res.status(404).send(`Chatflow ${chatMessage.chatflowid} not found`) + res.status(404).send(`Chatflow ${chatflowid} not found`) return } + const chatId = (req.query?.chatId as string) ?? (await getChatId(chatflowid)) + const memoryType = req.query?.memoryType as string | undefined + const sessionId = req.query?.sessionId as string | undefined + const chatType = req.query?.chatType as string | undefined + const isClearFromViewMessageDialog = req.query?.isClearFromViewMessageDialog as string | undefined + const flowData = chatflow.flowData const parsedFlowData: IReactFlowObject = JSON.parse(flowData) const nodes = parsedFlowData.nodes - clearSessionMemory(nodes, this.nodesPool.componentNodes, chatId, this.AppDataSource, req.query.sessionId as string) - const results = await this.AppDataSource.getRepository(ChatMessage).delete({ chatId: chatId }) + if (isClearFromViewMessageDialog) + clearSessionMemoryFromViewMessageDialog( + nodes, + this.nodesPool.componentNodes, + chatId, + this.AppDataSource, + sessionId, + memoryType + ) + else clearAllSessionMemory(nodes, this.nodesPool.componentNodes, chatId, this.AppDataSource, sessionId) + + const deleteOptions: FindOptionsWhere = { chatflowid, chatId } + if (memoryType) deleteOptions.memoryType = memoryType + if (sessionId) deleteOptions.sessionId = sessionId + if (chatType) deleteOptions.chatType = chatType + + const results = await this.AppDataSource.getRepository(ChatMessage).delete(deleteOptions) return res.json(results) }) @@ -831,30 +880,51 @@ export class App { /** * Method that get chat messages. - * - * @param chatflowid - - * @param chatType - - * + * @param {string} chatflowid + * @param {chatType} chatType + * @param {string} sortOrder + * @param {string} chatId + * @param {string} memoryType + * @param {string} sessionId + * @param {string} startDate + * @param {string} endDate */ - async getChatMessage(chatflowid: string, chatType: chatType | undefined): Promise { + async getChatMessage( + chatflowid: string, + chatType: chatType | undefined, + sortOrder: string = 'ASC', + chatId?: string, + memoryType?: string, + sessionId?: string, + startDate?: string, + endDate?: string + ): Promise { + let fromDate + if (startDate) fromDate = new Date(startDate) + + let toDate + if (endDate) toDate = new Date(endDate) + return await this.AppDataSource.getRepository(ChatMessage).find({ where: { - chatflowid: chatflowid, - chatType: chatType + chatflowid, + chatType, + chatId, + memoryType: memoryType ?? (chatId ? IsNull() : undefined), + sessionId: sessionId ?? (chatId ? IsNull() : undefined), + createdDate: toDate && fromDate ? Between(fromDate, toDate) : undefined }, order: { - createdDate: 'ASC' + createdDate: sortOrder === 'DESC' ? 'DESC' : 'ASC' } }) } /** * Method that add chat messages. - * - * @param chatMessage - - * + * @param {Partial} chatMessage */ - async addChatMessage(chatMessage: any): Promise { + async addChatMessage(chatMessage: Partial): Promise { const newChatMessage = new ChatMessage() Object.assign(newChatMessage, chatMessage) @@ -863,17 +933,23 @@ export class App { } /** - * Method that find memory label. - * - * @param nodes - - * + * Method that find memory label that is connected within chatflow + * In a chatflow, there should only be 1 memory node + * @param {IReactFlowNode[]} nodes + * @param {IReactFlowEdge[]} edges + * @returns {string | undefined} */ - findMemoryLabel(nodes: any[]): string | undefined { - const memoryNode = nodes.find((node) => { - return node.data.category === 'Memory' - }) + findMemoryLabel(nodes: IReactFlowNode[], edges: IReactFlowEdge[]): string | undefined { + const memoryNodes = nodes.filter((node) => node.data.category === 'Memory') + const memoryNodeIds = memoryNodes.map((mem) => mem.data.id) - return memoryNode ? memoryNode.data.label : undefined + for (const edge of edges) { + if (memoryNodeIds.includes(edge.source)) { + const memoryNode = nodes.find((node) => node.data.id === edge.source) + return memoryNode ? memoryNode.data.label : undefined + } + } + return undefined } /** @@ -883,7 +959,7 @@ export class App { * @param {Server} socketIO * @param {boolean} isInternal */ - async processPrediction(req: Request, res: Response, socketIO?: Server, isInternal = false) { + async processPrediction(req: Request, res: Response, socketIO?: Server, isInternal: boolean = false) { try { const chatflowid = req.params.id let incomingInput: IncomingInput = req.body @@ -895,7 +971,7 @@ export class App { }) if (!chatflow) return res.status(404).send(`Chatflow ${chatflowid} not found`) - const chatId = incomingInput.chatId ?? uuidv4() + const chatId = incomingInput.chatId ?? incomingInput.overrideConfig?.sessionId ?? uuidv4() const userMessageDateTime = new Date() if (!isInternal) { @@ -1033,9 +1109,9 @@ export class App { logger.debug(`[server]: Running ${nodeToExecuteData.label} (${nodeToExecuteData.id})`) let sessionId = undefined - let memoryLabel = undefined if (nodeToExecuteData.instance) sessionId = checkMemorySessionId(nodeToExecuteData.instance, chatId) - if (sessionId) memoryLabel = this.findMemoryLabel(nodes) + + const memoryType = this.findMemoryLabel(nodes, edges) let result = isStreamValid ? await nodeInstance.run(nodeToExecuteData, incomingInput.question, { @@ -1057,31 +1133,35 @@ export class App { result = typeof result === 'string' ? { text: result } : result - await this.addChatMessage({ + const userMessage: Omit = { role: 'userMessage', content: incomingInput.question, - chatflowid: chatflowid, + chatflowid, chatType: isInternal ? chatType.INTERNAL : chatType.EXTERNAL, - chatId: chatId, - memoryType: memoryLabel ? memoryLabel : undefined, - sessionId: sessionId ? sessionId : undefined, + chatId, + memoryType, + sessionId, createdDate: userMessageDateTime - }) + } + await this.addChatMessage(userMessage) - const apiMessage: any = { + const apiMessage: Omit = { role: 'apiMessage', content: result.text, - chatflowid: chatflowid, + chatflowid, chatType: isInternal ? chatType.INTERNAL : chatType.EXTERNAL, - chatId: chatId, - memoryType: memoryLabel ? memoryLabel : undefined, - sessionId: sessionId ? sessionId : undefined + chatId, + memoryType, + sessionId } if (result?.sourceDocuments) apiMessage.sourceDocuments = JSON.stringify(result.sourceDocuments) await this.addChatMessage(apiMessage) logger.debug(`[server]: Finished running ${nodeToExecuteData.label} (${nodeToExecuteData.id})`) - if (incomingInput.chatId) result.chatId = chatId + + // Only return ChatId when its Internal OR incoming input has ChatId, to avoid confusion when calling API + if (incomingInput.chatId || isInternal) result.chatId = chatId + return res.json(result) } catch (e: any) { logger.error('[server]: Error:', e) @@ -1104,7 +1184,7 @@ export class App { * @param {string} chatflowid * @returns {string} */ -export async function getChatId(chatflowid: string) { +export async function getChatId(chatflowid: string): Promise { // first chatmessage id as the unique chat id const firstChatMessage = await getDataSource() .getRepository(ChatMessage) diff --git a/packages/server/src/utils/index.ts b/packages/server/src/utils/index.ts index d636a6cd..63d19989 100644 --- a/packages/server/src/utils/index.ts +++ b/packages/server/src/utils/index.ts @@ -298,14 +298,14 @@ export const buildLangchain = async ( } /** - * Clear memory + * Clear all session memories on the canvas * @param {IReactFlowNode[]} reactFlowNodes * @param {IComponentNodes} componentNodes * @param {string} chatId * @param {DataSource} appDataSource * @param {string} sessionId */ -export const clearSessionMemory = async ( +export const clearAllSessionMemory = async ( reactFlowNodes: IReactFlowNode[], componentNodes: IComponentNodes, chatId: string, @@ -317,9 +317,46 @@ export const clearSessionMemory = async ( const nodeInstanceFilePath = componentNodes[node.data.name].filePath as string const nodeModule = await import(nodeInstanceFilePath) const newNodeInstance = new nodeModule.nodeClass() + if (sessionId && node.data.inputs) node.data.inputs.sessionId = sessionId - if (newNodeInstance.clearSessionMemory) + + if (newNodeInstance.clearSessionMemory) { await newNodeInstance?.clearSessionMemory(node.data, { chatId, appDataSource, databaseEntities, logger }) + } + } +} + +/** + * Clear specific session memory from View Message Dialog UI + * @param {IReactFlowNode[]} reactFlowNodes + * @param {IComponentNodes} componentNodes + * @param {string} chatId + * @param {DataSource} appDataSource + * @param {string} sessionId + * @param {string} memoryType + */ +export const clearSessionMemoryFromViewMessageDialog = async ( + reactFlowNodes: IReactFlowNode[], + componentNodes: IComponentNodes, + chatId: string, + appDataSource: DataSource, + sessionId?: string, + memoryType?: string +) => { + if (!sessionId) return + for (const node of reactFlowNodes) { + if (node.data.category !== 'Memory') continue + if (node.data.label !== memoryType) continue + const nodeInstanceFilePath = componentNodes[node.data.name].filePath as string + const nodeModule = await import(nodeInstanceFilePath) + const newNodeInstance = new nodeModule.nodeClass() + + if (sessionId && node.data.inputs) node.data.inputs.sessionId = sessionId + + if (newNodeInstance.clearSessionMemory) { + await newNodeInstance?.clearSessionMemory(node.data, { chatId, appDataSource, databaseEntities, logger }) + return + } } } @@ -933,5 +970,5 @@ export const checkMemorySessionId = (instance: any, chatId: string): string => { instance.memory.sessionId = chatId instance.memory.chatHistory.sessionId = chatId } - return instance.memory.sessionId + return instance.memory ? instance.memory.sessionId ?? instance.memory.chatHistory.sessionId : undefined } diff --git a/packages/ui/package.json b/packages/ui/package.json index 41ad515f..5244151c 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -31,7 +31,7 @@ "react": "^18.2.0", "react-code-blocks": "^0.0.9-0", "react-color": "^2.19.3", - "react-datepicker": "^4.8.0", + "react-datepicker": "^4.21.0", "react-device-detect": "^1.17.0", "react-dom": "^18.2.0", "react-markdown": "^8.0.6", diff --git a/packages/ui/src/api/chatmessage.js b/packages/ui/src/api/chatmessage.js index 4dcc7c88..5f1a4bad 100644 --- a/packages/ui/src/api/chatmessage.js +++ b/packages/ui/src/api/chatmessage.js @@ -1,10 +1,13 @@ import client from './client' -const getChatmessageFromChatflow = (id) => client.get(`/internal-chatmessage/${id}`) - -const deleteChatmessage = (id) => client.delete(`/chatmessage/${id}`) +const getInternalChatmessageFromChatflow = (id) => client.get(`/internal-chatmessage/${id}`) +const getAllChatmessageFromChatflow = (id, params = {}) => client.get(`/chatmessage/${id}`, { params: { order: 'DESC', ...params } }) +const getChatmessageFromPK = (id, params = {}) => client.get(`/chatmessage/${id}`, { params: { order: 'ASC', ...params } }) +const deleteChatmessage = (id, params = {}) => client.delete(`/chatmessage/${id}`, { params: { ...params } }) export default { - getChatmessageFromChatflow, + getInternalChatmessageFromChatflow, + getAllChatmessageFromChatflow, + getChatmessageFromPK, deleteChatmessage } diff --git a/packages/ui/src/assets/images/message_empty.svg b/packages/ui/src/assets/images/message_empty.svg new file mode 100644 index 00000000..d7c9df25 --- /dev/null +++ b/packages/ui/src/assets/images/message_empty.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/ui/src/layout/MainLayout/Header/ProfileSection/index.js b/packages/ui/src/layout/MainLayout/Header/ProfileSection/index.js index 41de3dd4..c10b3289 100644 --- a/packages/ui/src/layout/MainLayout/Header/ProfileSection/index.js +++ b/packages/ui/src/layout/MainLayout/Header/ProfileSection/index.js @@ -71,7 +71,7 @@ const ProfileSection = ({ username, handleLogout }) => { try { const response = await databaseApi.getExportDatabase() const exportItems = response.data - let dataStr = JSON.stringify(exportItems) + let dataStr = JSON.stringify(exportItems, null, 2) let dataUri = 'data:application/json;charset=utf-8,' + encodeURIComponent(dataStr) let exportFileDefaultName = `DB.json` diff --git a/packages/ui/src/menu-items/settings.js b/packages/ui/src/menu-items/settings.js index 038dc740..307bd0bd 100644 --- a/packages/ui/src/menu-items/settings.js +++ b/packages/ui/src/menu-items/settings.js @@ -1,8 +1,8 @@ // assets -import { IconTrash, IconFileUpload, IconFileExport, IconCopy, IconSearch } from '@tabler/icons' +import { IconTrash, IconFileUpload, IconFileExport, IconCopy, IconSearch, IconMessage } from '@tabler/icons' // constant -const icons = { IconTrash, IconFileUpload, IconFileExport, IconCopy, IconSearch } +const icons = { IconTrash, IconFileUpload, IconFileExport, IconCopy, IconSearch, IconMessage } // ==============================|| SETTINGS MENU ITEMS ||============================== // @@ -11,6 +11,13 @@ const settings = { title: '', type: 'group', children: [ + { + id: 'viewMessages', + title: 'View Messages', + type: 'item', + url: '', + icon: icons.IconMessage + }, { id: 'duplicateChatflow', title: 'Duplicate Chatflow', diff --git a/packages/ui/src/themes/palette.js b/packages/ui/src/themes/palette.js index 19a7df11..66ec3d01 100644 --- a/packages/ui/src/themes/palette.js +++ b/packages/ui/src/themes/palette.js @@ -80,6 +80,9 @@ export default function themePalette(theme) { asyncSelect: { main: theme.customization.isDarkMode ? theme.colors?.darkPrimary800 : theme.colors?.grey50 }, + timeMessage: { + main: theme.customization.isDarkMode ? theme.colors?.darkLevel2 : theme.colors?.grey200 + }, canvasHeader: { deployLight: theme.colors?.primaryLight, deployDark: theme.colors?.primaryDark, diff --git a/packages/ui/src/ui-component/dialog/ViewMessagesDialog.js b/packages/ui/src/ui-component/dialog/ViewMessagesDialog.js new file mode 100644 index 00000000..6d147dee --- /dev/null +++ b/packages/ui/src/ui-component/dialog/ViewMessagesDialog.js @@ -0,0 +1,695 @@ +import { createPortal } from 'react-dom' +import { useDispatch, useSelector } from 'react-redux' +import { useState, useEffect, forwardRef } from 'react' +import PropTypes from 'prop-types' +import moment from 'moment' +import rehypeMathjax from 'rehype-mathjax' +import remarkGfm from 'remark-gfm' +import remarkMath from 'remark-math' + +// material-ui +import { + Button, + Tooltip, + ListItemButton, + Box, + Stack, + Dialog, + DialogContent, + DialogTitle, + ListItem, + ListItemText, + Chip +} from '@mui/material' +import { useTheme } from '@mui/material/styles' +import DatePicker from 'react-datepicker' + +import robotPNG from 'assets/images/robot.png' +import userPNG from 'assets/images/account.png' +import msgEmptySVG from 'assets/images/message_empty.svg' +import { IconFileExport, IconEraser, IconX } from '@tabler/icons' + +// Project import +import { MemoizedReactMarkdown } from 'ui-component/markdown/MemoizedReactMarkdown' +import { CodeBlock } from 'ui-component/markdown/CodeBlock' +import SourceDocDialog from 'ui-component/dialog/SourceDocDialog' +import { MultiDropdown } from 'ui-component/dropdown/MultiDropdown' +import { StyledButton } from 'ui-component/button/StyledButton' + +// store +import { HIDE_CANVAS_DIALOG, SHOW_CANVAS_DIALOG } from 'store/actions' + +// API +import chatmessageApi from 'api/chatmessage' +import useApi from 'hooks/useApi' +import useConfirm from 'hooks/useConfirm' + +// Utils +import { isValidURL, removeDuplicateURL } from 'utils/genericHelper' +import useNotifier from 'utils/useNotifier' + +import { enqueueSnackbar as enqueueSnackbarAction, closeSnackbar as closeSnackbarAction } from 'store/actions' + +import 'views/chatmessage/ChatMessage.css' +import 'react-datepicker/dist/react-datepicker.css' + +const DatePickerCustomInput = forwardRef(function DatePickerCustomInput({ value, onClick }, ref) { + return ( + + {value} + + ) +}) + +DatePickerCustomInput.propTypes = { + value: PropTypes.string, + onClick: PropTypes.func +} + +const ViewMessagesDialog = ({ show, dialogProps, onCancel }) => { + const portalElement = document.getElementById('portal') + const dispatch = useDispatch() + const theme = useTheme() + const customization = useSelector((state) => state.customization) + const { confirm } = useConfirm() + + useNotifier() + const enqueueSnackbar = (...args) => dispatch(enqueueSnackbarAction(...args)) + const closeSnackbar = (...args) => dispatch(closeSnackbarAction(...args)) + + const [chatlogs, setChatLogs] = useState([]) + const [allChatlogs, setAllChatLogs] = useState([]) + const [chatMessages, setChatMessages] = useState([]) + const [selectedMessageIndex, setSelectedMessageIndex] = useState(0) + const [sourceDialogOpen, setSourceDialogOpen] = useState(false) + const [sourceDialogProps, setSourceDialogProps] = useState({}) + const [chatTypeFilter, setChatTypeFilter] = useState([]) + const [startDate, setStartDate] = useState(new Date().setMonth(new Date().getMonth() - 1)) + const [endDate, setEndDate] = useState(new Date()) + + const getChatmessageApi = useApi(chatmessageApi.getAllChatmessageFromChatflow) + const getChatmessageFromPKApi = useApi(chatmessageApi.getChatmessageFromPK) + + const onStartDateSelected = (date) => { + setStartDate(date) + getChatmessageApi.request(dialogProps.chatflow.id, { + startDate: date, + endDate: endDate, + chatType: chatTypeFilter.length ? chatTypeFilter : undefined + }) + } + + const onEndDateSelected = (date) => { + setEndDate(date) + getChatmessageApi.request(dialogProps.chatflow.id, { + endDate: date, + startDate: startDate, + chatType: chatTypeFilter.length ? chatTypeFilter : undefined + }) + } + + const onChatTypeSelected = (chatTypes) => { + setChatTypeFilter(chatTypes) + getChatmessageApi.request(dialogProps.chatflow.id, { + chatType: chatTypes.length ? chatTypes : undefined, + startDate: startDate, + endDate: endDate + }) + } + + const exportMessages = () => { + const obj = {} + for (let i = 0; i < allChatlogs.length; i += 1) { + const chatmsg = allChatlogs[i] + const chatPK = getChatPK(chatmsg) + const msg = { + content: chatmsg.content, + role: chatmsg.role === 'apiMessage' ? 'bot' : 'user', + time: chatmsg.createdDate + } + if (chatmsg.sourceDocuments) msg.sourceDocuments = JSON.parse(chatmsg.sourceDocuments) + + if (!Object.prototype.hasOwnProperty.call(obj, chatPK)) { + obj[chatPK] = { + id: chatmsg.chatId, + source: chatmsg.chatType === 'INTERNAL' ? 'UI' : 'API/Embed', + sessionId: chatmsg.sessionId ?? null, + memoryType: chatmsg.memoryType ?? null, + messages: [msg] + } + } else if (Object.prototype.hasOwnProperty.call(obj, chatPK)) { + obj[chatPK].messages = [...obj[chatPK].messages, msg] + } + } + + const exportMessages = [] + for (const key in obj) { + exportMessages.push({ + ...obj[key] + }) + } + + for (let i = 0; i < exportMessages.length; i += 1) { + exportMessages[i].messages = exportMessages[i].messages.reverse() + } + + const dataStr = JSON.stringify(exportMessages, null, 2) + const dataUri = 'data:application/json;charset=utf-8,' + encodeURIComponent(dataStr) + + const exportFileDefaultName = `${dialogProps.chatflow.id}-Message.json` + + let linkElement = document.createElement('a') + linkElement.setAttribute('href', dataUri) + linkElement.setAttribute('download', exportFileDefaultName) + linkElement.click() + } + + const clearChat = async (chatmsg) => { + const description = + chatmsg.sessionId && chatmsg.memoryType + ? `Are you sure you want to clear session id: ${chatmsg.sessionId} from ${chatmsg.memoryType}?` + : `Are you sure you want to clear messages?` + const confirmPayload = { + title: `Clear Session`, + description, + confirmButtonName: 'Clear', + cancelButtonName: 'Cancel' + } + const isConfirmed = await confirm(confirmPayload) + + const chatflowid = dialogProps.chatflow.id + if (isConfirmed) { + try { + const obj = { chatflowid, isClearFromViewMessageDialog: true } + if (chatmsg.chatId) obj.chatId = chatmsg.chatId + if (chatmsg.chatType) obj.chatType = chatmsg.chatType + if (chatmsg.memoryType) obj.memoryType = chatmsg.memoryType + if (chatmsg.sessionId) obj.sessionId = chatmsg.sessionId + + await chatmessageApi.deleteChatmessage(chatflowid, obj) + const description = + chatmsg.sessionId && chatmsg.memoryType + ? `Succesfully cleared session id: ${chatmsg.sessionId} from ${chatmsg.memoryType}` + : `Succesfully cleared messages` + enqueueSnackbar({ + message: description, + options: { + key: new Date().getTime() + Math.random(), + variant: 'success', + action: (key) => ( + + ) + } + }) + getChatmessageApi.request(chatflowid) + } catch (error) { + const errorData = error.response.data || `${error.response.status}: ${error.response.statusText}` + enqueueSnackbar({ + message: errorData, + options: { + key: new Date().getTime() + Math.random(), + variant: 'error', + persist: true, + action: (key) => ( + + ) + } + }) + } + } + } + + const getChatMessages = (chatmessages) => { + let prevDate = '' + const loadedMessages = [] + for (let i = 0; i < chatmessages.length; i += 1) { + const chatmsg = chatmessages[i] + if (!prevDate) { + prevDate = chatmsg.createdDate.split('T')[0] + loadedMessages.push({ + message: chatmsg.createdDate, + type: 'timeMessage' + }) + } else { + const currentDate = chatmsg.createdDate.split('T')[0] + if (currentDate !== prevDate) { + prevDate = currentDate + loadedMessages.push({ + message: chatmsg.createdDate, + type: 'timeMessage' + }) + } + } + const obj = { + ...chatmsg, + message: chatmsg.content, + type: chatmsg.role + } + if (chatmsg.sourceDocuments) obj.sourceDocuments = JSON.parse(chatmsg.sourceDocuments) + loadedMessages.push(obj) + } + setChatMessages(loadedMessages) + } + + const getChatPK = (chatmsg) => { + const chatId = chatmsg.chatId + const memoryType = chatmsg.memoryType ?? 'null' + const sessionId = chatmsg.sessionId ?? 'null' + return `${chatId}_${memoryType}_${sessionId}` + } + + const transformChatPKToParams = (chatPK) => { + const chatId = chatPK.split('_')[0] + const memoryType = chatPK.split('_')[1] + const sessionId = chatPK.split('_')[2] + + const params = { chatId } + if (memoryType !== 'null') params.memoryType = memoryType + if (sessionId !== 'null') params.sessionId = sessionId + + return params + } + + const processChatLogs = (allChatMessages) => { + const seen = {} + const filteredChatLogs = [] + for (let i = 0; i < allChatMessages.length; i += 1) { + const PK = getChatPK(allChatMessages[i]) + + const item = allChatMessages[i] + if (!Object.prototype.hasOwnProperty.call(seen, PK)) { + seen[PK] = { + counter: 1, + item: allChatMessages[i] + } + } else if (Object.prototype.hasOwnProperty.call(seen, PK) && seen[PK].counter === 1) { + seen[PK] = { + counter: 2, + item: { + ...seen[PK].item, + apiContent: + seen[PK].item.role === 'apiMessage' ? `Bot: ${seen[PK].item.content}` : `User: ${seen[PK].item.content}`, + userContent: item.role === 'apiMessage' ? `Bot: ${item.content}` : `User: ${item.content}` + } + } + filteredChatLogs.push(seen[PK].item) + } + } + setChatLogs(filteredChatLogs) + if (filteredChatLogs.length) return getChatPK(filteredChatLogs[0]) + return undefined + } + + const handleItemClick = (idx, chatmsg) => { + setSelectedMessageIndex(idx) + getChatmessageFromPKApi.request(dialogProps.chatflow.id, transformChatPKToParams(getChatPK(chatmsg))) + } + + const onURLClick = (data) => { + window.open(data, '_blank') + } + + const onSourceDialogClick = (data) => { + setSourceDialogProps({ data }) + setSourceDialogOpen(true) + } + + useEffect(() => { + if (getChatmessageFromPKApi.data) { + getChatMessages(getChatmessageFromPKApi.data) + } + + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [getChatmessageFromPKApi.data]) + + useEffect(() => { + if (getChatmessageApi.data) { + setAllChatLogs(getChatmessageApi.data) + const chatPK = processChatLogs(getChatmessageApi.data) + setSelectedMessageIndex(0) + if (chatPK) getChatmessageFromPKApi.request(dialogProps.chatflow.id, transformChatPKToParams(chatPK)) + } + + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [getChatmessageApi.data]) + + useEffect(() => { + if (dialogProps.chatflow) { + getChatmessageApi.request(dialogProps.chatflow.id) + } + + return () => { + setChatLogs([]) + setAllChatLogs([]) + setChatMessages([]) + setChatTypeFilter([]) + setSelectedMessageIndex(0) + setStartDate(new Date().setMonth(new Date().getMonth() - 1)) + setEndDate(new Date()) + } + + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [dialogProps]) + + useEffect(() => { + if (show) dispatch({ type: SHOW_CANVAS_DIALOG }) + else dispatch({ type: HIDE_CANVAS_DIALOG }) + return () => dispatch({ type: HIDE_CANVAS_DIALOG }) + }, [show, dispatch]) + + const component = show ? ( + + +
+ {dialogProps.title} +
+ +
+ + + <> +
+
+ From Date + onStartDateSelected(date)} + selectsStart + startDate={startDate} + endDate={endDate} + customInput={} + /> +
+
+ To Date + onEndDateSelected(date)} + selectsEnd + startDate={startDate} + endDate={endDate} + minDate={startDate} + maxDate={new Date()} + customInput={} + /> +
+
+ Source + onChatTypeSelected(newValue)} + value={chatTypeFilter} + formControlSx={{ mt: 0 }} + /> +
+
+
+
+ {chatlogs && chatlogs.length == 0 && ( + + + msgEmptySVG + +
No Messages
+ + )} + {chatlogs && chatlogs.length > 0 && ( +
+ + {chatlogs.map((chatmsg, index) => ( + handleItemClick(index, chatmsg)} + > + + + {chatmsg?.userContent} +
+ {chatmsg?.apiContent} +
+
+ } + secondary={moment(chatmsg.createdDate).format('MMMM Do YYYY, h:mm:ss a')} + /> + + + ))} + +
+ )} + {chatlogs && chatlogs.length > 0 && ( +
+ {chatMessages && chatMessages.length > 1 && ( +
+
+ {chatMessages[1].sessionId && ( +
+ Session Id: {chatMessages[1].sessionId} +
+ )} + {chatMessages[1].chatType && ( +
+ Source: {chatMessages[1].chatType === 'INTERNAL' ? 'UI' : 'API/Embed'} +
+ )} + {chatMessages[1].memoryType && ( +
+ Memory: {chatMessages[1].memoryType} +
+ )} +
+
+ clearChat(chatMessages[1])} + startIcon={} + > + Clear + + {chatMessages[1].sessionId && ( + +
+ Why my session is not deleted? +
+ + )} +
+
+ )} +
+
+ {chatMessages && + chatMessages.map((message, index) => { + if (message.type === 'apiMessage' || message.type === 'userMessage') { + return ( + + {/* Display the correct icon depending on the message type */} + {message.type === 'apiMessage' ? ( + AI + ) : ( + Me + )} +
+
+ {/* Messages are being rendered in Markdown format */} + + ) : ( + + {children} + + ) + } + }} + > + {message.message} + +
+ {message.sourceDocuments && ( +
+ {removeDuplicateURL(message).map((source, index) => { + const URL = isValidURL(source.metadata.source) + return ( + + URL + ? onURLClick(source.metadata.source) + : onSourceDialogClick(source) + } + /> + ) + })} +
+ )} +
+ + ) + } else { + return ( + + {moment(message.message).format('MMMM Do YYYY, h:mm:ss a')} + + ) + } + })} +
+
+
+ )} +
+ setSourceDialogOpen(false)} /> + + + + ) : null + + return createPortal(component, portalElement) +} + +ViewMessagesDialog.propTypes = { + show: PropTypes.bool, + dialogProps: PropTypes.object, + onCancel: PropTypes.func +} + +export default ViewMessagesDialog diff --git a/packages/ui/src/ui-component/dropdown/MultiDropdown.js b/packages/ui/src/ui-component/dropdown/MultiDropdown.js index ff07b89f..9b96e55c 100644 --- a/packages/ui/src/ui-component/dropdown/MultiDropdown.js +++ b/packages/ui/src/ui-component/dropdown/MultiDropdown.js @@ -18,7 +18,7 @@ const StyledPopper = styled(Popper)({ } }) -export const MultiDropdown = ({ name, value, options, onSelect, disabled = false, disableClearable = false }) => { +export const MultiDropdown = ({ name, value, options, onSelect, formControlSx = {}, disabled = false, disableClearable = false }) => { const customization = useSelector((state) => state.customization) const findMatchingOptions = (options = [], internalValue) => { let values = [] @@ -30,7 +30,7 @@ export const MultiDropdown = ({ name, value, options, onSelect, disabled = false let [internalValue, setInternalValue] = useState(value ?? []) return ( - + { return inputVariables } +export const removeDuplicateURL = (message) => { + const visitedURLs = [] + const newSourceDocuments = [] + + if (!message.sourceDocuments) return newSourceDocuments + + message.sourceDocuments.forEach((source) => { + if (isValidURL(source.metadata.source) && !visitedURLs.includes(source.metadata.source)) { + visitedURLs.push(source.metadata.source) + newSourceDocuments.push(source) + } else if (!isValidURL(source.metadata.source)) { + newSourceDocuments.push(source) + } + }) + return newSourceDocuments +} + export const isValidURL = (url) => { try { return new URL(url) diff --git a/packages/ui/src/views/canvas/CanvasHeader.js b/packages/ui/src/views/canvas/CanvasHeader.js index a9d2f39e..56365ba8 100644 --- a/packages/ui/src/views/canvas/CanvasHeader.js +++ b/packages/ui/src/views/canvas/CanvasHeader.js @@ -15,6 +15,7 @@ import Settings from 'views/settings' import SaveChatflowDialog from 'ui-component/dialog/SaveChatflowDialog' import APICodeDialog from 'views/chatflows/APICodeDialog' import AnalyseFlowDialog from 'ui-component/dialog/AnalyseFlowDialog' +import ViewMessagesDialog from 'ui-component/dialog/ViewMessagesDialog' // API import chatflowsApi from 'api/chatflows' @@ -44,6 +45,8 @@ const CanvasHeader = ({ chatflow, handleSaveFlow, handleDeleteFlow, handleLoadFl const [apiDialogProps, setAPIDialogProps] = useState({}) const [analyseDialogOpen, setAnalyseDialogOpen] = useState(false) const [analyseDialogProps, setAnalyseDialogProps] = useState({}) + const [viewMessagesDialogOpen, setViewMessagesDialogOpen] = useState(false) + const [viewMessagesDialogProps, setViewMessagesDialogProps] = useState({}) const updateChatflowApi = useApi(chatflowsApi.updateChatflow) const canvas = useSelector((state) => state.canvas) @@ -59,6 +62,12 @@ const CanvasHeader = ({ chatflow, handleSaveFlow, handleDeleteFlow, handleLoadFl chatflow: chatflow }) setAnalyseDialogOpen(true) + } else if (setting === 'viewMessages') { + setViewMessagesDialogProps({ + title: 'View Messages', + chatflow: chatflow + }) + setViewMessagesDialogOpen(true) } else if (setting === 'duplicateChatflow') { try { localStorage.setItem('duplicatedFlowData', chatflow.flowData) @@ -69,7 +78,7 @@ const CanvasHeader = ({ chatflow, handleSaveFlow, handleDeleteFlow, handleLoadFl } else if (setting === 'exportChatflow') { try { const flowData = JSON.parse(chatflow.flowData) - let dataStr = JSON.stringify(generateExportFlowData(flowData)) + let dataStr = JSON.stringify(generateExportFlowData(flowData), null, 2) let dataUri = 'data:application/json;charset=utf-8,' + encodeURIComponent(dataStr) let exportFileDefaultName = `${chatflow.name} Chatflow.json` @@ -367,6 +376,11 @@ const CanvasHeader = ({ chatflow, handleSaveFlow, handleDeleteFlow, handleLoadFl /> setAPIDialogOpen(false)} /> setAnalyseDialogOpen(false)} /> + setViewMessagesDialogOpen(false)} + /> ) } diff --git a/packages/ui/src/views/chatmessage/ChatMessage.css b/packages/ui/src/views/chatmessage/ChatMessage.css index 3b006c1d..2298fee6 100644 --- a/packages/ui/src/views/chatmessage/ChatMessage.css +++ b/packages/ui/src/views/chatmessage/ChatMessage.css @@ -134,3 +134,13 @@ justify-content: center; align-items: center; } + +.cloud-message { + width: 100%; + height: calc(100vh - 260px); + overflow-y: scroll; + border-radius: 0.5rem; + display: flex; + justify-content: center; + align-items: center; +} diff --git a/packages/ui/src/views/chatmessage/ChatMessage.js b/packages/ui/src/views/chatmessage/ChatMessage.js index 7b186358..ce5a32d3 100644 --- a/packages/ui/src/views/chatmessage/ChatMessage.js +++ b/packages/ui/src/views/chatmessage/ChatMessage.js @@ -30,7 +30,7 @@ import { baseURL, maxScroll } from 'store/constant' import robotPNG from 'assets/images/robot.png' import userPNG from 'assets/images/account.png' -import { isValidURL } from 'utils/genericHelper' +import { isValidURL, removeDuplicateURL } from 'utils/genericHelper' export const ChatMessage = ({ open, chatflowid, isDialog }) => { const theme = useTheme() @@ -53,7 +53,7 @@ export const ChatMessage = ({ open, chatflowid, isDialog }) => { const [chatId, setChatId] = useState(undefined) const inputRef = useRef(null) - const getChatmessageApi = useApi(chatmessageApi.getChatmessageFromChatflow) + const getChatmessageApi = useApi(chatmessageApi.getInternalChatmessageFromChatflow) const getIsChatflowStreamingApi = useApi(chatflowsApi.getIsChatflowStreaming) const onSourceDialogClick = (data) => { @@ -65,21 +65,6 @@ export const ChatMessage = ({ open, chatflowid, isDialog }) => { window.open(data, '_blank') } - const removeDuplicateURL = (message) => { - const visitedURLs = [] - const newSourceDocuments = [] - - message.sourceDocuments.forEach((source) => { - if (isValidURL(source.metadata.source) && !visitedURLs.includes(source.metadata.source)) { - visitedURLs.push(source.metadata.source) - newSourceDocuments.push(source) - } else if (!isValidURL(source.metadata.source)) { - newSourceDocuments.push(source) - } - }) - return newSourceDocuments - } - const scrollToBottom = () => { if (ps.current) { ps.current.scrollTo({ top: maxScroll }) diff --git a/packages/ui/src/views/chatmessage/ChatPopUp.js b/packages/ui/src/views/chatmessage/ChatPopUp.js index 5f1d413c..1b87ac30 100644 --- a/packages/ui/src/views/chatmessage/ChatPopUp.js +++ b/packages/ui/src/views/chatmessage/ChatPopUp.js @@ -86,7 +86,7 @@ export const ChatPopUp = ({ chatflowid }) => { if (isConfirmed) { try { const chatId = localStorage.getItem(`${chatflowid}_INTERNAL`) - await chatmessageApi.deleteChatmessage(chatId) + await chatmessageApi.deleteChatmessage(chatflowid, { chatId, chatType: 'INTERNAL' }) localStorage.removeItem(`${chatflowid}_INTERNAL`) resetChatDialog() enqueueSnackbar({ diff --git a/packages/ui/src/views/tools/ToolDialog.js b/packages/ui/src/views/tools/ToolDialog.js index 2b67f6d4..1fa92ec9 100644 --- a/packages/ui/src/views/tools/ToolDialog.js +++ b/packages/ui/src/views/tools/ToolDialog.js @@ -227,7 +227,7 @@ const ToolDialog = ({ show, dialogProps, onUseTemplate, onCancel, onConfirm }) = delete toolData.id delete toolData.createdDate delete toolData.updatedDate - let dataStr = JSON.stringify(toolData) + let dataStr = JSON.stringify(toolData, null, 2) let dataUri = 'data:application/json;charset=utf-8,' + encodeURIComponent(dataStr) let exportFileDefaultName = `${toolName}-CustomTool.json`