Merge branch 'main' into fix-issue-2263

tests/crew_test.py

@@ -20,6 +20,7 @@ from crewai.crews.crew_output import CrewOutput
 from crewai.knowledge.source.string_knowledge_source import StringKnowledgeSource
 from crewai.llm import LLM
 from crewai.memory.contextual.contextual_memory import ContextualMemory
+from crewai.memory.long_term.long_term_memory import LongTermMemory
 from crewai.memory.short_term.short_term_memory import ShortTermMemory
 from crewai.process import Process
 from crewai.task import Task
@@ -2407,6 +2408,136 @@ def test_using_contextual_memory():
         contextual_mem.assert_called_once()
 
 
+@pytest.mark.vcr(filter_headers=["authorization"])
+def test_using_contextual_memory_with_long_term_memory():
+    from unittest.mock import patch
+
+    math_researcher = Agent(
+        role="Researcher",
+        goal="You research about math.",
+        backstory="You're an expert in research and you love to learn new things.",
+        allow_delegation=False,
+    )
+
+    task1 = Task(
+        description="Research a topic to teach a kid aged 6 about math.",
+        expected_output="A topic, explanation, angle, and examples.",
+        agent=math_researcher,
+    )
+
+    crew = Crew(
+        agents=[math_researcher],
+        tasks=[task1],
+        long_term_memory=LongTermMemory(),
+    )
+
+    with patch.object(ContextualMemory, "build_context_for_task") as contextual_mem:
+        crew.kickoff()
+        contextual_mem.assert_called_once()
+        assert crew.memory is False
+
+
+@pytest.mark.vcr(filter_headers=["authorization"])
+def test_warning_long_term_memory_without_entity_memory():
+    from unittest.mock import patch
+
+    math_researcher = Agent(
+        role="Researcher",
+        goal="You research about math.",
+        backstory="You're an expert in research and you love to learn new things.",
+        allow_delegation=False,
+    )
+
+    task1 = Task(
+        description="Research a topic to teach a kid aged 6 about math.",
+        expected_output="A topic, explanation, angle, and examples.",
+        agent=math_researcher,
+    )
+
+    crew = Crew(
+        agents=[math_researcher],
+        tasks=[task1],
+        long_term_memory=LongTermMemory(),
+    )
+
+    with (
+        patch("crewai.utilities.printer.Printer.print") as mock_print,
+        patch(
+            "crewai.memory.long_term.long_term_memory.LongTermMemory.save"
+        ) as save_memory,
+    ):
+        crew.kickoff()
+        mock_print.assert_called_with(
+            content="Long term memory is enabled, but entity memory is not enabled. Please configure entity memory or set memory=True to automatically enable it.",
+            color="bold_yellow",
+        )
+        save_memory.assert_not_called()
+
+
+@pytest.mark.vcr(filter_headers=["authorization"])
+def test_long_term_memory_with_memory_flag():
+    from unittest.mock import patch
+
+    math_researcher = Agent(
+        role="Researcher",
+        goal="You research about math.",
+        backstory="You're an expert in research and you love to learn new things.",
+        allow_delegation=False,
+    )
+
+    task1 = Task(
+        description="Research a topic to teach a kid aged 6 about math.",
+        expected_output="A topic, explanation, angle, and examples.",
+        agent=math_researcher,
+    )
+
+    crew = Crew(
+        agents=[math_researcher],
+        tasks=[task1],
+        memory=True,
+        long_term_memory=LongTermMemory(),
+    )
+
+    with (
+        patch("crewai.utilities.printer.Printer.print") as mock_print,
+        patch(
+            "crewai.memory.long_term.long_term_memory.LongTermMemory.save"
+        ) as save_memory,
+    ):
+        crew.kickoff()
+        mock_print.assert_not_called()
+        save_memory.assert_called_once()
+
+
+@pytest.mark.vcr(filter_headers=["authorization"])
+def test_using_contextual_memory_with_short_term_memory():
+    from unittest.mock import patch
+
+    math_researcher = Agent(
+        role="Researcher",
+        goal="You research about math.",
+        backstory="You're an expert in research and you love to learn new things.",
+        allow_delegation=False,
+    )
+
+    task1 = Task(
+        description="Research a topic to teach a kid aged 6 about math.",
+        expected_output="A topic, explanation, angle, and examples.",
+        agent=math_researcher,
+    )
+
+    crew = Crew(
+        agents=[math_researcher],
+        tasks=[task1],
+        short_term_memory=ShortTermMemory(),
+    )
+
+    with patch.object(ContextualMemory, "build_context_for_task") as contextual_mem:
+        crew.kickoff()
+        contextual_mem.assert_called_once()
+        assert crew.memory is False
+
+
 @pytest.mark.vcr(filter_headers=["authorization"])
 def test_disabled_memory_using_contextual_memory():
     from unittest.mock import patch