Work on test failures

Author: abrookins

agent_memory_server/cli.py

@@ -15,12 +15,10 @@
 from agent_memory_server.utils.redis import ensure_search_index_exists, get_redis_conn
 
 
-# Set up logging
 configure_logging()
 logger = get_logger(__name__)
 
-# Define the version
-VERSION = "0.2.0"  # Matches the version in pyproject.toml
+VERSION = "0.2.0"
 
 
 @click.group()
@@ -68,6 +66,10 @@ def mcp(port: int, sse: bool):
     """Run the MCP server."""
     import asyncio
 
+    # Update the port in settings FIRST
+    settings.mcp_port = port
+
+    # Import mcp_app AFTER settings have been updated
     from agent_memory_server.mcp import mcp_app
 
     async def setup_and_run():
@@ -83,9 +85,6 @@ async def setup_and_run():
     # Update the port in settings
     settings.mcp_port = port
 
-    # Update the port in the mcp_app
-    mcp_app._port = port
-
     click.echo(f"Starting MCP server on port {port}")
 
     if sse:

tests/conftest.py

@@ -23,6 +23,9 @@
 from agent_memory_server.messages import (
     MemoryMessage,
 )
+
+# Import the module to access its global for resetting
+from agent_memory_server.utils import redis as redis_utils_module
 from agent_memory_server.utils.keys import Keys
 from agent_memory_server.utils.redis import ensure_search_index_exists
 
@@ -64,7 +67,8 @@ def mock_openai_client():
 @pytest.fixture(autouse=True)
 async def search_index(async_redis_client):
     """Create a Redis connection pool for testing"""
-    # TODO: Replace with RedisVL index.
+    # Reset the cached index in redis_utils_module
+    redis_utils_module._index = None
 
     await async_redis_client.flushdb()
 

tests/test_long_term_memory.py

@@ -13,6 +13,7 @@
     search_long_term_memories,
 )
 from agent_memory_server.models import LongTermMemory, LongTermMemoryResult
+from agent_memory_server.utils.redis import ensure_search_index_exists
 
 
 class TestLongTermMemory:
@@ -162,6 +163,7 @@ class TestLongTermMemoryIntegration:
     @pytest.mark.asyncio
     async def test_search_messages(self, async_redis_client):
         """Test searching messages"""
+        await ensure_search_index_exists(async_redis_client)
 
         long_term_memories = [
             LongTermMemory(text="Paris is the capital of France", session_id="123"),
@@ -192,6 +194,7 @@ async def test_search_messages(self, async_redis_client):
     @pytest.mark.asyncio
     async def test_search_messages_with_distance_threshold(self, async_redis_client):
         """Test searching messages with a distance threshold"""
+        await ensure_search_index_exists(async_redis_client)
 
         long_term_memories = [
             LongTermMemory(text="Paris is the capital of France", session_id="123"),

tests/test_mcp.py

@@ -1,4 +1,5 @@
 import json
+from unittest import mock
 
 import pytest
 from mcp.shared.memory import (
@@ -12,11 +13,27 @@
 )
 
 
+@pytest.fixture
+async def mcp_test_setup(async_redis_client, search_index):
+    with (
+        mock.patch(
+            "agent_memory_server.long_term_memory.get_redis_conn",
+            return_value=async_redis_client,
+        ) as _mock_ltm_redis,
+        mock.patch(
+            "agent_memory_server.api.get_redis_conn",
+            return_value=async_redis_client,
+            create=True,
+        ) as _mock_api_redis,
+    ):
+        yield
+
+
 class TestMCP:
     """Test search functionality and memory prompt endpoints via client sessions."""
 
     @pytest.mark.asyncio
-    async def test_create_long_term_memory(self, session):
+    async def test_create_long_term_memory(self, session, mcp_test_setup):
         async with client_session(mcp_app._mcp_server) as client:
             results = await client.call_tool(
                 "create_long_term_memories",
@@ -31,7 +48,7 @@ async def test_create_long_term_memory(self, session):
             assert results.content[0].text == '{"status": "ok"}'
 
     @pytest.mark.asyncio
-    async def test_search_memory(self, session):
+    async def test_search_memory(self, session, mcp_test_setup):
         """Test searching through session memory using the client."""
         async with client_session(mcp_app._mcp_server) as client:
             results = await client.call_tool(
@@ -65,7 +82,7 @@ async def test_search_memory(self, session):
             assert results["memories"][1]["session_id"] == session
 
     @pytest.mark.asyncio
-    async def test_memory_prompt(self, session):
+    async def test_memory_prompt(self, session, mcp_test_setup):
         """Test memory prompt with various parameter combinations."""
         async with client_session(mcp_app._mcp_server) as client:
             prompt = await client.call_tool(
@@ -98,7 +115,7 @@ async def test_memory_prompt(self, session):
             assert "assistant: Hi there" in message["content"]["text"]
 
     @pytest.mark.asyncio
-    async def test_memory_prompt_error_handling(self, session):
+    async def test_memory_prompt_error_handling(self, session, mcp_test_setup):
         """Test error handling in memory prompt generation via the client."""
         async with client_session(mcp_app._mcp_server) as client:
             # Test with a non-existent session id