Bump to latest AI abstractions, adapt code to it

kzu · kzu · commit f977db8ec3ac · 2026-03-12T10:39:27.000-03:00
Changes around MCP, auth and outputs.
diff --git a/src/xAI.Protocol/xAI.Protocol.csproj b/src/xAI.Protocol/xAI.Protocol.csproj
@@ -15,8 +15,8 @@
   <ItemGroup>
     <PackageReference Include="NuGetizer" Version="1.4.7" PrivateAssets="all" />
     <PackageReference Include="Google.Protobuf" Version="3.34.0" />
-    <PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
-    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.71.0" />
+    <PackageReference Include="Grpc.Net.Client" Version="2.76.0" />
+    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.76.0" />
     <PackageReference Include="Grpc.Tools" Version="2.78.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.4" />
   </ItemGroup>
diff --git a/src/xAI.Tests/ChatClientTests.cs b/src/xAI.Tests/ChatClientTests.cs
@@ -456,45 +456,45 @@ public async Task GrokInvokesHostedMcp()
     {
         var messages = new Chat()
         {
-            { "user", "When was GrokClient v1.0.0 released on the devlooped/GrokClient repo? Respond with just the date, in YYYY-MM-DD format." },
+            { "user", "When was GrokClient v1.1.0 released on the devlooped/GrokClient repo? Respond with just the date, in YYYY-MM-DD format." },
         };
 
-        var grok = new GrokClient(Configuration["XAI_API_KEY"]!).AsIChatClient("grok-4-fast");
+        var grok = new GrokClient(Configuration["XAI_API_KEY"]!).AsIChatClient("grok-4-1-fast-non-reasoning");
 
         var options = new ChatOptions
         {
             Tools = [new HostedMcpServerTool("GitHub", "https://api.githubcopilot.com/mcp/") {
-                AuthorizationToken = Configuration["GITHUB_TOKEN"]!,
+                Headers = new Dictionary<string, string> { ["Authorization"] = Configuration["GITHUB_TOKEN"]! },
                 AllowedTools = ["list_releases"],
             }]
         };
 
         var response = await grok.GetResponseAsync(messages, options);
         var text = response.Text;
 
-        Assert.Equal("2025-11-29", text);
+        Assert.Equal("2026-01-05", text);
         var call = Assert.Single(response.Messages
                 .SelectMany(x => x.Contents)
                 .OfType<McpServerToolCallContent>());
 
-        Assert.Equal("GitHub.list_releases", call.ToolName);
+        Assert.Equal("GitHub.list_releases", call.Name);
     }
 
     [SecretsFact("XAI_API_KEY", "GITHUB_TOKEN")]
     public async Task GrokInvokesHostedMcpWithOutput()
     {
         var messages = new Chat()
         {
-            { "user", "When was GrokClient v1.0.0 released on the devlooped/GrokClient repo? Respond with just the date, in YYYY-MM-DD format." },
+            { "user", "When was GrokClient v1.1.0 released on the devlooped/GrokClient repo? Respond with just the date, in YYYY-MM-DD format." },
         };
 
-        var grok = new GrokClient(Configuration["XAI_API_KEY"]!).AsIChatClient("grok-4-fast");
+        var grok = new GrokClient(Configuration["XAI_API_KEY"]!).AsIChatClient("grok-4-1-fast-non-reasoning");
 
         var options = new GrokChatOptions
         {
             Include = { IncludeOption.McpCallOutput },
             Tools = [new HostedMcpServerTool("GitHub", "https://api.githubcopilot.com/mcp/") {
-                AuthorizationToken = Configuration["GITHUB_TOKEN"]!,
+                Headers = new Dictionary<string, string> { ["Authorization"] = Configuration["GITHUB_TOKEN"]! },
                 AllowedTools = ["list_releases"],
             }]
         };
@@ -506,16 +506,16 @@ public async Task GrokInvokesHostedMcpWithOutput()
                 .SelectMany(x => x.Contents)
                 .OfType<McpServerToolResultContent>());
 
-        Assert.NotNull(output.Output);
-        Assert.Single(output.Output);
-        var json = Assert.Single(output.Output!.OfType<TextContent>()).Text;
+        Assert.NotNull(output.Outputs);
+        Assert.Single(output.Outputs);
+        var json = Assert.Single(output.Outputs!.OfType<TextContent>()).Text;
         var tags = JsonSerializer.Deserialize<List<Release>>(json, new JsonSerializerOptions(JsonSerializerDefaults.Web)
         {
             PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower
         });
 
         Assert.NotNull(tags);
-        Assert.Contains(tags, x => x.TagName == "v1.0.0");
+        Assert.Contains(tags, x => x.TagName == "v1.1.0");
     }
 
     record Release(string TagName, DateTimeOffset CreatedAt);
@@ -527,20 +527,20 @@ public async Task GrokStreamsUpdatesFromAllTools()
         {
             { "user",
                 """
-                What's the oldest stable version released on the devlooped/GrokClient repo on GitHub?, 
+                What's the latest stable version released on the devlooped/GrokClient repo on GitHub?, 
                 what is the current price of Tesla stock, 
                 and what is the current date? Respond with the following JSON: 
                 {
-                  "today": "[get_date result]",
-                  "release": "[first stable release of devlooped/GrokClient, using GitHub MCP tool]",
+                  "today": "[get_date result in yyyy-MM-dd format]",
+                  "release": "[latest stable release of devlooped/GrokClient, using GitHub MCP tool]",
                   "price": [$TSLA price using web search tool]
                 }
                 """
             },
         };
 
         var grok = new GrokClient(Configuration["XAI_API_KEY"]!)
-            .AsIChatClient("grok-4-fast")
+            .AsIChatClient("grok-4-1-fast-non-reasoning")
             .AsBuilder()
             .UseFunctionInvocation()
             .UseLogging(output.AsLoggerFactory())
@@ -554,12 +554,12 @@ public async Task GrokStreamsUpdatesFromAllTools()
             [
                 new HostedWebSearchTool(),
                 new HostedMcpServerTool("GitHub", "https://api.githubcopilot.com/mcp/") {
-                    AuthorizationToken = Configuration["GITHUB_TOKEN"]!,
+                    Headers = new Dictionary<string, string> { ["Authorization"] = Configuration["GITHUB_TOKEN"]! },
                     AllowedTools = ["list_releases", "get_release_by_tag"],
                 },
                 AIFunctionFactory.Create(() => {
                     getDateCalls++;
-                    return DateTimeOffset.Now.ToString("O");
+                    return DateTimeOffset.UtcNow.ToString("O");
                 }, "get_date", "Gets the current date")
             ]
         };
@@ -581,8 +581,8 @@ public async Task GrokStreamsUpdatesFromAllTools()
 
         Assert.Equal(1, getDateCalls);
 
-        Assert.Equal(DateOnly.FromDateTime(DateTime.Today), typed.Today);
-        Assert.EndsWith("1.0.0", typed.Release);
+        Assert.Equal(DateOnly.FromDateTime(DateTime.UtcNow), typed.Today);
+        Assert.EndsWith("1.1.0", typed.Release);
         Assert.True(typed.Price > 100);
     }
 
diff --git a/src/xAI.Tests/GrokConversionTests.cs b/src/xAI.Tests/GrokConversionTests.cs
@@ -265,7 +265,7 @@ public void AsTool_WithHostedMcpTool()
         })
         {
             AllowedTools = ["list"],
-            AuthorizationToken = accessToken,
+            Headers = new Dictionary<string, string> { ["Authorization"] = accessToken },
         };
 
         var tool = mcpTool.AsProtocolTool();
diff --git a/src/xAI.Tests/SanityChecks.cs b/src/xAI.Tests/SanityChecks.cs
@@ -299,7 +299,7 @@ public async Task AgenticMcpServer(bool streaming)
             [
                 new HostedMcpServerTool("GitHub", "https://api.githubcopilot.com/mcp/")
                 {
-                    AuthorizationToken = Env.GetString("GITHUB_TOKEN")!,
+                    Headers = new Dictionary < string, string > {["Authorization"] = Env.GetString("GITHUB_TOKEN") ! },
                     AllowedTools = ["list_releases", "get_release_by_tag"],
                 }
             ]
diff --git a/src/xAI.Tests/xAI.Tests.csproj b/src/xAI.Tests/xAI.Tests.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="8.0.0" />
-    <PackageReference Include="Devlooped.Extensions.AI" Version="1.0.0" />
+    <PackageReference Include="Devlooped.Extensions.AI" Version="2.0.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="ThisAssembly.Git" Version="2.1.2" PrivateAssets="all" />
     <PackageReference Include="xunit" Version="2.9.3" />
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.4" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.4" />
 
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.4" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.4" />
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.4.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.4" />
diff --git a/src/xAI/GrokChatClient.cs b/src/xAI/GrokChatClient.cs
@@ -194,14 +194,17 @@ GetCompletionsRequest MapToRequest(IEnumerable<ChatMessage> messages, ChatOption
                         Role = MessageRole.RoleTool,
                         Content = { new Content { Text = JsonSerializer.Serialize(resultContent.Result) ?? "null" } }
                     };
+
                     if (resultContent.CallId is { Length: > 0 } callId)
                         msg.ToolCallId = callId;
+
                     request.Messages.Add(msg);
                 }
                 else if (content is McpServerToolResultContent mcpResult &&
                     mcpResult.RawRepresentation is ToolCall mcpToolCall &&
-                    mcpResult.Output is { Count: 1 } &&
-                    mcpResult.Output[0] is TextContent mcpText)
+                    // TODO: what if there are multiple outputs?
+                    mcpResult.Outputs is { Count: 1 } &&
+                    mcpResult.Outputs[0] is TextContent mcpText)
                 {
                     request.Messages.Add(new Message
                     {
@@ -212,6 +215,7 @@ mcpResult.RawRepresentation is ToolCall mcpToolCall &&
                 }
                 else if (content is CodeInterpreterToolResultContent codeResult &&
                     codeResult.RawRepresentation is ToolCall codeToolCall &&
+                    // TODO: what if there are multiple outputs?
                     codeResult.Outputs is { Count: 1 } &&
                     codeResult.Outputs[0] is TextContent codeText)
                 {
diff --git a/src/xAI/GrokProtocolExtensions.cs b/src/xAI/GrokProtocolExtensions.cs
@@ -126,13 +126,24 @@ grokSearch.City is not null ||
             case HostedMcpServerTool mcpTool:
                 var mcp = new MCP
                 {
-                    Authorization = mcpTool.AuthorizationToken,
                     ServerLabel = mcpTool.ServerName,
                     ServerUrl = mcpTool.ServerAddress,
                     AllowedToolNames = { mcpTool.AllowedTools ?? Array.Empty<string>() },
                 };
 
+                if (mcpTool.Headers?.TryGetValue("Authorization", out var authHeader) == true && !string.IsNullOrEmpty(authHeader))
+                {
+                    mcp.Authorization = authHeader;
+                    foreach (var item in mcpTool.Headers.Where(x => x.Key != "Authorization"))
+                        mcp.ExtraHeaders.Add(item.Key, item.Value);
+                }
+                else if (mcpTool.Headers != null)
+                {
+                    mcp.ExtraHeaders.Add(mcpTool.Headers);
+                }
+
                 // We can set an entire dictionary with a specific key
+                // We keep this for backs compat, but makes little sense now with McpTool.Headers property available.
                 if (mcpTool.GetProperty<IDictionary<string, string>>(nameof(MCP.ExtraHeaders)) is { } headers)
                     mcp.ExtraHeaders.Add(headers);
 
@@ -239,23 +250,21 @@ internal static IEnumerable<AIContent> AsContents(this IEnumerable<ToolCall> too
                         {
                             Annotations = annotations,
                             RawRepresentation = toolCall,
-                            Output = [new TextContent(content)]
+                            Outputs = [new TextContent(content)]
                         };
                     break;
 
                 case ToolCallType.CodeExecutionTool:
-                    yield return new CodeInterpreterToolCallContent()
+                    yield return new CodeInterpreterToolCallContent(toolCall.Id)
                     {
                         Annotations = annotations,
                         RawRepresentation = toolCall,
-                        CallId = toolCall.Id,
                     };
                     if (content is not null)
-                        yield return new CodeInterpreterToolResultContent()
+                        yield return new CodeInterpreterToolResultContent(toolCall.Id)
                         {
                             Annotations = annotations,
                             RawRepresentation = toolCall,
-                            CallId = toolCall.Id,
                             Outputs = [new TextContent(content)]
                         };
                     break;
diff --git a/src/xAI/xAI.csproj b/src/xAI/xAI.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="NuGetizer" Version="1.4.7" PrivateAssets="all" />
     <PackageReference Include="Google.Protobuf" Version="3.34.0" />
     <PackageReference Include="Grpc.Net.Client" Version="2.76.0" />
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.3.0" />
+    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.4.0" />
     <PackageReference Include="System.ClientModel" Version="1.9.0" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ public void AsTool_WithHostedMcpTool()`
`265`	`265`	`})`
`266`	`266`	`{`
`267`	`267`	`AllowedTools = ["list"],`
`268`		`- AuthorizationToken = accessToken,`
	`268`	`+ Headers = new Dictionary<string, string> { ["Authorization"] = accessToken },`
`269`	`269`	`};`
`270`	`270`
`271`	`271`	`var tool = mcpTool.AsProtocolTool();`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ public async Task AgenticMcpServer(bool streaming)`
`299`	`299`	`[`
`300`	`300`	`new HostedMcpServerTool("GitHub", "https://api.githubcopilot.com/mcp/")`
`301`	`301`	`{`
`302`		`- AuthorizationToken = Env.GetString("GITHUB_TOKEN")!,`
	`302`	`+ Headers = new Dictionary < string, string > {["Authorization"] = Env.GetString("GITHUB_TOKEN") ! },`
`303`	`303`	`AllowedTools = ["list_releases", "get_release_by_tag"],`
`304`	`304`	`}`
`305`	`305`	`]`
Original file line number	Diff line number	Diff line change
`@@ -194,14 +194,17 @@ GetCompletionsRequest MapToRequest(IEnumerable<ChatMessage> messages, ChatOption`
`194`	`194`	`Role = MessageRole.RoleTool,`
`195`	`195`	`Content = { new Content { Text = JsonSerializer.Serialize(resultContent.Result) ?? "null" } }`
`196`	`196`	`};`
	`197`	`+`
`197`	`198`	`if (resultContent.CallId is { Length: > 0 } callId)`
`198`	`199`	`msg.ToolCallId = callId;`
	`200`	`+`
`199`	`201`	`request.Messages.Add(msg);`
`200`	`202`	`}`
`201`	`203`	`else if (content is McpServerToolResultContent mcpResult &&`
`202`	`204`	`mcpResult.RawRepresentation is ToolCall mcpToolCall &&`
`203`		`- mcpResult.Output is { Count: 1 } &&`
`204`		`- mcpResult.Output[0] is TextContent mcpText)`
	`205`	`+ // TODO: what if there are multiple outputs?`
	`206`	`+ mcpResult.Outputs is { Count: 1 } &&`
	`207`	`+ mcpResult.Outputs[0] is TextContent mcpText)`
`205`	`208`	`{`
`206`	`209`	`request.Messages.Add(new Message`
`207`	`210`	`{`
`@@ -212,6 +215,7 @@ mcpResult.RawRepresentation is ToolCall mcpToolCall &&`
`212`	`215`	`}`
`213`	`216`	`else if (content is CodeInterpreterToolResultContent codeResult &&`
`214`	`217`	`codeResult.RawRepresentation is ToolCall codeToolCall &&`
	`218`	`+ // TODO: what if there are multiple outputs?`
`215`	`219`	`codeResult.Outputs is { Count: 1 } &&`
`216`	`220`	`codeResult.Outputs[0] is TextContent codeText)`
`217`	`221`	`{`