NeoAnd/evo-ai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(agent_builder, custom_tools): simplify tool configuration handling and ensure parameter defaults

Browse Source
This commit is contained in:
Davidson Gomes 2025-05-09 20:42:30 -03:00
parent 9deeb02df8
commit b32a044cac
4 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -21,6 +21,8 @@ RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
RUN curl -fsSL https://get.docker.com | bash
RUN curl -LsSf https://astral.sh/uv/install.sh | sh
COPY . .
RUN pip install --no-cache-dir -e .

3
src/services/agent_builder.py
View File

@ -32,8 +32,7 @@ class AgentBuilder:
"""Create an LLM agent from the agent data."""
# Get custom tools from the configuration
custom_tools = []
if agent.config.get("tools"):
custom_tools = self.custom_tool_builder.build_tools(agent.config["tools"])
custom_tools = self.custom_tool_builder.build_tools(agent.config)
# Get MCP tools from the configuration
mcp_tools = []

60
src/services/custom_tools.py
View File

@ -18,10 +18,15 @@ class CustomToolBuilder:
endpoint = tool_config["endpoint"]
method = tool_config["method"]
headers = tool_config.get("headers", {})
parameters = tool_config.get("parameters", {})
parameters = tool_config.get("parameters", {}) or {}
values = tool_config.get("values", {})
error_handling = tool_config.get("error_handling", {})
# Garante que todos os parâmetros são dicts
path_params = parameters.get("path_params") or {}
query_params = parameters.get("query_params") or {}
body_params = parameters.get("body_params") or {}
def http_tool(**kwargs):
try:
# Combines default values with provided values
@ -35,32 +40,30 @@ class CustomToolBuilder:
# Processes path parameters
url = endpoint
for param, value in parameters.get("path_params", {}).items():
for param, value in path_params.items():
if param in all_values:
url = url.replace(f"{{{param}}}", str(all_values[param]))
# Process query parameters
query_params = {}
for param, value in parameters.get("query_params", {}).items():
query_params_dict = {}
for param, value in query_params.items():
if isinstance(value, list):
# If the value is a list, join with comma
query_params[param] = ",".join(value)
query_params_dict[param] = ",".join(value)
elif param in all_values:
# If the parameter is in the values, use the provided value
query_params[param] = all_values[param]
query_params_dict[param] = all_values[param]
else:
# Otherwise, use the default value from the configuration
query_params[param] = value
query_params_dict[param] = value
# Adds default values to query params if they are not present
for param, value in values.items():
if param not in query_params and param not in parameters.get(
"path_params", {}
):
query_params[param] = value
if param not in query_params_dict and param not in path_params:
query_params_dict[param] = value
body_data = {}
for param, param_config in parameters.get("body_params", {}).items():
for param, param_config in body_params.items():
if param in all_values:
body_data[param] = all_values[param]
@ -68,8 +71,8 @@ class CustomToolBuilder:
for param, value in values.items():
if (
param not in body_data
and param not in query_params
and param not in parameters.get("path_params", {})
and param not in query_params_dict
and param not in path_params
):
body_data[param] = value
@ -78,7 +81,7 @@ class CustomToolBuilder:
method=method,
url=url,
headers=processed_headers,
params=query_params,
params=query_params_dict,
json=body_data if body_data else None,
timeout=error_handling.get("timeout", 30),
)
@ -104,18 +107,18 @@ class CustomToolBuilder:
param_docs = []
# Adds path parameters
for param, value in parameters.get("path_params", {}).items():
for param, value in path_params.items():
param_docs.append(f"{param}: {value}")
# Adds query parameters
for param, value in parameters.get("query_params", {}).items():
for param, value in query_params.items():
if isinstance(value, list):
param_docs.append(f"{param}: List[{', '.join(value)}]")
else:
param_docs.append(f"{param}: {value}")
# Adds body parameters
for param, param_config in parameters.get("body_params", {}).items():
for param, param_config in body_params.items():
required = "Required" if param_config.get("required", False) else "Optional"
param_docs.append(
f"{param} ({param_config['type']}, {required}): {param_config['description']}"
@ -143,11 +146,26 @@ class CustomToolBuilder:
return FunctionTool(func=http_tool)
def build_tools(self, tools_config: Dict[str, Any]) -> List[FunctionTool]:
"""Builds a list of tools based on the provided configuration."""
"""Builds a list of tools based on the provided configuration. Accepts both 'tools' and 'custom_tools' (with http_tools)."""
self.tools = []
# Processes HTTP tools
for http_tool_config in tools_config.get("http_tools", []):
# Permite receber tanto 'tools' quanto 'custom_tools' (com http_tools)
http_tools = []
if tools_config.get("http_tools"):
http_tools = tools_config.get("http_tools", [])
elif tools_config.get("custom_tools") and tools_config["custom_tools"].get(
"http_tools"
):
http_tools = tools_config["custom_tools"].get("http_tools", [])
# Suporte para caso tools seja um dict com http_tools
elif (
tools_config.get("tools")
and isinstance(tools_config["tools"], dict)
and tools_config["tools"].get("http_tools")
):
http_tools = tools_config["tools"].get("http_tools", [])
for http_tool_config in http_tools:
self.tools.append(self._create_http_tool(http_tool_config))
return self.tools

3
src/services/mcp_service.py
View File

@ -79,6 +79,9 @@ class MCPService:
self, tools: List[Any], agent_tools: List[str]
) -> List[Any]:
"""Filters tools compatible with the agent."""
if not agent_tools or len(agent_tools) == 0:
return tools
filtered_tools = []
for tool in tools:
logger.info(f"Tool: {tool.name}")