Skip to content

fix: support CitationMetadata #463

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
yarolegovich merged 2 commits into from
Jan 8, 2026
Merged

fix: support CitationMetadata #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92af04e
467119377
nahapetyan-serob Jan 7, 2026
f42d159
reduce duplication
nahapetyan-serob Jan 7, 2026
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
2 changes: 2 additions & 0 deletions agent/remoteagent/a2a_agent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ func TestRemoteAgent_ADK2ADK(t *testing.T) {
{
LLMResponse: model.LLMResponse{
Content: genai.NewContentFromText("hello", genai.RoleModel),
CitationMetadata: &genai.CitationMetadata{Citations: []*genai.Citation{{Title: "Title1"}, {Title: "Title2"}}},
UsageMetadata: &genai.GenerateContentResponseUsageMetadata{CandidatesTokenCount: 12, ThoughtsTokenCount: 42},
GroundingMetadata: &genai.GroundingMetadata{SourceFlaggingUris: []*genai.GroundingMetadataSourceFlaggingURI{{SourceID: "id1"}}},
CustomMetadata: map[string]any{"nested": map[string]any{"key": "value"}},
Expand All @@ -316,6 +317,7 @@ func TestRemoteAgent_ADK2ADK(t *testing.T) {
wantResponses: []model.LLMResponse{
{
Content: genai.NewContentFromText("hello", genai.RoleModel),
CitationMetadata: &genai.CitationMetadata{Citations: []*genai.Citation{{Title: "Title1"}, {Title: "Title2"}}},
UsageMetadata: &genai.GenerateContentResponseUsageMetadata{CandidatesTokenCount: 12, ThoughtsTokenCount: 42},
GroundingMetadata: &genai.GroundingMetadata{SourceFlaggingUris: []*genai.GroundingMetadataSourceFlaggingURI{{SourceID: "id1"}}},
CustomMetadata: map[string]any{"nested": map[string]any{"key": "value"}},
Expand Down
68 changes: 42 additions & 26 deletions server/adka2a/metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (

"github.com/a2aproject/a2a-go/a2a"
"github.com/a2aproject/a2a-go/a2asrv"
"google.golang.org/genai"

"google.golang.org/adk/internal/converters"
"google.golang.org/adk/session"
Expand All @@ -33,6 +32,7 @@ var (
metadataEscalateKey = ToA2AMetaKey("escalate")
metadataTransferToAgentKey = ToA2AMetaKey("transfer_to_agent")
metadataErrorCodeKey = ToA2AMetaKey("error_code")
metadataCitationKey = ToA2AMetaKey("citation_metadata")
metadataGroundingKey = ToA2AMetaKey("grounding_metadata")
metadataUsageKey = ToA2AMetaKey("usage_metadata")
metadataCustomMetaKey = ToA2AMetaKey("custom_metadata")
Expand Down Expand Up @@ -95,19 +95,14 @@ func toEventMeta(meta invocationMeta, event *session.Event) (map[string]any, err
}
}

if event.GroundingMetadata != nil {
v, err := converters.ToMapStructure(event.GroundingMetadata)
if err != nil {
return nil, err
}
result[metadataGroundingKey] = v
if err := addMeta(result, metadataCitationKey, event.CitationMetadata); err != nil {
return nil, err
}
if event.UsageMetadata != nil {
v, err := converters.ToMapStructure(event.UsageMetadata)
if err != nil {
return nil, err
}
result[metadataUsageKey] = v
if err := addMeta(result, metadataGroundingKey, event.GroundingMetadata); err != nil {
return nil, err
}
if err := addMeta(result, metadataUsageKey, event.UsageMetadata); err != nil {
return nil, err
}
if event.CustomMetadata != nil {
result[metadataCustomMetaKey] = event.CustomMetadata
Expand Down Expand Up @@ -138,20 +133,14 @@ func setActionsMeta(meta map[string]any, actions session.EventActions) map[strin
func processA2AMeta(a2aEvent a2a.Event, event *session.Event) error {
taskInfo, meta := a2aEvent.TaskInfo(), a2aEvent.Meta()

if gm, ok := meta[metadataGroundingKey].(map[string]any); ok {
converted, err := converters.FromMapStructure[genai.GroundingMetadata](gm)
if err != nil {
return err
}
event.GroundingMetadata = converted
if err := processMeta(metadataCitationKey, meta, &event.CitationMetadata); err != nil {
return err
}

if um, ok := meta[metadataUsageKey].(map[string]any); ok {
converted, err := converters.FromMapStructure[genai.GenerateContentResponseUsageMetadata](um)
if err != nil {
return err
}
event.UsageMetadata = converted
if err := processMeta(metadataGroundingKey, meta, &event.GroundingMetadata); err != nil {
return err
}
if err := processMeta(metadataUsageKey, meta, &event.UsageMetadata); err != nil {
return err
}

event.CustomMetadata = ToCustomMetadata(taskInfo.TaskID, taskInfo.ContextID)
Expand All @@ -169,3 +158,30 @@ func processA2AMeta(a2aEvent a2a.Event, event *session.Event) error {
event.Actions = toEventActions(a2aEvent.Meta())
return nil
}

func addMeta(result map[string]any, key string, data any) error {
if data == nil {
return nil
}
v, err := converters.ToMapStructure(data)
if err != nil {
return err
}
if v == nil {
return nil
}

result[key] = v
return nil
}

func processMeta[T any](key string, meta map[string]any, target **T) error {
if m, ok := meta[key].(map[string]any); ok {
converted, err := converters.FromMapStructure[T](m)
if err != nil {
return err
}
*target = converted
}
return nil
}
Loading