mirror of
https://github.com/crewAIInc/crewAI.git
synced 2026-01-08 15:48:29 +00:00
Some checks failed
Notify Downstream / notify-downstream (push) Has been cancelled
* feat: implement tool usage limit exception handling - Introduced `ToolUsageLimitExceeded` exception to manage maximum usage limits for tools. - Enhanced `CrewStructuredTool` to check and raise this exception when the usage limit is reached. - Updated `_run` and `_execute` methods to include usage limit checks and handle exceptions appropriately, improving reliability and user feedback. * feat: enhance PlusAPI and ToolUsage with task metadata - Removed the `send_trace_batch` method from PlusAPI to streamline the API. - Added timeout parameters to trace event methods in PlusAPI for improved reliability. - Updated ToolUsage to include task metadata (task name and ID) in event emissions, enhancing traceability and context during tool usage. - Refactored event handling in LLM and ToolUsage events to ensure task information is consistently captured. * feat: enhance memory and event handling with task and agent metadata - Added task and agent metadata to various memory and event classes, improving traceability and context during memory operations. - Updated the `ContextualMemory` and `Memory` classes to associate tasks and agents, allowing for better context management. - Enhanced event emissions in `LLM`, `ToolUsage`, and memory events to include task and agent information, facilitating improved debugging and monitoring. - Refactored event handling to ensure consistent capture of task and agent details across the system. * drop * refactor: clean up unused imports in memory and event modules - Removed unused TYPE_CHECKING imports from long_term_memory.py to streamline the code. - Eliminated unnecessary import from memory_events.py, enhancing clarity and maintainability. * fix memory tests * fix task_completed payload * fix: remove unused test agent variable in external memory tests * refactor: remove unused agent parameter from Memory class save method - Eliminated the agent parameter from the save method in the Memory class to streamline the code and improve clarity. - Updated the TraceBatchManager class by moving initialization of attributes into the constructor for better organization and readability. * refactor: enhance ExecutionState and ReasoningEvent classes with optional task and agent identifiers - Added optional `current_agent_id` and `current_task_id` attributes to the `ExecutionState` class for better tracking of agent and task states. - Updated the `from_task` attribute in the `ReasoningEvent` class to use `Optional[Any]` instead of a specific type, improving flexibility in event handling. * refactor: update ExecutionState class by removing unused agent and task identifiers - Removed the `current_agent_id` and `current_task_id` attributes from the `ExecutionState` class to simplify the code and enhance clarity. - Adjusted the import statements to include `Optional` for better type handling. * refactor: streamline LLM event handling in LiteAgent - Removed unused LLM event emissions (LLMCallStartedEvent, LLMCallCompletedEvent, LLMCallFailedEvent) from the LiteAgent class to simplify the code and improve performance. - Adjusted the flow of LLM response handling by eliminating unnecessary event bus interactions, enhancing clarity and maintainability. * flow ownership and not emitting events when a crew is done * refactor: remove unused agent parameter from ShortTermMemory save method - Eliminated the agent parameter from the save method in the ShortTermMemory class to streamline the code and improve clarity. - This change enhances the maintainability of the memory management system by reducing unnecessary complexity. * runtype check fix * fixing tests * fix lints * fix: update event assertions in test_llm_emits_event_with_lite_agent - Adjusted the expected counts for completed and started events in the test to reflect the correct behavior of the LiteAgent. - Updated assertions for agent roles and IDs to match the expected values after recent changes in event handling. * fix: update task name assertions in event tests - Modified assertions in `test_stream_llm_emits_event_with_task_and_agent_info` and `test_llm_emits_event_with_task_and_agent_info` to use `task.description` as a fallback for `task.name`. This ensures that the tests correctly validate the task name even when it is not explicitly set. * fix: update test assertions for output values and improve readability - Updated assertions in `test_output_json_dict_hierarchical` to reflect the correct expected score value. - Enhanced readability of assertions in `test_output_pydantic_to_another_task` and `test_key` by formatting the error messages for clarity. - These changes ensure that the tests accurately validate the expected outputs and improve overall code quality. * test fixes * fix crew_test * added another fixture * fix: ensure agent and task assignments in contextual memory are conditional - Updated the ContextualMemory class to check for the existence of short-term, long-term, external, and extended memory before assigning agent and task attributes. This prevents potential attribute errors when memory types are not initialized.
134 lines
4.4 KiB
Python
134 lines
4.4 KiB
Python
from typing import Optional, TYPE_CHECKING
|
|
|
|
from crewai.memory import (
|
|
EntityMemory,
|
|
ExternalMemory,
|
|
LongTermMemory,
|
|
ShortTermMemory,
|
|
)
|
|
|
|
if TYPE_CHECKING:
|
|
from crewai.agent import Agent
|
|
from crewai.task import Task
|
|
|
|
|
|
class ContextualMemory:
|
|
def __init__(
|
|
self,
|
|
stm: ShortTermMemory,
|
|
ltm: LongTermMemory,
|
|
em: EntityMemory,
|
|
exm: ExternalMemory,
|
|
agent: Optional["Agent"] = None,
|
|
task: Optional["Task"] = None,
|
|
):
|
|
self.stm = stm
|
|
self.ltm = ltm
|
|
self.em = em
|
|
self.exm = exm
|
|
self.agent = agent
|
|
self.task = task
|
|
|
|
if self.stm is not None:
|
|
self.stm.agent = self.agent
|
|
self.stm.task = self.task
|
|
if self.ltm is not None:
|
|
self.ltm.agent = self.agent
|
|
self.ltm.task = self.task
|
|
if self.em is not None:
|
|
self.em.agent = self.agent
|
|
self.em.task = self.task
|
|
if self.exm is not None:
|
|
self.exm.agent = self.agent
|
|
self.exm.task = self.task
|
|
|
|
def build_context_for_task(self, task, context) -> str:
|
|
"""
|
|
Automatically builds a minimal, highly relevant set of contextual information
|
|
for a given task.
|
|
"""
|
|
query = f"{task.description} {context}".strip()
|
|
|
|
if query == "":
|
|
return ""
|
|
|
|
context = []
|
|
context.append(self._fetch_ltm_context(task.description))
|
|
context.append(self._fetch_stm_context(query))
|
|
context.append(self._fetch_entity_context(query))
|
|
context.append(self._fetch_external_context(query))
|
|
return "\n".join(filter(None, context))
|
|
|
|
def _fetch_stm_context(self, query) -> str:
|
|
"""
|
|
Fetches recent relevant insights from STM related to the task's description and expected_output,
|
|
formatted as bullet points.
|
|
"""
|
|
|
|
if self.stm is None:
|
|
return ""
|
|
|
|
stm_results = self.stm.search(query)
|
|
formatted_results = "\n".join(
|
|
[f"- {result['context']}" for result in stm_results]
|
|
)
|
|
return f"Recent Insights:\n{formatted_results}" if stm_results else ""
|
|
|
|
def _fetch_ltm_context(self, task) -> Optional[str]:
|
|
"""
|
|
Fetches historical data or insights from LTM that are relevant to the task's description and expected_output,
|
|
formatted as bullet points.
|
|
"""
|
|
|
|
if self.ltm is None:
|
|
return ""
|
|
|
|
ltm_results = self.ltm.search(task, latest_n=2)
|
|
if not ltm_results:
|
|
return None
|
|
|
|
formatted_results = [
|
|
suggestion
|
|
for result in ltm_results
|
|
for suggestion in result["metadata"]["suggestions"] # type: ignore # Invalid index type "str" for "str"; expected type "SupportsIndex | slice"
|
|
]
|
|
formatted_results = list(dict.fromkeys(formatted_results))
|
|
formatted_results = "\n".join([f"- {result}" for result in formatted_results]) # type: ignore # Incompatible types in assignment (expression has type "str", variable has type "list[str]")
|
|
|
|
return f"Historical Data:\n{formatted_results}" if ltm_results else ""
|
|
|
|
def _fetch_entity_context(self, query) -> str:
|
|
"""
|
|
Fetches relevant entity information from Entity Memory related to the task's description and expected_output,
|
|
formatted as bullet points.
|
|
"""
|
|
if self.em is None:
|
|
return ""
|
|
|
|
em_results = self.em.search(query)
|
|
formatted_results = "\n".join(
|
|
[f"- {result['context']}" for result in em_results] # type: ignore # Invalid index type "str" for "str"; expected type "SupportsIndex | slice"
|
|
)
|
|
return f"Entities:\n{formatted_results}" if em_results else ""
|
|
|
|
def _fetch_external_context(self, query: str) -> str:
|
|
"""
|
|
Fetches and formats relevant information from External Memory.
|
|
Args:
|
|
query (str): The search query to find relevant information.
|
|
Returns:
|
|
str: Formatted information as bullet points, or an empty string if none found.
|
|
"""
|
|
if self.exm is None:
|
|
return ""
|
|
|
|
external_memories = self.exm.search(query)
|
|
|
|
if not external_memories:
|
|
return ""
|
|
|
|
formatted_memories = "\n".join(
|
|
f"- {result['context']}" for result in external_memories
|
|
)
|
|
return f"External memories:\n{formatted_memories}"
|