Merge branch 'main' into feat/openapi-tool-httpx-client-factory

Author: rohityan

src/google/adk/a2a/converters/event_converter.py

@@ -570,7 +570,10 @@ def convert_event_to_a2a_events(
 
     # Handle regular message content
     message = convert_event_to_a2a_message(
-        event, invocation_context, part_converter=part_converter
+        event,
+        invocation_context,
+        part_converter=part_converter,
+        role=Role.user if event.author == "user" else Role.agent,
     )
     if message:
       running_event = _create_status_update_event(

src/google/adk/evaluation/base_eval_service.py

@@ -25,6 +25,7 @@
 from pydantic import ConfigDict
 from pydantic import Field
 
+from .constants import DEFAULT_LIVE_TIMEOUT_SECONDS
 from .eval_case import Invocation
 from .eval_metrics import EvalMetric
 from .eval_result import EvalCaseResult
@@ -81,6 +82,18 @@ class InferenceConfig(BaseModel):
 could also overwhelm those tools.""",
   )
 
+  use_live: bool = Field(
+      default=False,
+      description="""Whether to use live (bidirectional streaming) mode for
+inference. This is required for Live API models (e.g., gemini-*-live-*).""",
+  )
+
+  live_timeout_seconds: int = Field(
+      default=DEFAULT_LIVE_TIMEOUT_SECONDS,
+      description="""Timeout in seconds for waiting for model turn completion in
+live mode.""",
+  )
+
 
 class InferenceRequest(BaseModel):
   """Represent a request to perform inferences for the eval cases in an eval set."""

src/google/adk/evaluation/constants.py

@@ -18,3 +18,5 @@
     'Eval module is not installed, please install via `pip install'
     ' "google-adk[eval]"`.'
 )
+
+DEFAULT_LIVE_TIMEOUT_SECONDS = 300