Allows CustomFunction to be set as an Ending Node

packages/components/nodes/utilities/CustomFunction/CustomFunction.ts

@@ -52,11 +52,19 @@ class CustomFunction_Utilities implements INode {
                 label: 'Output',
                 name: 'output',
                 baseClasses: ['string', 'number', 'boolean', 'json', 'array']
+            },
+            {
+                label: 'Ending Node',
+                name: 'EndingNode',
+                baseClasses: [this.type]
             }
         ]
     }
 
     async init(nodeData: INodeData, input: string, options: ICommonObject): Promise<any> {
+        const isEndingNode = nodeData?.outputs?.output === 'EndingNode'
+        if (isEndingNode && !options.isRun) return // prevent running both init and run twice
+
         const javascriptFunction = nodeData.inputs?.javascriptFunction as string
         const functionInputVariablesRaw = nodeData.inputs?.functionInputVariables
         const appDataSource = options.appDataSource as DataSource
@@ -123,7 +131,8 @@ class CustomFunction_Utilities implements INode {
         const vm = new NodeVM(nodeVMOptions)
         try {
             const response = await vm.run(`module.exports = async function() {${javascriptFunction}}()`, __dirname)
-            if (typeof response === 'string') {
+
+            if (typeof response === 'string' && !isEndingNode) {
                 return handleEscapeCharacters(response, false)
             }
             return response
@@ -131,6 +140,10 @@ class CustomFunction_Utilities implements INode {
             throw new Error(e)
         }
     }
+
+    async run(nodeData: INodeData, input: string, options: ICommonObject): Promise<string> {
+        return await this.init(nodeData, input, { ...options, isRun: true })
+    }
 }
 
 module.exports = { nodeClass: CustomFunction_Utilities }

packages/server/src/index.ts

@@ -465,9 +465,13 @@ export class App {
                 const endingNodeData = endingNode.data
                 if (!endingNodeData) return res.status(500).send(`Ending node ${endingNode.id} data not found`)
 
+                const isEndingNode = endingNodeData?.outputs?.output === 'EndingNode'
+
+                if (!isEndingNode) {
                     if (endingNodeData && endingNodeData.category !== 'Chains' && endingNodeData.category !== 'Agents') {
                         return res.status(500).send(`Ending node must be either a Chain or Agent`)
                     }
+                }
 
                 isStreaming = isFlowValidForStream(nodes, endingNodeData)
             }
@@ -1665,21 +1669,21 @@ export class App {
                     const endingNodeData = endingNode.data
                     if (!endingNodeData) return res.status(500).send(`Ending node ${endingNode.id} data not found`)
 
+                    const isEndingNode = endingNodeData?.outputs?.output === 'EndingNode'
+
+                    if (!isEndingNode) {
                         if (endingNodeData && endingNodeData.category !== 'Chains' && endingNodeData.category !== 'Agents') {
                             return res.status(500).send(`Ending node must be either a Chain or Agent`)
                         }
 
-                    if (
+                        if (!Object.values(endingNodeData.outputs ?? {}).includes(endingNodeData.name)) {
-                        endingNodeData.outputs &&
-                        Object.keys(endingNodeData.outputs).length &&
-                        !Object.values(endingNodeData.outputs).includes(endingNodeData.name)
-                    ) {
                             return res
                                 .status(500)
                                 .send(
                                     `Output of ${endingNodeData.label} (${endingNodeData.id}) must be ${endingNodeData.label}, can't be an Output Prediction`
                                 )
                         }
+                    }
 
                     isStreamValid = isFlowValidForStream(nodes, endingNodeData)
                 }