feat: 2025-11-25 review fixes (#201)
* fix: review fixes of the latest changes * fix: updated unit tests * chore: more conformance compliance improvements * chore: reverted protocol changes * chore: more compliance improvements * chore: more conformance compliance improvements * chore: improvements to the backcompat and updated to Tool unit tests * chore: ci update
This commit is contained in:
parent
6112a3995a
commit
973b46b8f7
1 changed files with 692 additions and 507 deletions
|
|
@ -240,14 +240,14 @@ struct ToolTests {
|
|||
|
||||
@Test("Text content encoding and decoding")
|
||||
func testToolContentTextEncoding() throws {
|
||||
let content = Tool.Content.text("Hello, world!")
|
||||
let content = Tool.Content.text(text: "Hello, world!", annotations: nil, _meta: nil)
|
||||
let encoder = JSONEncoder()
|
||||
let decoder = JSONDecoder()
|
||||
|
||||
let data = try encoder.encode(content)
|
||||
let decoded = try decoder.decode(Tool.Content.self, from: data)
|
||||
|
||||
if case .text(let text) = decoded {
|
||||
if case .text(let text, _, _) = decoded {
|
||||
#expect(text == "Hello, world!")
|
||||
} else {
|
||||
#expect(Bool(false), "Expected text content")
|
||||
|
|
@ -259,7 +259,8 @@ struct ToolTests {
|
|||
let content = Tool.Content.image(
|
||||
data: "base64data",
|
||||
mimeType: "image/png",
|
||||
metadata: .init(additionalFields: ["width": "100", "height": "100"])
|
||||
annotations: nil,
|
||||
_meta: nil
|
||||
)
|
||||
let encoder = JSONEncoder()
|
||||
let decoder = JSONDecoder()
|
||||
|
|
@ -267,11 +268,9 @@ struct ToolTests {
|
|||
let data = try encoder.encode(content)
|
||||
let decoded = try decoder.decode(Tool.Content.self, from: data)
|
||||
|
||||
if case .image(let data, let mimeType, let metadata) = decoded {
|
||||
if case .image(let data, let mimeType, _, _) = decoded {
|
||||
#expect(data == "base64data")
|
||||
#expect(mimeType == "image/png")
|
||||
#expect(metadata?["width"] == "100")
|
||||
#expect(metadata?["height"] == "100")
|
||||
} else {
|
||||
#expect(Bool(false), "Expected image content")
|
||||
}
|
||||
|
|
@ -337,7 +336,9 @@ struct ToolTests {
|
|||
func testToolContentAudioEncoding() throws {
|
||||
let content = Tool.Content.audio(
|
||||
data: "base64audiodata",
|
||||
mimeType: "audio/wav"
|
||||
mimeType: "audio/wav",
|
||||
annotations: nil,
|
||||
_meta: nil
|
||||
)
|
||||
let encoder = JSONEncoder()
|
||||
let decoder = JSONDecoder()
|
||||
|
|
@ -345,7 +346,7 @@ struct ToolTests {
|
|||
let data = try encoder.encode(content)
|
||||
let decoded = try decoder.decode(Tool.Content.self, from: data)
|
||||
|
||||
if case .audio(let data, let mimeType) = decoded {
|
||||
if case .audio(let data, let mimeType, _, _) = decoded {
|
||||
#expect(data == "base64audiodata")
|
||||
#expect(mimeType == "audio/wav")
|
||||
} else {
|
||||
|
|
@ -353,6 +354,71 @@ struct ToolTests {
|
|||
}
|
||||
}
|
||||
|
||||
@Test("Text content encoding includes annotations and meta fields")
|
||||
func testToolContentTextEncodingIncludesAnnotationsAndMeta() throws {
|
||||
let annotations = Resource.Annotations(
|
||||
audience: [.assistant],
|
||||
priority: 0.75,
|
||||
lastModified: "2026-01-01T00:00:00Z"
|
||||
)
|
||||
let meta = Metadata(additionalFields: [
|
||||
"vendor.example/source": .string("tool-text")
|
||||
])
|
||||
let expected = Tool.Content.text(
|
||||
text: "Hello with metadata",
|
||||
annotations: annotations,
|
||||
_meta: meta
|
||||
)
|
||||
|
||||
let data = try JSONEncoder().encode(expected)
|
||||
let decoded = try JSONDecoder().decode(Tool.Content.self, from: data)
|
||||
#expect(decoded == expected)
|
||||
}
|
||||
|
||||
@Test("Image content encoding includes annotations and meta fields")
|
||||
func testToolContentImageEncodingIncludesAnnotationsAndMeta() throws {
|
||||
let annotations = Resource.Annotations(
|
||||
audience: [.user],
|
||||
priority: 0.9,
|
||||
lastModified: "2026-01-02T00:00:00Z"
|
||||
)
|
||||
let meta = Metadata(additionalFields: [
|
||||
"vendor.example/source": .string("tool-image")
|
||||
])
|
||||
let expected = Tool.Content.image(
|
||||
data: "base64-image",
|
||||
mimeType: "image/jpeg",
|
||||
annotations: annotations,
|
||||
_meta: meta
|
||||
)
|
||||
|
||||
let data = try JSONEncoder().encode(expected)
|
||||
let decoded = try JSONDecoder().decode(Tool.Content.self, from: data)
|
||||
#expect(decoded == expected)
|
||||
}
|
||||
|
||||
@Test("Audio content encoding includes annotations and meta fields")
|
||||
func testToolContentAudioEncodingIncludesAnnotationsAndMeta() throws {
|
||||
let annotations = Resource.Annotations(
|
||||
audience: [.assistant],
|
||||
priority: 0.4,
|
||||
lastModified: "2026-01-03T00:00:00Z"
|
||||
)
|
||||
let meta = Metadata(additionalFields: [
|
||||
"vendor.example/source": .string("tool-audio")
|
||||
])
|
||||
let expected = Tool.Content.audio(
|
||||
data: "base64-audio",
|
||||
mimeType: "audio/mp3",
|
||||
annotations: annotations,
|
||||
_meta: meta
|
||||
)
|
||||
|
||||
let data = try JSONEncoder().encode(expected)
|
||||
let decoded = try JSONDecoder().decode(Tool.Content.self, from: data)
|
||||
#expect(decoded == expected)
|
||||
}
|
||||
|
||||
@Test("ListTools parameters validation")
|
||||
func testListToolsParameters() throws {
|
||||
let params = ListTools.Parameters(cursor: "next_page")
|
||||
|
|
@ -422,15 +488,15 @@ struct ToolTests {
|
|||
@Test("CallTool success result validation")
|
||||
func testCallToolResult() throws {
|
||||
let content = [
|
||||
Tool.Content.text("Result 1"),
|
||||
Tool.Content.text("Result 2"),
|
||||
Tool.Content.text(text: "Result 1", annotations: nil, _meta: nil),
|
||||
Tool.Content.text(text: "Result 2", annotations: nil, _meta: nil),
|
||||
]
|
||||
|
||||
let result = CallTool.Result(content: content)
|
||||
#expect(result.content.count == 2)
|
||||
#expect(result.isError == nil)
|
||||
|
||||
if case .text(let text) = result.content[0] {
|
||||
if case .text(let text, _, _) = result.content[0] {
|
||||
#expect(text == "Result 1")
|
||||
} else {
|
||||
#expect(Bool(false), "Expected text content")
|
||||
|
|
@ -439,12 +505,12 @@ struct ToolTests {
|
|||
|
||||
@Test("CallTool error result validation")
|
||||
func testCallToolErrorResult() throws {
|
||||
let errorContent = [Tool.Content.text("Error message")]
|
||||
let errorContent = [Tool.Content.text(text: "Error message", annotations: nil, _meta: nil)]
|
||||
let errorResult = CallTool.Result(content: errorContent, isError: true)
|
||||
#expect(errorResult.content.count == 1)
|
||||
#expect(errorResult.isError == true)
|
||||
|
||||
if case .text(let text) = errorResult.content[0] {
|
||||
if case .text(let text, _, _) = errorResult.content[0] {
|
||||
#expect(text == "Error message")
|
||||
} else {
|
||||
#expect(Bool(false), "Expected error text content")
|
||||
|
|
|
|||
Loading…
Reference in a new issue