fix circular dependency of updateStorageUsage and checkStorage in utils

Author: HenryHengZJ

packages/server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "flowise-bullmq",
-    "version": "3.0.25",
+    "version": "3.0.38",
     "description": "Flowiseai Server",
     "main": "dist/index",
     "types": "dist/index.d.ts",
@@ -28,6 +28,9 @@
         "start:default": "cd bin && ./run start",
         "start-worker:windows": "cd bin && run worker",
         "start-worker:default": "cd bin && ./run worker",
+        "user": "run-script-os",
+        "user:windows": "cd bin && run user",
+        "user:default": "cd bin && ./run user",
         "dev": "nodemon",
         "oclif-dev": "run-script-os",
         "oclif-dev:windows": "cd bin && dev start",

packages/server/src/services/openai-realtime/index.ts

@@ -10,6 +10,7 @@ import {
     getStartingNodes,
     resolveVariables
 } from '../../utils'
+import { checkStorage, updateStorageUsage } from '../../utils/quotaUsage'
 import { getRunningExpressApp } from '../../utils/getRunningExpressApp'
 import { ChatFlow } from '../../database/entities/ChatFlow'
 import { IDepthQueue, IReactFlowNode } from '../../Interface'
@@ -110,7 +111,9 @@ const buildAndInitTool = async (chatflowid: string, _chatId?: string, _apiMessag
         variableOverrides,
         orgId,
         workspaceId,
-        subscriptionId
+        subscriptionId,
+        updateStorageUsage,
+        checkStorage
     })
 
     const nodeToExecute =

packages/server/src/utils/buildChatflow.ts

@@ -515,7 +515,9 @@ export const executeFlow = async ({
         baseURL,
         orgId,
         workspaceId,
-        subscriptionId
+        subscriptionId,
+        updateStorageUsage,
+        checkStorage
     })
 
     const setVariableNodesOutput = getSetVariableNodesOutput(reactFlowNodes)

packages/server/src/utils/index.ts

@@ -64,8 +64,6 @@ import {
     SecretsManagerClient,
     SecretsManagerClientConfig
 } from '@aws-sdk/client-secrets-manager'
-import { checkStorage, updateStorageUsage } from './quotaUsage'
-import { UsageCacheManager } from '../UsageCacheManager'
 
 export const QUESTION_VAR_PREFIX = 'question'
 export const FILE_ATTACHMENT_PREFIX = 'file_attachment'
@@ -206,22 +204,6 @@ export const constructGraphs = (
     return { graph, nodeDependencies }
 }
 
-/**
- * Get starting node and check if flow is valid
- * @param {INodeDependencies} nodeDependencies
- */
-export const getStartingNode = (nodeDependencies: INodeDependencies) => {
-    // Find starting node
-    const startingNodeIds = [] as string[]
-    Object.keys(nodeDependencies).forEach((nodeId) => {
-        if (nodeDependencies[nodeId] === 0) {
-            startingNodeIds.push(nodeId)
-        }
-    })
-
-    return { startingNodeIds }
-}
-
 /**
  * Get starting nodes and check if flow is valid
  * @param {INodeDependencies} graph
@@ -258,6 +240,22 @@ export const getStartingNodes = (graph: INodeDirectedGraph, endNodeId: string) =
     return { startingNodeIds, depthQueue: depthQueueReversed }
 }
 
+/**
+ * Get starting node and check if flow is valid
+ * @param {INodeDependencies} nodeDependencies
+ */
+export const getStartingNode = (nodeDependencies: INodeDependencies) => {
+    // Find starting node
+    const startingNodeIds = [] as string[]
+    Object.keys(nodeDependencies).forEach((nodeId) => {
+        if (nodeDependencies[nodeId] === 0) {
+            startingNodeIds.push(nodeId)
+        }
+    })
+
+    return { startingNodeIds }
+}
+
 /**
  * Get all connected nodes from startnode
  * @param {INodeDependencies} graph
@@ -503,8 +501,10 @@ type BuildFlowParams = {
     orgId?: string
     workspaceId?: string
     subscriptionId?: string
-    usageCacheManager?: UsageCacheManager
+    usageCacheManager?: any
     uploadedFilesContent?: string
+    updateStorageUsage?: (orgId: string, workspaceId: string, totalSize: number, usageCacheManager?: any) => void
+    checkStorage?: (orgId: string, subscriptionId: string, usageCacheManager: any) => Promise<any>
 }
 
 /**
@@ -539,7 +539,9 @@ export const buildFlow = async ({
     orgId,
     workspaceId,
     subscriptionId,
-    usageCacheManager
+    usageCacheManager,
+    updateStorageUsage,
+    checkStorage
 }: BuildFlowParams) => {
     const flowNodes = cloneDeep(reactFlowNodes)
 
@@ -1283,6 +1285,7 @@ export const findAvailableConfigs = (reactFlowNodes: IReactFlowNode[], component
     for (const flowNode of reactFlowNodes) {
         for (const inputParam of flowNode.data.inputParams) {
             let obj: IOverrideConfig | undefined
+
             if (inputParam.type === 'file') {
                 obj = {
                     node: flowNode.data.label,
@@ -1521,6 +1524,7 @@ export const decryptCredentialData = async (
 
     if (USE_AWS_SECRETS_MANAGER && secretsManagerClient) {
         try {
+            logger.info(`[server]: Reading AWS Secret: ${encryptedData}`)
             if (encryptedData.startsWith('FlowiseCredential_')) {
                 const command = new GetSecretValueCommand({ SecretId: encryptedData })
                 const response = await secretsManagerClient.send(command)
@@ -1824,7 +1828,7 @@ export const getUploadPath = (): string => {
         : path.join(getUserHome(), '.flowise', 'uploads')
 }
 
-export function generateId() {
+export const generateId = () => {
     return uuidv4()
 }
 

packages/server/src/utils/upsertVector.ts

@@ -193,7 +193,9 @@ export const executeUpsert = async ({
         variableOverrides,
         orgId,
         workspaceId,
-        subscriptionId
+        subscriptionId,
+        updateStorageUsage,
+        checkStorage
     })
 
     // Save to DB