Merge branch 'main' into codex/adk-4685-fix-function-call-warning

Author: rohityan

contributing/samples/bigquery/README.md

@@ -55,6 +55,9 @@ distributed via the `google.adk.tools.bigquery` module. These tools include:
   `ARIMA_PLUS` model and then querying it with
   `ML.DETECT_ANOMALIES` to detect time series data anomalies.
 
+11. `search_catalog`
+  Searches for data entries across projects using the Dataplex Catalog. This allows discovery of datasets, tables, and other assets.
+
 ## How to use
 
 Set up environment variables in your `.env` file for using
@@ -159,3 +162,4 @@ the necessary access tokens to call BigQuery APIs on their behalf.
 * which tables exist in the ml_datasets dataset?
 * show more details about the penguins table
 * compute penguins population per island.
+* are there any tables related to animals in project <your_project_id>?

contributing/samples/fields_output_schema/agent.py

@@ -22,9 +22,20 @@ class WeatherData(BaseModel):
   wind_speed: str
 
 
+def get_current_year() -> str:
+  """Get the current year.
+
+  Returns:
+    The current year as a string
+  """
+  from datetime import datetime
+
+  return str(datetime.now().year)
+
+
 root_agent = Agent(
     name='root_agent',
-    model='gemini-2.0-flash',
+    model='gemini-2.5-flash',
     instruction="""\
 Answer user's questions based on the data you have.
 
@@ -43,6 +54,7 @@ class WeatherData(BaseModel):
 * wind_speed: 13 mph
 
 """,
-    output_schema=WeatherData,
+    output_schema=list[WeatherData],
     output_key='weather_data',
+    tools=[get_current_year],
 )

pyproject.toml

@@ -37,6 +37,7 @@ dependencies = [
   "google-cloud-bigquery-storage>=2.0.0",
   "google-cloud-bigquery>=2.2.0",
   "google-cloud-bigtable>=2.32.0",                           # For Bigtable database
+  "google-cloud-dataplex>=1.7.0,<3.0.0",                    # For Dataplex Catalog Search tool
   "google-cloud-discoveryengine>=0.13.12, <0.14.0",          # For Discovery Engine Search Tool
   "google-cloud-pubsub>=2.0.0, <3.0.0",                      # For Pub/Sub Tool
   "google-cloud-secret-manager>=2.22.0, <3.0.0",             # Fetching secrets in RestAPI Tool
@@ -109,6 +110,7 @@ community = [
 eval = [
   # go/keep-sorted start
   "Jinja2>=3.1.4,<4.0.0",                         # For eval template rendering
+  "gepa>=0.1.0",
   "google-cloud-aiplatform[evaluation]>=1.100.0",
   "pandas>=2.2.3",
   "rouge-score>=0.1.2",

src/google/adk/a2a/agent/config.py

@@ -25,9 +25,18 @@
 from a2a.client.middleware import ClientCallContext
 from a2a.server.events import Event as A2AEvent
 from a2a.types import Message as A2AMessage
-from a2a.types import MessageSendConfiguration
 from pydantic import BaseModel
 
+from ...a2a.converters.part_converter import A2APartToGenAIPartConverter
+from ...a2a.converters.part_converter import convert_a2a_part_to_genai_part
+from ...a2a.converters.to_adk_event import A2AArtifactUpdateToEventConverter
+from ...a2a.converters.to_adk_event import A2AMessageToEventConverter
+from ...a2a.converters.to_adk_event import A2AStatusUpdateToEventConverter
+from ...a2a.converters.to_adk_event import A2ATaskToEventConverter
+from ...a2a.converters.to_adk_event import convert_a2a_artifact_update_to_event
+from ...a2a.converters.to_adk_event import convert_a2a_message_to_event
+from ...a2a.converters.to_adk_event import convert_a2a_status_update_to_event
+from ...a2a.converters.to_adk_event import convert_a2a_task_to_event
 from ...agents.invocation_context import InvocationContext
 from ...events.event import Event
 
@@ -71,6 +80,31 @@ class RequestInterceptor(BaseModel):
 
 
 class A2aRemoteAgentConfig(BaseModel):
-  """Configuration for the RemoteA2aAgent."""
+  """Configuration for A2A remote agents."""
+
+  # Converts standard A2A Messages into ADK Event.
+  a2a_message_converter: A2AMessageToEventConverter = (
+      convert_a2a_message_to_event
+  )
+
+  # Converts an A2A Task into an ADK Event.
+  a2a_task_converter: A2ATaskToEventConverter = convert_a2a_task_to_event
+
+  # Converts A2A TaskStatusUpdateEvents into ADK Event.
+  a2a_status_update_converter: A2AStatusUpdateToEventConverter = (
+      convert_a2a_status_update_to_event
+  )
+
+  # Converts A2A TaskArtifactUpdateEvents into ADK Event.
+  a2a_artifact_update_converter: A2AArtifactUpdateToEventConverter = (
+      convert_a2a_artifact_update_to_event
+  )
+
+  # A low-level hook that converts individual A2A Message Parts
+  # into native ADK/GenAI Part objects.
+  # This is utilized internally by the other converters.
+  a2a_part_converter: A2APartToGenAIPartConverter = (
+      convert_a2a_part_to_genai_part
+  )
 
   request_interceptors: Optional[list[RequestInterceptor]] = None