Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@ rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", branch = "mai
Basic dependencies:
- [tokio required](https://github.com/tokio-rs/tokio)
- [serde required](https://github.com/serde-rs/serde)

Json Schema generation(Must follow the 2020-12 version):
- [shemars required](https://github.com/GREsau/schemars)

CopilotAINov 18, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo in "shemars" - should be "schemars".

Suggested change
-[shemars required](https://github.com/GREsau/schemars)
-[schemars required](https://github.com/GREsau/schemars)

Copilot uses AI. Check for mistakes.


### Build a Client
Expand Down
2 changes: 1 addition & 1 deletion crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ schemars = ["dep:schemars"]

[dev-dependencies]
tokio = { version = "1", features = ["full"] }
schemars = { version = "1.0", features = ["chrono04"] }
schemars = { version = "1.1.0", features = ["chrono04"] }

CopilotAINov 18, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dev-dependency for schemars is being updated to version 1.1.0, but the main dependency at line 32 remains at version 1.0. This creates a version mismatch that could lead to compilation issues or unexpected behavior. Since draft2020_12() requires schemars 1.1.0+, the main dependency should also be updated to match.

Consider updating the main dependency to:

schemars = { version = "1.1.0", optional = true, features = ["chrono04"] }

Copilot uses AI. Check for mistakes.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jokemanfire Looks like something to look at if we need the bump across the board?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trace it in #182 , there should still be some work to be done here, and we may introduce some broken change.


anyhow = "1.0"
tracing-subscriber = { version = "0.3", features = [
Expand Down
5 changes: 2 additions & 3 deletions crates/rmcp/src/handler/server/common.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,8 @@ use crate::{
/// A shortcut for generating a JSON schema for a type.
pub fn schema_for_type<T: JsonSchema>() -> JsonObject {
// explicitly to align json schema version to official specifications.
// https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/schema/2025-03-26/schema.json
// TODO: update to 2020-12 waiting for the mcp spec update
let mut settings = SchemaSettings::draft07();
// refer to https://github.com/modelcontextprotocol/modelcontextprotocol/pull/655 for details.
let mut settings = SchemaSettings::draft2020_12();
settings.transforms = vec![Box::new(schemars::transform::AddNullable::default())];
let generator = settings.into_generator();
let schema = generator.into_root_schema_for::<T>();
Expand Down
68 changes: 52 additions & 16 deletions crates/rmcp/tests/test_complex_schema.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,24 +43,60 @@ impl Demo {
}
}

fn expected_schema() -> serde_json::Value {
serde_json::json!({
"$defs": {
"ChatMessage": {
"properties": {
"content": {
"type": "string"
},
"role": {
"$ref": "#/$defs/ChatRole"
}
},
"required": [
"role",
"content"
],
"type": "object"
},
"ChatRole": {
"enum": [
"System",
"User",
"Assistant",
"Tool"
],
"type": "string"
}
},
"$schema": "https://json-schema.org/draft/2020-12/schema",
"properties": {
"messages": {
"items": {
"$ref": "#/$defs/ChatMessage"
},
"type": "array"
},
"system": {
"nullable": true,
"type": "string"
}
},
"required": [
"messages"
],
"title": "ChatRequest",
"type": "object"
})
}

#[test]
fn test_complex_schema() {
let attr = Demo::chat_tool_attr();
let input_schema = attr.input_schema;
let enum_number = input_schema
.get("definitions")
.unwrap()
.as_object()
.unwrap()
.get("ChatRole")
.unwrap()
.as_object()
.unwrap()
.get("enum")
.unwrap()
.as_array()
.unwrap()
.len();
assert_eq!(enum_number, 4);
println!("{}", serde_json::to_string_pretty(&input_schema).unwrap());
let expected = expected_schema();
let produced = serde_json::Value::Object(input_schema.as_ref().clone());
assert_eq!(produced, expected, "schema mismatch");
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(shemars): use JSON Schema 2020-12 as Default Dialect by jokemanfire · Pull Request #549 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@ rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", branch = "mai
Basic dependencies:
- [tokio required](https://github.com/tokio-rs/tokio)
- [serde required](https://github.com/serde-rs/serde)

Json Schema generation(Must follow the 2020-12 version):
- [shemars required](https://github.com/GREsau/schemars)

CopilotAINov 18, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo in "shemars" - should be "schemars".

Suggested change
-[shemars required](https://github.com/GREsau/schemars)
-[schemars required](https://github.com/GREsau/schemars)

Copilot uses AI. Check for mistakes.


### Build a Client
Expand Down
2 changes: 1 addition & 1 deletion crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ schemars = ["dep:schemars"]

[dev-dependencies]
tokio = { version = "1", features = ["full"] }
schemars = { version = "1.0", features = ["chrono04"] }
schemars = { version = "1.1.0", features = ["chrono04"] }

CopilotAINov 18, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dev-dependency for schemars is being updated to version 1.1.0, but the main dependency at line 32 remains at version 1.0. This creates a version mismatch that could lead to compilation issues or unexpected behavior. Since draft2020_12() requires schemars 1.1.0+, the main dependency should also be updated to match.

Consider updating the main dependency to:

schemars = { version = "1.1.0", optional = true, features = ["chrono04"] }

Copilot uses AI. Check for mistakes.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jokemanfire Looks like something to look at if we need the bump across the board?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trace it in #182 , there should still be some work to be done here, and we may introduce some broken change.


anyhow = "1.0"
tracing-subscriber = { version = "0.3", features = [
Expand Down
5 changes: 2 additions & 3 deletions crates/rmcp/src/handler/server/common.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,8 @@ use crate::{
/// A shortcut for generating a JSON schema for a type.
pub fn schema_for_type<T: JsonSchema>() -> JsonObject {
// explicitly to align json schema version to official specifications.
// https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/schema/2025-03-26/schema.json
// TODO: update to 2020-12 waiting for the mcp spec update
let mut settings = SchemaSettings::draft07();
// refer to https://github.com/modelcontextprotocol/modelcontextprotocol/pull/655 for details.
let mut settings = SchemaSettings::draft2020_12();
settings.transforms = vec![Box::new(schemars::transform::AddNullable::default())];
let generator = settings.into_generator();
let schema = generator.into_root_schema_for::<T>();
Expand Down
68 changes: 52 additions & 16 deletions crates/rmcp/tests/test_complex_schema.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,24 +43,60 @@ impl Demo {
}
}

fn expected_schema() -> serde_json::Value {
serde_json::json!({
"$defs": {
"ChatMessage": {
"properties": {
"content": {
"type": "string"
},
"role": {
"$ref": "#/$defs/ChatRole"
}
},
"required": [
"role",
"content"
],
"type": "object"
},
"ChatRole": {
"enum": [
"System",
"User",
"Assistant",
"Tool"
],
"type": "string"
}
},
"$schema": "https://json-schema.org/draft/2020-12/schema",
"properties": {
"messages": {
"items": {
"$ref": "#/$defs/ChatMessage"
},
"type": "array"
},
"system": {
"nullable": true,
"type": "string"
}
},
"required": [
"messages"
],
"title": "ChatRequest",
"type": "object"
})
}

#[test]
fn test_complex_schema() {
let attr = Demo::chat_tool_attr();
let input_schema = attr.input_schema;
let enum_number = input_schema
.get("definitions")
.unwrap()
.as_object()
.unwrap()
.get("ChatRole")
.unwrap()
.as_object()
.unwrap()
.get("enum")
.unwrap()
.as_array()
.unwrap()
.len();
assert_eq!(enum_number, 4);
println!("{}", serde_json::to_string_pretty(&input_schema).unwrap());
let expected = expected_schema();
let produced = serde_json::Value::Object(input_schema.as_ref().clone());
assert_eq!(produced, expected, "schema mismatch");
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(shemars): use JSON Schema 2020-12 as Default Dialect by jokemanfire · Pull Request #549 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@ rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", branch = "mai
Basic dependencies:
- [tokio required](https://github.com/tokio-rs/tokio)
- [serde required](https://github.com/serde-rs/serde)

Json Schema generation(Must follow the 2020-12 version):
- [shemars required](https://github.com/GREsau/schemars)

CopilotAINov 18, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo in "shemars" - should be "schemars".

Suggested change
-[shemars required](https://github.com/GREsau/schemars)
-[schemars required](https://github.com/GREsau/schemars)

Copilot uses AI. Check for mistakes.


### Build a Client
Expand Down
2 changes: 1 addition & 1 deletion crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ schemars = ["dep:schemars"]

[dev-dependencies]
tokio = { version = "1", features = ["full"] }
schemars = { version = "1.0", features = ["chrono04"] }
schemars = { version = "1.1.0", features = ["chrono04"] }

CopilotAINov 18, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dev-dependency for schemars is being updated to version 1.1.0, but the main dependency at line 32 remains at version 1.0. This creates a version mismatch that could lead to compilation issues or unexpected behavior. Since draft2020_12() requires schemars 1.1.0+, the main dependency should also be updated to match.

Consider updating the main dependency to:

schemars = { version = "1.1.0", optional = true, features = ["chrono04"] }

Copilot uses AI. Check for mistakes.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jokemanfire Looks like something to look at if we need the bump across the board?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trace it in #182 , there should still be some work to be done here, and we may introduce some broken change.


anyhow = "1.0"
tracing-subscriber = { version = "0.3", features = [
Expand Down
5 changes: 2 additions & 3 deletions crates/rmcp/src/handler/server/common.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,8 @@ use crate::{
/// A shortcut for generating a JSON schema for a type.
pub fn schema_for_type<T: JsonSchema>() -> JsonObject {
// explicitly to align json schema version to official specifications.
// https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/schema/2025-03-26/schema.json
// TODO: update to 2020-12 waiting for the mcp spec update
let mut settings = SchemaSettings::draft07();
// refer to https://github.com/modelcontextprotocol/modelcontextprotocol/pull/655 for details.
let mut settings = SchemaSettings::draft2020_12();
settings.transforms = vec![Box::new(schemars::transform::AddNullable::default())];
let generator = settings.into_generator();
let schema = generator.into_root_schema_for::<T>();
Expand Down
68 changes: 52 additions & 16 deletions crates/rmcp/tests/test_complex_schema.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,24 +43,60 @@ impl Demo {
}
}

fn expected_schema() -> serde_json::Value {
serde_json::json!({
"$defs": {
"ChatMessage": {
"properties": {
"content": {
"type": "string"
},
"role": {
"$ref": "#/$defs/ChatRole"
}
},
"required": [
"role",
"content"
],
"type": "object"
},
"ChatRole": {
"enum": [
"System",
"User",
"Assistant",
"Tool"
],
"type": "string"
}
},
"$schema": "https://json-schema.org/draft/2020-12/schema",
"properties": {
"messages": {
"items": {
"$ref": "#/$defs/ChatMessage"
},
"type": "array"
},
"system": {
"nullable": true,
"type": "string"
}
},
"required": [
"messages"
],
"title": "ChatRequest",
"type": "object"
})
}

#[test]
fn test_complex_schema() {
let attr = Demo::chat_tool_attr();
let input_schema = attr.input_schema;
let enum_number = input_schema
.get("definitions")
.unwrap()
.as_object()
.unwrap()
.get("ChatRole")
.unwrap()
.as_object()
.unwrap()
.get("enum")
.unwrap()
.as_array()
.unwrap()
.len();
assert_eq!(enum_number, 4);
println!("{}", serde_json::to_string_pretty(&input_schema).unwrap());
let expected = expected_schema();
let produced = serde_json::Value::Object(input_schema.as_ref().clone());
assert_eq!(produced, expected, "schema mismatch");
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(shemars): use JSON Schema 2020-12 as Default Dialect by jokemanfire · Pull Request #549 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@ rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", branch = "mai
Basic dependencies:
- [tokio required](https://github.com/tokio-rs/tokio)
- [serde required](https://github.com/serde-rs/serde)

Json Schema generation(Must follow the 2020-12 version):
- [shemars required](https://github.com/GREsau/schemars)

CopilotAINov 18, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo in "shemars" - should be "schemars".

Suggested change
-[shemars required](https://github.com/GREsau/schemars)
-[schemars required](https://github.com/GREsau/schemars)

Copilot uses AI. Check for mistakes.


### Build a Client
Expand Down
2 changes: 1 addition & 1 deletion crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ schemars = ["dep:schemars"]

[dev-dependencies]
tokio = { version = "1", features = ["full"] }
schemars = { version = "1.0", features = ["chrono04"] }
schemars = { version = "1.1.0", features = ["chrono04"] }

CopilotAINov 18, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dev-dependency for schemars is being updated to version 1.1.0, but the main dependency at line 32 remains at version 1.0. This creates a version mismatch that could lead to compilation issues or unexpected behavior. Since draft2020_12() requires schemars 1.1.0+, the main dependency should also be updated to match.

Consider updating the main dependency to:

schemars = { version = "1.1.0", optional = true, features = ["chrono04"] }

Copilot uses AI. Check for mistakes.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jokemanfire Looks like something to look at if we need the bump across the board?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trace it in #182 , there should still be some work to be done here, and we may introduce some broken change.


anyhow = "1.0"
tracing-subscriber = { version = "0.3", features = [
Expand Down
5 changes: 2 additions & 3 deletions crates/rmcp/src/handler/server/common.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,8 @@ use crate::{
/// A shortcut for generating a JSON schema for a type.
pub fn schema_for_type<T: JsonSchema>() -> JsonObject {
// explicitly to align json schema version to official specifications.
// https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/schema/2025-03-26/schema.json
// TODO: update to 2020-12 waiting for the mcp spec update
let mut settings = SchemaSettings::draft07();
// refer to https://github.com/modelcontextprotocol/modelcontextprotocol/pull/655 for details.
let mut settings = SchemaSettings::draft2020_12();
settings.transforms = vec![Box::new(schemars::transform::AddNullable::default())];
let generator = settings.into_generator();
let schema = generator.into_root_schema_for::<T>();
Expand Down
68 changes: 52 additions & 16 deletions crates/rmcp/tests/test_complex_schema.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,24 +43,60 @@ impl Demo {
}
}

fn expected_schema() -> serde_json::Value {
serde_json::json!({
"$defs": {
"ChatMessage": {
"properties": {
"content": {
"type": "string"
},
"role": {
"$ref": "#/$defs/ChatRole"
}
},
"required": [
"role",
"content"
],
"type": "object"
},
"ChatRole": {
"enum": [
"System",
"User",
"Assistant",
"Tool"
],
"type": "string"
}
},
"$schema": "https://json-schema.org/draft/2020-12/schema",
"properties": {
"messages": {
"items": {
"$ref": "#/$defs/ChatMessage"
},
"type": "array"
},
"system": {
"nullable": true,
"type": "string"
}
},
"required": [
"messages"
],
"title": "ChatRequest",
"type": "object"
})
}

#[test]
fn test_complex_schema() {
let attr = Demo::chat_tool_attr();
let input_schema = attr.input_schema;
let enum_number = input_schema
.get("definitions")
.unwrap()
.as_object()
.unwrap()
.get("ChatRole")
.unwrap()
.as_object()
.unwrap()
.get("enum")
.unwrap()
.as_array()
.unwrap()
.len();
assert_eq!(enum_number, 4);
println!("{}", serde_json::to_string_pretty(&input_schema).unwrap());
let expected = expected_schema();
let produced = serde_json::Value::Object(input_schema.as_ref().clone());
assert_eq!(produced, expected, "schema mismatch");
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix(shemars): use JSON Schema 2020-12 as Default Dialect by jokemanfire · Pull Request #549 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@ rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", branch = "mai
Basic dependencies:
- [tokio required](https://github.com/tokio-rs/tokio)
- [serde required](https://github.com/serde-rs/serde)

Json Schema generation(Must follow the 2020-12 version):
- [shemars required](https://github.com/GREsau/schemars)

CopilotAINov 18, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo in "shemars" - should be "schemars".

Suggested change
-[shemars required](https://github.com/GREsau/schemars)
-[schemars required](https://github.com/GREsau/schemars)

Copilot uses AI. Check for mistakes.


### Build a Client
Expand Down
2 changes: 1 addition & 1 deletion crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ schemars = ["dep:schemars"]

[dev-dependencies]
tokio = { version = "1", features = ["full"] }
schemars = { version = "1.0", features = ["chrono04"] }
schemars = { version = "1.1.0", features = ["chrono04"] }

CopilotAINov 18, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dev-dependency for schemars is being updated to version 1.1.0, but the main dependency at line 32 remains at version 1.0. This creates a version mismatch that could lead to compilation issues or unexpected behavior. Since draft2020_12() requires schemars 1.1.0+, the main dependency should also be updated to match.

Consider updating the main dependency to:

schemars = { version = "1.1.0", optional = true, features = ["chrono04"] }

Copilot uses AI. Check for mistakes.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jokemanfire Looks like something to look at if we need the bump across the board?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trace it in #182 , there should still be some work to be done here, and we may introduce some broken change.


anyhow = "1.0"
tracing-subscriber = { version = "0.3", features = [
Expand Down
5 changes: 2 additions & 3 deletions crates/rmcp/src/handler/server/common.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,8 @@ use crate::{
/// A shortcut for generating a JSON schema for a type.
pub fn schema_for_type<T: JsonSchema>() -> JsonObject {
// explicitly to align json schema version to official specifications.
// https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/schema/2025-03-26/schema.json
// TODO: update to 2020-12 waiting for the mcp spec update
let mut settings = SchemaSettings::draft07();
// refer to https://github.com/modelcontextprotocol/modelcontextprotocol/pull/655 for details.
let mut settings = SchemaSettings::draft2020_12();
settings.transforms = vec![Box::new(schemars::transform::AddNullable::default())];
let generator = settings.into_generator();
let schema = generator.into_root_schema_for::<T>();
Expand Down
68 changes: 52 additions & 16 deletions crates/rmcp/tests/test_complex_schema.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,24 +43,60 @@ impl Demo {
}
}

fn expected_schema() -> serde_json::Value {
serde_json::json!({
"$defs": {
"ChatMessage": {
"properties": {
"content": {
"type": "string"
},
"role": {
"$ref": "#/$defs/ChatRole"
}
},
"required": [
"role",
"content"
],
"type": "object"
},
"ChatRole": {
"enum": [
"System",
"User",
"Assistant",
"Tool"
],
"type": "string"
}
},
"$schema": "https://json-schema.org/draft/2020-12/schema",
"properties": {
"messages": {
"items": {
"$ref": "#/$defs/ChatMessage"
},
"type": "array"
},
"system": {
"nullable": true,
"type": "string"
}
},
"required": [
"messages"
],
"title": "ChatRequest",
"type": "object"
})
}

#[test]
fn test_complex_schema() {
let attr = Demo::chat_tool_attr();
let input_schema = attr.input_schema;
let enum_number = input_schema
.get("definitions")
.unwrap()
.as_object()
.unwrap()
.get("ChatRole")
.unwrap()
.as_object()
.unwrap()
.get("enum")
.unwrap()
.as_array()
.unwrap()
.len();
assert_eq!(enum_number, 4);
println!("{}", serde_json::to_string_pretty(&input_schema).unwrap());
let expected = expected_schema();
let produced = serde_json::Value::Object(input_schema.as_ref().clone());
assert_eq!(produced, expected, "schema mismatch");
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(shemars): use JSON Schema 2020-12 as Default Dialect by jokemanfire · Pull Request #549 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@ rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", branch = "mai
Basic dependencies:
- [tokio required](https://github.com/tokio-rs/tokio)
- [serde required](https://github.com/serde-rs/serde)

Json Schema generation(Must follow the 2020-12 version):
- [shemars required](https://github.com/GREsau/schemars)

CopilotAINov 18, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo in "shemars" - should be "schemars".

Suggested change
-[shemars required](https://github.com/GREsau/schemars)
-[schemars required](https://github.com/GREsau/schemars)

Copilot uses AI. Check for mistakes.


### Build a Client
Expand Down
2 changes: 1 addition & 1 deletion crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ schemars = ["dep:schemars"]

[dev-dependencies]
tokio = { version = "1", features = ["full"] }
schemars = { version = "1.0", features = ["chrono04"] }
schemars = { version = "1.1.0", features = ["chrono04"] }

CopilotAINov 18, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dev-dependency for schemars is being updated to version 1.1.0, but the main dependency at line 32 remains at version 1.0. This creates a version mismatch that could lead to compilation issues or unexpected behavior. Since draft2020_12() requires schemars 1.1.0+, the main dependency should also be updated to match.

Consider updating the main dependency to:

schemars = { version = "1.1.0", optional = true, features = ["chrono04"] }

Copilot uses AI. Check for mistakes.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jokemanfire Looks like something to look at if we need the bump across the board?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trace it in #182 , there should still be some work to be done here, and we may introduce some broken change.


anyhow = "1.0"
tracing-subscriber = { version = "0.3", features = [
Expand Down
5 changes: 2 additions & 3 deletions crates/rmcp/src/handler/server/common.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,8 @@ use crate::{
/// A shortcut for generating a JSON schema for a type.
pub fn schema_for_type<T: JsonSchema>() -> JsonObject {
// explicitly to align json schema version to official specifications.
// https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/schema/2025-03-26/schema.json
// TODO: update to 2020-12 waiting for the mcp spec update
let mut settings = SchemaSettings::draft07();
// refer to https://github.com/modelcontextprotocol/modelcontextprotocol/pull/655 for details.
let mut settings = SchemaSettings::draft2020_12();
settings.transforms = vec![Box::new(schemars::transform::AddNullable::default())];
let generator = settings.into_generator();
let schema = generator.into_root_schema_for::<T>();
Expand Down
68 changes: 52 additions & 16 deletions crates/rmcp/tests/test_complex_schema.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,24 +43,60 @@ impl Demo {
}
}

fn expected_schema() -> serde_json::Value {
serde_json::json!({
"$defs": {
"ChatMessage": {
"properties": {
"content": {
"type": "string"
},
"role": {
"$ref": "#/$defs/ChatRole"
}
},
"required": [
"role",
"content"
],
"type": "object"
},
"ChatRole": {
"enum": [
"System",
"User",
"Assistant",
"Tool"
],
"type": "string"
}
},
"$schema": "https://json-schema.org/draft/2020-12/schema",
"properties": {
"messages": {
"items": {
"$ref": "#/$defs/ChatMessage"
},
"type": "array"
},
"system": {
"nullable": true,
"type": "string"
}
},
"required": [
"messages"
],
"title": "ChatRequest",
"type": "object"
})
}

#[test]
fn test_complex_schema() {
let attr = Demo::chat_tool_attr();
let input_schema = attr.input_schema;
let enum_number = input_schema
.get("definitions")
.unwrap()
.as_object()
.unwrap()
.get("ChatRole")
.unwrap()
.as_object()
.unwrap()
.get("enum")
.unwrap()
.as_array()
.unwrap()
.len();
assert_eq!(enum_number, 4);
println!("{}", serde_json::to_string_pretty(&input_schema).unwrap());
let expected = expected_schema();
let produced = serde_json::Value::Object(input_schema.as_ref().clone());
assert_eq!(produced, expected, "schema mismatch");
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); fix(shemars): use JSON Schema 2020-12 as Default Dialect by jokemanfire · Pull Request #549 · modelcontextprotocol/rust-sdk · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@ rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", branch = "mai
Basic dependencies:
- [tokio required](https://github.com/tokio-rs/tokio)
- [serde required](https://github.com/serde-rs/serde)

Json Schema generation(Must follow the 2020-12 version):
- [shemars required](https://github.com/GREsau/schemars)

CopilotAINov 18, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo in "shemars" - should be "schemars".

Suggested change
-[shemars required](https://github.com/GREsau/schemars)
-[schemars required](https://github.com/GREsau/schemars)

Copilot uses AI. Check for mistakes.


### Build a Client
Expand Down
2 changes: 1 addition & 1 deletion crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ schemars = ["dep:schemars"]

[dev-dependencies]
tokio = { version = "1", features = ["full"] }
schemars = { version = "1.0", features = ["chrono04"] }
schemars = { version = "1.1.0", features = ["chrono04"] }

CopilotAINov 18, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dev-dependency for schemars is being updated to version 1.1.0, but the main dependency at line 32 remains at version 1.0. This creates a version mismatch that could lead to compilation issues or unexpected behavior. Since draft2020_12() requires schemars 1.1.0+, the main dependency should also be updated to match.

Consider updating the main dependency to:

schemars = { version = "1.1.0", optional = true, features = ["chrono04"] }

Copilot uses AI. Check for mistakes.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jokemanfire Looks like something to look at if we need the bump across the board?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trace it in #182 , there should still be some work to be done here, and we may introduce some broken change.


anyhow = "1.0"
tracing-subscriber = { version = "0.3", features = [
Expand Down
5 changes: 2 additions & 3 deletions crates/rmcp/src/handler/server/common.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,8 @@ use crate::{
/// A shortcut for generating a JSON schema for a type.
pub fn schema_for_type<T: JsonSchema>() -> JsonObject {
// explicitly to align json schema version to official specifications.
// https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/schema/2025-03-26/schema.json
// TODO: update to 2020-12 waiting for the mcp spec update
let mut settings = SchemaSettings::draft07();
// refer to https://github.com/modelcontextprotocol/modelcontextprotocol/pull/655 for details.
let mut settings = SchemaSettings::draft2020_12();
settings.transforms = vec![Box::new(schemars::transform::AddNullable::default())];
let generator = settings.into_generator();
let schema = generator.into_root_schema_for::<T>();
Expand Down
68 changes: 52 additions & 16 deletions crates/rmcp/tests/test_complex_schema.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,24 +43,60 @@ impl Demo {
}
}

fn expected_schema() -> serde_json::Value {
serde_json::json!({
"$defs": {
"ChatMessage": {
"properties": {
"content": {
"type": "string"
},
"role": {
"$ref": "#/$defs/ChatRole"
}
},
"required": [
"role",
"content"
],
"type": "object"
},
"ChatRole": {
"enum": [
"System",
"User",
"Assistant",
"Tool"
],
"type": "string"
}
},
"$schema": "https://json-schema.org/draft/2020-12/schema",
"properties": {
"messages": {
"items": {
"$ref": "#/$defs/ChatMessage"
},
"type": "array"
},
"system": {
"nullable": true,
"type": "string"
}
},
"required": [
"messages"
],
"title": "ChatRequest",
"type": "object"
})
}

#[test]
fn test_complex_schema() {
let attr = Demo::chat_tool_attr();
let input_schema = attr.input_schema;
let enum_number = input_schema
.get("definitions")
.unwrap()
.as_object()
.unwrap()
.get("ChatRole")
.unwrap()
.as_object()
.unwrap()
.get("enum")
.unwrap()
.as_array()
.unwrap()
.len();
assert_eq!(enum_number, 4);
println!("{}", serde_json::to_string_pretty(&input_schema).unwrap());
let expected = expected_schema();
let produced = serde_json::Value::Object(input_schema.as_ref().clone());
assert_eq!(produced, expected, "schema mismatch");
}