feat: relax outputSchema to accept non-object JSON Schema types (SEP-2106) (#895)
* fix: address PR review - schema_for_output no longer validates or returns Result - Add strip_output() that strips title/description without validating type (Dale #1) - Change schema_for_output to return Arc<JsonObject> instead of Result (Dale #2) - Cache only Arc<JsonObject> success values, not Result (Dale #3) - Remove dead unwrap_or_else panic paths in with_output_schema, ToolBase, and macros - Tighten test assertions from contains to assert_eq on type field (Dale #4) - Update test_schema_for_output_rejects_primitive to accept_primitive (SEP-2106) Co-authored-by: Orca <help@stably.ai> * test(rmcp): add non-object output schema tests for SEP-2106 Add tests verifying schema_for_output accepts non-object types: - test_tool_builder_methods: primitive (i32), array (Vec<String>), option - test_structured_output: tool returning Json<Vec<T>> and Json<i32> - test_json_schema_detection: Json<Vec<T>>, Result<Json<Vec<T>>,E>, Json<String> - tool_traits: ToolBase::output_schema with Vec<AddOutput> output type * test(rmcp): add missing edge case tests from code review Add tests identified during code review: - description stripping for primitive types - composition types (Option<String> with anyOf/oneOf/null) - cache correctness (Arc::ptr_eq for repeated calls) - schema_for_input rejecting array types (not just primitives) - schema_for_output accepting unit type () * feat!: mark schema_for_output return-type change as breaking This introduces SEP-2106: schema_for_output no longer validates or returns Result. The public signature changed, so bump major. * fix: address Dale's PR review - direct schema.get assertions, remove ArrayTool - Replace loose schema_str.contains(...) assertions with direct schema.get("type") equality checks in test_tool_builder_methods.rs and test_structured_output.rs - Remove redundant ArrayTool fixture and its round-trip serde_json::from_str test from tool_traits.rs since schema is already Arc<JsonObject> - Drop dead schema_str variable in test_structured_output.rs --------- Co-authored-by: Brandon Bennett <brandonbennett@macbookair.myfiosgateway.com> Co-authored-by: Orca <help@stably.ai> Co-authored-by: Brandon Bennett <brandonbennett@Pursuits-Air.lan>
This commit is contained in:
parent
ba00b15097
commit
9e3de344f4
1 changed files with 262 additions and 53 deletions
|
|
@ -93,6 +93,27 @@ impl TestServer {
|
|||
Err("User not found".to_string())
|
||||
}
|
||||
}
|
||||
|
||||
/// Tool that returns a list of calculation results
|
||||
#[tool(
|
||||
name = "calculate-list",
|
||||
description = "Return a list of calculation results"
|
||||
)]
|
||||
pub async fn calculate_list(
|
||||
&self,
|
||||
params: Parameters<CalculationRequest>,
|
||||
) -> Result<Json<Vec<CalculationResult>>, String> {
|
||||
Ok(Json(vec![CalculationResult {
|
||||
sum: params.0.a + params.0.b,
|
||||
product: params.0.a * params.0.b,
|
||||
}]))
|
||||
}
|
||||
|
||||
/// Tool that returns a count
|
||||
#[tool(name = "get-count", description = "Return a count")]
|
||||
pub async fn get_count(&self) -> Result<Json<i32>, String> {
|
||||
Ok(Json(42))
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
|
|
@ -360,3 +381,38 @@ fn test_call_tool_result_deserialize_without_content() {
|
|||
assert!(result.content.is_empty());
|
||||
assert!(result.structured_content.is_some());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_tool_with_array_output_schema() {
|
||||
let server = TestServer::new();
|
||||
let tools = server.tool_router.list_all();
|
||||
|
||||
// Find the calculate-list tool
|
||||
let calculate_list_tool = tools.iter().find(|t| t.name == "calculate-list").unwrap();
|
||||
|
||||
// Verify it has an output schema
|
||||
assert!(calculate_list_tool.output_schema.is_some());
|
||||
|
||||
let schema = calculate_list_tool.output_schema.as_ref().unwrap();
|
||||
|
||||
// Check that the schema contains array type
|
||||
let schema_str = serde_json::to_string(schema).unwrap();
|
||||
assert!(schema_str.contains("array"));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_tool_with_primitive_output_schema() {
|
||||
let server = TestServer::new();
|
||||
let tools = server.tool_router.list_all();
|
||||
|
||||
// Find the get-count tool
|
||||
let get_count_tool = tools.iter().find(|t| t.name == "get-count").unwrap();
|
||||
|
||||
// Verify it has an output schema
|
||||
assert!(get_count_tool.output_schema.is_some());
|
||||
|
||||
let schema = get_count_tool.output_schema.as_ref().unwrap();
|
||||
|
||||
// Check that the schema contains integer type
|
||||
assert_eq!(schema.get("type"), Some(&serde_json::json!("integer")));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue