Reclean

Author: abrookins

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ repos:
     hooks:
       # Run the linter
       - id: ruff
-        args: [--fix]
+        args: [--fix, --unsafe-fixes]
       # Run the formatter
       - id: ruff-format
 

pyproject.toml

@@ -21,7 +21,7 @@ target-version = "py312"
 # Enable various rules
 select = ["E", "F", "B", "I", "N", "UP", "C4", "RET", "SIM", "TID"]
 # Exclude COM812 which conflicts with the formatter
-ignore = ["COM812"]
+ignore = ["COM812", "E501"]
 
 # Allow unused variables when underscore-prefixed
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"

tests/conftest.py

@@ -1,9 +1,11 @@
 import asyncio
+import contextlib
 import os
 from unittest import mock
 from unittest.mock import AsyncMock, patch
 
 import pytest
+from dotenv import load_dotenv
 from fastapi import BackgroundTasks, FastAPI
 from httpx import ASGITransport, AsyncClient
 from redis import Redis
@@ -20,10 +22,12 @@
 from utils import REDIS_INDEX_NAME, Keys, ensure_redisearch_index
 
 
+load_dotenv()
+
+
 @pytest.fixture(scope="session")
 def event_loop(request):
-    loop = asyncio.get_event_loop()
-    return loop
+    return asyncio.get_event_loop()
 
 
 @pytest.fixture()
@@ -46,13 +50,11 @@ def memory_messages():
 @pytest.fixture()
 def mock_openai_client():
     """Create a mock OpenAI client"""
-    client = AsyncMock(spec=OpenAIClientWrapper)
+    return AsyncMock(spec=OpenAIClientWrapper)
 
     # We won't set default side effects here, allowing tests to set their own mocks
     # This prevents conflicts with tests that need specific return values
 
-    return client
-
 
 @pytest.fixture(autouse=True)
 async def search_index(async_redis_client):
@@ -87,10 +89,8 @@ async def search_index(async_redis_client):
 
     # Clean up after tests
     await async_redis_client.flushdb()
-    try:
+    with contextlib.suppress(Exception):
         await async_redis_client.execute_command("FT.DROPINDEX", index_name)
-    except Exception:
-        pass
 
 
 @pytest.fixture()
@@ -169,8 +169,7 @@ def async_redis_client(redis_url):
 @pytest.fixture()
 def mock_async_redis_client():
     """Create a mock async Redis client"""
-    client = AsyncMock(spec=AsyncRedis)
-    return client
+    return AsyncMock(spec=AsyncRedis)
 
 
 @pytest.fixture()
@@ -211,7 +210,10 @@ def pytest_collection_modifyitems(
 
     # Otherwise skip all tests requiring an API key
     skip_api = pytest.mark.skip(
-        reason="Skipping test because API keys are not provided. Use --run-api-tests to run these tests."
+        reason="""
+        Skipping test because API keys are not provided.
+        "Use --run-api-tests to run these tests.
+        """
     )
     for item in items:
         if item.get_closest_marker("requires_api_keys"):

tests/test_api.py

@@ -12,7 +12,7 @@
 from reducers import handle_compaction
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_openai_client_wrapper():
     """Create a mock OpenAIClientWrapper that doesn't need an API key"""
     with patch("models.OpenAIClientWrapper") as mock_wrapper:
@@ -33,7 +33,7 @@ def mock_openai_client_wrapper():
 
 
 class TestHealthEndpoint:
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def test_health_endpoint(self, client):
         """Test the health endpoint"""
         response = await client.get("/health")
@@ -93,8 +93,8 @@ async def test_get_memory(self, client, test_session_setup):
         assert data["context"] == "Sample context"
         assert int(data["tokens"]) == 150  # Convert string to int for comparison
 
-    @pytest.mark.requires_api_keys()
-    @pytest.mark.asyncio()
+    @pytest.mark.requires_api_keys
+    @pytest.mark.asyncio
     async def test_post_memory(self, client):
         """Test the post_memory endpoint"""
         payload = {
@@ -113,8 +113,8 @@ async def test_post_memory(self, client):
         assert "status" in data
         assert data["status"] == "ok"
 
-    @pytest.mark.requires_api_keys()
-    @pytest.mark.asyncio()
+    @pytest.mark.requires_api_keys
+    @pytest.mark.asyncio
     async def test_post_memory_stores_in_long_term_memory(self, client):
         """Test the post_memory endpoint"""
         payload = {
@@ -144,8 +144,8 @@ async def test_post_memory_stores_in_long_term_memory(self, client):
         assert mock_add_task.call_count == 1
         assert mock_add_task.call_args[0][0] == index_messages
 
-    @pytest.mark.requires_api_keys()
-    @pytest.mark.asyncio()
+    @pytest.mark.requires_api_keys
+    @pytest.mark.asyncio
     async def test_post_memory_compacts_long_conversation(self, client):
         """Test the post_memory endpoint"""
         payload = {
@@ -175,7 +175,7 @@ async def test_post_memory_compacts_long_conversation(self, client):
         assert mock_add_task.call_count == 1
         assert mock_add_task.call_args[0][0] == handle_compaction
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def test_delete_memory(self, client, test_session_setup):
         """Test the delete_memory endpoint"""
         session_id = test_session_setup
@@ -201,10 +201,10 @@ async def test_delete_memory(self, client, test_session_setup):
         assert len(data["messages"]) == 0
 
 
-@pytest.mark.requires_api_keys()
+@pytest.mark.requires_api_keys
 class TestRetrievalEndpoint:
     @patch("retrieval.search_messages")
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def test_retrieval(self, mock_search, client):
         """Test the retrieval endpoint"""
         mock_search.return_value = SearchResults(

tests/test_long_term_memory.py

@@ -10,7 +10,7 @@
 
 
 class TestLongTermMemory:
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def test_index_messages(
         self, memory_messages, mock_openai_client, mock_async_redis_client
     ):
@@ -52,7 +52,7 @@ async def test_index_messages(
             # Check that the vector is bytes
             assert isinstance(mapping["vector"], bytes)
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def test_search_messages(self, mock_openai_client, mock_async_redis_client):
         """Test searching messages"""
         # Set up the mock embedding response
@@ -124,9 +124,9 @@ def __init__(self, docs):
         assert results.docs[1].dist == 0.75
 
 
-@pytest.mark.requires_api_keys()
+@pytest.mark.requires_api_keys
 class TestLongTermMemoryIntegration:
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def test_search_messages(self, memory_messages, async_redis_client):
         """Test searching messages"""
 
@@ -146,7 +146,7 @@ async def test_search_messages(self, memory_messages, async_redis_client):
         assert results.docs[0].role == "user"
         assert results.docs[0].content == "What is the capital of France?"
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     async def test_search_messages_with_distance_threshold(
         self, memory_messages, async_redis_client
     ):

tests/test_models.py

@@ -83,7 +83,7 @@ def test_redisearch_result(self):
         assert result.dist == 0.75
 
 
-@pytest.mark.asyncio()
+@pytest.mark.asyncio
 class TestOpenAIClientWrapper:
     @patch.dict(
         os.environ,

tests/test_reducer.py

@@ -6,7 +6,7 @@
 from utils import Keys
 
 
-@pytest.mark.asyncio()
+@pytest.mark.asyncio
 class TestIncrementalSummarization:
     async def test_incremental_summarization_no_context(self, mock_openai_client):
         """Test incremental summarization without previous context"""
@@ -66,7 +66,7 @@ async def test_incremental_summarization_with_context(self, mock_openai_client):
 
 
 class TestHandleCompaction:
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     @patch("reducers._incremental_summary")
     async def test_handle_compaction(
         self, mock_summarization, mock_openai_client, mock_async_redis_client
@@ -126,7 +126,7 @@ async def test_handle_compaction(
             "Message 6",
         ]
 
-    @pytest.mark.asyncio()
+    @pytest.mark.asyncio
     @patch("reducers._incremental_summary")
     async def test_handle_compaction_no_messages(
         self, mock_summarization, mock_openai_client, mock_async_redis_client