modelcontextprotocol/rust-sdk
Watch
1
0
Fork
You've already forked rust-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(rmcp): allow both content and structured content (#359)

Browse source 
Co-authored-by: Michael Neale <michael.neale@gmail.com>
This commit is contained in:
Alex Hancock 2025-08-07 11:19:46 -04:00 • committed by GitHub
commit 2ee6106fc3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/rmcp/src/model.rs
View file

@ -1181,8 +1181,6 @@ pub type RootsListChangedNotification = NotificationNoParam<RootsListChangedNoti
///
/// Contains the content returned by the tool execution and an optional
/// flag indicating whether the operation resulted in an error.
///
/// Note: `content` and `structured_content` are mutually exclusive - exactly one must be provided.
#[derive(Debug, Serialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
@ -1262,10 +1260,9 @@ impl CallToolResult {
}
}
/// Validate that content and structured_content are mutually exclusive
/// Validate that content or structured content is provided
pub fn validate(&self) -> Result<(), &'static str> {
match (&self.content, &self.structured_content) {
(Some(_), Some(_)) => Err("content and structured_content are mutually exclusive"),
(None, None) => Err("either content or structured_content must be provided"),
_ => Ok(()),
}