Skip to content

Commit abdd3e0

Browse files
committed
address feedback
1 parent 583920d commit abdd3e0

File tree

5 files changed

+9
-22
lines changed

5 files changed

+9
-22
lines changed

dotnet/samples/AGUIClientServer/AGUIClient/AGUIClientSerializerContext.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@ namespace AGUIClient;
99

1010
[JsonSerializable(typeof(SensorRequest))]
1111
[JsonSerializable(typeof(SensorResponse))]
12-
internal sealed partial class AGUIClientSerializerContext : JsonSerializerContext
13-
{
14-
}
12+
internal sealed partial class AGUIClientSerializerContext : JsonSerializerContext;

dotnet/samples/AGUIClientServer/AGUIServer/AGUIServerSerializerContext.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,4 @@ namespace AGUIServer;
66

77
[JsonSerializable(typeof(ServerWeatherForecastRequest))]
88
[JsonSerializable(typeof(ServerWeatherForecastResponse))]
9-
internal sealed partial class AGUIServerSerializerContext : JsonSerializerContext
10-
{
11-
}
9+
internal sealed partial class AGUIServerSerializerContext : JsonSerializerContext;

dotnet/samples/AGUIClientServer/AGUIServer/ServerWeatherForecastRequest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ namespace AGUIServer;
55
internal sealed class ServerWeatherForecastRequest
66
{
77
public DateTime Date { get; set; }
8-
98
public string Location { get; set; } = "Seattle";
109
}

dotnet/src/Microsoft.Agents.AI.AGUI/AGUIChatClient.cs

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,8 @@ private static JsonSerializerOptions CombineJsonSerializerOptions(JsonSerializer
5050
return AGUIJsonSerializerContext.Default.Options;
5151
}
5252

53-
// Create a new JsonSerializerOptions based on the provided one
5453
var combinedOptions = new JsonSerializerOptions(jsonSerializerOptions);
55-
56-
// Add the AGUI context to the type info resolver chain if not already present
57-
if (!combinedOptions.TypeInfoResolverChain.Any(r => r == AGUIJsonSerializerContext.Default))
58-
{
59-
combinedOptions.TypeInfoResolverChain.Insert(0, AGUIJsonSerializerContext.Default);
60-
}
54+
combinedOptions.TypeInfoResolverChain.Add(AGUIJsonSerializerContext.Default);
6155

6256
return combinedOptions;
6357
}
@@ -107,7 +101,7 @@ public async override IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseA
107101
if (conversationId == null && firstUpdate == null)
108102
{
109103
firstUpdate = update;
110-
if (firstUpdate.AdditionalProperties != null && firstUpdate.AdditionalProperties.TryGetValue("agui_thread_id", out var threadIdObj) && threadIdObj is string threadId)
104+
if (firstUpdate.AdditionalProperties?.TryGetValue("agui_thread_id", out string? threadId) is true)
111105
{
112106
// Capture the thread id from the first update to use as conversation id if none was provided
113107
conversationId = threadId;
@@ -170,7 +164,7 @@ public AGUIChatClientHandler(
170164
Uri metadataUri = string.IsNullOrEmpty(endpoint) && httpClient.BaseAddress is not null
171165
? httpClient.BaseAddress
172166
: new Uri(endpoint, UriKind.RelativeOrAbsolute);
173-
this.Metadata = new ChatClientMetadata("AGUI", metadataUri, null);
167+
this.Metadata = new ChatClientMetadata("ag-ui", metadataUri, null);
174168
}
175169

176170
public ChatClientMetadata Metadata { get; }
@@ -194,10 +188,10 @@ public async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
194188
throw new ArgumentNullException(nameof(messages));
195189
}
196190

197-
var runId = $"run_{Guid.NewGuid()}";
191+
var runId = $"run_{Guid.NewGuid():N}";
198192
var messagesList = messages.ToList(); // Avoid triggering the enumerator multiple times.
199193
var threadId = ExtractTemporaryThreadId(messagesList) ??
200-
ExtractThreadIdFromOptions(options) ?? $"thread_{Guid.NewGuid()}";
194+
ExtractThreadIdFromOptions(options) ?? $"thread_{Guid.NewGuid():N}";
201195

202196
// Create the input for the AGUI service
203197
var input = new RunAgentInput
@@ -291,9 +285,7 @@ threadIdObj is not string threadId ||
291285
return null;
292286
}
293287

294-
if (content.AdditionalProperties == null ||
295-
!content.AdditionalProperties.TryGetValue("agui_thread_id", out var threadIdObj) ||
296-
threadIdObj is not string threadId ||
288+
if (content.AdditionalProperties?.TryGetValue("agui_thread_id", out string? threadId) is not true ||
297289
string.IsNullOrEmpty(threadId))
298290
{
299291
return null;

dotnet/src/Microsoft.Agents.AI.AGUI/Shared/AGUIChatMessageExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static IEnumerable<AGUIMessage> AsAGUIMessages(
115115
{
116116
foreach (var message in chatMessages)
117117
{
118-
message.MessageId ??= Guid.NewGuid().ToString();
118+
message.MessageId ??= Guid.NewGuid().ToString("N");
119119
if (message.Role == ChatRole.Tool)
120120
{
121121
foreach (var toolMessage in MapToolMessages(jsonSerializerOptions, message))

0 commit comments

Comments
 (0)