expand the config and custom toolset path

Author: mainred

src/aks-preview/azext_aks_preview/_consts.py

@@ -373,3 +373,9 @@
 CONST_K8S_EXTENSION_NAME = "k8s-extension"
 CONST_K8S_EXTENSION_ACTION_MOD_NAME = "azext_k8s_extension.action"
 CONST_K8S_EXTENSION_FORMAT_MOD_NAME = "azext_k8s_extension._format"
+
+# aks agent constants
+CONST_AGENT_CONFIG_PATH_DIR_ENV_KEY = "CONFIG_PATH_DIR"
+CONST_AGENT_NAME = "AKS AGENT"
+CONST_AGENT_NAME_ENV_KEY = "AGENT_NAME"
+CONST_AGENT_CONFIG_FILE_NAME = "aksAgent.config"

src/aks-preview/azext_aks_preview/_params.py

@@ -2842,7 +2842,7 @@ def load_arguments(self, _):
             action="store_true",
         )
         c.argument(
-            "custom-toolsets",
+            "custom_toolsets",
             help="File path to a custom toolsets.",
             validator=validate_agent_custom_toolsets,
             required=False,

src/aks-preview/azext_aks_preview/_validators.py

@@ -13,6 +13,7 @@
 from math import isclose, isnan
 
 from azure.cli.core import keys
+from azure.cli.core.api import get_config_dir
 from azure.cli.core.azclierror import (
     ArgumentUsageError,
     InvalidArgumentValueError,
@@ -36,6 +37,7 @@
     CONST_NETWORK_POD_IP_ALLOCATION_MODE_STATIC_BLOCK,
     CONST_NODEPOOL_MODE_GATEWAY,
     CONST_AZURE_SERVICE_MESH_MAX_EGRESS_NAME_LENGTH,
+    CONST_AGENT_CONFIG_FILE_NAME,
 )
 from azext_aks_preview._helpers import _fuzzy_match
 from knack.log import get_logger
@@ -979,6 +981,7 @@ def validate_location_resource_group_cluster_parameters(namespace):
             "Cannot specify --location and --resource-group and --cluster at the same time."
         )
 
+
 def _validate_param_yaml_file(yaml_path, param_name):
     if not yaml_path:
         return
@@ -1007,6 +1010,9 @@ def validate_agent_config_file(namespace):
     config_file = namespace.config_file
     if not config_file:
         return
+    default_config_path = os.path.join(get_config_dir(), CONST_AGENT_CONFIG_FILE_NAME)
+    if config_file == default_config_path and not os.path.exists(config_file):
+        return
 
     _validate_param_yaml_file(config_file, "config-file")
 
@@ -1016,4 +1022,3 @@ def validate_agent_custom_toolsets(namespace):
     if not custom_toolsets:
         return
     _validate_param_yaml_file(custom_toolsets, "custom-toolsets")
-

src/aks-preview/azext_aks_preview/agent/agent.py

@@ -10,6 +10,12 @@
 import uuid
 from pathlib import Path
 
+from azext_aks_preview._consts import (
+    CONST_AGENT_CONFIG_FILE_NAME,
+    CONST_AGENT_CONFIG_PATH_DIR_ENV_KEY,
+    CONST_AGENT_NAME,
+    CONST_AGENT_NAME_ENV_KEY,
+)
 from azure.cli.core.api import get_config_dir
 from azure.cli.core.commands.client_factory import get_subscription_id
 from knack.util import CLIError
@@ -87,9 +93,9 @@ def aks_agent(
 
     console = init_log()
 
-    os.environ["CONFIG_PATH_DIR"] = get_config_dir()
+    os.environ[CONST_AGENT_CONFIG_PATH_DIR_ENV_KEY] = get_config_dir()
     # Holmes library allows the user to specify the agent name through environment variable before loading the library.
-    os.environ["AGENT_NAME"] = "AKS AGENT"
+    os.environ[CONST_AGENT_NAME_ENV_KEY] = CONST_AGENT_NAME
 
     from holmes.config import Config
     from holmes.core.prompt import build_initial_ask_messages
@@ -109,15 +115,19 @@ def aks_agent(
             )
             interactive = False
 
-    config_file = Path(config_file)
+    expanded_config_file = Path(os.path.expanduser(config_file))
+    expanded_custom_toolsets_list = (
+        [Path(os.path.expanduser(custom_toolsets))]
+        if custom_toolsets is not None
+        else None
+    )
+
     config = Config.load_from_file(
-        config_file,
+        expanded_config_file,
         model=model,
         api_key=api_key,
         max_steps=max_steps,
-        custom_toolsets_from_cli=(
-            [custom_toolsets] if custom_toolsets is not None else None
-        ),
+        custom_toolsets_from_cli=expanded_custom_toolsets_list,
     )
 
     ai = config.create_console_toolcalling_llm(