Compare commits
2 Commits
main
...
feature/Ge
| Author | SHA1 | Date |
|---|---|---|
Henry
|
bf65936d22 | |
|
Henry
|
bdcaad34b6 |
|
|
@ -81,7 +81,7 @@ class Agent_Agentflow implements INode {
|
|||
constructor() {
|
||||
this.label = 'Agent'
|
||||
this.name = 'agentAgentflow'
|
||||
this.version = 2.0
|
||||
this.version = 2.1
|
||||
this.type = 'Agent'
|
||||
this.category = 'Agent Flows'
|
||||
this.description = 'Dynamically choose and utilize tools during runtime, enabling multi-step reasoning'
|
||||
|
|
@ -161,6 +161,27 @@ class Agent_Agentflow implements INode {
|
|||
agentModel: 'chatOpenAI'
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Gemini Built-in Tools',
|
||||
name: 'agentToolsBuiltInGemini',
|
||||
type: 'multiOptions',
|
||||
optional: true,
|
||||
options: [
|
||||
{
|
||||
label: 'URL Context',
|
||||
name: 'urlContext',
|
||||
description: 'Extract content from given URLs'
|
||||
},
|
||||
{
|
||||
label: 'Google Search',
|
||||
name: 'googleSearch',
|
||||
description: 'Search real-time web content'
|
||||
}
|
||||
],
|
||||
show: {
|
||||
agentModel: 'chatGoogleGenerativeAI'
|
||||
}
|
||||
},
|
||||
{
|
||||
label: 'Tools',
|
||||
name: 'agentTools',
|
||||
|
|
@ -765,6 +786,23 @@ class Agent_Agentflow implements INode {
|
|||
}
|
||||
}
|
||||
|
||||
const agentToolsBuiltInGemini = convertMultiOptionsToStringArray(nodeData.inputs?.agentToolsBuiltInGemini)
|
||||
if (agentToolsBuiltInGemini && agentToolsBuiltInGemini.length > 0) {
|
||||
for (const tool of agentToolsBuiltInGemini) {
|
||||
const builtInTool: ICommonObject = {
|
||||
[tool]: {}
|
||||
}
|
||||
;(toolsInstance as any).push(builtInTool)
|
||||
;(availableTools as any).push({
|
||||
name: tool,
|
||||
toolNode: {
|
||||
label: tool,
|
||||
name: tool
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
if (llmNodeInstance && toolsInstance.length > 0) {
|
||||
if (llmNodeInstance.bindTools === undefined) {
|
||||
throw new Error(`Agent needs to have a function calling capable models.`)
|
||||
|
|
@ -1177,12 +1215,10 @@ class Agent_Agentflow implements INode {
|
|||
return builtInUsedTools
|
||||
}
|
||||
|
||||
const { output, tools } = response.response_metadata
|
||||
|
||||
if (!output || !Array.isArray(output) || output.length === 0 || !tools || !Array.isArray(tools) || tools.length === 0) {
|
||||
return builtInUsedTools
|
||||
}
|
||||
const { output, tools, groundingMetadata, urlContextMetadata } = response.response_metadata
|
||||
|
||||
// Handle OpenAI built-in tools
|
||||
if (output && Array.isArray(output) && output.length > 0 && tools && Array.isArray(tools) && tools.length > 0) {
|
||||
for (const outputItem of output) {
|
||||
if (outputItem.type && outputItem.type.endsWith('_call')) {
|
||||
let toolInput = outputItem.action ?? outputItem.code
|
||||
|
|
@ -1226,6 +1262,35 @@ class Agent_Agentflow implements INode {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Handle Gemini googleSearch tool
|
||||
if (groundingMetadata && groundingMetadata.webSearchQueries && Array.isArray(groundingMetadata.webSearchQueries)) {
|
||||
// Check for duplicates
|
||||
if (!builtInUsedTools.find((tool) => tool.tool === 'googleSearch')) {
|
||||
builtInUsedTools.push({
|
||||
tool: 'googleSearch',
|
||||
toolInput: {
|
||||
queries: groundingMetadata.webSearchQueries
|
||||
},
|
||||
toolOutput: `Searched for: ${groundingMetadata.webSearchQueries.join(', ')}`
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Handle Gemini urlContext tool
|
||||
if (urlContextMetadata && urlContextMetadata.urlMetadata && Array.isArray(urlContextMetadata.urlMetadata)) {
|
||||
// Check for duplicates
|
||||
if (!builtInUsedTools.find((tool) => tool.tool === 'urlContext')) {
|
||||
builtInUsedTools.push({
|
||||
tool: 'urlContext',
|
||||
toolInput: {
|
||||
urlMetadata: urlContextMetadata.urlMetadata
|
||||
},
|
||||
toolOutput: `Processed ${urlContextMetadata.urlMetadata.length} URL(s)`
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
return builtInUsedTools
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@ import {
|
|||
IconAlertCircleFilled,
|
||||
IconCode,
|
||||
IconWorldWww,
|
||||
IconPhoto
|
||||
IconPhoto,
|
||||
IconBrandGoogle
|
||||
} from '@tabler/icons-react'
|
||||
import StopCircleIcon from '@mui/icons-material/StopCircle'
|
||||
import CancelIcon from '@mui/icons-material/Cancel'
|
||||
|
|
@ -142,6 +143,17 @@ const AgentFlowNode = ({ data }) => {
|
|||
}
|
||||
}
|
||||
|
||||
const getBuiltInGeminiToolIcon = (toolName) => {
|
||||
switch (toolName) {
|
||||
case 'urlContext':
|
||||
return <IconWorldWww size={14} color={'white'} />
|
||||
case 'googleSearch':
|
||||
return <IconBrandGoogle size={14} color={'white'} />
|
||||
default:
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (ref.current) {
|
||||
setTimeout(() => {
|
||||
|
|
@ -433,6 +445,16 @@ const AgentFlowNode = ({ data }) => {
|
|||
: [],
|
||||
toolProperty: 'builtInTool',
|
||||
isBuiltInOpenAI: true
|
||||
},
|
||||
{
|
||||
tools: data.inputs?.agentToolsBuiltInGemini
|
||||
? (typeof data.inputs.agentToolsBuiltInGemini === 'string'
|
||||
? JSON.parse(data.inputs.agentToolsBuiltInGemini)
|
||||
: data.inputs.agentToolsBuiltInGemini
|
||||
).map((tool) => ({ builtInTool: tool }))
|
||||
: [],
|
||||
toolProperty: 'builtInTool',
|
||||
isBuiltInGemini: true
|
||||
}
|
||||
]
|
||||
|
||||
|
|
@ -493,6 +515,32 @@ const AgentFlowNode = ({ data }) => {
|
|||
]
|
||||
}
|
||||
|
||||
// Handle built-in Gemini tools with icons
|
||||
if (config.isBuiltInGemini) {
|
||||
const icon = getBuiltInGeminiToolIcon(toolName)
|
||||
if (!icon) return []
|
||||
|
||||
return [
|
||||
<Box
|
||||
key={`tool-${configIndex}-${toolIndex}`}
|
||||
sx={{
|
||||
width: 20,
|
||||
height: 20,
|
||||
borderRadius: '50%',
|
||||
backgroundColor: customization.isDarkMode
|
||||
? darken(data.color, 0.5)
|
||||
: darken(data.color, 0.2),
|
||||
display: 'flex',
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
padding: 0.2
|
||||
}}
|
||||
>
|
||||
{icon}
|
||||
</Box>
|
||||
]
|
||||
}
|
||||
|
||||
return [
|
||||
<Box
|
||||
key={`tool-${configIndex}-${toolIndex}`}
|
||||
|
|
|
|||
Loading…
Reference in New Issue