awslabs.cloudwatch-mcp-server 0.0.10__py3-none-any.whl → 0.0.11__py3-none-any.whl

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.10.dist-info → awslabs_cloudwatch_mcp_server-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.cloudwatch-mcp-server
-Version: 0.0.10
+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/

{awslabs_cloudwatch_mcp_server-0.0.10.dist-info → awslabs_cloudwatch_mcp_server-0.0.11.dist-info}/RECORD

@@ -5,13 +5,13 @@ awslabs/cloudwatch_mcp_server/server.py,sha256=raMeiC0F8M7cIH6-5rZnU2_DZZkPEtpvR
 awslabs/cloudwatch_mcp_server/cloudwatch_alarms/models.py,sha256=vqctogiT-EjzA_VczWUYeskaF_aAOBQJR_s5KI7NkuI,7202
 awslabs/cloudwatch_mcp_server/cloudwatch_alarms/tools.py,sha256=PGEm8alzSAbrz-X-JaWARGPHKU1IBXDTmNP8R7PZPfc,30865
 awslabs/cloudwatch_mcp_server/cloudwatch_logs/models.py,sha256=wyfxHNN5E2K49LreqKBMAZ4Vyvc2MMkxMCfyGHsK-pQ,7982
-awslabs/cloudwatch_mcp_server/cloudwatch_logs/tools.py,sha256=ohaVlRsmXlg8yJOL1D-KEXPPuXfJ9mVSdj8YKc-xeBw,28163
+awslabs/cloudwatch_mcp_server/cloudwatch_logs/tools.py,sha256=b0tobrfTkyEzKkqof0wNR649PWfOIA0euGSwT4qvevM,30018
 awslabs/cloudwatch_mcp_server/cloudwatch_metrics/models.py,sha256=ov6aJUUrN2fz9Gom-tE4DT5h6M0PCkKwA9pEBnVv6SE,5756
 awslabs/cloudwatch_mcp_server/cloudwatch_metrics/tools.py,sha256=GoW0gLy35gW7MspbxtfNBghUgR8xWIa4tgcohqYE1h8,33410
 awslabs/cloudwatch_mcp_server/cloudwatch_metrics/data/metric_metadata.json,sha256=FlSUlfYVo1VdANrsBg50atggMNGSqZvhhZU7ca-v48c,745055
-awslabs_cloudwatch_mcp_server-0.0.10.dist-info/METADATA,sha256=kXSMICub-jPW9BkggBDo26IfkThHdvVK3thonk5eaSM,10115
-awslabs_cloudwatch_mcp_server-0.0.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-awslabs_cloudwatch_mcp_server-0.0.10.dist-info/entry_points.txt,sha256=u8YZn3_qq9Ai7nRux17K6K7RDssOBhTSyUNyZKrQUIk,92
-awslabs_cloudwatch_mcp_server-0.0.10.dist-info/licenses/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
-awslabs_cloudwatch_mcp_server-0.0.10.dist-info/licenses/NOTICE,sha256=xpvRUSHqG7LIpUZ1W_0D4sfPJG8lj51X6Mxjq1KJ6eQ,97
-awslabs_cloudwatch_mcp_server-0.0.10.dist-info/RECORD,,
+awslabs_cloudwatch_mcp_server-0.0.11.dist-info/METADATA,sha256=CGl6c-2NH9cfhuygysGBGvMKp-lCmmn45-b-6RoufJg,10115
+awslabs_cloudwatch_mcp_server-0.0.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+awslabs_cloudwatch_mcp_server-0.0.11.dist-info/entry_points.txt,sha256=u8YZn3_qq9Ai7nRux17K6K7RDssOBhTSyUNyZKrQUIk,92
+awslabs_cloudwatch_mcp_server-0.0.11.dist-info/licenses/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
+awslabs_cloudwatch_mcp_server-0.0.11.dist-info/licenses/NOTICE,sha256=xpvRUSHqG7LIpUZ1W_0D4sfPJG8lj51X6Mxjq1KJ6eQ,97
+awslabs_cloudwatch_mcp_server-0.0.11.dist-info/RECORD,,