From bb10d18c881c12d58d359fe2f11b241100a24a02 Mon Sep 17 00:00:00 2001 From: Henry Date: Sat, 5 Aug 2023 23:37:51 +0100 Subject: [PATCH] add appdatasource and databaseEntities to run method --- packages/server/src/ChildProcess.ts | 9 +++++++-- packages/server/src/index.ts | 12 +++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/packages/server/src/ChildProcess.ts b/packages/server/src/ChildProcess.ts index 2eae90f8..45509938 100644 --- a/packages/server/src/ChildProcess.ts +++ b/packages/server/src/ChildProcess.ts @@ -7,7 +7,8 @@ import { getStartingNodes, getUserHome, replaceInputsWithConfig, - resolveVariables + resolveVariables, + databaseEntities } from './utils' import { DataSource } from 'typeorm' import { ChatFlow } from './entity/ChatFlow' @@ -137,7 +138,11 @@ export class ChildProcess { const nodeInstance = new nodeModule.nodeClass() logger.debug(`[server] [mode:child]: Running ${nodeToExecuteData.label} (${nodeToExecuteData.id})`) - const result = await nodeInstance.run(nodeToExecuteData, incomingInput.question, { chatHistory: incomingInput.history }) + const result = await nodeInstance.run(nodeToExecuteData, incomingInput.question, { + chatHistory: incomingInput.history, + appDataSource: childAppDataSource, + databaseEntities + }) logger.debug(`[server] [mode:child]: Finished running ${nodeToExecuteData.label} (${nodeToExecuteData.id})`) await sendToParentProcess('finish', { result, addToChatFlowPool }) diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index 545c75a7..178218dc 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -993,10 +993,16 @@ export class App { chatHistory: incomingInput.history, socketIO, socketIOClientId: incomingInput.socketIOClientId, - logger + logger, + appDataSource: this.AppDataSource, + databaseEntities + }) + : await nodeInstance.run(nodeToExecuteData, incomingInput.question, { + chatHistory: incomingInput.history, + logger, + appDataSource: this.AppDataSource, + databaseEntities }) - : await nodeInstance.run(nodeToExecuteData, incomingInput.question, { chatHistory: incomingInput.history, logger }) - logger.debug(`[server]: Finished running ${nodeToExecuteData.label} (${nodeToExecuteData.id})`) return res.json(result) }