andre/crewAI
1
0
Fork 0
mirror of https://github.com/crewAIInc/crewAI.git synced 2026-01-10 00:28:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: implement _remember_format in ToolUsage class (#1815)

Browse Source 
Co-Authored-By: Joe Moura <joao@crewai.com>
This commit is contained in:
Devin AI
2024-12-29 17:00:15 +00:00
parent 700660be94
commit 1582017ad4
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/crewai/agents/crew_agent_executor.py
View File

@@ -127,10 +127,6 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
"Invalid response from LLM call - None or empty."
)
# Remember output format before parsing
if hasattr(self.task, 'output_format'):
self._remember_format()
if not self.use_stop_words:
try:
self._format_answer(answer)
@@ -192,7 +188,9 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
)
except OutputParserException as e:
error_msg = "Error on parsing tool." if "Error parsing tool usage" in str(e) else e.error
error_msg = e.error
if "Error parsing tool usage" in str(e):
error_msg = "Error on parsing tool."
self.messages.append({"role": "user", "content": error_msg})
if self.iterations > self.log_error_after:
self._printer.print(

24
src/crewai/tools/tool_usage.py
View File

@@ -145,6 +145,10 @@ class ToolUsage:
from_cache = False
result = None # type: ignore # Incompatible types in assignment (expression has type "None", variable has type "str")
# Remember output format if needed
self._remember_format()
# check if cache is available
if self.tools_handler.cache:
result = self.tools_handler.cache.read( # type: ignore # Incompatible types in assignment (expression has type "str | None", variable has type "str")
@@ -259,14 +263,20 @@ class ToolUsage:
return result
def _should_remember_format(self) -> bool:
return self.task.used_tools % self._remember_format_after_usages == 0
"""Check if we should remember the output format based on usage count."""
return self.task.used_tools >= self._remember_format_after_usages
def _remember_format(self, result: str) -> None:
result = str(result)
result += "\n\n" + self._i18n.slice("tools").format(
tools=self.tools_description, tool_names=self.tools_names
)
return result # type: ignore # No return value expected
def _remember_format(self, result: str = None) -> str:
"""Remember the output format for the task and optionally format the result."""
if hasattr(self.task, 'output_format') and self._should_remember_format():
self.task.output_format = True
if result is not None:
result = str(result)
result += "\n\n" + self._i18n.slice("tools").format(
tools=self.tools_description, tool_names=self.tools_names
)
return result if result is not None else ""
def _check_tool_repeated_usage(
self, calling: Union[ToolCalling, InstructorToolCalling]