Replace deprecated datetime.utcnow() with datetime.now(UTC)

Author: fordN

src/amp/loaders/base.py

@@ -6,7 +6,7 @@
 import time
 from abc import ABC, abstractmethod
 from dataclasses import fields, is_dataclass
-from datetime import datetime
+from datetime import UTC, datetime
 from logging import Logger
 from typing import Any, Dict, Generic, Iterator, List, Optional, Set, TypeVar
 
@@ -553,7 +553,7 @@ def _process_reorg_event(
                 # Save reorg checkpoint (keeps old checkpoints for history)
                 checkpoint = CheckpointState(
                     ranges=reorg_ranges,
-                    timestamp=datetime.utcnow(),
+                    timestamp=datetime.now(UTC),
                     worker_id=worker_id,
                     is_reorg=True,
                 )
@@ -718,11 +718,11 @@ def _save_checkpoint_if_complete(
             batch_count: Current batch number
         """
         if ranges_complete and ranges:
-            from datetime import datetime
+            from datetime import UTC, datetime
 
             checkpoint = CheckpointState(
                 ranges=ranges,
-                timestamp=datetime.utcnow(),
+                timestamp=datetime.now(UTC),
                 worker_id=worker_id,
             )
 

src/amp/streaming/idempotency.py

@@ -9,7 +9,7 @@
 import logging
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from datetime import datetime
+from datetime import UTC, datetime
 from typing import List, Optional
 
 from .types import BlockRange
@@ -253,7 +253,7 @@ def mark_processed(
             return
 
         table = f'{self.config.table_prefix}processed_ranges'
-        processed_at = datetime.utcnow()
+        processed_at = datetime.now(UTC)
 
         insert_sql = f"""
         INSERT INTO {table} (connection_name, table_name, network, start_block, end_block, processed_at, batch_hash)

tests/integration/test_checkpoint_resume.py

@@ -6,7 +6,7 @@
 """
 
 import time
-from datetime import datetime
+from datetime import UTC, datetime
 
 import psycopg2
 import pytest
@@ -82,7 +82,7 @@ def test_save_and_load_checkpoint(self, checkpoint_store):
 
         checkpoint = CheckpointState(
             ranges=ranges,
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
             worker_id=0,
         )
 
@@ -103,7 +103,7 @@ def test_checkpoint_upsert(self, checkpoint_store):
         ranges1 = [BlockRange(network='ethereum', start=100, end=200)]
         checkpoint1 = CheckpointState(
             ranges=ranges1,
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
         )
 
         # Save first checkpoint
@@ -113,7 +113,7 @@ def test_checkpoint_upsert(self, checkpoint_store):
         ranges2 = [BlockRange(network='ethereum', start=200, end=300)]
         checkpoint2 = CheckpointState(
             ranges=ranges2,
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
         )
         checkpoint_store.save('conn1', 'table1', checkpoint2)
 
@@ -126,14 +126,14 @@ def test_multiple_workers(self, checkpoint_store):
         ranges_w0 = [BlockRange(network='ethereum', start=100, end=200)]
         checkpoint_w0 = CheckpointState(
             ranges=ranges_w0,
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
             worker_id=0,
         )
 
         ranges_w1 = [BlockRange(network='ethereum', start=300, end=400)]
         checkpoint_w1 = CheckpointState(
             ranges=ranges_w1,
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
             worker_id=1,
         )
 
@@ -154,20 +154,20 @@ def test_delete_for_network(self, checkpoint_store):
         # Create checkpoints for different networks
         checkpoint_eth = CheckpointState(
             ranges=[BlockRange(network='ethereum', start=100, end=200)],
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
             worker_id=0,
         )
         checkpoint_poly = CheckpointState(
             ranges=[BlockRange(network='polygon', start=50, end=150)],
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
             worker_id=1,
         )
         checkpoint_mixed = CheckpointState(
             ranges=[
                 BlockRange(network='ethereum', start=200, end=300),
                 BlockRange(network='polygon', start=150, end=250),
             ],
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
             worker_id=2,
         )
 
@@ -191,7 +191,7 @@ def test_delete_checkpoint(self, checkpoint_store):
         """Test checkpoint deletion"""
         checkpoint = CheckpointState(
             ranges=[BlockRange(network='ethereum', start=100, end=200)],
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
         )
 
         checkpoint_store.save('conn1', 'table1', checkpoint)
@@ -254,7 +254,7 @@ def test_checkpoint_save_during_streaming(self, checkpoint_store):
                 # Save checkpoint
                 checkpoint = CheckpointState(
                     ranges=ranges,
-                    timestamp=datetime.utcnow(),
+                    timestamp=datetime.now(UTC),
                 )
                 checkpoint_store.save('streaming_conn', 'streaming_table', checkpoint)
 
@@ -273,7 +273,7 @@ def test_resume_from_checkpoint(self, checkpoint_store):
                 BlockRange(network='ethereum', start=500, end=600, hash='0x123'),
                 BlockRange(network='polygon', start=200, end=300, hash='0x456'),
             ],
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
         )
         checkpoint_store.save('resume_conn', 'resume_table', checkpoint)
 
@@ -292,7 +292,7 @@ def test_checkpoint_deleted_after_reorg(self, checkpoint_store):
         # Save checkpoint for ethereum
         checkpoint = CheckpointState(
             ranges=[BlockRange(network='ethereum', start=100, end=200)],
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
         )
         checkpoint_store.save('reorg_conn', 'reorg_table', checkpoint)
 
@@ -317,7 +317,7 @@ def test_multiple_checkpoint_updates_during_stream(self, checkpoint_store):
         for i in range(5):
             checkpoint = CheckpointState(
                 ranges=[BlockRange(network='ethereum', start=i * 100, end=(i + 1) * 100)],
-                timestamp=datetime.utcnow(),
+                timestamp=datetime.now(UTC),
             )
             checkpoint_store.save('progressive_conn', 'progressive_table', checkpoint)
             checkpoints.append(checkpoint)
@@ -336,7 +336,7 @@ def test_checkpoint_with_reorg_during_streaming(self, checkpoint_store):
         # Save initial checkpoint
         checkpoint_v0 = CheckpointState(
             ranges=[BlockRange(network='ethereum', start=100, end=200)],
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
         )
         checkpoint_store.save('reorg_conn', 'reorg_table', checkpoint_v0)
 
@@ -349,7 +349,7 @@ def test_checkpoint_with_reorg_during_streaming(self, checkpoint_store):
         # Save new checkpoint after reorg (stream would have restarted)
         checkpoint_v1 = CheckpointState(
             ranges=[BlockRange(network='ethereum', start=180, end=280)],  # May overlap with old
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
         )
         checkpoint_store.save('reorg_conn', 'reorg_table', checkpoint_v1)
 
@@ -382,7 +382,7 @@ def test_null_checkpoint_store_no_side_effects(self):
         # All operations should be no-ops
         checkpoint = CheckpointState(
             ranges=[BlockRange(network='ethereum', start=100, end=200)],
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
         )
 
         store.save('conn1', 'table1', checkpoint)  # No-op
@@ -596,7 +596,7 @@ def test_exactly_once_with_checkpoint_integration(self, checkpoint_db_connection
         # Save checkpoint after batch 1
         checkpoint1 = CheckpointState(
             ranges=ranges_batch1,
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
         )
         checkpoint_store.save('conn1', 'table1', checkpoint1)
 
@@ -607,7 +607,7 @@ def test_exactly_once_with_checkpoint_integration(self, checkpoint_db_connection
         # Save checkpoint after batch 2
         checkpoint2 = CheckpointState(
             ranges=ranges_batch2,
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
         )
         checkpoint_store.save('conn1', 'table1', checkpoint2)
 

tests/unit/test_checkpoint.py

@@ -2,7 +2,7 @@
 Unit tests for checkpoint system.
 """
 
-from datetime import datetime
+from datetime import UTC, datetime
 
 import pytest
 
@@ -20,7 +20,7 @@ def test_creation(self):
             BlockRange(network='ethereum', start=100, end=200, hash='0xabc'),
             BlockRange(network='polygon', start=50, end=150, hash='0xdef'),
         ]
-        timestamp = datetime.utcnow()
+        timestamp = datetime.now(UTC)
 
         checkpoint = CheckpointState(
             ranges=ranges,
@@ -137,7 +137,7 @@ def test_save_does_nothing(self):
 
         checkpoint = CheckpointState(
             ranges=[BlockRange(network='ethereum', start=100, end=200)],
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(UTC),
         )
 
         # Should not raise

tests/unit/test_idempotency.py

@@ -2,7 +2,7 @@
 Unit tests for idempotency system.
 """
 
-from datetime import datetime
+from datetime import UTC, datetime
 
 import pytest
 
@@ -48,7 +48,7 @@ class TestProcessedRange:
 
     def test_creation(self):
         """Test creating a processed range"""
-        timestamp = datetime.utcnow()
+        timestamp = datetime.now(UTC)
 
         pr = ProcessedRange(
             connection_name='test_conn',
@@ -76,7 +76,7 @@ def test_matches_range_true(self):
             network='ethereum',
             start_block=100,
             end_block=200,
-            processed_at=datetime.utcnow(),
+            processed_at=datetime.now(UTC),
         )
 
         block_range = BlockRange(network='ethereum', start=100, end=200)
@@ -90,7 +90,7 @@ def test_matches_range_false_network(self):
             network='ethereum',
             start_block=100,
             end_block=200,
-            processed_at=datetime.utcnow(),
+            processed_at=datetime.now(UTC),
         )
 
         block_range = BlockRange(network='polygon', start=100, end=200)
@@ -104,7 +104,7 @@ def test_matches_range_false_blocks(self):
             network='ethereum',
             start_block=100,
             end_block=200,
-            processed_at=datetime.utcnow(),
+            processed_at=datetime.now(UTC),
         )
 
         block_range = BlockRange(network='ethereum', start=100, end=300)