Merge branch 'main' of github.com:joaomdmoura/crewAI into test-hierarchical-tools-proper-setup

src/crewai/agents/executor.py

@@ -242,6 +242,8 @@ class CrewAgentExecutor(AgentExecutor, CrewAgentExecutorMixin):
             else:
                 if tool_calling.tool_name.casefold().strip() in [
                     name.casefold().strip() for name in name_to_tool_map
+                ] or tool_calling.tool_name.casefold().replace("_", " ") in [
+                    name.casefold().strip() for name in name_to_tool_map
                 ]:
                     observation = tool_usage.use(tool_calling, agent_action.log)
                 else:

src/crewai/crew.py

@@ -29,7 +29,6 @@ from crewai.memory.short_term.short_term_memory import ShortTermMemory
 from crewai.process import Process
 from crewai.task import Task
 from crewai.tasks.conditional_task import ConditionalTask
-from crewai.tasks.output_format import OutputFormat
 from crewai.tasks.task_output import TaskOutput
 from crewai.telemetry import Telemetry
 from crewai.tools.agent_tools import AgentTools
@@ -39,12 +38,11 @@ from crewai.utilities.constants import (
     TRAINING_DATA_FILE,
 )
 from crewai.utilities.evaluators.task_evaluator import TaskEvaluator
-from crewai.utilities.task_output_storage_handler import TaskOutputStorageHandler
-
 from crewai.utilities.formatter import (
     aggregate_raw_outputs_from_task_outputs,
     aggregate_raw_outputs_from_tasks,
 )
+from crewai.utilities.task_output_storage_handler import TaskOutputStorageHandler
 from crewai.utilities.training_handler import CrewTrainingHandler
 
 try:
@@ -310,7 +308,7 @@ class Crew(BaseModel):
 
     @model_validator(mode="after")
     def validate_async_tasks_not_async(self) -> "Crew":
-        """Ensure the first task is not a ConditionalTask."""
+        """Ensure that ConditionalTask is not async."""
         for task in self.tasks:
             if task.async_execution and isinstance(task, ConditionalTask):
                 raise PydanticCustomError(
@@ -704,12 +702,7 @@ class Crew(BaseModel):
                 f"Skipping conditional task: {task.description}",
                 color="yellow",
             )
-            skipped_task_output = TaskOutput(
-                description=task.description,
-                raw="",
-                agent=task.agent.role if task.agent else "",
-                output_format=OutputFormat.RAW,
-            )
+            skipped_task_output = task.get_skipped_task_output()
 
             if not was_replayed:
                 self._store_execution_log(task, skipped_task_output, task_index)

src/crewai/tasks/conditional_task.py

@@ -1,7 +1,9 @@
-from typing import Callable, Any
+from typing import Any, Callable
 
 from pydantic import Field
+
 from crewai.task import Task
+from crewai.tasks.output_format import OutputFormat
 from crewai.tasks.task_output import TaskOutput
 
 
@@ -34,6 +36,12 @@ class ConditionalTask(Task):
         Returns:
             bool: True if the task should be executed, False otherwise.
         """
-        if self.condition:
-            return self.condition(context)
-        return True
+        return self.condition(context)
+
+    def get_skipped_task_output(self):
+        return TaskOutput(
+            description=self.description,
+            raw="",
+            agent=self.agent.role if self.agent else "",
+            output_format=OutputFormat.RAW,
+        )

src/crewai/utilities/converter.py

@@ -38,10 +38,10 @@ class Converter(OutputConverter):
                 return self._create_instructor().to_json()
             else:
                 return json.dumps(self._create_chain().invoke({}).model_dump())
-        except Exception:
+        except Exception as e:
             if current_attempt < self.max_attempts:
                 return self.to_json(current_attempt + 1)
-            return ConverterError("Failed to convert text into JSON.")
+            return ConverterError(f"Failed to convert text into JSON, error: {e}.")
 
     def _create_instructor(self):
         """Create an instructor."""

src/crewai/utilities/crew_pydantic_output_parser.py

@@ -17,6 +17,16 @@ class CrewPydanticOutputParser(PydanticOutputParser):
 
     def parse_result(self, result: List[Generation], *, partial: bool = False) -> Any:
         result[0].text = self._transform_in_valid_json(result[0].text)
+
+        # Treating edge case of function calling llm returning the name instead of tool_name
+        json_object = json.loads(result[0].text)
+        json_object["tool_name"] = (
+            json_object["name"]
+            if "tool_name" not in json_object
+            else json_object["tool_name"]
+        )
+        result[0].text = json.dumps(json_object)
+
         json_object = super().parse_result(result)
         try:
             return self.pydantic_object.parse_obj(json_object)