fix: reformat

Author: dori

src/mcp_as_a_judge/db/cleanup_service.py

@@ -5,7 +5,7 @@
 removing records older than the retention period (default: 1 day).
 """
 
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
 from sqlalchemy import Engine, func
 from sqlmodel import Session, select
@@ -46,8 +46,8 @@ def __init__(self, engine: Engine) -> None:
         self.engine = engine
         self.max_total_sessions = MAX_TOTAL_SESSIONS
         self.retention_days = RECORD_RETENTION_DAYS
-        self.last_cleanup_time = datetime.utcnow()
-        self.last_session_cleanup_time = datetime.utcnow()
+        self.last_cleanup_time = datetime.now(timezone.utc)
+        self.last_session_cleanup_time = datetime.now(timezone.utc)
 
     def cleanup_old_records(self) -> int:
         """
@@ -58,10 +58,10 @@ def cleanup_old_records(self) -> int:
             Number of records deleted
         """
         # Only run cleanup once per day
-        if (datetime.utcnow() - self.last_cleanup_time).days < 1:
+        if (datetime.now(timezone.utc) - self.last_cleanup_time).days < 1:
             return 0
 
-        cutoff_date = datetime.utcnow() - timedelta(days=self.retention_days)
+        cutoff_date = datetime.now(timezone.utc) - timedelta(days=self.retention_days)
 
         with Session(self.engine) as session:
             # Count old records
@@ -75,7 +75,7 @@ def cleanup_old_records(self) -> int:
                 logger.info(
                     f"🧹 Daily cleanup: No records older than {self.retention_days} days"
                 )
-                self.last_cleanup_time = datetime.utcnow()
+                self.last_cleanup_time = datetime.now(timezone.utc)
                 return 0
 
             # Delete old records
@@ -85,7 +85,7 @@ def cleanup_old_records(self) -> int:
             session.commit()
 
             # Reset cleanup tracking
-            self.last_cleanup_time = datetime.utcnow()
+            self.last_cleanup_time = datetime.now(timezone.utc)
 
             logger.info(
                 f"🧹 Daily cleanup: Deleted {old_count} records older than "
@@ -188,7 +188,7 @@ def cleanup_excess_sessions(self) -> int:
             Number of records deleted
         """
         # Only run session cleanup once per day
-        if (datetime.utcnow() - self.last_session_cleanup_time).days < 1:
+        if (datetime.now(timezone.utc) - self.last_session_cleanup_time).days < 1:
             return 0
 
         current_session_count = self.get_session_count()
@@ -198,7 +198,7 @@ def cleanup_excess_sessions(self) -> int:
                 f"🧹 Daily session LRU cleanup: {current_session_count} sessions "
                 f"(max: {self.max_total_sessions}) - no cleanup needed"
             )
-            self.last_session_cleanup_time = datetime.utcnow()
+            self.last_session_cleanup_time = datetime.now(timezone.utc)
             return 0
 
         # Calculate how many sessions to remove
@@ -215,14 +215,14 @@ def cleanup_excess_sessions(self) -> int:
 
         if not lru_session_ids:
             logger.warning("🧹 No sessions found for LRU cleanup")
-            self.last_session_cleanup_time = datetime.utcnow()
+            self.last_session_cleanup_time = datetime.now(timezone.utc)
             return 0
 
         # Delete all records for these sessions
         deleted_count = self.delete_sessions(lru_session_ids)
 
         # Reset cleanup tracking
-        self.last_session_cleanup_time = datetime.utcnow()
+        self.last_session_cleanup_time = datetime.now(timezone.utc)
 
         logger.info(
             f"✅ Daily session LRU cleanup completed: removed {sessions_to_remove} sessions, "

src/mcp_as_a_judge/db/providers/sqlite_provider.py

@@ -6,7 +6,7 @@
 """
 
 import uuid
-from datetime import datetime
+from datetime import datetime, timezone
 
 from sqlalchemy import create_engine
 from sqlmodel import Session, SQLModel, asc, desc, select
@@ -152,7 +152,7 @@ async def save_conversation(
     ) -> str:
         """Save a conversation record to SQLite database with LRU cleanup."""
         record_id = str(uuid.uuid4())
-        timestamp = datetime.utcnow()
+        timestamp = datetime.now(timezone.utc)
 
         logger.info(
             f"💾 Saving conversation to SQLModel SQLite DB: record {record_id} "

tests/test_conversation_history_lifecycle.py

@@ -5,13 +5,10 @@
 """
 
 import asyncio
-from datetime import datetime, timedelta
-
+from datetime import datetime, timedelta, timezone
 import pytest
-
 from mcp_as_a_judge.db.providers.sqlite_provider import SQLiteProvider
 
-
 class TestConversationHistoryLifecycle:
     """Test the complete lifecycle of conversation history records."""
 
@@ -50,17 +47,13 @@ async def test_save_retrieve_fifo_cleanup_lifecycle(self):
         # Records should be in reverse chronological order (newest first)
         sources = [r.source for r in records]
         expected_sources = ["tool_2", "tool_1", "tool_0"]  # Newest first
-        assert sources == expected_sources, (
-            f"Expected {expected_sources}, got {sources}"
-        )
+        assert sources == expected_sources, f"Expected {expected_sources}, got {sources}"
 
         # Verify timestamps are in descending order
         timestamps = [r.timestamp for r in records]
         for i in range(len(timestamps) - 1):
-            assert timestamps[i] >= timestamps[i + 1], (
-                "Records should be ordered newest first"
-            )
-
+            assert timestamps[i] >= timestamps[i + 1], "Records should be ordered newest first"
+            
         print(f"✅ Phase 2: Records retrieved in correct order: {sources}")
 
         # PHASE 3: Trigger FIFO cleanup by adding more records
@@ -78,16 +71,12 @@ async def test_save_retrieve_fifo_cleanup_lifecycle(self):
 
         # Verify FIFO cleanup worked
         records = await db.get_session_conversations(session_id)
-        assert len(records) == 3, (
-            f"Expected 3 records after cleanup, got {len(records)}"
-        )
+        assert len(records) == 3, f"Expected 3 records after cleanup, got {len(records)}"
 
         # Should have the 3 most recent records
         sources = [r.source for r in records]
         expected_sources = ["tool_4", "tool_3", "tool_2"]  # Most recent 3
-        assert sources == expected_sources, (
-            f"Expected {expected_sources}, got {sources}"
-        )
+        assert sources == expected_sources, f"Expected {expected_sources}, got {sources}"
 
         print(f"✅ Phase 3: FIFO cleanup worked correctly: {sources}")
 
@@ -180,7 +169,7 @@ async def test_time_based_cleanup_integration(self):
         print(f"✅ Before cleanup: {len(records_before)} records")
 
         # Force time-based cleanup by mocking old cleanup time
-        old_time = datetime.utcnow() - timedelta(days=2)
+        old_time = datetime.now(timezone.utc) - timedelta(days=2)
         db._last_cleanup_time = old_time
 
         # Trigger cleanup by adding another record
@@ -194,10 +183,7 @@ async def test_time_based_cleanup_integration(self):
         # Records should still exist (within retention period)
         records_after = await db.get_session_conversations("time_test_session")
         assert len(records_after) == 4
-        print(
-            f"✅ After time-based cleanup: {len(records_after)} records "
-            f"(within retention)"
-        )
+        print(f"✅ After time-based cleanup: {len(records_after)} records (within retention)")
 
     @pytest.mark.asyncio
     async def test_lru_session_cleanup_lifecycle(self):
@@ -265,7 +251,7 @@ async def test_lru_session_cleanup_lifecycle(self):
         print("\n🧹 PHASE 3: Triggering LRU session cleanup...")
 
         # Force cleanup by mocking old cleanup time
-        old_time = datetime.utcnow() - timedelta(days=2)
+        old_time = datetime.now(timezone.utc) - timedelta(days=2)
         db._cleanup_service.last_session_cleanup_time = old_time
 
         # Trigger cleanup
@@ -280,13 +266,7 @@ async def test_lru_session_cleanup_lifecycle(self):
         # PHASE 4: Verify which sessions remain
         print("\n🔍 PHASE 4: Verifying remaining sessions...")
 
-        sessions_to_check = [
-            "session_A",
-            "session_B",
-            "session_C",
-            "session_D",
-            "session_E",
-        ]
+        sessions_to_check = ["session_A", "session_B", "session_C", "session_D", "session_E"]
         remaining_sessions = []
         deleted_sessions = []
 
@@ -295,10 +275,7 @@ async def test_lru_session_cleanup_lifecycle(self):
             if records:
                 remaining_sessions.append(session_id)
                 last_activity = max(r.timestamp for r in records)
-                print(
-                    f"   ✅ {session_id}: {len(records)} records, "
-                    f"last activity: {last_activity}"
-                )
+                print(f"   ✅ {session_id}: {len(records)} records, last activity: {last_activity}")
             else:
                 deleted_sessions.append(session_id)
                 print(f"   ❌ {session_id}: DELETED (was least recently used)")

tests/test_sqlite_comprehensive.py

@@ -4,7 +4,7 @@
 """
 
 import asyncio
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
 import pytest
 from test_utils import DatabaseTestUtils
@@ -44,7 +44,7 @@ async def test_daily_cleanup_sql(self):
         db = SQLiteProvider()
 
         # Mock old cleanup time to force daily cleanup
-        old_time = datetime.utcnow() - timedelta(days=2)
+        old_time = datetime.now(timezone.utc) - timedelta(days=2)
         db._last_cleanup_time = old_time
 
         # Add a record