Fix minor bugs

JC-386 · JC-386 · commit 881f6e956e26 · 2025-11-10T21:59:49.000-08:00
diff --git a/sdk/agentserver/Azure.AI.AgentServer.AgentFramework/CHANGELOG.md b/sdk/agentserver/Azure.AI.AgentServer.AgentFramework/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 1.0.0-beta.3 (2025-11-10)
+
+### Features Added
+- Fixed AgentId serialization
+- Fixed NPE when usage data is missing
+
 ## 1.0.0-beta.2 (2025-11-10)
 
 ### Features Added
diff --git a/sdk/agentserver/Azure.AI.AgentServer.AgentFramework/src/Azure.AI.AgentServer.AgentFramework.csproj b/sdk/agentserver/Azure.AI.AgentServer.AgentFramework/src/Azure.AI.AgentServer.AgentFramework.csproj
@@ -3,7 +3,7 @@
     <!-- Approved override -->
     <RequiredTargetFrameworks>net9.0;$(LtsTargetFramework);</RequiredTargetFrameworks>
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
-    <Version>1.0.0-beta.2</Version>
+    <Version>1.0.0-beta.3</Version>
 
     <PackageTags>Azure.AI.AgentServer.AgentFramework</PackageTags>
   </PropertyGroup>
diff --git a/sdk/agentserver/Azure.AI.AgentServer.Contracts/CHANGELOG.md b/sdk/agentserver/Azure.AI.AgentServer.Contracts/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 1.0.0-beta.3 (2025-11-10)
+
+### Features Added
+- Fixed AgentId serialization
+- Fixed NPE when usage data is missing
+
 ## 1.0.0-beta.2 (2025-11-10)
 
 ### Features Added
diff --git a/sdk/agentserver/Azure.AI.AgentServer.Contracts/src/Azure.AI.AgentServer.Contracts.csproj b/sdk/agentserver/Azure.AI.AgentServer.Contracts/src/Azure.AI.AgentServer.Contracts.csproj
@@ -17,7 +17,7 @@
     </NoWarn>
 
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
-    <Version>1.0.0-beta.2</Version>
+    <Version>1.0.0-beta.3</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/sdk/agentserver/Azure.AI.AgentServer.Core/CHANGELOG.md b/sdk/agentserver/Azure.AI.AgentServer.Core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 1.0.0-beta.3 (2025-11-10)
+
+### Features Added
+- Fixed AgentId serialization
+- Fixed NPE when usage data is missing
+
 ## 1.0.0-beta.2 (2025-11-10)
 
 ### Features Added
diff --git a/sdk/agentserver/Azure.AI.AgentServer.Core/src/Azure.AI.AgentServer.Core.csproj b/sdk/agentserver/Azure.AI.AgentServer.Core/src/Azure.AI.AgentServer.Core.csproj
@@ -3,7 +3,7 @@
     <!-- Approved override -->
     <RequiredTargetFrameworks>net9.0;$(LtsTargetFramework);</RequiredTargetFrameworks>
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
-    <Version>1.0.0-beta.2</Version>
+    <Version>1.0.0-beta.3</Version>
 
     <PackageTags>Azure.AI.AgentServer.Core</PackageTags>
   </PropertyGroup>
diff --git a/sdk/agentserver/Azure.AI.AgentServer.Core/src/Responses/Invocation/ResponsesExtensions.cs b/sdk/agentserver/Azure.AI.AgentServer.Core/src/Responses/Invocation/ResponsesExtensions.cs
@@ -78,7 +78,7 @@ public static Contracts.Generated.Responses.Response ToResponse(
         return agent == null
             ? null
             : new AgentId(
-                type: new AgentIdType(agent.Type.ToString()),
+                type: AgentIdType.AgentId,
                 name: agent.Name,
                 version: agent.Version,
                 serializedAdditionalRawData: null);
diff --git a/sdk/agentserver/Azure.AI.AgentServer.Core/src/Responses/Invocation/Stream/NestedResponseGenerator.cs b/sdk/agentserver/Azure.AI.AgentServer.Core/src/Responses/Invocation/Stream/NestedResponseGenerator.cs
@@ -49,8 +49,7 @@ public Action<Action<ResponseUsage>> SubscribeUsageUpdate
     {
         yield return new NestedEventsGroup<Contracts.Generated.Responses.Response>()
         {
-            CreateAggregate = () => CompletedResponse!,
-            Events = GenerateEventsAsync()
+            CreateAggregate = () => CompletedResponse!, Events = GenerateEventsAsync()
         };
     }
 #pragma warning restore CS1998
@@ -61,7 +60,8 @@ private async IAsyncEnumerable<ResponseStreamEvent> GenerateEventsAsync()
         yield return new ResponseInProgressEvent(Seq.Next(), ToResponse(status: ResponseStatus.InProgress));
 
         IList<Func<IEnumerable<ItemResource>>> outputFactories = [];
-        await foreach (var group in OutputGenerator.Generate().WithCancellation(CancellationToken).ConfigureAwait(false))
+        await foreach (var group in OutputGenerator.Generate().WithCancellation(CancellationToken)
+                           .ConfigureAwait(false))
         {
             outputFactories.Add(group.CreateAggregate);
             await foreach (var e in group.Events.WithCancellation(CancellationToken).ConfigureAwait(false))
@@ -97,11 +97,11 @@ private void SetUsage(ResponseUsage usage)
 
         _latestUsage = new ResponseUsage(
             inputTokens: usage.InputTokens + _latestUsage.InputTokens,
-            inputTokensDetails: new ResponseUsageInputTokensDetails(
-                cachedTokens: usage.InputTokensDetails.CachedTokens + _latestUsage.InputTokensDetails.CachedTokens),
+            inputTokensDetails: new ResponseUsageInputTokensDetails(cachedTokens:
+                usage.InputTokensDetails?.CachedTokens ?? 0 + _latestUsage.InputTokensDetails?.CachedTokens ?? 0),
             outputTokens: usage.OutputTokens + _latestUsage.OutputTokens,
-            outputTokensDetails: new ResponseUsageOutputTokensDetails(
-                reasoningTokens: usage.OutputTokensDetails.ReasoningTokens + _latestUsage.OutputTokensDetails.ReasoningTokens),
+            outputTokensDetails: new ResponseUsageOutputTokensDetails(reasoningTokens:
+                usage.OutputTokensDetails?.ReasoningTokens ?? 0 + _latestUsage.OutputTokensDetails?.ReasoningTokens ?? 0),
             totalTokens: usage.TotalTokens + _latestUsage.TotalTokens);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,7 @@ public Action<Action<ResponseUsage>> SubscribeUsageUpdate`
`49`	`49`	`{`
`50`	`50`	`yield return new NestedEventsGroup<Contracts.Generated.Responses.Response>()`
`51`	`51`	`{`
`52`		`- CreateAggregate = () => CompletedResponse!,`
`53`		`- Events = GenerateEventsAsync()`
	`52`	`+ CreateAggregate = () => CompletedResponse!, Events = GenerateEventsAsync()`
`54`	`53`	`};`
`55`	`54`	`}`
`56`	`55`	`#pragma warning restore CS1998`
`@@ -61,7 +60,8 @@ private async IAsyncEnumerable<ResponseStreamEvent> GenerateEventsAsync()`
`61`	`60`	`yield return new ResponseInProgressEvent(Seq.Next(), ToResponse(status: ResponseStatus.InProgress));`
`62`	`61`
`63`	`62`	`IList<Func<IEnumerable<ItemResource>>> outputFactories = [];`
`64`		`- await foreach (var group in OutputGenerator.Generate().WithCancellation(CancellationToken).ConfigureAwait(false))`
	`63`	`+ await foreach (var group in OutputGenerator.Generate().WithCancellation(CancellationToken)`
	`64`	`+ .ConfigureAwait(false))`
`65`	`65`	`{`
`66`	`66`	`outputFactories.Add(group.CreateAggregate);`
`67`	`67`	`await foreach (var e in group.Events.WithCancellation(CancellationToken).ConfigureAwait(false))`
`@@ -97,11 +97,11 @@ private void SetUsage(ResponseUsage usage)`
`97`	`97`
`98`	`98`	`_latestUsage = new ResponseUsage(`
`99`	`99`	`inputTokens: usage.InputTokens + _latestUsage.InputTokens,`
`100`		`- inputTokensDetails: new ResponseUsageInputTokensDetails(`
`101`		`- cachedTokens: usage.InputTokensDetails.CachedTokens + _latestUsage.InputTokensDetails.CachedTokens),`
	`100`	`+ inputTokensDetails: new ResponseUsageInputTokensDetails(cachedTokens:`
	`101`	`+ usage.InputTokensDetails?.CachedTokens ?? 0 + _latestUsage.InputTokensDetails?.CachedTokens ?? 0),`
`102`	`102`	`outputTokens: usage.OutputTokens + _latestUsage.OutputTokens,`
`103`		`- outputTokensDetails: new ResponseUsageOutputTokensDetails(`
`104`		`- reasoningTokens: usage.OutputTokensDetails.ReasoningTokens + _latestUsage.OutputTokensDetails.ReasoningTokens),`
	`103`	`+ outputTokensDetails: new ResponseUsageOutputTokensDetails(reasoningTokens:`
	`104`	`+ usage.OutputTokensDetails?.ReasoningTokens ?? 0 + _latestUsage.OutputTokensDetails?.ReasoningTokens ?? 0),`
`105`	`105`	`totalTokens: usage.TotalTokens + _latestUsage.TotalTokens);`
`106`	`106`	`}`
`107`	`107`	`}`