Merge pull request #1 from FlowiseAI/feature/ChatGPT-Plugin

Feature/Add tools for ChatGPT plugins

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

@@ -1,6 +1,5 @@
 import { INode, INodeData, INodeParams } from '../../../src/Interface'
-import { initializeAgentExecutor, AgentExecutor } from 'langchain/agents'
+import { initializeAgentExecutor, AgentExecutor, Tool } from 'langchain/agents'
-import { Tool } from 'langchain/tools'
 import { BaseChatModel } from 'langchain/chat_models/base'
 import { getBaseClasses } from '../../../src/utils'
 

packages/components/nodes/tools/AIPlugin/AIPlugin.ts

@@ -0,0 +1,41 @@
+import { INode, INodeData, INodeParams } from '../../../src/Interface'
+import { AIPluginTool } from 'langchain/tools'
+import { getBaseClasses } from '../../../src/utils'
+
+class AIPlugin implements INode {
+    label: string
+    name: string
+    description: string
+    type: string
+    icon: string
+    category: string
+    baseClasses: string[]
+    inputs?: INodeParams[]
+
+    constructor() {
+        this.label = 'AI Plugin'
+        this.name = 'aiPlugin'
+        this.type = 'AIPlugin'
+        this.icon = 'aiplugin.svg'
+        this.category = 'Tools'
+        this.description = 'Execute actions using ChatGPT Plugin Url'
+        this.baseClasses = [this.type, ...getBaseClasses(AIPluginTool)]
+        this.inputs = [
+            {
+                label: 'Plugin Url',
+                name: 'pluginUrl',
+                type: 'string',
+                placeholder: 'https://www.klarna.com/.well-known/ai-plugin.json'
+            }
+        ]
+    }
+
+    async init(nodeData: INodeData): Promise<any> {
+        const pluginUrl = nodeData.inputs?.pluginUrl as string
+        const aiplugin = await AIPluginTool.fromPluginUrl(pluginUrl)
+
+        return aiplugin
+    }
+}
+
+module.exports = { nodeClass: AIPlugin }

packages/components/nodes/tools/AIPlugin/aiplugin.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-plug" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+   <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+   <path d="M9.785 6l8.215 8.215l-2.054 2.054a5.81 5.81 0 1 1 -8.215 -8.215l2.054 -2.054z"></path>
+   <path d="M4 20l3.5 -3.5"></path>
+   <path d="M15 4l-3.5 3.5"></path>
+   <path d="M20 9l-3.5 3.5"></path>
+</svg>

packages/server/marketplaces/ChatGPTPlugin.json

@@ -0,0 +1,307 @@
+{
+    "description": "Use ChatGPT Plugins within LangChain abstractions with GET and POST Tools",
+    "nodes": [
+        {
+            "width": 300,
+            "height": 278,
+            "id": "aiPlugin_0",
+            "position": {
+                "x": 992.9213747553727,
+                "y": 115.80946637479596
+            },
+            "type": "customNode",
+            "data": {
+                "id": "aiPlugin_0",
+                "label": "AI Plugin",
+                "name": "aiPlugin",
+                "type": "AIPlugin",
+                "baseClasses": ["AIPlugin", "Tool"],
+                "category": "Tools",
+                "description": "Execute actions using ChatGPT Plugin Url",
+                "inputParams": [
+                    {
+                        "label": "Plugin Url",
+                        "name": "pluginUrl",
+                        "type": "string",
+                        "placeholder": "https://www.klarna.com/.well-known/ai-plugin.json"
+                    }
+                ],
+                "inputAnchors": [],
+                "inputs": {
+                    "pluginUrl": "https://www.klarna.com/.well-known/ai-plugin.json"
+                },
+                "outputAnchors": [
+                    {
+                        "id": "aiPlugin_0-output-aiPlugin-AIPlugin|Tool",
+                        "name": "aiPlugin",
+                        "label": "AIPlugin",
+                        "type": "AIPlugin | Tool"
+                    }
+                ],
+                "selected": false
+            },
+            "selected": false,
+            "positionAbsolute": {
+                "x": 992.9213747553727,
+                "y": 115.80946637479596
+            },
+            "dragging": false
+        },
+        {
+            "width": 300,
+            "height": 143,
+            "id": "requestsPost_0",
+            "position": {
+                "x": 638.2831241951309,
+                "y": 294.0784991300699
+            },
+            "type": "customNode",
+            "data": {
+                "id": "requestsPost_0",
+                "label": "Requests Post",
+                "name": "requestsPost",
+                "type": "RequestsPost",
+                "baseClasses": ["RequestsPost", "Tool"],
+                "category": "Tools",
+                "description": "Execute HTTP POST requests",
+                "inputParams": [],
+                "inputAnchors": [],
+                "inputs": {},
+                "outputAnchors": [
+                    {
+                        "id": "requestsPost_0-output-requestsPost-RequestsPost|Tool",
+                        "name": "requestsPost",
+                        "label": "RequestsPost",
+                        "type": "RequestsPost | Tool"
+                    }
+                ],
+                "selected": false
+            },
+            "positionAbsolute": {
+                "x": 638.2831241951309,
+                "y": 294.0784991300699
+            },
+            "selected": false,
+            "dragging": false
+        },
+        {
+            "width": 300,
+            "height": 143,
+            "id": "requestsGet_0",
+            "position": {
+                "x": 703.0477667387721,
+                "y": 476.8955204497346
+            },
+            "type": "customNode",
+            "data": {
+                "id": "requestsGet_0",
+                "label": "Requests Get",
+                "name": "requestsGet",
+                "type": "RequestsGet",
+                "baseClasses": ["RequestsGet", "Tool"],
+                "category": "Tools",
+                "description": "Execute HTTP GET requests",
+                "inputParams": [],
+                "inputAnchors": [],
+                "inputs": {},
+                "outputAnchors": [
+                    {
+                        "id": "requestsGet_0-output-requestsGet-RequestsGet|Tool",
+                        "name": "requestsGet",
+                        "label": "RequestsGet",
+                        "type": "RequestsGet | Tool"
+                    }
+                ],
+                "selected": false
+            },
+            "selected": false,
+            "positionAbsolute": {
+                "x": 703.0477667387721,
+                "y": 476.8955204497346
+            },
+            "dragging": false
+        },
+        {
+            "width": 300,
+            "height": 280,
+            "id": "mrklAgentChat_0",
+            "position": {
+                "x": 1363.057715565282,
+                "y": 479.27393467974
+            },
+            "type": "customNode",
+            "data": {
+                "id": "mrklAgentChat_0",
+                "label": "MRKL Agent for Chat Models",
+                "name": "mrklAgentChat",
+                "type": "AgentExecutor",
+                "baseClasses": ["AgentExecutor", "BaseChain"],
+                "category": "Agents",
+                "description": "Agent that uses the ReAct Framework to decide what action to take, optimized to be used with Chat Models",
+                "inputParams": [],
+                "inputAnchors": [
+                    {
+                        "label": "Allowed Tools",
+                        "name": "tools",
+                        "type": "Tool",
+                        "list": true,
+                        "id": "mrklAgentChat_0-input-tools-Tool"
+                    },
+                    {
+                        "label": "Chat Model",
+                        "name": "model",
+                        "type": "BaseChatModel",
+                        "id": "mrklAgentChat_0-input-model-BaseChatModel"
+                    }
+                ],
+                "inputs": {
+                    "tools": ["{{requestsGet_0.data.instance}}", "{{requestsPost_0.data.instance}}", "{{aiPlugin_0.data.instance}}"],
+                    "model": "{{chatOpenAI_0.data.instance}}"
+                },
+                "outputAnchors": [
+                    {
+                        "id": "mrklAgentChat_0-output-mrklAgentChat-AgentExecutor|BaseChain",
+                        "name": "mrklAgentChat",
+                        "label": "AgentExecutor",
+                        "type": "AgentExecutor | BaseChain"
+                    }
+                ],
+                "selected": false
+            },
+            "selected": false,
+            "positionAbsolute": {
+                "x": 1363.057715565282,
+                "y": 479.27393467974
+            },
+            "dragging": false
+        },
+        {
+            "width": 300,
+            "height": 472,
+            "id": "chatOpenAI_0",
+            "position": {
+                "x": 724.4534948088211,
+                "y": 668.3578659651726
+            },
+            "type": "customNode",
+            "data": {
+                "id": "chatOpenAI_0",
+                "label": "ChatOpenAI",
+                "name": "chatOpenAI",
+                "type": "ChatOpenAI",
+                "baseClasses": ["ChatOpenAI", "BaseChatModel", "BaseLanguageModel"],
+                "category": "Chat Models",
+                "description": "Wrapper around OpenAI large language models that use the Chat endpoint",
+                "inputParams": [
+                    {
+                        "label": "OpenAI Api Key",
+                        "name": "openAIApiKey",
+                        "type": "password"
+                    },
+                    {
+                        "label": "Model Name",
+                        "name": "modelName",
+                        "type": "options",
+                        "options": [
+                            {
+                                "label": "gpt-4",
+                                "name": "gpt-4"
+                            },
+                            {
+                                "label": "gpt-4-0314",
+                                "name": "gpt-4-0314"
+                            },
+                            {
+                                "label": "gpt-4-32k-0314",
+                                "name": "gpt-4-32k-0314"
+                            },
+                            {
+                                "label": "gpt-3.5-turbo",
+                                "name": "gpt-3.5-turbo"
+                            },
+                            {
+                                "label": "gpt-3.5-turbo-0301",
+                                "name": "gpt-3.5-turbo-0301"
+                            }
+                        ],
+                        "default": "gpt-3.5-turbo",
+                        "optional": true
+                    },
+                    {
+                        "label": "Temperature",
+                        "name": "temperature",
+                        "type": "number",
+                        "default": 0.9,
+                        "optional": true
+                    }
+                ],
+                "inputAnchors": [],
+                "inputs": {
+                    "modelName": "gpt-3.5-turbo",
+                    "temperature": "0"
+                },
+                "outputAnchors": [
+                    {
+                        "id": "chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel",
+                        "name": "chatOpenAI",
+                        "label": "ChatOpenAI",
+                        "type": "ChatOpenAI | BaseChatModel | BaseLanguageModel"
+                    }
+                ],
+                "selected": false
+            },
+            "selected": false,
+            "positionAbsolute": {
+                "x": 724.4534948088211,
+                "y": 668.3578659651726
+            },
+            "dragging": false
+        }
+    ],
+    "edges": [
+        {
+            "source": "aiPlugin_0",
+            "sourceHandle": "aiPlugin_0-output-aiPlugin-AIPlugin|Tool",
+            "target": "mrklAgentChat_0",
+            "targetHandle": "mrklAgentChat_0-input-tools-Tool",
+            "type": "buttonedge",
+            "id": "aiPlugin_0-aiPlugin_0-output-aiPlugin-AIPlugin|Tool-mrklAgentChat_0-mrklAgentChat_0-input-tools-Tool",
+            "data": {
+                "label": ""
+            }
+        },
+        {
+            "source": "requestsGet_0",
+            "sourceHandle": "requestsGet_0-output-requestsGet-RequestsGet|Tool",
+            "target": "mrklAgentChat_0",
+            "targetHandle": "mrklAgentChat_0-input-tools-Tool",
+            "type": "buttonedge",
+            "id": "requestsGet_0-requestsGet_0-output-requestsGet-RequestsGet|Tool-mrklAgentChat_0-mrklAgentChat_0-input-tools-Tool",
+            "data": {
+                "label": ""
+            }
+        },
+        {
+            "source": "requestsPost_0",
+            "sourceHandle": "requestsPost_0-output-requestsPost-RequestsPost|Tool",
+            "target": "mrklAgentChat_0",
+            "targetHandle": "mrklAgentChat_0-input-tools-Tool",
+            "type": "buttonedge",
+            "id": "requestsPost_0-requestsPost_0-output-requestsPost-RequestsPost|Tool-mrklAgentChat_0-mrklAgentChat_0-input-tools-Tool",
+            "data": {
+                "label": ""
+            }
+        },
+        {
+            "source": "chatOpenAI_0",
+            "sourceHandle": "chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel",
+            "target": "mrklAgentChat_0",
+            "targetHandle": "mrklAgentChat_0-input-model-BaseChatModel",
+            "type": "buttonedge",
+            "id": "chatOpenAI_0-chatOpenAI_0-output-chatOpenAI-ChatOpenAI|BaseChatModel|BaseLanguageModel-mrklAgentChat_0-mrklAgentChat_0-input-model-BaseChatModel",
+            "data": {
+                "label": ""
+            }
+        }
+    ]
+}

packages/ui/src/utils/genericHelper.js

@@ -233,3 +233,20 @@ export const copyToClipboard = (e) => {
         navigator.clipboard.writeText(src)
     }
 }
+
+export const rearrangeToolsOrdering = (newValues, sourceNodeId) => {
+    // RequestsGet and RequestsPost have to be in order before other tools
+    newValues.push(`{{${sourceNodeId}.data.instance}}`)
+
+    const sortKey = (item) => {
+        if (item.includes('requestsGet')) {
+            return 0
+        } else if (item.includes('requestsPost')) {
+            return 1
+        } else {
+            return 2
+        }
+    }
+
+    newValues.sort((a, b) => sortKey(a) - sortKey(b))
+}

packages/ui/src/views/canvas/index.js

@@ -38,7 +38,7 @@ import useConfirm from 'hooks/useConfirm'
 import { IconX } from '@tabler/icons'
 
 // utils
-import { getUniqueNodeId, initNode, getEdgeLabelName } from 'utils/genericHelper'
+import { getUniqueNodeId, initNode, getEdgeLabelName, rearrangeToolsOrdering } from 'utils/genericHelper'
 import useNotifier from 'utils/useNotifier'
 
 const nodeTypes = { customNode: CanvasNode }
@@ -110,7 +110,11 @@ const Canvas = () => {
                     const inputAnchor = node.data.inputAnchors.find((ancr) => ancr.name === targetInput)
                     if (inputAnchor && inputAnchor.list) {
                         const newValues = node.data.inputs[targetInput] || []
+                        if (targetInput === 'tools') {
+                            rearrangeToolsOrdering(newValues, sourceNodeId)
+                        } else {
                             newValues.push(`{{${sourceNodeId}.data.instance}}`)
+                        }
                         value = newValues
                     } else {
                         value = `{{${sourceNodeId}.data.instance}}`