feat: propagate external_model_message upwards on errors (#1297)

block · Feb 19, 2025 · a59119b · a59119b
1 parent 537e1dc
commit a59119b
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/crates/goose/src/providers/databricks.rs b/crates/goose/src/providers/databricks.rs
@@ -181,7 +181,16 @@ impl DatabricksProvider {
 
                 let mut error_msg = "Unknown error".to_string();
                 if let Some(payload) = &payload {
-                    error_msg = payload.get("message").and_then(|m| m.as_str()).unwrap_or("Unknown error").to_string();
+                    // try to convert message to string, if that fails use external_model_message
+                    error_msg = payload
+                        .get("message")
+                        .and_then(|m| m.as_str())
+                        .or_else(|| {
+                            payload.get("external_model_message")
+                                .and_then(|ext| ext.get("message"))
+                                .and_then(|m| m.as_str())
+                        })
+                        .unwrap_or("Unknown error").to_string();
                 }
 
                 tracing::debug!(