Skip to content

Switchyard lets LLM applications route traffic across models and providers while preserving native OpenAI and Anthropic API compatibility - enabling flexible model selection, benchmarking, and cost/performance optimization.

Rust

fix(translation): validate nested tool result media (#755)

Alex Fournier4214331b370c
diff --git a/crates/switchyard-translation/src/util.rs b/crates/switchyard-translation/src/util.rs
index 3d57fcb17..5d3351c7c 100644
--- a/crates/switchyard-translation/src/util.rs
+++ b/crates/switchyard-translation/src/util.rs
@@ -250,11 +250,27 @@ fn messages_have_tools(messages: &[Message]) -> bool {
}
// Scans message content for a caller-provided block predicate.
-fn messages_have_block(messages: &[Message], predicate: impl FnMut(&ContentBlock) -> bool) -> bool {
+fn messages_have_block(
+ messages: &[Message],
+ mut predicate: impl FnMut(&ContentBlock) -> bool,
+) -> bool {
messages
.iter()
- .flat_map(|message| message.content.iter())
- .any(predicate)
+ .any(|message| content_has_block(&message.content, &mut predicate))
+}
+
+// Scans content recursively because tool results can contain media blocks.
+fn content_has_block(
+ content: &[ContentBlock],
+ predicate: &mut impl FnMut(&ContentBlock) -> bool,
+) -> bool {
+ content.iter().any(|block| {
+ predicate(block)
+ || match block {
+ ContentBlock::ToolResult(result) => content_has_block(&result.content, predicate),
+ _ => false,
+ }
+ })
}
/// Captures an exact source request body according to preservation policy.
diff --git a/crates/switchyard-translation/tests/request_translation.rs b/crates/switchyard-translation/tests/request_translation.rs
index 0927a7a15..06994f311 100644
--- a/crates/switchyard-translation/tests/request_translation.rs
+++ b/crates/switchyard-translation/tests/request_translation.rs
@@ -901,7 +901,7 @@ fn anthropic_parallel_multimodal_tool_results_preserve_order_and_policy() -> Tes
}
])
);
- let policy = TranslationPolicy {
+ let mut policy = TranslationPolicy {
lossy_conversion_policy: LossyConversionPolicy::Reject,
..TranslationPolicy::default()
};
@@ -917,6 +917,29 @@ fn anthropic_parallel_multimodal_tool_results_preserve_order_and_policy() -> Tes
};
assert_eq!(error.kind(), "LossyConversion");
+
+ // Capability checks must reach media nested inside tool results.
+ policy.lossy_conversion_policy = LossyConversionPolicy::AllowWithDiagnostics;
+ policy.target_capabilities.supports_images = Some(false);
+ policy.target_capabilities.supports_files = Some(false);
+ let output = engine.translate_request(
+ WireFormat::AnthropicMessages,
+ WireFormat::OpenAiResponses,
+ &body,
+ &policy,
+ )?;
+ assert_eq!(output.diagnostics.len(), 2);
+
+ policy.lossy_conversion_policy = LossyConversionPolicy::Reject;
+ let error = engine
+ .translate_request(
+ WireFormat::AnthropicMessages,
+ WireFormat::OpenAiResponses,
+ &body,
+ &policy,
+ )
+ .expect_err("nested media should be rejected by the target capability profile");
+ assert_eq!(error.kind(), "LossyConversion");
Ok(())
}