tz-aware datetimes

Author: samuelclay

handlers/library_handler.py

@@ -1068,7 +1068,7 @@ def _should_check_series_grouping(self):
             bool: True if we should check (and potentially disable) series grouping
         """
         try:
-            from datetime import datetime, timedelta
+            from datetime import datetime, timedelta, timezone
 
             # Get the last check time from the database
             library_settings = self.driver.automator.profile_manager.get_library_settings()
@@ -1082,7 +1082,7 @@ def _should_check_series_grouping(self):
                 return True
 
             # Check if it's been more than 24 hours
-            now = datetime.now()
+            now = datetime.now(timezone.utc)
             time_since_check = now - last_check
             should_check = time_since_check > timedelta(hours=24)
 
@@ -1135,7 +1135,7 @@ def _handle_series_grouping_if_needed(self):
                     repo = UserRepository(session)
                     # Use update_user_field which is idempotent (creates library_settings if needed)
                     success = repo.update_user_field(
-                        sindarin_email, "library_settings.last_series_group_check", datetime.now()
+                        sindarin_email, "library_settings.last_series_group_check", datetime.now(timezone.utc)
                     )
                     if success:
                         logger.info("Updated last_series_group_check timestamp in database")

scripts/db_export.py

@@ -3,7 +3,7 @@
 import json
 import logging
 import sys
-from datetime import datetime
+from datetime import datetime, timezone
 from pathlib import Path
 
 # Add project root to Python path
@@ -70,7 +70,7 @@ def export_database(output_file: str = None) -> None:
         db_connection.initialize()
 
         # Prepare export data
-        export_data = {"export_timestamp": datetime.now().isoformat(), "tables": {}}
+        export_data = {"export_timestamp": datetime.now(timezone.utc).isoformat(), "tables": {}}
 
         with db_connection.get_session() as session:
             # Export all tables
@@ -95,7 +95,7 @@ def export_database(output_file: str = None) -> None:
 
         # Generate output filename if not provided
         if not output_file:
-            timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+            timestamp = datetime.now(timezone.utc).strftime("%Y%m%d_%H%M%S")
             output_file = f"backups/kindle_db_export_{timestamp}.json"
 
         # Ensure backup directory exists

server/resources/cold_storage_resources.py

@@ -1,5 +1,5 @@
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 
 from flask import request
 from flask_restful import Resource
@@ -56,7 +56,7 @@ def _handle_archive_request(self):
                         "message": f"User {user_email} archived to cold storage",
                         "user_email": user_email,
                         "storage_info": storage_info,
-                        "timestamp": datetime.now().isoformat(),
+                        "timestamp": datetime.now(timezone.utc).isoformat(),
                         "dry_run": dry_run,
                     }
                 else:
@@ -65,7 +65,7 @@ def _handle_archive_request(self):
                         "message": f"Failed to archive user {user_email}",
                         "user_email": user_email,
                         "error": storage_info.get("error") if storage_info else "Unknown error",
-                        "timestamp": datetime.now().isoformat(),
+                        "timestamp": datetime.now(timezone.utc).isoformat(),
                     }, 400
 
             # Otherwise, archive all eligible profiles
@@ -86,7 +86,7 @@ def _handle_archive_request(self):
                 "success_count": success_count,
                 "failure_count": failure_count,
                 "storage_info": storage_info,
-                "timestamp": datetime.now().isoformat(),
+                "timestamp": datetime.now(timezone.utc).isoformat(),
                 "dry_run": dry_run,
             }
 
@@ -150,7 +150,7 @@ def get(self):
                     if last_used:
                         try:
                             # Convert Unix timestamp to ISO format string
-                            last_used_date = datetime.fromtimestamp(last_used).isoformat()
+                            last_used_date = datetime.fromtimestamp(last_used, tz=timezone.utc).isoformat()
                         except (ValueError, TypeError):
                             logger.warning(f"Invalid last_used timestamp for {email}: {last_used}")
                     else:
@@ -183,7 +183,7 @@ def get(self):
                 "eligible_profiles": eligible_profiles,
                 "active_profiles": active_profiles,
                 "days_threshold": days_inactive,
-                "timestamp": datetime.now().isoformat(),
+                "timestamp": datetime.now(timezone.utc).isoformat(),
             }
 
         except Exception as e:
@@ -235,14 +235,14 @@ def _handle_restore_request(self):
                         "success": True,
                         "message": f"Successfully restored {user_email} from local backup",
                         "user_email": user_email,
-                        "timestamp": datetime.now().isoformat(),
+                        "timestamp": datetime.now(timezone.utc).isoformat(),
                     }
                 else:
                     return {
                         "success": False,
                         "message": f"Failed to restore {user_email} from local backup",
                         "user_email": user_email,
-                        "timestamp": datetime.now().isoformat(),
+                        "timestamp": datetime.now(timezone.utc).isoformat(),
                     }, 400
             else:
                 # Normal restore from cold storage
@@ -269,7 +269,7 @@ def _handle_restore_request(self):
                         "message": message,
                         "user_email": user_email,
                         "restore_info": restore_info,
-                        "timestamp": datetime.now().isoformat(),
+                        "timestamp": datetime.now(timezone.utc).isoformat(),
                         "dry_run": dry_run,
                     }
                 else:
@@ -278,7 +278,7 @@ def _handle_restore_request(self):
                         "message": f"Failed to restore {user_email} from cold storage",
                         "user_email": user_email,
                         "error": restore_info.get("error") if restore_info else "Unknown error",
-                        "timestamp": datetime.now().isoformat(),
+                        "timestamp": datetime.now(timezone.utc).isoformat(),
                     }, 400
 
         except Exception as e:

server/resources/idle_check_resources.py

@@ -3,7 +3,7 @@
 import logging
 import platform
 import time
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
 from flask import request
 from flask_restful import Resource
@@ -206,7 +206,7 @@ def _check_and_shutdown_idle(self, timeout_minutes=None):
             # Prepare summary
             server = AutomationServer.get_instance()
             summary = {
-                "timestamp": datetime.now().isoformat(),
+                "timestamp": datetime.now(timezone.utc).isoformat(),
                 "idle_timeout_minutes": timeout_minutes,
                 "total_checked": len(server.automators),
                 "shut_down": len([s for s in shutdown_emails if s.get("status") == "shutdown"]),

server/resources/staff_auth_resources.py

@@ -1,7 +1,7 @@
 """Staff authentication resource."""
 
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 
 from flask import jsonify, make_response, request
 from flask_restful import Resource
@@ -144,9 +144,9 @@ def get(self):
         for token_info in tokens:
             if "created_at" in token_info:
                 timestamp = token_info["created_at"]
-                token_info["created_at_formatted"] = datetime.fromtimestamp(timestamp).strftime(
-                    "%Y-%m-%d %H:%M:%S"
-                )
+                token_info["created_at_formatted"] = datetime.fromtimestamp(
+                    timestamp, tz=timezone.utc
+                ).strftime("%Y-%m-%d %H:%M:%S")
 
             # Truncate the actual token for security
             if "token" in token_info:

server/resources/user_activity_resource.py

@@ -4,7 +4,7 @@
 import json
 import os
 import re
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from pathlib import Path
 
 from flask import make_response, request
@@ -186,7 +186,7 @@ def _parse_log_lines(self, file_obj, user_email):
                 if timestamp_match:
                     time_str = timestamp_match.group(1)
                     # Use today's date with the time
-                    today = datetime.now().date()
+                    today = datetime.now(timezone.utc).date()
                     timestamp = datetime.combine(today, datetime.strptime(time_str, "%H:%M:%S").time())
 
             if not timestamp:

server/utils/emulator_launcher.py

@@ -9,7 +9,7 @@
 import platform
 import subprocess
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 from pathlib import Path
 from typing import Dict, List, Optional, Set, Tuple
 
@@ -2124,7 +2124,9 @@ def has_snapshot(self, email: str, snapshot_name: str) -> bool:
                 # Get snapshot size and modification time for debugging
                 snapshot_stat = os.stat(snapshot_path)
                 snapshot_size_mb = snapshot_stat.st_size / (1024 * 1024)
-                snapshot_mtime = datetime.fromtimestamp(snapshot_stat.st_mtime).strftime("%Y-%m-%d %H:%M:%S")
+                snapshot_mtime = datetime.fromtimestamp(snapshot_stat.st_mtime, tz=timezone.utc).strftime(
+                    "%Y-%m-%d %H:%M:%S"
+                )
                 logger.debug(
                     f"Snapshot '{snapshot_name}' exists for {email} at {snapshot_path} "
                     f"(size: {snapshot_size_mb:.1f}MB, modified: {snapshot_mtime})"