Sultan
/
Flowise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix/Query Runner already released (#3525) 

Merge branch 'feature/add-couchbase-vectore-store' into feature/Couchbase
This commit is contained in:
Henry Heng 2024-11-16 14:33:58 +00:00 committed by GitHub
parent 1ccd97685c
commit 47e723be02
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/server/src/services/assistants/index.ts
View File

@ -7,7 +7,7 @@ import { Credential } from '../../database/entities/Credential'
import { decryptCredentialData, getAppVersion } from '../../utils' import { decryptCredentialData, getAppVersion } from '../../utils'
import { InternalFlowiseError } from '../../errors/internalFlowiseError' import { InternalFlowiseError } from '../../errors/internalFlowiseError'
import { getErrorMessage } from '../../errors/utils' import { getErrorMessage } from '../../errors/utils'
import { DeleteResult } from 'typeorm' import { DeleteResult, QueryRunner } from 'typeorm'
import { FLOWISE_METRIC_COUNTERS, FLOWISE_COUNTER_STATUS } from '../../Interface.Metrics' import { FLOWISE_METRIC_COUNTERS, FLOWISE_COUNTER_STATUS } from '../../Interface.Metrics'
const createAssistant = async (requestBody: any): Promise<Assistant> => { const createAssistant = async (requestBody: any): Promise<Assistant> => {
@ -291,9 +291,10 @@ const updateAssistant = async (assistantId: string, requestBody: any): Promise<A
} }
} }
const importAssistants = async (newAssistants: Partial<Assistant>[]): Promise<any> => { const importAssistants = async (newAssistants: Partial<Assistant>[], queryRunner?: QueryRunner): Promise<any> => {
try { try {
const appServer = getRunningExpressApp() const appServer = getRunningExpressApp()
const repository = queryRunner ? queryRunner.manager.getRepository(Assistant) : appServer.AppDataSource.getRepository(Assistant)
// step 1 - check whether array is zero // step 1 - check whether array is zero
if (newAssistants.length == 0) return if (newAssistants.length == 0) return
@ -309,7 +310,7 @@ const importAssistants = async (newAssistants: Partial<Assistant>[]): Promise<an
count += 1 count += 1
}) })
const selectResponse = await appServer.AppDataSource.getRepository(Assistant) const selectResponse = await repository
.createQueryBuilder('assistant') .createQueryBuilder('assistant')
.select('assistant.id') .select('assistant.id')
.where(`assistant.id IN ${ids}`) .where(`assistant.id IN ${ids}`)
@ -329,7 +330,7 @@ const importAssistants = async (newAssistants: Partial<Assistant>[]): Promise<an
}) })
// step 4 - transactional insert array of entities // step 4 - transactional insert array of entities
const insertResponse = await appServer.AppDataSource.getRepository(Assistant).insert(prepVariables) const insertResponse = await repository.insert(prepVariables)
return insertResponse return insertResponse
} catch (error) { } catch (error) {

12
packages/server/src/services/chatflows/index.ts
View File

@ -14,6 +14,7 @@ import { getRunningExpressApp } from '../../utils/getRunningExpressApp'
import { utilGetUploadsConfig } from '../../utils/getUploadsConfig' import { utilGetUploadsConfig } from '../../utils/getUploadsConfig'
import logger from '../../utils/logger' import logger from '../../utils/logger'
import { FLOWISE_METRIC_COUNTERS, FLOWISE_COUNTER_STATUS } from '../../Interface.Metrics' import { FLOWISE_METRIC_COUNTERS, FLOWISE_COUNTER_STATUS } from '../../Interface.Metrics'
import { QueryRunner } from 'typeorm'
// Check if chatflow valid for streaming // Check if chatflow valid for streaming
const checkIfChatflowIsValidForStreaming = async (chatflowId: string): Promise<any> => { const checkIfChatflowIsValidForStreaming = async (chatflowId: string): Promise<any> => {
@ -206,9 +207,10 @@ const saveChatflow = async (newChatFlow: ChatFlow): Promise<any> => {
} }
} }
const importChatflows = async (newChatflows: Partial<ChatFlow>[]): Promise<any> => { const importChatflows = async (newChatflows: Partial<ChatFlow>[], queryRunner?: QueryRunner): Promise<any> => {
try { try {
const appServer = getRunningExpressApp() const appServer = getRunningExpressApp()
const repository = queryRunner ? queryRunner.manager.getRepository(ChatFlow) : appServer.AppDataSource.getRepository(ChatFlow)
// step 1 - check whether file chatflows array is zero // step 1 - check whether file chatflows array is zero
if (newChatflows.length == 0) return if (newChatflows.length == 0) return
@ -224,11 +226,7 @@ const importChatflows = async (newChatflows: Partial<ChatFlow>[]): Promise<any>
count += 1 count += 1
}) })
const selectResponse = await appServer.AppDataSource.getRepository(ChatFlow) const selectResponse = await repository.createQueryBuilder('cf').select('cf.id').where(`cf.id IN ${ids}`).getMany()
.createQueryBuilder('cf')
.select('cf.id')
.where(`cf.id IN ${ids}`)
.getMany()
const foundIds = selectResponse.map((response) => { const foundIds = selectResponse.map((response) => {
return response.id return response.id
}) })
@ -248,7 +246,7 @@ const importChatflows = async (newChatflows: Partial<ChatFlow>[]): Promise<any>
}) })
// step 4 - transactional insert array of entities // step 4 - transactional insert array of entities
const insertResponse = await appServer.AppDataSource.getRepository(ChatFlow).insert(prepChatflows) const insertResponse = await repository.insert(prepChatflows)
return insertResponse return insertResponse
} catch (error) { } catch (error) {

24
packages/server/src/services/export-import/index.ts
View File

@ -87,22 +87,22 @@ const importData = async (importData: ExportData) => {
const queryRunner = appServer.AppDataSource.createQueryRunner() const queryRunner = appServer.AppDataSource.createQueryRunner()
try { try {
queryRunner.startTransaction() await queryRunner.startTransaction()
// step 1 - importTools if (importData.Tool.length > 0) await toolsService.importTools(importData.Tool, queryRunner)
if (importData.Tool.length > 0) await toolsService.importTools(importData.Tool) if (importData.ChatFlow.length > 0) await chatflowService.importChatflows(importData.ChatFlow, queryRunner)
// step 2 - importChatflows if (importData.AgentFlow.length > 0) await chatflowService.importChatflows(importData.AgentFlow, queryRunner)
if (importData.ChatFlow.length > 0) await chatflowService.importChatflows(importData.ChatFlow) if (importData.Variable.length > 0) await variableService.importVariables(importData.Variable, queryRunner)
// step 3 - importAgentlows if (importData.Assistant.length > 0) await assistantService.importAssistants(importData.Assistant, queryRunner)
if (importData.AgentFlow.length > 0) await chatflowService.importChatflows(importData.AgentFlow)
if (importData.Variable.length > 0) await variableService.importVariables(importData.Variable) await queryRunner.commitTransaction()
if (importData.Assistant.length > 0) await assistantService.importAssistants(importData.Assistant)
queryRunner.commitTransaction()
} catch (error) { } catch (error) {
queryRunner.rollbackTransaction() await queryRunner.rollbackTransaction()
throw error throw error
} finally { } finally {
queryRunner.release() if (!queryRunner.isReleased) {
await queryRunner.release()
}
} }
} catch (error) { } catch (error) {
throw new InternalFlowiseError( throw new InternalFlowiseError(

12
packages/server/src/services/tools/index.ts
View File

@ -5,6 +5,7 @@ import { getErrorMessage } from '../../errors/utils'
import { getAppVersion } from '../../utils' import { getAppVersion } from '../../utils'
import { getRunningExpressApp } from '../../utils/getRunningExpressApp' import { getRunningExpressApp } from '../../utils/getRunningExpressApp'
import { FLOWISE_METRIC_COUNTERS, FLOWISE_COUNTER_STATUS } from '../../Interface.Metrics' import { FLOWISE_METRIC_COUNTERS, FLOWISE_COUNTER_STATUS } from '../../Interface.Metrics'
import { QueryRunner } from 'typeorm'
const createTool = async (requestBody: any): Promise<any> => { const createTool = async (requestBody: any): Promise<any> => {
try { try {
@ -81,9 +82,10 @@ const updateTool = async (toolId: string, toolBody: any): Promise<any> => {
} }
} }
const importTools = async (newTools: Partial<Tool>[]) => { const importTools = async (newTools: Partial<Tool>[], queryRunner?: QueryRunner) => {
try { try {
const appServer = getRunningExpressApp() const appServer = getRunningExpressApp()
const repository = queryRunner ? queryRunner.manager.getRepository(Tool) : appServer.AppDataSource.getRepository(Tool)
// step 1 - check whether file tools array is zero // step 1 - check whether file tools array is zero
if (newTools.length == 0) return if (newTools.length == 0) return
@ -99,11 +101,7 @@ const importTools = async (newTools: Partial<Tool>[]) => {
count += 1 count += 1
}) })
const selectResponse = await appServer.AppDataSource.getRepository(Tool) const selectResponse = await repository.createQueryBuilder('t').select('t.id').where(`t.id IN ${ids}`).getMany()
.createQueryBuilder('t')
.select('t.id')
.where(`t.id IN ${ids}`)
.getMany()
const foundIds = selectResponse.map((response) => { const foundIds = selectResponse.map((response) => {
return response.id return response.id
}) })
@ -120,7 +118,7 @@ const importTools = async (newTools: Partial<Tool>[]) => {
}) })
// step 4 - transactional insert array of entities // step 4 - transactional insert array of entities
const insertResponse = await appServer.AppDataSource.getRepository(Tool).insert(prepTools) const insertResponse = await repository.insert(prepTools)
return insertResponse return insertResponse
} catch (error) { } catch (error) {

12
packages/server/src/services/variables/index.ts
View File

@ -3,6 +3,7 @@ import { getRunningExpressApp } from '../../utils/getRunningExpressApp'
import { Variable } from '../../database/entities/Variable' import { Variable } from '../../database/entities/Variable'
import { InternalFlowiseError } from '../../errors/internalFlowiseError' import { InternalFlowiseError } from '../../errors/internalFlowiseError'
import { getErrorMessage } from '../../errors/utils' import { getErrorMessage } from '../../errors/utils'
import { QueryRunner } from 'typeorm'
const createVariable = async (newVariable: Variable) => { const createVariable = async (newVariable: Variable) => {
try { try {
@ -73,9 +74,10 @@ const updateVariable = async (variable: Variable, updatedVariable: Variable) =>
} }
} }
const importVariables = async (newVariables: Partial<Variable>[]): Promise<any> => { const importVariables = async (newVariables: Partial<Variable>[], queryRunner?: QueryRunner): Promise<any> => {
try { try {
const appServer = getRunningExpressApp() const appServer = getRunningExpressApp()
const repository = queryRunner ? queryRunner.manager.getRepository(Variable) : appServer.AppDataSource.getRepository(Variable)
// step 1 - check whether array is zero // step 1 - check whether array is zero
if (newVariables.length == 0) return if (newVariables.length == 0) return
@ -91,11 +93,7 @@ const importVariables = async (newVariables: Partial<Variable>[]): Promise<any>
count += 1 count += 1
}) })
const selectResponse = await appServer.AppDataSource.getRepository(Variable) const selectResponse = await repository.createQueryBuilder('v').select('v.id').where(`v.id IN ${ids}`).getMany()
.createQueryBuilder('v')
.select('v.id')
.where(`v.id IN ${ids}`)
.getMany()
const foundIds = selectResponse.map((response) => { const foundIds = selectResponse.map((response) => {
return response.id return response.id
}) })
@ -112,7 +110,7 @@ const importVariables = async (newVariables: Partial<Variable>[]): Promise<any>
}) })
// step 4 - transactional insert array of entities // step 4 - transactional insert array of entities
const insertResponse = await appServer.AppDataSource.getRepository(Variable).insert(prepVariables) const insertResponse = await repository.insert(prepVariables)
return insertResponse return insertResponse
} catch (error) { } catch (error) {