[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

src/jupyterhub_cost_monitoring/date_utils.py

@@ -3,7 +3,7 @@
 """
 
 from dataclasses import dataclass
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 
 
 def ensure_utc_datetime(date_str: str) -> datetime:
@@ -19,10 +19,10 @@ def ensure_utc_datetime(date_str: str) -> datetime:
     dt = datetime.fromisoformat(date_str)
     if dt.tzinfo is None:
         # Assume UTC if no timezone provided
-        dt = dt.replace(tzinfo=timezone.utc)
+        dt = dt.replace(tzinfo=UTC)
     else:
         # Convert to UTC if timezone-aware
-        dt = dt.astimezone(timezone.utc)
+        dt = dt.astimezone(UTC)
     return dt
 
 
@@ -153,8 +153,7 @@ def parse_from_to_in_query_params(
     # Apply validation rules to prevent API errors
 
     # Prevent "end date past the beginning of next month" errors from AWS
-    if to_date > now_date:
-        to_date = now_date
+    to_date = min(to_date, now_date)
 
     # Prevent "Start date (and hour) should be before end date (and hour)" errors
     if from_date >= now_date:
@@ -165,7 +164,5 @@ def parse_from_to_in_query_params(
 
 def get_now_date():
     """Get current date at midnight UTC for consistent date boundaries"""
-    now_date = datetime.now(timezone.utc).replace(
-        hour=0, minute=0, second=0, microsecond=0
-    )
+    now_date = datetime.now(UTC).replace(hour=0, minute=0, second=0, microsecond=0)
     return now_date

src/jupyterhub_cost_monitoring/query_usage.py

@@ -4,7 +4,7 @@
 
 import os
 from collections import defaultdict
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 
 import escapism
 import requests
@@ -127,7 +127,7 @@ def _process_response(
         hub = data["metric"]["namespace"]
         user = data["metric"]["username"]
         date = [
-            datetime.fromtimestamp(value[0], tz=timezone.utc).strftime("%Y-%m-%d")
+            datetime.fromtimestamp(value[0], tz=UTC).strftime("%Y-%m-%d")
             for value in data["values"]
         ]
         usage = [float(value[1]) for value in data["values"]]

tests/conftest.py

@@ -1,6 +1,6 @@
 import json
 import os
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from unittest.mock import patch
 
 import boto3
@@ -193,50 +193,50 @@ def mock_ce():
 @pytest.fixture
 def sample_utc_datetime():
     """Sample UTC datetime for testing."""
-    return datetime(2024, 1, 15, 12, 30, 45, tzinfo=timezone.utc)
+    return datetime(2024, 1, 15, 12, 30, 45, tzinfo=UTC)
 
 
 @pytest.fixture
 def sample_date_range():
     """Sample DateRange for testing."""
     from src.jupyterhub_cost_monitoring.date_utils import DateRange
 
-    start = datetime(2025, 9, 1, tzinfo=timezone.utc)
-    end = datetime(2025, 9, 3, tzinfo=timezone.utc)
+    start = datetime(2025, 9, 1, tzinfo=UTC)
+    end = datetime(2025, 9, 3, tzinfo=UTC)
     return DateRange(start_date=start, end_date=end)
 
 
 @pytest.fixture
 def mock_current_time():
     """Mock current time for consistent testing."""
-    return datetime(2024, 2, 15, 10, 0, 0, tzinfo=timezone.utc)
+    return datetime(2024, 2, 15, 10, 0, 0, tzinfo=UTC)
 
 
 @pytest.fixture
 def timezone_test_cases():
     """Test cases for different timezone conversions."""
     return [
         # (input_string, expected_utc_datetime)
-        ("2024-01-15", datetime(2024, 1, 15, tzinfo=timezone.utc)),
+        ("2024-01-15", datetime(2024, 1, 15, tzinfo=UTC)),
         (
             "2024-01-15T10:00:00-05:00",
-            datetime(2024, 1, 15, 15, 0, 0, tzinfo=timezone.utc),
+            datetime(2024, 1, 15, 15, 0, 0, tzinfo=UTC),
         ),
         (
             "2024-01-15T18:00:00+09:00",
-            datetime(2024, 1, 15, 9, 0, 0, tzinfo=timezone.utc),
+            datetime(2024, 1, 15, 9, 0, 0, tzinfo=UTC),
         ),
         (
             "2024-01-15T12:00:00+00:00",
-            datetime(2024, 1, 15, 12, 0, 0, tzinfo=timezone.utc),
+            datetime(2024, 1, 15, 12, 0, 0, tzinfo=UTC),
         ),
     ]
 
 
 @pytest.fixture
 def date_validation_test_cases():
     """Test cases for date validation scenarios."""
-    base_time = datetime(2024, 2, 15, tzinfo=timezone.utc)
+    base_time = datetime(2024, 2, 15, tzinfo=UTC)
     return {
         "current_time": base_time,
         "future_date": "2024-03-01",  # Future end date

tests/test_date_utils.py

@@ -5,7 +5,7 @@
 API-specific formatting, and caching integration.
 """
 
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from unittest.mock import patch
 
 import pytest
@@ -24,45 +24,43 @@ class TestEnsureUTCDateTime:
     def test_timezone_naive_string_assumes_utc(self):
         """Test that timezone-naive strings are assumed to be UTC."""
         result = ensure_utc_datetime("2025-01-15")
-        expected = datetime(2025, 1, 15, tzinfo=timezone.utc)
+        expected = datetime(2025, 1, 15, tzinfo=UTC)
         assert result == expected
-        assert result.tzinfo == timezone.utc
+        assert result.tzinfo == UTC
 
     def test_timezone_aware_string_converts_to_utc(self):
         """Test that timezone-aware strings are converted to UTC."""
         # Test with EST (UTC-5)
         result = ensure_utc_datetime("2025-01-15T10:00:00-05:00")
-        expected = datetime(
-            2025, 1, 15, 15, 0, 0, tzinfo=timezone.utc
-        )  # 10 AM EST = 3 PM UTC
+        expected = datetime(2025, 1, 15, 15, 0, 0, tzinfo=UTC)  # 10 AM EST = 3 PM UTC
         assert result == expected
-        assert result.tzinfo == timezone.utc
+        assert result.tzinfo == UTC
 
     def test_iso_formats(self):
         """Test various ISO format inputs."""
         test_cases = [
-            ("2025-01-15", datetime(2025, 1, 15, tzinfo=timezone.utc)),
-            ("2025-01-15T00:00:00", datetime(2025, 1, 15, tzinfo=timezone.utc)),
+            ("2025-01-15", datetime(2025, 1, 15, tzinfo=UTC)),
+            ("2025-01-15T00:00:00", datetime(2025, 1, 15, tzinfo=UTC)),
             (
                 "2025-01-15T12:30:45",
-                datetime(2025, 1, 15, 12, 30, 45, tzinfo=timezone.utc),
+                datetime(2025, 1, 15, 12, 30, 45, tzinfo=UTC),
             ),
             # Z suffix indicates UTC timezone (Zulu time)
             (
                 "2025-01-15T12:30:45Z",
-                datetime(2025, 1, 15, 12, 30, 45, tzinfo=timezone.utc),
+                datetime(2025, 1, 15, 12, 30, 45, tzinfo=UTC),
             ),
         ]
 
         for input_str, expected in test_cases:
             result = ensure_utc_datetime(input_str)
             assert result == expected
-            assert result.tzinfo == timezone.utc
+            assert result.tzinfo == UTC
 
     def test_utc_string_unchanged(self):
         """Test that UTC strings remain unchanged."""
         result = ensure_utc_datetime("2025-01-15T12:00:00+00:00")
-        expected = datetime(2025, 1, 15, 12, 0, 0, tzinfo=timezone.utc)
+        expected = datetime(2025, 1, 15, 12, 0, 0, tzinfo=UTC)
         assert result == expected
 
     def test_different_timezones(self):
@@ -71,17 +69,17 @@ def test_different_timezones(self):
             # PST (UTC-8) to UTC
             (
                 "2025-01-15T08:00:00-08:00",
-                datetime(2025, 1, 15, 16, 0, 0, tzinfo=timezone.utc),
+                datetime(2025, 1, 15, 16, 0, 0, tzinfo=UTC),
             ),
             # JST (UTC+9) to UTC
             (
                 "2025-01-15T18:00:00+09:00",
-                datetime(2025, 1, 15, 9, 0, 0, tzinfo=timezone.utc),
+                datetime(2025, 1, 15, 9, 0, 0, tzinfo=UTC),
             ),
             # CET (UTC+1) to UTC
             (
                 "2025-01-15T13:00:00+01:00",
-                datetime(2025, 1, 15, 12, 0, 0, tzinfo=timezone.utc),
+                datetime(2025, 1, 15, 12, 0, 0, tzinfo=UTC),
             ),
         ]
 
@@ -95,30 +93,30 @@ class TestDateRange:
 
     def test_daterange_creation(self):
         """Test basic DateRange object creation."""
-        start = datetime(2025, 1, 1, tzinfo=timezone.utc)
-        end = datetime(2025, 1, 31, tzinfo=timezone.utc)
+        start = datetime(2025, 1, 1, tzinfo=UTC)
+        end = datetime(2025, 1, 31, tzinfo=UTC)
         dr = DateRange(start_date=start, end_date=end)
 
         assert dr.start_date == start
         assert dr.end_date == end
 
     def test_daterange_immutability(self):
         """Test that DateRange is immutable (frozen dataclass)."""
-        start = datetime(2025, 1, 1, tzinfo=timezone.utc)
-        end = datetime(2025, 1, 31, tzinfo=timezone.utc)
+        start = datetime(2025, 1, 1, tzinfo=UTC)
+        end = datetime(2025, 1, 31, tzinfo=UTC)
         dr = DateRange(start_date=start, end_date=end)
 
         # Attempting to modify should raise AttributeError
         with pytest.raises(AttributeError):
-            dr.start_date = datetime(2025, 2, 1, tzinfo=timezone.utc)
+            dr.start_date = datetime(2025, 2, 1, tzinfo=UTC)
 
         with pytest.raises(AttributeError):
-            dr.end_date = datetime(2025, 2, 28, tzinfo=timezone.utc)
+            dr.end_date = datetime(2025, 2, 28, tzinfo=UTC)
 
     def test_daterange_hashability(self):
         """Test that DateRange objects are hashable and can be used as dict keys."""
-        start = datetime(2025, 1, 1, tzinfo=timezone.utc)
-        end = datetime(2025, 1, 31, tzinfo=timezone.utc)
+        start = datetime(2025, 1, 1, tzinfo=UTC)
+        end = datetime(2025, 1, 31, tzinfo=UTC)
 
         dr1 = DateRange(start_date=start, end_date=end)
         dr2 = DateRange(start_date=start, end_date=end)
@@ -132,22 +130,20 @@ def test_daterange_hashability(self):
 
     def test_daterange_equality(self):
         """Test DateRange equality comparison."""
-        start = datetime(2025, 1, 1, tzinfo=timezone.utc)
-        end = datetime(2025, 1, 31, tzinfo=timezone.utc)
+        start = datetime(2025, 1, 1, tzinfo=UTC)
+        end = datetime(2025, 1, 31, tzinfo=UTC)
 
         dr1 = DateRange(start_date=start, end_date=end)
         dr2 = DateRange(start_date=start, end_date=end)
-        dr3 = DateRange(
-            start_date=start, end_date=datetime(2025, 2, 1, tzinfo=timezone.utc)
-        )
+        dr3 = DateRange(start_date=start, end_date=datetime(2025, 2, 1, tzinfo=UTC))
 
         assert dr1 == dr2
         assert dr1 != dr3
 
     def test_aws_range_formatting(self):
         """Test AWS date range formatting (exclusive end date, YYYY-MM-DD format)."""
-        start = datetime(2025, 1, 15, 12, 30, 45, tzinfo=timezone.utc)
-        end = datetime(2025, 1, 31, 8, 15, 30, tzinfo=timezone.utc)
+        start = datetime(2025, 1, 15, 12, 30, 45, tzinfo=UTC)
+        end = datetime(2025, 1, 31, 8, 15, 30, tzinfo=UTC)
         dr = DateRange(start_date=start, end_date=end)
 
         aws_from, aws_to = dr.aws_range
@@ -159,8 +155,8 @@ def test_aws_range_formatting(self):
 
     def test_prometheus_range_formatting(self):
         """Test Prometheus date range formatting (inclusive dates, ISO format)."""
-        start = datetime(2025, 1, 15, 12, 30, 45, tzinfo=timezone.utc)
-        end = datetime(2025, 1, 31, 8, 15, 30, tzinfo=timezone.utc)
+        start = datetime(2025, 1, 15, 12, 30, 45, tzinfo=UTC)
+        end = datetime(2025, 1, 31, 8, 15, 30, tzinfo=UTC)
         dr = DateRange(start_date=start, end_date=end)
 
         prom_from, prom_to = dr.prometheus_range
@@ -172,8 +168,8 @@ def test_prometheus_range_formatting(self):
     def test_same_logical_range_different_formats(self):
         """Test that AWS and Prometheus formats represent the same logical date range."""
         # Create range for January 1-31, 2025
-        start = datetime(2025, 1, 1, tzinfo=timezone.utc)
-        end = datetime(2025, 1, 31, 23, 59, 59, tzinfo=timezone.utc)
+        start = datetime(2025, 1, 1, tzinfo=UTC)
+        end = datetime(2025, 1, 31, 23, 59, 59, tzinfo=UTC)
         dr = DateRange(start_date=start, end_date=end)
 
         aws_from, aws_to = dr.aws_range
@@ -195,7 +191,7 @@ def test_default_date_range(self):
         """Test default 30-day range behavior."""
         with patch("src.jupyterhub_cost_monitoring.date_utils.datetime") as mock_dt:
             # Mock current time as 2025-02-15 midnight UTC
-            mock_now = datetime(2025, 2, 15, tzinfo=timezone.utc)
+            mock_now = datetime(2025, 2, 15, tzinfo=UTC)
             mock_dt.now.return_value = mock_now
             mock_dt.side_effect = lambda *args, **kwargs: datetime(*args, **kwargs)
 
@@ -218,10 +214,10 @@ def test_timezone_handling_in_parsing(self):
 
         # Should be converted to UTC
         expected_start = datetime(
-            2025, 1, 1, 15, 0, 0, tzinfo=timezone.utc
+            2025, 1, 1, 15, 0, 0, tzinfo=UTC
         )  # 10 AM EST = 3 PM UTC
         expected_end = datetime(
-            2025, 1, 31, 13, 0, 0, tzinfo=timezone.utc
+            2025, 1, 31, 13, 0, 0, tzinfo=UTC
         )  # 3 PM CET = 1 PM UTC
 
         assert result.start_date == expected_start
@@ -242,8 +238,8 @@ def cached_function(date_range: DateRange) -> str:
             call_count += 1
             return f"Result for {date_range.start_date.date()}"
 
-        start = datetime(2025, 1, 1, tzinfo=timezone.utc)
-        end = datetime(2025, 1, 31, tzinfo=timezone.utc)
+        start = datetime(2025, 1, 1, tzinfo=UTC)
+        end = datetime(2025, 1, 31, tzinfo=UTC)
 
         dr1 = DateRange(start_date=start, end_date=end)
         dr2 = DateRange(start_date=start, end_date=end)  # Identical range
@@ -267,12 +263,12 @@ def cached_function(date_range: DateRange) -> str:
             call_count += 1
             return f"Call #{call_count} for {date_range.start_date.date()}"
 
-        start1 = datetime(2025, 1, 1, tzinfo=timezone.utc)
-        end1 = datetime(2025, 1, 31, tzinfo=timezone.utc)
+        start1 = datetime(2025, 1, 1, tzinfo=UTC)
+        end1 = datetime(2025, 1, 31, tzinfo=UTC)
         january_range = DateRange(start_date=start1, end_date=end1)
 
-        start2 = datetime(2025, 2, 1, tzinfo=timezone.utc)
-        end2 = datetime(2025, 2, 28, tzinfo=timezone.utc)
+        start2 = datetime(2025, 2, 1, tzinfo=UTC)
+        end2 = datetime(2025, 2, 28, tzinfo=UTC)
         february_range = DateRange(start_date=start2, end_date=end2)
 
         result1 = cached_function(january_range)
@@ -293,12 +289,12 @@ def cached_function(date_range: DateRange) -> str:
             return f"Call #{call_count} for {date_range.start_date.date()}"
 
         # Same dates but different times
-        start1 = datetime(2025, 1, 1, 8, 30, 15, tzinfo=timezone.utc)
-        end1 = datetime(2025, 1, 31, 14, 45, 22, tzinfo=timezone.utc)
+        start1 = datetime(2025, 1, 1, 8, 30, 15, tzinfo=UTC)
+        end1 = datetime(2025, 1, 31, 14, 45, 22, tzinfo=UTC)
         morning_range = DateRange(start_date=start1, end_date=end1)
 
-        start2 = datetime(2025, 1, 1, 16, 20, 55, tzinfo=timezone.utc)
-        end2 = datetime(2025, 1, 31, 9, 12, 8, tzinfo=timezone.utc)
+        start2 = datetime(2025, 1, 1, 16, 20, 55, tzinfo=UTC)
+        end2 = datetime(2025, 1, 31, 9, 12, 8, tzinfo=UTC)
         evening_range = DateRange(start_date=start2, end_date=end2)
 
         result1 = cached_function(morning_range)
@@ -311,8 +307,8 @@ def cached_function(date_range: DateRange) -> str:
     def test_daterange_normalization(self):
         """Test that DateRange normalizes times for consistent caching."""
         # Test start date normalization to 00:00:00
-        start_with_time = datetime(2025, 1, 1, 15, 30, 45, tzinfo=timezone.utc)
-        end_with_time = datetime(2025, 1, 31, 8, 15, 30, tzinfo=timezone.utc)
+        start_with_time = datetime(2025, 1, 1, 15, 30, 45, tzinfo=UTC)
+        end_with_time = datetime(2025, 1, 31, 8, 15, 30, tzinfo=UTC)
         time_specific_range = DateRange(
             start_date=start_with_time, end_date=end_with_time
         )
@@ -336,12 +332,12 @@ def test_daterange_normalization(self):
     def test_daterange_hash_consistency_across_times(self):
         """Test that DateRange objects with same dates but different times have same hash."""
         # Same dates, different times
-        start1 = datetime(2025, 1, 1, 2, 30, tzinfo=timezone.utc)
-        end1 = datetime(2025, 1, 31, 18, 45, tzinfo=timezone.utc)
+        start1 = datetime(2025, 1, 1, 2, 30, tzinfo=UTC)
+        end1 = datetime(2025, 1, 31, 18, 45, tzinfo=UTC)
         early_range = DateRange(start_date=start1, end_date=end1)
 
-        start2 = datetime(2025, 1, 1, 22, 15, tzinfo=timezone.utc)
-        end2 = datetime(2025, 1, 31, 6, 20, tzinfo=timezone.utc)
+        start2 = datetime(2025, 1, 1, 22, 15, tzinfo=UTC)
+        end2 = datetime(2025, 1, 31, 6, 20, tzinfo=UTC)
         late_range = DateRange(start_date=start2, end_date=end2)
 
         # Should have same hash despite different input times