mirror of
https://github.com/crewAIInc/crewAI.git
synced 2026-01-11 00:58:30 +00:00
fix: Re-add manual deep copy for all memory types in Crew.copy
Addresses feedback on PR #2594 to ensure all memory objects (short_term, long_term, entity, external, user) are correctly deep copied using model_copy(deep=True). Also simplifies the test case to directly verify the copy behavior instead of relying on the train method. Co-Authored-By: Joe Moura <joao@crewai.com>
This commit is contained in:
@@ -1220,6 +1220,10 @@ class Crew(BaseModel):
|
|||||||
copied_data["long_term_memory"] = self.long_term_memory.model_copy(deep=True)
|
copied_data["long_term_memory"] = self.long_term_memory.model_copy(deep=True)
|
||||||
if self.entity_memory:
|
if self.entity_memory:
|
||||||
copied_data["entity_memory"] = self.entity_memory.model_copy(deep=True)
|
copied_data["entity_memory"] = self.entity_memory.model_copy(deep=True)
|
||||||
|
if self.external_memory:
|
||||||
|
copied_data["external_memory"] = self.external_memory.model_copy(deep=True)
|
||||||
|
if self.user_memory:
|
||||||
|
copied_data["user_memory"] = self.user_memory.model_copy(deep=True)
|
||||||
|
|
||||||
|
|
||||||
copied_data.pop("agents", None)
|
copied_data.pop("agents", None)
|
||||||
|
|||||||
@@ -4119,20 +4119,53 @@ def test_crew_kickoff_for_each_works_with_manager_agent_copy():
|
|||||||
assert crew_copy.manager_agent.role == crew.manager_agent.role
|
assert crew_copy.manager_agent.role == crew.manager_agent.role
|
||||||
assert crew_copy.manager_agent.goal == crew.manager_agent.goal
|
assert crew_copy.manager_agent.goal == crew.manager_agent.goal
|
||||||
|
|
||||||
def test_crew_train_with_memory():
|
def test_crew_copy_with_memory():
|
||||||
"""Test that training a crew with memory enabled does not raise validation errors."""
|
"""Test that copying a crew with memory enabled does not raise validation errors and copies memory correctly."""
|
||||||
agent = Agent(role="Test Agent", goal="Test Goal", backstory="Test Backstory")
|
agent = Agent(role="Test Agent", goal="Test Goal", backstory="Test Backstory")
|
||||||
task = Task(description="Test Task", expected_output="Test Output", agent=agent)
|
task = Task(description="Test Task", expected_output="Test Output", agent=agent)
|
||||||
crew = Crew(agents=[agent], tasks=[task], memory=True)
|
crew = Crew(agents=[agent], tasks=[task], memory=True)
|
||||||
|
|
||||||
with tempfile.TemporaryDirectory() as tmpdir:
|
original_short_term_id = id(crew._short_term_memory) if crew._short_term_memory else None
|
||||||
filename = os.path.join(tmpdir, "training_data.pkl")
|
original_long_term_id = id(crew._long_term_memory) if crew._long_term_memory else None
|
||||||
try:
|
original_entity_id = id(crew._entity_memory) if crew._entity_memory else None
|
||||||
crew.train(n_iterations=1, filename=filename)
|
original_external_id = id(crew._external_memory) if crew._external_memory else None
|
||||||
except pydantic_core.ValidationError as e:
|
original_user_id = id(crew._user_memory) if crew._user_memory else None
|
||||||
if "Input should be an instance of" in str(e) and ("Memory" in str(e)):
|
|
||||||
pytest.fail(f"Training with memory raised Pydantic ValidationError, likely due to incorrect memory copy: {e}")
|
|
||||||
else:
|
try:
|
||||||
raise e
|
crew_copy = crew.copy()
|
||||||
except Exception as e:
|
|
||||||
print(f"Warning: Training raised an unexpected exception: {e}")
|
assert hasattr(crew_copy, "_short_term_memory"), "Copied crew should have _short_term_memory"
|
||||||
|
assert crew_copy._short_term_memory is not None, "Copied _short_term_memory should not be None"
|
||||||
|
assert id(crew_copy._short_term_memory) != original_short_term_id, "Copied _short_term_memory should be a new object"
|
||||||
|
|
||||||
|
assert hasattr(crew_copy, "_long_term_memory"), "Copied crew should have _long_term_memory"
|
||||||
|
assert crew_copy._long_term_memory is not None, "Copied _long_term_memory should not be None"
|
||||||
|
assert id(crew_copy._long_term_memory) != original_long_term_id, "Copied _long_term_memory should be a new object"
|
||||||
|
|
||||||
|
assert hasattr(crew_copy, "_entity_memory"), "Copied crew should have _entity_memory"
|
||||||
|
assert crew_copy._entity_memory is not None, "Copied _entity_memory should not be None"
|
||||||
|
assert id(crew_copy._entity_memory) != original_entity_id, "Copied _entity_memory should be a new object"
|
||||||
|
|
||||||
|
if original_external_id:
|
||||||
|
assert hasattr(crew_copy, "_external_memory"), "Copied crew should have _external_memory"
|
||||||
|
assert crew_copy._external_memory is not None, "Copied _external_memory should not be None"
|
||||||
|
assert id(crew_copy._external_memory) != original_external_id, "Copied _external_memory should be a new object"
|
||||||
|
else:
|
||||||
|
assert not hasattr(crew_copy, "_external_memory") or crew_copy._external_memory is None, "Copied _external_memory should be None if not originally present"
|
||||||
|
|
||||||
|
if original_user_id:
|
||||||
|
assert hasattr(crew_copy, "_user_memory"), "Copied crew should have _user_memory"
|
||||||
|
assert crew_copy._user_memory is not None, "Copied _user_memory should not be None"
|
||||||
|
assert id(crew_copy._user_memory) != original_user_id, "Copied _user_memory should be a new object"
|
||||||
|
else:
|
||||||
|
assert not hasattr(crew_copy, "_user_memory") or crew_copy._user_memory is None, "Copied _user_memory should be None if not originally present"
|
||||||
|
|
||||||
|
|
||||||
|
except pydantic_core.ValidationError as e:
|
||||||
|
if "Input should be an instance of" in str(e) and ("Memory" in str(e)):
|
||||||
|
pytest.fail(f"Copying with memory raised Pydantic ValidationError, likely due to incorrect memory copy: {e}")
|
||||||
|
else:
|
||||||
|
raise e # Re-raise other validation errors
|
||||||
|
except Exception as e:
|
||||||
|
pytest.fail(f"Copying crew raised an unexpected exception: {e}")
|
||||||
|
|||||||
Reference in New Issue
Block a user