Skip to content

Add ChatTools and ResponseTools helper classes #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joseharriaga merged 28 commits into from
May 9, 2025
Merged

Add ChatTools and ResponseTools helper classes #422

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a0ec8a3
wip
christothes Apr 28, 2025
04b7069
wip
christothes Apr 29, 2025
294ed2d
wip
christothes Apr 29, 2025
d909b21
wip
christothes Apr 30, 2025
1dfadee
fix mcp name placeholder
christothes Apr 30, 2025
12e8a87
make mcp types internal
christothes Apr 30, 2025
47f3e2d
cleanup
christothes Apr 30, 2025
93f94c6
docs
christothes May 1, 2025
8ab51f1
cleanup
christothes May 1, 2025
4309965
namespaces
christothes May 1, 2025
dcc655c
feedback
christothes May 1, 2025
24f1821
feedback
christothes May 1, 2025
a63b571
feedback
christothes May 1, 2025
7bc969c
feedback
christothes May 1, 2025
d8da69a
wip tests
christothes May 1, 2025
567ffa0
tests
christothes May 2, 2025
fe67356
fb
christothes May 2, 2025
385dd35
fb
christothes May 2, 2025
78e3e5f
refactor
christothes May 2, 2025
f46fd40
fb
christothes May 2, 2025
4009c2b
fb
christothes May 2, 2025
5703fc0
fb
christothes May 5, 2025
76b907a
fb
christothes May 5, 2025
5ce1d02
fb
christothes May 5, 2025
c984bc8
async tools
christothes May 6, 2025
de89187
fix rename
christothes May 6, 2025
869a455
remove McpClient
christothes May 8, 2025
6079911
warnings
christothes May 8, 2025
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
make mcp types internal
  • Loading branch information
@christothes
christothes committed Apr 30, 2025
commit 12e8a87b56e32bf0750f62a70272ff80adde8d73
2 changes: 1 addition & 1 deletion src/Utility/ChatTools.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public ChatTools(Type tool, params Type[] additionalTools) : this((EmbeddingClie
internal override ChatTool MethodInfoToTool(MethodInfo methodInfo) =>
ChatTool.CreateFunctionTool(methodInfo.Name, GetMethodDescription(methodInfo), BuildParametersJson(methodInfo.GetParameters()));

protected override async Task Add(BinaryData toolDefinitions, McpClient client)
internal override async Task Add(BinaryData toolDefinitions, McpClient client)
{
using var document = JsonDocument.Parse(toolDefinitions);
if (!document.RootElement.TryGetProperty("tools", out JsonElement toolsElement))
Expand Down
2 changes: 1 addition & 1 deletion src/Utility/MCP/McpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OpenAI;

public class McpClient
internal class McpClient
{
private readonly McpSession _session;
private readonly ClientPipeline _pipeline = ClientPipeline.Create();
Expand Down
2 changes: 1 addition & 1 deletion src/Utility/ResponseTools.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public ResponseTools(Type tool, params Type[] additionalTools) : this((Embedding
internal override ResponseTool MethodInfoToTool(MethodInfo methodInfo) =>
ResponseTool.CreateFunctionTool(methodInfo.Name, GetMethodDescription(methodInfo), BuildParametersJson(methodInfo.GetParameters()));

protected override async Task Add(BinaryData toolDefinitions, McpClient client)
internal override async Task Add(BinaryData toolDefinitions, McpClient client)
{
using var document = JsonDocument.Parse(toolDefinitions);
if (!document.RootElement.TryGetProperty("tools", out JsonElement toolsElement))
Expand Down
8 changes: 4 additions & 4 deletions src/Utility/ToolsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ public abstract class ToolsBase<TTool> where TTool : class
protected readonly EmbeddingClient _client;
protected readonly List<VectorbaseEntry> _entries = [];

protected readonly List<McpClient> _mcpClients = [];
protected readonly Dictionary<string, McpClient> _mcpClientsByEndpoint = [];
internal readonly List<McpClient> _mcpClients = [];
internal readonly Dictionary<string, McpClient> _mcpClientsByEndpoint = [];
protected const string _mcpToolSeparator = "_-_";

protected ToolsBase(EmbeddingClient client = null)
Expand All @@ -44,7 +44,7 @@ public void AddLocalTools(params Type[] tools)
Add(functionHolder);
}

public async Task AddMcpServerAsync(McpClient client)
internal async Task AddMcpServerAsync(McpClient client)
{
if (client == null) throw new ArgumentNullException(nameof(client));
_mcpClientsByEndpoint[client.ServerEndpoint.AbsoluteUri] = client;
Expand Down Expand Up @@ -80,7 +80,7 @@ public void Add(MethodInfo function)

internal abstract TTool MethodInfoToTool(MethodInfo methodInfo);

protected abstract Task Add(BinaryData toolDefinitions, McpClient client);
internal abstract Task Add(BinaryData toolDefinitions, McpClient client);

public string Call(string name, object[] arguments)
{
Expand Down