Compare commits

...

3 Commits

Author SHA1 Message Date
Devin AI
b15289b5ae Improve code based on PR feedback: add type hints, error handling, docs, and tests
Co-Authored-By: Joe Moura <joao@crewai.com>
2025-03-24 15:00:24 +00:00
Devin AI
c340400582 Fix import ordering in test file
Co-Authored-By: Joe Moura <joao@crewai.com>
2025-03-24 14:52:57 +00:00
Devin AI
49b19a3b2a Fix AttributeError when agent_info is a list in YAML configuration
Co-Authored-By: Joe Moura <joao@crewai.com>
2025-03-24 14:51:06 +00:00
2 changed files with 137 additions and 2 deletions

View File

@@ -1,6 +1,6 @@
import inspect import inspect
from pathlib import Path from pathlib import Path
from typing import Any, Callable, Dict, TypeVar, cast from typing import Any, Callable, Dict, List, TypeVar, Union, cast
import yaml import yaml
from dotenv import load_dotenv from dotenv import load_dotenv
@@ -116,13 +116,33 @@ def CrewBase(cls: T) -> T:
def _map_agent_variables( def _map_agent_variables(
self, self,
agent_name: str, agent_name: str,
agent_info: Dict[str, Any], agent_info: Union[Dict[str, Any], List[Dict[str, Any]]],
agents: Dict[str, Callable], agents: Dict[str, Callable],
llms: Dict[str, Callable], llms: Dict[str, Callable],
tool_functions: Dict[str, Callable], tool_functions: Dict[str, Callable],
cache_handler_functions: Dict[str, Callable], cache_handler_functions: Dict[str, Callable],
callbacks: Dict[str, Callable], callbacks: Dict[str, Callable],
) -> None: ) -> None:
"""Maps agent variables from configuration to internal state.
Args:
agent_name: Name of the agent.
agent_info: Configuration as a dictionary or list of configurations.
agents: Dictionary of agent functions.
llms: Dictionary of LLM functions.
tool_functions: Dictionary of tool functions.
cache_handler_functions: Dictionary of cache handler functions.
callbacks: Dictionary of callback functions.
Raises:
ValueError: When an empty list is provided as agent_info.
"""
# If agent_info is a list, use the first item as the configuration
if isinstance(agent_info, list):
if not agent_info:
raise ValueError(f"Empty agent configuration list for agent {agent_name}")
agent_info = agent_info[0]
if llm := agent_info.get("llm"): if llm := agent_info.get("llm"):
try: try:
self.agents_config[agent_name]["llm"] = llms[llm]() self.agents_config[agent_name]["llm"] = llms[llm]()

View File

@@ -0,0 +1,115 @@
import os
import sys
import tempfile
from pathlib import Path
import pytest
import yaml
class TestYamlConfig:
"""Tests for YAML configuration handling."""
def test_list_format_in_yaml(self):
"""Test that list format in YAML is handled correctly."""
# Create a test YAML content with list format
yaml_content = """
test_agent:
- name: test_agent
role: Test Agent
goal: Test Goal
"""
# Parse the YAML content
data = yaml.safe_load(yaml_content)
# Get the agent_info which should be a list
agent_name = "test_agent"
agent_info = data[agent_name]
# Verify it's a list
assert isinstance(agent_info, list)
# Create a function that simulates the behavior of _map_agent_variables
# with our fix applied
def map_agent_variables(agent_name, agent_info):
# This is the fix we implemented
if isinstance(agent_info, list):
if not agent_info:
raise ValueError(f"Empty agent configuration list for agent {agent_name}")
agent_info = agent_info[0]
# Try to access a dictionary method on agent_info
# This would fail with AttributeError if agent_info is still a list
value = agent_info.get("name")
return value
# Call the function - this would raise AttributeError before the fix
result = map_agent_variables(agent_name, agent_info)
def test_empty_list_in_yaml(self):
"""Test that empty list in YAML raises appropriate error."""
# Create a test YAML content with empty list
yaml_content = """
test_agent: []
"""
# Parse the YAML content
data = yaml.safe_load(yaml_content)
# Get the agent_info which should be an empty list
agent_name = "test_agent"
agent_info = data[agent_name]
# Verify it's a list
assert isinstance(agent_info, list)
assert len(agent_info) == 0
# Create a function that simulates the behavior of _map_agent_variables
def map_agent_variables(agent_name, agent_info):
if isinstance(agent_info, list):
if not agent_info:
raise ValueError(f"Empty agent configuration list for agent {agent_name}")
agent_info = agent_info[0]
return agent_info
# Call the function - should raise ValueError
with pytest.raises(ValueError, match=f"Empty agent configuration list for agent {agent_name}"):
map_agent_variables(agent_name, agent_info)
def test_multiple_items_in_list(self):
"""Test that when multiple items are in the list, the first one is used."""
# Create a test YAML content with multiple items in the list
yaml_content = """
test_agent:
- name: first_agent
role: First Agent
goal: First Goal
- name: second_agent
role: Second Agent
goal: Second Goal
"""
# Parse the YAML content
data = yaml.safe_load(yaml_content)
# Get the agent_info which should be a list
agent_name = "test_agent"
agent_info = data[agent_name]
# Verify it's a list with multiple items
assert isinstance(agent_info, list)
assert len(agent_info) > 1
# Create a function that simulates the behavior of _map_agent_variables
def map_agent_variables(agent_name, agent_info):
if isinstance(agent_info, list):
if not agent_info:
raise ValueError(f"Empty agent configuration list for agent {agent_name}")
agent_info = agent_info[0]
return agent_info.get("name")
# Call the function - should return name from the first item
result = map_agent_variables(agent_name, agent_info)
# Verify only the first item was used
assert result == "first_agent"