awslabs.eks-mcp-server 0.1.15__py3-none-any.whl → 0.1.17__py3-none-any.whl

awslabs/eks_mcp_server/__init__.py

@@ -14,4 +14,4 @@
 
 """awslabs.eks-mcp-server"""
 
-__version__ = '0.1.15'
+__version__ = '0.1.17'

awslabs/eks_mcp_server/cloudwatch_handler.py

@@ -19,9 +19,9 @@ import json
 import time
 from awslabs.eks_mcp_server.aws_helper import AwsHelper
 from awslabs.eks_mcp_server.logging_helper import LogLevel, log_with_request_id
-from awslabs.eks_mcp_server.models import CloudWatchLogsResponse, CloudWatchMetricsResponse
+from awslabs.eks_mcp_server.models import CloudWatchLogsData, CloudWatchMetricsData
 from mcp.server.fastmcp import Context
-from mcp.types import TextContent
+from mcp.types import CallToolResult, TextContent
 from pydantic import Field
 from typing import Optional, Union
 
@@ -131,7 +131,7 @@ class CloudWatchHandler:
             None,
             description='Custom fields to include in the query results (defaults to "@timestamp, @message"). Use CloudWatch Logs Insights field syntax. IMPORTANT: Only specify if you need fields beyond the default timestamp and message.',
         ),
-    ) -> CloudWatchLogsResponse:
+    ) -> CallToolResult:
         """Get logs from CloudWatch for a specific resource.
 
         This tool retrieves logs from CloudWatch for Kubernetes resources in an EKS cluster,
@@ -181,17 +181,9 @@ class CloudWatchHandler:
                     'Access to CloudWatch logs requires --allow-sensitive-data-access flag'
                 )
                 log_with_request_id(ctx, LogLevel.ERROR, error_message)
-                return CloudWatchLogsResponse(
+                return CallToolResult(
                     isError=True,
                     content=[TextContent(type='text', text=error_message)],
-                    resource_type=resource_type,
-                    resource_name=resource_name,
-                    cluster_name=cluster_name,
-                    log_type=log_type,
-                    log_group='',
-                    start_time='',
-                    end_time='',
-                    log_entries=[],
                 )
 
             start_dt, end_dt = self.resolve_time_range(start_time, end_time, minutes)
@@ -268,15 +260,8 @@ class CloudWatchHandler:
                 f'Retrieved {len(log_entries)} log entries for {resource_str}cluster {cluster_name}',
             )
 
-            # Return the results
-            return CloudWatchLogsResponse(
-                isError=False,
-                content=[
-                    TextContent(
-                        type='text',
-                        text=f'Successfully retrieved {len(log_entries)} log entries for {resource_str}cluster {cluster_name}',
-                    )
-                ],
+            # Create structured data model
+            data = CloudWatchLogsData(
                 resource_type=resource_type,
                 resource_name=resource_name,
                 cluster_name=cluster_name,
@@ -287,22 +272,29 @@ class CloudWatchHandler:
                 log_entries=log_entries,
             )
 
+            # Return CallToolResult with structured content
+            return CallToolResult(
+                isError=False,
+                content=[
+                    TextContent(
+                        type='text',
+                        text=f'Successfully retrieved {len(log_entries)} log entries for {resource_str}cluster {cluster_name}',
+                    ),
+                    TextContent(
+                        type='text',
+                        text=json.dumps(data.model_dump()),
+                    ),
+                ],
+            )
+
         except Exception as e:
             resource_name_str = f' {resource_name}' if resource_name is not None else ''
             error_message = f'Failed to get logs for {resource_type}{resource_name_str}: {str(e)}'
             log_with_request_id(ctx, LogLevel.ERROR, error_message)
 
-            return CloudWatchLogsResponse(
+            return CallToolResult(
                 isError=True,
                 content=[TextContent(type='text', text=error_message)],
-                resource_type=resource_type,
-                resource_name=resource_name,
-                cluster_name=cluster_name,
-                log_type=log_type,
-                log_group='',
-                start_time='',
-                end_time='',
-                log_entries=[],
             )
 
     async def get_cloudwatch_metrics(
@@ -360,7 +352,7 @@ class CloudWatchHandler:
             - Minimum: Lowest value during the period
             - SampleCount: Number of samples during the period""",
         ),
-    ) -> CloudWatchMetricsResponse:
+    ) -> CallToolResult:
         """Get metrics from CloudWatch for a specific resource.
 
         This tool retrieves metrics from CloudWatch for Kubernetes resources in an EKS cluster,
@@ -419,15 +411,9 @@ class CloudWatchHandler:
             if 'ClusterName' in dimensions and dimensions['ClusterName'] != cluster_name:
                 error_message = f"Provided cluster_name '{cluster_name}' does not match ClusterName dimension '{dimensions['ClusterName']}'"
                 log_with_request_id(ctx, LogLevel.ERROR, error_message)
-                return CloudWatchMetricsResponse(
+                return CallToolResult(
                     isError=True,
                     content=[TextContent(type='text', text=error_message)],
-                    metric_name=metric_name,
-                    namespace=namespace,
-                    cluster_name=cluster_name,
-                    start_time='',
-                    end_time='',
-                    data_points=[],
                 )
 
             log_with_request_id(
@@ -493,15 +479,8 @@ class CloudWatchHandler:
                 f'Retrieved {len(data_points)} metric data points for {metric_name}',
             )
 
-            # Return the results
-            return CloudWatchMetricsResponse(
-                isError=False,
-                content=[
-                    TextContent(
-                        type='text',
-                        text=f'Successfully retrieved {len(data_points)} metric data points for {metric_name} in cluster {cluster_name}',
-                    )
-                ],
+            # Create structured data model
+            data = CloudWatchMetricsData(
                 metric_name=metric_name,
                 namespace=namespace,
                 cluster_name=cluster_name,
@@ -510,19 +489,28 @@ class CloudWatchHandler:
                 data_points=data_points,
             )
 
+            # Return CallToolResult with structured content
+            return CallToolResult(
+                isError=False,
+                content=[
+                    TextContent(
+                        type='text',
+                        text=f'Successfully retrieved {len(data_points)} metric data points for {metric_name} in cluster {cluster_name}',
+                    ),
+                    TextContent(
+                        type='text',
+                        text=json.dumps(data.model_dump()),
+                    ),
+                ],
+            )
+
         except Exception as e:
             error_message = f'Failed to get metrics: {str(e)}'
             log_with_request_id(ctx, LogLevel.ERROR, error_message)
 
-            return CloudWatchMetricsResponse(
+            return CallToolResult(
                 isError=True,
                 content=[TextContent(type='text', text=error_message)],
-                metric_name=metric_name,
-                namespace=namespace,
-                cluster_name=cluster_name,
-                start_time='',
-                end_time='',
-                data_points=[],
             )
 
     def _poll_query_results(

awslabs/eks_mcp_server/cloudwatch_metrics_guidance_handler.py

@@ -17,11 +17,11 @@
 import json
 import os
 from awslabs.eks_mcp_server.logging_helper import LogLevel, log_with_request_id
-from awslabs.eks_mcp_server.models import MetricsGuidanceResponse
+from awslabs.eks_mcp_server.models import MetricsGuidanceData
 from enum import Enum
 from loguru import logger
 from mcp.server.fastmcp import Context
-from mcp.types import TextContent
+from mcp.types import CallToolResult, TextContent
 from pydantic import Field
 from typing import Any, Dict
 
@@ -78,7 +78,7 @@ class CloudWatchMetricsHandler:
             ...,
             description='Type of resource to get metrics for (cluster, node, pod, namespace, service)',
         ),
-    ) -> MetricsGuidanceResponse:
+    ) -> CallToolResult:
         """Get CloudWatch metrics guidance for specific resource types in EKS clusters.
 
         This tool provides information about available CloudWatch metrics that are in the `ContainerInsights` naemspace for different resource types
@@ -112,11 +112,9 @@ class CloudWatchMetricsHandler:
             )
             log_with_request_id(ctx, LogLevel.ERROR, error_message)
 
-            return MetricsGuidanceResponse(
+            return CallToolResult(
                 isError=True,
                 content=[TextContent(type='text', text=error_message)],
-                resource_type=resource_type,
-                metrics=[],
             )
 
         metrics = self.metrics_guidance.get(resource_type.lower(), {}).get('metrics', [])
@@ -128,14 +126,21 @@ class CloudWatchMetricsHandler:
             f'Retrieved {len(metrics)} metrics for resource type {resource_type_lower}',
         )
 
-        return MetricsGuidanceResponse(
+        data = MetricsGuidanceData(
+            resource_type=resource_type_lower,
+            metrics=metrics,
+        )
+
+        return CallToolResult(
             isError=False,
             content=[
                 TextContent(
                     type='text',
                     text=f'Successfully retrieved {len(metrics)} metrics for resource type {resource_type_lower}',
-                )
+                ),
+                TextContent(
+                    type='text',
+                    text=json.dumps(data.model_dump()),
+                ),
             ],
-            resource_type=resource_type_lower,
-            metrics=metrics,
         )

awslabs/eks_mcp_server/eks_kb_handler.py

@@ -16,6 +16,7 @@
 
 import requests
 from loguru import logger
+from mcp.types import CallToolResult, TextContent
 from pydantic import Field
 from requests_auth_aws_sigv4 import AWSSigV4
 
@@ -49,7 +50,7 @@ class EKSKnowledgeBaseHandler:
             ...,
             description='Your specific question or issue description related to EKS troubleshooting',
         ),
-    ) -> str:
+    ) -> CallToolResult:
         """Search the EKS Troubleshoot Guide for troubleshooting information.
 
         This tool provides troubleshooting guidance for Amazon EKS issues by querying
@@ -74,7 +75,7 @@ class EKSKnowledgeBaseHandler:
             contain letters, numbers, commas, periods, question marks, colons, and spaces.
 
         Returns:
-            str: Detailed troubleshooting guidance for the EKS issue
+            CallToolResult: Detailed troubleshooting guidance for the EKS issue
         """
         try:
             response = requests.post(
@@ -83,7 +84,24 @@ class EKSKnowledgeBaseHandler:
                 auth=AWSSigV4(AWS_SERVICE, region=AWS_REGION),
             )
             response.raise_for_status()
-            return response.text
+
+            return CallToolResult(
+                isError=False,
+                content=[
+                    TextContent(
+                        type='text',
+                        text=response.text,
+                    )
+                ],
+            )
         except Exception as e:
             logger.error(f'Error in search_eks_troubleshoot_guide: {str(e)}')
-            return f'Error: {str(e)}'
+            return CallToolResult(
+                isError=True,
+                content=[
+                    TextContent(
+                        type='text',
+                        text=f'Error: {str(e)}',
+                    )
+                ],
+            )