Merge branch 'main' into FEATURE/Vision

# Conflicts:
#	packages/components/nodes/agents/ConversationalAgent/ConversationalAgent.ts
#	packages/components/nodes/agents/MRKLAgentChat/MRKLAgentChat.ts
#	packages/components/nodes/chains/ConversationChain/ConversationChain.ts
#	packages/components/nodes/chains/LLMChain/LLMChain.ts
#	packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI.ts

packages/components/nodes/agents/AirtableAgent/AirtableAgent.ts

@@ -1,11 +1,11 @@
-import { ICommonObject, INode, INodeData, INodeParams, PromptTemplate } from '../../../src/Interface'
-import { AgentExecutor } from 'langchain/agents'
-import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
-import { LoadPyodide, finalSystemPrompt, systemPrompt } from './core'
-import { LLMChain } from 'langchain/chains'
-import { BaseLanguageModel } from 'langchain/base_language'
-import { ConsoleCallbackHandler, CustomChainHandler, additionalCallbacks } from '../../../src/handler'
 import axios from 'axios'
+import { BaseLanguageModel } from '@langchain/core/language_models/base'
+import { AgentExecutor } from 'langchain/agents'
+import { LLMChain } from 'langchain/chains'
+import { ICommonObject, INode, INodeData, INodeParams, PromptTemplate } from '../../../src/Interface'
+import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
+import { ConsoleCallbackHandler, CustomChainHandler, additionalCallbacks } from '../../../src/handler'
+import { LoadPyodide, finalSystemPrompt, systemPrompt } from './core'
 
 class Airtable_Agents implements INode {
     label: string

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

@@ -1,13 +1,12 @@
-import { INode, INodeData, INodeParams } from '../../../src/Interface'
-import { BaseChatModel } from 'langchain/chat_models/base'
-import { AutoGPT } from 'langchain/experimental/autogpt'
-import { Tool } from 'langchain/tools'
-import { AIMessage, HumanMessage, SystemMessage } from 'langchain/schema'
-import { VectorStoreRetriever } from 'langchain/vectorstores/base'
 import { flatten } from 'lodash'
-import { StructuredTool } from 'langchain/tools'
+import { Tool, StructuredTool } from '@langchain/core/tools'
+import { BaseChatModel } from '@langchain/core/language_models/chat_models'
+import { AIMessage, HumanMessage, SystemMessage } from '@langchain/core/messages'
+import { VectorStoreRetriever } from '@langchain/core/vectorstores'
+import { PromptTemplate } from '@langchain/core/prompts'
+import { AutoGPT } from 'langchain/experimental/autogpt'
 import { LLMChain } from 'langchain/chains'
-import { PromptTemplate } from 'langchain/prompts'
+import { INode, INodeData, INodeParams } from '../../../src/Interface'
 
 type ObjectTool = StructuredTool
 const FINISH_NAME = 'finish'

packages/components/nodes/agents/BabyAGI/BabyAGI.ts

@@ -1,7 +1,7 @@
+import { BaseChatModel } from '@langchain/core/language_models/chat_models'
+import { VectorStore } from '@langchain/core/vectorstores'
 import { INode, INodeData, INodeParams } from '../../../src/Interface'
 import { BabyAGI } from './core'
-import { BaseChatModel } from 'langchain/chat_models/base'
-import { VectorStore } from 'langchain/vectorstores/base'
 
 class BabyAGI_Agents implements INode {
     label: string

packages/components/nodes/agents/BabyAGI/core.ts

@@ -1,8 +1,8 @@
+import { BaseChatModel } from '@langchain/core/language_models/chat_models'
+import { VectorStore } from '@langchain/core/vectorstores'
+import { Document } from '@langchain/core/documents'
+import { PromptTemplate } from '@langchain/core/prompts'
 import { LLMChain } from 'langchain/chains'
-import { BaseChatModel } from 'langchain/chat_models/base'
-import { VectorStore } from 'langchain/dist/vectorstores/base'
-import { Document } from 'langchain/document'
-import { PromptTemplate } from 'langchain/prompts'
 
 class TaskCreationChain extends LLMChain {
     constructor(prompt: PromptTemplate, llm: BaseChatModel) {

packages/components/nodes/agents/CSVAgent/CSVAgent.ts

@@ -1,10 +1,10 @@
-import { ICommonObject, INode, INodeData, INodeParams, PromptTemplate } from '../../../src/Interface'
+import { BaseLanguageModel } from '@langchain/core/language_models/base'
 import { AgentExecutor } from 'langchain/agents'
+import { LLMChain } from 'langchain/chains'
+import { ConsoleCallbackHandler, CustomChainHandler, additionalCallbacks } from '../../../src/handler'
+import { ICommonObject, INode, INodeData, INodeParams, PromptTemplate } from '../../../src/Interface'
 import { getBaseClasses } from '../../../src/utils'
 import { LoadPyodide, finalSystemPrompt, systemPrompt } from './core'
-import { LLMChain } from 'langchain/chains'
-import { BaseLanguageModel } from 'langchain/base_language'
-import { ConsoleCallbackHandler, CustomChainHandler, additionalCallbacks } from '../../../src/handler'
 
 class CSV_Agents implements INode {
     label: string

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

@@ -1,14 +1,16 @@
-import { Tool } from 'langchain/tools'
-import { BaseChatModel } from 'langchain/chat_models/base'
 import { flatten } from 'lodash'
-import { AgentStep, BaseMessage, ChainValues, AIMessage, HumanMessage } from 'langchain/schema'
-import { RunnableSequence } from 'langchain/schema/runnable'
+import { Tool } from '@langchain/core/tools'
+import { BaseChatModel } from '@langchain/core/language_models/chat_models'
+import { AIMessage, BaseMessage, HumanMessage } from '@langchain/core/messages'
+import { ChainValues } from '@langchain/core/utils/types'
+import { AgentStep } from '@langchain/core/agents'
+import { renderTemplate } from '@langchain/core/prompts'
+import { RunnableSequence } from '@langchain/core/runnables'
+import { ChatConversationalAgent } from 'langchain/agents'
 import { getBaseClasses } from '../../../src/utils'
 import { ConsoleCallbackHandler, CustomChainHandler, additionalCallbacks } from '../../../src/handler'
 import { FlowiseMemory, ICommonObject, IMessage, INode, INodeData, INodeParams } from '../../../src/Interface'
 import { AgentExecutor } from '../../../src/agents'
-import { ChatConversationalAgent } from 'langchain/agents'
-import { renderTemplate } from '@langchain/core/prompts'
 import { injectAgentExecutorNodeData } from '../../../src/multiModalUtils'
 
 const DEFAULT_PREFIX = `Assistant is a large language model trained by OpenAI.

packages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts

@@ -1,13 +1,14 @@
-import { ChainValues, AgentStep, BaseMessage } from 'langchain/schema'
 import { flatten } from 'lodash'
-import { ChatOpenAI } from 'langchain/chat_models/openai'
-import { ChatPromptTemplate, MessagesPlaceholder } from 'langchain/prompts'
-import { formatToOpenAIFunction } from 'langchain/tools'
-import { RunnableSequence } from 'langchain/schema/runnable'
+import { BaseMessage } from '@langchain/core/messages'
+import { ChainValues } from '@langchain/core/utils/types'
+import { AgentStep } from '@langchain/core/agents'
+import { RunnableSequence } from '@langchain/core/runnables'
+import { ChatOpenAI, formatToOpenAIFunction } from '@langchain/openai'
+import { ChatPromptTemplate, MessagesPlaceholder } from '@langchain/core/prompts'
+import { OpenAIFunctionsAgentOutputParser } from 'langchain/agents/openai/output_parser'
 import { FlowiseMemory, ICommonObject, IMessage, INode, INodeData, INodeParams } from '../../../src/Interface'
 import { getBaseClasses } from '../../../src/utils'
 import { ConsoleCallbackHandler, CustomChainHandler, additionalCallbacks } from '../../../src/handler'
-import { OpenAIFunctionsAgentOutputParser } from 'langchain/agents/openai/output_parser'
 import { AgentExecutor, formatAgentSteps } from '../../../src/agents'
 
 const defaultMessage = `Do your best to answer the questions. Feel free to use any tools available to look up relevant information, only if necessary.`

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

@@ -1,10 +1,12 @@
-import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
-import { initializeAgentExecutorWithOptions, AgentExecutor } from 'langchain/agents'
-import { getBaseClasses } from '../../../src/utils'
-import { Tool } from 'langchain/tools'
-import { BaseLanguageModel } from 'langchain/base_language'
 import { flatten } from 'lodash'
+import { AgentExecutor, createReactAgent } from 'langchain/agents'
+import { pull } from 'langchain/hub'
+import { Tool } from '@langchain/core/tools'
+import type { PromptTemplate } from '@langchain/core/prompts'
+import { BaseChatModel } from '@langchain/core/language_models/chat_models'
 import { additionalCallbacks } from '../../../src/handler'
+import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
+import { getBaseClasses } from '../../../src/utils'
 import { injectLcAgentExecutorNodeData } from '../../../src/multiModalUtils'
 
 class MRKLAgentChat_Agents implements INode {
@@ -21,7 +23,7 @@ class MRKLAgentChat_Agents implements INode {
     constructor() {
         this.label = 'ReAct Agent for Chat Models'
         this.name = 'mrklAgentChat'
-        this.version = 1.0
+        this.version = 2.0
         this.type = 'AgentExecutor'
         this.category = 'Agents'
         this.icon = 'agent.svg'
@@ -35,31 +37,43 @@ class MRKLAgentChat_Agents implements INode {
                 list: true
             },
             {
-                label: 'Language Model',
+                label: 'Chat Model',
                 name: 'model',
-                type: 'BaseLanguageModel'
+                type: 'BaseChatModel'
             }
         ]
     }
 
-    async init(nodeData: INodeData): Promise<any> {
-        const model = nodeData.inputs?.model as BaseLanguageModel
-        let tools = nodeData.inputs?.tools as Tool[]
-        tools = flatten(tools)
-        const executor = await initializeAgentExecutorWithOptions(tools, model, {
-            agentType: 'chat-zero-shot-react-description',
-            verbose: process.env.DEBUG === 'true'
-        })
-        return executor
+    async init(): Promise<any> {
+        return null
     }
 
     async run(nodeData: INodeData, input: string, options: ICommonObject): Promise<string> {
-        const executor = nodeData.instance as AgentExecutor
+        const model = nodeData.inputs?.model as BaseChatModel
+        let tools = nodeData.inputs?.tools as Tool[]
+        tools = flatten(tools)
+
+        const promptWithChat = await pull<PromptTemplate>('hwchase17/react-chat')
+
+        const agent = await createReactAgent({
+            llm: model,
+            tools,
+            prompt: promptWithChat
+        })
+
+        const executor = new AgentExecutor({
+            agent,
+            tools,
+            verbose: process.env.DEBUG === 'true' ? true : false
+        })
         injectLcAgentExecutorNodeData(executor, nodeData, options)
 
         const callbacks = await additionalCallbacks(nodeData, options)
 
-        const result = await executor.call({ input }, [...callbacks])
+        const result = await executor.invoke({
+            input,
+            callbacks
+        })
 
         return result?.output
     }

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

@@ -1,10 +1,12 @@
-import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
-import { initializeAgentExecutorWithOptions, AgentExecutor } from 'langchain/agents'
-import { Tool } from 'langchain/tools'
-import { getBaseClasses } from '../../../src/utils'
-import { BaseLanguageModel } from 'langchain/base_language'
 import { flatten } from 'lodash'
+import { AgentExecutor, createReactAgent } from 'langchain/agents'
+import { pull } from 'langchain/hub'
+import { Tool } from '@langchain/core/tools'
+import type { PromptTemplate } from '@langchain/core/prompts'
+import { BaseLanguageModel } from 'langchain/base_language'
 import { additionalCallbacks } from '../../../src/handler'
+import { getBaseClasses } from '../../../src/utils'
+import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
 
 class MRKLAgentLLM_Agents implements INode {
     label: string
@@ -41,24 +43,35 @@ class MRKLAgentLLM_Agents implements INode {
         ]
     }
 
-    async init(nodeData: INodeData): Promise<any> {
+    async init(): Promise<any> {
+        return null
+    }
+
+    async run(nodeData: INodeData, input: string, options: ICommonObject): Promise<string> {
         const model = nodeData.inputs?.model as BaseLanguageModel
         let tools = nodeData.inputs?.tools as Tool[]
         tools = flatten(tools)
 
-        const executor = await initializeAgentExecutorWithOptions(tools, model, {
-            agentType: 'zero-shot-react-description',
+        const prompt = await pull<PromptTemplate>('hwchase17/react')
+
+        const agent = await createReactAgent({
+            llm: model,
+            tools,
+            prompt
+        })
+
+        const executor = new AgentExecutor({
+            agent,
+            tools,
             verbose: process.env.DEBUG === 'true' ? true : false
         })
-        return executor
-    }
-
-    async run(nodeData: INodeData, input: string, options: ICommonObject): Promise<string> {
-        const executor = nodeData.instance as AgentExecutor
 
         const callbacks = await additionalCallbacks(nodeData, options)
 
-        const result = await executor.call({ input }, [...callbacks])
+        const result = await executor.invoke({
+            input,
+            callbacks
+        })
 
         return result?.output
     }

packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts

@@ -1,13 +1,14 @@
-import { ChainValues, AgentStep, BaseMessage } from 'langchain/schema'
-import { getBaseClasses } from '../../../src/utils'
 import { flatten } from 'lodash'
-import { RunnableSequence } from 'langchain/schema/runnable'
-import { formatToOpenAIFunction } from 'langchain/tools'
-import { ChatOpenAI } from 'langchain/chat_models/openai'
+import { BaseMessage } from '@langchain/core/messages'
+import { ChainValues } from '@langchain/core/utils/types'
+import { AgentStep } from '@langchain/core/agents'
+import { RunnableSequence } from '@langchain/core/runnables'
+import { ChatOpenAI, formatToOpenAIFunction } from '@langchain/openai'
+import { ChatPromptTemplate, MessagesPlaceholder } from '@langchain/core/prompts'
+import { OpenAIFunctionsAgentOutputParser } from 'langchain/agents/openai/output_parser'
+import { getBaseClasses } from '../../../src/utils'
 import { FlowiseMemory, ICommonObject, IMessage, INode, INodeData, INodeParams } from '../../../src/Interface'
 import { ConsoleCallbackHandler, CustomChainHandler, additionalCallbacks } from '../../../src/handler'
-import { ChatPromptTemplate, MessagesPlaceholder } from 'langchain/prompts'
-import { OpenAIFunctionsAgentOutputParser } from 'langchain/agents/openai/output_parser'
 import { AgentExecutor, formatAgentSteps } from '../../../src/agents'
 
 class OpenAIFunctionAgent_Agents implements INode {