mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
9506fb28f6
* .NET: Delete AgentResponse.{Try}Deserialize<T> methods (#3518)
* delete deserialize method of agent response
* order usings
* Update dotnet/samples/GettingStarted/FoundryAgents/FoundryAgents_Step05_StructuredOutput/Program.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update dotnet/samples/GettingStarted/Workflows/_Foundational/08_WriterCriticWorkflow/Program.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update dotnet/samples/GettingStarted/AGUI/Step05_StateManagement/Server/SharedStateAgent.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update dotnet/samples/AGUIClientServer/AGUIDojoServer/SharedState/SharedStateAgent.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update dotnet/samples/M365Agent/Agents/WeatherForecastAgent.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* .NET:[Breaking] Add support for structured output (#3658)
* add support for so
* restore lost xml comment part
* fix using ordering
* Update dotnet/src/Microsoft.Agents.AI.Abstractions/AIAgentStructuredOutput.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update dotnet/src/Microsoft.Agents.AI.Abstractions/AIAgentStructuredOutput.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update dotnet/tests/Microsoft.Agents.AI.UnitTests/ChatClient/ChatClientAgent_SO_WithFormatResponseTests.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* addressw pr review comments
* address pr review feedback
* address pr review comments
* fix compilation issues after the latest merge with main
* remove unnecessry options
* remove RunAsync<object> methods
* address code review feedback
* address pr review feedback
* make copy constructor protected
* address pr review feedback
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* .NET: Add decorator for structured output support (#3694)
* add decorator that adds structured output support to agents that don't natively support it.
* Update dotnet/src/Microsoft.Agents.AI/StructuredOutput/StructuredOutputAgentResponse.cs
Co-authored-by: westey <164392973+westey-m@users.noreply.github.com>
* Update dotnet/samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Program.cs
Co-authored-by: westey <164392973+westey-m@users.noreply.github.com>
* address pr review feedback
---------
Co-authored-by: westey <164392973+westey-m@users.noreply.github.com>
* .NET: Support primitives and arrays for SO (#3696)
* wrap primitives and arrays
* fix file encoding
* address review comments
* add adr
* add missed change
* fix compilation issue
* address review comments
* rename adr file name
* reflect decision to have SO decorator as a reference implementation in samples
* .NET: Move SO agent to samples (#3820)
* move SO agent to samples
* change file encoding
* fix files encoding
* .NET: Preserve caller context (#3803)
* fix stuck orchestration
* add previously removed RunAsync<T> method to DurableAIAgent
* suppress IDE0005 warning
* update changelog and remove unused constructor of AgentResponse<T>
* updatge the changelog
* address PR review feedback
* .NET: Disable irrelevant integration test (#3913)
* disable irrelevant integration test
* Update dotnet/tests/AzureAI.IntegrationTests/AIProjectClientAgentStructuredOutputRunTests.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* forgotten change
* address pr review feedback
* disable intermittently failing integration test.
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: westey <164392973+westey-m@users.noreply.github.com>
159 lines
6.0 KiB
C#
159 lines
6.0 KiB
C#
// Copyright (c) Microsoft. All rights reserved.
|
|
|
|
using System.Runtime.CompilerServices;
|
|
using System.Text.Json;
|
|
using Microsoft.Agents.AI;
|
|
using Microsoft.Extensions.AI;
|
|
|
|
namespace RecipeAssistant;
|
|
|
|
internal sealed class SharedStateAgent : DelegatingAIAgent
|
|
{
|
|
private readonly JsonSerializerOptions _jsonSerializerOptions;
|
|
|
|
public SharedStateAgent(AIAgent innerAgent, JsonSerializerOptions jsonSerializerOptions)
|
|
: base(innerAgent)
|
|
{
|
|
this._jsonSerializerOptions = jsonSerializerOptions;
|
|
}
|
|
|
|
protected override Task<AgentResponse> RunCoreAsync(
|
|
IEnumerable<ChatMessage> messages,
|
|
AgentSession? session = null,
|
|
AgentRunOptions? options = null,
|
|
CancellationToken cancellationToken = default)
|
|
{
|
|
return this.RunCoreStreamingAsync(messages, session, options, cancellationToken)
|
|
.ToAgentResponseAsync(cancellationToken);
|
|
}
|
|
|
|
protected override async IAsyncEnumerable<AgentResponseUpdate> RunCoreStreamingAsync(
|
|
IEnumerable<ChatMessage> messages,
|
|
AgentSession? session = null,
|
|
AgentRunOptions? options = null,
|
|
[EnumeratorCancellation] CancellationToken cancellationToken = default)
|
|
{
|
|
// Check if the client sent state in the request
|
|
if (options is not ChatClientAgentRunOptions { ChatOptions.AdditionalProperties: { } properties } chatRunOptions ||
|
|
!properties.TryGetValue("ag_ui_state", out object? stateObj) ||
|
|
stateObj is not JsonElement state ||
|
|
state.ValueKind != JsonValueKind.Object)
|
|
{
|
|
// No state management requested, pass through to inner agent
|
|
await foreach (var update in this.InnerAgent.RunStreamingAsync(messages, session, options, cancellationToken).ConfigureAwait(false))
|
|
{
|
|
yield return update;
|
|
}
|
|
yield break;
|
|
}
|
|
|
|
// Check if state has properties (not empty {})
|
|
bool hasProperties = false;
|
|
foreach (JsonProperty _ in state.EnumerateObject())
|
|
{
|
|
hasProperties = true;
|
|
break;
|
|
}
|
|
|
|
if (!hasProperties)
|
|
{
|
|
// Empty state - treat as no state
|
|
await foreach (var update in this.InnerAgent.RunStreamingAsync(messages, session, options, cancellationToken).ConfigureAwait(false))
|
|
{
|
|
yield return update;
|
|
}
|
|
yield break;
|
|
}
|
|
|
|
// First run: Generate structured state update
|
|
var firstRunOptions = new ChatClientAgentRunOptions
|
|
{
|
|
ChatOptions = chatRunOptions.ChatOptions.Clone(),
|
|
AllowBackgroundResponses = chatRunOptions.AllowBackgroundResponses,
|
|
ContinuationToken = chatRunOptions.ContinuationToken,
|
|
ChatClientFactory = chatRunOptions.ChatClientFactory,
|
|
};
|
|
|
|
// Configure JSON schema response format for structured state output
|
|
firstRunOptions.ChatOptions.ResponseFormat = ChatResponseFormat.ForJsonSchema<AgentState>(
|
|
schemaName: "AgentState",
|
|
schemaDescription: "A response containing a recipe with title, skill level, cooking time, ingredients, and instructions");
|
|
|
|
// Add current state to the conversation - state is already a JsonElement
|
|
ChatMessage stateUpdateMessage = new(
|
|
ChatRole.System,
|
|
[
|
|
new TextContent("Here is the current state in JSON format:"),
|
|
new TextContent(JsonSerializer.Serialize(state, this._jsonSerializerOptions.GetTypeInfo(typeof(JsonElement)))),
|
|
new TextContent("The new state is:")
|
|
]);
|
|
|
|
var firstRunMessages = messages.Append(stateUpdateMessage);
|
|
|
|
// Collect all updates from first run
|
|
var allUpdates = new List<AgentResponseUpdate>();
|
|
await foreach (var update in this.InnerAgent.RunStreamingAsync(firstRunMessages, session, firstRunOptions, cancellationToken).ConfigureAwait(false))
|
|
{
|
|
allUpdates.Add(update);
|
|
|
|
// Yield all non-text updates (tool calls, etc.)
|
|
bool hasNonTextContent = update.Contents.Any(c => c is not TextContent);
|
|
if (hasNonTextContent)
|
|
{
|
|
yield return update;
|
|
}
|
|
}
|
|
|
|
var response = allUpdates.ToAgentResponse();
|
|
|
|
// Try to deserialize the structured state response
|
|
if (TryDeserialize(response.Text, this._jsonSerializerOptions, out JsonElement stateSnapshot))
|
|
{
|
|
// Serialize and emit as STATE_SNAPSHOT via DataContent
|
|
byte[] stateBytes = JsonSerializer.SerializeToUtf8Bytes(
|
|
stateSnapshot,
|
|
this._jsonSerializerOptions.GetTypeInfo(typeof(JsonElement)));
|
|
yield return new AgentResponseUpdate
|
|
{
|
|
Contents = [new DataContent(stateBytes, "application/json")]
|
|
};
|
|
}
|
|
else
|
|
{
|
|
yield break;
|
|
}
|
|
|
|
// Second run: Generate user-friendly summary
|
|
var secondRunMessages = messages.Concat(response.Messages).Append(
|
|
new ChatMessage(
|
|
ChatRole.System,
|
|
[new TextContent("Please provide a concise summary of the state changes in at most two sentences.")]));
|
|
|
|
await foreach (var update in this.InnerAgent.RunStreamingAsync(secondRunMessages, session, options, cancellationToken).ConfigureAwait(false))
|
|
{
|
|
yield return update;
|
|
}
|
|
}
|
|
|
|
private static bool TryDeserialize<T>(string json, JsonSerializerOptions jsonSerializerOptions, out T structuredOutput)
|
|
{
|
|
try
|
|
{
|
|
T? deserialized = JsonSerializer.Deserialize<T>(json, jsonSerializerOptions);
|
|
if (deserialized is null)
|
|
{
|
|
structuredOutput = default!;
|
|
return false;
|
|
}
|
|
|
|
structuredOutput = deserialized;
|
|
return true;
|
|
}
|
|
catch
|
|
{
|
|
structuredOutput = default!;
|
|
return false;
|
|
}
|
|
}
|
|
}
|