holmesgpt 0.13.2__py3-none-any.whl → 0.16.2a0__py3-none-any.whl

holmes/plugins/toolsets/__init__.py

@@ -7,7 +7,10 @@ import yaml  # type: ignore
 from pydantic import ValidationError
 
 import holmes.utils.env as env_utils
-from holmes.common.env_vars import USE_LEGACY_KUBERNETES_LOGS
+from holmes.common.env_vars import (
+    USE_LEGACY_KUBERNETES_LOGS,
+    DISABLE_PROMETHEUS_TOOLSET,
+)
 from holmes.core.supabase_dal import SupabaseDal
 from holmes.core.tools import Toolset, ToolsetType, ToolsetYamlFromConfig, YAMLToolset
 from holmes.plugins.toolsets.atlas_mongodb.mongodb_atlas import MongoDBAtlasToolset
@@ -31,22 +34,26 @@ from holmes.plugins.toolsets.datadog.toolset_datadog_general import (
 )
 from holmes.plugins.toolsets.git import GitToolset
 from holmes.plugins.toolsets.grafana.toolset_grafana import GrafanaToolset
-from holmes.plugins.toolsets.grafana.toolset_grafana_loki import GrafanaLokiToolset
+from holmes.plugins.toolsets.grafana.loki.toolset_grafana_loki import GrafanaLokiToolset
 from holmes.plugins.toolsets.grafana.toolset_grafana_tempo import GrafanaTempoToolset
 from holmes.plugins.toolsets.internet.internet import InternetToolset
 from holmes.plugins.toolsets.internet.notion import NotionToolset
 from holmes.plugins.toolsets.kafka import KafkaToolset
 from holmes.plugins.toolsets.kubernetes_logs import KubernetesLogsToolset
 from holmes.plugins.toolsets.mcp.toolset_mcp import RemoteMCPToolset
-from holmes.plugins.toolsets.newrelic import NewRelicToolset
+from holmes.plugins.toolsets.newrelic.newrelic import NewRelicToolset
 from holmes.plugins.toolsets.opensearch.opensearch import OpenSearchToolset
 from holmes.plugins.toolsets.opensearch.opensearch_logs import OpenSearchLogsToolset
+from holmes.plugins.toolsets.opensearch.opensearch_query_assist import (
+    OpenSearchQueryAssistToolset,
+)
 from holmes.plugins.toolsets.opensearch.opensearch_traces import OpenSearchTracesToolset
-from holmes.plugins.toolsets.prometheus.prometheus import PrometheusToolset
 from holmes.plugins.toolsets.rabbitmq.toolset_rabbitmq import RabbitMQToolset
 from holmes.plugins.toolsets.robusta.robusta import RobustaToolset
 from holmes.plugins.toolsets.runbook.runbook_fetcher import RunbookToolset
-from holmes.plugins.toolsets.servicenow.servicenow import ServiceNowToolset
+from holmes.plugins.toolsets.servicenow_tables.servicenow_tables import (
+    ServiceNowTablesToolset,
+)
 from holmes.plugins.toolsets.investigator.core_investigation import (
     CoreInvestigationToolset,
 )
@@ -89,18 +96,24 @@ def load_python_toolsets(dal: Optional[SupabaseDal]) -> List[Toolset]:
         DatadogMetricsToolset(),
         DatadogTracesToolset(),
         DatadogRDSToolset(),
-        PrometheusToolset(),
         OpenSearchLogsToolset(),
         OpenSearchTracesToolset(),
+        OpenSearchQueryAssistToolset(),
         CoralogixLogsToolset(),
         RabbitMQToolset(),
         GitToolset(),
         BashExecutorToolset(),
         MongoDBAtlasToolset(),
-        RunbookToolset(),
+        RunbookToolset(dal=dal),
         AzureSQLToolset(),
-        ServiceNowToolset(),
+        ServiceNowTablesToolset(),
     ]
+
+    if not DISABLE_PROMETHEUS_TOOLSET:
+        from holmes.plugins.toolsets.prometheus.prometheus import PrometheusToolset
+
+        toolsets.append(PrometheusToolset())
+
     if not USE_LEGACY_KUBERNETES_LOGS:
         toolsets.append(KubernetesLogsToolset())
 

holmes/plugins/toolsets/aks-node-health.yaml

@@ -7,17 +7,49 @@ toolsets:
       - command: "az account show"
       - command: "az aks --help"
       - command: "kubectl version --client"
+
+    # Note: Tools in this toolset use transformers with llm_summarize
+    # to automatically summarize large outputs from Azure CLI and kubectl commands
+    # when a fast model is configured, focusing on health issues and troubleshooting.
     tools:
       - name: "check_node_status"
         description: "Checks the status of all nodes in the AKS cluster."
         user_description: "get the status of all nodes in the AKS cluster"
         command: |
           kubectl get nodes
+        transformers:
+          - name: llm_summarize
+            config:
+              input_threshold: 800
+              prompt: |
+                Summarize this node status output focusing on:
+                - Any nodes that are NotReady or in error states
+                - Node health patterns and issues requiring attention
+                - Group healthy nodes together with aggregate counts
+                - Highlight nodes with concerning conditions or ages
+                - When possible, mention exact node names for follow-up investigation
+                - Be concise: aim for ≤ 50% of the original length; avoid repeating defaults/healthy/unchanged details
+                - Prefer aggregates and counts; list only outliers and actionable items
+                - Keep grep-friendly: include exact field names/values that matter
       - name: "describe_node"
         description: "Describes a specific node in the AKS cluster to inspect its conditions."
         user_description: "describe node {{ NODE_NAME }} in the AKS cluster"
         command: |
           kubectl describe node {{ NODE_NAME }}
+        transformers:
+          - name: llm_summarize
+            config:
+              input_threshold: 1200
+              prompt: |
+                Summarize this node description focusing on:
+                - Node conditions and health status (Ready, MemoryPressure, DiskPressure, etc.)
+                - Resource capacity vs allocatable vs current usage
+                - Any taints, labels, or annotations indicating issues
+                - Recent events that show problems or state changes
+                - System information relevant to troubleshooting
+                - When possible, highlight specific condition reasons for investigation
+                - Strive for ≤ 50% of the original size; keep results compact and grep-friendly (one line per aggregate)
+                - Prioritize aggregates and actionable outliers over comprehensive details
       - name: "get_node_events"
         description: "Fetches recent events for a specific node to surface warnings and errors."
         user_description: "get events for node {{ NODE_NAME }}"
@@ -33,6 +65,20 @@ toolsets:
         user_description: "review Azure Activity Log for resource group {{ RESOURCE_GROUP_NAME }}"
         command: |
           az monitor activity-log list --resource-group {{ RESOURCE_GROUP_NAME }}
+        transformers:
+          - name: llm_summarize
+            config:
+              input_threshold: 1500
+              prompt: |
+                Summarize this Azure Activity Log focusing on:
+                - Recent administrative actions or configuration changes
+                - Any failed operations or errors that could impact node health
+                - Resource scaling, updates, or maintenance activities
+                - Network security group, load balancer, or VM-related changes
+                - Group similar activities and highlight time patterns
+                - When possible, mention specific operation names and correlation IDs
+                - Be concise and avoid expansion: target ≤ 50% of input size; prefer counts + outliers over full listings
+                - Include grep-ready keys/values; avoid repeating entire objects or unchanged defaults
       - name: "check_top_resource_consuming_pods"
         description: "Checks for the top resource-consuming pods on a specific node."
         user_description: "get the top resource-consuming pods on node {{ NODE_NAME }}"

holmes/plugins/toolsets/aks.yaml

@@ -7,6 +7,10 @@ toolsets:
       - command: "az account show"
       - command: "az aks --help"
       - command: "kubectl version --client"
+
+    # Note: Tools in this toolset use transformers with llm_summarize
+    # to automatically summarize large JSON outputs from Azure CLI commands
+    # when a fast model is configured, focusing on key configuration and status information.
     tools:
       - name: "cloud_provider"
         description: "Fetches the cloud provider of the kubernetes cluster, determined by the providerID of the nodes"
@@ -18,16 +22,61 @@ toolsets:
         user_description: "get AKS cluster {{ CLUSTER_NAME }} under resource group {{ RESOURCE_GROUP_NAME }} in subscription {{ SUBSCRIPTION_ID }}"
         command: |
           az aks show --resource-group {{ RESOURCE_GROUP_NAME }} --name {{ CLUSTER_NAME }} --subscription {{ SUBSCRIPTION_ID }}
+        transformers:
+          - name: llm_summarize
+            config:
+              input_threshold: 1500
+              prompt: |
+                Summarize this AKS cluster configuration focusing on:
+                - Cluster status, health state, and version information
+                - Node pool configuration and scaling settings
+                - Network configuration (subnet, load balancer, network policy)
+                - Add-ons and features enabled (monitoring, auto-scaling, etc.)
+                - Security settings (RBAC, managed identity, private cluster)
+                - Any warnings or deprecated configurations
+                - When possible, highlight settings that might impact performance or security
+                - Be concise: aim for ≤ 50% of the original length; avoid repeating defaults/healthy/unchanged details
+                - Prefer aggregates and counts; list only outliers and actionable items
+                - Keep grep-friendly: include exact field names/values that matter
       - name: "aks_list_clusters_by_rg"
         description: "Lists all AKS clusters under a specific resource group. Only run this tool when you need to get all clusters in a resource group, rather than a specific one."
         user_description: "list AKS clusters in resource group {{ RESOURCE_GROUP_NAME }} under subscription {{ SUBSCRIPTION_ID }}"
         command: |
           az aks list --resource-group {{ RESOURCE_GROUP_NAME }} --subscription {{ SUBSCRIPTION_ID }}
+        transformers:
+          - name: llm_summarize
+            config:
+              input_threshold: 1000
+              prompt: |
+                Summarize this AKS clusters list focusing on:
+                - Cluster names, locations, and current status
+                - Kubernetes versions and any version skew issues
+                - Node pool counts and VM SKUs
+                - Key configuration differences between clusters
+                - Any clusters in error or unusual states
+                - When possible, group clusters by similar configurations
+                - Be concise and avoid expansion: target ≤ 50% of input size; prefer counts + outliers over full listings
+                - Include grep-ready keys/values; avoid repeating entire objects or unchanged defaults
       - name: "aks_list_node_pools"
         description: "Lists node pools in an AKS cluster"
         user_description: "list node pools for AKS cluster {{ CLUSTER_NAME }} under resource group {{ RESOURCE_GROUP_NAME }}"
         command: |
           az aks nodepool list --resource-group {{ RESOURCE_GROUP_NAME }} --cluster-name {{ CLUSTER_NAME }} --subscription {{ SUBSCRIPTION_ID }}
+        transformers:
+          - name: llm_summarize
+            config:
+              input_threshold: 1200
+              prompt: |
+                Summarize this AKS node pools list focusing on:
+                - Node pool names, VM sizes, and current node counts
+                - Scaling configuration (min/max nodes, auto-scaling enabled)
+                - Node pool status and provisioning state
+                - OS types, Kubernetes versions, and any upgrade patterns
+                - Taints, labels, and specialized configurations
+                - Any node pools in error states or with scaling issues
+                - When possible, identify resource allocation patterns
+                - Strive for ≤ 50% of the original size; keep results compact and grep-friendly (one line per aggregate)
+                - Prioritize aggregates and actionable outliers over comprehensive details
       - name: "aks_show_node_pool"
         description: "Shows details of a specific node pool in an AKS cluster"
         user_description: "get node pool {{ NODE_POOL_NAME }} in AKS cluster {{ CLUSTER_NAME }} under resource group {{ RESOURCE_GROUP_NAME }}"
@@ -84,3 +133,18 @@ toolsets:
         user_description: "list NSG rules for NSG {{ NSG_NAME }} in resource group {{ RESOURCE_GROUP_NAME }} under subscription {{ SUBSCRIPTION_ID }}"
         command: |
             az network nsg rule list --resource-group {{ RESOURCE_GROUP_NAME }} --nsg-name {{ NSG_NAME }} --subscription {{ SUBSCRIPTION_ID }} --include-default -o table
+        transformers:
+          - name: llm_summarize
+            config:
+              input_threshold: 1000
+              prompt: |
+                Summarize these NSG rules focusing on:
+                - Allow vs deny rules and their priority order
+                - Inbound vs outbound traffic rules
+                - Port ranges and protocols affected
+                - Source and destination configurations
+                - Any overly permissive or potentially insecure rules
+                - Default rules vs custom rules
+                - When possible, highlight rules that might impact AKS connectivity
+                - Be concise: aim for ≤ 50% of the original text; prioritize aggregates and actionable outliers
+                - Include grep-ready keys/values; avoid repeating entire rules or unchanged defaults

holmes/plugins/toolsets/atlas_mongodb/mongodb_atlas.py

@@ -4,13 +4,14 @@ from typing import Any, Dict, Tuple, List
 from holmes.core.tools import (
     CallablePrerequisite,
     Tool,
+    ToolInvokeContext,
     ToolParameter,
     Toolset,
     ToolsetTag,
 )
 
 from pydantic import BaseModel, PrivateAttr
-from holmes.core.tools import StructuredToolResult, ToolResultStatus
+from holmes.core.tools import StructuredToolResult, StructuredToolResultStatus
 from requests.auth import HTTPDigestAuth  # type: ignore
 import gzip
 import io
@@ -41,7 +42,6 @@ class MongoDBAtlasToolset(Toolset):
     def __init__(self):
         super().__init__(
             prerequisites=[CallablePrerequisite(callable=self.prerequisites_callable)],
-            experimental=True,
             tools=[
                 ReturnProjectAlerts(toolset=self),
                 ReturnProjectProcesses(toolset=self),
@@ -66,8 +66,8 @@ class MongoDBAtlasToolset(Toolset):
                 {"Accept": "application/vnd.atlas.2025-03-12+json"}
             )
             self._session.auth = HTTPDigestAuth(
-                self.config.get("public_key"),
-                self.config.get("private_key"),
+                self.config.get("public_key"),  # type: ignore
+                self.config.get("private_key"),  # type: ignore
             )
             return True, ""
         except Exception:
@@ -90,15 +90,15 @@ class MongoDBAtlasBaseTool(Tool):
         if response.ok:
             res = response.json()
             return StructuredToolResult(
-                status=ToolResultStatus.SUCCESS
+                status=StructuredToolResultStatus.SUCCESS
                 if res.get(field, [])
-                else ToolResultStatus.NO_DATA,
+                else StructuredToolResultStatus.NO_DATA,
                 data=res,
                 params=params,
             )
         else:
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=f"Failed {self.name}.\n{response.text}",
                 return_code=response.status_code,
                 params=params,
@@ -118,9 +118,7 @@ class ReturnProjectAlerts(MongoDBAtlasBaseTool):
         project_id = self.toolset.config.get("project_id", "")
         return f"{toolset_name_for_one_liner(self.toolset.name)}: Get Project Alerts ({project_id})"
 
-    def _invoke(
-        self, params: dict, user_approved: bool = False
-    ) -> StructuredToolResult:
+    def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
         try:
             url = "https://cloud.mongodb.com/api/atlas/v2/groups/{project_id}/alerts".format(
                 project_id=self.toolset.config.get("project_id")
@@ -130,7 +128,7 @@ class ReturnProjectAlerts(MongoDBAtlasBaseTool):
         except Exception as e:
             logging.exception(self.get_parameterized_one_liner(params))
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 data=f"Exception {self.name}: {str(e)}",
                 params=params,
             )
@@ -145,9 +143,7 @@ class ReturnProjectProcesses(MongoDBAtlasBaseTool):
         project_id = self.toolset.config.get("project_id", "")
         return f"{toolset_name_for_one_liner(self.toolset.name)}: Get Project Processes ({project_id})"
 
-    def _invoke(
-        self, params: dict, user_approved: bool = False
-    ) -> StructuredToolResult:
+    def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
         try:
             url = "https://cloud.mongodb.com/api/atlas/v2/groups/{project_id}/processes".format(
                 project_id=self.toolset.config.get("project_id")
@@ -157,7 +153,7 @@ class ReturnProjectProcesses(MongoDBAtlasBaseTool):
         except Exception as e:
             logging.exception(self.get_parameterized_one_liner(params))
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=f"Exception {self.name}: {str(e)}",
                 params=params,
             )
@@ -180,9 +176,7 @@ class ReturnProjectSlowQueries(MongoDBAtlasBaseTool):
         process_id = params.get("process_id", "")
         return f"{toolset_name_for_one_liner(self.toolset.name)}: Get Slow Queries ({process_id})"
 
-    def _invoke(
-        self, params: dict, user_approved: bool = False
-    ) -> StructuredToolResult:
+    def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
         try:
             url = self.url.format(
                 project_id=self.toolset.config.get("project_id"),
@@ -193,7 +187,7 @@ class ReturnProjectSlowQueries(MongoDBAtlasBaseTool):
         except Exception as e:
             logging.exception(self.get_parameterized_one_liner(params))
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=f"Exception {self.name}: {str(e)}",
                 params=params,
             )
@@ -209,9 +203,7 @@ class ReturnEventsFromProject(MongoDBAtlasBaseTool):
         project_id = self.toolset.config.get("project_id", "")
         return f"{toolset_name_for_one_liner(self.toolset.name)}: Get Project Events ({project_id})"
 
-    def _invoke(
-        self, params: dict, user_approved: bool = False
-    ) -> StructuredToolResult:
+    def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
         params.update({"itemsPerPage": 500})
         try:
             now_utc = datetime.now(timezone.utc)
@@ -230,14 +222,14 @@ class ReturnEventsFromProject(MongoDBAtlasBaseTool):
                 )
                 data = f"last 4 hours eventTypeName and # of occurrences list: {events_counter} \n to get more information about a given eventTypeName call atlas_return_events_type_from_project"
                 status = (
-                    ToolResultStatus.SUCCESS
+                    StructuredToolResultStatus.SUCCESS
                     if events_counter
-                    else ToolResultStatus.NO_DATA
+                    else StructuredToolResultStatus.NO_DATA
                 )
                 return StructuredToolResult(status=status, data=data, params=params)
             else:
                 return StructuredToolResult(
-                    status=ToolResultStatus.ERROR,
+                    status=StructuredToolResultStatus.ERROR,
                     error=f"Failed {self.name}. \n{response.text}",
                     return_code=response.status_code,
                     params=params,
@@ -245,7 +237,7 @@ class ReturnEventsFromProject(MongoDBAtlasBaseTool):
         except Exception as e:
             logging.exception(self.get_parameterized_one_liner(params))
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=f"Exception {self.name}: {str(e)}",
                 params=params,
             )
@@ -268,9 +260,7 @@ class ReturnLogsForProcessInProject(MongoDBAtlasBaseTool):
         hostname = params.get("hostName", "")
         return f"{toolset_name_for_one_liner(self.toolset.name)}: Get Host Logs ({hostname})"
 
-    def _invoke(
-        self, params: dict, user_approved: bool = False
-    ) -> StructuredToolResult:
+    def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
         one_hour_ago = datetime.now(timezone.utc) - timedelta(hours=1)
         try:
             url = self.url.format(
@@ -287,11 +277,13 @@ class ReturnLogsForProcessInProject(MongoDBAtlasBaseTool):
                 with gzip.GzipFile(fileobj=io.BytesIO(response.content)) as gz:
                     text_data = gz.read().decode("utf-8")
                 return StructuredToolResult(
-                    status=ToolResultStatus.SUCCESS, data=text_data, params=params
+                    status=StructuredToolResultStatus.SUCCESS,
+                    data=text_data,
+                    params=params,
                 )
             else:
                 return StructuredToolResult(
-                    status=ToolResultStatus.ERROR,
+                    status=StructuredToolResultStatus.ERROR,
                     error=f"Failed {self.name}. \n{response.text}",
                     return_code=response.status_code,
                     params=params,
@@ -299,7 +291,7 @@ class ReturnLogsForProcessInProject(MongoDBAtlasBaseTool):
         except Exception as e:
             logging.exception(self.get_parameterized_one_liner(params))
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=f"Exception {self.name}: {str(e)}",
                 params=params,
             )
@@ -322,9 +314,7 @@ class ReturnEventTypeFromProject(MongoDBAtlasBaseTool):
         event_type = params.get("eventType", "")
         return f"{toolset_name_for_one_liner(self.toolset.name)}: Get Event Details ({event_type})"
 
-    def _invoke(
-        self, params: dict, user_approved: bool = False
-    ) -> StructuredToolResult:
+    def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
         try:
             url = self.url.format(projectId=self.toolset.config.get("project_id"))
 
@@ -340,7 +330,7 @@ class ReturnEventTypeFromProject(MongoDBAtlasBaseTool):
         except Exception as e:
             logging.exception(self.get_parameterized_one_liner(params))
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=f"Exception {self.name}: {str(e)}",
                 params=params,
             )

holmes/plugins/toolsets/azure_sql/azure_sql_toolset.py

@@ -60,7 +60,6 @@ class AzureSQLToolset(BaseAzureSQLToolset):
             docs_url="https://kagi.com/proxy/png-clipart-microsoft-sql-server-microsoft-azure-sql-database-microsoft-text-logo-thumbnail.png?c=4Sg1bvcUGOrhnDzXgoBBa0G0j27ykgskX4a8cLrZp_quzqlpVGVG02OqQtezTxy7lB6ydmTKgbVAn_F7BxofxK6LKKUZSpjJ1huIAsXPVaXyakO4sWXFiX0Wz_8WjkA0AIlO_oFfW31AKaj5RcvGcr3siy0n5kW-GcqdpeBWsmm_huxUT6RycULFCDFBwuUzHvVl5TW3cYqlMxT8ecPZfg%3D%3D",
             icon_url="https://upload.wikimedia.org/wikipedia/commons/thumb/f/f7/Azure_SQL_Database_logo.svg/1200px-Azure_SQL_Database_logo.svg.png",
             tags=[ToolsetTag.CORE],
-            experimental=True,
             tools=[
                 AnalyzeDatabaseHealthStatus(self),
                 AnalyzeDatabasePerformance(self),

holmes/plugins/toolsets/azure_sql/tools/analyze_connection_failures.py

@@ -2,7 +2,12 @@ import logging
 from typing import Dict, Tuple
 from datetime import datetime, timezone
 
-from holmes.core.tools import StructuredToolResult, ToolParameter, ToolResultStatus
+from holmes.core.tools import (
+    StructuredToolResult,
+    ToolInvokeContext,
+    ToolParameter,
+    StructuredToolResultStatus,
+)
 from holmes.plugins.toolsets.azure_sql.azure_base_toolset import (
     BaseAzureSQLTool,
     BaseAzureSQLToolset,
@@ -213,9 +218,7 @@ class AnalyzeConnectionFailures(BaseAzureSQLTool):
 
         return "\n".join(report_sections)
 
-    def _invoke(
-        self, params: dict, user_approved: bool = False
-    ) -> StructuredToolResult:
+    def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
         try:
             # Get configuration
             db_config = self.toolset.database_config()
@@ -242,7 +245,7 @@ class AnalyzeConnectionFailures(BaseAzureSQLTool):
             # Check for errors
             if "error" in analysis_data:
                 return StructuredToolResult(
-                    status=ToolResultStatus.ERROR,
+                    status=StructuredToolResultStatus.ERROR,
                     error=analysis_data["error"],
                     params=params,
                 )
@@ -253,7 +256,7 @@ class AnalyzeConnectionFailures(BaseAzureSQLTool):
             )
 
             return StructuredToolResult(
-                status=ToolResultStatus.SUCCESS,
+                status=StructuredToolResultStatus.SUCCESS,
                 data=report_text,
                 params=params,
             )
@@ -263,7 +266,7 @@ class AnalyzeConnectionFailures(BaseAzureSQLTool):
                 f"Error in analyze_connection_failures: {str(e)}", exc_info=True
             )
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=f"Failed to analyze connection failures: {str(e)}",
                 params=params,
             )

holmes/plugins/toolsets/azure_sql/tools/analyze_database_connections.py

@@ -2,7 +2,12 @@ import logging
 from typing import Any, Dict, Tuple
 from datetime import datetime, timezone
 
-from holmes.core.tools import StructuredToolResult, ToolParameter, ToolResultStatus
+from holmes.core.tools import (
+    StructuredToolResult,
+    ToolInvokeContext,
+    ToolParameter,
+    StructuredToolResultStatus,
+)
 from holmes.plugins.toolsets.azure_sql.azure_base_toolset import (
     BaseAzureSQLTool,
     BaseAzureSQLToolset,
@@ -151,9 +156,7 @@ class AnalyzeDatabaseConnections(BaseAzureSQLTool):
 
         return "\n".join(report_sections)
 
-    def _invoke(
-        self, params: dict, user_approved: bool = False
-    ) -> StructuredToolResult:
+    def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
         try:
             hours_back = params.get("hours_back", 2)
 
@@ -200,7 +203,7 @@ class AnalyzeDatabaseConnections(BaseAzureSQLTool):
             )
 
             return StructuredToolResult(
-                status=ToolResultStatus.SUCCESS,
+                status=StructuredToolResultStatus.SUCCESS,
                 data=report_text,
                 params=params,
             )
@@ -208,7 +211,7 @@ class AnalyzeDatabaseConnections(BaseAzureSQLTool):
             error_msg = f"Failed to generate connection report: {str(e)}"
             logging.error(error_msg)
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=error_msg,
                 params=params,
             )

holmes/plugins/toolsets/azure_sql/tools/analyze_database_health_status.py

@@ -2,7 +2,11 @@ import logging
 from typing import Dict
 from datetime import datetime, timezone
 
-from holmes.core.tools import StructuredToolResult, ToolResultStatus
+from holmes.core.tools import (
+    StructuredToolResult,
+    StructuredToolResultStatus,
+    ToolInvokeContext,
+)
 from holmes.plugins.toolsets.azure_sql.azure_base_toolset import (
     BaseAzureSQLTool,
     BaseAzureSQLToolset,
@@ -131,9 +135,7 @@ class AnalyzeDatabaseHealthStatus(BaseAzureSQLTool):
 
         return "\n".join(report_sections)
 
-    def _invoke(
-        self, params: dict, user_approved: bool = False
-    ) -> StructuredToolResult:
+    def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
         try:
             db_config = self.toolset.database_config()
             client = self.toolset.api_client()
@@ -145,7 +147,7 @@ class AnalyzeDatabaseHealthStatus(BaseAzureSQLTool):
             report_text = self._build_health_report(health_data, db_config)
 
             return StructuredToolResult(
-                status=ToolResultStatus.SUCCESS,
+                status=StructuredToolResultStatus.SUCCESS,
                 data=report_text,
                 params=params,
             )
@@ -153,7 +155,7 @@ class AnalyzeDatabaseHealthStatus(BaseAzureSQLTool):
             error_msg = f"Failed to generate health report: {str(e)}"
             logging.error(error_msg)
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=error_msg,
                 params=params,
             )

holmes/plugins/toolsets/azure_sql/tools/analyze_database_performance.py

@@ -2,7 +2,11 @@ import logging
 from typing import Any, Dict, List, Tuple, cast
 from datetime import datetime, timezone
 
-from holmes.core.tools import StructuredToolResult, ToolResultStatus
+from holmes.core.tools import (
+    StructuredToolResult,
+    StructuredToolResultStatus,
+    ToolInvokeContext,
+)
 from holmes.plugins.toolsets.azure_sql.azure_base_toolset import (
     BaseAzureSQLTool,
     BaseAzureSQLToolset,
@@ -192,9 +196,7 @@ class AnalyzeDatabasePerformance(BaseAzureSQLTool):
 
         return "\n".join(report_sections)
 
-    def _invoke(
-        self, params: dict, user_approved: bool = False
-    ) -> StructuredToolResult:
+    def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
         try:
             db_config = self.toolset.database_config()
             client = self.toolset.api_client()
@@ -206,7 +208,7 @@ class AnalyzeDatabasePerformance(BaseAzureSQLTool):
             report_text = self._build_performance_report(performance_data, db_config)
 
             return StructuredToolResult(
-                status=ToolResultStatus.SUCCESS,
+                status=StructuredToolResultStatus.SUCCESS,
                 data=report_text,
                 params=params,
             )
@@ -214,7 +216,7 @@ class AnalyzeDatabasePerformance(BaseAzureSQLTool):
             error_msg = f"Failed to generate performance report: {str(e)}"
             logging.error(error_msg)
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=error_msg,
                 params=params,
             )

holmes/plugins/toolsets/azure_sql/tools/analyze_database_storage.py

@@ -2,7 +2,12 @@ import logging
 from typing import Any, Dict, Tuple
 from datetime import datetime, timezone
 
-from holmes.core.tools import StructuredToolResult, ToolParameter, ToolResultStatus
+from holmes.core.tools import (
+    StructuredToolResult,
+    ToolInvokeContext,
+    ToolParameter,
+    StructuredToolResultStatus,
+)
 from holmes.plugins.toolsets.azure_sql.azure_base_toolset import (
     BaseAzureSQLTool,
     BaseAzureSQLToolset,
@@ -249,9 +254,7 @@ class AnalyzeDatabaseStorage(BaseAzureSQLTool):
 
         return "\n".join(report_sections)
 
-    def _invoke(
-        self, params: dict, user_approved: bool = False
-    ) -> StructuredToolResult:
+    def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
         try:
             hours_back = params.get("hours_back", 24)
             top_tables = params.get("top_tables", 20)
@@ -307,7 +310,7 @@ class AnalyzeDatabaseStorage(BaseAzureSQLTool):
             )
 
             return StructuredToolResult(
-                status=ToolResultStatus.SUCCESS,
+                status=StructuredToolResultStatus.SUCCESS,
                 data=report_text,
                 params=params,
             )
@@ -315,7 +318,7 @@ class AnalyzeDatabaseStorage(BaseAzureSQLTool):
             error_msg = f"Failed to generate storage report: {str(e)}"
             logging.error(error_msg)
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=error_msg,
                 params=params,
             )