More cases in switch and tests

Author: aaronpowell

src/ModelContextProtocol/AIContentExtensions.cs

@@ -104,13 +104,7 @@ internal static string GetBase64Data(this DataContent dataContent)
 #endif
     }
 
-    /// <summary>
-    /// Converts different types of <see cref="AIContent"/> into a standardized <see cref="Content"/> object with specific properties based on the
-    /// content type.
-    /// </summary>
-    /// <param name="content"></param>
-    /// <returns>A <see cref="Content"/> object that encapsulates the relevant properties derived from the input content.</returns>
-    public static Content ToContent(this AIContent content) =>
+    internal static Content ToContent(this AIContent content) =>
         content switch
         {
             TextContent textContent => new()
@@ -123,9 +117,9 @@ public static Content ToContent(this AIContent content) =>
                 Data = dataContent.GetBase64Data(),
                 MimeType = dataContent.MediaType,
                 Type =
-                dataContent.HasTopLevelMediaType("image") ? "image" :
-                dataContent.HasTopLevelMediaType("audio") ? "audio" :
-                "resource",
+                    dataContent.HasTopLevelMediaType("image") ? "image" :
+                    dataContent.HasTopLevelMediaType("audio") ? "audio" :
+                    "resource",
             },
             _ => new()
             {

src/ModelContextProtocol/Server/AIFunctionMcpServerTool.cs

@@ -225,6 +225,7 @@ public override async Task<CallToolResponse> InvokeAsync(
             {
                 Content = [.. contents]
             },
+            CallToolResponse callToolResponse => callToolResponse,
 
             // TODO https://github.com/modelcontextprotocol/csharp-sdk/issues/69:
             // Add specialization for annotations.

tests/ModelContextProtocol.Tests/Server/McpServerToolReturnTests.cs

@@ -164,4 +164,31 @@ public async Task CanReturnCollectionOfMcpContent()
         Assert.Equal("image/png", result.Content[1].MimeType);
         Assert.Null(result.Content[1].Text);
     }
+
+    [Fact]
+    public async Task CanReturnCallToolResponse()
+    {
+        CallToolResponse response = new()
+        {
+            Content = [new() { Text = "text", Type = "text" }, new() { Data = "1234", Type = "image" }]
+        };
+
+        Mock<IMcpServer> mockServer = new();
+        McpServerTool tool = McpServerTool.Create((IMcpServer server) =>
+        {
+            Assert.Same(mockServer.Object, server);
+            return response;
+        });
+        var result = await tool.InvokeAsync(
+            new RequestContext<CallToolRequestParams>(mockServer.Object, null),
+            TestContext.Current.CancellationToken);
+
+        Assert.Same(response, result);
+
+        Assert.Equal(2, result.Content.Count);
+        Assert.Equal("text", result.Content[0].Text);
+        Assert.Equal("text", result.Content[0].Type);
+        Assert.Equal("1234", result.Content[1].Data);
+        Assert.Equal("image", result.Content[1].Type);
+    }
 }