Merge branch 'main' into feature/OAuth2-Tools

This commit is contained in:
Henry 2025-06-04 17:59:16 +01:00
commit ad2f68dad4
2 changed files with 9 additions and 3 deletions

View File

@ -187,7 +187,10 @@ class Tool_Agentflow implements INode {
async run(nodeData: INodeData, input: string, options: ICommonObject): Promise<any> {
const selectedTool = (nodeData.inputs?.selectedTool as string) || (nodeData.inputs?.toolAgentflowSelectedTool as string)
const selectedToolConfig = nodeData.inputs?.selectedToolConfig as ICommonObject
const selectedToolConfig =
(nodeData?.inputs?.selectedToolConfig as ICommonObject) ||
(nodeData?.inputs?.toolAgentflowSelectedToolConfig as ICommonObject) ||
{}
const toolInputArgs = nodeData.inputs?.toolInputArgs as IToolInputArgs[]
const _toolUpdateState = nodeData.inputs?.toolUpdateState

View File

@ -401,8 +401,11 @@ const AgentFlowNode = ({ data }) => {
{ tools: data.inputs?.llmTools, toolProperty: 'llmSelectedTool' },
{ tools: data.inputs?.agentTools, toolProperty: 'agentSelectedTool' },
{
tools: data.inputs?.selectedTool ? [{ selectedTool: data.inputs?.selectedTool }] : [],
toolProperty: 'selectedTool'
tools:
data.inputs?.selectedTool ?? data.inputs?.toolAgentflowSelectedTool
? [{ selectedTool: data.inputs?.selectedTool ?? data.inputs?.toolAgentflowSelectedTool }]
: [],
toolProperty: ['selectedTool', 'toolAgentflowSelectedTool']
},
{ tools: data.inputs?.agentKnowledgeVSEmbeddings, toolProperty: ['vectorStore', 'embeddingModel'] }
]