Skip to content

Commit

Permalink
Feature/add max iterations to agents (#2161)
Browse files Browse the repository at this point in the history 
add max iterations to agents
  • Loading branch information
@HenryHengZJ
HenryHengZJ authored Apr 11, 2024
1 parent e7a58fc commit a82dd93
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 8 deletions.
11 changes: 10 additions & 1 deletion packages/components/nodes/agents/ConversationalAgent/ConversationalAgent.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@ class ConversationalAgent_Agents implements INode {
type: 'Moderation',
optional: true,
list: true
},
{
label: 'Max Iterations',
name: 'maxIterations',
type: 'number',
optional: true,
additionalParams: true
}
]
this.sessionId = fields?.sessionId
Expand Down Expand Up @@ -176,6 +183,7 @@ const prepareAgent = async (
flowObj: { sessionId?: string; chatId?: string; input?: string }
) => {
const model = nodeData.inputs?.model as BaseChatModel
const maxIterations = nodeData.inputs?.maxIterations as string
let tools = nodeData.inputs?.tools as Tool[]
tools = flatten(tools)
const memory = nodeData.inputs?.memory as FlowiseMemory
Expand Down Expand Up @@ -247,7 +255,8 @@ const prepareAgent = async (
sessionId: flowObj?.sessionId,
chatId: flowObj?.chatId,
input: flowObj?.input,
verbose: process.env.DEBUG === 'true'
verbose: process.env.DEBUG === 'true',
maxIterations: maxIterations ? parseFloat(maxIterations) : undefined
})

return executor
Expand Down
11 changes: 10 additions & 1 deletion ...ages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ class ConversationalRetrievalAgent_Agents implements INode {
type: 'Moderation',
optional: true,
list: true
},
{
label: 'Max Iterations',
name: 'maxIterations',
type: 'number',
optional: true,
additionalParams: true
}
]
this.sessionId = fields?.sessionId
Expand Down Expand Up @@ -131,6 +138,7 @@ const prepareAgent = (nodeData: INodeData, flowObj: { sessionId?: string; chatId
const model = nodeData.inputs?.model as ChatOpenAI
const memory = nodeData.inputs?.memory as FlowiseMemory
const systemMessage = nodeData.inputs?.systemMessage as string
const maxIterations = nodeData.inputs?.maxIterations as string
let tools = nodeData.inputs?.tools
tools = flatten(tools)
const memoryKey = memory.memoryKey ? memory.memoryKey : 'chat_history'
Expand Down Expand Up @@ -168,7 +176,8 @@ const prepareAgent = (nodeData: INodeData, flowObj: { sessionId?: string; chatId
chatId: flowObj?.chatId,
input: flowObj?.input,
returnIntermediateSteps: true,
verbose: process.env.DEBUG === 'true' ? true : false
verbose: process.env.DEBUG === 'true' ? true : false,
maxIterations: maxIterations ? parseFloat(maxIterations) : undefined
})

return executor
Expand Down
11 changes: 10 additions & 1 deletion packages/components/nodes/agents/MRKLAgentChat/MRKLAgentChat.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ class MRKLAgentChat_Agents implements INode {
type: 'Moderation',
optional: true,
list: true
},
{
label: 'Max Iterations',
name: 'maxIterations',
type: 'number',
optional: true,
additionalParams: true
}
]
this.sessionId = fields?.sessionId
Expand All @@ -69,6 +76,7 @@ class MRKLAgentChat_Agents implements INode {

async run(nodeData: INodeData, input: string, options: ICommonObject): Promise<string | object> {
const memory = nodeData.inputs?.memory as FlowiseMemory
const maxIterations = nodeData.inputs?.maxIterations as string
const model = nodeData.inputs?.model as BaseChatModel
let tools = nodeData.inputs?.tools as Tool[]
const moderations = nodeData.inputs?.inputModeration as Moderation[]
Expand Down Expand Up @@ -120,7 +128,8 @@ class MRKLAgentChat_Agents implements INode {
const executor = new AgentExecutor({
agent,
tools,
verbose: process.env.DEBUG === 'true'
verbose: process.env.DEBUG === 'true',
maxIterations: maxIterations ? parseFloat(maxIterations) : undefined
})

const callbacks = await additionalCallbacks(nodeData, options)
Expand Down
11 changes: 10 additions & 1 deletion packages/components/nodes/agents/MRKLAgentLLM/MRKLAgentLLM.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@ class MRKLAgentLLM_Agents implements INode {
type: 'Moderation',
optional: true,
list: true
},
{
label: 'Max Iterations',
name: 'maxIterations',
type: 'number',
optional: true,
additionalParams: true
}
]
}
Expand All @@ -60,6 +67,7 @@ class MRKLAgentLLM_Agents implements INode {

async run(nodeData: INodeData, input: string, options: ICommonObject): Promise<string | object> {
const model = nodeData.inputs?.model as BaseLanguageModel
const maxIterations = nodeData.inputs?.maxIterations as string
let tools = nodeData.inputs?.tools as Tool[]
const moderations = nodeData.inputs?.inputModeration as Moderation[]

Expand Down Expand Up @@ -87,7 +95,8 @@ class MRKLAgentLLM_Agents implements INode {
const executor = new AgentExecutor({
agent,
tools,
verbose: process.env.DEBUG === 'true' ? true : false
verbose: process.env.DEBUG === 'true' ? true : false,
maxIterations: maxIterations ? parseFloat(maxIterations) : undefined
})

const callbacks = await additionalCallbacks(nodeData, options)
Expand Down
11 changes: 10 additions & 1 deletion packages/components/nodes/agents/MistralAIToolAgent/MistralAIToolAgent.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ class MistralAIToolAgent_Agents implements INode {
type: 'Moderation',
optional: true,
list: true
},
{
label: 'Max Iterations',
name: 'maxIterations',
type: 'number',
optional: true,
additionalParams: true
}
]
this.sessionId = fields?.sessionId
Expand Down Expand Up @@ -157,6 +164,7 @@ class MistralAIToolAgent_Agents implements INode {
const prepareAgent = (nodeData: INodeData, flowObj: { sessionId?: string; chatId?: string; input?: string }) => {
const model = nodeData.inputs?.model as ChatOpenAI
const memory = nodeData.inputs?.memory as FlowiseMemory
const maxIterations = nodeData.inputs?.maxIterations as string
const systemMessage = nodeData.inputs?.systemMessage as string
let tools = nodeData.inputs?.tools
tools = flatten(tools)
Expand Down Expand Up @@ -194,7 +202,8 @@ const prepareAgent = (nodeData: INodeData, flowObj: { sessionId?: string; chatId
sessionId: flowObj?.sessionId,
chatId: flowObj?.chatId,
input: flowObj?.input,
verbose: process.env.DEBUG === 'true' ? true : false
verbose: process.env.DEBUG === 'true' ? true : false,
maxIterations: maxIterations ? parseFloat(maxIterations) : undefined
})

return executor
Expand Down
11 changes: 10 additions & 1 deletion packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,13 @@ class OpenAIFunctionAgent_Agents implements INode {
type: 'Moderation',
optional: true,
list: true
},
{
label: 'Max Iterations',
name: 'maxIterations',
type: 'number',
optional: true,
additionalParams: true
}
]
this.sessionId = fields?.sessionId
Expand Down Expand Up @@ -155,6 +162,7 @@ class OpenAIFunctionAgent_Agents implements INode {

const prepareAgent = (nodeData: INodeData, flowObj: { sessionId?: string; chatId?: string; input?: string }) => {
const model = nodeData.inputs?.model as ChatOpenAI
const maxIterations = nodeData.inputs?.maxIterations as string
const memory = nodeData.inputs?.memory as FlowiseMemory
const systemMessage = nodeData.inputs?.systemMessage as string
let tools = nodeData.inputs?.tools
Expand Down Expand Up @@ -193,7 +201,8 @@ const prepareAgent = (nodeData: INodeData, flowObj: { sessionId?: string; chatId
sessionId: flowObj?.sessionId,
chatId: flowObj?.chatId,
input: flowObj?.input,
verbose: process.env.DEBUG === 'true' ? true : false
verbose: process.env.DEBUG === 'true' ? true : false,
maxIterations: maxIterations ? parseFloat(maxIterations) : undefined
})

return executor
Expand Down
11 changes: 10 additions & 1 deletion packages/components/nodes/agents/OpenAIToolAgent/OpenAIToolAgent.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ class OpenAIToolAgent_Agents implements INode {
type: 'Moderation',
optional: true,
list: true
},
{
label: 'Max Iterations',
name: 'maxIterations',
type: 'number',
optional: true,
additionalParams: true
}
]
this.sessionId = fields?.sessionId
Expand Down Expand Up @@ -156,6 +163,7 @@ class OpenAIToolAgent_Agents implements INode {

const prepareAgent = (nodeData: INodeData, flowObj: { sessionId?: string; chatId?: string; input?: string }) => {
const model = nodeData.inputs?.model as ChatOpenAI
const maxIterations = nodeData.inputs?.maxIterations as string
const memory = nodeData.inputs?.memory as FlowiseMemory
const systemMessage = nodeData.inputs?.systemMessage as string
let tools = nodeData.inputs?.tools
Expand Down Expand Up @@ -192,7 +200,8 @@ const prepareAgent = (nodeData: INodeData, flowObj: { sessionId?: string; chatId
sessionId: flowObj?.sessionId,
chatId: flowObj?.chatId,
input: flowObj?.input,
verbose: process.env.DEBUG === 'true' ? true : false
verbose: process.env.DEBUG === 'true' ? true : false,
maxIterations: maxIterations ? parseFloat(maxIterations) : undefined
})

return executor
Expand Down
11 changes: 10 additions & 1 deletion packages/components/nodes/agents/XMLAgent/XMLAgent.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,13 @@ class XMLAgent_Agents implements INode {
type: 'Moderation',
optional: true,
list: true
},
{
label: 'Max Iterations',
name: 'maxIterations',
type: 'number',
optional: true,
additionalParams: true
}
]
this.sessionId = fields?.sessionId
Expand Down Expand Up @@ -179,6 +186,7 @@ class XMLAgent_Agents implements INode {

const prepareAgent = async (nodeData: INodeData, flowObj: { sessionId?: string; chatId?: string; input?: string }) => {
const model = nodeData.inputs?.model as BaseChatModel
const maxIterations = nodeData.inputs?.maxIterations as string
const memory = nodeData.inputs?.memory as FlowiseMemory
const systemMessage = nodeData.inputs?.systemMessage as string
let tools = nodeData.inputs?.tools
Expand Down Expand Up @@ -233,7 +241,8 @@ const prepareAgent = async (nodeData: INodeData, flowObj: { sessionId?: string;
chatId: flowObj?.chatId,
input: flowObj?.input,
isXML: true,
verbose: process.env.DEBUG === 'true' ? true : false
verbose: process.env.DEBUG === 'true' ? true : false,
maxIterations: maxIterations ? parseFloat(maxIterations) : undefined
})

return executor
Expand Down

0 comments on commit a82dd93

Please sign in to comment.