feat: model clean-up (#36)

* make required props not optional, use jsonrequired attribute instead of required one, etc

* format test class

* change type of FilePart.File property from the specific FileWithBytes to the FileContent base one.

Author: SergeyMenshykh

samples/AgentServer/AgentServer.http

@@ -3,7 +3,7 @@
 ### Query agent card for the echo agent
 GET {{host}}/echo/.well-known/agent.json
 
-## curl -N -X GET http://localhost:5048/echo/.well-known/agent.json
+### curl -N -X GET http://localhost:5048/echo/.well-known/agent.json
 
 ### Send a message to the echo agent
 POST {{host}}/echo
@@ -49,21 +49,19 @@ Content-Type: application/json
     }
 }
 
+### curl -N -X POST http://localhost:5048/echo -H "Content-Type: application/json" -d '{ "id": "3","jsonrpc": "2.0","method": "task/sendsubscribe","params": {"id": "1234","message": {"role": "user","parts": [{"type": "text","text": "Hello, world!"}]}}}'
 
-
-## curl -N -X POST http://localhost:5048/echo -H "Content-Type: application/json" -d '{ "id": "3","jsonrpc": "2.0","method": "task/sendsubscribe","params": {"id": "1234","message": {"role": "user","parts": [{"type": "text","text": "Hello, world!"}]}}}'
-
-###
+###  Retrieve a task
 POST {{host}}/echotasks
 Content-Type: application/json
 
 {
     "id": "3",
     "jsonrpc": "2.0",
-    "method": "task/get",
+    "method": "tasks/get",
     "params": {
         "id": "40dfa726-bc05-4fd4-aa3d-763d5972c9d0"
-        }
+     }
 }
 
 ### SendSubscribe the echo agent
@@ -132,17 +130,17 @@ Content-Type: application/json
     }
 }
 
-###
+###  Retrieve a task
 POST {{host}}/hostedclient
 Content-Type: application/json
 
 {
     "id": "d589ff00-daba-49a0-a01c-fa2a0924ada3",
     "jsonrpc": "2.0",
-    "method": "task/get",
+    "method": "tasks/get",
     "params": {
         "id": "b6d9ce5c-c457-47af-be95-6bed646ab667"
-        }
+     }
 }
 
 
@@ -179,7 +177,7 @@ Content-Type: application/json
 {
     "id": "2",
     "jsonrpc": "2.0",
-    "method": "task/get",
+    "method": "tasks/get",
     "params": {
         "id": "c65e7047-2938-432f-bae0-660d6d9fda50"
     }

src/A2A.AspNetCore/A2AHttpProcessor.cs

@@ -252,7 +252,7 @@ internal static async Task<IResult> SetPushNotification(TaskManager taskManager,
             var taskIdParams = new TaskIdParams { Id = id };
             var result = await taskManager.SetPushNotificationAsync(new TaskPushNotificationConfig
             {
-                Id = id,
+                TaskId = id,
                 PushNotificationConfig = pushNotificationConfig
             });
 

src/A2A/JsonRpc/JsonRpcError.cs

@@ -1,4 +1,5 @@
 using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace A2A;
 
@@ -10,17 +11,22 @@ public class JsonRpcError
     /// <summary>
     /// Gets or sets the number that indicates the error type that occurred.
     /// </summary>
-    public int Code { get; set; }
+    [JsonPropertyName("code")]
+    [JsonRequired]
+    public int Code { get; set; } = 0;
 
     /// <summary>
     /// Gets or sets the string providing a short description of the error.
     /// </summary>
+    [JsonPropertyName("message")]
+    [JsonRequired]
     public string Message { get; set; } = string.Empty;
 
     /// <summary>
     /// Gets or sets the primitive or structured value that contains additional information about the error.
     /// This may be omitted.
     /// </summary>
+    [JsonPropertyName("data")]
     public JsonElement? Data { get; set; }
 
     /// <summary>

src/A2A/JsonRpc/JsonRpcRequest.cs

@@ -15,6 +15,8 @@ public class JsonRpcRequest
     /// MUST be exactly "2.0".
     /// </remarks>
     [JsonPropertyName("jsonrpc")]
+    [JsonRequired]
+
     public string JsonRpc { get; set; } = "2.0";
 
     /// <summary>
@@ -30,6 +32,7 @@ public class JsonRpcRequest
     /// Gets or sets the string containing the name of the method to be invoked.
     /// </summary>
     [JsonPropertyName("method")]
+    [JsonRequired]
     public string Method { get; set; } = string.Empty;
 
     /// <summary>

src/A2A/Models/AgentCard.cs

@@ -1,4 +1,3 @@
-using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
 namespace A2A;
@@ -18,7 +17,7 @@ public class AgentCard
     /// Gets or sets the human readable name of the agent.
     /// </summary>
     [JsonPropertyName("name")]
-    [Required]
+    [JsonRequired]
     public string Name { get; set; } = string.Empty;
 
     /// <summary>
@@ -30,8 +29,8 @@ public class AgentCard
     /// (e.g., "This agent helps users find recipes, plan meals, and get cooking instructions.")
     /// </remarks>
     [JsonPropertyName("description")]
-    [Required]
-    public string? Description { get; set; }
+    [JsonRequired]
+    public string Description { get; set; } = string.Empty;
 
     /// <summary>
     /// Gets or sets a URL to the address the agent is hosted at.
@@ -40,7 +39,7 @@ public class AgentCard
     /// This represents the preferred endpoint as declared by the agent.
     /// </remarks>
     [JsonPropertyName("url")]
-    [Required]
+    [JsonRequired]
     public string Url { get; set; } = string.Empty;
 
     /// <summary>
@@ -53,14 +52,14 @@ public class AgentCard
     /// Gets or sets the version of the agent - format is up to the provider.
     /// </summary>
     [JsonPropertyName("version")]
-    [Required]
+    [JsonRequired]
     public string Version { get; set; } = string.Empty;
 
     /// <summary>
     /// The version of the A2A protocol this agent supports.
     /// </summary>
     [JsonPropertyName("protocolVersion")]
-    [Required]
+    [JsonRequired]
     public string ProtocolVersion { get; set; } = "0.2.3";
 
     /// <summary>
@@ -73,7 +72,7 @@ public class AgentCard
     /// Gets or sets the optional capabilities supported by the agent.
     /// </summary>
     [JsonPropertyName("capabilities")]
-    [Required]
+    [JsonRequired]
     public AgentCapabilities Capabilities { get; set; } = new AgentCapabilities();
 
     /// <summary>
@@ -95,19 +94,21 @@ public class AgentCard
     /// This can be overridden per-skill. Supported media types for input.
     /// </remarks>
     [JsonPropertyName("defaultInputModes")]
+    [JsonRequired]
     public List<string> DefaultInputModes { get; set; } = ["text"];
 
     /// <summary>
     /// Gets or sets the supported media types for output.
     /// </summary>
     [JsonPropertyName("defaultOutputModes")]
+    [JsonRequired]
     public List<string> DefaultOutputModes { get; set; } = ["text"];
 
     /// <summary>
     /// Gets or sets the skills that are a unit of capability that an agent can perform.
     /// </summary>
     [JsonPropertyName("skills")]
-    [Required]
+    [JsonRequired]
     public List<AgentSkill> Skills { get; set; } = [];
 
     /// <summary>

src/A2A/Models/AgentInterface.cs

@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace A2A;
 
@@ -16,13 +15,13 @@ public class AgentInterface
     /// The core ones officially supported are JSONRPC, GRPC, and HTTP+JSON.
     /// </remarks>
     [JsonPropertyName("transport")]
-    [Required]
+    [JsonRequired]
     public required AgentTransport Transport { get; set; }
 
     /// <summary>
     /// The target URL for the agent interface.
     /// </summary>
     [JsonPropertyName("url")]
-    [Required]
+    [JsonRequired]
     public required string Url { get; set; }
 }

src/A2A/Models/AgentProvider.cs

@@ -1,4 +1,3 @@
-using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
 namespace A2A;
@@ -12,13 +11,13 @@ public class AgentProvider
     /// Agent provider's organization name.
     /// </summary>
     [JsonPropertyName("organization")]
-    [Required]
+    [JsonRequired]
     public string Organization { get; set; } = string.Empty;
 
     /// <summary>
     /// Agent provider's URL.
     /// </summary>
     [JsonPropertyName("url")]
-    [Required]
+    [JsonRequired]
     public string Url { get; set; } = string.Empty;
 }

src/A2A/Models/AgentSkill.cs

@@ -1,4 +1,3 @@
-using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
 namespace A2A;
@@ -12,14 +11,14 @@ public class AgentSkill
     /// Unique identifier for the agent's skill.
     /// </summary>
     [JsonPropertyName("id")]
-    [Required]
+    [JsonRequired]
     public string Id { get; set; } = string.Empty;
 
     /// <summary>
     /// Human readable name of the skill.
     /// </summary>
     [JsonPropertyName("name")]
-    [Required]
+    [JsonRequired]
     public string Name { get; set; } = string.Empty;
 
     /// <summary>
@@ -29,15 +28,15 @@ public class AgentSkill
     /// Will be used by the client or a human as a hint to understand what the skill does.
     /// </remarks>
     [JsonPropertyName("description")]
-    [Required]
-    public string? Description { get; set; }
+    [JsonRequired]
+    public string Description { get; set; } = string.Empty;
 
     /// <summary>
     /// Set of tagwords describing classes of capabilities for this specific skill.
     /// </summary>
     [JsonPropertyName("tags")]
-    [Required]
-    public List<string>? Tags { get; set; }
+    [JsonRequired]
+    public List<string> Tags { get; set; } = [];
 
     /// <summary>
     /// The set of example scenarios that the skill can perform.

src/A2A/Models/AgentTask.cs

@@ -20,7 +20,7 @@ public class AgentTask : A2AResponse
     /// </summary>
     [JsonPropertyName("contextId")]
     [JsonRequired]
-    public string? ContextId { get; set; }
+    public string ContextId { get; set; } = string.Empty;
 
     /// <summary>
     /// Current status of the task.

src/A2A/Models/DataPart.cs

@@ -12,5 +12,6 @@ public class DataPart : Part
     /// Structured data content.
     /// </summary>
     [JsonPropertyName("data")]
+    [JsonRequired]
     public Dictionary<string, JsonElement> Data { get; set; } = [];
 }