vrr/goose
2
0
Fork 0
mirror of https://github.com/block/goose.git synced 2026-07-09 16:09:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

fix(databricks): always use OpenAI-compatible "parameters" for tools (#10101)

Browse source
This commit is contained in:
Kyle E DeFreitas 2026-07-01 15:56:54 -04:00 • committed by GitHub
parent 2d47d1feea
commit 44869db2d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

52
crates/goose/src/providers/formats/databricks.rs
View file

@ -303,12 +303,10 @@ fn apply_claude_thinking_config(
}
}
pub fn format_tools(tools: &[Tool], model_name: &str) -> anyhow::Result<Vec<Value>> {
pub fn format_tools(tools: &[Tool], _model_name: &str) -> anyhow::Result<Vec<Value>> {
let mut tool_names = std::collections::HashSet::new();
let mut result = Vec::new();
let is_gemini = model_name.contains("gemini");
for tool in tools {
if !tool_names.insert(&tool.name) {
return Err(anyhow!("Duplicate tool name: {}", tool.name));
@ -320,25 +318,17 @@ pub fn format_tools(tools: &[Tool], model_name: &str) -> anyhow::Result<Vec<Valu
.and_then(|v| v.as_object())
.is_some_and(|p| !p.is_empty());
let function_def = if is_gemini {
let mut def = json!({
"name": tool.name,
"description": tool.description,
});
if has_properties {
def["parametersJsonSchema"] = json!(tool.input_schema);
}
def
} else {
let mut def = json!({
"name": tool.name,
"description": tool.description,
});
if has_properties {
def["parameters"] = json!(tool.input_schema);
}
def
};
// Databricks serving endpoints (including Gemini-backed ones) use the
// OpenAI-compatible chat format, so tools always use "parameters" — not
// the Google-native "parametersJsonSchema" field.
let mut def = json!({
"name": tool.name,
"description": tool.description,
});
if has_properties {
def["parameters"] = json!(tool.input_schema);
}
let function_def = def;
result.push(json!({
"type": "function",
@ -801,19 +791,17 @@ mod tests {
"http://json-schema.org/draft-07/schema#"
);
// Databricks Gemini endpoints use OpenAI-compatible format, so tools use
// "parameters" (not "parametersJsonSchema") regardless of model family.
let spec = format_tools(std::slice::from_ref(&tool), "gemini-2-5-flash")?;
assert!(spec[0]["function"].get("parametersJsonSchema").is_some());
assert_eq!(
spec[0]["function"]["parametersJsonSchema"]["type"],
"object"
);
assert!(spec[0]["function"].get("parametersJsonSchema").is_none());
assert!(spec[0]["function"].get("parameters").is_some());
assert_eq!(spec[0]["function"]["parameters"]["type"], "object");
let spec = format_tools(&[tool], "databricks-gemini-3-pro")?;
assert!(spec[0]["function"].get("parametersJsonSchema").is_some());
assert_eq!(
spec[0]["function"]["parametersJsonSchema"]["type"],
"object"
);
assert!(spec[0]["function"].get("parametersJsonSchema").is_none());
assert!(spec[0]["function"].get("parameters").is_some());
assert_eq!(spec[0]["function"]["parameters"]["type"], "object");
Ok(())
}