Merge branch 'main' into custom-session-id-with-agent-engine

Author: guillaumeblaquiere

contributing/samples/agent_registry_agent/agent.py

@@ -18,6 +18,7 @@
 
 from google.adk.agents.llm_agent import LlmAgent
 from google.adk.integrations.agent_registry import AgentRegistry
+from google.adk.models.google_llm import Gemini
 
 # Project and location can be set via environment variables:
 # GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION
@@ -27,6 +28,8 @@
 # Initialize Agent Registry client
 registry = AgentRegistry(project_id=project_id, location=location)
 
+# List agents, MCP servers, and endpoints resource names from the registry.
+# They can be used to initialize the agent, toolset, and model below.
 print(f"Listing agents in {project_id}/{location}...")
 agents = registry.list_agents()
 for agent in agents.get("agents", []):
@@ -37,6 +40,11 @@
 for server in mcp_servers.get("mcpServers", []):
   print(f"- MCP Server: {server.get('displayName')} ({server.get('name')})")
 
+print(f"\nListing endpoints in {project_id}/{location}...")
+endpoints = registry.list_endpoints()
+for endpoint in endpoints.get("endpoints", []):
+  print(f"- Endpoint: {endpoint.get('displayName')} ({endpoint.get('name')})")
+
 # Example of using a specific agent or MCP server from the registry:
 # (Note: These names should be full resource names as returned by list methods)
 
@@ -52,8 +60,19 @@
     f"projects/{project_id}/locations/{location}/mcpServers/MCP_SERVER_NAME"
 )
 
+# 3. Getting a specific model endpoint configuration
+# This returns a string like:
+# "projects/adk12345/locations/us-central1/publishers/google/models/gemini-2.5-flash"
+# TODO: Replace ENDPOINT_NAME with your endpoint name
+model_name = registry.get_model_name(
+    f"projects/{project_id}/locations/{location}/endpoints/ENDPOINT_NAME"
+)
+
+# Initialize the model using the resolved model name from registry.
+gemini_model = Gemini(model=model_name)
+
 root_agent = LlmAgent(
-    model="gemini-2.5-flash",
+    model=gemini_model,
     name="discovery_agent",
     instruction=(
         "You have access to tools and sub-agents discovered via Registry."

contributing/samples/skills_agent/agent.py

@@ -54,9 +54,9 @@ async def run_async(self, *, args: dict, tool_context) -> str:
     return f"The timezone for {args['location']} is UTC+00:00."
 
 
-def get_current_humidity(location: str) -> str:
-  """Returns the current humidity for a given location."""
-  return f"The humidity in {location} is 45%."
+def get_wind_speed(location: str) -> str:
+  """Returns the current wind speed for a given location."""
+  return f"The wind speed in {location} is 10 mph."
 
 
 greeting_skill = models.Skill(
@@ -87,7 +87,7 @@ def get_current_humidity(location: str) -> str:
 # be used in production environments.
 my_skill_toolset = SkillToolset(
     skills=[greeting_skill, weather_skill],
-    additional_tools=[GetTimezoneTool(), get_current_humidity],
+    additional_tools=[GetTimezoneTool(), get_wind_speed],
     code_executor=UnsafeLocalCodeExecutor(),
 )
 

contributing/samples/skills_agent/skills/weather-skill/SKILL.md

@@ -1,8 +1,12 @@
 ---
 name: weather-skill
 description: A skill that provides weather information based on reference data.
+metadata:
+  adk_additional_tools:
+    - get_wind_speed
 ---
 
 Step 1: Check 'references/weather_info.md' for the current weather.
 Step 2: If humidity is requested, use run 'scripts/get_humidity.py' with the `location` argument.
-Step 3: Provide the update to the user.
+Step 3: If wind speed is requested, use the `get_wind_speed` tool.
+Step 4: Provide the update to the user.

contributing/samples/skills_agent/skills/weather_skill/SKILL.md

@@ -16,6 +16,7 @@
 
 from __future__ import annotations
 
+import copy
 from typing import Any
 from typing import Awaitable
 from typing import Callable
@@ -108,3 +109,16 @@ class A2aRemoteAgentConfig(BaseModel):
   )
 
   request_interceptors: Optional[list[RequestInterceptor]] = None
+
+  def __deepcopy__(self, memo):
+    cls = self.__class__
+    copied_values = {}
+    for k, v in self.__dict__.items():
+      if not k.startswith('_'):
+        if callable(v):
+          copied_values[k] = v
+        else:
+          copied_values[k] = copy.deepcopy(v, memo)
+    result = cls.model_construct(**copied_values)
+    memo[id(self)] = result
+    return result

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

@@ -38,6 +38,7 @@
 from typing_extensions import override
 
 from ...runners import Runner
+from ...sessions import base_session_service
 from ...utils.context_utils import Aclosing
 from ..agent.interceptors.new_integration_extension import _NEW_A2A_ADK_INTEGRATION_EXTENSION
 from ..converters.from_adk_event import create_error_status_event
@@ -287,6 +288,8 @@ async def _resolve_session(
         app_name=runner.app_name,
         user_id=user_id,
         session_id=session_id,
+        # Checking existence doesn't require event history.
+        config=base_session_service.GetSessionConfig(num_recent_events=0),
     )
     if session is None:
       session = await runner.session_service.create_session(

src/google/adk/a2a/executor/a2a_agent_executor_impl.py

@@ -73,6 +73,10 @@ class OAuth2Auth(BaseModelWithConfig):
   # tool or adk can generate the auth_uri with the state info thus client
   # can verify the state
   auth_uri: Optional[str] = None
+  # A unique value generated at the start of the OAuth flow to bind the user's
+  # session to the authorization request. This value is typically stored with
+  # user session and passed to backend for validation.
+  nonce: Optional[str] = None
   state: Optional[str] = None
   # tool or adk can decide the redirect_uri if they don't want client to decide
   redirect_uri: Optional[str] = None

src/google/adk/auth/auth_credential.py

@@ -1904,6 +1904,37 @@ async def event_generator():
           media_type="text/event-stream",
       )
 
+    @app.get(
+        "/dev/{app_name}/graph",
+        response_model_exclude_none=True,
+        tags=[TAG_DEBUG],
+    )
+    async def get_app_graph_dot(
+        app_name: str, dark_mode: bool = False
+    ) -> GetEventGraphResult | dict:
+      """Returns the base agent graph in DOT format without any highlights.
+
+      This endpoint allows the frontend to fetch the graph structure once
+      and compute highlights client-side for better performance.
+
+      Args:
+        app_name: The name of the agent/app
+        dark_mode: Whether to use dark theme background color
+      """
+      agent_or_app = self.agent_loader.load_agent(app_name)
+      root_agent = self._get_root_agent(agent_or_app)
+
+      # Get graph with NO highlights (empty list) and specified theme
+      dot_graph = await agent_graph.get_agent_graph(
+          root_agent, [], dark_mode=dark_mode
+      )
+
+      if dot_graph and isinstance(dot_graph, graphviz.Digraph):
+        return GetEventGraphResult(dot_src=dot_graph.source)
+      else:
+        return {}
+
+    # TODO: This endpoint can be removed once we update adk web to stop consuming it
     @app.get(
         "/apps/{app_name}/users/{user_id}/sessions/{session_id}/events/{event_id}/graph",
         response_model_exclude_none=True,

src/google/adk/cli/adk_web_server.py

@@ -282,9 +282,12 @@ def draw_edge(from_name, to_name):
       draw_edge(agent.name, get_node_name(tool))
 
 
-async def get_agent_graph(root_agent, highlights_pairs, image=False):
+async def get_agent_graph(
+    root_agent, highlights_pairs, image=False, dark_mode=True
+):
+  bg_color = '#333537' if dark_mode else '#ffffff'
   graph = graphviz.Digraph(
-      graph_attr={'rankdir': 'LR', 'bgcolor': '#333537'}, strict=True
+      graph_attr={'rankdir': 'LR', 'bgcolor': bg_color}, strict=True
   )
   await build_graph(graph, root_agent, highlights_pairs)
   if image:

src/google/adk/cli/agent_graph.py

@@ -1713,7 +1713,8 @@ def cli_api_server(
     default=False,
     help=(
         "Optional. Deploy ADK Web UI if set. (default: deploy ADK API server"
-        " only)"
+        " only). WARNING: The web UI is for development and testing only — do"
+        " not use in production."
     ),
 )
 @click.option(
@@ -2229,7 +2230,8 @@ def cli_deploy_agent_engine(
     default=False,
     help=(
         "Optional. Deploy ADK Web UI if set. (default: deploy ADK API server"
-        " only)"
+        " only). WARNING: The web UI is for development and testing only — do"
+        " not use in production."
     ),
 )
 @click.option(