Address PR feedback

Author: stephentoub

src/Libraries/Microsoft.Extensions.AI.Abstractions/CodeInterpreterTool.cs

@@ -1,9 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections.Generic;
-using Microsoft.Shared.Collections;
-
 namespace Microsoft.Extensions.AI;
 
 /// <summary>Represents a tool that can be specified to an AI service to enable it to execute code it generates.</summary>
@@ -14,11 +11,7 @@ namespace Microsoft.Extensions.AI;
 public class CodeInterpreterTool : AITool
 {
     /// <summary>Initializes a new instance of the <see cref="CodeInterpreterTool"/> class.</summary>
-    public CodeInterpreterTool(IReadOnlyDictionary<string, object?>? additionalProperties = null)
+    public CodeInterpreterTool()
     {
-        AdditionalProperties = additionalProperties ?? EmptyReadOnlyDictionary<string, object?>.Instance;
     }
-
-    /// <inheritdoc/>
-    public override IReadOnlyDictionary<string, object?> AdditionalProperties { get; }
 }

src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIModelMapper.ChatCompletion.cs

@@ -240,8 +240,10 @@ public static ChatOptions FromOpenAIOptions(ChatCompletionOptions? options)
             {
                 foreach (ChatTool tool in tools)
                 {
-                    result.Tools ??= [];
-                    result.Tools.Add(FromOpenAIChatTool(tool));
+                    if (FromOpenAIChatTool(tool) is { } convertedTool)
+                    {
+                        (result.Tools ??= []).Add(convertedTool);
+                    }
                 }
 
                 using var toolChoiceJson = JsonDocument.Parse(JsonModelHelpers.Serialize(options.ToolChoice).ToMemory());
@@ -407,17 +409,24 @@ public static ChatCompletionOptions ToOpenAIOptions(ChatOptions? options)
         return result;
     }
 
-    private static AITool FromOpenAIChatTool(ChatTool chatTool)
+    private static AITool? FromOpenAIChatTool(ChatTool chatTool)
     {
-        AdditionalPropertiesDictionary additionalProperties = [];
-        if (chatTool.FunctionSchemaIsStrict is bool strictValue)
+        switch (chatTool.Kind)
         {
-            additionalProperties["Strict"] = strictValue;
-        }
+            case ChatToolKind.Function:
+                AdditionalPropertiesDictionary additionalProperties = [];
+                if (chatTool.FunctionSchemaIsStrict is bool strictValue)
+                {
+                    additionalProperties["Strict"] = strictValue;
+                }
+
+                OpenAIChatToolJson openAiChatTool = JsonSerializer.Deserialize(chatTool.FunctionParameters.ToMemory().Span, OpenAIJsonContext.Default.OpenAIChatToolJson)!;
+                JsonElement schema = JsonSerializer.SerializeToElement(openAiChatTool, OpenAIJsonContext.Default.OpenAIChatToolJson);
+                return new MetadataOnlyAIFunction(chatTool.FunctionName, chatTool.FunctionDescription, schema, additionalProperties);
 
-        OpenAIChatToolJson openAiChatTool = JsonSerializer.Deserialize(chatTool.FunctionParameters.ToMemory().Span, OpenAIJsonContext.Default.OpenAIChatToolJson)!;
-        JsonElement schema = JsonSerializer.SerializeToElement(openAiChatTool, OpenAIJsonContext.Default.OpenAIChatToolJson);
-        return new MetadataOnlyAIFunction(chatTool.FunctionName, chatTool.FunctionDescription, schema, additionalProperties);
+            default:
+                return null;
+        }
     }
 
     private sealed class MetadataOnlyAIFunction(string name, string description, JsonElement schema, IReadOnlyDictionary<string, object?> additionalProps) : AIFunction

test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/CodeInterpreterToolTests.cs

@@ -15,12 +15,5 @@ public void Constructor_Roundtrips()
         Assert.Empty(tool.Description);
         Assert.Empty(tool.AdditionalProperties);
         Assert.Equal(nameof(CodeInterpreterTool), tool.ToString());
-
-        var props = new AdditionalPropertiesDictionary();
-        tool = new CodeInterpreterTool(props);
-        Assert.Equal(nameof(CodeInterpreterTool), tool.Name);
-        Assert.Empty(tool.Description);
-        Assert.Same(props, tool.AdditionalProperties);
-        Assert.Equal(nameof(CodeInterpreterTool), tool.ToString());
     }
 }