agent/agent-framework
2
0
Fork 0
mirror of https://github.com/microsoft/agent-framework.git synced 2026-06-16 21:04:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

.Net: FileSearch Tool Sample + API Proposal Updates for MEAI.Abstractions/Azure.AI.Agents (#210)

Browse Source 
* Wip, bringing persistent chat client back

* Bring back code interpreter resource logic

* Add file search samples and proposal for new OpenAIAssistantChatClient and AgentPersistantChatCLient

* Update dotnet/samples/GettingStarted/External/MEAI.Abstractions/NewHostedFileSearchTool.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update dotnet/samples/GettingStarted/Steps/Step04_ChatClientAgent_UsingFileSearchTools.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update dotnet/samples/GettingStarted/External/Azure.AI.Agents.Persistent/NewPersistentAgentsChatClient.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update MEAI abstractions to reflect latest discussions, updated underlying chatclients

* Remove unneeded comments

* Address PR feedback

* Address PR feedback

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Roger Barreto
2025-07-29 11:41:35 +01:00
committed by GitHub
Unverified
parent dff700e469
commit 02814a4fc0
10 changed files with 881 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dotnet/samples/GettingStarted/External/MEAI.OpenAI/NewOpenAIAssistantChatClient.cs
Vendored
+108 -6
View File
@@ -80,6 +80,74 @@ public sealed class NewOpenAIAssistantChatClient : IChatClient
IEnumerable<ChatMessage> messages, ChatOptions? options = null, CancellationToken cancellationToken = default) =>
GetStreamingResponseAsync(messages, options, cancellationToken).ToChatResponseAsync(cancellationToken);
private ToolResources? CreateToolResources(ChatOptions? options)
{
if (options is null)
{
return null;
}
if (options.Tools is { Count: > 0 } tools)
{
FileSearchToolResources? fileSearchResources = null;
CodeInterpreterToolResources? codeInterpreterResources = null;
// The caller can provide tools in the supplied ThreadAndRunOptions. Augment it with any supplied via ChatOptions.Tools.
foreach (AITool tool in tools)
{
switch (tool)
{
case NewHostedCodeInterpreterTool codeTool:
if (codeTool.Inputs is { Count: > 0 })
{
codeInterpreterResources ??= new();
foreach (var input in codeTool.Inputs)
{
switch (input)
{
case HostedFileContent fileContent:
// Use the file ID from the HostedFileContent.
codeInterpreterResources.FileIds.Add(fileContent.FileId);
break;
}
}
}
break;
case NewHostedFileSearchTool fileSearchTool:
// Handle file IDs for file search tool
if (fileSearchTool.Inputs is { Count: > 0 })
{
fileSearchResources ??= new();
foreach (var input in fileSearchTool.Inputs)
{
switch (input)
{
case HostedVectorStoreContent vectorStoreContent:
// Use the vector store ID from the HostedVectorStoreContent.
fileSearchResources.VectorStoreIds.Add(vectorStoreContent.VectorStoreId);
break;
}
}
}
break;
}
}
return new ToolResources
{
CodeInterpreter = codeInterpreterResources,
FileSearch = fileSearchResources,
};
}
return null;
}
/// <inheritdoc />
public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
IEnumerable<ChatMessage> messages, ChatOptions? options = null, [EnumeratorCancellation] CancellationToken cancellationToken = default)
@@ -132,7 +200,11 @@ public sealed class NewOpenAIAssistantChatClient : IChatClient
if (threadId is null)
{
// No thread ID was provided, so create a new thread.
ThreadCreationOptions threadCreationOptions = new();
ThreadCreationOptions threadCreationOptions = new()
{
ToolResources = CreateToolResources(options)
};
foreach (var message in runOptions.AdditionalMessages)
{
threadCreationOptions.InitialMessages.Add(message);
@@ -303,18 +375,48 @@ public sealed class NewOpenAIAssistantChatClient : IChatClient
runOptions.ToolsOverride.Add(ToOpenAIAssistantsFunctionToolDefinition(aiFunction, options));
break;
case HostedCodeInterpreterTool:
case NewHostedCodeInterpreterTool codeTool:
var codeInterpreterToolDefinition = new CodeInterpreterToolDefinition();
runOptions.ToolsOverride.Add(codeInterpreterToolDefinition);
// Once available, HostedCodeInterpreterTool.FileIds property will be used instead of the AdditionalProperties.
if (tool.AdditionalProperties.TryGetValue("fileIds", out object? fileIdsObject) && fileIdsObject is IEnumerable<string> fileIds)
if (codeTool.Inputs is { Count: > 0 })
{
var threadInitializationMessage = new ThreadInitializationMessage(OpenAI.Assistants.MessageRole.User, [OpenAI.Assistants.MessageContent.FromText("attachments")]);
foreach (var fileId in fileIds)
foreach (var input in codeTool.Inputs)
{
threadInitializationMessage.Attachments.Add(new(fileId, [codeInterpreterToolDefinition]));
switch (input)
{
case HostedFileContent fileContent:
// Use the file ID from the HostedFileContent.
threadInitializationMessage.Attachments.Add(new(fileContent.FileId, [codeInterpreterToolDefinition]));
break;
}
}
runOptions.AdditionalMessages.Add(threadInitializationMessage);
}
break;
case NewHostedFileSearchTool fileSearchTool:
var fileSearchToolDefinition = new FileSearchToolDefinition();
runOptions.ToolsOverride.Add(fileSearchToolDefinition);
// Handle file IDs for file search tool
if (fileSearchTool.Inputs is { Count: > 0 })
{
var threadInitializationMessage = new ThreadInitializationMessage(OpenAI.Assistants.MessageRole.User, [OpenAI.Assistants.MessageContent.FromText("file search attachments")]);
foreach (var input in fileSearchTool.Inputs)
{
switch (input)
{
case HostedFileContent fileContent:
// Use the file ID from the HostedFileContent.
threadInitializationMessage.Attachments.Add(new(fileContent.FileId, [fileSearchToolDefinition]));
break;
}
}
runOptions.AdditionalMessages.Add(threadInitializationMessage);