Merge pull request #165 from awslabs/refactor/arch-wave1-isolated

refactor: fix isolated mechanical violations (datetime, except-pass, stubs)

Author: fgogolli

src/orb/api/handlers/get_return_requests_handler.py

@@ -1,7 +1,7 @@
 """API handler for getting return requests."""
 
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Any, Optional, cast
 
 from orb.application.base.infrastructure_handlers import (
@@ -272,7 +272,7 @@ def _get_from_cache(self, cache_key: str) -> Optional[dict[str, Any]]:
         if cache_key in self._cache:
             cached_data = self._cache[cache_key]
             if (
-                datetime.utcnow() - cached_data["timestamp"]
+                datetime.now(timezone.utc) - cached_data["timestamp"]
             ).total_seconds() < self._cache_duration:
                 return cached_data["data"]
             else:
@@ -287,12 +287,12 @@ def _add_to_cache(self, cache_key: str, data: dict[str, Any]) -> None:
             cache_key: Cache key
             data: Data to cache
         """
-        self._cache[cache_key] = {"data": data, "timestamp": datetime.utcnow()}
+        self._cache[cache_key] = {"data": data, "timestamp": datetime.now(timezone.utc)}
         self._cleanup_cache()
 
     def _cleanup_cache(self) -> None:
         """Clean up expired cache entries."""
-        now = datetime.utcnow()
+        now = datetime.now(timezone.utc)
         expired_keys = [
             key
             for key, value in self._cache.items()

src/orb/application/base/handlers.py

@@ -9,7 +9,7 @@
 import asyncio
 import time
 from abc import ABC, abstractmethod
-from datetime import datetime
+from datetime import datetime, timezone
 from functools import wraps
 from typing import Any, Callable, Optional, TypeVar
 
@@ -136,7 +136,7 @@ async def async_wrapper(*args, **kwargs):
                     self._metrics[operation_id] = {
                         "duration": duration,
                         "status": "success",
-                        "timestamp": datetime.utcnow(),
+                        "timestamp": datetime.now(timezone.utc),
                     }
 
                     return result
@@ -156,7 +156,7 @@ async def async_wrapper(*args, **kwargs):
                         "duration": duration,
                         "status": "error",
                         "error": str(e),
-                        "timestamp": datetime.utcnow(),
+                        "timestamp": datetime.now(timezone.utc),
                     }
 
                     raise

src/orb/application/commands/cleanup_handlers.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
 from orb.application.base.handlers import BaseCommandHandler
 from orb.application.decorators import command_handler
@@ -51,7 +51,7 @@ async def execute_command(self, command: CleanupOldRequestsCommand) -> None:
         - command.request_ids_found: List of request IDs found (dry run)
         """
         self.logger.info("Cleaning up requests older than %s days", command.older_than_days)
-        cutoff_date = datetime.utcnow() - timedelta(days=command.older_than_days)
+        cutoff_date = datetime.now(timezone.utc) - timedelta(days=command.older_than_days)
 
         try:
             with self._uow_factory.create_unit_of_work() as uow:
@@ -139,7 +139,7 @@ async def execute_command(self, command: CleanupAllResourcesCommand) -> None:
         - command.total_cleaned: Total resources cleaned
         """
         self.logger.info("Cleaning up all resources older than %s days", command.older_than_days)
-        cutoff_date = datetime.utcnow() - timedelta(days=command.older_than_days)
+        cutoff_date = datetime.now(timezone.utc) - timedelta(days=command.older_than_days)
 
         try:
             with self._uow_factory.create_unit_of_work() as uow:

src/orb/application/dto/system.py

@@ -5,7 +5,7 @@
 replacing Dict[str, Any] returns with appropriate type safety.
 """
 
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Optional
 
 from pydantic import Field
@@ -128,7 +128,8 @@ class ConfigurationSectionResponse(BaseDTO):
         default_factory=list, description="List of providers that failed validation"
     )
     validation_timestamp: datetime = Field(
-        default_factory=datetime.utcnow, description="When validation was performed"
+        default_factory=lambda: datetime.now(timezone.utc),
+        description="When validation was performed",
     )
 
 
@@ -146,7 +147,8 @@ class SystemStatusDTO(BaseDTO):
     cpu_usage_percent: float = Field(description="CPU usage percentage")
     disk_usage_percent: float = Field(description="Disk usage percentage")
     last_health_check: datetime = Field(
-        default_factory=datetime.utcnow, description="Last health check timestamp"
+        default_factory=lambda: datetime.now(timezone.utc),
+        description="Last health check timestamp",
     )
     components: dict[str, str] = Field(
         default_factory=dict, description="Status of individual components"
@@ -167,7 +169,8 @@ class ProviderMetricsDTO(BaseDTO):
     uptime_percent: float = Field(description="Provider uptime percentage")
     health_status: str = Field(description="Current health status")
     metrics_timestamp: datetime = Field(
-        default_factory=datetime.utcnow, description="When metrics were collected"
+        default_factory=lambda: datetime.now(timezone.utc),
+        description="When metrics were collected",
     )
 
 
@@ -196,7 +199,7 @@ class ProviderCapabilitiesDTO(BaseDTO):
     supports_auto_scaling: bool = Field(description="Whether auto scaling is supported")
     api_version: str = Field(description="API version")
     last_updated: datetime = Field(
-        default_factory=datetime.utcnow, description="Last update timestamp"
+        default_factory=lambda: datetime.now(timezone.utc), description="Last update timestamp"
     )
 
 
@@ -214,7 +217,8 @@ class ProviderStrategyConfigDTO(BaseDTO):
     retry_attempts: int = Field(description="Number of retry attempts")
     timeout_seconds: int = Field(description="Timeout in seconds")
     last_modified: datetime = Field(
-        default_factory=datetime.utcnow, description="Last modification timestamp"
+        default_factory=lambda: datetime.now(timezone.utc),
+        description="Last modification timestamp",
     )
 
 
@@ -228,6 +232,7 @@ class ValidationDTO(BaseDTO):
     warnings: list[str] = Field(default_factory=list, description="List of validation warnings")
     template_id: str = Field(description="ID of the validated template")
     validation_timestamp: datetime = Field(
-        default_factory=datetime.utcnow, description="When validation was performed"
+        default_factory=lambda: datetime.now(timezone.utc),
+        description="When validation was performed",
     )
     schema_version: str = Field(description="Schema version used for validation")

src/orb/application/queries/cleanup_query_handlers.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import Any
 
 # Define query classes inline since they're not in dto/queries.py yet
@@ -49,7 +49,7 @@ async def execute_query(self, query: ListCleanableRequestsQuery) -> dict[str, An
             "Listing requests eligible for cleanup (older than %d days)", query.older_than_days
         )
 
-        cutoff_date = datetime.utcnow() - timedelta(days=query.older_than_days)
+        cutoff_date = datetime.now(timezone.utc) - timedelta(days=query.older_than_days)
 
         try:
             with self._uow_factory.create_unit_of_work() as uow:
@@ -66,7 +66,9 @@ async def execute_query(self, query: ListCleanableRequestsQuery) -> dict[str, An
                                     "request_id": str(request.request_id),
                                     "status": str(request.status),
                                     "created_at": request.created_at.isoformat(),
-                                    "age_days": (datetime.utcnow() - request.created_at).days,
+                                    "age_days": (
+                                        datetime.now(timezone.utc) - request.created_at
+                                    ).days,
                                 }
                             )
 

src/orb/application/queries/specialized_handlers.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from datetime import datetime, timezone
 from typing import Any
 
 from orb.application.base.handlers import BaseQueryHandler
@@ -208,15 +209,13 @@ async def execute_query(self, query: GetMachineHealthQuery) -> MachineHealthDTO:
                     health_details = {"error": str(health_error)}
 
                 # Create health DTO
-                from datetime import datetime
-
                 health_dto = MachineHealthDTO(
                     machine_id=str(machine.machine_id),
                     overall_status=health_status,
                     system_status=health_status,
                     instance_status=health_status,
                     metrics=[health_details] if health_details else [],
-                    last_check=last_health_check or datetime.utcnow(),
+                    last_check=last_health_check or datetime.now(timezone.utc),
                 )
 
                 self.logger.info(

src/orb/config/installation_detector.py

@@ -118,7 +118,7 @@ def get_scripts_location() -> Path:
                 if scripts_dir is not None:
                     return scripts_dir
         except Exception:
-            pass
+            pass  # Best-effort: DI container may not be ready during installation detection
 
         from orb.config.platform_dirs import get_config_location
 

src/orb/domain/base/entity_pure.py

@@ -1,7 +1,7 @@
 """Pure domain entities - foundation for all domain objects without infrastructure dependencies."""
 
 from abc import ABC, abstractmethod
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Optional, TypeVar
 
 T = TypeVar("T", bound="Entity")
@@ -26,8 +26,8 @@ def __init__(
             **kwargs: Additional attributes for subclasses
         """
         self.id = id
-        self.created_at = created_at or datetime.utcnow()
-        self.updated_at = updated_at or datetime.utcnow()
+        self.created_at = created_at or datetime.now(timezone.utc)
+        self.updated_at = updated_at or datetime.now(timezone.utc)
 
         # Store additional attributes for subclasses
         for key, value in kwargs.items():

src/orb/domain/base/error.py

@@ -1,7 +1,7 @@
 """Domain error concepts - core error representation."""
 
 from dataclasses import dataclass
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Optional
 
 
@@ -60,7 +60,7 @@ class ErrorContext:
     def create(cls, operation: str, layer: str, request_id: Optional[str] = None) -> "ErrorContext":
         """Create error context with current timestamp."""
         return cls(
-            timestamp=datetime.utcnow(),
+            timestamp=datetime.now(timezone.utc),
             operation=operation,
             layer=layer,
             request_id=request_id,

src/orb/domain/machine/aggregate.py

@@ -1,6 +1,6 @@
 """Machine aggregate - core machine domain logic."""
 
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Optional
 
 from pydantic import ConfigDict, Field
@@ -83,10 +83,8 @@ def __init__(self, **data) -> None:
             data["id"] = data.get("machine_id", f"machine-{data.get('template_id', 'unknown')}")
 
         # Set default timestamps if not provided
-        from datetime import datetime
-
         if "created_at" not in data:
-            data["created_at"] = datetime.utcnow()
+            data["created_at"] = datetime.now(timezone.utc)
 
         super().__init__(**data)
 
@@ -97,7 +95,7 @@ def start_launching(self) -> "Machine":
 
         fields = self.model_dump()
         fields["status"] = MachineStatus.LAUNCHING
-        fields["launched_at"] = datetime.utcnow()
+        fields["launched_at"] = datetime.now(timezone.utc)
         fields["version"] = self.version + 1
 
         updated_machine = Machine.model_validate(fields)
@@ -133,7 +131,7 @@ def update_status(self, new_status: MachineStatus, reason: Optional[str] = None)
         fields["version"] = self.version + 1
 
         # Update timestamps based on status
-        now = datetime.utcnow()
+        now = datetime.now(timezone.utc)
         if new_status == MachineStatus.RUNNING and not self.launch_time:
             fields["launch_time"] = now
         elif new_status in [MachineStatus.TERMINATED, MachineStatus.FAILED]:
@@ -224,7 +222,7 @@ def is_healthy(self) -> bool:
     def uptime(self) -> Optional[int]:
         """Get machine uptime in seconds."""
         if self.launch_time and self.status == MachineStatus.RUNNING:
-            return int((datetime.utcnow() - self.launch_time).total_seconds())
+            return int((datetime.now(timezone.utc) - self.launch_time).total_seconds())
         return None
 
     def to_provider_format(self, provider_type: str) -> dict[str, Any]: