claude-mpm 4.1.26__py3-none-any.whl → 5.0.9__py3-none-any.whl

claude_mpm/services/mcp_gateway/tools/health_check_tool.py

@@ -20,12 +20,13 @@ import asyncio
 import os
 import platform
 import sys
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict
 
 import psutil
 
 from claude_mpm.config.paths import paths
+from claude_mpm.core.enums import HealthStatus, OperationResult, ServiceState
 from claude_mpm.core.logger import get_logger
 from claude_mpm.services.mcp_gateway.core.interfaces import (
     MCPToolDefinition,
@@ -86,7 +87,7 @@ class HealthCheckTool(BaseToolAdapter):
         Returns:
             Tool execution result with health check results
         """
-        start_time = datetime.now()
+        start_time = datetime.now(timezone.utc)
 
         try:
             # Get parameters
@@ -98,7 +99,7 @@ class HealthCheckTool(BaseToolAdapter):
             results = await self._perform_health_checks(check_type, detailed, timeout)
 
             # Calculate execution time
-            execution_time = (datetime.now() - start_time).total_seconds()
+            execution_time = (datetime.now(timezone.utc) - start_time).total_seconds()
 
             # Update metrics
             self._update_metrics(True, execution_time)
@@ -115,7 +116,7 @@ class HealthCheckTool(BaseToolAdapter):
             )
 
         except Exception as e:
-            execution_time = (datetime.now() - start_time).total_seconds()
+            execution_time = (datetime.now(timezone.utc) - start_time).total_seconds()
             self._update_metrics(False, execution_time)
 
             return MCPToolResult(
@@ -130,7 +131,7 @@ class HealthCheckTool(BaseToolAdapter):
     ) -> Dict[str, Any]:
         """Perform the requested health checks."""
         results = {
-            "timestamp": datetime.now().isoformat(),
+            "timestamp": datetime.now(timezone.utc).isoformat(),
             "check_type": check_type,
             "detailed": detailed,
             "overall_status": "unknown",
@@ -168,20 +169,20 @@ class HealthCheckTool(BaseToolAdapter):
                 if i < len(check_results):
                     if isinstance(check_results[i], Exception):
                         results["checks"][check_name] = {
-                            "status": "error",
+                            "status": OperationResult.ERROR,
                             "error": str(check_results[i]),
                         }
                     else:
                         results["checks"][check_name] = check_results[i]
                 else:
                     results["checks"][check_name] = {
-                        "status": "timeout",
+                        "status": OperationResult.TIMEOUT,
                         "error": "Check timed out",
                     }
 
         except asyncio.TimeoutError:
             results["checks"]["timeout"] = {
-                "status": "error",
+                "status": OperationResult.ERROR,
                 "error": f"Health checks timed out after {timeout} seconds",
             }
 
@@ -194,7 +195,7 @@ class HealthCheckTool(BaseToolAdapter):
     async def _check_system_health(self, detailed: bool) -> Dict[str, Any]:
         """Check system health (CPU, memory, disk, etc.)."""
         check_result = {
-            "status": "healthy",
+            "status": ServiceState.RUNNING,
             "checks": {},
             "warnings": [],
             "errors": [],
@@ -219,7 +220,7 @@ class HealthCheckTool(BaseToolAdapter):
 
             if memory_usage > 90:
                 check_result["errors"].append("High memory usage detected")
-                check_result["status"] = "unhealthy"
+                check_result["status"] = HealthStatus.UNHEALTHY
             elif memory_usage > 80:
                 check_result["warnings"].append("Elevated memory usage")
 
@@ -232,7 +233,7 @@ class HealthCheckTool(BaseToolAdapter):
 
             if cpu_usage > 95:
                 check_result["errors"].append("High CPU usage detected")
-                check_result["status"] = "unhealthy"
+                check_result["status"] = HealthStatus.UNHEALTHY
             elif cpu_usage > 80:
                 check_result["warnings"].append("Elevated CPU usage")
 
@@ -248,7 +249,7 @@ class HealthCheckTool(BaseToolAdapter):
 
                 if disk_usage_percent > 95:
                     check_result["errors"].append("Disk space critically low")
-                    check_result["status"] = "unhealthy"
+                    check_result["status"] = HealthStatus.UNHEALTHY
                 elif disk_usage_percent > 85:
                     check_result["warnings"].append("Disk space running low")
 
@@ -262,7 +263,7 @@ class HealthCheckTool(BaseToolAdapter):
             }
 
         except Exception as e:
-            check_result["status"] = "error"
+            check_result["status"] = HealthStatus.UNHEALTHY
             check_result["errors"].append(f"System health check failed: {e}")
 
         return check_result
@@ -270,7 +271,7 @@ class HealthCheckTool(BaseToolAdapter):
     async def _check_gateway_health(self, detailed: bool) -> Dict[str, Any]:
         """Check MCP Gateway health."""
         check_result = {
-            "status": "healthy",
+            "status": ServiceState.RUNNING,
             "checks": {},
             "warnings": [],
             "errors": [],
@@ -302,10 +303,10 @@ class HealthCheckTool(BaseToolAdapter):
 
             if not mcp_dir.exists():
                 check_result["errors"].append("MCP directory does not exist")
-                check_result["status"] = "unhealthy"
+                check_result["status"] = HealthStatus.UNHEALTHY
 
         except Exception as e:
-            check_result["status"] = "error"
+            check_result["status"] = HealthStatus.UNHEALTHY
             check_result["errors"].append(f"Gateway health check failed: {e}")
 
         return check_result
@@ -313,7 +314,7 @@ class HealthCheckTool(BaseToolAdapter):
     async def _check_tools_health(self, detailed: bool) -> Dict[str, Any]:
         """Check MCP tools health."""
         check_result = {
-            "status": "healthy",
+            "status": ServiceState.RUNNING,
             "checks": {},
             "warnings": [],
             "errors": [],
@@ -353,11 +354,11 @@ class HealthCheckTool(BaseToolAdapter):
                 )
 
             if len(available_essential) == 0:
-                check_result["status"] = "unhealthy"
+                check_result["status"] = HealthStatus.UNHEALTHY
                 check_result["errors"].append("No essential tools available")
 
         except Exception as e:
-            check_result["status"] = "error"
+            check_result["status"] = HealthStatus.UNHEALTHY
             check_result["errors"].append(f"Tools health check failed: {e}")
 
         return check_result
@@ -365,7 +366,7 @@ class HealthCheckTool(BaseToolAdapter):
     async def _check_config_health(self, detailed: bool) -> Dict[str, Any]:
         """Check configuration health."""
         check_result = {
-            "status": "healthy",
+            "status": ServiceState.RUNNING,
             "checks": {},
             "warnings": [],
             "errors": [],
@@ -383,7 +384,7 @@ class HealthCheckTool(BaseToolAdapter):
                 # Try to load configuration
                 import json
 
-                with open(config_file) as f:
+                with config_file.open() as f:
                     config_data = json.load(f)
 
                 check_result["checks"]["config_valid"] = True
@@ -401,7 +402,7 @@ class HealthCheckTool(BaseToolAdapter):
             }
 
         except Exception as e:
-            check_result["status"] = "error"
+            check_result["status"] = HealthStatus.UNHEALTHY
             check_result["errors"].append(f"Config health check failed: {e}")
 
         return check_result
@@ -413,13 +414,13 @@ class HealthCheckTool(BaseToolAdapter):
 
         statuses = [check.get("status", "unknown") for check in checks.values()]
 
-        if "error" in statuses:
-            return "error"
-        if "unhealthy" in statuses:
+        # Check for unhealthy (handle both string and enum)
+        if HealthStatus.UNHEALTHY in statuses or "unhealthy" in statuses:
             return "unhealthy"
         if "warning" in statuses:
             return "warning"
-        if all(status == "healthy" for status in statuses):
+        # Check for healthy (handle both string and enum)
+        if all(status in (HealthStatus.HEALTHY, "healthy") for status in statuses):
             return "healthy"
         return "unknown"
 
@@ -436,19 +437,20 @@ class HealthCheckTool(BaseToolAdapter):
         for check_name, check_result in checks.items():
             status = check_result.get("status", "unknown")
 
-            if status == "healthy":
+            # Check for healthy (handle both string and enum)
+            if status in (HealthStatus.HEALTHY, "healthy"):
                 summary["healthy"] += 1
-            elif status in ["warning", "unhealthy"]:
+            elif status in ["warning", HealthStatus.UNHEALTHY, "unhealthy"]:
                 summary["warnings"] += 1
                 # Collect warning messages
                 warnings = check_result.get("warnings", [])
                 for warning in warnings:
                     summary["issues"].append(f"{check_name}: {warning}")
-            elif status == "error":
-                summary["errors"] += 1
-                # Collect error messages
-                errors = check_result.get("errors", [])
-                for error in errors:
-                    summary["issues"].append(f"{check_name}: {error}")
+                # Collect error messages if status is unhealthy
+                if status in (HealthStatus.UNHEALTHY, "unhealthy"):
+                    summary["errors"] += 1
+                    errors = check_result.get("errors", [])
+                    for error in errors:
+                        summary["issues"].append(f"{check_name}: {error}")
 
         return summary

claude_mpm/services/mcp_gateway/tools/hello_world.py

@@ -27,7 +27,7 @@ import json
 import platform
 import re
 import sys
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, List, Optional
 
 from claude_mpm.services.mcp_gateway.core.interfaces import (
@@ -305,7 +305,7 @@ class HelloWorldTool(BaseToolAdapter):
         Returns:
             Tool execution result with greeting
         """
-        start_time = datetime.now()
+        start_time = datetime.now(timezone.utc)
 
         try:
             # Validate parameters
@@ -353,13 +353,13 @@ class HelloWorldTool(BaseToolAdapter):
                 greeting = " ".join([greeting] * repeat)
 
             # Calculate execution time
-            execution_time = (datetime.now() - start_time).total_seconds()
+            execution_time = (datetime.now(timezone.utc) - start_time).total_seconds()
 
             # Build response data
             response_data = {
                 "greeting": greeting,
                 "mode": mode,
-                "timestamp": datetime.now().isoformat(),
+                "timestamp": datetime.now(timezone.utc).isoformat(),
             }
 
             # Add metadata if requested
@@ -389,7 +389,7 @@ class HelloWorldTool(BaseToolAdapter):
             )
 
         except Exception as e:
-            execution_time = (datetime.now() - start_time).total_seconds()
+            execution_time = (datetime.now(timezone.utc) - start_time).total_seconds()
             self._update_metrics(False, execution_time)
             self._metrics["last_error"] = str(e)
 
@@ -409,11 +409,11 @@ class HelloWorldTool(BaseToolAdapter):
 
     async def _time_based_greeting(self) -> str:
         """Generate a greeting based on current time."""
-        current_hour = datetime.now().hour
+        current_hour = datetime.now(timezone.utc).hour
 
         for (start, end), greeting in self.TIME_GREETINGS.items():
             if start <= current_hour < end:
-                return f"{greeting}! It's {datetime.now().strftime('%I:%M %p')}."
+                return f"{greeting}! It's {datetime.now(timezone.utc).strftime('%I:%M %p')}."
 
         return "Hello! Time is a curious thing."
 
@@ -482,7 +482,7 @@ class HelloWorldTool(BaseToolAdapter):
             execution_time: Time taken to generate greeting
         """
         entry = {
-            "timestamp": datetime.now().isoformat(),
+            "timestamp": datetime.now(timezone.utc).isoformat(),
             "mode": mode,
             "greeting": greeting[:100],  # Truncate long greetings
             "execution_time": execution_time,