Merge branch 'main' into feat/evaluate-full-response

Siddhartha90 · web-flow · commit ee8c179e1795 · 2026-04-09T13:45:13.000-07:00
diff --git a/contributing/samples/local_environment_skill/README.md b/contributing/samples/local_environment_skill/README.md
@@ -0,0 +1,24 @@
+# Local Environment Skill Sample
+
+This sample demonstrates how to use the `LocalEnvironment` with the `EnvironmentToolset` to allow an agent to manually discover and load skills from the environment, rather than using the pre-configured `SkillToolset`.
+
+## Description
+
+The agent is configured with the `EnvironmentToolset` and is initialized with a `LocalEnvironment` pointing to the agent's directory.
+Instead of having skills pre-loaded, the agent uses system instructions that guide it to search for skills in the `skills/` folder and load them by reading their `SKILL.md` files using the `ReadFile` tool.
+
+This demonstrates a "manual skill loading" pattern where the agent can acquire new capabilities dynamically by reading instructions from the environment.
+
+## Sample Usage
+
+You can interact with the agent by providing prompts that require a specific skill (like weather).
+
+### Example Prompt
+
+> "Can you check the weather in Sunnyvale?"
+
+### Expected Behavior
+
+1.  **Find Skill**: The agent uses the `Execute` tool to search for all available skills by running `find skills -name SKILL.md`.
+2.  **Load Skill**: The agent identifies the relevant skill and uses the `ReadFile` tool to read its `SKILL.md` file.
+3.  **Execute Skill**: The agent follows the instructions in the skill file (e.g., reading references or running scripts) to answer the user's request.
diff --git a/contributing/samples/local_environment_skill/__init__.py b/contributing/samples/local_environment_skill/__init__.py
@@ -0,0 +1,15 @@
+# Copyright 2026 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.
+
+from . import agent
diff --git a/contributing/samples/local_environment_skill/agent.py b/contributing/samples/local_environment_skill/agent.py
@@ -0,0 +1,95 @@
+# Copyright 2026 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.
+import pathlib
+
+from google.adk import Agent
+from google.adk.environment import LocalEnvironment
+from google.adk.tools.base_tool import BaseTool
+from google.adk.tools.environment import EnvironmentToolset
+from google.genai import types
+
+
+class GetTimezoneTool(BaseTool):
+  """A tool to get the timezone for a given location."""
+
+  def __init__(self):
+    super().__init__(
+        name="get_timezone",
+        description="Returns the timezone for a given location.",
+    )
+
+  def _get_declaration(self) -> types.FunctionDeclaration | None:
+    return types.FunctionDeclaration(
+        name=self.name,
+        description=self.description,
+        parameters_json_schema={
+            "type": "object",
+            "properties": {
+                "location": {
+                    "type": "string",
+                    "description": "The location to get the timezone for.",
+                },
+            },
+            "required": ["location"],
+        },
+    )
+
+  async def run_async(self, *, args: dict, tool_context) -> str:
+    return f"The timezone for {args['location']} is UTC+00:00."
+
+
+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."
+
+
+BASE_INSTRUCTION = (
+    "You are a helpful AI assistant that can use the local environment to"
+    " execute commands and file I/O."
+)
+
+SKILL_USAGE_INSTRUCTION = """\
+[SKILLS ACCESS]
+You have access to specialized skills stored in the environment's `skills/` folder.
+Each skill is a folder containing a `SKILL.md` file with instructions.
+
+[MANDATORY PROCEDURE]
+Before declaring that you cannot perform a task or answer a question (especially for domain-specific queries like weather), you MUST:
+1. Use the `Execute` tool to search for all available skills by running: `find skills -name SKILL.md`
+2. Review the list of found skills to see if any are relevant to the user's request.
+3. If a relevant skill is found, use the `ReadFile` tool to read its `SKILL.md` file.
+4. Follow the instructions in that file to complete the request.
+   *CRITICAL NOTE ON PATHS:* All file and script paths mentioned inside a `SKILL.md` file (e.g., `references/...` or `scripts/...`) are RELATIVE to that specific skill's folder. You MUST resolve them by prepending the skill's folder path (e.g., if the skill is at `skills/weather-skill/`, you must read `skills/weather-skill/references/weather_info.md`).
+
+Failure to check the `skills/` directory before stating you cannot help is unacceptable.\
+"""
+
+
+root_agent = Agent(
+    model="gemini-2.5-pro",
+    name="local_environment_skill_agent",
+    description=(
+        "An agent that uses local environment tools to load and use skills."
+    ),
+    instruction=f"{BASE_INSTRUCTION}\n\n{SKILL_USAGE_INSTRUCTION}",
+    tools=[
+        EnvironmentToolset(
+            environment=LocalEnvironment(
+                working_dir=pathlib.Path(__file__).parent
+            ),
+        ),
+        GetTimezoneTool(),
+        get_wind_speed,
+    ],
+)
diff --git a/contributing/samples/local_environment_skill/skills/weather-skill/SKILL.md b/contributing/samples/local_environment_skill/skills/weather-skill/SKILL.md
@@ -0,0 +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: If wind speed is requested, use the `get_wind_speed` tool.
+Step 4: Provide the update to the user.
diff --git a/contributing/samples/local_environment_skill/skills/weather-skill/references/weather_info.md b/contributing/samples/local_environment_skill/skills/weather-skill/references/weather_info.md
@@ -0,0 +1,11 @@
+# Weather Information
+
+- **Location:** San Francisco, CA
+- **Condition:** Sunny ☀️
+- **Temperature:** 72°F (22°C)
+- **Forecast:** Clear skies all day.
+
+- **Location:** Sunnyvale, CA
+- **Condition:** Sunny ☀️
+- **Temperature:** 75°F (24°C)
+- **Forecast:** Warm and sunny.
diff --git a/contributing/samples/local_environment_skill/skills/weather-skill/scripts/get_humidity.py b/contributing/samples/local_environment_skill/skills/weather-skill/scripts/get_humidity.py
@@ -0,0 +1,29 @@
+# Copyright 2026 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.
+
+import argparse
+
+
+def get_humidity(location: str) -> str:
+  """Fetch live humidity for a given location. (Simulated)"""
+  print(f"Fetching live humidity for {location}...")
+  return "45% (Simulated)"
+
+
+if __name__ == "__main__":
+  parser = argparse.ArgumentParser()
+  parser.add_argument("--location", type=str, default="Mountain View")
+  args = parser.parse_args()
+
+  print(get_humidity(args.location))
diff --git a/src/google/adk/a2a/executor/a2a_agent_executor.py b/src/google/adk/a2a/executor/a2a_agent_executor.py
@@ -260,17 +260,15 @@ async def _handle_request(
             context.context_id,
             self._config.gen_ai_part_converter,
         ):
-          a2a_event = await execute_after_event_interceptors(
+          a2a_events = await execute_after_event_interceptors(
               a2a_event,
               executor_context,
               adk_event,
               self._config.execute_interceptors,
           )
-          if a2a_event is None:
-            continue
-
-          task_result_aggregator.process_event(a2a_event)
-          await event_queue.enqueue_event(a2a_event)
+          for e in a2a_events:
+            task_result_aggregator.process_event(e)
+            await event_queue.enqueue_event(e)
 
     # publish the task result event - this is final
     if (
diff --git a/src/google/adk/a2a/executor/a2a_agent_executor_impl.py b/src/google/adk/a2a/executor/a2a_agent_executor_impl.py
@@ -49,6 +49,7 @@
 from ..experimental import a2a_experimental
 from .config import A2aAgentExecutorConfig
 from .executor_context import ExecutorContext
+from .interceptors.include_artifacts_in_a2a_event import include_artifacts_in_a2a_event_interceptor
 from .utils import execute_after_agent_interceptors
 from .utils import execute_after_event_interceptors
 from .utils import execute_before_agent_interceptors
@@ -221,15 +222,14 @@ async def _handle_request(
             self._config.gen_ai_part_converter,
         ):
           a2a_event.metadata = self._get_invocation_metadata(executor_context)
-          a2a_event = await execute_after_event_interceptors(
+          a2a_events = await execute_after_event_interceptors(
               a2a_event,
               executor_context,
               adk_event,
               self._config.execute_interceptors,
           )
-          if not a2a_event:
-            continue
-          await event_queue.enqueue_event(a2a_event)
+          for e in a2a_events:
+            await event_queue.enqueue_event(e)
 
     if error_event:
       final_event = error_event
diff --git a/src/google/adk/a2a/executor/config.py b/src/google/adk/a2a/executor/config.py
@@ -57,7 +57,7 @@ class ExecuteInterceptor:
   after_event: Optional[
       Callable[
           [ExecutorContext, A2AEvent, Event],
-          Awaitable[Union[A2AEvent, None]],
+          Awaitable[Union[A2AEvent, list[A2AEvent], None]],
       ]
   ] = None
   """Hook executed after an ADK event is converted to an A2A event.
diff --git a/src/google/adk/a2a/executor/interceptors/__init__.py b/src/google/adk/a2a/executor/interceptors/__init__.py
@@ -0,0 +1,19 @@
+# Copyright 2026 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.
+
+from .include_artifacts_in_a2a_event import include_artifacts_in_a2a_event_interceptor
+
+__all__ = [
+    "include_artifacts_in_a2a_event_interceptor",
+]
diff --git a/src/google/adk/a2a/executor/interceptors/include_artifacts_in_a2a_event.py b/src/google/adk/a2a/executor/interceptors/include_artifacts_in_a2a_event.py
@@ -0,0 +1,73 @@
+# Copyright 2026 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.
+from __future__ import annotations
+
+from typing import Union
+
+from a2a.server.events import Event as A2AEvent
+from a2a.types import Artifact
+from a2a.types import TaskArtifactUpdateEvent
+from a2a.types import TaskStatusUpdateEvent
+from google.adk.a2a.executor.config import ExecuteInterceptor
+from google.adk.a2a.executor.config import ExecutorContext
+
+from ....events.event import Event
+from ...converters.part_converter import convert_genai_part_to_a2a_part
+
+
+async def _after_agent(
+    ctx: ExecutorContext, a2a_event: A2AEvent, adk_event: Event
+) -> Union[A2AEvent, list[A2AEvent]]:
+  """After agent interceptor that includes artifacts in A2A events."""
+  if isinstance(a2a_event, (TaskStatusUpdateEvent, TaskArtifactUpdateEvent)):
+    artifact_service = ctx.runner.artifact_service
+    if artifact_service and adk_event.actions.artifact_delta:
+      new_events = []
+      for filename, version in adk_event.actions.artifact_delta.items():
+        genai_part = await artifact_service.load_artifact(
+            app_name=ctx.app_name,
+            user_id=ctx.user_id,
+            session_id=ctx.session_id,
+            filename=filename,
+            version=version,
+        )
+        if genai_part:
+          a2a_part = convert_genai_part_to_a2a_part(genai_part)
+          if a2a_part:
+            a2a_artifact = Artifact(
+                artifact_id=f"{filename}_{version}",
+                name=filename,
+                parts=[a2a_part],
+            )
+            new_event = TaskArtifactUpdateEvent(
+                task_id=a2a_event.task_id,
+                context_id=a2a_event.context_id,
+                artifact=a2a_artifact,
+                metadata=a2a_event.metadata,
+                append=False,
+                last_chunk=True,
+            )
+            new_events.append(new_event)
+
+      adk_event.actions.artifact_delta = {}
+
+      if new_events:
+        return [a2a_event] + new_events
+
+  return a2a_event
+
+
+include_artifacts_in_a2a_event_interceptor = ExecuteInterceptor(
+    after_event=_after_agent
+)
diff --git a/src/google/adk/a2a/executor/utils.py b/src/google/adk/a2a/executor/utils.py
@@ -41,16 +41,24 @@ async def execute_after_event_interceptors(
     executor_context: ExecutorContext,
     adk_event: Event,
     execute_interceptors: Optional[list[ExecuteInterceptor]],
-) -> Optional[A2AEvent]:
+) -> list[A2AEvent]:
+  events = [a2a_event]
   if execute_interceptors:
     for interceptor in execute_interceptors:
       if interceptor.after_event:
-        a2a_event = await interceptor.after_event(
-            executor_context, a2a_event, adk_event
-        )
-        if a2a_event is None:
-          return None
-  return a2a_event
+        next_events = []
+        for e in events:
+          res = await interceptor.after_event(executor_context, e, adk_event)
+          if res is None:
+            continue
+          if isinstance(res, list):
+            next_events.extend(res)
+          else:
+            next_events.append(res)
+        events = next_events
+        if not events:
+          return []
+  return events
 
 
 async def execute_after_agent_interceptors(
diff --git a/src/google/adk/cli/adk_web_server.py b/src/google/adk/cli/adk_web_server.py
diff --git a/src/google/adk/integrations/agent_registry/agent_registry.py b/src/google/adk/integrations/agent_registry/agent_registry.py
diff --git a/tests/unittests/a2a/integration/server.py b/tests/unittests/a2a/integration/server.py
diff --git a/tests/unittests/a2a/integration/test_client_server.py b/tests/unittests/a2a/integration/test_client_server.py
diff --git a/tests/unittests/cli/test_fast_api.py b/tests/unittests/cli/test_fast_api.py
diff --git a/tests/unittests/integrations/agent_registry/test_agent_registry.py b/tests/unittests/integrations/agent_registry/test_agent_registry.py

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class ExecuteInterceptor:`
`57`	`57`	`after_event: Optional[`
`58`	`58`	`Callable[`
`59`	`59`	`[ExecutorContext, A2AEvent, Event],`
`60`		`- Awaitable[Union[A2AEvent, None]],`
	`60`	`+ Awaitable[Union[A2AEvent, list[A2AEvent], None]],`
`61`	`61`	`]`
`62`	`62`	`] = None`
`63`	`63`	`"""Hook executed after an ADK event is converted to an A2A event.`