Skip to content
Merged
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
14 changes: 7 additions & 7 deletions client/base/src/main/java/io/a2a/A2A.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public class A2A {
* @see #createUserTextMessage(String, String, String)
*/
public static Message toUserMessage(String text) {
return toMessage(text, Message.Role.USER, null);
return toMessage(text, Message.Role.ROLE_USER, null);
}

/**
Expand All @@ -96,7 +96,7 @@ public static Message toUserMessage(String text) {
* @see #toUserMessage(String)
*/
public static Message toUserMessage(String text, String messageId) {
return toMessage(text, Message.Role.USER, messageId);
return toMessage(text, Message.Role.ROLE_USER, messageId);
}

/**
Expand All @@ -117,7 +117,7 @@ public static Message toUserMessage(String text, String messageId) {
* @see #toAgentMessage(String, String)
*/
public static Message toAgentMessage(String text) {
return toMessage(text, Message.Role.AGENT, null);
return toMessage(text, Message.Role.ROLE_AGENT, null);
}

/**
Expand All @@ -133,7 +133,7 @@ public static Message toAgentMessage(String text) {
* @return an agent message with the specified text and ID
*/
public static Message toAgentMessage(String text, String messageId) {
return toMessage(text, Message.Role.AGENT, messageId);
return toMessage(text, Message.Role.ROLE_AGENT, messageId);
}

/**
Expand Down Expand Up @@ -180,7 +180,7 @@ public static Message toAgentMessage(String text, String messageId) {
* @see Message#taskId()
*/
public static Message createUserTextMessage(String text, String contextId, String taskId) {
return toMessage(text, Message.Role.USER, null, contextId, taskId);
return toMessage(text, Message.Role.ROLE_USER, null, contextId, taskId);
}

/**
Expand All @@ -195,7 +195,7 @@ public static Message createUserTextMessage(String text, String contextId, Strin
* @see #createUserTextMessage(String, String, String)
*/
public static Message createAgentTextMessage(String text, String contextId, String taskId) {
return toMessage(text, Message.Role.AGENT, null, contextId, taskId);
return toMessage(text, Message.Role.ROLE_AGENT, null, contextId, taskId);
}

/**
Expand Down Expand Up @@ -225,7 +225,7 @@ public static Message createAgentPartsMessage(List<Part<?>> parts, String contex
if (parts == null || parts.isEmpty()) {
throw new IllegalArgumentException("Parts cannot be null or empty");
}
return toMessage(parts, Message.Role.AGENT, null, contextId, taskId);
return toMessage(parts, Message.Role.ROLE_AGENT, null, contextId, taskId);
}

private static Message toMessage(String text, Message.Role role, String messageId) {
Expand Down
16 changes: 8 additions & 8 deletions client/base/src/test/java/io/a2a/A2ATest.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public void testToUserMessage() {
String text = "Hello, world!";
Message message = A2A.toUserMessage(text);

assertEquals(Message.Role.USER, message.role());
assertEquals(Message.Role.ROLE_USER, message.role());
assertEquals(1, message.parts().size());
assertEquals(text, ((TextPart) message.parts().get(0)).text());
assertNotNull(message.messageId());
Expand All @@ -34,7 +34,7 @@ public void testToUserMessageWithId() {
String messageId = "test-message-id";
Message message = A2A.toUserMessage(text, messageId);

assertEquals(Message.Role.USER, message.role());
assertEquals(Message.Role.ROLE_USER, message.role());
assertEquals(messageId, message.messageId());
}

Expand All @@ -43,7 +43,7 @@ public void testToAgentMessage() {
String text = "Hello, I'm an agent!";
Message message = A2A.toAgentMessage(text);

assertEquals(Message.Role.AGENT, message.role());
assertEquals(Message.Role.ROLE_AGENT, message.role());
assertEquals(1, message.parts().size());
assertEquals(text, ((TextPart) message.parts().get(0)).text());
assertNotNull(message.messageId());
Expand All @@ -55,7 +55,7 @@ public void testToAgentMessageWithId() {
String messageId = "agent-message-id";
Message message = A2A.toAgentMessage(text, messageId);

assertEquals(Message.Role.AGENT, message.role());
assertEquals(Message.Role.ROLE_AGENT, message.role());
assertEquals(messageId, message.messageId());
}

Expand All @@ -67,7 +67,7 @@ public void testCreateUserTextMessage() {

Message message = A2A.createUserTextMessage(text, contextId, taskId);

assertEquals(Message.Role.USER, message.role());
assertEquals(Message.Role.ROLE_USER, message.role());
assertEquals(contextId, message.contextId());
assertEquals(taskId, message.taskId());
assertEquals(1, message.parts().size());
Expand All @@ -83,7 +83,7 @@ public void testCreateUserTextMessageWithNullParams() {

Message message = A2A.createUserTextMessage(text, null, null);

assertEquals(Message.Role.USER, message.role());
assertEquals(Message.Role.ROLE_USER, message.role());
assertNull(message.contextId());
assertNull(message.taskId());
assertEquals(1, message.parts().size());
Expand All @@ -98,7 +98,7 @@ public void testCreateAgentTextMessage() {

Message message = A2A.createAgentTextMessage(text, contextId, taskId);

assertEquals(Message.Role.AGENT, message.role());
assertEquals(Message.Role.ROLE_AGENT, message.role());
assertEquals(contextId, message.contextId());
assertEquals(taskId, message.taskId());
assertEquals(1, message.parts().size());
Expand All @@ -117,7 +117,7 @@ public void testCreateAgentPartsMessage() {

Message message = A2A.createAgentPartsMessage(parts, contextId, taskId);

assertEquals(Message.Role.AGENT, message.role());
assertEquals(Message.Role.ROLE_AGENT, message.role());
assertEquals(contextId, message.contextId());
assertEquals(taskId, message.taskId());
assertEquals(2, message.parts().size());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public class AuthenticationAuthorizationTest {
public void setUp() {
server = new ClientAndServer(4001);
MESSAGE = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("test message")))
.contextId("context-1234")
.messageId("message-1234")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public void setUp() {

sampleMessage = Message.builder()
.messageId("msg1")
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("Hello")))
.build();
}
Expand Down Expand Up @@ -196,7 +196,7 @@ public void testUpdateWithMessage() {
public void testUpdateWithMessageMovesStatusMessage() {
Message statusMessage = Message.builder()
.messageId("status_msg")
.role(Message.Role.AGENT)
.role(Message.Role.ROLE_AGENT)
.parts(Collections.singletonList(new TextPart("Status")))
.build();

Expand All @@ -219,7 +219,7 @@ public void testUpdateWithMessageMovesStatusMessage() {
public void testUpdateWithMessagePreservesExistingHistory() {
Message existingMessage = Message.builder()
.messageId("existing_msg")
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("Existing")))
.build();

Expand Down Expand Up @@ -256,7 +256,7 @@ public void testSaveTaskEventMultipleStatusUpdates() throws Exception {
// Second status update
Message secondMessage = Message.builder()
.messageId("msg2")
.role(Message.Role.AGENT)
.role(Message.Role.ROLE_AGENT)
.parts(Collections.singletonList(new TextPart("Second message")))
.build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void testSendStreamingMessageParams() {
// The goal here is just to verify the correct parameters are being used
// This is a unit test of the parameter construction, not the streaming itself
Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("test message")))
.contextId("context-test")
.messageId("message-test")
Expand All @@ -73,7 +73,7 @@ public void testSendStreamingMessageParams() {
assertNotNull(params);
assertEquals(message, params.message());
assertEquals(configuration, params.configuration());
assertEquals(Message.Role.USER, params.message().role());
assertEquals(Message.Role.ROLE_USER, params.message().role());
assertEquals("test message", ((TextPart) params.message().parts().get(0)).text());
}

Expand All @@ -95,7 +95,7 @@ public void testA2AClientSendStreamingMessage() throws Exception {

JSONRPCTransport client = new JSONRPCTransport("http://localhost:4001");
Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("tell me some jokes")))
.contextId("context-1234")
.messageId("message-1234")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public void testA2AClientSendMessage() throws Exception {

JSONRPCTransport client = new JSONRPCTransport("http://localhost:4001");
Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("tell me a joke")))
.contextId("context-1234")
.messageId("message-1234")
Expand Down Expand Up @@ -151,7 +151,7 @@ public void testA2AClientSendMessageWithMessageResponse() throws Exception {

JSONRPCTransport client = new JSONRPCTransport("http://localhost:4001");
Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("tell me a joke")))
.contextId("context-1234")
.messageId("message-1234")
Expand All @@ -168,7 +168,7 @@ public void testA2AClientSendMessageWithMessageResponse() throws Exception {
EventKind result = client.sendMessage(params, null);
assertInstanceOf(Message.class, result);
Message agentMessage = (Message) result;
assertEquals(Message.Role.AGENT, agentMessage.role());
assertEquals(Message.Role.ROLE_AGENT, agentMessage.role());
Part<?> part = agentMessage.parts().get(0);
assertTrue(part instanceof TextPart);
assertEquals("Why did the chicken cross the road? To get to the other side!", ((TextPart) part).text());
Expand All @@ -193,7 +193,7 @@ public void testA2AClientSendMessageWithError() throws Exception {

JSONRPCTransport client = new JSONRPCTransport("http://localhost:4001");
Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("tell me a joke")))
.contextId("context-1234")
.messageId("message-1234")
Expand Down Expand Up @@ -248,7 +248,7 @@ public void testA2AClientGetTask() throws Exception {
assertNotNull(history);
assertEquals(1, history.size());
Message message = history.get(0);
assertEquals(Message.Role.USER, message.role());
assertEquals(Message.Role.ROLE_USER, message.role());
List<Part<?>> parts = message.parts();
assertNotNull(parts);
assertEquals(3, parts.size());
Expand Down Expand Up @@ -435,7 +435,7 @@ public void testA2AClientSendMessageWithFilePart() throws Exception {

JSONRPCTransport client = new JSONRPCTransport("http://localhost:4001");
Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(List.of(
new TextPart("analyze this image"),
new FilePart(new FileWithUri("image/jpeg", null, "file:///path/to/image.jpg"))
Expand Down Expand Up @@ -495,7 +495,7 @@ public void testA2AClientSendMessageWithDataPart() throws Exception {
data.put("timestamp", "2024-01-15T10:30:00Z");

Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(List.of(
new TextPart("process this data"),
new DataPart(data)
Expand Down Expand Up @@ -552,7 +552,7 @@ public void testA2AClientSendMessageWithMixedParts() throws Exception {
data.put("labels", List.of("Q1", "Q2", "Q3", "Q4"));

Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(List.of(
new TextPart("analyze this data and image"),
new FilePart(new FileWithBytes("image/png", "chart.png", "aGVsbG8=")),
Expand Down Expand Up @@ -617,7 +617,7 @@ public void testExtensionSupportRequiredErrorUnmarshalling() throws Exception {

JSONRPCTransport client = new JSONRPCTransport("http://localhost:4001");
Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("test message")))
.contextId("context-test")
.messageId("message-test")
Expand Down Expand Up @@ -673,7 +673,7 @@ public void testVersionNotSupportedErrorUnmarshalling() throws Exception {

JSONRPCTransport client = new JSONRPCTransport("http://localhost:4001");
Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("test message")))
.contextId("context-test")
.messageId("message-test")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public void testOnEventWithMessageResult() throws Exception {
assertNotNull(receivedEvent.get());
assertTrue(receivedEvent.get() instanceof Message);
Message message = (Message) receivedEvent.get();
assertEquals(Message.Role.AGENT, message.role());
assertEquals(Message.Role.ROLE_AGENT, message.role());
assertEquals("msg-123", message.messageId());
assertEquals("context-456", message.contextId());
assertEquals(1, message.parts().size());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public RestTransportTest() {
@Test
public void testSendMessage() throws Exception {
Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("tell me a joke")))
.contextId("context-1234")
.messageId("message-1234")
Expand Down Expand Up @@ -143,7 +143,7 @@ public void testSendMessage() throws Exception {
assertEquals(1, task.history().size());
Message history = task.history().get(0);
assertEquals("message", history.kind());
assertEquals(Message.Role.USER, history.role());
assertEquals(Message.Role.ROLE_USER, history.role());
assertEquals("context-1234", history.contextId());
assertEquals("message-1234", history.messageId());
assertEquals("9b511af4-b27c-47fa-aecf-2a93c08a44f8", history.taskId());
Expand Down Expand Up @@ -215,7 +215,7 @@ public void testGetTask() throws Exception {
assertEquals(1, task.history().size());
Message history = task.history().get(0);
assertEquals("message", history.kind());
assertEquals(Message.Role.USER, history.role());
assertEquals(Message.Role.ROLE_USER, history.role());
assertEquals("message-123", history.messageId());
assertEquals(3, history.parts().size());
assertTrue(history.parts().get(0) instanceof io.a2a.spec.TextPart);
Expand Down Expand Up @@ -252,7 +252,7 @@ public void testSendMessageStreaming() throws Exception {

RestTransport client = new RestTransport(CARD);
Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("tell me some jokes")))
.contextId("context-1234")
.messageId("message-1234")
Expand Down Expand Up @@ -478,7 +478,7 @@ public void testExtensionSupportRequiredErrorUnmarshalling() throws Exception {

RestTransport client = new RestTransport(CARD);
Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("test message")))
.contextId("context-test")
.messageId("message-test")
Expand Down Expand Up @@ -526,7 +526,7 @@ public void testVersionNotSupportedErrorUnmarshalling() throws Exception {

RestTransport client = new RestTransport(CARD);
Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("test message")))
.contextId("context-test")
.messageId("message-test")
Expand Down Expand Up @@ -573,7 +573,7 @@ public void testVersionNotSupportedErrorUnmarshallingStreaming() throws Exceptio

RestTransport client = new RestTransport(CARD);
Message message = Message.builder()
.role(Message.Role.USER)
.role(Message.Role.ROLE_USER)
.parts(Collections.singletonList(new TextPart("test message")))
.contextId("context-test")
.messageId("message-test")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public void testOnMessageWithMessageResult() {
assertNotNull(receivedEvent.get());
assertTrue(receivedEvent.get() instanceof Message);
Message message = (Message) receivedEvent.get();
assertEquals(Message.Role.AGENT, message.role());
assertEquals(Message.Role.ROLE_AGENT, message.role());
assertEquals("msg-123", message.messageId());
assertEquals("context-456", message.contextId());
assertEquals(1, message.parts().size());
Expand Down
Loading