Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fb
  • Loading branch information
christothes committed May 2, 2025
commit 4009c2b10ee9ab5fee5b5b7f6086314a9f589188
15 changes: 1 addition & 14 deletions src/Utility/ChatTools.cs
Original file line number Diff line number Diff line change
Expand Up @@ -140,20 +140,7 @@ private async Task AddToolsAsync(BinaryData toolDefinitions, McpClient client)

private BinaryData SerializeTool(ChatTool tool)
{
using var stream = new MemoryStream();
using var writer = new Utf8JsonWriter(stream, new JsonWriterOptions { Indented = true });

writer.WriteStartObject();
writer.WriteString("name", tool.FunctionName);
writer.WriteString("description", tool.FunctionDescription);
writer.WritePropertyName("inputSchema");
using (var doc = JsonDocument.Parse(tool.FunctionParameters))
doc.RootElement.WriteTo(writer);
writer.WriteEndObject();
writer.Flush();

stream.Position = 0;
return BinaryData.FromStream(stream);
return ToolsUtility.SerializeTool(tool.FunctionName, tool.FunctionDescription, tool.FunctionParameters);
}

private ChatTool ParseToolDefinition(BinaryData data)
Expand Down
15 changes: 1 addition & 14 deletions src/Utility/ResponseTools.cs
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,7 @@ private async Task AddToolsAsync(BinaryData toolDefinitions, McpClient client)
private BinaryData SerializeTool(ResponseTool tool)
{
var functionTool = tool as InternalResponsesFunctionTool;
using var stream = new MemoryStream();
using var writer = new Utf8JsonWriter(stream, new JsonWriterOptions { Indented = true });

writer.WriteStartObject();
writer.WriteString("name", functionTool?.Name);
writer.WriteString("description", functionTool?.Description);
writer.WritePropertyName("inputSchema");
using (var doc = JsonDocument.Parse(functionTool?.Parameters ?? BinaryData.FromString("{}")))
doc.RootElement.WriteTo(writer);
writer.WriteEndObject();
writer.Flush();

stream.Position = 0;
return BinaryData.FromStream(stream);
return ToolsUtility.SerializeTool(functionTool?.Name, functionTool?.Description, functionTool?.Parameters ?? BinaryData.FromString("{}"));
}

private ResponseTool ParseToolDefinition(BinaryData data)
Expand Down
18 changes: 18 additions & 0 deletions src/Utility/ToolsUtility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -173,4 +173,22 @@ internal static IEnumerable<VectorbaseEntry> GetClosestEntries(List<VectorbaseEn

return distances.Select(d => entries[d.Index]);
}

internal static BinaryData SerializeTool(string name, string description, BinaryData parameters)
{
using var stream = new MemoryStream();
using var writer = new Utf8JsonWriter(stream, new JsonWriterOptions { Indented = true });

writer.WriteStartObject();
writer.WriteString("name", name);
writer.WriteString("description", description);
writer.WritePropertyName("inputSchema");
using (var doc = JsonDocument.Parse(parameters))
doc.RootElement.WriteTo(writer);
writer.WriteEndObject();
writer.Flush();

stream.Position = 0;
return BinaryData.FromStream(stream);
}
}