Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public EventKind sendMessage(MessageSendParams messageSendParams, @Nullable Clie
try {
String httpResponseBody = sendPostRequest(Utils.buildBaseUrl(agentInterface, messageSendParams.tenant()) + "/message:send", payloadAndHeaders);
org.a2aproject.sdk.grpc.SendMessageResponse.Builder responseBuilder = org.a2aproject.sdk.grpc.SendMessageResponse.newBuilder();
JsonFormat.parser().merge(httpResponseBody, responseBuilder);
ProtoJsonUtils.mergeIgnoringUnknownFields(httpResponseBody, responseBuilder);
if (responseBuilder.hasMessage()) {
return ProtoUtils.FromProto.message(responseBuilder.getMessage());
}
Expand Down Expand Up @@ -166,7 +166,7 @@ public Task getTask(TaskQueryParams taskQueryParams, @Nullable ClientCallContext
}
String httpResponseBody = response.body();
org.a2aproject.sdk.grpc.Task.Builder responseBuilder = org.a2aproject.sdk.grpc.Task.newBuilder();
JsonFormat.parser().merge(httpResponseBody, responseBuilder);
ProtoJsonUtils.mergeIgnoringUnknownFields(httpResponseBody, responseBuilder);
return ProtoUtils.FromProto.task(responseBuilder);
} catch (A2AClientException e) {
throw e;
Expand All @@ -183,7 +183,7 @@ public Task cancelTask(CancelTaskParams taskIdParams, @Nullable ClientCallContex
try {
String httpResponseBody = sendPostRequest(Utils.buildBaseUrl(agentInterface, taskIdParams.tenant()) + String.format("/tasks/%1s:cancel", taskIdParams.id()), payloadAndHeaders);
org.a2aproject.sdk.grpc.Task.Builder responseBuilder = org.a2aproject.sdk.grpc.Task.newBuilder();
JsonFormat.parser().merge(httpResponseBody, responseBuilder);
ProtoJsonUtils.mergeIgnoringUnknownFields(httpResponseBody, responseBuilder);
return ProtoUtils.FromProto.task(responseBuilder);
} catch (A2AClientException e) {
throw e;
Expand Down Expand Up @@ -243,7 +243,7 @@ public ListTasksResult listTasks(ListTasksParams request, @Nullable ClientCallCo
}
String httpResponseBody = response.body();
org.a2aproject.sdk.grpc.ListTasksResponse.Builder responseBuilder = org.a2aproject.sdk.grpc.ListTasksResponse.newBuilder();
JsonFormat.parser().merge(httpResponseBody, responseBuilder);
ProtoJsonUtils.mergeIgnoringUnknownFields(httpResponseBody, responseBuilder);

return new ListTasksResult(
responseBuilder.getTasksList().stream()
Expand Down Expand Up @@ -306,7 +306,7 @@ public TaskPushNotificationConfig createTaskPushNotificationConfiguration(TaskPu
try {
String httpResponseBody = sendPostRequest(Utils.buildBaseUrl(agentInterface, request.tenant()) + String.format("/tasks/%1s/pushNotificationConfigs", request.taskId()), payloadAndHeaders);
org.a2aproject.sdk.grpc.TaskPushNotificationConfig.Builder responseBuilder = org.a2aproject.sdk.grpc.TaskPushNotificationConfig.newBuilder();
JsonFormat.parser().merge(httpResponseBody, responseBuilder);
ProtoJsonUtils.mergeIgnoringUnknownFields(httpResponseBody, responseBuilder);
return ProtoUtils.FromProto.taskPushNotificationConfig(responseBuilder);
} catch (A2AClientException e) {
throw e;
Expand Down Expand Up @@ -341,7 +341,7 @@ public TaskPushNotificationConfig getTaskPushNotificationConfiguration(GetTaskPu
}
String httpResponseBody = response.body();
org.a2aproject.sdk.grpc.TaskPushNotificationConfig.Builder responseBuilder = org.a2aproject.sdk.grpc.TaskPushNotificationConfig.newBuilder();
JsonFormat.parser().merge(httpResponseBody, responseBuilder);
ProtoJsonUtils.mergeIgnoringUnknownFields(httpResponseBody, responseBuilder);
return ProtoUtils.FromProto.taskPushNotificationConfig(responseBuilder);
} catch (A2AClientException e) {
throw e;
Expand Down Expand Up @@ -379,7 +379,7 @@ public ListTaskPushNotificationConfigsResult listTaskPushNotificationConfigurati
}
String httpResponseBody = response.body();
org.a2aproject.sdk.grpc.ListTaskPushNotificationConfigsResponse.Builder responseBuilder = org.a2aproject.sdk.grpc.ListTaskPushNotificationConfigsResponse.newBuilder();
JsonFormat.parser().merge(httpResponseBody, responseBuilder);
ProtoJsonUtils.mergeIgnoringUnknownFields(httpResponseBody, responseBuilder);
return ProtoUtils.FromProto.listTaskPushNotificationConfigsResult(responseBuilder);
} catch (A2AClientException e) {
throw e;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@
import java.util.function.Consumer;
import java.util.logging.Logger;

import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.google.gson.JsonParser;
import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.util.JsonFormat;
import org.a2aproject.sdk.client.http.ServerSentEvent;
import org.a2aproject.sdk.client.transport.spi.sse.AbstractSSEEventListener;
import org.a2aproject.sdk.client.transport.rest.RestErrorMapper;
import org.a2aproject.sdk.grpc.StreamResponse;
import org.a2aproject.sdk.grpc.utils.ProtoJsonUtils;
import org.a2aproject.sdk.grpc.utils.ProtoUtils;
import org.a2aproject.sdk.spec.StreamingEventKind;
import org.jspecify.annotations.Nullable;
Expand Down Expand Up @@ -37,13 +40,27 @@ public void onMessage(ServerSentEvent event, @Nullable Future<Void> completableF
try {
LOGGER.fine("REST SSE raw data: " + event.data());
org.a2aproject.sdk.grpc.StreamResponse.Builder builder = org.a2aproject.sdk.grpc.StreamResponse.newBuilder();
JsonFormat.parser().merge(event.data(), builder);
ProtoJsonUtils.mergeIgnoringUnknownFields(event.data(), builder);
if (builder.getPayloadCase() == StreamResponse.PayloadCase.PAYLOAD_NOT_SET && isErrorEvent(event.data())) {
// Unknown fields are ignored, so an error event parses to an empty response.
signalTerminal(RestErrorMapper.mapRestError(event.data(), 500));
return;
}
parseAndHandleMessage(builder.build(), completableFuture);
} catch (InvalidProtocolBufferException e) {
signalTerminal(RestErrorMapper.mapRestError(event.data(), 500));
}
}

private static boolean isErrorEvent(String data) {
try {
JsonElement json = JsonParser.parseString(data);
return json.isJsonObject() && json.getAsJsonObject().has("error");
} catch (JsonParseException e) {
return false;
}
}

/**
* Parses a StreamResponse protobuf message and delegates to the base class for event handling.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockserver.model.HttpRequest.request;
import static org.mockserver.model.HttpResponse.response;
Expand Down Expand Up @@ -174,6 +175,79 @@ public void testSendMessage() throws Exception {
assertNull(history.referenceTaskIds());
}

@Test
public void testSendMessageIgnoresUnknownResponseFields() throws Exception {
Message message = Message.builder()
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("tell me a joke")))
.contextId("context-1234")
.messageId("message-1234")
.build();
this.server.when(
request()
.withMethod("POST")
.withPath("/message:send")
)
.respond(
response()
.withStatusCode(200)
.withBody("""
{
"task": {
"id": "task-1234",
"contextId": "context-1234",
"status": {
"state": "TASK_STATE_SUBMITTED"
},
"unknownTaskField": "ignored"
},
"unknownResponseField": 42
}""")
);
MessageSendParams messageSendParams = new MessageSendParams(message, null, null, "");

RestTransport instance = new RestTransport(CARD);
Task task = (Task) instance.sendMessage(messageSendParams, null);
assertEquals("task-1234", task.id());
assertEquals(TaskState.TASK_STATE_SUBMITTED, task.status().state());
}

@Test
public void testSendMessageRejectsUnrecognizedEnumValueInResponse() throws Exception {
Message message = Message.builder()
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("tell me a joke")))
.contextId("context-1234")
.messageId("message-1234")
.build();
this.server.when(
request()
.withMethod("POST")
.withPath("/message:send")
)
.respond(
response()
.withStatusCode(200)
.withBody("""
{
"task": {
"id": "task-1234",
"contextId": "context-1234",
"status": {
"state": "NOT_A_TASK_STATE"
},
"unknownTaskField": "ignored"
}
}""")
);
MessageSendParams messageSendParams = new MessageSendParams(message, null, null, "");

RestTransport instance = new RestTransport(CARD);
A2AClientException exception = assertThrows(A2AClientException.class,
() -> instance.sendMessage(messageSendParams, null));
assertTrue(exception.getMessage().contains("NOT_A_TASK_STATE"), exception.getMessage());
}

/**
* Test of cancelTask method, of class JSONRestTransport.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.a2aproject.sdk.client.transport.rest.sse;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
Expand All @@ -13,9 +14,11 @@
import java.util.concurrent.atomic.AtomicReference;

import org.a2aproject.sdk.client.http.ServerSentEvent;
import org.a2aproject.sdk.spec.A2AClientException;
import org.a2aproject.sdk.spec.Message;
import org.a2aproject.sdk.spec.StreamingEventKind;
import org.a2aproject.sdk.spec.Task;
import org.a2aproject.sdk.spec.TaskNotFoundError;
import org.a2aproject.sdk.spec.TaskState;
import org.a2aproject.sdk.spec.TaskStatusUpdateEvent;
import org.a2aproject.sdk.spec.TextPart;
Expand Down Expand Up @@ -98,6 +101,36 @@ public void testOnMessageWithTaskResult() {
assertEquals(TaskState.TASK_STATE_WORKING, task.status().state());
}

@Test
public void testOnMessageIgnoresUnknownFields() {
AtomicReference<StreamingEventKind> receivedEvent = new AtomicReference<>();
AtomicReference<Throwable> receivedError = new AtomicReference<>();
SSEEventListener listener = new SSEEventListener(receivedEvent::set, receivedError::set);

String jsonMessage = """
{
"task": {
"id": "task-123",
"contextId": "context-456",
"status": {
"state": "TASK_STATE_WORKING",
"unknownStatusField": true
},
"unknownTaskField": "ignored"
},
"unknownResponseField": 42
}
""";

listener.onMessage(new ServerSentEvent(jsonMessage), null);

assertNull(receivedError.get());
Task task = (Task) receivedEvent.get();
assertNotNull(task);
assertEquals("task-123", task.id());
assertEquals(TaskState.TASK_STATE_WORKING, task.status().state());
}

@Test
public void testOnMessageWithMessageResult() {
// Set up event handler
Expand Down Expand Up @@ -275,6 +308,48 @@ public void testOnMessageWithInvalidJsonThenOnCompleteKeepsTheError() {
assertSame(firstError, receivedError.get());
}

@Test
public void testOnMessageWithErrorEventMapsTheError() {
AtomicReference<Throwable> receivedError = new AtomicReference<>();
SSEEventListener listener = new SSEEventListener(event -> {}, receivedError::set);

String errorEvent = """
{"error": {"code": 404, "status": "NOT_FOUND", "message": "Task not found",
"details": [{"reason": "TASK_NOT_FOUND"}]}}
""";

listener.onMessage(new ServerSentEvent(errorEvent), null);

A2AClientException error = assertInstanceOf(A2AClientException.class, receivedError.get());
assertInstanceOf(TaskNotFoundError.class, error.getCause());
}

@Test
public void testOnMessageWithUnrecognizedEnumValueSignalsError() {
AtomicReference<StreamingEventKind> receivedEvent = new AtomicReference<>();
AtomicReference<Throwable> receivedError = new AtomicReference<>();
SSEEventListener listener = new SSEEventListener(receivedEvent::set, receivedError::set);

// Unknown field names are ignored, but an unrecognized enum value is not dropped.
String jsonMessage = """
{
"task": {
"id": "task-123",
"contextId": "context-456",
"status": {
"state": "NOT_A_TASK_STATE"
},
"unknownTaskField": "ignored"
}
}
""";

listener.onMessage(new ServerSentEvent(jsonMessage), null);

assertNull(receivedEvent.get());
assertNotNull(receivedError.get());
}

@Test
public void testOnMessageWithInvalidPayloadCaseThenOnCompleteKeepsTheError() {
// Set up error handler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ private static A2ARequest<?> parseMethodRequest(String version, Object id, Strin
}
case SEND_MESSAGE_METHOD -> {
org.a2aproject.sdk.grpc.SendMessageRequest.Builder builder = org.a2aproject.sdk.grpc.SendMessageRequest.newBuilder();
parseSendMessageParams(params, builder, id);
parseRequestBody(params, builder, id);
setTenantIfAbsent(builder::getTenant, builder::setTenant, tenant);
return new SendMessageRequest(version, id, ProtoUtils.FromProto.messageSendParams(builder));
}
Expand Down Expand Up @@ -293,7 +293,7 @@ private static A2ARequest<?> parseMethodRequest(String version, Object id, Strin
}
case SEND_STREAMING_MESSAGE_METHOD -> {
org.a2aproject.sdk.grpc.SendMessageRequest.Builder builder = org.a2aproject.sdk.grpc.SendMessageRequest.newBuilder();
parseSendMessageParams(params, builder, id);
parseRequestBody(params, builder, id);
setTenantIfAbsent(builder::getTenant, builder::setTenant, tenant);
return new SendStreamingMessageRequest(version, id, ProtoUtils.FromProto.messageSendParams(builder));
}
Expand Down Expand Up @@ -465,14 +465,9 @@ private static A2AError processError(JsonObject error) {
}

protected static void parseRequestBody(JsonElement jsonRpc, com.google.protobuf.Message.Builder builder, Object id) throws JsonProcessingException {
parseJsonString(jsonRpc.toString(), builder, id);
}

// SendMessage permits extra top-level operation parameters; nested protocol objects remain strict.
private static void parseSendMessageParams(JsonElement jsonRpc, com.google.protobuf.Message.Builder builder, Object id)
throws JsonProcessingException {
JsonElement params = ProtoJsonUtils.retainKnownFields(jsonRpc, builder.getDescriptorForType());
parseJsonString(params.toString(), builder, id);
// Spec Section 5.7: ignore unrecognized field names for forward compatibility. The values
// of recognized fields, such as enum values, are still checked by the strict parser.
parseJsonString(ProtoJsonUtils.removeUnknownFields(jsonRpc, builder.getDescriptorForType()).toString(), builder, id);
}

public static void parseJsonString(String body, com.google.protobuf.Message.Builder builder, Object id) throws JsonProcessingException {
Expand Down
Loading
Loading