Skip to content

Commit 7640ad8

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 c4c014f commit 7640ad8

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

src/google/adk/sessions/vertex_ai_session_service.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,6 @@ async def append_event(self, session: Session, event: Event) -> Event:
304304
else None
305305
),
306306
}
307-
if event.usage_metadata:
308-
metadata_dict['usage_metadata'] = event.usage_metadata.model_dump(
309-
exclude_none=True, mode='json'
310-
)
311307
if event.cache_metadata:
312308
metadata_dict['cache_metadata'] = event.cache_metadata.model_dump(
313309
exclude_none=True, mode='json'
@@ -436,10 +432,6 @@ def _from_api_event(api_event_obj: vertexai.types.SessionEvent) -> Event:
436432
getattr(event_metadata, 'grounding_metadata', None),
437433
types.GroundingMetadata,
438434
)
439-
usage_metadata = _session_util.decode_model(
440-
getattr(event_metadata, 'usage_metadata', None),
441-
types.GenerateContentResponseUsageMetadata,
442-
)
443435
cache_metadata = _session_util.decode_model(
444436
getattr(event_metadata, 'cache_metadata', None),
445437
CacheMetadata,
@@ -454,7 +446,6 @@ def _from_api_event(api_event_obj: vertexai.types.SessionEvent) -> Event:
454446
compaction_data = None
455447
usage_metadata_data = None
456448
grounding_metadata = None
457-
usage_metadata = None
458449
cache_metadata = None
459450

460451
if actions:
@@ -497,7 +488,6 @@ def _from_api_event(api_event_obj: vertexai.types.SessionEvent) -> Event:
497488
branch=branch,
498489
custom_metadata=custom_metadata,
499490
grounding_metadata=grounding_metadata,
500-
usage_metadata=usage_metadata,
501491
cache_metadata=cache_metadata,
502492
long_running_tool_ids=long_running_tool_ids,
503493
usage_metadata=usage_metadata,

0 commit comments

Comments
 (0)