Commit 7e8965d
fix(live): propagate output token count in live API usage metadata
Merge #6064
**Please ensure you have read the [contribution guide](https://github.com/google/adk-python/blob/main/CONTRIBUTING.md) before creating a pull request.**
### Link to Issue or Description of Change
**Problem:**
Live API output token count in `usage_metadata` is always `0` (input/total are correct), so everything reading `candidates_token_count`reports zero output tokens for live sessions.
Root cause: live usage is a `types.UsageMetadata` (`response_token_count` / `response_tokens_details`), but `LlmResponse.usage_metadata` is a `types.GenerateContentResponseUsageMetadata` (`candidates_token_count` / `candidates_tokens_details`). The raw object was assigned directly; Pydantic re-validated into the target type and silently dropped the two renamed fields.
**Solution:**
Remap the live usage into `GenerateContentResponseUsageMetadata` in `gemini_llm_connection.receive()` via a `_to_generate_content_usage_metadata()` helper. Updated related tests.
### Testing Plan
**Unit Tests:**
- [X] I have added or updated unit tests for my change.
- [X] All unit tests pass locally.
$ uv run pytest tests/unittests/models/test_gemini_llm_connection.py -q
45 passed, 17 warnings in 1.25s
**Manual End-to-End (E2E) Tests:**
`uv run adk web contributing/samples/live --log_level DEBUG` → `live_bidi_streaming_single_agent`, audio stream. Confirmed live response's `usage_metadata.candidates_token_count` is now non-zero (was `0`), input/total unchanged.
### Checklist
- [X] I have read the [CONTRIBUTING.md](https://github.com/google/adk-python/blob/main/CONTRIBUTING.md) document.
- [X] I have performed a self-review of my own code.
- [X] I have commented my code, particularly in hard-to-understand areas.
- [X] I have added tests that prove my fix is effective or that my feature works.
- [X] New and existing unit tests pass locally with my changes.
- [X] I have manually tested my changes end-to-end.
- [X] Any dependent changes have been merged and published in downstream modules.
### Additional context
N/A
COPYBARA_INTEGRATE_REVIEW=#6064 from allen-stephen:fix/live-output-tokens 7ae8c29
PiperOrigin-RevId: 9305009431 parent 792775f commit 7e8965d
2 files changed
Lines changed: 99 additions & 4 deletions
File tree
- src/google/adk/models
- tests/unittests/models
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
216 | 216 | | |
217 | 217 | | |
218 | 218 | | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
219 | 248 | | |
220 | 249 | | |
221 | 250 | | |
| |||
234 | 263 | | |
235 | 264 | | |
236 | 265 | | |
237 | | - | |
| 266 | + | |
238 | 267 | | |
239 | | - | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
240 | 271 | | |
241 | 272 | | |
242 | 273 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
231 | 231 | | |
232 | 232 | | |
233 | 233 | | |
| 234 | + | |
| 235 | + | |
234 | 236 | | |
235 | 237 | | |
236 | 238 | | |
237 | | - | |
| 239 | + | |
238 | 240 | | |
239 | 241 | | |
240 | 242 | | |
| |||
243 | 245 | | |
244 | 246 | | |
245 | 247 | | |
246 | | - | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
247 | 251 | | |
248 | 252 | | |
249 | 253 | | |
250 | 254 | | |
251 | 255 | | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
252 | 316 | | |
253 | 317 | | |
254 | 318 | | |
| |||
0 commit comments