jyapayne/langflow
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

refactor: simplify input_types in LCToolsAgentComponent (remove BaseTool and StructuredTool) (#5084)

Browse source 
* 🔧 (agent.py): remove unnecessary input_types "BaseTool" and "StructuredTool" from the HandleInput class to simplify and clarify the code.

* 🔧 (sql.py): remove "BaseTool" from input_types in HandleInput to simplify the code and enhance clarity.

* 🔧 Refactor starter project JSON files to simplify inputTypes by removing "BaseTool" and "StructuredTool", retaining only "Tool" for clarity and consistency across multiple agent configurations.

---------

Co-authored-by: Gabriel Luiz Freitas Almeida <gabriel@langflow.org>
This commit is contained in:
Cristhian Zanforlin Lousa 2024-12-18 17:57:37 -03:00 • committed by GitHub
commit 1e52711cf4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 37 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/backend/base/langflow/base/agents/agent.py
View file

@ -200,7 +200,7 @@ class LCToolsAgentComponent(LCAgentComponent):
HandleInput( HandleInput(
name="tools", name="tools",
display_name="Tools", display_name="Tools",
input_types=["Tool", "BaseTool", "StructuredTool"], input_types=["Tool"],
is_list=True, is_list=True,
required=False, required=False,
info="These are the tools that the agent can use to help with tasks.", info="These are the tools that the agent can use to help with tasks.",

2
src/backend/base/langflow/components/langchain_utilities/sql.py
View file

@ -19,7 +19,7 @@ class SQLAgentComponent(LCAgentComponent):
HandleInput( HandleInput(
name="extra_tools", name="extra_tools",
display_name="Extra Tools", display_name="Extra Tools",
input_types=["Tool", "BaseTool"], input_types=["Tool"],
is_list=True, is_list=True,
advanced=True, advanced=True,
), ),

10
src/backend/base/langflow/initial_setup/starter_projects/Instagram Copywriter.json
View file

@ -100,9 +100,7 @@
"fieldName": "tools", "fieldName": "tools",
"id": "Agent-9Wf58", "id": "Agent-9Wf58",
"inputTypes": [ "inputTypes": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"type": "other" "type": "other"
} }
@ -112,7 +110,7 @@
"source": "TavilyAISearch-AN1Hv", "source": "TavilyAISearch-AN1Hv",
"sourceHandle": "{œdataTypeœ: œTavilyAISearchœ, œidœ: œTavilyAISearch-AN1Hvœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}", "sourceHandle": "{œdataTypeœ: œTavilyAISearchœ, œidœ: œTavilyAISearch-AN1Hvœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
"target": "Agent-9Wf58", "target": "Agent-9Wf58",
"targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-9Wf58œ, œinputTypesœ: [œToolœ, œBaseToolœ, œStructuredToolœ], œtypeœ: œotherœ}" "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-9Wf58œ, œinputTypesœ: [œToolœ], œtypeœ: œotherœ}"
}, },
{ {
"animated": false, "animated": false,
@ -2099,9 +2097,7 @@
"dynamic": false, "dynamic": false,
"info": "These are the tools that the agent can use to help with tasks.", "info": "These are the tools that the agent can use to help with tasks.",
"input_types": [ "input_types": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"list": true, "list": true,
"name": "tools", "name": "tools",

10
src/backend/base/langflow/initial_setup/starter_projects/Market Research.json
View file

@ -101,9 +101,7 @@
"fieldName": "tools", "fieldName": "tools",
"id": "Agent-QSS16", "id": "Agent-QSS16",
"inputTypes": [ "inputTypes": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"type": "other" "type": "other"
} }
@ -113,7 +111,7 @@
"source": "TavilyAISearch-ghguc", "source": "TavilyAISearch-ghguc",
"sourceHandle": "{œdataTypeœ: œTavilyAISearchœ, œidœ: œTavilyAISearch-ghgucœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}", "sourceHandle": "{œdataTypeœ: œTavilyAISearchœ, œidœ: œTavilyAISearch-ghgucœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
"target": "Agent-QSS16", "target": "Agent-QSS16",
"targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-QSS16œ, œinputTypesœ: [œToolœ, œBaseToolœ, œStructuredToolœ], œtypeœ: œotherœ}" "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-QSS16œ, œinputTypesœ: [œToolœ], œtypeœ: œotherœ}"
}, },
{ {
"animated": false, "animated": false,
@ -2343,9 +2341,7 @@
"dynamic": false, "dynamic": false,
"info": "These are the tools that the agent can use to help with tasks.", "info": "These are the tools that the agent can use to help with tasks.",
"input_types": [ "input_types": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"list": true, "list": true,
"name": "tools", "name": "tools",

10
src/backend/base/langflow/initial_setup/starter_projects/Research Agent.json
View file

@ -131,9 +131,7 @@
"fieldName": "tools", "fieldName": "tools",
"id": "Agent-9E8IU", "id": "Agent-9E8IU",
"inputTypes": [ "inputTypes": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"type": "other" "type": "other"
} }
@ -143,7 +141,7 @@
"source": "TavilyAISearch-rI4aD", "source": "TavilyAISearch-rI4aD",
"sourceHandle": "{œdataTypeœ: œTavilyAISearchœ, œidœ: œTavilyAISearch-rI4aDœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}", "sourceHandle": "{œdataTypeœ: œTavilyAISearchœ, œidœ: œTavilyAISearch-rI4aDœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
"target": "Agent-9E8IU", "target": "Agent-9E8IU",
"targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-9E8IUœ, œinputTypesœ: [œToolœ, œBaseToolœ, œStructuredToolœ], œtypeœ: œotherœ}" "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-9E8IUœ, œinputTypesœ: [œToolœ], œtypeœ: œotherœ}"
}, },
{ {
"animated": false, "animated": false,
@ -2590,9 +2588,7 @@
"dynamic": false, "dynamic": false,
"info": "These are the tools that the agent can use to help with tasks.", "info": "These are the tools that the agent can use to help with tasks.",
"input_types": [ "input_types": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"list": true, "list": true,
"name": "tools", "name": "tools",

10
src/backend/base/langflow/initial_setup/starter_projects/SaaS Pricing.json
View file

@ -17,9 +17,7 @@
"fieldName": "tools", "fieldName": "tools",
"id": "Agent-5e01q", "id": "Agent-5e01q",
"inputTypes": [ "inputTypes": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"type": "other" "type": "other"
} }
@ -28,7 +26,7 @@
"source": "CalculatorTool-DF8xQ", "source": "CalculatorTool-DF8xQ",
"sourceHandle": "{œdataTypeœ: œCalculatorToolœ, œidœ: œCalculatorTool-DF8xQœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}", "sourceHandle": "{œdataTypeœ: œCalculatorToolœ, œidœ: œCalculatorTool-DF8xQœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
"target": "Agent-5e01q", "target": "Agent-5e01q",
"targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-5e01qœ, œinputTypesœ: [œToolœ, œBaseToolœ, œStructuredToolœ], œtypeœ: œotherœ}" "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-5e01qœ, œinputTypesœ: [œToolœ], œtypeœ: œotherœ}"
}, },
{ {
"animated": false, "animated": false,
@ -1164,9 +1162,7 @@
"dynamic": false, "dynamic": false,
"info": "These are the tools that the agent can use to help with tasks.", "info": "These are the tools that the agent can use to help with tasks.",
"input_types": [ "input_types": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"list": true, "list": true,
"name": "tools", "name": "tools",

30
src/backend/base/langflow/initial_setup/starter_projects/Sequential Tasks Agents .json
View file

@ -98,9 +98,7 @@
"fieldName": "tools", "fieldName": "tools",
"id": "Agent-rH74C", "id": "Agent-rH74C",
"inputTypes": [ "inputTypes": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"type": "other" "type": "other"
} }
@ -109,7 +107,7 @@
"source": "CalculatorTool-xo5ux", "source": "CalculatorTool-xo5ux",
"sourceHandle": "{œdataTypeœ: œCalculatorToolœ, œidœ: œCalculatorTool-xo5uxœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}", "sourceHandle": "{œdataTypeœ: œCalculatorToolœ, œidœ: œCalculatorTool-xo5uxœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
"target": "Agent-rH74C", "target": "Agent-rH74C",
"targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-rH74Cœ, œinputTypesœ: [œToolœ, œBaseToolœ, œStructuredToolœ], œtypeœ: œotherœ}" "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-rH74Cœ, œinputTypesœ: [œToolœ], œtypeœ: œotherœ}"
}, },
{ {
"animated": false, "animated": false,
@ -127,9 +125,7 @@
"fieldName": "tools", "fieldName": "tools",
"id": "Agent-vIPAK", "id": "Agent-vIPAK",
"inputTypes": [ "inputTypes": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"type": "other" "type": "other"
} }
@ -138,7 +134,7 @@
"source": "YahooFinanceTool-YmOKx", "source": "YahooFinanceTool-YmOKx",
"sourceHandle": "{œdataTypeœ: œYahooFinanceToolœ, œidœ: œYahooFinanceTool-YmOKxœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}", "sourceHandle": "{œdataTypeœ: œYahooFinanceToolœ, œidœ: œYahooFinanceTool-YmOKxœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
"target": "Agent-vIPAK", "target": "Agent-vIPAK",
"targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-vIPAKœ, œinputTypesœ: [œToolœ, œBaseToolœ, œStructuredToolœ], œtypeœ: œotherœ}" "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-vIPAKœ, œinputTypesœ: [œToolœ], œtypeœ: œotherœ}"
}, },
{ {
"animated": false, "animated": false,
@ -238,9 +234,7 @@
"fieldName": "tools", "fieldName": "tools",
"id": "Agent-uaR2o", "id": "Agent-uaR2o",
"inputTypes": [ "inputTypes": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"type": "other" "type": "other"
} }
@ -249,7 +243,7 @@
"source": "TavilyAISearch-YfG8u", "source": "TavilyAISearch-YfG8u",
"sourceHandle": "{œdataTypeœ: œTavilyAISearchœ, œidœ: œTavilyAISearch-YfG8uœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}", "sourceHandle": "{œdataTypeœ: œTavilyAISearchœ, œidœ: œTavilyAISearch-YfG8uœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
"target": "Agent-uaR2o", "target": "Agent-uaR2o",
"targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-uaR2oœ, œinputTypesœ: [œToolœ, œBaseToolœ, œStructuredToolœ], œtypeœ: œotherœ}" "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-uaR2oœ, œinputTypesœ: [œToolœ], œtypeœ: œotherœ}"
}, },
{ {
"animated": false, "animated": false,
@ -1113,9 +1107,7 @@
"dynamic": false, "dynamic": false,
"info": "These are the tools that the agent can use to help with tasks.", "info": "These are the tools that the agent can use to help with tasks.",
"input_types": [ "input_types": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"list": true, "list": true,
"name": "tools", "name": "tools",
@ -1691,9 +1683,7 @@
"dynamic": false, "dynamic": false,
"info": "These are the tools that the agent can use to help with tasks.", "info": "These are the tools that the agent can use to help with tasks.",
"input_types": [ "input_types": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"list": true, "list": true,
"name": "tools", "name": "tools",
@ -3584,9 +3574,7 @@
"dynamic": false, "dynamic": false,
"info": "These are the tools that the agent can use to help with tasks.", "info": "These are the tools that the agent can use to help with tasks.",
"input_types": [ "input_types": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"list": true, "list": true,
"name": "tools", "name": "tools",

16
src/backend/base/langflow/initial_setup/starter_projects/Simple Agent.json
View file

@ -73,9 +73,7 @@
"fieldName": "tools", "fieldName": "tools",
"id": "Agent-yGhD2", "id": "Agent-yGhD2",
"inputTypes": [ "inputTypes": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"type": "other" "type": "other"
} }
@ -85,7 +83,7 @@
"source": "CalculatorTool-IfWT1", "source": "CalculatorTool-IfWT1",
"sourceHandle": "{œdataTypeœ: œCalculatorToolœ, œidœ: œCalculatorTool-IfWT1œ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}", "sourceHandle": "{œdataTypeœ: œCalculatorToolœ, œidœ: œCalculatorTool-IfWT1œ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
"target": "Agent-yGhD2", "target": "Agent-yGhD2",
"targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-yGhD2œ, œinputTypesœ: [œToolœ, œBaseToolœ, œStructuredToolœ], œtypeœ: œotherœ}" "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-yGhD2œ, œinputTypesœ: [œToolœ], œtypeœ: œotherœ}"
}, },
{ {
"animated": false, "animated": false,
@ -103,9 +101,7 @@
"fieldName": "tools", "fieldName": "tools",
"id": "Agent-yGhD2", "id": "Agent-yGhD2",
"inputTypes": [ "inputTypes": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"type": "other" "type": "other"
} }
@ -115,7 +111,7 @@
"source": "URL-FOPyh", "source": "URL-FOPyh",
"sourceHandle": "{œdataTypeœ: œURLœ, œidœ: œURL-FOPyhœ, œnameœ: œcomponent_as_toolœ, œoutput_typesœ: [œToolœ]}", "sourceHandle": "{œdataTypeœ: œURLœ, œidœ: œURL-FOPyhœ, œnameœ: œcomponent_as_toolœ, œoutput_typesœ: [œToolœ]}",
"target": "Agent-yGhD2", "target": "Agent-yGhD2",
"targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-yGhD2œ, œinputTypesœ: [œToolœ, œBaseToolœ, œStructuredToolœ], œtypeœ: œotherœ}" "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-yGhD2œ, œinputTypesœ: [œToolœ], œtypeœ: œotherœ}"
} }
], ],
"nodes": [ "nodes": [
@ -647,9 +643,7 @@
"dynamic": false, "dynamic": false,
"info": "These are the tools that the agent can use to help with tasks.", "info": "These are the tools that the agent can use to help with tasks.",
"input_types": [ "input_types": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"list": true, "list": true,
"name": "tools", "name": "tools",

30
src/backend/base/langflow/initial_setup/starter_projects/Travel Planning Agents.json
View file

@ -98,9 +98,7 @@
"fieldName": "tools", "fieldName": "tools",
"id": "Agent-uVWaZ", "id": "Agent-uVWaZ",
"inputTypes": [ "inputTypes": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"type": "other" "type": "other"
} }
@ -109,7 +107,7 @@
"source": "SearchAPI-zMZv7", "source": "SearchAPI-zMZv7",
"sourceHandle": "{œdataTypeœ: œSearchAPIœ, œidœ: œSearchAPI-zMZv7œ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}", "sourceHandle": "{œdataTypeœ: œSearchAPIœ, œidœ: œSearchAPI-zMZv7œ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
"target": "Agent-uVWaZ", "target": "Agent-uVWaZ",
"targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-uVWaZœ, œinputTypesœ: [œToolœ, œBaseToolœ, œStructuredToolœ], œtypeœ: œotherœ}" "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-uVWaZœ, œinputTypesœ: [œToolœ], œtypeœ: œotherœ}"
}, },
{ {
"animated": false, "animated": false,
@ -127,9 +125,7 @@
"fieldName": "tools", "fieldName": "tools",
"id": "Agent-qPNh7", "id": "Agent-qPNh7",
"inputTypes": [ "inputTypes": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"type": "other" "type": "other"
} }
@ -138,7 +134,7 @@
"source": "url_content_fetcher-p0SUP", "source": "url_content_fetcher-p0SUP",
"sourceHandle": "{œdataTypeœ: œurl_content_fetcherœ, œidœ: œurl_content_fetcher-p0SUPœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}", "sourceHandle": "{œdataTypeœ: œurl_content_fetcherœ, œidœ: œurl_content_fetcher-p0SUPœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
"target": "Agent-qPNh7", "target": "Agent-qPNh7",
"targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-qPNh7œ, œinputTypesœ: [œToolœ, œBaseToolœ, œStructuredToolœ], œtypeœ: œotherœ}" "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-qPNh7œ, œinputTypesœ: [œToolœ], œtypeœ: œotherœ}"
}, },
{ {
"animated": false, "animated": false,
@ -156,9 +152,7 @@
"fieldName": "tools", "fieldName": "tools",
"id": "Agent-LAoR7", "id": "Agent-LAoR7",
"inputTypes": [ "inputTypes": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"type": "other" "type": "other"
} }
@ -167,7 +161,7 @@
"source": "CalculatorTool-v71XZ", "source": "CalculatorTool-v71XZ",
"sourceHandle": "{œdataTypeœ: œCalculatorToolœ, œidœ: œCalculatorTool-v71XZœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}", "sourceHandle": "{œdataTypeœ: œCalculatorToolœ, œidœ: œCalculatorTool-v71XZœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
"target": "Agent-LAoR7", "target": "Agent-LAoR7",
"targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-LAoR7œ, œinputTypesœ: [œToolœ, œBaseToolœ, œStructuredToolœ], œtypeœ: œotherœ}" "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-LAoR7œ, œinputTypesœ: [œToolœ], œtypeœ: œotherœ}"
}, },
{ {
"animated": false, "animated": false,
@ -1742,9 +1736,7 @@
"dynamic": false, "dynamic": false,
"info": "These are the tools that the agent can use to help with tasks.", "info": "These are the tools that the agent can use to help with tasks.",
"input_types": [ "input_types": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"list": true, "list": true,
"name": "tools", "name": "tools",
@ -2320,9 +2312,7 @@
"dynamic": false, "dynamic": false,
"info": "These are the tools that the agent can use to help with tasks.", "info": "These are the tools that the agent can use to help with tasks.",
"input_types": [ "input_types": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"list": true, "list": true,
"name": "tools", "name": "tools",
@ -2898,9 +2888,7 @@
"dynamic": false, "dynamic": false,
"info": "These are the tools that the agent can use to help with tasks.", "info": "These are the tools that the agent can use to help with tasks.",
"input_types": [ "input_types": [
"Tool", "Tool"
"BaseTool",
"StructuredTool"
], ],
"list": true, "list": true,
"name": "tools", "name": "tools",