Environment Variables: injection of variables ($env) into the custom tool and addition of ($flow) object

packages/components/nodes/tools/CustomTool/CustomTool.ts

@@ -80,7 +80,32 @@ class CustomTool_Tools implements INode {
                 code: tool.func
             }
             if (customToolFunc) obj.code = customToolFunc
-            return new DynamicStructuredTool(obj)
+
+            const variables = await appDataSource.getRepository(databaseEntities['Variable']).find()
+
+            // override variables defined in overrideConfig
+            // nodeData.inputs.variables is an Object, check each property and override the variable
+            if (nodeData?.inputs?.variables) {
+                for (const propertyName of Object.getOwnPropertyNames(nodeData.inputs.variables)) {
+                    const foundVar = variables.find((v) => v.name === propertyName)
+                    if (foundVar) {
+                        // even if the variable was defined as runtime, we override it with static value
+                        foundVar.type = 'static'
+                        foundVar.value = nodeData.inputs.variables[propertyName]
+                    } else {
+                        // add it the variables, if not found locally in the db
+                        variables.push({ name: propertyName, type: 'static', value: nodeData.inputs.variables[propertyName] })
+                    }
+                }
+            }
+            const flow = {
+                chatId: options.chatId, // id is uppercase (I)
+                chatflowId: options.chatflowid // id is lowercase (i)
+            }
+            let dynamicStructuredTool = new DynamicStructuredTool(obj)
+            dynamicStructuredTool.setVariables(variables)
+            dynamicStructuredTool.setFlowObject(flow)
+            return dynamicStructuredTool
         } catch (e) {
             throw new Error(e)
         }

packages/components/nodes/tools/CustomTool/core.ts

@@ -2,6 +2,7 @@ import { z } from 'zod'
 import { CallbackManagerForToolRun } from 'langchain/callbacks'
 import { StructuredTool, ToolParams } from 'langchain/tools'
 import { NodeVM } from 'vm2'
+import { logger } from "@zilliz/milvus2-sdk-node";
 
 /*
  * List of dependencies allowed to be import in vm2
@@ -62,6 +63,8 @@ export class DynamicStructuredTool<
     func: DynamicStructuredToolInput['func']
 
     schema: T
+    private variables: any[]
+    private flowObj: any
 
     constructor(fields: DynamicStructuredToolInput<T>) {
         super(fields)
@@ -80,8 +83,26 @@ export class DynamicStructuredTool<
                 sandbox[`$${item}`] = arg[item]
             }
         }
-        sandbox['$env'] = { USER: 'VINOD' }
-        console.log('sandbox === ' + JSON.stringify(sandbox))
+        //inject variables
+        let env = {}
+        if (this.variables) {
+            for (const item of this.variables) {
+                let value = item.value
+                if (item.type === 'runtime') {
+                    value = process.env[item.name]
+                }
+                Object.defineProperty(env, item.name, {
+                    enumerable: true,
+                    configurable: true,
+                    writable: true,
+                    value: value
+                })
+            }
+        }
+        sandbox['$env'] = env
+        if (this.flowObj) {
+            sandbox['$flow'] = this.flowObj
+        }
         const defaultAllowBuiltInDep = [
             'assert',
             'buffer',
@@ -118,4 +139,12 @@ export class DynamicStructuredTool<
 
         return response
     }
+
+    setVariables(variables: any[]) {
+        this.variables = variables
+    }
+
+    setFlowObject(flow: any) {
+        this.flowObj = flow
+    }
 }