holmesgpt 0.13.2__py3-none-any.whl → 0.18.4__py3-none-any.whl

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

@@ -1,17 +1,22 @@
 import logging
-from typing import Any, Dict, Tuple
 from datetime import datetime, timezone
+from typing import Any, Dict, Tuple
 
-from holmes.core.tools import StructuredToolResult, ToolParameter, ToolResultStatus
-from holmes.plugins.toolsets.azure_sql.azure_base_toolset import (
-    BaseAzureSQLTool,
-    BaseAzureSQLToolset,
-    AzureSQLDatabaseConfig,
+from holmes.core.tools import (
+    StructuredToolResult,
+    StructuredToolResultStatus,
+    ToolInvokeContext,
+    ToolParameter,
 )
+from holmes.plugins.toolsets.azure_sql.apis.azure_sql_api import AzureSQLAPIClient
 from holmes.plugins.toolsets.azure_sql.apis.storage_analysis_api import (
     StorageAnalysisAPI,
 )
-from holmes.plugins.toolsets.azure_sql.apis.azure_sql_api import AzureSQLAPIClient
+from holmes.plugins.toolsets.azure_sql.azure_base_toolset import (
+    AzureSQLDatabaseConfig,
+    BaseAzureSQLTool,
+    BaseAzureSQLToolset,
+)
 from holmes.plugins.toolsets.utils import toolset_name_for_one_liner
 
 
@@ -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,
             )

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

@@ -1,19 +1,21 @@
 import logging
-from typing import Dict
 from datetime import datetime, timezone
+from typing import Dict, Tuple
 
-from holmes.core.tools import StructuredToolResult, ToolResultStatus
-from holmes.plugins.toolsets.azure_sql.azure_base_toolset import (
-    BaseAzureSQLTool,
-    BaseAzureSQLToolset,
-    AzureSQLDatabaseConfig,
+from holmes.core.tools import (
+    StructuredToolResult,
+    StructuredToolResultStatus,
+    ToolInvokeContext,
 )
-from holmes.plugins.toolsets.azure_sql.apis.azure_sql_api import AzureSQLAPIClient
 from holmes.plugins.toolsets.azure_sql.apis.alert_monitoring_api import (
     AlertMonitoringAPI,
 )
-from typing import Tuple
-
+from holmes.plugins.toolsets.azure_sql.apis.azure_sql_api import AzureSQLAPIClient
+from holmes.plugins.toolsets.azure_sql.azure_base_toolset import (
+    AzureSQLDatabaseConfig,
+    BaseAzureSQLTool,
+    BaseAzureSQLToolset,
+)
 from holmes.plugins.toolsets.utils import toolset_name_for_one_liner
 
 
@@ -147,9 +149,7 @@ class GetActiveAlerts(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()
             api_client = self.toolset.api_client()
@@ -170,7 +170,7 @@ class GetActiveAlerts(BaseAzureSQLTool):
             # Check for errors
             if "error" in alerts_data:
                 return StructuredToolResult(
-                    status=ToolResultStatus.ERROR,
+                    status=StructuredToolResultStatus.ERROR,
                     error=alerts_data["error"],
                     params=params,
                 )
@@ -179,7 +179,7 @@ class GetActiveAlerts(BaseAzureSQLTool):
             report_text = self._build_alerts_report(db_config, alerts_data, "active")
 
             return StructuredToolResult(
-                status=ToolResultStatus.SUCCESS,
+                status=StructuredToolResultStatus.SUCCESS,
                 data=report_text,
                 params=params,
             )
@@ -187,7 +187,7 @@ class GetActiveAlerts(BaseAzureSQLTool):
             error_msg = f"Failed to retrieve active alerts: {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/get_slow_queries.py

@@ -1,13 +1,18 @@
 import logging
 from typing import Dict, List, Tuple
 
-from holmes.core.tools import StructuredToolResult, ToolParameter, ToolResultStatus
+from holmes.core.tools import (
+    StructuredToolResult,
+    StructuredToolResultStatus,
+    ToolInvokeContext,
+    ToolParameter,
+)
+from holmes.plugins.toolsets.azure_sql.apis.azure_sql_api import AzureSQLAPIClient
 from holmes.plugins.toolsets.azure_sql.azure_base_toolset import (
+    AzureSQLDatabaseConfig,
     BaseAzureSQLTool,
     BaseAzureSQLToolset,
-    AzureSQLDatabaseConfig,
 )
-from holmes.plugins.toolsets.azure_sql.apis.azure_sql_api import AzureSQLAPIClient
 from holmes.plugins.toolsets.azure_sql.utils import format_timing
 from holmes.plugins.toolsets.utils import toolset_name_for_one_liner
 
@@ -99,9 +104,7 @@ class GetSlowQueries(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:
             top_count = params.get("top_count", 15)
             hours_back = params.get("hours_back", 2)
@@ -125,7 +128,7 @@ class GetSlowQueries(BaseAzureSQLTool):
             )
 
             return StructuredToolResult(
-                status=ToolResultStatus.SUCCESS,
+                status=StructuredToolResultStatus.SUCCESS,
                 data=report_text,
                 params=params,
             )
@@ -133,7 +136,7 @@ class GetSlowQueries(BaseAzureSQLTool):
             error_msg = f"Failed to get slow queries: {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/get_top_cpu_queries.py

@@ -1,13 +1,18 @@
 import logging
 from typing import Dict, List, Tuple
 
-from holmes.core.tools import StructuredToolResult, ToolParameter, ToolResultStatus
+from holmes.core.tools import (
+    StructuredToolResult,
+    StructuredToolResultStatus,
+    ToolInvokeContext,
+    ToolParameter,
+)
+from holmes.plugins.toolsets.azure_sql.apis.azure_sql_api import AzureSQLAPIClient
 from holmes.plugins.toolsets.azure_sql.azure_base_toolset import (
+    AzureSQLDatabaseConfig,
     BaseAzureSQLTool,
     BaseAzureSQLToolset,
-    AzureSQLDatabaseConfig,
 )
-from holmes.plugins.toolsets.azure_sql.apis.azure_sql_api import AzureSQLAPIClient
 from holmes.plugins.toolsets.azure_sql.utils import format_timing
 from holmes.plugins.toolsets.utils import toolset_name_for_one_liner
 
@@ -97,9 +102,7 @@ class GetTopCPUQueries(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:
             top_count = params.get("top_count", 15)
             hours_back = params.get("hours_back", 2)
@@ -123,7 +126,7 @@ class GetTopCPUQueries(BaseAzureSQLTool):
             )
 
             return StructuredToolResult(
-                status=ToolResultStatus.SUCCESS,
+                status=StructuredToolResultStatus.SUCCESS,
                 data=report_text,
                 params=params,
             )
@@ -131,7 +134,7 @@ class GetTopCPUQueries(BaseAzureSQLTool):
             error_msg = f"Failed to get top CPU queries: {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/get_top_data_io_queries.py

@@ -1,13 +1,18 @@
 import logging
 from typing import Dict, List, Tuple
 
-from holmes.core.tools import StructuredToolResult, ToolParameter, ToolResultStatus
+from holmes.core.tools import (
+    StructuredToolResult,
+    StructuredToolResultStatus,
+    ToolInvokeContext,
+    ToolParameter,
+)
+from holmes.plugins.toolsets.azure_sql.apis.azure_sql_api import AzureSQLAPIClient
 from holmes.plugins.toolsets.azure_sql.azure_base_toolset import (
+    AzureSQLDatabaseConfig,
     BaseAzureSQLTool,
     BaseAzureSQLToolset,
-    AzureSQLDatabaseConfig,
 )
-from holmes.plugins.toolsets.azure_sql.apis.azure_sql_api import AzureSQLAPIClient
 from holmes.plugins.toolsets.azure_sql.utils import format_timing
 from holmes.plugins.toolsets.utils import toolset_name_for_one_liner
 
@@ -115,9 +120,7 @@ class GetTopDataIOQueries(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:
             top_count = params.get("top_count", 15)
             hours_back = params.get("hours_back", 2)
@@ -141,7 +144,7 @@ class GetTopDataIOQueries(BaseAzureSQLTool):
             )
 
             return StructuredToolResult(
-                status=ToolResultStatus.SUCCESS,
+                status=StructuredToolResultStatus.SUCCESS,
                 data=report_text,
                 params=params,
             )
@@ -149,7 +152,7 @@ class GetTopDataIOQueries(BaseAzureSQLTool):
             error_msg = f"Failed to get top data I/O queries: {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/get_top_log_io_queries.py

@@ -1,13 +1,18 @@
 import logging
 from typing import Dict, List, Tuple
 
-from holmes.core.tools import StructuredToolResult, ToolParameter, ToolResultStatus
+from holmes.core.tools import (
+    StructuredToolResult,
+    StructuredToolResultStatus,
+    ToolInvokeContext,
+    ToolParameter,
+)
+from holmes.plugins.toolsets.azure_sql.apis.azure_sql_api import AzureSQLAPIClient
 from holmes.plugins.toolsets.azure_sql.azure_base_toolset import (
+    AzureSQLDatabaseConfig,
     BaseAzureSQLTool,
     BaseAzureSQLToolset,
-    AzureSQLDatabaseConfig,
 )
-from holmes.plugins.toolsets.azure_sql.apis.azure_sql_api import AzureSQLAPIClient
 from holmes.plugins.toolsets.azure_sql.utils import format_timing
 from holmes.plugins.toolsets.utils import toolset_name_for_one_liner
 
@@ -107,9 +112,7 @@ class GetTopLogIOQueries(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:
             top_count = params.get("top_count", 15)
             hours_back = params.get("hours_back", 2)
@@ -133,7 +136,7 @@ class GetTopLogIOQueries(BaseAzureSQLTool):
             )
 
             return StructuredToolResult(
-                status=ToolResultStatus.SUCCESS,
+                status=StructuredToolResultStatus.SUCCESS,
                 data=report_text,
                 params=params,
             )
@@ -141,7 +144,7 @@ class GetTopLogIOQueries(BaseAzureSQLTool):
             error_msg = f"Failed to get top log I/O queries: {str(e)}"
             logging.error(error_msg)
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=error_msg,
                 params=params,
             )

holmes/plugins/toolsets/azure_sql/utils.py

@@ -20,38 +20,6 @@ def format_timing(microseconds: float) -> str:
         return f"{microseconds:.0f} μs"
 
 
-def format_size_bytes(bytes_value: float) -> str:
-    """Format byte values with appropriate units.
-
-    Args:
-        bytes_value: Size value in bytes
-
-    Returns:
-        Formatted string with appropriate units (GB, MB, KB, or B)
-    """
-    if bytes_value >= 1_073_741_824:  # >= 1 GB
-        return f"{bytes_value / 1_073_741_824:.2f} GB"
-    elif bytes_value >= 1_048_576:  # >= 1 MB
-        return f"{bytes_value / 1_048_576:.2f} MB"
-    elif bytes_value >= 1_024:  # >= 1 KB
-        return f"{bytes_value / 1_024:.2f} KB"
-    else:  # < 1 KB
-        return f"{bytes_value:.0f} B"
-
-
-def format_percentage(value: float, decimal_places: int = 2) -> str:
-    """Format percentage values.
-
-    Args:
-        value: Percentage value (0-100)
-        decimal_places: Number of decimal places to show
-
-    Returns:
-        Formatted percentage string
-    """
-    return f"{value:.{decimal_places}f}%"
-
-
 def safe_divide(numerator: float, denominator: float, default: float = 0.0) -> float:
     """Safely divide two numbers, handling division by zero.
 

holmes/plugins/toolsets/bash/argocd/__init__.py

@@ -1,13 +1,13 @@
 import argparse
 from typing import Any, Optional
 
-from holmes.plugins.toolsets.bash.common.bash_command import BashCommand
-from holmes.plugins.toolsets.bash.common.config import BashExecutorConfig
-from holmes.plugins.toolsets.bash.common.stringify import escape_shell_args
 from holmes.plugins.toolsets.bash.argocd.constants import (
     ALLOWED_ARGOCD_COMMANDS,
     DENIED_ARGOCD_COMMANDS,
 )
+from holmes.plugins.toolsets.bash.common.bash_command import BashCommand
+from holmes.plugins.toolsets.bash.common.config import BashExecutorConfig
+from holmes.plugins.toolsets.bash.common.stringify import escape_shell_args
 from holmes.plugins.toolsets.bash.common.validators import (
     validate_command_and_operations,
 )

holmes/plugins/toolsets/bash/aws/__init__.py

@@ -1,16 +1,16 @@
 import argparse
 from typing import Any, Optional
 
+from holmes.plugins.toolsets.bash.aws.constants import (
+    ALLOWED_AWS_COMMANDS,
+    DENIED_AWS_COMMANDS,
+)
 from holmes.plugins.toolsets.bash.common.bash_command import BashCommand
 from holmes.plugins.toolsets.bash.common.config import BashExecutorConfig
 from holmes.plugins.toolsets.bash.common.stringify import escape_shell_args
 from holmes.plugins.toolsets.bash.common.validators import (
     validate_command_and_operations,
 )
-from holmes.plugins.toolsets.bash.aws.constants import (
-    ALLOWED_AWS_COMMANDS,
-    DENIED_AWS_COMMANDS,
-)
 
 
 class AWSCommand(BashCommand):

holmes/plugins/toolsets/bash/azure/__init__.py

@@ -1,16 +1,16 @@
 import argparse
 from typing import Any, Optional
 
+from holmes.plugins.toolsets.bash.azure.constants import (
+    ALLOWED_AZURE_COMMANDS,
+    DENIED_AZURE_COMMANDS,
+)
 from holmes.plugins.toolsets.bash.common.bash_command import BashCommand
 from holmes.plugins.toolsets.bash.common.config import BashExecutorConfig
 from holmes.plugins.toolsets.bash.common.stringify import escape_shell_args
 from holmes.plugins.toolsets.bash.common.validators import (
     validate_command_and_operations,
 )
-from holmes.plugins.toolsets.bash.azure.constants import (
-    ALLOWED_AZURE_COMMANDS,
-    DENIED_AZURE_COMMANDS,
-)
 
 
 class AzureCommand(BashCommand):

holmes/plugins/toolsets/bash/bash_toolset.py

@@ -4,20 +4,20 @@ import os
 import random
 import re
 import string
-from typing import Dict, Any, Optional
+from typing import Any, Dict, Optional
 
 import sentry_sdk
 
-
 from holmes.common.env_vars import (
     BASH_TOOL_UNSAFE_ALLOW_ALL,
 )
 from holmes.core.tools import (
     CallablePrerequisite,
     StructuredToolResult,
+    StructuredToolResultStatus,
     Tool,
+    ToolInvokeContext,
     ToolParameter,
-    ToolResultStatus,
     Toolset,
     ToolsetTag,
 )
@@ -82,9 +82,7 @@ class KubectlRunImageCommand(BaseBashTool):
         command_str = get_param_or_raise(params, "command")
         return f"kubectl run {pod_name} --image={image} --namespace={namespace} --rm --attach --restart=Never -i -- {command_str}"
 
-    def _invoke(
-        self, params: dict, user_approved: bool = False
-    ) -> StructuredToolResult:
+    def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
         timeout = params.get("timeout", 60)
 
         image = get_param_or_raise(params, "image")
@@ -94,7 +92,7 @@ class KubectlRunImageCommand(BaseBashTool):
 
         if namespace and not re.match(SAFE_NAMESPACE_PATTERN, namespace):
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=f"Error: The namespace is invalid. Valid namespaces must match the following regexp: {SAFE_NAMESPACE_PATTERN}",
                 params=params,
             )
@@ -118,7 +116,7 @@ class KubectlRunImageCommand(BaseBashTool):
                 }
             )
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=str(e),
                 params=params,
             )
@@ -164,22 +162,20 @@ class RunBashCommand(BaseBashTool):
             toolset=toolset,
         )
 
-    def _invoke(
-        self, params: dict, user_approved: bool = False
-    ) -> StructuredToolResult:
+    def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
         command_str = params.get("command")
         timeout = params.get("timeout", 60)
 
         if not command_str:
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error="The 'command' parameter is required and was not provided.",
                 params=params,
             )
 
         if not isinstance(command_str, str):
             return StructuredToolResult(
-                status=ToolResultStatus.ERROR,
+                status=StructuredToolResultStatus.ERROR,
                 error=f"The 'command' parameter must be a string, got {type(command_str).__name__}.",
                 params=params,
             )
@@ -187,7 +183,7 @@ class RunBashCommand(BaseBashTool):
         command_to_execute = command_str
 
         # Only run the safety check if user has NOT approved the command
-        if not user_approved:
+        if not context.user_approved:
             try:
                 command_to_execute = make_command_safe(command_str, self.toolset.config)
 
@@ -202,7 +198,7 @@ class RunBashCommand(BaseBashTool):
                     logging.info(f"Refusing LLM tool call {command_str}")
 
                     return StructuredToolResult(
-                        status=ToolResultStatus.APPROVAL_REQUIRED,
+                        status=StructuredToolResultStatus.APPROVAL_REQUIRED,
                         error=f"Refusing to execute bash command. {str(e)}",
                         params=params,
                         invocation=command_str,

holmes/plugins/toolsets/bash/common/bash.py

@@ -1,11 +1,14 @@
 import subprocess
-from holmes.core.tools import StructuredToolResult, ToolResultStatus
+
+from holmes.core.tools import StructuredToolResult, StructuredToolResultStatus
+from holmes.utils.memory_limit import check_oom_and_append_hint, get_ulimit_prefix
 
 
 def execute_bash_command(cmd: str, timeout: int, params: dict) -> StructuredToolResult:
     try:
+        protected_cmd = get_ulimit_prefix() + cmd
         process = subprocess.run(
-            cmd,
+            protected_cmd,
             shell=True,
             executable="/bin/bash",
             stdout=subprocess.PIPE,
@@ -16,16 +19,23 @@ def execute_bash_command(cmd: str, timeout: int, params: dict) -> StructuredTool
         )
 
         stdout = process.stdout.strip() if process.stdout else ""
-        result_data = f"{cmd}\n" f"{stdout}"
+        stdout = check_oom_and_append_hint(stdout, process.returncode)
+        result_data = f"{cmd}\n{stdout}"
 
-        status = ToolResultStatus.ERROR
-        if process.returncode == 0 and stdout:
-            status = ToolResultStatus.SUCCESS
-        elif not stdout:
-            status = ToolResultStatus.NO_DATA
+        if process.returncode == 0:
+            status = (
+                StructuredToolResultStatus.SUCCESS
+                if stdout
+                else StructuredToolResultStatus.NO_DATA
+            )
+            error = None
+        else:
+            status = StructuredToolResultStatus.ERROR
+            error = f'Error: Command "{cmd}" returned non-zero exit status {process.returncode}'
 
         return StructuredToolResult(
             status=status,
+            error=error,
             data=result_data,
             params=params,
             invocation=cmd,
@@ -33,20 +43,20 @@ def execute_bash_command(cmd: str, timeout: int, params: dict) -> StructuredTool
         )
     except subprocess.TimeoutExpired:
         return StructuredToolResult(
-            status=ToolResultStatus.ERROR,
+            status=StructuredToolResultStatus.ERROR,
             error=f"Error: Command '{cmd}' timed out after {timeout} seconds.",
             params=params,
         )
     except FileNotFoundError:
-        # This might occur if /bin/bash is not found, or if shell=False and command is not found
+        # This might occur if /bin/bash is not found, or command is not found
         return StructuredToolResult(
-            status=ToolResultStatus.ERROR,
-            error="Error: Bash executable or command not found. Ensure bash is installed and the command is valid.",
+            status=StructuredToolResultStatus.ERROR,
+            error="Error: Bash executable or command not found.",
             params=params,
         )
     except Exception as e:
         return StructuredToolResult(
-            status=ToolResultStatus.ERROR,
+            status=StructuredToolResultStatus.ERROR,
             error=f"Error executing command '{cmd}': {str(e)}",
             params=params,
         )

holmes/plugins/toolsets/bash/common/bash_command.py

@@ -1,5 +1,5 @@
-from abc import ABC, abstractmethod
 import argparse
+from abc import ABC, abstractmethod
 from typing import Any, Optional
 
 from holmes.plugins.toolsets.bash.common.config import BashExecutorConfig

holmes/plugins/toolsets/bash/common/stringify.py

@@ -1,5 +1,5 @@
-import shlex
 import re
+import shlex
 
 SAFE_SHELL_CHARS = frozenset(".-_=/,:")
 

holmes/plugins/toolsets/bash/kubectl/__init__.py

@@ -1,4 +1,5 @@
 from typing import Any, Optional
+
 from holmes.plugins.toolsets.bash.common.bash_command import BashCommand
 from holmes.plugins.toolsets.bash.common.config import BashExecutorConfig
 from holmes.plugins.toolsets.bash.kubectl.constants import (
@@ -9,9 +10,9 @@ from holmes.plugins.toolsets.bash.kubectl.constants import (
 )
 from holmes.plugins.toolsets.bash.kubectl.kubectl_describe import KubectlDescribeCommand
 from holmes.plugins.toolsets.bash.kubectl.kubectl_events import KubectlEventsCommand
+from holmes.plugins.toolsets.bash.kubectl.kubectl_get import KubectlGetCommand
 from holmes.plugins.toolsets.bash.kubectl.kubectl_logs import KubectlLogsCommand
 from holmes.plugins.toolsets.bash.kubectl.kubectl_top import KubectlTopCommand
-from holmes.plugins.toolsets.bash.kubectl.kubectl_get import KubectlGetCommand
 
 
 class KubectlCommand(BashCommand):

holmes/plugins/toolsets/bash/kubectl/constants.py

@@ -1,6 +1,5 @@
 import re
 
-
 SAFE_NAME_PATTERN = re.compile(r"^[a-zA-Z0-9][a-zA-Z0-9\-_.]*$")
 SAFE_NAMESPACE_PATTERN = re.compile(r"^[a-z0-9][a-z0-9\-]*$")
 SAFE_SELECTOR_PATTERN = re.compile(r"^[a-zA-Z0-9\-_.=,!()]+$")

holmes/plugins/toolsets/bash/kubectl/kubectl_get.py

@@ -1,6 +1,8 @@
+import argparse
 from typing import Any, Optional
 
-import argparse
+from holmes.plugins.toolsets.bash.common.bash_command import BashCommand
+from holmes.plugins.toolsets.bash.common.config import BashExecutorConfig
 from holmes.plugins.toolsets.bash.common.stringify import escape_shell_args
 from holmes.plugins.toolsets.bash.common.validators import (
     whitelist_validator,
@@ -9,9 +11,6 @@ from holmes.plugins.toolsets.bash.kubectl.constants import (
     VALID_RESOURCE_TYPES,
 )
 
-from holmes.plugins.toolsets.bash.common.bash_command import BashCommand
-from holmes.plugins.toolsets.bash.common.config import BashExecutorConfig
-
 
 class KubectlGetCommand(BashCommand):
     def __init__(self):