Skip to content

Make Tool.inputSchema non-optional #123

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make Tool.inputSchema non-optional #123

Show file tree
Hide file tree
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
10 changes: 4 additions & 6 deletions Sources/MCP/Server/Tools.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public struct Tool: Hashable, Codable, Sendable {
/// The tool description
public let description: String
/// The tool input schema
public let inputSchema: Value?
public let inputSchema: Value

/// Annotations that provide display-facing and operational information for a Tool.
///
Expand Down Expand Up @@ -86,7 +86,7 @@ public struct Tool: Hashable, Codable, Sendable {
public init(
name: String,
description: String,
inputSchema: Value? = nil,
inputSchema: Value,
annotations: Annotations = nil
) {
self.name = name
Expand Down Expand Up @@ -183,7 +183,7 @@ public struct Tool: Hashable, Codable, Sendable {
let container = try decoder.container(keyedBy: CodingKeys.self)
name = try container.decode(String.self, forKey: .name)
description = try container.decode(String.self, forKey: .description)
inputSchema = try container.decodeIfPresent(Value.self, forKey: .inputSchema)
inputSchema = try container.decode(Value.self, forKey: .inputSchema)
annotations =
try container.decodeIfPresent(Tool.Annotations.self, forKey: .annotations) ?? .init()
}
Expand All @@ -192,9 +192,7 @@ public struct Tool: Hashable, Codable, Sendable {
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(name, forKey: .name)
try container.encode(description, forKey: .description)
if let schema = inputSchema {
try container.encode(schema, forKey: .inputSchema)
}
try container.encode(inputSchema, forKey: .inputSchema)
if !annotations.isEmpty {
try container.encode(annotations, forKey: .annotations)
}
Expand Down
25 changes: 15 additions & 10 deletions Tests/MCPTests/ToolTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,28 +126,29 @@ struct ToolTests {
func testToolWithEmptyAnnotations() throws {
var tool = Tool(
name: "test_tool",
description: "Test tool description"
description: "Test tool description",
inputSchema: [:]
)

do {
#expect(tool.annotations.isEmpty)

let encoder = JSONEncoder()
let data = try encoder.encode(tool)

// Verify that empty annotations are not included in the JSON
let jsonString = String(data: data, encoding: .utf8)!
#expect(!jsonString.contains("\"annotations\""))
}

do {
tool.annotations.title = "Test"

#expect(!tool.annotations.isEmpty)

let encoder = JSONEncoder()
let data = try encoder.encode(tool)

// Verify that empty annotations are not included in the JSON
let jsonString = String(data: data, encoding: .utf8)!
#expect(jsonString.contains("\"annotations\""))
Expand All @@ -159,7 +160,7 @@ struct ToolTests {
let tool = Tool(
name: "test_tool",
description: "Test tool description",
inputSchema: nil,
inputSchema: [:],
annotations: nil
)

Expand Down Expand Up @@ -318,8 +319,8 @@ struct ToolTests {
@Test("ListTools result validation")
func testListToolsResult() throws {
let tools = [
Tool(name: "tool1", description: "First tool", inputSchema: nil),
Tool(name: "tool2", description: "Second tool", inputSchema: nil),
Tool(name: "tool1", description: "First tool", inputSchema: [:]),
Tool(name: "tool2", description: "Second tool", inputSchema: [:]),
]

let result = ListTools.Result(tools: tools, nextCursor: "next_page")
Expand Down Expand Up @@ -393,7 +394,11 @@ struct ToolTests {
#expect(request.id == 1)
#expect(request.params.cursor == nil)

let testTool = Tool(name: "test_tool", description: "Test tool for verification")
let testTool = Tool(
name: "test_tool",
description: "Test tool for verification",
inputSchema: [:]
)
return ListTools.response(id: request.id, result: ListTools.Result(tools: [testTool]))
}

Expand Down