Replace datetime.utcnow with datetime.now(timezone.utc)

Signed-off-by: Madhav Kandukuri <[email protected]>

Author: madhav165

mcpgateway/db.py

@@ -105,6 +105,12 @@
     connect_args=connect_args,
 )
 
+# ---------------------------------------------------------------------------
+# 6. Function to return UTC timestamp
+# ---------------------------------------------------------------------------
+def utc_now():
+    return datetime.now(timezone.utc)
+
 # Session factory
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
@@ -181,7 +187,7 @@ class ToolMetric(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True)
     tool_id: Mapped[str] = mapped_column(String, ForeignKey("tools.id"), nullable=False)
-    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
+    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
     response_time: Mapped[float] = mapped_column(Float, nullable=False)
     is_success: Mapped[bool] = mapped_column(Boolean, nullable=False)
     error_message: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
@@ -207,7 +213,7 @@ class ResourceMetric(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True)
     resource_id: Mapped[int] = mapped_column(Integer, ForeignKey("resources.id"), nullable=False)
-    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
+    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
     response_time: Mapped[float] = mapped_column(Float, nullable=False)
     is_success: Mapped[bool] = mapped_column(Boolean, nullable=False)
     error_message: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
@@ -233,7 +239,7 @@ class ServerMetric(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True)
     server_id: Mapped[str] = mapped_column(String, ForeignKey("servers.id"), nullable=False)
-    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
+    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
     response_time: Mapped[float] = mapped_column(Float, nullable=False)
     is_success: Mapped[bool] = mapped_column(Boolean, nullable=False)
     error_message: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
@@ -259,7 +265,7 @@ class PromptMetric(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True)
     prompt_id: Mapped[int] = mapped_column(Integer, ForeignKey("prompts.id"), nullable=False)
-    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
+    timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
     response_time: Mapped[float] = mapped_column(Float, nullable=False)
     is_success: Mapped[bool] = mapped_column(Boolean, nullable=False)
     error_message: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
@@ -312,8 +318,8 @@ class Tool(Base):
     headers: Mapped[Optional[Dict[str, str]]] = mapped_column(JSON)
     input_schema: Mapped[Dict[str, Any]] = mapped_column(JSON)
     annotations: Mapped[Optional[Dict[str, Any]]] = mapped_column(JSON, default=lambda: {})
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
-    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
     is_active: Mapped[bool] = mapped_column(default=True)
     jsonpath_filter: Mapped[str] = mapped_column(default="")
 
@@ -557,8 +563,8 @@ class Resource(Base):
     mime_type: Mapped[Optional[str]]
     size: Mapped[Optional[int]]
     template: Mapped[Optional[str]]  # URI template for parameterized resources
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
-    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
     is_active: Mapped[bool] = mapped_column(default=True)
     metrics: Mapped[List["ResourceMetric"]] = relationship("ResourceMetric", back_populates="resource", cascade="all, delete-orphan")
 
@@ -714,7 +720,7 @@ class ResourceSubscription(Base):
     id: Mapped[int] = mapped_column(primary_key=True)
     resource_id: Mapped[int] = mapped_column(ForeignKey("resources.id"))
     subscriber_id: Mapped[str]  # Client identifier
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
     last_notification: Mapped[Optional[datetime]] = mapped_column(DateTime)
 
     resource: Mapped["Resource"] = relationship(back_populates="subscriptions")
@@ -745,8 +751,8 @@ class Prompt(Base):
     description: Mapped[Optional[str]]
     template: Mapped[str] = mapped_column(Text)
     argument_schema: Mapped[Dict[str, Any]] = mapped_column(JSON)
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
-    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
     is_active: Mapped[bool] = mapped_column(default=True)
     metrics: Mapped[List["PromptMetric"]] = relationship("PromptMetric", back_populates="prompt", cascade="all, delete-orphan")
 
@@ -894,8 +900,8 @@ class Server(Base):
     name: Mapped[str] = mapped_column(unique=True)
     description: Mapped[Optional[str]]
     icon: Mapped[Optional[str]]
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
-    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
     is_active: Mapped[bool] = mapped_column(default=True)
     metrics: Mapped[List["ServerMetric"]] = relationship("ServerMetric", back_populates="server", cascade="all, delete-orphan")
 
@@ -1014,8 +1020,8 @@ class Gateway(Base):
     description: Mapped[Optional[str]]
     transport: Mapped[str] = mapped_column(default="SSE")
     capabilities: Mapped[Dict[str, Any]] = mapped_column(JSON)
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
-    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)
+    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
     is_active: Mapped[bool] = mapped_column(default=True)
     last_seen: Mapped[Optional[datetime]]
 
@@ -1086,8 +1092,8 @@ class SessionRecord(Base):
     __tablename__ = "mcp_sessions"
 
     session_id: Mapped[str] = mapped_column(primary_key=True)
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))  # pylint: disable=not-callable
-    last_accessed: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))  # pylint: disable=not-callable
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)  # pylint: disable=not-callable
+    last_accessed: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)  # pylint: disable=not-callable
     data: Mapped[str] = mapped_column(String, nullable=True)
 
     messages: Mapped[List["SessionMessageRecord"]] = relationship("SessionMessageRecord", back_populates="session", cascade="all, delete-orphan")
@@ -1101,8 +1107,8 @@ class SessionMessageRecord(Base):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     session_id: Mapped[str] = mapped_column(ForeignKey("mcp_sessions.session_id"))
     message: Mapped[str] = mapped_column(String, nullable=True)
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))  # pylint: disable=not-callable
-    last_accessed: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))  # pylint: disable=not-callable
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now)  # pylint: disable=not-callable
+    last_accessed: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)  # pylint: disable=not-callable
 
     session: Mapped["SessionRecord"] = relationship("SessionRecord", back_populates="messages")
 

mcpgateway/federation/discovery.py

@@ -16,7 +16,7 @@
 # Standard
 import asyncio
 from dataclasses import dataclass
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 import logging
 import os
 import socket
@@ -205,7 +205,7 @@ async def add_peer(self, url: str, source: str, name: Optional[str] = None) -> b
         # Skip if already known
         if url in self._discovered_peers:
             peer = self._discovered_peers[url]
-            peer.last_seen = datetime.utcnow()
+            peer.last_seen = datetime.now(timezone.utc)
             return False
 
         try:
@@ -218,8 +218,8 @@ async def add_peer(self, url: str, source: str, name: Optional[str] = None) -> b
                 name=name,
                 protocol_version=PROTOCOL_VERSION,
                 capabilities=capabilities,
-                discovered_at=datetime.utcnow(),
-                last_seen=datetime.utcnow(),
+                discovered_at=datetime.now(timezone.utc),
+                last_seen=datetime.now(timezone.utc),
                 source=source,
             )
 
@@ -253,7 +253,7 @@ async def refresh_peer(self, url: str) -> bool:
         try:
             capabilities = await self._get_gateway_info(url)
             self._discovered_peers[url].capabilities = capabilities
-            self._discovered_peers[url].last_seen = datetime.utcnow()
+            self._discovered_peers[url].last_seen = datetime.now(timezone.utc)
             return True
         except Exception as e:
             logger.warning(f"Failed to refresh peer {url}: {e}")
@@ -303,7 +303,7 @@ async def _cleanup_loop(self) -> None:
         """Periodically clean up stale peers."""
         while True:
             try:
-                now = datetime.utcnow()
+                now = datetime.now(timezone.utc)
                 stale_urls = [url for url, peer in self._discovered_peers.items() if now - peer.last_seen > timedelta(minutes=10)]
                 for url in stale_urls:
                     await self.remove_peer(url)

mcpgateway/federation/forward.py

@@ -15,7 +15,7 @@
 
 # Standard
 import asyncio
-from datetime import datetime
+from datetime import datetime, timezone
 import logging
 from typing import Any, Dict, List, Optional, Set, Tuple, Union
 
@@ -233,7 +233,7 @@ async def _forward_to_gateway(
                     result = response.json()
 
                     # Update last seen
-                    gateway.last_seen = datetime.utcnow()
+                    gateway.last_seen = datetime.now(timezone.utc)
 
                     # Handle response
                     if "error" in result:
@@ -316,7 +316,7 @@ def _check_rate_limit(self, gateway_url: str) -> bool:
         Returns:
             True if request allowed
         """
-        now = datetime.utcnow()
+        now = datetime.now(timezone.utc)
 
         # Clean old history
         self._request_history[gateway_url] = [t for t in self._request_history.get(gateway_url, []) if (now - t).total_seconds() < 60]

mcpgateway/federation/manager.py

@@ -18,7 +18,7 @@
 
 # Standard
 import asyncio
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 import logging
 import os
 from typing import Any, Dict, List, Optional, Set
@@ -158,7 +158,7 @@ async def register_gateway(self, db: Session, url: str, name: Optional[str] = No
                 name=gateway_name,
                 url=url,
                 capabilities=capabilities.dict(),
-                last_seen=datetime.utcnow(),
+                last_seen=datetime.now(timezone.utc),
             )
             db.add(gateway)
             db.commit()
@@ -195,7 +195,7 @@ async def unregister_gateway(self, db: Session, gateway_id: str) -> None:
 
             # Remove gateway
             gateway.is_active = False
-            gateway.updated_at = datetime.utcnow()
+            gateway.updated_at = datetime.now(timezone.utc)
 
             # Remove associated tools
             db.execute(select(DbTool).where(DbTool.gateway_id == gateway_id)).delete()
@@ -315,7 +315,7 @@ async def forward_request(self, gateway: DbGateway, method: str, params: Optiona
             result = response.json()
 
             # Update last seen
-            gateway.last_seen = datetime.utcnow()
+            gateway.last_seen = datetime.now(timezone.utc)
 
             # Handle response
             if "error" in result:
@@ -351,7 +351,7 @@ async def _run_sync_loop(self, db: Session) -> None:
                         # Update capabilities
                         capabilities = await self._initialize_gateway(gateway.url)
                         gateway.capabilities = capabilities.dict()
-                        gateway.last_seen = datetime.utcnow()
+                        gateway.last_seen = datetime.now(timezone.utc)
                         gateway.is_active = True
 
                     except Exception as e:
@@ -383,7 +383,7 @@ async def _run_health_loop(self, db: Session) -> None:
                     except Exception as e:
                         logger.warning(f"Health check failed for {gateway.name}: {e}")
                         # Mark inactive if not seen recently
-                        if datetime.utcnow() - gateway.last_seen > timedelta(minutes=5):
+                        if datetime.now(timezone.utc) - gateway.last_seen > timedelta(minutes=5):
                             gateway.is_active = False
                             self._active_gateways.discard(gateway.url)
 

mcpgateway/schemas.py

@@ -21,7 +21,7 @@
 
 # Standard
 import base64
-from datetime import datetime
+from datetime import datetime, timezone
 import json
 import logging
 from typing import Any, Dict, List, Literal, Optional, Union
@@ -542,7 +542,7 @@ class ResourceNotification(BaseModelWithConfig):
 
     uri: str
     content: ResourceContent
-    timestamp: datetime = Field(default_factory=datetime.utcnow)
+    timestamp: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
 
 
 # --- Prompt Schemas ---
@@ -893,10 +893,10 @@ class GatewayRead(BaseModelWithConfig):
     description: Optional[str] = Field(None, description="Gateway description")
     transport: str = Field(default="SSE", description="Transport used by MCP server: SSE or STREAMABLEHTTP")
     capabilities: Dict[str, Any] = Field(default_factory=dict, description="Gateway capabilities")
-    created_at: datetime = Field(default_factory=datetime.utcnow, description="Creation timestamp")
-    updated_at: datetime = Field(default_factory=datetime.utcnow, description="Last update timestamp")
+    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc), description="Creation timestamp")
+    updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc), description="Last update timestamp")
     is_active: bool = Field(default=True, description="Is the gateway active?")
-    last_seen: Optional[datetime] = Field(default_factory=datetime.utcnow, description="Last seen timestamp")
+    last_seen: Optional[datetime] = Field(default_factory=lambda: datetime.now(timezone.utc), description="Last seen timestamp")
 
     # Authorizations
     auth_type: Optional[str] = Field(None, description="auth_type: basic, bearer, headers or None")
@@ -1030,7 +1030,7 @@ class EventMessage(BaseModelWithConfig):
 
     type: str = Field(..., description="Event type (tool_added, resource_updated, etc)")
     data: Dict[str, Any] = Field(..., description="Event payload")
-    timestamp: datetime = Field(default_factory=datetime.utcnow)
+    timestamp: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
 
 
 class AdminToolCreate(BaseModelWithConfig):

mcpgateway/services/logging_service.py

@@ -11,7 +11,7 @@
 
 # Standard
 import asyncio
-from datetime import datetime
+from datetime import datetime, timezone
 import logging
 from typing import Any, AsyncGenerator, Dict, List, Optional
 
@@ -106,7 +106,7 @@ async def notify(self, data: Any, level: LogLevel, logger_name: Optional[str] =
             "data": {
                 "level": level,
                 "data": data,
-                "timestamp": datetime.utcnow().isoformat(),
+                "timestamp": datetime.now(timezone.utc).isoformat(),
             },
         }
         if logger_name: