refactor

src/Utility/ChatTools.cs

@@ -114,23 +114,11 @@ public async Task AddMcpToolsAsync(Uri mcpEndpoint)
 
     private async Task AddToolsAsync(BinaryData toolDefinitions, McpClient client)
     {
-        using var document = JsonDocument.Parse(toolDefinitions);
-        if (!document.RootElement.TryGetProperty("tools", out JsonElement toolsElement))
-            throw new JsonException("The JSON document must contain a 'tools' array.");
-
-        var serverKey = client.Endpoint.Host + client.Endpoint.Port.ToString();
         List<ChatTool> toolsToVectorize = new();
+        var parsedTools = ToolsUtility.ParseMcpToolDefinitions(toolDefinitions, client);
 
-        foreach (var tool in toolsElement.EnumerateArray())
+        foreach (var (name, description, inputSchema) in parsedTools)
         {
-            var name = $"{serverKey}{ToolsUtility.McpToolSeparator}{tool.GetProperty("name").GetString()!}";
-            var description = tool.GetProperty("description").GetString()!;
-#pragma warning disable IL2026, IL3050
-            var inputSchema = JsonSerializer.Serialize(
-                JsonSerializer.Deserialize<JsonElement>(tool.GetProperty("inputSchema").GetRawText()),
-                new JsonSerializerOptions { Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping });
-#pragma warning restore IL2026, IL3050
-
             var chatTool = ChatTool.CreateFunctionTool(name, description, BinaryData.FromString(inputSchema));
             _tools.Add(chatTool);
             toolsToVectorize.Add(chatTool);

src/Utility/ResponseTools.cs

@@ -114,23 +114,11 @@ public async Task AddMcpToolsAsync(Uri mcpEndpoint)
 
     private async Task AddToolsAsync(BinaryData toolDefinitions, McpClient client)
     {
-        using var document = JsonDocument.Parse(toolDefinitions);
-        if (!document.RootElement.TryGetProperty("tools", out JsonElement toolsElement))
-            throw new JsonException("The JSON document must contain a 'tools' array.");
-
-        var serverKey = client.Endpoint.Host + client.Endpoint.Port.ToString();
         List<ResponseTool> toolsToVectorize = new();
+        var parsedTools = ToolsUtility.ParseMcpToolDefinitions(toolDefinitions, client);
 
-        foreach (var tool in toolsElement.EnumerateArray())
+        foreach (var (name, description, inputSchema) in parsedTools)
         {
-            var name = $"{serverKey}{ToolsUtility.McpToolSeparator}{tool.GetProperty("name").GetString()!}";
-            var description = tool.GetProperty("description").GetString()!;
-#pragma warning disable IL2026, IL3050
-            var inputSchema = JsonSerializer.Serialize(
-                JsonSerializer.Deserialize<JsonElement>(tool.GetProperty("inputSchema").GetRawText()),
-                new JsonSerializerOptions { Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping });
-#pragma warning restore IL2026, IL3050
-
             var responseTool = ResponseTool.CreateFunctionTool(name, description, BinaryData.FromString(inputSchema));
             _tools.Add(responseTool);
             toolsToVectorize.Add(responseTool);

src/Utility/ToolsUtility.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Text.Json;
 using System.Threading.Tasks;
+using OpenAI.Agents;
 using OpenAI.Embeddings;
 
 namespace OpenAI;
@@ -113,4 +114,27 @@ internal static float CosineSimilarity(ReadOnlySpan<float> x, ReadOnlySpan<float
         return dot / (MathF.Sqrt(xSumSquared) * MathF.Sqrt(ySumSquared));
 #endif
     }
+
+    internal static IEnumerable<(string name, string description, string inputSchema)> ParseMcpToolDefinitions(BinaryData toolDefinitions, McpClient client)
+    {
+        using var document = JsonDocument.Parse(toolDefinitions);
+        if (!document.RootElement.TryGetProperty("tools", out JsonElement toolsElement))
+            throw new JsonException("The JSON document must contain a 'tools' array.");
+
+        var serverKey = client.Endpoint.Host + client.Endpoint.Port.ToString();
+        var result = new List<(string name, string description, string inputSchema)>();
+
+        foreach (var tool in toolsElement.EnumerateArray())
+        {
+            var name = $"{serverKey}{McpToolSeparator}{tool.GetProperty("name").GetString()!}";
+            var description = tool.GetProperty("description").GetString()!;
+            var inputSchema = JsonSerializer.Serialize(
+                JsonSerializer.Deserialize<JsonElement>(tool.GetProperty("inputSchema").GetRawText()),
+                new JsonSerializerOptions { Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping });
+
+            result.Add((name, description, inputSchema));
+        }
+
+        return result;
+    }
 }