fix: UTC

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, timezone
+from datetime import UTC, datetime, timedelta
 
 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.now(timezone.utc)
-        self.last_session_cleanup_time = datetime.now(timezone.utc)
+        self.last_cleanup_time = datetime.now(UTC)
+        self.last_session_cleanup_time = datetime.now(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.now(timezone.utc) - self.last_cleanup_time).days < 1:
+        if (datetime.now(UTC) - self.last_cleanup_time).days < 1:
             return 0
 
-        cutoff_date = datetime.now(timezone.utc) - timedelta(days=self.retention_days)
+        cutoff_date = datetime.now(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.now(timezone.utc)
+                self.last_cleanup_time = datetime.now(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.now(timezone.utc)
+            self.last_cleanup_time = datetime.now(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.now(timezone.utc) - self.last_session_cleanup_time).days < 1:
+        if (datetime.now(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.now(timezone.utc)
+            self.last_session_cleanup_time = datetime.now(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.now(timezone.utc)
+            self.last_session_cleanup_time = datetime.now(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.now(timezone.utc)
+        self.last_session_cleanup_time = datetime.now(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, timezone
+from datetime import UTC, datetime
 
 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.now(timezone.utc)
+        timestamp = datetime.now(UTC)
 
         logger.info(
             f"💾 Saving conversation to SQLModel SQLite DB: record {record_id} "

tests/test_conversation_history_lifecycle.py

@@ -5,8 +5,10 @@
 """
 
 import asyncio
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
+
 import pytest
+
 from mcp_as_a_judge.db.providers.sqlite_provider import SQLiteProvider
 
 class TestConversationHistoryLifecycle:
@@ -53,7 +55,7 @@ async def test_save_retrieve_fifo_cleanup_lifecycle(self):
         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"
-            
+
         print(f"✅ Phase 2: Records retrieved in correct order: {sources}")
 
         # PHASE 3: Trigger FIFO cleanup by adding more records
@@ -169,7 +171,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.now(timezone.utc) - timedelta(days=2)
+        old_time = datetime.now(UTC) - timedelta(days=2)
         db._last_cleanup_time = old_time
 
         # Trigger cleanup by adding another record
@@ -251,7 +253,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.now(timezone.utc) - timedelta(days=2)
+        old_time = datetime.now(UTC) - timedelta(days=2)
         db._cleanup_service.last_session_cleanup_time = old_time
 
         # Trigger cleanup

tests/test_sqlite_comprehensive.py

@@ -4,7 +4,7 @@
 """
 
 import asyncio
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 
 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.now(timezone.utc) - timedelta(days=2)
+        old_time = datetime.now(UTC) - timedelta(days=2)
         db._last_cleanup_time = old_time
 
         # Add a record