andre/crewAI
1
0
Fork 0
mirror of https://github.com/crewAIInc/crewAI.git synced 2026-05-01 23:32:39 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix: include tool role messages in save_last_messages

Browse Source
This commit is contained in:
Greyson LaLonde
2026-01-22 19:10:33 -05:00
parent 846133310b
commit edae4e889c
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/crewai/src/crewai/agent/utils.py
View File

@@ -17,6 +17,7 @@ from crewai.events.types.knowledge_events import (
) )
from crewai.knowledge.utils.knowledge_utils import extract_knowledge_context from crewai.knowledge.utils.knowledge_utils import extract_knowledge_context
from crewai.utilities.pydantic_schema_utils import generate_model_description from crewai.utilities.pydantic_schema_utils import generate_model_description
from crewai.utilities.types import LLMMessage
if TYPE_CHECKING: if TYPE_CHECKING:
@@ -237,8 +238,8 @@ def save_last_messages(agent: Agent) -> None:
"""Save the last messages from agent executor. """Save the last messages from agent executor.
Sanitizes messages to be compatible with TaskOutput's LLMMessage type, Sanitizes messages to be compatible with TaskOutput's LLMMessage type,
which only accepts 'user', 'assistant', 'system' roles and requires which accepts 'user', 'assistant', 'system', and 'tool' roles.
content to be a string or list (not None). Preserves tool_call_id/name for tool messages and tool_calls for assistant messages.
Args: Args:
agent: The agent instance. agent: The agent instance.
@@ -247,17 +248,27 @@ def save_last_messages(agent: Agent) -> None:
agent._last_messages = [] agent._last_messages = []
return return
sanitized_messages = [] sanitized_messages: list[LLMMessage] = []
for msg in agent.agent_executor.messages: for msg in agent.agent_executor.messages:
role = msg.get("role", "") role = msg.get("role", "")
# Only include messages with valid LLMMessage roles if role not in ("user", "assistant", "system", "tool"):
if role not in ("user", "assistant", "system"):
continue continue
# Ensure content is not None (can happen with tool call assistant messages)
content = msg.get("content") content = msg.get("content")
if content is None: if content is None:
content = "" content = ""
sanitized_messages.append({"role": role, "content": content}) sanitized_msg: LLMMessage = {"role": role, "content": content}
if role == "tool":
tool_call_id = msg.get("tool_call_id")
if tool_call_id:
sanitized_msg["tool_call_id"] = tool_call_id
name = msg.get("name")
if name:
sanitized_msg["name"] = name
elif role == "assistant":
tool_calls = msg.get("tool_calls")
if tool_calls:
sanitized_msg["tool_calls"] = tool_calls
sanitized_messages.append(sanitized_msg)
agent._last_messages = sanitized_messages agent._last_messages = sanitized_messages