Skip to content

fix: merge metadata appendArtifactToTask metadata #615 #616

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

Open
flex-myeonghyeon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: merge metadata appendArtifactToTask metadata #615 #616

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
5 changes: 5 additions & 0 deletions server-common/src/test/java/io/a2a/server/tasks/TaskManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ public void testTaskArtifactUpdateEventAppendTrueWithExistingArtifact() throws A
.artifactId("artifact-id")
.name("artifact-1")
.parts(Collections.singletonList(new TextPart("existing content")))
.metadata(Map.of("key1", "value1"))
.build();
Task taskWithArtifact = Task.builder(initialTask)
.artifacts(Collections.singletonList(existingArtifact))
Expand All @@ -201,6 +202,7 @@ public void testTaskArtifactUpdateEventAppendTrueWithExistingArtifact() throws A
.artifactId("artifact-id")
.name("artifact-1")
.parts(Collections.singletonList(new TextPart("new content")))
.metadata(Map.of("key2", "value2"))
.build();
TaskArtifactUpdateEvent event = TaskArtifactUpdateEvent.builder()
.taskId(minimalTask.id())
Expand All @@ -217,6 +219,9 @@ public void testTaskArtifactUpdateEventAppendTrueWithExistingArtifact() throws A
assertEquals(2, updatedArtifact.parts().size());
assertEquals("existing content", ((TextPart) updatedArtifact.parts().get(0)).text());
assertEquals("new content", ((TextPart) updatedArtifact.parts().get(1)).text());

assertEquals("value1", updatedArtifact.metadata().get("key1"));
assertEquals("value2", updatedArtifact.metadata().get("key2"));
}

@Test
Expand Down
12 changes: 12 additions & 0 deletions spec/src/main/java/io/a2a/util/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
import static io.a2a.util.Assert.checkNotNullParam;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;

import com.google.gson.Gson;
Expand Down Expand Up @@ -129,8 +131,18 @@ public static Task appendArtifactToTask(Task task, TaskArtifactUpdateEvent event
log.fine(String.format("Appending parts to artifact id %s for task %s", artifactId, taskId));
List<Part<?>> parts = new ArrayList<>(existingArtifact.parts());
parts.addAll(newArtifact.parts());

Map<String, Object> metadata = new HashMap<>();
if (existingArtifact.metadata() != null) {
metadata.putAll(existingArtifact.metadata());
}
if (newArtifact.metadata() != null) {
metadata.putAll(newArtifact.metadata());
}

Artifact updated = Artifact.builder(existingArtifact)
.parts(parts)
.metadata(metadata)
.build();
artifacts.set(existingArtifactIndex, updated);
} else {
Expand Down