Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DOsinga merged 1 commit into from
Jul 1, 2026
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 20 additions & 32 deletions crates/goose/src/providers/formats/databricks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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",
Expand Down Expand Up @@ -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(())
}
Expand Down
Loading