Merge pull request #114 from FlowiseAI/feature/Zapier

packages/components/nodes/agents/AutoGPT/AutoGPT.ts

@@ -66,7 +66,8 @@ class AutoGPT_Agents implements INode {
     async init(nodeData: INodeData): Promise<any> {
         const model = nodeData.inputs?.model as BaseChatModel
         const vectorStoreRetriever = nodeData.inputs?.vectorStoreRetriever as VectorStoreRetriever
-        const tools = nodeData.inputs?.tools as Tool[]
+        let tools = nodeData.inputs?.tools as Tool[]
+        tools = tools.flat()
         const aiName = (nodeData.inputs?.aiName as string) || 'AutoGPT'
         const aiRole = (nodeData.inputs?.aiRole as string) || 'Assistant'
         const maxLoop = nodeData.inputs?.maxLoop as string

packages/components/nodes/agents/ConversationalAgent/ConversationalAgent.ts

@@ -62,7 +62,8 @@ class ConversationalAgent_Agents implements INode {
 
     async init(nodeData: INodeData): Promise<any> {
         const model = nodeData.inputs?.model as BaseChatModel
-        const tools = nodeData.inputs?.tools as Tool[]
+        let tools = nodeData.inputs?.tools as Tool[]
+        tools = tools.flat()
         const memory = nodeData.inputs?.memory as BaseChatMemory
         const humanMessage = nodeData.inputs?.humanMessage as string
         const systemMessage = nodeData.inputs?.systemMessage as string

packages/components/nodes/agents/MRKLAgentChat/MRKLAgentChat.ts

@@ -39,7 +39,8 @@ class MRKLAgentChat_Agents implements INode {
 
     async init(nodeData: INodeData): Promise<any> {
         const model = nodeData.inputs?.model as BaseChatModel
-        const tools = nodeData.inputs?.tools as Tool[]
+        let tools = nodeData.inputs?.tools as Tool[]
+        tools = tools.flat()
         const executor = await initializeAgentExecutorWithOptions(tools, model, {
             agentType: 'chat-zero-shot-react-description',
             verbose: true

packages/components/nodes/agents/MRKLAgentLLM/MRKLAgentLLM.ts

@@ -39,7 +39,8 @@ class MRKLAgentLLM_Agents implements INode {
 
     async init(nodeData: INodeData): Promise<any> {
         const model = nodeData.inputs?.model as BaseLLM
-        const tools = nodeData.inputs?.tools as Tool[]
+        let tools = nodeData.inputs?.tools as Tool[]
+        tools = tools.flat()
 
         const executor = await initializeAgentExecutorWithOptions(tools, model, {
             agentType: 'zero-shot-react-description',

packages/components/nodes/tools/ZapierNLA/ZapierNLA.ts

@@ -0,0 +1,45 @@
+import { ZapierNLAWrapper, ZapiterNLAWrapperParams } from 'langchain/tools'
+import { INode, INodeData, INodeParams } from '../../../src/Interface'
+import { ZapierToolKit } from 'langchain/agents'
+
+class ZapierNLA_Tools implements INode {
+    label: string
+    name: string
+    description: string
+    type: string
+    icon: string
+    category: string
+    baseClasses: string[]
+    inputs: INodeParams[]
+
+    constructor() {
+        this.label = 'Zapier NLA'
+        this.name = 'zapierNLA'
+        this.type = 'ZapierNLA'
+        this.icon = 'zapier.png'
+        this.category = 'Tools'
+        this.description = "Access to apps and actions on Zapier's platform through a natural language API interface"
+        this.inputs = [
+            {
+                label: 'Zapier NLA Api Key',
+                name: 'apiKey',
+                type: 'password'
+            }
+        ]
+        this.baseClasses = [this.type, 'Tool']
+    }
+
+    async init(nodeData: INodeData): Promise<any> {
+        const apiKey = nodeData.inputs?.apiKey as string
+
+        const obj: Partial<ZapiterNLAWrapperParams> = {
+            apiKey
+        }
+        const zapier = new ZapierNLAWrapper(obj)
+        const toolkit = await ZapierToolKit.fromZapierNLAWrapper(zapier)
+
+        return toolkit.tools
+    }
+}
+
+module.exports = { nodeClass: ZapierNLA_Tools }

packages/server/marketplaces/Zapier NLA.json

@@ -0,0 +1,274 @@
+{
+    "description": "An agent that uses Zapier NLA to accesss apps and actions on Zapier's platform",
+    "nodes": [
+        {
+            "width": 300,
+            "height": 281,
+            "id": "mrklAgentLLM_0",
+            "position": {
+                "x": 919.3453672085218,
+                "y": 371.80988480957353
+            },
+            "type": "customNode",
+            "data": {
+                "id": "mrklAgentLLM_0",
+                "label": "MRKL Agent for LLMs",
+                "name": "mrklAgentLLM",
+                "type": "AgentExecutor",
+                "baseClasses": ["AgentExecutor", "BaseChain", "BaseLangChain"],
+                "category": "Agents",
+                "description": "Agent that uses the ReAct Framework to decide what action to take, optimized to be used with LLMs",
+                "inputParams": [],
+                "inputAnchors": [
+                    {
+                        "label": "Allowed Tools",
+                        "name": "tools",
+                        "type": "Tool",
+                        "list": true,
+                        "id": "mrklAgentLLM_0-input-tools-Tool"
+                    },
+                    {
+                        "label": "LLM Model",
+                        "name": "model",
+                        "type": "BaseLLM",
+                        "id": "mrklAgentLLM_0-input-model-BaseLLM"
+                    }
+                ],
+                "inputs": {
+                    "tools": ["{{zapierNLA_0.data.instance}}"],
+                    "model": "{{openAI_0.data.instance}}"
+                },
+                "outputAnchors": [
+                    {
+                        "id": "mrklAgentLLM_0-output-mrklAgentLLM-AgentExecutor|BaseChain|BaseLangChain",
+                        "name": "mrklAgentLLM",
+                        "label": "AgentExecutor",
+                        "type": "AgentExecutor | BaseChain | BaseLangChain"
+                    }
+                ],
+                "outputs": {},
+                "selected": false
+            },
+            "selected": false,
+            "positionAbsolute": {
+                "x": 919.3453672085218,
+                "y": 371.80988480957353
+            },
+            "dragging": false
+        },
+        {
+            "width": 300,
+            "height": 279,
+            "id": "zapierNLA_0",
+            "position": {
+                "x": 546.0561178227484,
+                "y": 83.03303671691799
+            },
+            "type": "customNode",
+            "data": {
+                "id": "zapierNLA_0",
+                "label": "Zapier NLA",
+                "name": "zapierNLA",
+                "type": "ZapierNLA",
+                "baseClasses": ["ZapierNLA", "Tool"],
+                "category": "Tools",
+                "description": "Access to apps and actions on Zapier's platform through a natural language API interface",
+                "inputParams": [
+                    {
+                        "label": "Zapier NLA Api Key",
+                        "name": "apiKey",
+                        "type": "password",
+                        "id": "zapierNLA_0-input-apiKey-password"
+                    }
+                ],
+                "inputAnchors": [],
+                "inputs": {},
+                "outputAnchors": [
+                    {
+                        "id": "zapierNLA_0-output-zapierNLA-ZapierNLA|Tool",
+                        "name": "zapierNLA",
+                        "label": "ZapierNLA",
+                        "type": "ZapierNLA | Tool"
+                    }
+                ],
+                "outputs": {},
+                "selected": false
+            },
+            "selected": false,
+            "positionAbsolute": {
+                "x": 546.0561178227484,
+                "y": 83.03303671691799
+            },
+            "dragging": false
+        },
+        {
+            "width": 300,
+            "height": 526,
+            "id": "openAI_0",
+            "position": {
+                "x": 547.3867724775708,
+                "y": 394.1919189424442
+            },
+            "type": "customNode",
+            "data": {
+                "id": "openAI_0",
+                "label": "OpenAI",
+                "name": "openAI",
+                "type": "OpenAI",
+                "baseClasses": ["OpenAI", "BaseLLM", "BaseLanguageModel", "BaseLangChain"],
+                "category": "LLMs",
+                "description": "Wrapper around OpenAI large language models",
+                "inputParams": [
+                    {
+                        "label": "OpenAI Api Key",
+                        "name": "openAIApiKey",
+                        "type": "password",
+                        "id": "openAI_0-input-openAIApiKey-password"
+                    },
+                    {
+                        "label": "Model Name",
+                        "name": "modelName",
+                        "type": "options",
+                        "options": [
+                            {
+                                "label": "text-davinci-003",
+                                "name": "text-davinci-003"
+                            },
+                            {
+                                "label": "text-davinci-002",
+                                "name": "text-davinci-002"
+                            },
+                            {
+                                "label": "text-curie-001",
+                                "name": "text-curie-001"
+                            },
+                            {
+                                "label": "text-babbage-001",
+                                "name": "text-babbage-001"
+                            }
+                        ],
+                        "default": "text-davinci-003",
+                        "optional": true,
+                        "id": "openAI_0-input-modelName-options"
+                    },
+                    {
+                        "label": "Temperature",
+                        "name": "temperature",
+                        "type": "number",
+                        "default": 0.7,
+                        "optional": true,
+                        "id": "openAI_0-input-temperature-number"
+                    },
+                    {
+                        "label": "Max Tokens",
+                        "name": "maxTokens",
+                        "type": "number",
+                        "optional": true,
+                        "additionalParams": true,
+                        "id": "openAI_0-input-maxTokens-number"
+                    },
+                    {
+                        "label": "Top Probability",
+                        "name": "topP",
+                        "type": "number",
+                        "optional": true,
+                        "additionalParams": true,
+                        "id": "openAI_0-input-topP-number"
+                    },
+                    {
+                        "label": "Best Of",
+                        "name": "bestOf",
+                        "type": "number",
+                        "optional": true,
+                        "additionalParams": true,
+                        "id": "openAI_0-input-bestOf-number"
+                    },
+                    {
+                        "label": "Frequency Penalty",
+                        "name": "frequencyPenalty",
+                        "type": "number",
+                        "optional": true,
+                        "additionalParams": true,
+                        "id": "openAI_0-input-frequencyPenalty-number"
+                    },
+                    {
+                        "label": "Presence Penalty",
+                        "name": "presencePenalty",
+                        "type": "number",
+                        "optional": true,
+                        "additionalParams": true,
+                        "id": "openAI_0-input-presencePenalty-number"
+                    },
+                    {
+                        "label": "Batch Size",
+                        "name": "batchSize",
+                        "type": "number",
+                        "optional": true,
+                        "additionalParams": true,
+                        "id": "openAI_0-input-batchSize-number"
+                    },
+                    {
+                        "label": "Timeout",
+                        "name": "timeout",
+                        "type": "number",
+                        "optional": true,
+                        "additionalParams": true,
+                        "id": "openAI_0-input-timeout-number"
+                    }
+                ],
+                "inputAnchors": [],
+                "inputs": {
+                    "modelName": "text-davinci-003",
+                    "temperature": 0.7,
+                    "maxTokens": "",
+                    "topP": "",
+                    "bestOf": "",
+                    "frequencyPenalty": "",
+                    "presencePenalty": "",
+                    "batchSize": "",
+                    "timeout": ""
+                },
+                "outputAnchors": [
+                    {
+                        "id": "openAI_0-output-openAI-OpenAI|BaseLLM|BaseLanguageModel|BaseLangChain",
+                        "name": "openAI",
+                        "label": "OpenAI",
+                        "type": "OpenAI | BaseLLM | BaseLanguageModel | BaseLangChain"
+                    }
+                ],
+                "outputs": {},
+                "selected": false
+            },
+            "selected": false,
+            "positionAbsolute": {
+                "x": 547.3867724775708,
+                "y": 394.1919189424442
+            },
+            "dragging": false
+        }
+    ],
+    "edges": [
+        {
+            "source": "zapierNLA_0",
+            "sourceHandle": "zapierNLA_0-output-zapierNLA-ZapierNLA|Tool",
+            "target": "mrklAgentLLM_0",
+            "targetHandle": "mrklAgentLLM_0-input-tools-Tool",
+            "type": "buttonedge",
+            "id": "zapierNLA_0-zapierNLA_0-output-zapierNLA-ZapierNLA|Tool-mrklAgentLLM_0-mrklAgentLLM_0-input-tools-Tool",
+            "data": {
+                "label": ""
+            }
+        },
+        {
+            "source": "openAI_0",
+            "sourceHandle": "openAI_0-output-openAI-OpenAI|BaseLLM|BaseLanguageModel|BaseLangChain",
+            "target": "mrklAgentLLM_0",
+            "targetHandle": "mrklAgentLLM_0-input-model-BaseLLM",
+            "type": "buttonedge",
+            "id": "openAI_0-openAI_0-output-openAI-OpenAI|BaseLLM|BaseLanguageModel|BaseLangChain-mrklAgentLLM_0-mrklAgentLLM_0-input-model-BaseLLM",
+            "data": {
+                "label": ""
+            }
+        }
+    ]
+}