Merge branch 'main' into lg-guardrail-llm

tests/agent_test.py

@@ -72,9 +72,54 @@ def test_agent_creation():
     assert agent.role == "test role"
     assert agent.goal == "test goal"
     assert agent.backstory == "test backstory"
-    assert agent.tools == []
+
+def test_agent_with_only_system_template():
+    """Test that an agent with only system_template works without errors."""
+    agent = Agent(
+        role="Test Role",
+        goal="Test Goal",
+        backstory="Test Backstory",
+        allow_delegation=False,
+        system_template="You are a test agent...",
+        # prompt_template is intentionally missing
+    )
+
+    assert agent.role == "Test Role"
+    assert agent.goal == "Test Goal"
+    assert agent.backstory == "Test Backstory"
+
+def test_agent_with_only_prompt_template():
+    """Test that an agent with only system_template works without errors."""
+    agent = Agent(
+        role="Test Role",
+        goal="Test Goal",
+        backstory="Test Backstory",
+        allow_delegation=False,
+        prompt_template="You are a test agent...",
+        # prompt_template is intentionally missing
+    )
+
+    assert agent.role == "Test Role"
+    assert agent.goal == "Test Goal"
+    assert agent.backstory == "Test Backstory"
 
 
+def test_agent_with_missing_response_template():
+    """Test that an agent with system_template and prompt_template but no response_template works without errors."""
+    agent = Agent(
+        role="Test Role",
+        goal="Test Goal",
+        backstory="Test Backstory",
+        allow_delegation=False,
+        system_template="You are a test agent...",
+        prompt_template="This is a test prompt...",
+        # response_template is intentionally missing
+    )
+
+    assert agent.role == "Test Role"
+    assert agent.goal == "Test Goal"
+    assert agent.backstory == "Test Backstory"
+    
 def test_agent_default_values():
     agent = Agent(role="test role", goal="test goal", backstory="test backstory")
     assert agent.llm.model == "gpt-4o-mini"

tests/memory/user_memory_test.py

@@ -1,4 +1,3 @@
-
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -65,4 +64,4 @@ def test_save_and_search(user_memory):
     with patch.object(UserMemory, 'search', return_value=expected_result) as mock_search:
         find = UserMemory.search("test value", score_threshold=0.01)[0]
         mock_search.assert_called_once_with("test value", score_threshold=0.01)
-        assert find == expected_result[0]
+        assert find == expected_result[0]

tests/storage/test_mem0_storage.py

@@ -15,6 +15,7 @@ from crewai.task import Task
 class MockCrew:
     def __init__(self, memory_config):
         self.memory_config = memory_config
+        self.agents = [MagicMock(role="Test Agent")]
 
 
 @pytest.fixture
@@ -107,11 +108,13 @@ def mem0_storage_with_memory_client_using_config_from_crew(mock_mem0_memory_clie
 
 
 @pytest.fixture
-def mem0_storage_with_memory_client_using_explictly_config(mock_mem0_memory_client):
+def mem0_storage_with_memory_client_using_explictly_config(mock_mem0_memory_client, mock_mem0_memory):
     """Fixture to create a Mem0Storage instance with mocked dependencies"""
 
-    # We need to patch the MemoryClient before it's instantiated
-    with patch.object(MemoryClient, "__new__", return_value=mock_mem0_memory_client):
+    # We need to patch both MemoryClient and Memory to prevent actual initialization
+    with patch.object(MemoryClient, "__new__", return_value=mock_mem0_memory_client), \
+         patch.object(Memory, "__new__", return_value=mock_mem0_memory):
+
         crew = MockCrew(
             memory_config={
                 "provider": "mem0",
@@ -155,3 +158,82 @@ def test_mem0_storage_with_explict_config(
         mem0_storage_with_memory_client_using_explictly_config.memory_config
         == expected_config
     )
+
+
+def test_save_method_with_memory_oss(mem0_storage_with_mocked_config):
+    """Test save method for different memory types"""
+    mem0_storage, _, _ = mem0_storage_with_mocked_config
+    mem0_storage.memory.add = MagicMock()
+    
+    # Test short_term memory type (already set in fixture)
+    test_value = "This is a test memory"
+    test_metadata = {"key": "value"}
+    
+    mem0_storage.save(test_value, test_metadata)
+    
+    mem0_storage.memory.add.assert_called_once_with(
+        test_value,
+        agent_id="Test_Agent",
+        infer=False,
+        metadata={"type": "short_term", "key": "value"},
+    )
+
+
+def test_save_method_with_memory_client(mem0_storage_with_memory_client_using_config_from_crew):
+    """Test save method for different memory types"""
+    mem0_storage = mem0_storage_with_memory_client_using_config_from_crew
+    mem0_storage.memory.add = MagicMock()
+    
+    # Test short_term memory type (already set in fixture)
+    test_value = "This is a test memory"
+    test_metadata = {"key": "value"}
+    
+    mem0_storage.save(test_value, test_metadata)
+    
+    mem0_storage.memory.add.assert_called_once_with(
+        test_value,
+        agent_id="Test_Agent",
+        infer=False,
+        metadata={"type": "short_term", "key": "value"},
+        output_format="v1.1"
+    )
+
+
+def test_search_method_with_memory_oss(mem0_storage_with_mocked_config):
+    """Test search method for different memory types"""
+    mem0_storage, _, _ = mem0_storage_with_mocked_config
+    mock_results = {"results": [{"score": 0.9, "content": "Result 1"}, {"score": 0.4, "content": "Result 2"}]}
+    mem0_storage.memory.search = MagicMock(return_value=mock_results)
+
+    results = mem0_storage.search("test query", limit=5, score_threshold=0.5)
+
+    mem0_storage.memory.search.assert_called_once_with(
+        query="test query", 
+        limit=5, 
+        agent_id="Test_Agent",
+        user_id="test_user"
+    )
+
+    assert len(results) == 1
+    assert results[0]["content"] == "Result 1"
+
+
+def test_search_method_with_memory_client(mem0_storage_with_memory_client_using_config_from_crew):
+    """Test search method for different memory types"""
+    mem0_storage = mem0_storage_with_memory_client_using_config_from_crew
+    mock_results = {"results": [{"score": 0.9, "content": "Result 1"}, {"score": 0.4, "content": "Result 2"}]}
+    mem0_storage.memory.search = MagicMock(return_value=mock_results)
+
+    results = mem0_storage.search("test query", limit=5, score_threshold=0.5)
+
+    mem0_storage.memory.search.assert_called_once_with(
+        query="test query", 
+        limit=5, 
+        agent_id="Test_Agent", 
+        metadata={"type": "short_term"},
+        user_id="test_user",
+        output_format='v1.1'
+    )
+
+    assert len(results) == 1
+    assert results[0]["content"] == "Result 1"