awslabs.cloudwatch-mcp-server 0.0.13__tar.gz → 0.0.14__tar.gz

{awslabs_cloudwatch_mcp_server-0.0.13 → awslabs_cloudwatch_mcp_server-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.cloudwatch-mcp-server
-Version: 0.0.13
+Version: 0.0.14
 Summary: An AWS Labs Model Context Protocol (MCP) server for cloudwatch
 Project-URL: homepage, https://awslabs.github.io/mcp/
 Project-URL: docs, https://awslabs.github.io/mcp/servers/cloudwatch-mcp-server/
@@ -23,7 +23,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
 Requires-Dist: boto3>=1.38.22
 Requires-Dist: loguru>=0.7.0
-Requires-Dist: mcp[cli]>=1.11.0
+Requires-Dist: mcp[cli]>=1.23.0
 Requires-Dist: numpy>=2.0.0
 Requires-Dist: pandas>=2.2.3
 Requires-Dist: pydantic>=2.10.6

{awslabs_cloudwatch_mcp_server-0.0.13 → awslabs_cloudwatch_mcp_server-0.0.14}/awslabs/cloudwatch_mcp_server/__init__.py

@@ -14,4 +14,5 @@
 
 """awslabs.cloudwatch-mcp-server"""
 
-MCP_SERVER_VERSION = '0.0.12'
+__version__ = '0.0.14'
+MCP_SERVER_VERSION = __version__

{awslabs_cloudwatch_mcp_server-0.0.13 → awslabs_cloudwatch_mcp_server-0.0.14}/awslabs/cloudwatch_mcp_server/cloudwatch_metrics/tools.py

@@ -162,7 +162,10 @@ class CloudWatchMetricsTools:
         ctx: Context,
         namespace: str,
         metric_name: str,
-        start_time: Union[str, datetime],
+        start_time: Annotated[
+            Union[str, datetime],
+            Field(description='The start time for the metric data query (ISO format or datetime)'),
+        ],
         dimensions: List[Dimension] = [],
         end_time: Annotated[
             Union[str, datetime] | None,
@@ -390,10 +393,17 @@ class CloudWatchMetricsTools:
             start_time = datetime.fromisoformat(start_time.replace('Z', '+00:00'))
 
         if end_time is None:
-            end_time = datetime.utcnow()
+            end_time = datetime.now(timezone.utc)
         elif isinstance(end_time, str):
             end_time = datetime.fromisoformat(end_time.replace('Z', '+00:00'))
 
+        # Ensure both datetimes have timezone info for correct datetime arithmetic afterwards.
+        # This avoids issues when datetime is passed as naive values (without timezone)
+        if start_time.tzinfo is None:
+            start_time = start_time.replace(tzinfo=timezone.utc)
+        if end_time.tzinfo is None:
+            end_time = end_time.replace(tzinfo=timezone.utc)
+
         # Calculate period based on time window and target datapoints
         time_window_seconds = int((end_time - start_time).total_seconds())
         calculated_period = max(60, int(time_window_seconds / target_datapoints))

{awslabs_cloudwatch_mcp_server-0.0.13 → awslabs_cloudwatch_mcp_server-0.0.14}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "awslabs.cloudwatch-mcp-server"
-version = "0.0.13"
+version = "0.0.14"
 description = "An AWS Labs Model Context Protocol (MCP) server for cloudwatch"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
     "boto3>=1.38.22",
     "loguru>=0.7.0",
-    "mcp[cli]>=1.11.0",
+    "mcp[cli]>=1.23.0",
     "pydantic>=2.10.6",
     "numpy>=2.0.0",
     "pandas>=2.2.3",

{awslabs_cloudwatch_mcp_server-0.0.13 → awslabs_cloudwatch_mcp_server-0.0.14}/tests/cloudwatch_metrics/test_metrics_server.py

@@ -23,7 +23,7 @@ from awslabs.cloudwatch_mcp_server.cloudwatch_metrics.models import (
     StaticAlarmThreshold,
 )
 from awslabs.cloudwatch_mcp_server.cloudwatch_metrics.tools import CloudWatchMetricsTools
-from datetime import datetime
+from datetime import datetime, timezone
 from moto import mock_aws
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock, patch
@@ -116,8 +116,9 @@ class TestGetMetricData:
                 == 'CPUUtilization'
             )
             assert call_args['MetricDataQueries'][0]['MetricStat']['Stat'] == 'Average'
-            assert call_args['StartTime'] == start_time
-            assert call_args['EndTime'] == end_time
+
+            assert call_args['StartTime'] == start_time.replace(tzinfo=timezone.utc)
+            assert call_args['EndTime'] == end_time.replace(tzinfo=timezone.utc)
             assert isinstance(result, GetMetricDataResponse)
             assert len(result.metricDataResults) == 1
             assert result.metricDataResults[0].label == 'CPUUtilization'
@@ -504,6 +505,109 @@ class TestGetMetricData:
             ctx.error.assert_called_once()
             assert 'Test exception' in ctx.error.call_args[0][0]
 
+    @pytest.mark.parametrize(
+        'start_time,end_time,test_description',
+        [
+            # Timezone-aware start, no end (defaults to now)
+            (
+                '2023-01-01T00:00:00+00:00',
+                None,
+                'timezone-aware start_time with None end_time (defaults to now)',
+            ),
+            # Both timezone-aware
+            (
+                '2023-01-01T00:00:00+00:00',
+                '2023-01-01T01:00:00+00:00',
+                'both timezone-aware (ISO strings)',
+            ),
+            # Both naive datetime objects
+            (
+                datetime(2023, 1, 1, 0, 0, 0),
+                datetime(2023, 1, 1, 1, 0, 0),
+                'both naive datetime objects',
+            ),
+            # Timezone-aware datetime objects
+            (
+                datetime(2023, 1, 1, 0, 0, 0, tzinfo=__import__('datetime').timezone.utc),
+                datetime(2023, 1, 1, 1, 0, 0, tzinfo=__import__('datetime').timezone.utc),
+                'both timezone-aware datetime objects',
+            ),
+            # Mixed: naive start, timezone-aware end (ISO string)
+            (
+                datetime(2023, 1, 1, 0, 0, 0),
+                '2023-01-01T01:00:00+00:00',
+                'naive datetime start with timezone-aware ISO string end',
+            ),
+            # Mixed: timezone-aware start (ISO string), naive end
+            (
+                '2023-01-01T00:00:00+00:00',
+                datetime(2023, 1, 1, 1, 0, 0),
+                'timezone-aware ISO string start with naive datetime end',
+            ),
+            # Naive start, no end
+            (
+                datetime(2023, 1, 1, 0, 0, 0),
+                None,
+                'naive datetime start with None end_time',
+            ),
+            # Different timezone offsets
+            (
+                '2023-01-01T00:00:00-05:00',
+                '2023-01-01T06:00:00+00:00',
+                'different timezone offsets (EST and UTC)',
+            ),
+            # ISO string with Z notation
+            (
+                '2023-01-01T00:00:00Z',
+                '2023-01-01T01:00:00Z',
+                'ISO strings with Z notation',
+            ),
+        ],
+    )
+    async def test_get_metric_data_with_various_datetime_formats(
+        self, ctx, cloudwatch_metrics_tools, start_time, end_time, test_description
+    ):
+        """Parametrized test for various datetime format combinations.
+
+        Tests all combinations of:
+        - Timezone-aware vs naive datetimes
+        - ISO strings vs datetime objects
+        - With and without end_time (None defaults to now)
+        - Different timezone offsets
+
+        This ensures the fix for timezone handling works correctly in all scenarios.
+        """
+        mock_client = MagicMock()
+        mock_client.get_metric_data.return_value = {
+            'MetricDataResults': [
+                {
+                    'Id': 'm1',
+                    'Label': 'CPUUtilization',
+                    'StatusCode': 'Complete',
+                    'Timestamps': [datetime(2023, 1, 1, 0, 0, 0, tzinfo=timezone.utc)],
+                    'Values': [10.5],
+                }
+            ],
+        }
+
+        with patch.object(
+            cloudwatch_metrics_tools, '_get_cloudwatch_client', return_value=mock_client
+        ):
+            result = await cloudwatch_metrics_tools.get_metric_data(
+                ctx,
+                namespace='AWS/EC2',
+                metric_name='CPUUtilization',
+                start_time=start_time,
+                end_time=end_time,
+                dimensions=[Dimension(name='InstanceId', value='i-1234567890abcdef0')],
+                statistic='AVG',
+                target_datapoints=60,
+            )
+
+            # Should not raise an error and should return valid response
+            assert isinstance(result, GetMetricDataResponse), f'Failed for: {test_description}'
+            assert len(result.metricDataResults) == 1, f'Failed for: {test_description}'
+
     async def test_get_metric_metadata_found(self, ctx, cloudwatch_metrics_tools):
         """Test getting metric metadata for existing metric."""
         result = await cloudwatch_metrics_tools.get_metric_metadata(

{awslabs_cloudwatch_mcp_server-0.0.13 → awslabs_cloudwatch_mcp_server-0.0.14}/uv.lock

@@ -51,7 +51,7 @@ wheels = [
 
 [[package]]
 name = "awslabs-cloudwatch-mcp-server"
-version = "0.0.13"
+version = "0.0.14"
 source = { editable = "." }
 dependencies = [
     { name = "boto3" },
@@ -81,7 +81,7 @@ dev = [
 requires-dist = [
     { name = "boto3", specifier = ">=1.38.22" },
     { name = "loguru", specifier = ">=0.7.0" },
-    { name = "mcp", extras = ["cli"], specifier = ">=1.11.0" },
+    { name = "mcp", extras = ["cli"], specifier = ">=1.23.0" },
     { name = "numpy", specifier = ">=2.0.0" },
     { name = "pandas", specifier = ">=2.2.3" },
     { name = "pydantic", specifier = ">=2.10.6" },
@@ -665,7 +665,7 @@ wheels = [
 
 [[package]]
 name = "mcp"
-version = "1.11.0"
+version = "1.23.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "anyio" },
@@ -674,15 +674,18 @@ dependencies = [
     { name = "jsonschema" },
     { name = "pydantic" },
     { name = "pydantic-settings" },
+    { name = "pyjwt", extra = ["crypto"] },
     { name = "python-multipart" },
     { name = "pywin32", marker = "sys_platform == 'win32'" },
     { name = "sse-starlette" },
     { name = "starlette" },
+    { name = "typing-extensions" },
+    { name = "typing-inspection" },
     { name = "uvicorn", marker = "sys_platform != 'emscripten'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/3a/f5/9506eb5578d5bbe9819ee8ba3198d0ad0e2fbe3bab8b257e4131ceb7dfb6/mcp-1.11.0.tar.gz", hash = "sha256:49a213df56bb9472ff83b3132a4825f5c8f5b120a90246f08b0dac6bedac44c8", size = 406907, upload-time = "2025-07-10T16:41:09.388Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/a7/a4/d06a303f45997e266f2c228081abe299bbcba216cb806128e2e49095d25f/mcp-1.23.3.tar.gz", hash = "sha256:b3b0da2cc949950ce1259c7bfc1b081905a51916fcd7c8182125b85e70825201", size = 600697, upload-time = "2025-12-09T16:04:37.351Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/92/9c/c9ca79f9c512e4113a5d07043013110bb3369fc7770040c61378c7fbcf70/mcp-1.11.0-py3-none-any.whl", hash = "sha256:58deac37f7483e4b338524b98bc949b7c2b7c33d978f5fafab5bde041c5e2595", size = 155880, upload-time = "2025-07-10T16:41:07.935Z" },
+    { url = "https://files.pythonhosted.org/packages/32/c6/13c1a26b47b3f3a3b480783001ada4268917c9f42d78a079c336da2e75e5/mcp-1.23.3-py3-none-any.whl", hash = "sha256:32768af4b46a1b4f7df34e2bfdf5c6011e7b63d7f1b0e321d0fdef4cd6082031", size = 231570, upload-time = "2025-12-09T16:04:35.56Z" },
 ]
 
 [package.optional-dependencies]
@@ -1130,6 +1133,20 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/8a/0b/9fcc47d19c48b59121088dd6da2488a49d5f72dacf8262e2790a1d2c7d15/pygments-2.19.1-py3-none-any.whl", hash = "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c", size = 1225293, upload-time = "2025-01-06T17:26:25.553Z" },
 ]
 
+[[package]]
+name = "pyjwt"
+version = "2.10.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/e7/46/bd74733ff231675599650d3e47f361794b22ef3e3770998dda30d3b63726/pyjwt-2.10.1.tar.gz", hash = "sha256:3cc5772eb20009233caf06e9d8a0577824723b44e6648ee0a2aedb6cf9381953", size = 87785, upload-time = "2024-11-28T03:43:29.933Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/61/ad/689f02752eeec26aed679477e80e632ef1b682313be70793d798c1d5fc8f/PyJWT-2.10.1-py3-none-any.whl", hash = "sha256:dcdd193e30abefd5debf142f9adfcdd2b58004e644f25406ffaebd50bd98dacb", size = 22997, upload-time = "2024-11-28T03:43:27.893Z" },
+]
+
+[package.optional-dependencies]
+crypto = [
+    { name = "cryptography" },
+]
+
 [[package]]
 name = "pyright"
 version = "1.1.401"