fix: Use candidates_token_count for output tokens in telemetry

Author: tl-nguyen

src/google/adk/agents/remote_a2a_agent.py

@@ -481,11 +481,11 @@ async def _run_async_impl(
           ),
       )
 
-    logger.info(build_a2a_request_log(a2a_request))
+    logger.debug(build_a2a_request_log(a2a_request))
 
     try:
       a2a_response = await self._a2a_client.send_message(request=a2a_request)
-      logger.info(build_a2a_response_log(a2a_response))
+      logger.debug(build_a2a_response_log(a2a_response))
 
       event = await self._handle_a2a_response(a2a_response, ctx)
 

src/google/adk/cli/browser/index.html

@@ -27,7 +27,7 @@
 
 from typing_extensions import deprecated
 
-from ..agents import Agent
+from ..agents.llm_agent import Agent
 from ..artifacts.base_artifact_service import BaseArtifactService
 from ..evaluation.base_eval_service import BaseEvalService
 from ..evaluation.base_eval_service import EvaluateConfig

src/google/adk/cli/browser/main-SRBSE46V.js renamed to src/google/adk/cli/browser/main-W7QZBYAR.js

@@ -27,7 +27,6 @@
 from typing import Any
 from typing import List
 from typing import Literal
-from typing import Mapping
 from typing import Optional
 
 import click
@@ -407,20 +406,7 @@ def _parse_agent_engine_resource_name(agent_engine_id_or_resource_name):
 
   @app.get("/list-apps")
   def list_apps() -> list[str]:
-    base_path = Path.cwd() / agents_dir
-    if not base_path.exists():
-      raise HTTPException(status_code=404, detail="Path not found")
-    if not base_path.is_dir():
-      raise HTTPException(status_code=400, detail="Not a directory")
-    agent_names = [
-        x
-        for x in os.listdir(base_path)
-        if os.path.isdir(os.path.join(base_path, x))
-        and not x.startswith(".")
-        and x != "__pycache__"
-    ]
-    agent_names.sort()
-    return agent_names
+    return agent_loader.list_agents()
 
   @app.get("/debug/trace/{event_id}")
   def get_trace_dict(event_id: str) -> Any:
@@ -525,13 +511,6 @@ async def create_session(
 
     return session
 
-  def _get_eval_set_file_path(app_name, agents_dir, eval_set_id) -> str:
-    return os.path.join(
-        agents_dir,
-        app_name,
-        eval_set_id + _EVAL_SET_FILE_EXTENSION,
-    )
-
   @app.post(
       "/apps/{app_name}/eval_sets/{eval_set_id}",
       response_model_exclude_none=True,
@@ -675,23 +654,24 @@ async def run_eval(
       app_name: str, eval_set_id: str, req: RunEvalRequest
   ) -> list[RunEvalResult]:
     """Runs an eval given the details in the eval request."""
-    from ..evaluation.local_eval_service import LocalEvalService
-    from .cli_eval import _collect_eval_results
-    from .cli_eval import _collect_inferences
-
     # Create a mapping from eval set file to all the evals that needed to be
     # run.
-    eval_set = eval_sets_manager.get_eval_set(app_name, eval_set_id)
+    try:
+      from ..evaluation.local_eval_service import LocalEvalService
+      from .cli_eval import _collect_eval_results
+      from .cli_eval import _collect_inferences
 
-    if not eval_set:
-      raise HTTPException(
-          status_code=400, detail=f"Eval set `{eval_set_id}` not found."
-      )
+      eval_set = eval_sets_manager.get_eval_set(app_name, eval_set_id)
 
-    root_agent = agent_loader.load_agent(app_name)
+      if not eval_set:
+        raise HTTPException(
+            status_code=400, detail=f"Eval set `{eval_set_id}` not found."
+        )
+
+      root_agent = agent_loader.load_agent(app_name)
+
+      eval_case_results = []
 
-    eval_case_results = []
-    try:
       eval_service = LocalEvalService(
           root_agent=root_agent,
           eval_sets_manager=eval_sets_manager,
@@ -894,7 +874,8 @@ async def agent_run(req: AgentRunRequest) -> list[Event]:
             new_message=req.new_message,
         )
     ]
-    logger.info("Generated %s events in agent run: %s", len(events), events)
+    logger.info("Generated %s events in agent run", len(events))
+    logger.debug("Events generated: %s", events)
     return events
 
   @app.post("/run_sse")
@@ -920,7 +901,7 @@ async def event_generator():
         ):
           # Format as SSE data
           sse_event = event.model_dump_json(exclude_none=True, by_alias=True)
-          logger.info("Generated event in agent run streaming: %s", sse_event)
+          logger.debug("Generated event in agent run streaming: %s", sse_event)
           yield f"data: {sse_event}\n\n"
       except Exception as e:
         logger.exception("Error in event_generator: %s", e)

src/google/adk/cli/cli_eval.py

@@ -17,20 +17,23 @@
 import importlib
 import logging
 import os
+from pathlib import Path
 import sys
 from typing import Optional
 
 from pydantic import ValidationError
+from typing_extensions import override
 
 from . import envs
 from ...agents import config_agent_utils
 from ...agents.base_agent import BaseAgent
 from ...utils.feature_decorator import working_in_progress
+from .base_agent_loader import BaseAgentLoader
 
 logger = logging.getLogger("google_adk." + __name__)
 
 
-class AgentLoader:
+class AgentLoader(BaseAgentLoader):
   """Centralized agent loading with proper isolation, caching, and .env loading.
   Support loading agents from below folder/file structures:
   a)  {agent_name}.agent as a module name:
@@ -188,6 +191,7 @@ def _perform_load(self, agent_name: str) -> BaseAgent:
         " exposed."
     )
 
+  @override
   def load_agent(self, agent_name: str) -> BaseAgent:
     """Load an agent module (with caching & .env) and return its root_agent."""
     if agent_name in self._agent_cache:
@@ -199,6 +203,20 @@ def load_agent(self, agent_name: str) -> BaseAgent:
     self._agent_cache[agent_name] = agent
     return agent
 
+  @override
+  def list_agents(self) -> list[str]:
+    """Lists all agents available in the agent loader (sorted alphabetically)."""
+    base_path = Path.cwd() / self.agents_dir
+    agent_names = [
+        x
+        for x in os.listdir(base_path)
+        if os.path.isdir(os.path.join(base_path, x))
+        and not x.startswith(".")
+        and x != "__pycache__"
+    ]
+    agent_names.sort()
+    return agent_names
+
   def remove_agent_from_cache(self, agent_name: str):
     # Clear module cache for the agent and its submodules
     keys_to_delete = [

src/google/adk/cli/fast_api.py

@@ -0,0 +1,34 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Base class for agent loaders."""
+
+from __future__ import annotations
+
+from abc import ABC
+from abc import abstractmethod
+
+from ...agents.base_agent import BaseAgent
+
+
+class BaseAgentLoader(ABC):
+  """Abstract base class for agent loaders."""
+
+  @abstractmethod
+  def load_agent(self, agent_name: str) -> BaseAgent:
+    """Loads an instance of an agent with the given name."""
+
+  @abstractmethod
+  def list_agents(self) -> list[str]:
+    """Lists all agents available in the agent loader in alphabetical order."""

src/google/adk/cli/utils/agent_loader.py

@@ -42,7 +42,6 @@ class Event(LlmResponse):
     branch: The branch of the event.
     id: The unique identifier of the event.
     timestamp: The timestamp of the event.
-    is_final_response: Whether the event is the final response of the agent.
     get_function_calls: Returns the function calls in the event.
   """
 
@@ -92,7 +91,13 @@ def model_post_init(self, __context):
       self.id = Event.new_id()
 
   def is_final_response(self) -> bool:
-    """Returns whether the event is the final response of the agent."""
+    """Returns whether the event is the final response of an agent.
+
+    NOTE: This method is ONLY for use by Agent Development Kit.
+
+    Note that when multiple agents participage in one invocation, there could be
+    one event has `is_final_response()` as True for each participating agent.
+    """
     if self.actions.skip_summarization or self.long_running_tool_ids:
       return True
     return (

src/google/adk/cli/utils/base_agent_loader.py

@@ -86,7 +86,8 @@ async def add_session_to_memory(self, session: Session):
           path=f'reasoningEngines/{self._agent_engine_id}/memories:generate',
           request_dict=request_dict,
       )
-      logger.info('Generate memory response: %s', api_response)
+      logger.info('Generate memory response received.')
+      logger.debug('Generate memory response: %s', api_response)
     else:
       logger.info('No events to add to memory.')
 
@@ -108,7 +109,8 @@ async def search_memory(self, *, app_name: str, user_id: str, query: str):
         },
     )
     api_response = _convert_api_response(api_response)
-    logger.info('Search memory response: %s', api_response)
+    logger.info('Search memory response received.')
+    logger.debug('Search memory response: %s', api_response)
 
     if not api_response or not api_response.get('retrievedMemories', None):
       return SearchMemoryResponse()

src/google/adk/events/event.py

@@ -174,7 +174,8 @@ def content_block_to_part(
 def message_to_generate_content_response(
     message: anthropic_types.Message,
 ) -> LlmResponse:
-  logger.info(
+  logger.info("Received response from Claude.")
+  logger.debug(
       "Claude response: %s",
       message.model_dump_json(indent=2, exclude_none=True),
   )