mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
* Initial plan * Update code for Microsoft.Extensions.AI.Abstractions 10.4.0 breaking changes - Rename FunctionApprovalRequestContent → ToolApprovalRequestContent - Rename FunctionApprovalResponseContent → ToolApprovalResponseContent - Rename UserInputRequestContent → ToolApprovalRequestContent - Rename UserInputResponseContent → ToolApprovalResponseContent - Update .FunctionCall property → .ToolCall with FunctionCallContent casts where needed - Update .Id property → .RequestId on the renamed types - Rename FunctionApprovalRequestEventGenerator → ToolApprovalRequestEventGenerator - Rename FunctionApprovalResponseEventGenerator → ToolApprovalResponseEventGenerator Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Update OpenAI 2.9.1, ME.AI 10.4.0, fix breaking API changes Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com> * Fix remaining ME.AI 10.4.0 breaking changes: MCP approval types, .Output→.Outputs Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com> * Use pattern matching with `when` for ToolApprovalRequestContent/FunctionCallContent Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com> * Update Azure.AI.OpenAI to 2.9.0-beta.1 Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com> * Fix remaining GetResponsesClient(model) build failures for Azure.AI.OpenAI 2.9.0-beta.1 Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com> * Address review feedback: remove redundant type checks in TestRequestAgent.cs and fix error message in AIAgentHostExecutor.cs Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com> * Update Azure.AI.Projects to 2.0.0-beta.2 with namespace migration - Azure.AI.Projects 2.0.0-beta.1 → 2.0.0-beta.2 - Azure.AI.Projects.OpenAI → Azure.AI.Extensions.OpenAI (transitive) - Agent types moved to Azure.AI.Projects.Agents namespace - AgentRecord.Versions.Latest → AgentRecord.GetLatestVersion() - OpenAPIFunctionDefinition → OpenApiFunctionDefinition - BingCustomSearchToolParameters → BingCustomSearchToolOptions - MemorySearchPreviewTool.UpdateDelay → UpdateDelayInSecs - Azure.Identity 1.17.1 → 1.19.0 - Microsoft.Identity.Client.Extensions.Msal 4.78.0 → 4.83.1 Co-authored-by: rogerbarreto <19890735+rogerbarreto@users.noreply.github.com> * Fix remaining type renames for Azure.AI.Projects 2.0.0-beta.2 - BrowserAutomationToolParameters → BrowserAutomationToolOptions - MemoryUpdateOptions.UpdateDelay stays as UpdateDelay (not renamed) - WaitForMemoriesUpdateAsync parameter order: pollingInterval before options - AIProjectAgentsOperations → AgentsClient Co-authored-by: rogerbarreto <19890735+rogerbarreto@users.noreply.github.com> * Fix format errors and OpenTelemetry test for ME.AI 10.4.0 - Remove unused 'using Azure.AI.Extensions.OpenAI' and fix import ordering in Agent_With_AzureAIProject/Program.cs - Update OpenTelemetryAgentTests: gen_ai.tool.definitions is now always emitted regardless of EnableSensitiveData per ME.AI 10.4.0 change (dotnet/extensions#7346). Tool definitions are not considered sensitive. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix GetRepoFolder() to work in git worktrees Use 'workflow-samples' directory as repo root marker instead of '.git', which fails in worktrees (.git is a file) and also matches too early when a '.github' folder exists in subdirectories. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix formatting: remove unused usings and fix import ordering dotnet format applied across 59 impacted projects. Primarily removes unnecessary 'using Azure.AI.Projects' where Azure.AI.Projects.Agents provides all needed types, and fixes import ordering per editorconfig. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Disable AzureAIAgentsPersistent integration tests (#4769) Azure.AI.Agents.Persistent 1.2.0-beta.9 references McpServerToolApprovalResponseContent which was removed in ME.AI 10.4.0 (renamed to ToolApprovalResponseContent), causing TypeLoadException at runtime. Mark all 6 test classes with IntegrationDisabled trait until Persistent ships a version targeting ME.AI 10.4.0+. Upstream fix: https://github.com/Azure/azure-sdk-for-net/pull/56929 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add README with compatibility note for AzureAI.Persistent (#4769) Documents that Azure.AI.Agents.Persistent 1.2.0-beta.9 is only compatible with ME.AI ≤10.3.0 and OpenAI ≤2.8.0 due to type renames in ME.AI 10.4.0. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix file encoding: restore UTF-8 BOM on Persistent test files Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Mark AzureAI.Persistent as IsPackable=false (#4769) Prevent shipping until Azure.AI.Agents.Persistent targets ME.AI 10.4.0+. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Moving IsPackable after import --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com> Co-authored-by: rogerbarreto <19890735+rogerbarreto@users.noreply.github.com>
195 lines
7.6 KiB
C#
195 lines
7.6 KiB
C#
// Copyright (c) Microsoft. All rights reserved.
|
|
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Text.Json;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Agents.AI.Workflows.Declarative.Events;
|
|
using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
|
|
using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
|
|
using Microsoft.Agents.AI.Workflows.Declarative.Kit;
|
|
using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
|
|
using Microsoft.Agents.ObjectModel;
|
|
using Microsoft.Agents.ObjectModel.Abstractions;
|
|
using Microsoft.Extensions.AI;
|
|
using Microsoft.Shared.Diagnostics;
|
|
|
|
namespace Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
|
|
|
|
[SendsMessage(typeof(ExternalInputRequest))]
|
|
internal sealed class InvokeAzureAgentExecutor(InvokeAzureAgent model, ResponseAgentProvider agentProvider, WorkflowFormulaState state) :
|
|
DeclarativeActionExecutor<InvokeAzureAgent>(model, state)
|
|
{
|
|
public static class Steps
|
|
{
|
|
public static string ExternalInput(string id) => $"{id}_{nameof(ExternalInput)}";
|
|
public static string Resume(string id) => $"{id}_{nameof(Resume)}";
|
|
}
|
|
|
|
public static bool RequiresInput(object? message) => message is ExternalInputRequest;
|
|
|
|
public static bool RequiresNothing(object? message) => message is ActionExecutorResult;
|
|
|
|
private AzureAgentUsage AgentUsage => Throw.IfNull(this.Model.Agent, $"{nameof(this.Model)}.{nameof(this.Model.Agent)}");
|
|
private AzureAgentInput? AgentInput => this.Model.Input;
|
|
private AzureAgentOutput? AgentOutput => this.Model.Output;
|
|
|
|
protected override bool EmitResultEvent => false;
|
|
protected override bool IsDiscreteAction => false;
|
|
|
|
protected override async ValueTask<object?> ExecuteAsync(IWorkflowContext context, CancellationToken cancellationToken = default)
|
|
{
|
|
await this.InvokeAgentAsync(context, this.GetInputMessages(), cancellationToken).ConfigureAwait(false);
|
|
|
|
return default;
|
|
}
|
|
|
|
public async ValueTask ResumeAsync(IWorkflowContext context, ExternalInputResponse response, CancellationToken cancellationToken)
|
|
{
|
|
await context.SetLastMessageAsync(response.Messages.Last()).ConfigureAwait(false);
|
|
await this.InvokeAgentAsync(context, response.Messages, cancellationToken).ConfigureAwait(false);
|
|
}
|
|
|
|
public async ValueTask CompleteAsync(IWorkflowContext context, ActionExecutorResult message, CancellationToken cancellationToken)
|
|
{
|
|
await context.RaiseCompletionEventAsync(this.Model, cancellationToken).ConfigureAwait(false);
|
|
}
|
|
|
|
private async ValueTask InvokeAgentAsync(IWorkflowContext context, IEnumerable<ChatMessage>? messages, CancellationToken cancellationToken)
|
|
{
|
|
string? conversationId = this.GetConversationId();
|
|
string agentName = this.GetAgentName();
|
|
bool autoSend = this.GetAutoSendValue();
|
|
Dictionary<string, object?>? inputParameters = this.GetStructuredInputs();
|
|
AgentResponse agentResponse = await agentProvider.InvokeAgentAsync(this.Id, context, agentName, conversationId, autoSend, messages, inputParameters, cancellationToken).ConfigureAwait(false);
|
|
|
|
ChatMessage[] actionableMessages = FilterActionableContent(agentResponse).ToArray();
|
|
if (actionableMessages.Length > 0)
|
|
{
|
|
AgentResponse filteredResponse =
|
|
new(actionableMessages)
|
|
{
|
|
AdditionalProperties = agentResponse.AdditionalProperties,
|
|
AgentId = agentResponse.AgentId,
|
|
CreatedAt = agentResponse.CreatedAt,
|
|
ResponseId = agentResponse.ResponseId,
|
|
Usage = agentResponse.Usage,
|
|
};
|
|
await context.SendMessageAsync(new ExternalInputRequest(filteredResponse), cancellationToken).ConfigureAwait(false);
|
|
return;
|
|
}
|
|
|
|
await this.AssignAsync(this.AgentOutput?.Messages?.Path, agentResponse.Messages.ToTable(), context).ConfigureAwait(false);
|
|
|
|
// Attempt to parse the last message as JSON and assign to the response object variable.
|
|
try
|
|
{
|
|
JsonDocument jsonDocument = JsonDocument.Parse(agentResponse.Messages.Last().Text);
|
|
Dictionary<string, object?> objectProperties = jsonDocument.ParseRecord(VariableType.RecordType);
|
|
await this.AssignAsync(this.AgentOutput?.ResponseObject?.Path, objectProperties.ToFormula(), context).ConfigureAwait(false);
|
|
}
|
|
catch
|
|
{
|
|
// Not valid json, skip assignment.
|
|
}
|
|
|
|
if (this.Model.Input?.ExternalLoop?.When is not null)
|
|
{
|
|
bool requestInput = this.Evaluator.GetValue(this.Model.Input.ExternalLoop.When).Value;
|
|
if (requestInput)
|
|
{
|
|
ExternalInputRequest inputRequest = new(agentResponse);
|
|
await context.SendMessageAsync(inputRequest, cancellationToken).ConfigureAwait(false);
|
|
return;
|
|
}
|
|
}
|
|
|
|
await context.SendResultMessageAsync(this.Id, result: null, cancellationToken).ConfigureAwait(false);
|
|
}
|
|
|
|
private Dictionary<string, object?>? GetStructuredInputs()
|
|
{
|
|
Dictionary<string, object?>? inputs = null;
|
|
|
|
if (this.AgentInput?.Arguments is not null)
|
|
{
|
|
inputs = [];
|
|
|
|
foreach (KeyValuePair<string, ValueExpression> argument in this.AgentInput.Arguments)
|
|
{
|
|
inputs[argument.Key] = this.Evaluator.GetValue(argument.Value).Value.ToObject();
|
|
}
|
|
}
|
|
|
|
return inputs;
|
|
}
|
|
|
|
private IEnumerable<ChatMessage>? GetInputMessages()
|
|
{
|
|
DataValue? userInput = null;
|
|
|
|
if (this.AgentInput?.Messages is not null)
|
|
{
|
|
EvaluationResult<DataValue> expressionResult = this.Evaluator.GetValue(this.AgentInput.Messages);
|
|
userInput = expressionResult.Value;
|
|
}
|
|
|
|
return userInput?.ToChatMessages();
|
|
}
|
|
|
|
private static IEnumerable<ChatMessage> FilterActionableContent(AgentResponse agentResponse)
|
|
{
|
|
HashSet<string> functionResultIds =
|
|
[.. agentResponse.Messages
|
|
.SelectMany(
|
|
m =>
|
|
m.Contents
|
|
.OfType<FunctionResultContent>()
|
|
.Select(functionCall => functionCall.CallId))];
|
|
|
|
foreach (ChatMessage responseMessage in agentResponse.Messages)
|
|
{
|
|
if (responseMessage.Contents.Any(content => content is ToolApprovalRequestContent))
|
|
{
|
|
yield return responseMessage;
|
|
continue;
|
|
}
|
|
|
|
if (responseMessage.Contents.OfType<FunctionCallContent>().Any(functionCall => !functionResultIds.Contains(functionCall.CallId)))
|
|
{
|
|
yield return responseMessage;
|
|
}
|
|
}
|
|
}
|
|
|
|
private string? GetConversationId()
|
|
{
|
|
if (this.Model.ConversationId is null)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
EvaluationResult<string> conversationIdResult = this.Evaluator.GetValue(this.Model.ConversationId);
|
|
return conversationIdResult.Value.Length == 0 ? null : conversationIdResult.Value;
|
|
}
|
|
|
|
private string GetAgentName() =>
|
|
this.Evaluator.GetValue(
|
|
Throw.IfNull(
|
|
this.AgentUsage.Name,
|
|
$"{nameof(this.Model)}.{nameof(this.Model.Agent)}.{nameof(this.Model.Agent.Name)}")).Value;
|
|
|
|
private bool GetAutoSendValue()
|
|
{
|
|
if (this.AgentOutput?.AutoSend is null)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
EvaluationResult<bool> autoSendResult = this.Evaluator.GetValue(this.AgentOutput.AutoSend);
|
|
|
|
return autoSendResult.Value;
|
|
}
|
|
}
|