Merge branch 'main' into test/add-planners-unit-tests

Author: rohityan

.github/workflows/release-cherry-pick.yml

@@ -18,7 +18,7 @@ jobs:
   cherry-pick:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: release/candidate
           fetch-depth: 0

.github/workflows/release-cut.yml

@@ -18,7 +18,7 @@ jobs:
   cut-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ inputs.commit_sha || 'main' }}
 

.github/workflows/release-finalize.yml

@@ -29,7 +29,7 @@ jobs:
             echo "is_release_pr=false" >> $GITHUB_OUTPUT
           fi
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         if: steps.check.outputs.is_release_pr == 'true'
         with:
           ref: release/candidate

.github/workflows/release-please.yml

@@ -27,7 +27,7 @@ jobs:
             echo "exists=false" >> $GITHUB_OUTPUT
           fi
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         if: steps.check.outputs.exists == 'true'
         with:
           ref: release/candidate

.github/workflows/release-publish.yml

@@ -28,7 +28,7 @@ jobs:
           echo "version=$VERSION" >> $GITHUB_OUTPUT
           echo "Publishing version: $VERSION"
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Install uv
         uses: astral-sh/setup-uv@v4

contributing/samples/gepa/OWNERS

@@ -14,14 +14,20 @@
 
 """Example agent demonstrating the use of SkillToolset with GCS.
 
+Set the following environment variables before running:
+SAMPLE_SKILLS_SANDBOX_RESOURCE_NAME="projects/{PROJECT_NUMBER}/locations/{LOCATION}/reasoningEngines/{ENGINE_ID}/sandboxEnvironments/{SANDBOX_ID}"
+SAMPLE_SKILLS_AGENT_ENGINE_RESOURCE_NAME="projects/{PROJECT_NUMBER}/locations/{LOCATION}/reasoningEngines/{ENGINE_ID}"
+
 Go to parent directory and run with `adk web --host=0.0.0.0`.
 """
 
 import asyncio
 import logging
+import os
 
 from google.adk import Agent
 from google.adk import Runner
+from google.adk.code_executors.agent_engine_sandbox_code_executor import AgentEngineSandboxCodeExecutor
 from google.adk.plugins import LoggingPlugin
 from google.adk.skills import list_skills_in_gcs_dir
 from google.adk.skills import load_skill_from_gcs_dir
@@ -62,6 +68,12 @@
     tools=[
         my_skill_toolset,
     ],
+    code_executor=AgentEngineSandboxCodeExecutor(
+        sandbox_resource_name=os.getenv("SAMPLE_SKILLS_SANDBOX_RESOURCE_NAME"),
+        agent_engine_resource_name=os.getenv(
+            "SAMPLE_SKILLS_AGENT_ENGINE_RESOURCE_NAME"
+        ),
+    ),
 )
 
 

contributing/samples/skills_agent_gcs/agent.py

@@ -58,10 +58,9 @@ restore_venv() {
         deactivate
     fi
 
-    if [[ -d ".unittest_venv" ]]; then
-        echo "Cleaning up .unittest_venv..."
-        rm -rf .unittest_venv
-    fi
+    echo "Cleaning up temporary directories..."
+    [[ -n "${VENV_DIR:-}" ]] && rm -rf "$VENV_DIR"
+    [[ -n "${UV_CACHE_DIR:-}" ]] && rm -rf "$UV_CACHE_DIR"
 
     if [[ -n "$ORIGINAL_VENV" ]]; then
         echo "Reactivating pre-existing venv: $ORIGINAL_VENV"
@@ -72,6 +71,15 @@ restore_venv() {
 # Ensure the environment is restored when the script exits.
 trap restore_venv EXIT
 
+# Temporary directory for the virtual environment.
+VENV_DIR=$(mktemp -d "${TMPDIR:-/tmp}/unittest_venv.XXXXXX")
+
+# Move uv cache to temp to prevent workspace bloat and IDE performance issues.
+export UV_CACHE_DIR=$(mktemp -d "${TMPDIR:-/tmp}/uv_cache.XXXXXX")
+
+# Force 'copy' mode; hardlinks (uv default) fail on many virtual filesystems.
+export UV_LINK_MODE=copy
+
 # 1. deactivate the current venv
 if [[ -n "${VIRTUAL_ENV:-}" ]]; then
     echo "Deactivating current venv: $VIRTUAL_ENV"
@@ -88,12 +96,12 @@ for version in "${versions_to_run[@]}"; do
     echo "=================================================="
 
     # 2. create a unittest_venv just for unit tests
-    echo "Creating/Using unittest_venv for python${version} in .unittest_venv..."
-    uv venv --python "${version}" .unittest_venv --clear
-    source .unittest_venv/bin/activate
+    echo "Creating/Using unittest_venv for python${version} in $VENV_DIR..."
+    uv venv --python "${version}" "$VENV_DIR" --clear
+    source "$VENV_DIR/bin/activate"
 
     # 3. perform the unit tests
-    echo "Setting up test environment in .unittest_venv..."
+    echo "Setting up test environment in $VENV_DIR..."
     uv sync --extra test --active
 
     echo "Running unit tests..."

scripts/unittests.sh

@@ -136,6 +136,12 @@ class MyAgent(BaseAgent):
   sub_agents: list[BaseAgent] = Field(default_factory=list)
   """The sub-agents of this agent."""
 
+  version: str = ''
+  """The agent's version.
+
+  Version of the agent being invoked. Used to identify the Agent involved in telemetry.
+  """
+
   before_agent_callback: Optional[BeforeAgentCallback] = None
   """Callback or list of callbacks to be invoked before the agent run.
 
@@ -680,6 +686,7 @@ def __create_kwargs(
 
     kwargs: Dict[str, Any] = {
         'name': config.name,
+        'version': config.version,
         'description': config.description,
     }
     if config.sub_agents:

src/google/adk/agents/base_agent.py

@@ -55,6 +55,10 @@ class BaseAgentConfig(BaseModel):
 
   name: str = Field(description='Required. The name of the agent.')
 
+  version: str = Field(
+      default='', description='Optional. The version of the agent.'
+  )
+
   description: str = Field(
       default='', description='Optional. The description of the agent.'
   )