Merge branch 'google:main' into oauth-audience-prompt

Author: mescanne

src/google/adk/cli/adk_web_server.py

@@ -173,7 +173,18 @@ class AddSessionToEvalSetRequest(common.BaseModel):
 
 
 class RunEvalRequest(common.BaseModel):
-  eval_ids: list[str]  # if empty, then all evals in the eval set are run.
+  eval_ids: list[str] = Field(
+      deprecated=True,
+      default_factory=list,
+      description="This field is deprecated, use eval_case_ids instead.",
+  )
+  eval_case_ids: list[str] = Field(
+      default_factory=list,
+      description=(
+          "List of eval case ids to evaluate. if empty, then all eval cases in"
+          " the eval set are run."
+      ),
+  )
   eval_metrics: list[EvalMetric]
 
 
@@ -195,6 +206,10 @@ class RunEvalResult(common.BaseModel):
   session_id: str
 
 
+class RunEvalResponse(common.BaseModel):
+  run_eval_results: list[RunEvalResult]
+
+
 class GetEventGraphResult(common.BaseModel):
   dot_src: str
 
@@ -207,6 +222,22 @@ class ListEvalSetsResponse(common.BaseModel):
   eval_set_ids: list[str]
 
 
+class EvalResult(EvalSetResult):
+  """This class has no field intentionally.
+
+  The goal here is to just give a new name to the class to align with the API
+  endpoint.
+  """
+
+
+class ListEvalResultsResponse(common.BaseModel):
+  eval_result_ids: list[str]
+
+
+class ListMetricsInfoResponse(common.BaseModel):
+  metrics_info: list[MetricInfo]
+
+
 class AdkWebServer:
   """Helper class for setting up and running the ADK web server on FastAPI.
 
@@ -690,14 +721,30 @@ async def delete_eval(
       except NotFoundError as nfe:
         raise HTTPException(status_code=404, detail=str(nfe)) from nfe
 
+    @deprecated(
+        "Please use run_eval instead. This will be removed in future releases."
+    )
     @app.post(
         "/apps/{app_name}/eval_sets/{eval_set_id}/run_eval",
         response_model_exclude_none=True,
         tags=[TAG_EVALUATION],
     )
-    async def run_eval(
+    async def run_eval_legacy(
         app_name: str, eval_set_id: str, req: RunEvalRequest
     ) -> list[RunEvalResult]:
+      run_eval_response = await run_eval(
+          app_name=app_name, eval_set_id=eval_set_id, req=req
+      )
+      return run_eval_response.run_eval_results
+
+    @app.post(
+        "/apps/{app_name}/eval-sets/{eval_set_id}/run",
+        response_model_exclude_none=True,
+        tags=[TAG_EVALUATION],
+    )
+    async def run_eval(
+        app_name: str, eval_set_id: str, req: RunEvalRequest
+    ) -> RunEvalResponse:
       """Runs an eval given the details in the eval request."""
       # Create a mapping from eval set file to all the evals that needed to be
       # run.
@@ -727,7 +774,7 @@ async def run_eval(
         inference_request = InferenceRequest(
             app_name=app_name,
             eval_set_id=eval_set.eval_set_id,
-            eval_case_ids=req.eval_ids,
+            eval_case_ids=req.eval_case_ids or req.eval_ids,
             inference_config=InferenceConfig(),
         )
         inference_results = await _collect_inferences(
@@ -760,18 +807,41 @@ async def run_eval(
             )
         )
 
-      return run_eval_results
+      return RunEvalResponse(run_eval_results=run_eval_results)
 
     @app.get(
-        "/apps/{app_name}/eval_results/{eval_result_id}",
+        "/apps/{app_name}/eval-results/{eval_result_id}",
         response_model_exclude_none=True,
         tags=[TAG_EVALUATION],
     )
     async def get_eval_result(
         app_name: str,
         eval_result_id: str,
-    ) -> EvalSetResult:
+    ) -> EvalResult:
       """Gets the eval result for the given eval id."""
+      try:
+        eval_set_result = self.eval_set_results_manager.get_eval_set_result(
+            app_name, eval_result_id
+        )
+        return EvalResult(**eval_set_result.model_dump())
+      except ValueError as ve:
+        raise HTTPException(status_code=404, detail=str(ve)) from ve
+      except ValidationError as ve:
+        raise HTTPException(status_code=500, detail=str(ve)) from ve
+
+    @deprecated(
+        "Please use get_eval_result instead. This will be removed in future"
+        " releases."
+    )
+    @app.get(
+        "/apps/{app_name}/eval_results/{eval_result_id}",
+        response_model_exclude_none=True,
+        tags=[TAG_EVALUATION],
+    )
+    async def get_eval_result_legacy(
+        app_name: str,
+        eval_result_id: str,
+    ) -> EvalSetResult:
       try:
         return self.eval_set_results_manager.get_eval_set_result(
             app_name, eval_result_id
@@ -782,27 +852,46 @@ async def get_eval_result(
         raise HTTPException(status_code=500, detail=str(ve)) from ve
 
     @app.get(
-        "/apps/{app_name}/eval_results",
+        "/apps/{app_name}/eval-results",
         response_model_exclude_none=True,
         tags=[TAG_EVALUATION],
     )
-    async def list_eval_results(app_name: str) -> list[str]:
+    async def list_eval_results(app_name: str) -> ListEvalResultsResponse:
       """Lists all eval results for the given app."""
-      return self.eval_set_results_manager.list_eval_set_results(app_name)
+      eval_result_ids = self.eval_set_results_manager.list_eval_set_results(
+          app_name
+      )
+      return ListEvalResultsResponse(eval_result_ids=eval_result_ids)
+
+    @deprecated(
+        "Please use list_eval_results instead. This will be removed in future"
+        " releases."
+    )
+    @app.get(
+        "/apps/{app_name}/eval_results",
+        response_model_exclude_none=True,
+        tags=[TAG_EVALUATION],
+    )
+    async def list_eval_results_legacy(app_name: str) -> list[str]:
+      list_eval_results_response = await list_eval_results(app_name)
+      return list_eval_results_response.eval_result_ids
 
     @app.get(
-        "/apps/{app_name}/eval_metrics",
+        "/apps/{app_name}/metrics-info",
         response_model_exclude_none=True,
         tags=[TAG_EVALUATION],
     )
-    async def list_eval_metrics(app_name: str) -> list[MetricInfo]:
+    async def list_metrics_info(app_name: str) -> ListMetricsInfoResponse:
       """Lists all eval metrics for the given app."""
       try:
         from ..evaluation.metric_evaluator_registry import DEFAULT_METRIC_EVALUATOR_REGISTRY
 
         # Right now we ignore the app_name as eval metrics are not tied to the
         # app_name, but they could be moving forward.
-        return DEFAULT_METRIC_EVALUATOR_REGISTRY.get_registered_metrics()
+        metrics_info = (
+            DEFAULT_METRIC_EVALUATOR_REGISTRY.get_registered_metrics()
+        )
+        return ListMetricsInfoResponse(metrics_info=metrics_info)
       except ModuleNotFoundError as e:
         logger.exception("%s\n%s", MISSING_EVAL_DEPENDENCIES_MESSAGE, e)
         raise HTTPException(

src/google/adk/flows/llm_flows/audio_cache_manager.py

@@ -141,7 +141,6 @@ async def _flush_cache_to_services(
     Returns:
       True if the cache was successfully flushed, False otherwise.
     """
-    print('flush cache')
     if not invocation_context.artifact_service or not audio_cache:
       logger.debug('Skipping cache flush: no artifact service or empty cache')
       return False

src/google/adk/models/gemini_llm_connection.py

@@ -164,8 +164,14 @@ async def receive(self) -> AsyncGenerator[LlmResponse, None]:
               message.server_content.input_transcription
               and message.server_content.input_transcription.text
           ):
+            user_text = message.server_content.input_transcription.text
+            parts = [
+                types.Part.from_text(
+                    text=user_text,
+                )
+            ]
             llm_response = LlmResponse(
-                input_transcription=message.server_content.input_transcription,
+                content=types.Content(role='user', parts=parts)
             )
             yield llm_response
           if (
@@ -180,8 +186,13 @@ async def receive(self) -> AsyncGenerator[LlmResponse, None]:
             # We rely on other control signals to determine when to yield the
             # full text response(turn_complete, interrupted, or tool_call).
             text += message.server_content.output_transcription.text
+            parts = [
+                types.Part.from_text(
+                    text=message.server_content.output_transcription.text
+                )
+            ]
             llm_response = LlmResponse(
-                output_transcription=message.server_content.output_transcription
+                content=types.Content(role='model', parts=parts), partial=True
             )
             yield llm_response
 

src/google/adk/tools/agent_tool.py

@@ -139,7 +139,7 @@ async def run_async(
         state=tool_context.state.to_dict(),
     )
 
-    last_event = None
+    last_content = None
     async with Aclosing(
         runner.run_async(
             user_id=session.user_id, session_id=session.id, new_message=content
@@ -149,11 +149,12 @@ async def run_async(
         # Forward state delta to parent session.
         if event.actions.state_delta:
           tool_context.state.update(event.actions.state_delta)
-        last_event = event
+        if event.content:
+          last_content = event.content
 
-    if not last_event or not last_event.content or not last_event.content.parts:
+    if not last_content:
       return ''
-    merged_text = '\n'.join(p.text for p in last_event.content.parts if p.text)
+    merged_text = '\n'.join(p.text for p in last_content.parts if p.text)
     if isinstance(self.agent, LlmAgent) and self.agent.output_schema:
       tool_result = self.agent.output_schema.model_validate_json(
           merged_text

src/google/adk/tools/base_toolset.py

@@ -22,14 +22,17 @@
 from typing import Optional
 from typing import Protocol
 from typing import runtime_checkable
+from typing import Type
 from typing import TYPE_CHECKING
+from typing import TypeVar
 from typing import Union
 
 from ..agents.readonly_context import ReadonlyContext
 from .base_tool import BaseTool
 
 if TYPE_CHECKING:
   from ..models.llm_request import LlmRequest
+  from .tool_configs import ToolArgsConfig
   from .tool_context import ToolContext
 
 
@@ -53,6 +56,9 @@ def __call__(
     """
 
 
+SelfToolset = TypeVar("SelfToolset", bound="BaseToolset")
+
+
 class BaseToolset(ABC):
   """Base class for toolset.
 
@@ -152,6 +158,22 @@ async def close(self) -> None:
       resources are properly released to prevent leaks.
     """
 
+  @classmethod
+  def from_config(
+      cls: Type[SelfToolset], config: ToolArgsConfig, config_abs_path: str
+  ) -> SelfToolset:
+    """Creates a toolset instance from a config.
+
+    Args:
+      config: The config for the tool.
+      config_abs_path: The absolute path to the config file that contains the
+        tool config.
+
+    Returns:
+      The toolset instance.
+    """
+    raise ValueError(f"from_config() not implemented for toolset: {cls}")
+
   def _is_tool_selected(
       self, tool: BaseTool, readonly_context: ReadonlyContext
   ) -> bool:

src/google/adk/tools/mcp_tool/__init__.py

@@ -21,15 +21,19 @@
   from .mcp_session_manager import StdioConnectionParams
   from .mcp_session_manager import StreamableHTTPConnectionParams
   from .mcp_tool import MCPTool
+  from .mcp_tool import McpTool
   from .mcp_toolset import MCPToolset
+  from .mcp_toolset import McpToolset
 
   __all__.extend([
       'adk_to_mcp_tool_type',
       'gemini_to_json_schema',
+      'McpTool',
       'MCPTool',
+      'McpToolset',
       'MCPToolset',
-      'StdioConnectionParams',
       'SseConnectionParams',
+      'StdioConnectionParams',
       'StreamableHTTPConnectionParams',
   ])
 

src/google/adk/tools/mcp_tool/mcp_tool.py

@@ -17,6 +17,7 @@
 import base64
 import logging
 from typing import Optional
+import warnings
 
 from fastapi.openapi.models import APIKeyIn
 from google.genai.types import FunctionDeclaration
@@ -52,7 +53,7 @@
 logger = logging.getLogger("google_adk." + __name__)
 
 
-class MCPTool(BaseAuthenticatedTool):
+class McpTool(BaseAuthenticatedTool):
   """Turns an MCP Tool into an ADK Tool.
 
   Internally, the tool initializes from a MCP Tool, and uses the MCP Session to
@@ -216,3 +217,15 @@ async def _get_headers(
         )
 
     return headers
+
+
+class MCPTool(McpTool):
+  """Deprecated name, use `McpTool` instead."""
+
+  def __init__(self, *args, **kwargs):
+    warnings.warn(
+        "MCPTool class is deprecated, use `McpTool` instead.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    super().__init__(*args, **kwargs)