Resolved Merge Conflicts for PR #712: Remove Hyphen in co-workers (#786)

* removed hyphen in co-workers

* Fix issue with AgentTool agent selection. The LLM included double quotes in the agent name which messed up the string comparison. Added additional types. Cleaned up error messaging.

* Remove duplicate import

* Improve explanation

* Revert poetry.lock changes

* Fix missing line in poetry.lock

---------

Co-authored-by: madmag77 <goncharov.artemv@gmail.com>

src/crewai/agents/executor.py

@@ -58,7 +58,7 @@ class CrewAgentExecutor(AgentExecutor):
         if (
             self.crew
             and self.crew.memory
-            and "Action: Delegate work to co-worker" not in output.log
+            and "Action: Delegate work to coworker" not in output.log
         ):
             memory = ShortTermMemoryItem(
                 data=output.log,

src/crewai/tools/agent_tools.py

@@ -18,14 +18,14 @@ class AgentTools(BaseModel):
         tools = [
             StructuredTool.from_function(
                 func=self.delegate_work,
-                name="Delegate work to co-worker",
+                name="Delegate work to coworker",
                 description=self.i18n.tools("delegate_work").format(
                     coworkers=f"[{', '.join([f'{agent.role}' for agent in self.agents])}]"
                 ),
             ),
             StructuredTool.from_function(
                 func=self.ask_question,
-                name="Ask question to co-worker",
+                name="Ask question to coworker",
                 description=self.i18n.tools("ask_question").format(
                     coworkers=f"[{', '.join([f'{agent.role}' for agent in self.agents])}]"
                 ),
@@ -34,34 +34,54 @@ class AgentTools(BaseModel):
         return tools
 
     def delegate_work(
-        self, task: str, context: str, coworker: Union[str, None] = None, **kwargs
+        self,
+        task: str,
+        context: Union[str, None] = None,
+        coworker: Union[str, None] = None,
+        **kwargs,
     ):
-        """Useful to delegate a specific task to a co-worker passing all necessary context and names."""
-        coworker = coworker or kwargs.get("co_worker") or kwargs.get("co-worker")
-        if coworker is not None:
+        """Useful to delegate a specific task to a coworker passing all necessary context and names."""
+        coworker = coworker or kwargs.get("co_worker") or kwargs.get("coworker")
+        if coworker:
             is_list = coworker.startswith("[") and coworker.endswith("]")
             if is_list:
                 coworker = coworker[1:-1].split(",")[0]
         return self._execute(coworker, task, context)
 
     def ask_question(
-        self, question: str, context: str, coworker: Union[str, None] = None, **kwargs
+        self,
+        question: str,
+        context: Union[str, None] = None,
+        coworker: Union[str, None] = None,
+        **kwargs,
     ):
-        """Useful to ask a question, opinion or take from a co-worker passing all necessary context and names."""
-        coworker = coworker or kwargs.get("co_worker") or kwargs.get("co-worker")
-        if coworker is not None:
+        """Useful to ask a question, opinion or take from a coworker passing all necessary context and names."""
+        coworker = coworker or kwargs.get("co_worker") or kwargs.get("coworker")
+        if coworker:
             is_list = coworker.startswith("[") and coworker.endswith("]")
             if is_list:
                 coworker = coworker[1:-1].split(",")[0]
         return self._execute(coworker, question, context)
 
-    def _execute(self, agent, task, context):
+    def _execute(self, agent: Union[str, None], task: str, context: Union[str, None]):
         """Execute the command."""
         try:
+            if agent is None:
+                agent = ""
+
+            # It is important to remove the quotes from the agent name.
+            # The reason we have to do this is because less-powerful LLM's
+            # have difficulty producing valid JSON.
+            # As a result, we end up with invalid JSON that is truncated like this:
+            # {"task": "....", "coworker": "....
+            # when it should look like this:
+            # {"task": "....", "coworker": "...."}
+            agent_name = agent.casefold().replace('"', "")
+
             agent = [
                 available_agent
                 for available_agent in self.agents
-                if available_agent.role.casefold().strip() == agent.casefold().strip()
+                if available_agent.role.casefold() == agent_name
             ]
         except Exception as _:
             return self.i18n.errors("agent_tool_unexsiting_coworker").format(
@@ -81,6 +101,6 @@ class AgentTools(BaseModel):
         task = Task(
             description=task,
             agent=agent,
-            expected_output="Your best answer to your co-worker asking you this, accounting for the context shared.",
+            expected_output="Your best answer to your coworker asking you this, accounting for the context shared.",
         )
         return agent.execute_task(task, context)

src/crewai/tools/tool_usage.py

@@ -126,8 +126,8 @@ class ToolUsage:
         if not result:
             try:
                 if calling.tool_name in [
-                    "Delegate work to co-worker",
-                    "Ask question to co-worker",
+                    "Delegate work to coworker",
+                    "Ask question to coworker",
                 ]:
                     self.task.increment_delegations()
 

src/crewai/translations/en.json

@@ -21,7 +21,7 @@
   },
   "errors": {
     "force_final_answer": "Tool won't be use because it's time to give your final answer. Don't use tools and just your absolute BEST Final answer.",
-    "agent_tool_unexsiting_coworker": "\nError executing tool. Co-worker mentioned not found, it must to be one of the following options:\n{coworkers}\n",
+    "agent_tool_unexsiting_coworker": "\nError executing tool. coworker mentioned not found, it must be one of the following options:\n{coworkers}\n",
     "task_repeated_usage": "I tried reusing the same input, I must stop using this action input. I'll try something else instead.\n\n",
     "tool_usage_error": "I encountered an error: {error}",
     "tool_arguments_error": "Error: the Action Input is not a valid key, value dictionary.",
@@ -29,7 +29,7 @@
     "tool_usage_exception": "I encountered an error while trying to use the tool. This was the error: {error}.\n Tool {tool} accepts these inputs: {tool_inputs}"
   },
   "tools": {
-    "delegate_work": "Delegate a specific task to one of the following co-workers: {coworkers}\nThe input to this tool should be the co-worker, the task you want them to do, and ALL necessary context to execute the task, they know nothing about the task, so share absolute everything you know, don't reference things but instead explain them.",
-    "ask_question": "Ask a specific question to one of the following co-workers: {coworkers}\nThe input to this tool should be the co-worker, the question you have for them, and ALL necessary context to ask the question properly, they know nothing about the question, so share absolute everything you know, don't reference things but instead explain them."
+    "delegate_work": "Delegate a specific task to one of the following coworkers: {coworkers}\nThe input to this tool should be the coworker, the task you want them to do, and ALL necessary context to execute the task, they know nothing about the task, so share absolute everything you know, don't reference things but instead explain them.",
+    "ask_question": "Ask a specific question to one of the following coworkers: {coworkers}\nThe input to this tool should be the coworker, the question you have for them, and ALL necessary context to ask the question properly, they know nothing about the question, so share absolute everything you know, don't reference things but instead explain them."
   }
 }

src/crewai/utilities/logger.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+
 from crewai.utilities.printer import Printer