Tests passing

Author: abrookins

long_term_memory.py

@@ -91,7 +91,7 @@ async def search_messages(
             .paging(0, limit)
             .dialect(2)
         )
-        print(params)
+
         raw_results = await redis_conn.ft(REDIS_INDEX_NAME).search(
             q,
             query_params=params,  # type: ignore

memory.py

@@ -13,7 +13,7 @@
     AckResponse,
     GetSessionsQuery,
 )
-from reducer import handle_compaction
+from reducers import handle_compaction
 from long_term_memory import index_messages
 from utils import Keys, get_openai_client, get_redis_conn
 from config import settings

reducer.py reducers.pyreducer.py renamed to reducers.py

@@ -7,7 +7,7 @@
 logger = logging.getLogger(__name__)
 
 
-async def incremental_summarization(
+async def _incremental_summary(
     model: str,
     openai_client: OpenAIClientWrapper,
     context: Optional[str],
@@ -136,7 +136,7 @@ async def handle_compaction(
             return
 
         # Generate new summary
-        summary, _ = await incremental_summarization(
+        summary, _ = await _incremental_summary(
             model,
             openai_client,
             context.decode("utf-8") if isinstance(context, bytes) else context,

tests/test_api.py

@@ -1,18 +1,14 @@
-from unittest.mock import AsyncMock, MagicMock, Mock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
 
-from httpx import ASGITransport, AsyncClient
 import numpy as np
 import pytest
-from fastapi import BackgroundTasks, FastAPI
 
 from config import Settings
-from healthcheck import router as health_router
-from memory import router as memory_router
+from long_term_memory import index_messages
 from models import (
     RedisearchResult,
 )
-from reducer import handle_compaction
-from long_term_memory import index_messages
+from reducers import handle_compaction
 
 
 @pytest.fixture
@@ -115,7 +111,7 @@ async def test_post_memory(self, client):
         data = response.json()
         assert "status" in data
         assert data["status"] == "ok"
-        
+
     @pytest.mark.requires_api_keys
     @pytest.mark.asyncio
     async def test_post_memory_stores_in_long_term_memory(self, client):

tests/test_long_term_memory.py

@@ -1,5 +1,5 @@
 from re import M
-from unittest.mock import AsyncMock
+from unittest.mock import AsyncMock, MagicMock
 import pytest
 import numpy as np
 from redis.commands.search.document import Document
@@ -56,15 +56,18 @@ async def test_index_messages(
     async def test_search_messages(self, mock_openai_client, mock_async_redis_client):
         """Test searching messages"""
         # Set up the mock embedding response
-        mock_openai_client.create_embedding.return_value = [[0.1, 0.2, 0.3, 0.4]]
+        mock_openai_client.create_embedding.return_value = np.array(
+            [0.1, 0.2, 0.3, 0.4], dtype=np.float32
+        )
 
         class MockResult:
             def __init__(self, docs):
                 self.total = len(docs)
                 self.docs = docs
 
-        mock_async_redis_client.ft = AsyncMock()
-        mock_async_redis_client.ft.search.return_value = MockResult(
+        # Create a proper mock structure for Redis ft().search()
+        mock_search = AsyncMock()
+        mock_search.return_value = MockResult(
             [
                 Document(
                     id=b"doc1",
@@ -81,6 +84,13 @@ def __init__(self, docs):
             ]
         )
 
+        # Create a mock FT object that has a search method
+        mock_ft = MagicMock()
+        mock_ft.search = mock_search
+
+        # Setup the ft method to return our mock_ft object
+        mock_async_redis_client.ft = MagicMock(return_value=mock_ft)
+
         # Call search_messages
         query = "What is the meaning of life?"
         session_id = "test-session"
@@ -91,12 +101,17 @@ def __init__(self, docs):
         # Check that create_embedding was called with the right arguments
         mock_openai_client.create_embedding.assert_called_with([query])
 
-        # Check that redis.execute_command was called with the right arguments
-        mock_async_redis_client.ft.search.assert_called_once()
-        args = mock_async_redis_client.ft.search.call_args[0]
-
         # Check that the index name is correct
-        assert args[1] == REDIS_INDEX_NAME
+        assert mock_async_redis_client.ft.call_count == 1
+        assert mock_async_redis_client.ft.call_args[0][0] == REDIS_INDEX_NAME
+
+        # Check that search was called with the right arguments
+        assert mock_ft.search.call_count == 1
+        args = mock_ft.search.call_args[0]
+        assert (
+            args[0]._query_string
+            == "@session:{test-session}=>[KNN 10 @vector $vec AS dist]"
+        )
 
         # Check that the results are parsed correctly
         assert len(results.docs) == 2
@@ -109,6 +124,7 @@ def __init__(self, docs):
         assert results.docs[1].dist == 0.75
 
 
+@pytest.mark.requires_api_keys
 class TestLongTermMemoryIntegration:
     @pytest.mark.asyncio
     async def test_search_messages(self, memory_messages, async_redis_client):
@@ -149,7 +165,9 @@ async def test_search_messages_with_distance_threshold(
             limit=2,
         )
 
-        assert results.total == 2
+        assert results.total == 4
+        assert len(results.docs) == 2
+
         assert results.docs[0].role == "user"
         assert results.docs[0].content == "What is the capital of France?"
         assert results.docs[1].role == "assistant"

tests/test_models.py

@@ -1,7 +1,7 @@
 import pytest
 import os
+import numpy as np
 from unittest.mock import patch, MagicMock, AsyncMock
-from typing import List
 
 from models import (
     MemoryMessage,
@@ -11,7 +11,6 @@
     RedisearchResult,
     OpenAIClientType,
     OpenAIClientWrapper,
-    parse_redisearch_response,
 )
 
 
@@ -81,49 +80,6 @@ def test_redisearch_result(self):
         assert result.dist == 0.75
 
 
-class TestRedisearchParsing:
-    def test_parse_redisearch_empty_response(self):
-        """Test parsing an empty redisearch response"""
-        # Test with empty response
-        assert parse_redisearch_response([]) == []
-        assert parse_redisearch_response([0]) == []
-
-    def test_parse_redisearch_response(self):
-        """Test parsing a redisearch response"""
-        # Create a mock response similar to what Redis would return
-        mock_response = [
-            2,  # Number of results
-            b"doc1",  # Document ID
-            [  # Document fields
-                b"role",
-                b"user",
-                b"content",
-                b"Hello, world!",
-                b"dist",
-                b"0.25",
-            ],
-            b"doc2",  # Document ID
-            [  # Document fields
-                b"role",
-                b"assistant",
-                b"content",
-                b"Hi there!",
-                b"dist",
-                b"0.75",
-            ],
-        ]
-
-        results = parse_redisearch_response(mock_response)
-
-        assert len(results) == 2
-        assert results[0].role == "user"
-        assert results[0].content == "Hello, world!"
-        assert results[0].dist == 0.25
-        assert results[1].role == "assistant"
-        assert results[1].content == "Hi there!"
-        assert results[1].dist == 0.75
-
-
 @pytest.mark.asyncio
 class TestOpenAIClientWrapper:
     @patch.dict(
@@ -171,8 +127,13 @@ async def test_create_embedding(self, mock_init):
 
         # Verify embeddings were created correctly
         assert len(embeddings) == 2
-        assert embeddings[0] == [0.1, 0.2, 0.3]
-        assert embeddings[1] == [0.4, 0.5, 0.6]
+        # Convert NumPy array to list or use np.array_equal for comparison
+        assert np.array_equal(
+            embeddings[0], np.array([0.1, 0.2, 0.3], dtype=np.float32)
+        )
+        assert np.array_equal(
+            embeddings[1], np.array([0.4, 0.5, 0.6], dtype=np.float32)
+        )
 
         # Verify the client was called with correct parameters
         client.embedding_client.embeddings.create.assert_called_with(