fix: update datetime usage to ensure UTC consistency across the appli… (#66)

* fix: update datetime usage to ensure UTC consistency across the application

* run precommit

Author: Wh1isper

mcp_email_server/config.py

@@ -4,6 +4,7 @@
 import os
 from pathlib import Path
 from typing import Any
+from zoneinfo import ZoneInfo
 
 import tomli_w
 from pydantic import BaseModel, ConfigDict, Field, field_serializer, model_validator
@@ -37,8 +38,8 @@ class AccountAttributes(BaseModel):
     model_config = ConfigDict(json_encoders={datetime.datetime: lambda v: v.isoformat()})
     account_name: str
     description: str = ""
-    created_at: datetime.datetime = Field(default_factory=datetime.datetime.now)
-    updated_at: datetime.datetime = Field(default_factory=datetime.datetime.now)
+    created_at: datetime.datetime = Field(default_factory=lambda: datetime.datetime.now(ZoneInfo("UTC")))
+    updated_at: datetime.datetime = Field(default_factory=lambda: datetime.datetime.now(ZoneInfo("UTC")))
 
     @model_validator(mode="after")
     @classmethod
@@ -48,7 +49,7 @@ def update_updated_at(cls, obj: AccountAttributes) -> AccountAttributes:
         obj.model_config["validate_assignment"] = False
 
         # update updated_at field
-        obj.updated_at = datetime.datetime.now()
+        obj.updated_at = datetime.datetime.now(ZoneInfo("UTC"))
 
         # enable validation again
         obj.model_config["validate_assignment"] = True

mcp_email_server/emails/classic.py

@@ -1,6 +1,6 @@
 import email.utils
 from collections.abc import AsyncGenerator
-from datetime import datetime
+from datetime import datetime, timezone
 from email.header import Header
 from email.mime.text import MIMEText
 from email.parser import BytesParser
@@ -56,9 +56,13 @@ def _parse_email_data(self, raw_email: bytes, email_id: str | None = None) -> di
         # Parse date
         try:
             date_tuple = email.utils.parsedate_tz(date_str)
-            date = datetime.fromtimestamp(email.utils.mktime_tz(date_tuple)) if date_tuple else datetime.now()
+            date = (
+                datetime.fromtimestamp(email.utils.mktime_tz(date_tuple), tz=timezone.utc)
+                if date_tuple
+                else datetime.now(timezone.utc)
+            )
         except Exception:
-            date = datetime.now()
+            date = datetime.now(timezone.utc)
 
         # Get body content
         body = ""
@@ -267,12 +271,12 @@ async def get_emails_metadata_stream(  # noqa: C901
                             try:
                                 date_tuple = email.utils.parsedate_tz(date_str)
                                 date = (
-                                    datetime.fromtimestamp(email.utils.mktime_tz(date_tuple))
+                                    datetime.fromtimestamp(email.utils.mktime_tz(date_tuple), tz=timezone.utc)
                                     if date_tuple
-                                    else datetime.now()
+                                    else datetime.now(timezone.utc)
                                 )
                             except Exception:
-                                date = datetime.now()
+                                date = datetime.now(timezone.utc)
 
                             # For metadata, we don't fetch attachments to save bandwidth
                             # We'll mark it as unknown for now

tests/test_classic_handler.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from unittest.mock import AsyncMock, patch
 
 import pytest
@@ -54,7 +54,7 @@ def test_init(self, email_settings):
     async def test_get_emails(self, classic_handler):
         """Test get_emails method."""
         # Create test data
-        now = datetime.now()
+        now = datetime.now(timezone.utc)
         email_data = {
             "email_id": "123",
             "subject": "Test Subject",

tests/test_email_client.py

@@ -1,6 +1,6 @@
 import asyncio
 import email
-from datetime import datetime
+from datetime import datetime, timezone
 from email.mime.text import MIMEText
 from unittest.mock import AsyncMock, MagicMock, patch
 
@@ -104,12 +104,12 @@ def test_build_search_criteria(self):
         assert criteria == ["ALL"]
 
         # Test with before date
-        before_date = datetime(2023, 1, 1)
+        before_date = datetime(2023, 1, 1, tzinfo=timezone.utc)
         criteria = EmailClient._build_search_criteria(before=before_date)
         assert criteria == ["BEFORE", "01-JAN-2023"]
 
         # Test with since date
-        since_date = datetime(2023, 1, 1)
+        since_date = datetime(2023, 1, 1, tzinfo=timezone.utc)
         criteria = EmailClient._build_search_criteria(since=since_date)
         assert criteria == ["SINCE", "01-JAN-2023"]
 
@@ -135,7 +135,7 @@ def test_build_search_criteria(self):
 
         # Test with multiple criteria
         criteria = EmailClient._build_search_criteria(
-            subject="Test", from_address="test@example.com", since=datetime(2023, 1, 1)
+            subject="Test", from_address="test@example.com", since=datetime(2023, 1, 1, tzinfo=timezone.utc)
         )
         assert criteria == ["SINCE", "01-JAN-2023", "SUBJECT", "Test", "FROM", "test@example.com"]
 
@@ -172,7 +172,7 @@ async def test_get_emails_stream(self, email_client):
                     "subject": "Test Subject",
                     "from": "sender@example.com",
                     "body": "Test Body",
-                    "date": datetime.now(),
+                    "date": datetime.now(timezone.utc),
                     "attachments": [],
                 }
 

tests/test_mcp_tools.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
@@ -108,7 +108,7 @@ async def test_add_email_account(self):
     async def test_list_emails_metadata(self):
         """Test list_emails_metadata MCP tool."""
         # Create test data
-        now = datetime.now()
+        now = datetime.now(timezone.utc)
         email_metadata = EmailMetadata(
             email_id="12345",
             subject="Test Subject",
@@ -171,7 +171,7 @@ async def test_list_emails_metadata(self):
     async def test_get_emails_content_single(self):
         """Test get_emails_content MCP tool with single email."""
         # Create test data
-        now = datetime.now()
+        now = datetime.now(timezone.utc)
         email_body = EmailBodyResponse(
             email_id="12345",
             subject="Test Subject",
@@ -216,7 +216,7 @@ async def test_get_emails_content_single(self):
     async def test_get_emails_content_batch(self):
         """Test get_emails_content MCP tool with multiple emails."""
         # Create test data
-        now = datetime.now()
+        now = datetime.now(timezone.utc)
         email1 = EmailBodyResponse(
             email_id="12345",
             subject="Test Subject 1",

tests/test_models.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 
 from mcp_email_server.emails.models import EmailMetadata, EmailMetadataPageResponse
 
@@ -11,7 +11,7 @@ def test_init(self):
             subject="Test Subject",
             sender="test@example.com",
             recipients=["recipient@example.com"],
-            date=datetime.now(),
+            date=datetime.now(timezone.utc),
             attachments=["file1.txt", "file2.pdf"],
         )
 
@@ -23,7 +23,7 @@ def test_init(self):
 
     def test_from_email(self):
         """Test from_email class method."""
-        now = datetime.now()
+        now = datetime.now(timezone.utc)
         email_dict = {
             "email_id": "123",
             "subject": "Test Subject",
@@ -45,7 +45,7 @@ def test_from_email(self):
 class TestEmailMetadataPageResponse:
     def test_init(self):
         """Test initialization with valid data."""
-        now = datetime.now()
+        now = datetime.now(timezone.utc)
         email_data = EmailMetadata(
             email_id="123",
             subject="Test Subject",