Merge pull request #3 from neuroglia-io/fix-task-record-extensions

cdavernas · web-flow · commit 323959a104c5 · 2025-04-17T22:37:23.000+02:00
Fixed the `TaskRecordExtensions` to include `Artifacts` when converting a `TaskRecord` into a `Task`
diff --git a/src/a2a-net.Client.Asbtractions/a2a-net.Client.Abstractions.csproj b/src/a2a-net.Client.Asbtractions/a2a-net.Client.Abstractions.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Client</RootNamespace>
-    <VersionPrefix>0.4.0</VersionPrefix>
+    <VersionPrefix>0.4.1</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/a2a-net.Client.Http/a2a-net.Client.Http.csproj b/src/a2a-net.Client.Http/a2a-net.Client.Http.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Client</RootNamespace>
-    <VersionPrefix>0.4.0</VersionPrefix>
+    <VersionPrefix>0.4.1</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/a2a-net.Client.WebSocket/a2a-net.Client.WebSocket.csproj b/src/a2a-net.Client.WebSocket/a2a-net.Client.WebSocket.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Client.WebSocket</RootNamespace>
-    <VersionPrefix>0.4.0</VersionPrefix>
+    <VersionPrefix>0.4.1</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/a2a-net.Client/a2a-net.Client.csproj b/src/a2a-net.Client/a2a-net.Client.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Client</RootNamespace>
-    <VersionPrefix>0.4.0</VersionPrefix>
+    <VersionPrefix>0.4.1</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/a2a-net.Core/a2a-net.Core.csproj b/src/a2a-net.Core/a2a-net.Core.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Client</RootNamespace>
-    <VersionPrefix>0.4.0</VersionPrefix>
+    <VersionPrefix>0.4.1</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/a2a-net.Server.AspNetCore/a2a-net.Server.AspNetCore.csproj b/src/a2a-net.Server.AspNetCore/a2a-net.Server.AspNetCore.csproj
@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
 	<OutputType>Library</OutputType>
 	<RootNamespace>A2A.Server.AspNetCore</RootNamespace>
-    <VersionPrefix>0.4.0</VersionPrefix>
+    <VersionPrefix>0.4.1</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/a2a-net.Server.Infrastructure.Abstractions/a2a-net.Server.Infrastructure.Abstractions.csproj b/src/a2a-net.Server.Infrastructure.Abstractions/a2a-net.Server.Infrastructure.Abstractions.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Server.Infrastructure</RootNamespace>
-    <VersionPrefix>0.4.0</VersionPrefix>
+    <VersionPrefix>0.4.1</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/a2a-net.Server.Infrastructure.DistributedCache/a2a-net.Server.Infrastructure.DistributedCache.csproj b/src/a2a-net.Server.Infrastructure.DistributedCache/a2a-net.Server.Infrastructure.DistributedCache.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Server.Infrastructure.DistributedCache</RootNamespace>
-    <VersionPrefix>0.4.0</VersionPrefix>
+    <VersionPrefix>0.4.1</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/a2a-net.Server/Extensions/TaskRecordExtensions.cs b/src/a2a-net.Server/Extensions/TaskRecordExtensions.cs
@@ -23,13 +23,16 @@ public static class TaskRecordExtensions
     /// Converts the <see cref="TaskRecord"/> into a new <see cref="Models.Task"/>
     /// </summary>
     /// <param name="taskRecord">The <see cref="TaskRecord"/> to convert</param>
+    /// <param name="stateTransitionHistory">A boolean indicating whether or not the agent exposes status change history for tasks</param>
+    /// <param name="historyLength">The maximum length number of state transitions, if any, to be retrieved</param>
     /// <returns>A new <see cref="Models.Task"/></returns>
-    public static Models.Task AsTask(this TaskRecord taskRecord) => new()
+    public static Models.Task AsTask(this TaskRecord taskRecord, bool stateTransitionHistory = false, uint? historyLength = null) => new()
     {
         Id = taskRecord.Id,
         SessionId = taskRecord.SessionId,
         Status = taskRecord.Status,
-        History = taskRecord.History,
+        Artifacts = taskRecord.Artifacts,
+        History = stateTransitionHistory ? historyLength.HasValue && taskRecord.History != null ? [..taskRecord.History.TakeLast((int)historyLength.Value)] : taskRecord.History : null,
         Metadata = taskRecord.Metadata,
     };
 
diff --git a/src/a2a-net.Server/Infrastructure/Services/A2AProtocolServer.cs b/src/a2a-net.Server/Infrastructure/Services/A2AProtocolServer.cs
@@ -78,7 +78,7 @@ public class A2AProtocolServer(string name, AgentCapabilities capabilities, ILog
         return new()
         {
             Id = request.Id,
-            Result = task.AsTask()
+            Result = task.AsTask(Capabilities.StateTransitionHistory, request.Params.HistoryLength)
         };
     }
 
@@ -134,7 +134,7 @@ public virtual async IAsyncEnumerable<RpcResponse<TaskEvent>> ResubscribeToTaskA
     public virtual async Task<RpcResponse<Models.Task>> GetTaskAsync(GetTaskRequest request, CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(request);
-        var task = (await Tasks.GetAsync(request.Params.Id, cancellationToken).ConfigureAwait(false))?.AsTask();
+        var task = (await Tasks.GetAsync(request.Params.Id, cancellationToken).ConfigureAwait(false))?.AsTask(Capabilities.StateTransitionHistory);
         if (task == null) return new()
         {
             Id = request.Id,
@@ -173,7 +173,7 @@ public virtual async IAsyncEnumerable<RpcResponse<TaskEvent>> ResubscribeToTaskA
         return new()
         {
             Id = request.Id,
-            Result = task.AsTask()
+            Result = task.AsTask(Capabilities.StateTransitionHistory)
         };
     }
 
diff --git a/src/a2a-net.Server/a2a-net.Server.csproj b/src/a2a-net.Server/a2a-net.Server.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Server</RootNamespace>
-    <VersionPrefix>0.4.0</VersionPrefix>
+    <VersionPrefix>0.4.1</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/tests/a2a-net.IntegrationTests/Cases/A2AProtocolHttpClientTests.cs b/tests/a2a-net.IntegrationTests/Cases/A2AProtocolHttpClientTests.cs
@@ -69,6 +69,7 @@ public async System.Threading.Tasks.Task SendTask_Should_Work()
         response.Id.Should().Be(request.Id);
         response.Result.Should().NotBeNull();
         response.Result.Id.Should().Be(request.Params.Id);
+        response.Result.Artifacts.Should().NotBeNullOrEmpty();
     }
 
     [Fact]
diff --git a/tests/a2a-net.IntegrationTests/Services/MockAgentRuntime.cs b/tests/a2a-net.IntegrationTests/Services/MockAgentRuntime.cs
@@ -21,8 +21,28 @@ internal class MockAgentRuntime
 
     public async IAsyncEnumerable<AgentResponseContent> ExecuteAsync(TaskRecord task,  [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
-        await System.Threading.Tasks.Task.Delay(100, cancellationToken);
-        yield break;
+        await System.Threading.Tasks.Task.Delay(50, cancellationToken);
+        yield return new(new Artifact()
+        {
+            Parts =
+                [
+                    new TextPart("Foo")
+                ]
+        });
+        yield return new(new Artifact()
+        {
+            Parts =
+           [
+               new TextPart("Bar")
+           ]
+        });
+        yield return new(new Artifact()
+        {
+            Parts =
+           [
+               new TextPart("Baz")
+           ]
+        });
     }
 
     public System.Threading.Tasks.Task CancelAsync(string taskId, CancellationToken cancellationToken = default) => System.Threading.Tasks.Task.CompletedTask;

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public class A2AProtocolServer(string name, AgentCapabilities capabilities, ILog`
`78`	`78`	`return new()`
`79`	`79`	`{`
`80`	`80`	`Id = request.Id,`
`81`		`- Result = task.AsTask()`
	`81`	`+ Result = task.AsTask(Capabilities.StateTransitionHistory, request.Params.HistoryLength)`
`82`	`82`	`};`
`83`	`83`	`}`
`84`	`84`
`@@ -134,7 +134,7 @@ public virtual async IAsyncEnumerable<RpcResponse<TaskEvent>> ResubscribeToTaskA`
`134`	`134`	`public virtual async Task<RpcResponse<Models.Task>> GetTaskAsync(GetTaskRequest request, CancellationToken cancellationToken = default)`
`135`	`135`	`{`
`136`	`136`	`ArgumentNullException.ThrowIfNull(request);`
`137`		`- var task = (await Tasks.GetAsync(request.Params.Id, cancellationToken).ConfigureAwait(false))?.AsTask();`
	`137`	`+ var task = (await Tasks.GetAsync(request.Params.Id, cancellationToken).ConfigureAwait(false))?.AsTask(Capabilities.StateTransitionHistory);`
`138`	`138`	`if (task == null) return new()`
`139`	`139`	`{`
`140`	`140`	`Id = request.Id,`
`@@ -173,7 +173,7 @@ public virtual async IAsyncEnumerable<RpcResponse<TaskEvent>> ResubscribeToTaskA`
`173`	`173`	`return new()`
`174`	`174`	`{`
`175`	`175`	`Id = request.Id,`
`176`		`- Result = task.AsTask()`
	`176`	`+ Result = task.AsTask(Capabilities.StateTransitionHistory)`
`177`	`177`	`};`
`178`	`178`	`}`
`179`	`179`