awslabs.cloudwatch-mcp-server 0.0.8__tar.gz → 0.0.11__tar.gz

{awslabs_cloudwatch_mcp_server-0.0.8 → awslabs_cloudwatch_mcp_server-0.0.11}/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # dependabot should continue to update this to the latest hash.
-FROM public.ecr.aws/docker/library/python:3.13.5-alpine3.21@sha256:c9a09c45a4bcc618c7f7128585b8dd0d41d0c31a8a107db4c8255ffe0b69375d AS uv
+FROM public.ecr.aws/docker/library/python:3.13-alpine@sha256:070342a0cc1011532c0e69972cce2bbc6cc633eba294bae1d12abea8bd05303b AS uv
 
 # Install the project into `/app`
 WORKDIR /app
@@ -61,7 +61,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
 # Make the directory just in case it doesn't exist
 RUN mkdir -p /root/.local
 
-FROM public.ecr.aws/docker/library/python:3.13.5-alpine3.21@sha256:c9a09c45a4bcc618c7f7128585b8dd0d41d0c31a8a107db4c8255ffe0b69375d
+FROM public.ecr.aws/docker/library/python:3.13-alpine@sha256:070342a0cc1011532c0e69972cce2bbc6cc633eba294bae1d12abea8bd05303b
 
 # Place executables in the environment at the front of the path and include other binaries
 ENV PATH="/app/.venv/bin:$PATH" \

{awslabs_cloudwatch_mcp_server-0.0.8 → awslabs_cloudwatch_mcp_server-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.cloudwatch-mcp-server
-Version: 0.0.8
+Version: 0.0.11
 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/
@@ -119,6 +119,35 @@ Alarm Recommendations - Suggests recommended alarm configurations for CloudWatch
   }
 }
 ```
+### Windows Installation
+
+For Windows users, the MCP server configuration format is slightly different:
+
+```json
+{
+  "mcpServers": {
+    "awslabs.cloudwatch-mcp-server": {
+      "disabled": false,
+      "timeout": 60,
+      "type": "stdio",
+      "command": "uv",
+      "args": [
+        "tool",
+        "run",
+        "--from",
+        "awslabs.cloudwatch-mcp-server@latest",
+        "awslabs.cloudwatch-mcp-server.exe"
+      ],
+      "env": {
+        "FASTMCP_LOG_LEVEL": "ERROR",
+        "AWS_PROFILE": "your-aws-profile",
+        "AWS_REGION": "us-east-1"
+      }
+    }
+  }
+}
+```
+
 
 Please reference [AWS documentation](https://docs.aws.amazon.com/cli/v1/userguide/cli-configure-files.html) to create and manage your credentials profile
 

{awslabs_cloudwatch_mcp_server-0.0.8 → awslabs_cloudwatch_mcp_server-0.0.11}/README.md

@@ -90,6 +90,35 @@ Alarm Recommendations - Suggests recommended alarm configurations for CloudWatch
   }
 }
 ```
+### Windows Installation
+
+For Windows users, the MCP server configuration format is slightly different:
+
+```json
+{
+  "mcpServers": {
+    "awslabs.cloudwatch-mcp-server": {
+      "disabled": false,
+      "timeout": 60,
+      "type": "stdio",
+      "command": "uv",
+      "args": [
+        "tool",
+        "run",
+        "--from",
+        "awslabs.cloudwatch-mcp-server@latest",
+        "awslabs.cloudwatch-mcp-server.exe"
+      ],
+      "env": {
+        "FASTMCP_LOG_LEVEL": "ERROR",
+        "AWS_PROFILE": "your-aws-profile",
+        "AWS_REGION": "us-east-1"
+      }
+    }
+  }
+}
+```
+
 
 Please reference [AWS documentation](https://docs.aws.amazon.com/cli/v1/userguide/cli-configure-files.html) to create and manage your credentials profile
 

{awslabs_cloudwatch_mcp_server-0.0.8 → awslabs_cloudwatch_mcp_server-0.0.11}/awslabs/cloudwatch_mcp_server/cloudwatch_logs/tools.py

@@ -168,12 +168,37 @@ class CloudWatchLogsTools:
         """
         poll_start = timer()
         while poll_start + max_timeout > timer():
-            response = logs_client.get_query_results(queryId=query_id)
-            status = response['status']
+            try:
+                response = logs_client.get_query_results(queryId=query_id)
+                status = response['status']
+
+                logger.debug(f'Query {query_id} status: {status}')
+
+                if status in {'Complete', 'Failed', 'Cancelled'}:
+                    logger.info(f'Query {query_id} finished with status {status}')
+                    result = self._process_query_results(response, query_id)
+
+                    # Handle case where query completed but returned no results
+                    if status == 'Complete' and not result.get('results'):
+                        logger.info(f'Query {query_id} completed but returned no results')
+                        result['results'] = []
+
+                    return result
+
+                # Handle unexpected status states
+                if status not in {'Scheduled', 'Running'}:
+                    logger.warning(f'Query {query_id} has unexpected status: {status}')
+                    return self._process_query_results(response, query_id)
 
-            if status in {'Complete', 'Failed', 'Cancelled'}:
-                logger.info(f'Query {query_id} finished with status {status}')
-                return self._process_query_results(response, query_id)
+            except Exception as e:
+                logger.error(f'Error polling for query {query_id} completion: {str(e)}')
+                await ctx.error(f'Error during query polling: {str(e)}')
+                return {
+                    'queryId': query_id,
+                    'status': 'Error',
+                    'message': f'Error occurred while polling: {str(e)}',
+                    'results': [],
+                }
 
             await asyncio.sleep(1)
 
@@ -184,6 +209,7 @@ class CloudWatchLogsTools:
             'queryId': query_id,
             'status': 'Polling Timeout',
             'message': msg,
+            'results': [],
         }
 
     def register(self, mcp):
@@ -576,8 +602,16 @@ class CloudWatchLogsTools:
 
         except Exception as e:
             logger.error(f'Error in execute_log_insights_query_tool: {str(e)}')
-            await ctx.error(f'Error executing CloudWatch Logs Insights query: {str(e)}')
-            raise
+            error_msg = f'Error executing CloudWatch Logs Insights query: {str(e)}'
+            await ctx.error(error_msg)
+
+            # Instead of raising, return a consistent error result
+            return {
+                'queryId': '',
+                'status': 'Error',
+                'message': error_msg,
+                'results': [],
+            }
 
     async def get_logs_insight_query_results(
         self,
@@ -612,11 +646,26 @@ class CloudWatchLogsTools:
 
             logger.info(f'Retrieved results for query ID {query_id}')
 
-            return self._process_query_results(response, query_id)
+            result = self._process_query_results(response, query_id)
+
+            # Ensure results is always an array, even if empty
+            if not result.get('results'):
+                result['results'] = []
+
+            return result
+
         except Exception as e:
             logger.error(f'Error in get_query_results_tool: {str(e)}')
-            await ctx.error(f'Error retrieving CloudWatch Logs Insights query results: {str(e)}')
-            raise
+            error_msg = f'Error retrieving CloudWatch Logs Insights query results: {str(e)}'
+            await ctx.error(error_msg)
+
+            # Return consistent error structure instead of raising
+            return {
+                'queryId': query_id,
+                'status': 'Error',
+                'message': error_msg,
+                'results': [],
+            }
 
     async def cancel_logs_insight_query(
         self,

{awslabs_cloudwatch_mcp_server-0.0.8 → awslabs_cloudwatch_mcp_server-0.0.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "awslabs.cloudwatch-mcp-server"
-version = "0.0.8"
+version = "0.0.11"
 description = "An AWS Labs Model Context Protocol (MCP) server for cloudwatch"
 readme = "README.md"
 requires-python = ">=3.10"

{awslabs_cloudwatch_mcp_server-0.0.8 → awslabs_cloudwatch_mcp_server-0.0.11}/tests/cloudwatch_logs/test_logs_error_handling.py

@@ -185,19 +185,22 @@ class TestErrorHandling:
 
             tools = CloudWatchLogsTools()
 
-            with pytest.raises(Exception) as exc_info:
-                await tools.execute_log_insights_query(
-                    mock_context,
-                    log_group_names=['test-group'],
-                    log_group_identifiers=None,
-                    start_time='2023-01-01T00:00:00+00:00',
-                    end_time='2023-01-01T01:00:00+00:00',
-                    query_string='fields @message',
-                    limit=10,
-                    max_timeout=30,
-                )
+            result = await tools.execute_log_insights_query(
+                mock_context,
+                log_group_names=['test-group'],
+                log_group_identifiers=None,
+                start_time='2023-01-01T00:00:00+00:00',
+                end_time='2023-01-01T01:00:00+00:00',
+                query_string='fields @message',
+                limit=10,
+                max_timeout=30,
+            )
 
-            assert 'Query API Error' in str(exc_info.value)
+            # Verify error response structure instead of exception
+            assert result['status'] == 'Error'
+            assert result['results'] == []
+            assert 'Query API Error' in result['message']
+            assert result['queryId'] == ''
             mock_context.error.assert_called_once()
 
     @pytest.mark.asyncio
@@ -212,10 +215,15 @@ class TestErrorHandling:
 
             tools = CloudWatchLogsTools()
 
-            with pytest.raises(Exception) as exc_info:
-                await tools.get_logs_insight_query_results(mock_context, query_id='test-query-id')
+            result = await tools.get_logs_insight_query_results(
+                mock_context, query_id='test-query-id'
+            )
 
-            assert 'Query Results API Error' in str(exc_info.value)
+            # Verify error response structure instead of exception
+            assert result['status'] == 'Error'
+            assert result['results'] == []
+            assert 'Query Results API Error' in result['message']
+            assert result['queryId'] == 'test-query-id'
             mock_context.error.assert_called_once()
 
     @pytest.mark.asyncio
@@ -296,6 +304,54 @@ class TestErrorHandling:
             assert result['queryId'] == 'test-query-id'
             assert result['status'] == 'Cancelled'
 
+    @pytest.mark.asyncio
+    async def test_poll_for_query_completion_unexpected_status(self, mock_context):
+        """Test polling with unexpected query status."""
+        with patch(
+            'awslabs.cloudwatch_mcp_server.cloudwatch_logs.tools.boto3.Session'
+        ) as mock_session:
+            mock_client = Mock()
+            mock_client.get_query_results.return_value = {
+                'queryId': 'test-query-id',
+                'status': 'UnknownStatus',  # Unexpected status
+                'results': [],
+            }
+            mock_session.return_value.client.return_value = mock_client
+            tools = CloudWatchLogsTools()
+            result = await tools._poll_for_query_completion(
+                mock_client, 'test-query-id', 30, mock_context
+            )
+            assert result['queryId'] == 'test-query-id'
+            assert result['status'] == 'UnknownStatus'
+            assert result['results'] == []
+
+    @pytest.mark.asyncio
+    async def test_poll_for_query_completion_polling_exception(self, mock_context):
+        """Test polling with exception during get_query_results."""
+        with patch(
+            'awslabs.cloudwatch_mcp_server.cloudwatch_logs.tools.boto3.Session'
+        ) as mock_session:
+            mock_client = Mock()
+            mock_client.get_query_results.side_effect = Exception('Network timeout during polling')
+            mock_session.return_value.client.return_value = mock_client
+            tools = CloudWatchLogsTools()
+
+            result = await tools._poll_for_query_completion(
+                mock_client, 'test-query-id', 30, mock_context
+            )
+
+            # Verify error response structure
+            assert result['queryId'] == 'test-query-id'
+            assert result['status'] == 'Error'
+            assert 'Network timeout during polling' in result['message']
+            assert result['results'] == []
+
+            # Verify context error was called
+            mock_context.error.assert_called_once()
+            error_call_args = mock_context.error.call_args[0][0]
+            assert 'Error during query polling' in error_call_args
+            assert 'Network timeout during polling' in error_call_args
+
 
 class TestEdgeCases:
     """Test edge cases and boundary conditions."""
@@ -308,14 +364,13 @@ class TestEdgeCases:
             # Response with minimal fields
             raw_response = {
                 'status': 'Complete',
-                # Missing queryId, statistics, results
+                # Missing queryId, results
             }
 
             processed = tools._process_query_results(raw_response, 'fallback-id')
 
             assert processed['queryId'] == 'fallback-id'
             assert processed['status'] == 'Complete'
-            assert processed['statistics'] == {}
             assert processed['results'] == []
 
     def test_aws_profile_initialization(self):

{awslabs_cloudwatch_mcp_server-0.0.8 → awslabs_cloudwatch_mcp_server-0.0.11}/tests/cloudwatch_logs/test_logs_server.py

@@ -265,17 +265,21 @@ class TestExecuteLogInsightsQuery:
 
     async def test_invalid_parameters(self, ctx, cloudwatch_tools):
         """Test invalid parameter handling."""
-        with pytest.raises(Exception):
-            await cloudwatch_tools.execute_log_insights_query(
-                ctx,
-                log_group_names=['/aws/test/group1'],
-                log_group_identifiers=['/aws/test/group1'],  # Both provided - should fail
-                start_time='2023-01-01T00:00:00+00:00',
-                end_time='2023-01-01T01:00:00+00:00',
-                query_string='fields @timestamp, @message | limit 10',
-                limit=10,
-                max_timeout=30,
-            )
+        result = await cloudwatch_tools.execute_log_insights_query(
+            ctx,
+            log_group_names=['/aws/test/group1'],
+            log_group_identifiers=['/aws/test/group1'],  # Both provided - should fail
+            start_time='2023-01-01T00:00:00+00:00',
+            end_time='2023-01-01T01:00:00+00:00',
+            query_string='fields @timestamp, @message | limit 10',
+            limit=10,
+            max_timeout=30,
+        )
+
+        # Verify error response structure instead of exception
+        assert result['status'] == 'Error'
+        assert result['results'] == []
+        assert 'Error executing CloudWatch Logs Insights query' in result['message']
 
 
 @pytest.mark.asyncio

awslabs_cloudwatch_mcp_server-0.0.11/uv-requirements.txt

@@ -0,0 +1,24 @@
+# This file was autogenerated by uv via the following command:
+#    echo "uv==0.8.10" > uv-requirements.in
+#    uv pip compile --generate-hashes --output-file=uv-requirements.txt --strip-extras --python=3.10 uv-requirements.in
+uv==0.8.10 \
+    --hash=sha256:31e4fc37ee94b94c032384a0957ad32ba7dce4ce6c04b4880fd3e31e25e51a82 \
+    --hash=sha256:36a5ce708d52388c37043e7335f9eb3fea5a19a56166a2cc6adb365179a1cd77 \
+    --hash=sha256:38286d230daad82388469c8dc7a1d2f5dc279c11178319c886d1a88d7938e513 \
+    --hash=sha256:3e190cee3bb2b4f574a419eef87ae8e33f713e9cd6f856b83277ece70ad9ca9b \
+    --hash=sha256:3fdf89fc40af9902141c39ed943bcfca15664623363335eb032a44f22001e2b4 \
+    --hash=sha256:4cc190d403a89e46d13cec83b6f8e8d7d07aaf1e5a996eac9a3f0c2a8cd92537 \
+    --hash=sha256:57b71dc79eff25a5419d3fe4a563d3b9397f55d789f685ef27f43f033b31f482 \
+    --hash=sha256:86fe044c2be43977566a0d184a487edd7aace2febb757fd95927684b629ef50b \
+    --hash=sha256:88df34c32555064fae459cce665757619fd1af7deb2dc393352b15d909d2d131 \
+    --hash=sha256:9ad21eeaa4156a1bf5ed85903f80db06e2c02badd3a587ba98d3171517960555 \
+    --hash=sha256:a5495b5a6e3111c03cf5e4dbdd598bc8fd1da887e3920d58cd5a2d4c8bc9a473 \
+    --hash=sha256:ab072cd3bf2f9dc264659a1ff48ad91a910ac4830bcfe965e2d3f89c86646f46 \
+    --hash=sha256:af8a5526b0e331775a264fa0dbccfd53c183cb974f269a208af136d7561f9eb2 \
+    --hash=sha256:b00637c63d5dfc9f879281c5c91db2bb909ab1f9ab275dab015e7fb6cac6be5b \
+    --hash=sha256:b3ff3c451fcd23ea78356d8c18e802d0e423cbe655273601e3ec039a51b33286 \
+    --hash=sha256:c4a493cd4b15b3aef11523531aff96a77a586666a63e842fa437966b7b7ee62d \
+    --hash=sha256:defc50bb319be2d58be74a680710cd4b7697e88d5f79974eacd354df95f0b6b0 \
+    --hash=sha256:e0a02bcec766eb0862b7082ab746b204add7d9fcaa62322502d159b5a7ccc54a \
+    --hash=sha256:eb79a46d8099f563ef58237bf4e9009f876a40145e757ea883a92b24b724d01e
+    # via -r uv-requirements.in