Skip to content

ADK changes #659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Dec 11, 2025
Merged

ADK changes #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
ADK changes 
PiperOrigin-RevId: 843252601
  • Loading branch information
@google-genai-bot @copybara-github
google-genai-bot authored and copybara-github committed Dec 11, 2025
commit 4c12dc4b6d6c3db1aaf001d2e294fdd5bb4c1e65
13 changes: 11 additions & 2 deletions a2a/src/main/java/com/google/adk/a2a/converters/PartConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,21 +132,28 @@ private static Optional<com.google.genai.types.Part> convertDataPartToGenAiPart(
if (data.containsKey("name") && data.containsKey("args")
|| A2A_DATA_PART_METADATA_TYPE_FUNCTION_CALL.equals(metadataType)) {
String functionName = String.valueOf(data.getOrDefault("name", ""));
String functionId = String.valueOf(data.getOrDefault("id", ""));
Map<String, Object> args = coerceToMap(data.get("args"));
return Optional.of(
com.google.genai.types.Part.builder()
.functionCall(FunctionCall.builder().name(functionName).args(args).build())
.functionCall(
FunctionCall.builder().name(functionName).id(functionId).args(args).build())
.build());
}

if (data.containsKey("name") && data.containsKey("response")
|| A2A_DATA_PART_METADATA_TYPE_FUNCTION_RESPONSE.equals(metadataType)) {
String functionName = String.valueOf(data.getOrDefault("name", ""));
String functionId = String.valueOf(data.getOrDefault("id", ""));
Map<String, Object> response = coerceToMap(data.get("response"));
return Optional.of(
com.google.genai.types.Part.builder()
.functionResponse(
FunctionResponse.builder().name(functionName).response(response).build())
FunctionResponse.builder()
.name(functionName)
.id(functionId)
.response(response)
.build())
.build());
}

Expand All @@ -167,6 +174,7 @@ private static Optional<com.google.genai.types.Part> convertDataPartToGenAiPart(
private static Optional<DataPart> createDataPartFromFunctionCall(FunctionCall functionCall) {
Map<String, Object> data = new HashMap<>();
data.put("name", functionCall.name().orElse(""));
data.put("id", functionCall.id().orElse(""));
data.put("args", functionCall.args().orElse(Map.of()));

Map<String, Object> metadata =
Expand All @@ -185,6 +193,7 @@ private static Optional<DataPart> createDataPartFromFunctionResponse(
FunctionResponse functionResponse) {
Map<String, Object> data = new HashMap<>();
data.put("name", functionResponse.name().orElse(""));
data.put("id", functionResponse.id().orElse(""));
data.put("response", functionResponse.response().orElse(Map.of()));

Map<String, Object> metadata =
Expand Down
16 changes: 14 additions & 2 deletions a2a/src/test/java/com/google/adk/a2a/EventConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@ public void convertEventsToA2AMessage_preservesFunctionCallAndResponseParts() {

Part functionCallPart =
Part.builder()
.functionCall(FunctionCall.builder().name("roll_die").args(Map.of("sides", 6)).build())
.functionCall(
FunctionCall.builder()
.name("roll_die")
.id("adk-call-1")
.args(Map.of("sides", 6))
.build())
.build();
Event callEvent =
Event.builder()
Expand All @@ -59,7 +64,11 @@ public void convertEventsToA2AMessage_preservesFunctionCallAndResponseParts() {
Part functionResponsePart =
Part.builder()
.functionResponse(
FunctionResponse.builder().name("roll_die").response(Map.of("result", 3)).build())
FunctionResponse.builder()
.name("roll_die")
.id("adk-call-1")
.response(Map.of("result", 3))
.build())
.build();
Event responseEvent =
Event.builder()
Expand Down Expand Up @@ -106,11 +115,14 @@ public void convertEventsToA2AMessage_preservesFunctionCallAndResponseParts() {
assertThat(callDataPart.getMetadata().get(PartConverter.A2A_DATA_PART_METADATA_TYPE_KEY))
.isEqualTo(PartConverter.A2A_DATA_PART_METADATA_TYPE_FUNCTION_CALL);
assertThat(callDataPart.getData()).containsEntry("name", "roll_die");
assertThat(callDataPart.getData()).containsEntry("id", "adk-call-1");
assertThat(callDataPart.getData()).containsEntry("args", Map.of("sides", 6));

DataPart responseDataPart = (DataPart) message.getParts().get(2);
assertThat(responseDataPart.getMetadata().get(PartConverter.A2A_DATA_PART_METADATA_TYPE_KEY))
.isEqualTo(PartConverter.A2A_DATA_PART_METADATA_TYPE_FUNCTION_RESPONSE);
assertThat(responseDataPart.getData()).containsEntry("name", "roll_die");
assertThat(responseDataPart.getData()).containsEntry("id", "adk-call-1");
assertThat(responseDataPart.getData()).containsEntry("response", Map.of("result", 3));
}

Expand Down