fix: Improve the use_aws tool specification (#668)

Author: brandonskiser

crates/q_cli/src/cli/chat/tools/mod.rs

@@ -185,6 +185,11 @@ pub fn serde_value_to_document(value: serde_json::Value) -> Document {
     }
 }
 
+#[allow(dead_code)]
+fn path_expand(_ctx: &Context, _path: impl AsRef<Path>) -> PathBuf {
+    PathBuf::new()
+}
+
 /// Converts `path` to a relative path according to the current working directory `cwd`.
 fn absolute_to_relative(cwd: impl AsRef<Path>, path: impl AsRef<Path>) -> Result<PathBuf> {
     let cwd = cwd.as_ref().canonicalize()?;

crates/q_cli/src/cli/chat/tools/tool_index.json

@@ -75,7 +75,7 @@
   },
   {
     "name": "use_aws",
-    "description": "Make an AWS api call with the specified service, operation, and parameters. You may not create resources or perform any write or mutating actions. You may only use this tool to call read operations with names that start with: get, describe, list, search, batch_get.",
+    "description": "Make an AWS CLI api call with the specified service, operation, and parameters. The arguments MUST conform to the AWS CLI specification. You may not create resources or perform any write or mutating actions. You may only use this tool to call read operations with names that start with: get, describe, list, search, batch_get.",
     "input_schema": {
       "type": "object",
       "properties": {
@@ -85,11 +85,11 @@
         },
         "operation_name": {
           "type": "string",
-          "description": "The name of the operation to perform. All of the operation name will be in kebab case. If incorrect operations are encountered, try different variation (e.g. if list-buckets is not correct, try ls)"
+          "description": "The name of the operation to perform."
         },
         "parameters": {
           "type": "object",
-          "description": "The parameters for the operation."
+          "description": "The parameters for the operation. Each parameter must be encoded as a string."
         },
         "region": {
           "type": "string",
@@ -108,7 +108,6 @@
         "region",
         "service_name",
         "operation_name",
-        "parameters",
         "label"
       ]
     }

crates/q_cli/src/cli/chat/tools/use_aws.rs

@@ -40,7 +40,7 @@ impl std::fmt::Display for AwsToolError {
 pub struct UseAws {
     pub service_name: String,
     pub operation_name: String,
-    pub parameters: HashMap<String, String>,
+    pub parameters: Option<HashMap<String, String>>,
     pub region: String,
     pub profile_name: Option<String>,
     pub label: Option<String>,
@@ -64,11 +64,13 @@ impl UseAws {
             command.arg("--profile").arg(profile_name);
         }
         command.arg(&self.service_name).arg(&self.operation_name);
-        for (param_name, val) in &self.parameters {
-            if param_name.starts_with("--") {
-                command.arg(param_name).arg(val);
-            } else {
-                command.arg(format!("--{}", param_name)).arg(val);
+        if let Some(parameters) = &self.parameters {
+            for (param_name, val) in parameters {
+                if param_name.starts_with("--") {
+                    command.arg(param_name).arg(val);
+                } else {
+                    command.arg(format!("--{}", param_name)).arg(val);
+                }
             }
         }
         let output = command
@@ -104,8 +106,10 @@ impl UseAws {
             style::Print(format!("Operation name: {}\n", self.operation_name)),
             style::Print("Parameters: \n".to_string()),
         )?;
-        for (name, value) in &self.parameters {
-            queue!(updates, style::Print(format!("{}: {}\n", name, value)))?;
+        if let Some(parameters) = &self.parameters {
+            for (name, value) in parameters {
+                queue!(updates, style::Print(format!("{}: {}\n", name, value)))?;
+            }
         }
 
         if let Some(ref profile_name) = self.profile_name {