Skip to content

Commit 8c4ffcf

Browse files
committed
fix: remove duplicate usage_metadata handling after rebase
Upstream main already handles usage_metadata round-trip via _USAGE_METADATA_CUSTOM_METADATA_KEY in custom_metadata. Remove the redundant event_metadata-based usage_metadata storage/retrieval that was added in the initial commit, which caused a SyntaxError (repeated keyword argument) when merged with upstream.
1 parent 1d0c123 commit 8c4ffcf

1 file changed

Lines changed: 0 additions & 10 deletions

File tree

src/google/adk/sessions/vertex_ai_session_service.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,6 @@ async def append_event(self, session: Session, event: Event) -> Event:
312312
else None
313313
),
314314
}
315-
if event.usage_metadata:
316-
metadata_dict['usage_metadata'] = event.usage_metadata.model_dump(
317-
exclude_none=True, mode='json'
318-
)
319315
if event.cache_metadata:
320316
metadata_dict['cache_metadata'] = event.cache_metadata.model_dump(
321317
exclude_none=True, mode='json'
@@ -490,10 +486,6 @@ def _from_api_event(api_event_obj: vertexai.types.SessionEvent) -> Event:
490486
getattr(event_metadata, 'grounding_metadata', None),
491487
types.GroundingMetadata,
492488
)
493-
usage_metadata = _session_util.decode_model(
494-
getattr(event_metadata, 'usage_metadata', None),
495-
types.GenerateContentResponseUsageMetadata,
496-
)
497489
cache_metadata = _session_util.decode_model(
498490
getattr(event_metadata, 'cache_metadata', None),
499491
CacheMetadata,
@@ -508,7 +500,6 @@ def _from_api_event(api_event_obj: vertexai.types.SessionEvent) -> Event:
508500
compaction_data = None
509501
usage_metadata_data = None
510502
grounding_metadata = None
511-
usage_metadata = None
512503
cache_metadata = None
513504

514505
if actions:
@@ -558,7 +549,6 @@ def _from_api_event(api_event_obj: vertexai.types.SessionEvent) -> Event:
558549
branch=branch,
559550
custom_metadata=custom_metadata,
560551
grounding_metadata=grounding_metadata,
561-
usage_metadata=usage_metadata,
562552
cache_metadata=cache_metadata,
563553
long_running_tool_ids=long_running_tool_ids,
564554
usage_metadata=usage_metadata,

0 commit comments

Comments
 (0)