diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
new file mode 100644
index 0000000..2905bd5
--- /dev/null
+++ b/.github/workflows/android-ci.yml
@@ -0,0 +1,48 @@
+# 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.
+
+name: Android CI
+
+on:
+ pull_request:
+ branches: [ main ]
+ workflow_dispatch:
+
+permissions:
+ contents: read
+
+jobs:
+ build:
+ name: Android CI / build
+ # zizmor: ignore[unpinned-images]
+ runs-on: ubuntu-24.04
+ timeout-minutes: 10
+
+ steps:
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+ with:
+ persist-credentials: false
+
+ - name: Set up JDK 17
+ uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+ with:
+ distribution: 'temurin'
+ java-version: '17'
+ cache: 'gradle'
+
+ - name: Build and test library
+ run: |
+ chmod +x ./gradlew
+ ./gradlew test assembleRelease --no-daemon
+ working-directory: client/android/GoogleMapsA2UI
diff --git a/.github/workflows/cleanup-stale-prs.yml b/.github/workflows/cleanup-stale-prs.yml
new file mode 100644
index 0000000..d238b98
--- /dev/null
+++ b/.github/workflows/cleanup-stale-prs.yml
@@ -0,0 +1,84 @@
+# 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.
+
+name: Cleanup Stale Draft PRs
+
+on:
+ schedule:
+ - cron: '0 2 * * *' # Daily at 02:00 UTC
+ workflow_dispatch:
+ inputs:
+ older_than_days:
+ description: 'Close draft PRs older than N days'
+ required: false
+ default: '3'
+ type: string
+ dry_run:
+ description: 'Dry run (simulate without closing PRs or deleting branches)'
+ required: false
+ default: false
+ type: boolean
+
+permissions:
+ pull-requests: write
+ contents: write
+
+jobs:
+ cleanup:
+ name: Cleanup Draft PRs
+ # zizmor: ignore[unpinned-images]
+ runs-on: ubuntu-latest
+ steps:
+ - name: Close stale draft PRs and delete branches
+ env:
+ GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ GH_REPO: ${{ github.repository }}
+ INPUT_DAYS: ${{ inputs.older_than_days }}
+ INPUT_DRY_RUN: ${{ inputs.dry_run }}
+ run: |
+ DAYS="${INPUT_DAYS:-3}"
+ DRY_RUN="${INPUT_DRY_RUN:-false}"
+
+ echo "Searching for open draft PRs with head branch matching 'test_*' older than $DAYS day(s)..."
+
+ CUTOFF_EPOCH=$(date -d "$DAYS days ago" +%s)
+ echo "Cutoff timestamp: $CUTOFF_EPOCH ($(date -d "@$CUTOFF_EPOCH" --utc --iso-8601=seconds))"
+
+ PRS_JSON=$(gh pr list --repo "$GH_REPO" --state open --draft --json number,headRefName,updatedAt)
+
+ echo "$PRS_JSON" | jq -c '.[]' | while read -r pr; do
+ PR_NUMBER=$(echo "$pr" | jq -r '.number')
+ HEAD_REF=$(echo "$pr" | jq -r '.headRefName')
+ UPDATED_AT=$(echo "$pr" | jq -r '.updatedAt')
+
+ # Only target Copybara presubmit branches (prefix test_)
+ if [[ ! "$HEAD_REF" =~ ^test_ ]]; then
+ echo "Skipping PR #$PR_NUMBER (head branch '$HEAD_REF' does not match 'test_*')"
+ continue
+ fi
+
+ PR_EPOCH=$(date -d "$UPDATED_AT" +%s)
+ if [ "$PR_EPOCH" -lt "$CUTOFF_EPOCH" ]; then
+ echo "PR #$PR_NUMBER ($HEAD_REF, updated at $UPDATED_AT) is older than $DAYS day(s)."
+ if [ "$DRY_RUN" = "true" ]; then
+ echo "[DRY RUN] Would close PR #$PR_NUMBER and delete branch '$HEAD_REF'"
+ else
+ echo "Closing PR #$PR_NUMBER and deleting branch '$HEAD_REF'..."
+ gh pr close "$PR_NUMBER" --repo "$GH_REPO" --comment "Automatically closing stale presubmit draft PR and cleaning up branch." --delete-branch || \
+ gh pr close "$PR_NUMBER" --repo "$GH_REPO" --comment "Automatically closing stale presubmit draft PR."
+ fi
+ else
+ echo "Keeping PR #$PR_NUMBER ($HEAD_REF, updated at $UPDATED_AT) - active within $DAYS day(s)."
+ fi
+ done
diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml
new file mode 100644
index 0000000..6c8352a
--- /dev/null
+++ b/.github/workflows/ios-ci.yml
@@ -0,0 +1,45 @@
+# 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.
+
+name: iOS CI
+
+on:
+ pull_request:
+ branches: [ main ]
+ workflow_dispatch:
+
+permissions:
+ contents: read
+
+jobs:
+ build:
+ name: iOS CI / build
+ # Pinned to macos-15 so the bundled Xcode and iOS Simulator lineup stay stable.
+ # zizmor: ignore[unpinned-images]
+ runs-on: macos-15
+ timeout-minutes: 30
+
+ steps:
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+ with:
+ persist-credentials: false
+
+ - name: Build and test package
+ run: |
+ xcodebuild test \
+ -scheme GoogleMapsA2UI \
+ -destination 'platform=iOS Simulator,name=iPhone 16' \
+ -skipPackagePluginValidation \
+ CODE_SIGNING_ALLOWED=NO
+ working-directory: client/ios/GoogleMapsA2UI
diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
index 8ee8f3b..4693853 100644
--- a/.github/workflows/python-ci.yml
+++ b/.github/workflows/python-ci.yml
@@ -22,7 +22,10 @@ on:
jobs:
build:
+ name: Python CI / build
runs-on: ubuntu-latest
+ permissions:
+ contents: read
steps:
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fc62731..165d705 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,6 +18,11 @@
on:
workflow_dispatch:
+ inputs:
+ dry_run:
+ description: "Run in dry-run mode (no tags, no publish)"
+ type: boolean
+ default: true
permissions:
contents: write
@@ -45,7 +50,7 @@ jobs:
- name: Install dependencies
working-directory: client/web
- run: npm ci
+ run: npm install
- name: Setup Node for Publishing
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
@@ -60,5 +65,15 @@ jobs:
NODE_AUTH_TOKEN: ${{ secrets.NPM_WOMBAT_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_WOMBAT_TOKEN }}
NODE_PATH: ${{ github.workspace }}/client/web/node_modules
- run: npx --prefix client/web semantic-release
+ DRY_RUN: ${{ inputs.dry_run }}
+ REF_NAME: ${{ github.ref_name }}
+ run: |
+ EXTRA_ARGS=""
+ if [ "$DRY_RUN" != "false" ]; then
+ EXTRA_ARGS="--dry-run"
+ fi
+ if [ "$REF_NAME" != "main" ]; then
+ EXTRA_ARGS="$EXTRA_ARGS --branches $REF_NAME"
+ fi
+ npx --prefix client/web semantic-release $EXTRA_ARGS
diff --git a/.github/workflows/web-ci.yml b/.github/workflows/web-ci.yml
index a55bc4d..5272949 100644
--- a/.github/workflows/web-ci.yml
+++ b/.github/workflows/web-ci.yml
@@ -25,6 +25,7 @@ permissions:
jobs:
build:
+ name: Web CI / build
# zizmor: ignore[unpinned-images]
runs-on: ubuntu-24.04
steps:
diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
index 8c4f481..5f48f4e 100644
--- a/.github/workflows/zizmor.yml
+++ b/.github/workflows/zizmor.yml
@@ -1,3 +1,17 @@
+# 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.
+
name: Zizmor
on:
@@ -24,3 +38,6 @@ jobs:
- name: Run zizmor
uses: zizmorcore/zizmor-action@195d10ad90f31d8cd6ea1efd6ecc12969ddbe73f # v0.5.1
+ with:
+ args: --ignore insufficient-cooldown
+
diff --git a/.releaserc.json b/.releaserc.json
index 089c315..15c8354 100644
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -3,7 +3,34 @@
"main"
],
"plugins": [
- "@semantic-release/commit-analyzer",
+ [
+ "@semantic-release/commit-analyzer",
+ {
+ "preset": "angular",
+ "releaseRules": [
+ {
+ "breaking": true,
+ "release": "patch"
+ },
+ {
+ "type": "feat",
+ "release": "patch"
+ },
+ {
+ "type": "fix",
+ "release": "patch"
+ },
+ {
+ "type": "perf",
+ "release": "patch"
+ },
+ {
+ "type": "refactor",
+ "release": "patch"
+ }
+ ]
+ }
+ ],
"@semantic-release/release-notes-generator",
"@semantic-release/changelog",
[
diff --git a/README.md b/README.md
index a153511..075d9b8 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,7 @@ This package provides the core Python agent implementations for the Agentic UI T
* `agent.py`: Contains the `MAUIAgent` class, which handles session management, LLM interaction, and A2UI schema loading.
* `agent_with_grounding.py`: Contains `MAUIAgentWithGrounding`, extending the base agent with Vertex Grounding capabilities.
+* `streaming_request_handler.py`: Contains `StreamingRequestHandler` (extending `DefaultRequestHandler`), enabling the A2A server to handle both incremental SSE streaming (`message/stream`) and non-streaming (`message/send`) JSON-RPC requests.
* `shared/`: Contains schema extensions (e.g., `maps_catalog_extension.json`).
* `skills/`: Contains specific skill definitions used by the agents.
* `pyproject.toml`: Configuration file for the package, using Hatchling as the build backend.
@@ -185,6 +186,25 @@ class MAUIAgentExecutor(AgentExecutor):
raise ServerError(error=UnsupportedOperationError())
```
+#### 3. Enabling Real-Time SSE Streaming (`StreamingRequestHandler`)
+
+To serve both real-time Server-Sent Events (`message/stream`) and standard single-response requests (`message/send`) from your `A2AStarletteApplication`, pass `StreamingRequestHandler` as the `http_handler`:
+
+```python
+from a2a.server.apps import A2AStarletteApplication
+from a2a.server.tasks import InMemoryTaskStore
+from streaming_request_handler import StreamingRequestHandler
+
+request_handler = StreamingRequestHandler(
+ agent_executor=agent_executor,
+ task_store=InMemoryTaskStore(),
+)
+server = A2AStarletteApplication(
+ agent_card=default_agent.agent_card,
+ http_handler=request_handler,
+)
+```
+
## Agentic UI Toolkit Client Libraries
This repository provides A2UI client libraries across multiple platforms (Web, Android, and iOS) to render interactive A2UI surfaces and communicate with an A2A agent server.
@@ -254,6 +274,28 @@ return (
);
```
+#### 3. Streaming Responses (`sendStream`)
+`A2UIClient` also supports real-time incremental Server-Sent Events (SSE) streaming via `client.sendStream(messageText)` (`message/stream`). You can use a `useStreaming` boolean flag to switch between streaming (`client.sendStream`) and non-streaming (`client.send`):
+
+```tsx
+const useStreaming = true; // Set to false to use non-streaming client.send()
+
+async function handleSend(messageText: string) {
+ renderer.addUserMessage(messageText);
+
+ if (useStreaming) {
+ // Stream incremental text and A2UI component updates via SSE (message/stream)
+ for await (const chunk of client.sendStream(messageText)) {
+ renderer.processResponse([chunk]);
+ }
+ } else {
+ // Wait for the full response in a single payload (message/send)
+ const response = await client.send(messageText);
+ renderer.processResponse(response);
+ }
+}
+```
+
#### Local Development
To make changes to this package and test them in an application:
@@ -297,7 +339,6 @@ Agentic UI Toolkit requires an API Key to use Google Maps Platform products. To
Your API Key must have the following APIs enabled in the [Google Cloud Console](https://console.cloud.google.com/apis/credentials):
-* Geocoding API
* Maps JavaScript API
* Places UI Kit
* Routes API
diff --git a/agent/python_agent/README.md b/agent/python_agent/README.md
index a56a9c1..3b4f6e1 100644
--- a/agent/python_agent/README.md
+++ b/agent/python_agent/README.md
@@ -14,6 +14,9 @@ AI Maps Grounding.
`DIRECTIONS`) and structured parameter extraction for low latency.
* `agent_with_grounding.py`: Contains `MAUIAgentWithGrounding`, extending the
base agent with Vertex AI Grounding capabilities.
+* `template_tool.py`: Contains standard ADK `BaseTool` implementations
+ (`RenderLocalSearchTemplateTool`, `RenderDirectionsTemplateTool`,
+ `RenderTextOnlyTemplateTool`, and `TemplateToolset`) for template rendering.
* `agent_config.py`: Contains `AgentConfig` and `FallbackMode` configurations
(`TEXT` vs `DYNAMIC`).
* `extractor.py` & `merger.py`: Parameter extraction schemas and template
@@ -133,6 +136,25 @@ class MAUIAgentExecutor(AgentExecutor):
raise ServerError(error=UnsupportedOperationError())
```
+### 3. Enabling Real-Time SSE Streaming (`StreamingRequestHandler`)
+
+To serve both real-time Server-Sent Events (`message/stream`) and standard single-response requests (`message/send`) from your `A2AStarletteApplication`, pass `StreamingRequestHandler` as the `http_handler`:
+
+```python
+from a2a.server.apps import A2AStarletteApplication
+from a2a.server.tasks import InMemoryTaskStore
+from streaming_request_handler import StreamingRequestHandler
+
+request_handler = StreamingRequestHandler(
+ agent_executor=agent_executor,
+ task_store=InMemoryTaskStore(),
+)
+server = A2AStarletteApplication(
+ agent_card=default_agent.agent_card,
+ http_handler=request_handler,
+)
+```
+
## Google API Keys
### Google Maps API Key
diff --git a/agent/python_agent/__init__.py b/agent/python_agent/__init__.py
index 11eecd8..067827d 100644
--- a/agent/python_agent/__init__.py
+++ b/agent/python_agent/__init__.py
@@ -1 +1,21 @@
-# GMP A2UI Python Agent Package
+# 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
+#
+# https://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 template_tool import (
+ BaseTemplateTool,
+ RenderDirectionsTemplateTool,
+ RenderLocalSearchTemplateTool,
+ RenderTextOnlyTemplateTool,
+ TemplateToolset,
+)
diff --git a/agent/python_agent/after_tools_callback.py b/agent/python_agent/after_tools_callback.py
new file mode 100644
index 0000000..ee46ef7
--- /dev/null
+++ b/agent/python_agent/after_tools_callback.py
@@ -0,0 +1,100 @@
+# 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
+#
+# https://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.
+
+"""After-tool callback for grounding tools in MAUI Agent."""
+
+import logging
+from typing import Any
+
+logger = logging.getLogger(__name__)
+
+# Maximum number of recent content tokens to retain in session state.
+#
+# Trade-offs / Considerations:
+# - Pros of larger values:
+# - Retains grounding tokens across longer multi-turn conversations where
+# older tool calls returned entities that are still referenced or
+# rendered in UI widgets.
+# - Prevents premature eviction of valid tokens, ensuring Place Widget
+# requests can successfully waive billing even after multiple subsequent
+# tool turns.
+# - Cons of larger values:
+# - Increases session state size and payload memory footprint across
+# requests.
+# - Increases serialized metadata size attached to message parts and RPCs.
+# - Adds backend processing overhead when downstream services must decrypt
+# and validate a larger list of candidate tokens.
+# - Since tokens have an expiration TTL (e.g. 30 minutes), retaining too
+# many historical tokens increases stale/expired tokens in the payload.
+MAX_CONTENT_TOKENS: int = 10
+
+
+def after_tools_callback(
+ tool: Any,
+ args: dict[str, Any],
+ tool_context: Any,
+ tool_response: Any,
+ **kwargs: Any,
+) -> Any:
+ """Callback to aggregate grounding_content_token into session state."""
+ # pylint: disable=unused-argument
+ if not tool_response or not isinstance(tool_response, dict):
+ return None
+
+ after_maps_tools_callback(tool_context, tool_response)
+
+ return None
+
+
+def after_maps_tools_callback(
+ tool_context: Any,
+ tool_response: Any,
+) -> Any:
+ """Callback to aggregate content_token from Maps Tools into session state."""
+ # pylint: disable=unused-argument
+ if tool_context is None or getattr(tool_context, "state", None) is None:
+ return None
+
+ token = tool_response.get("content_token")
+ if isinstance(token, str) and token:
+ content_tokens = tool_context.state.get("maps_tools_content_tokens", [])
+ # If content_tokens is not a list, initialize it to an empty list.
+ if not isinstance(content_tokens, list):
+ content_tokens = []
+ if token not in content_tokens:
+ content_tokens.append(token)
+ # Keep only the last MAX_CONTENT_TOKENS tokens.
+ if len(content_tokens) > MAX_CONTENT_TOKENS:
+ content_tokens = content_tokens[-MAX_CONTENT_TOKENS:]
+ tool_context.state["maps_tools_content_tokens"] = content_tokens
+ logger.info(
+ "--- after_maps_tools_callback: Aggregated content token into"
+ " content_tokens. ---"
+ )
+
+ return None
+
+
+def _add_maps_tools_tokens_to_part(part: Any, session: Any) -> None:
+ """Adds maps_tools_content_tokens from session state to part metadata."""
+ if session is None or getattr(session, "state", None) is None:
+ return
+ maps_tools_content_tokens = session.state.get("maps_tools_content_tokens")
+ if maps_tools_content_tokens:
+ if getattr(part, "root", None) is not None:
+ if getattr(part.root, "metadata", None) is None:
+ part.root.metadata = {}
+ part.root.metadata["maps_tools_content_tokens"] = (
+ maps_tools_content_tokens
+ )
diff --git a/agent/python_agent/agent.py b/agent/python_agent/agent.py
index 19182fb..8329ae5 100644
--- a/agent/python_agent/agent.py
+++ b/agent/python_agent/agent.py
@@ -51,9 +51,22 @@
from a2ui.schema.catalog import CatalogConfig
from a2ui.schema.catalog_provider import A2uiCatalogProvider
from a2ui.schema.common_modifiers import remove_strict_validation
-from a2ui.schema.constants import A2UI_CLOSE_TAG, A2UI_OPEN_TAG, VERSION_0_9
+from a2ui.parser.constants import (
+ MSG_TYPE_CREATE_SURFACE,
+ MSG_TYPE_DELETE_SURFACE,
+ MSG_TYPE_UPDATE_COMPONENTS,
+ MSG_TYPE_UPDATE_DATA_MODEL,
+)
+from a2ui.schema.constants import (
+ A2UI_CLOSE_TAG,
+ A2UI_OPEN_TAG,
+ A2UI_SURFACE_ID_KEY,
+ VERSION_0_9,
+)
from a2ui.schema.manager import A2uiSchemaManager
+from .after_tools_callback import _add_maps_tools_tokens_to_part, after_tools_callback
+
logger = logging.getLogger(__name__)
InMemorySessionService = in_memory_session_service.InMemorySessionService
@@ -143,6 +156,24 @@ def load(self) -> dict[str, Any]:
return catalog
+def extract_surface_id(data: Any) -> str | None:
+ """Extracts the surface ID from an A2UI payload dictionary or part."""
+ if not isinstance(data, dict):
+ return None
+ for key in (
+ MSG_TYPE_CREATE_SURFACE,
+ MSG_TYPE_UPDATE_COMPONENTS,
+ MSG_TYPE_UPDATE_DATA_MODEL,
+ MSG_TYPE_DELETE_SURFACE,
+ ):
+ target = data.get(key)
+ if isinstance(target, dict):
+ surface_id = target.get(A2UI_SURFACE_ID_KEY)
+ if surface_id:
+ return str(surface_id)
+ return None
+
+
class MAUIAgent:
"""An agent that finds restaurants based on user criteria."""
@@ -159,6 +190,7 @@ def __init__(
self._model_name = model_name
self._user_id = "remote_agent"
self._shared_session_service = InMemorySessionService()
+ self._after_tool_callback = after_tools_callback
self._text_runner: Runner | None = self._build_runner(
self._build_llm_agent()
)
@@ -303,6 +335,7 @@ def _build_llm_agent(
),
instruction=instruction,
tools=[grounding_lite_mcp, skill_manager_tool],
+ after_tool_callback=self._after_tool_callback,
)
async def stream(
@@ -414,15 +447,28 @@ async def token_stream():
"--- MAUIAgent.stream: Streamed part: %s ---", token_stream()
)
- async for part in stream_response_to_parts(
- self._parsers[session_id],
- token_stream(),
- ):
- logger.info("-- MAUIAgent.stream: Streamed part: %s ---", part)
- yield {
- "is_task_complete": False,
- "parts": [part],
- }
+ session_surface_id = None
+ # Wrap stream parsing in try/except to prevent A2uiValidatorError from crashing the ASGI app.
+ # This ensures execution falls through to the deleteSurface/retry loop below.
+ try:
+ async for part in stream_response_to_parts(
+ self._parsers[session_id],
+ token_stream(),
+ ):
+ _add_maps_tools_tokens_to_part(part, session)
+ logger.info("-- MAUIAgent.stream: Streamed part: %s ---", part)
+ # TODO(b/553539577): Remove this workaround once A2UI fixes the stream parser state issue.
+ if isinstance(part.root, DataPart):
+ s_id = extract_surface_id(part.root.data)
+ if s_id:
+ session_surface_id = s_id
+ logger.info("[WORKAROUND] Sniffed surfaceId '%s' from streamed part", session_surface_id)
+ yield {
+ "is_task_complete": False,
+ "parts": [part],
+ }
+ except Exception as e:
+ logger.warning("--- MAUIAgent.stream: Error during stream parsing (will fall through to retry loop): %s ---", e)
else:
async for token in token_stream():
yield {
@@ -528,6 +574,9 @@ async def token_stream():
filtered_parts.append(p)
final_parts = filtered_parts
+ for p in final_parts:
+ _add_maps_tools_tokens_to_part(p, session)
+
yield {
"is_task_complete": True,
"parts": final_parts,
@@ -542,6 +591,26 @@ async def token_stream():
attempt,
max_retries + 1,
)
+
+ # Extract surfaceId to clear the failed UI card on the client
+ surface_id = session_surface_id or getattr(self._parsers.get(session_id), "surface_id", None)
+
+ if surface_id:
+ logger.info("--- MAUIAgent.stream: Sending deleteSurface for '%s' to clear failed attempt ---", surface_id)
+ yield {
+ "is_task_complete": False,
+ "parts": [
+ Part(
+ root=DataPart(
+ data={
+ "version": "v0.9",
+ "deleteSurface": {"surfaceId": surface_id},
+ }
+ )
+ )
+ ],
+ }
+
# Prepare the query for the retry
current_query_text = (
f"Your previous response was invalid. {error_message} You MUST"
@@ -573,3 +642,5 @@ async def token_stream():
],
}
# --- End: UI Validation and Retry Logic ---
+
+
diff --git a/agent/python_agent/agent_config.py b/agent/python_agent/agent_config.py
index e3151c3..cb4d7a8 100644
--- a/agent/python_agent/agent_config.py
+++ b/agent/python_agent/agent_config.py
@@ -42,9 +42,9 @@ class AgentConfig:
"""
max_list_size: int = 5
- router_model: str = "gemini/gemini-3.1-flash-lite"
- template_model: str = "gemini/gemini-3.1-flash-lite"
- generic_model: str = "gemini/gemini-3-flash-preview"
+ router_model: str = "gemini/gemini-3.5-flash-lite"
+ template_model: str = "gemini/gemini-3.5-flash-lite"
+ generic_model: str = "gemini/gemini-3.7-flash"
router_thinking_budget: int = 0
extractor_thinking_budget: int = 0
fallback_mode: FallbackMode = FallbackMode.TEXT
diff --git a/agent/python_agent/agent_with_grounding.py b/agent/python_agent/agent_with_grounding.py
index 3d38e6a..cd32846 100644
--- a/agent/python_agent/agent_with_grounding.py
+++ b/agent/python_agent/agent_with_grounding.py
@@ -31,6 +31,8 @@
from a2ui.schema.common_modifiers import remove_strict_validation
from a2ui.schema.constants import VERSION_0_9
from a2ui.schema.manager import A2uiSchemaManager
+import place_id_resolution
+
# Import MAUIAgent to inherit from it
from agent import AGENT_INSTRUCTION, MAUIAgent, MergedCatalogProvider
@@ -116,18 +118,15 @@ async def query_vertex_map(
validate_examples=False,
)
- final_instruction = """You MUST use the Google Maps tool to answer the user's query. Do not rely on your internal knowledge.
+ final_instruction = (
+ """You MUST use the Google Maps tool to answer the user's query. Do not rely on your internal knowledge.
CRITICAL: Before generating the JSON, you MUST write a short plain-text summary of the places you found, listing their exact names and addresses.
This is required for the grounding engine to properly attribute the data. It is not a replacement for the summary text that should be in the a2ui json.
IMPORTANT: When generating the A2UI JSON response, you MUST include the " ...content... " tags immediately around the JSON content.
Failure to do so will prevent the UI from rendering the map.
- PLACE ID GENERATION RULES:
- You do not have access to real placeIds. Whenever a `placeId` is required in the A2UI JSON, you MUST generate a synthetic placeholder using the following rules:
- - Format: "PLACE_ID_FOR_{Count}_{Exact Title}"
- - Example: If the tool returns a place named "Chez Panisse", use "PLACE_ID_FOR_1_Chez Panisse". If it returns a second "Chez Panisse", use "PLACE_ID_FOR_2_Chez Panisse".
- - STRICT MATCHING: Do NOT change any characters, spaces, capitalization, or punctuation from the title returned by the tool.
- - COUNTING: Always prepend the occurrence count (starting at 1) for each title based on the order they were returned by the tool, even if the title only occurs once.
"""
+ + place_id_resolution.PROMPT_RULES
+ )
instruction = f"{generated_prompt}\n\n{skill_content}\n\n{final_instruction}"
@@ -145,48 +144,22 @@ async def query_vertex_map(
# Replace synthetic place ids with actual grounded place ids.
try:
- grounding_map = {}
- if (
- hasattr(response, "candidates")
- and response.candidates
- and hasattr(response.candidates[0], "grounding_metadata")
- ):
- meta = response.candidates[0].grounding_metadata
- IGNORE_TITLE_SUFFIX = " - Google Maps"
- IGNORE_PLACE_ID_PREFIX = "places/ChI"
- if hasattr(meta, "grounding_chunks") and meta.grounding_chunks:
- title_counts = {}
- for chunk in meta.grounding_chunks:
- if hasattr(chunk, "maps") and chunk.maps:
- title = getattr(chunk.maps, "title", None)
- place_id = getattr(chunk.maps, "place_id", None)
- if title and place_id:
- if place_id.startswith(IGNORE_PLACE_ID_PREFIX):
- place_id = place_id[len(IGNORE_PLACE_ID_PREFIX) - 3:]
- if title.endswith(IGNORE_TITLE_SUFFIX):
- title = title[:-len(IGNORE_TITLE_SUFFIX)]
-
- # Track how many times this title has appeared
- title_counts[title] = title_counts.get(title, 0) + 1
- count = title_counts[title]
- grounding_map[f"PLACE_ID_FOR_{count}_{title}"] = place_id
- else:
- logger.warning("No grounding chunks found")
- else:
- logger.warning("No grounding metadata found")
-
- if grounding_map:
- for key, value in grounding_map.items():
- final_response_content = final_response_content.replace(key, value)
- else:
- logger.warning("No grounding map found")
-
+ attribution_sources = place_id_resolution.extract_attribution_sources(
+ response
+ )
+ final_response_content, unresolved_placeholders = (
+ place_id_resolution.resolve_place_ids(
+ final_response_content, attribution_sources
+ )
+ )
+ if unresolved_placeholders:
+ logger.warning(
+ "%d Place ID placeholder(s) remain in the response.",
+ unresolved_placeholders,
+ )
except Exception as e: # pylint: disable=broad-exception-caught
logger.error("Error during Place ID cleanup: %s", e)
- if "PLACE_ID_FOR_" in final_response_content:
- logger.warning("Place ID placeholder found in response.")
-
# Final safety check: Extract JSON array if marker is present
if "" in final_response_content:
marker_idx = final_response_content.find("")
@@ -276,4 +249,5 @@ def _build_llm_agent(
),
instruction=instruction,
tools=[grounding_tool, skill_manager_tool],
+ after_tool_callback=self._after_tool_callback,
)
diff --git a/agent/python_agent/agent_with_templates.py b/agent/python_agent/agent_with_templates.py
index 0b2ec0a..7da45a1 100644
--- a/agent/python_agent/agent_with_templates.py
+++ b/agent/python_agent/agent_with_templates.py
@@ -14,59 +14,62 @@
"""MAUI Agent with template-based latency optimization."""
-import asyncio
-import json
+import dataclasses
+import inspect
import logging
import pathlib
from types import SimpleNamespace
from typing import Any, AsyncIterable
import uuid
-from a2a.types import DataPart
from a2a.types import Part
-from google.adk import skills as adk_skills
from google.adk.agents import run_config
from google.adk.agents.llm_agent import LlmAgent
-from google.adk.events.event import Event
from google.adk.models.lite_llm import LiteLlm
from google.adk.models.llm_request import LlmRequest
from google.adk.runners import Runner
-from google.adk.tools.set_model_response_tool import SetModelResponseTool
from google.genai import types
import pydantic
from a2ui.a2a.parts import create_a2ui_part
+from a2ui.schema.constants import VERSION_0_9
from a2ui.schema.manager import (
A2uiSchemaManager,
)
from agent import MAUIAgent
from agent_config import AgentConfig
from agent_config import FallbackMode
-from extractor import DirectionsExtractorSchema
-from extractor import LocalSearchExtractorSchema
from merger import merge_template
-from router_config import IntentClass
-from router_config import ROUTER_SYSTEM_INSTRUCTION
-from router_config import RouterClassification
+from template_registry import (
+ INTENT_OTHER_SPATIAL,
+ INTENT_TEXT_ONLY,
+ TemplateRegistry,
+)
+from template_tool import (
+ BaseTemplateTool,
+ RenderDirectionsTemplateTool,
+ RenderLocalSearchTemplateTool,
+ RenderTextOnlyTemplateTool,
+ STATE_RENDERED_A2UI_DATA,
+ STATE_RENDERED_A2UI_PARTS,
+)
logger = logging.getLogger(__name__)
-_SKILL_BASE_PATH = pathlib.Path(__file__).parent / "skills"
_SHARED_INSTRUCTIONS_PATH = (
pathlib.Path(__file__).parent / "shared" / "instructions"
)
-_LOCAL_SEARCH_SKILL_NAME = "local-search-template-response"
-_LOCAL_SEARCH_TEMPLATE_NAME = "local_search"
-_LOCAL_SEARCH_SURFACE_PREFIX = "local-search-surface"
-_DIRECTIONS_SKILL_NAME = "directions-template-response"
-_DIRECTIONS_TEMPLATE_NAME = "directions"
-_DIRECTIONS_SURFACE_PREFIX = "directions-surface"
-
-_EXTRACTOR_SCHEMAS = {
- _LOCAL_SEARCH_SKILL_NAME: LocalSearchExtractorSchema,
- _DIRECTIONS_SKILL_NAME: DirectionsExtractorSchema,
+# TODO(hungmn): Get the tool mapping directly from TemplateRegistry.
+_INTENT_TOOL_CLASSES: dict[str, type[BaseTemplateTool]] = {
+ "LOCAL_SEARCH": RenderLocalSearchTemplateTool,
+ "DIRECTIONS": RenderDirectionsTemplateTool,
}
-_SUPPORTED_INTENTS = {IntentClass.LOCAL_SEARCH, IntentClass.DIRECTIONS}
+
+_SUPPORTED_INTENTS: set[str] = set(_INTENT_TOOL_CLASSES.keys())
+
+_TEMPLATE_TOOL_NAMES: set[str] = {
+ tool_class.name for tool_class in _INTENT_TOOL_CLASSES.values()
+} | {"render_text_only_template"}
_GROUNDED_TEXT_BASE_INSTRUCTION = """\
You are an expert location and navigation assistant with access to Google Maps tools.
@@ -80,21 +83,57 @@
"""
+def _normalize_version(version: str | None) -> str:
+ """Canonicalizes an A2UI version string to the key used by version maps.
+
+ The A2UI extension URI carries the version as `v0.9`, while the schema
+ constants (and therefore `_schema_managers`) use the bare `0.9`. Callers may
+ pass either form, so both are collapsed to the bare form here.
+
+ Args:
+ version: Requested A2UI version, e.g. `0.9` or `v0.9`. May be None.
+
+ Returns:
+ The bare version string, defaulting to `VERSION_0_9` when unspecified.
+ """
+ if not version:
+ return VERSION_0_9
+ return version.removeprefix("v")
+
+
class MAUIAgentWithTemplates(MAUIAgent):
"""MAUI Agent extending base with server-side layout templates and query intent routing."""
def __init__(self, base_url: str, config: AgentConfig | None = None) -> None:
self.config = config or AgentConfig()
super().__init__(base_url=base_url, model_name=self.config.generic_model)
+ self.template_registry = TemplateRegistry()
self.router_client = LiteLlm(model=self.config.router_model)
self.extractor_client = LiteLlm(model=self.config.template_model)
self.fallback_client = LiteLlm(model=self.config.generic_model)
+ self._extractor_agents: dict[str, LlmAgent] = {}
+ self._extractor_runners: dict[str, Runner] = {}
+ self._grounded_text_agent = self._build_grounded_text_agent(
+ client=self.extractor_client
+ )
+ self._grounded_text_runner = self._build_runner(self._grounded_text_agent)
+ self._fallback_text_agent = self._build_grounded_text_agent(
+ client=self.fallback_client
+ )
+ self._fallback_text_runner = self._build_runner(self._fallback_text_agent)
+
+ for version, schema_manager in self._schema_managers.items():
+ agent = self._build_unified_extractor_agent(schema_manager=schema_manager)
+ key = _normalize_version(version)
+ self._extractor_agents[key] = agent
+ self._extractor_runners[key] = self._build_runner(agent)
+
def _build_runner(self, agent: LlmAgent) -> Runner:
runner = super()._build_runner(agent)
- # The extractor agent runs inside a dynamically created runner.
+ # The extractor agent runs inside a persistent runner.
# We must enable auto_create_session to prevent SessionNotFoundError
- # since we don't pre-create the session for this runner.
+ # when new sessions are encountered.
runner.auto_create_session = True
return runner
@@ -107,7 +146,7 @@ def _on_tool_error(
) -> dict[str, Any] | None:
"""Callback for tool errors during extraction."""
# pylint: disable=unused-argument
- if tool.name == "set_model_response" and isinstance(
+ if tool.name in _TEMPLATE_TOOL_NAMES and isinstance(
error, pydantic.ValidationError
):
logger.warning(
@@ -137,86 +176,127 @@ def _load_shared_guidelines(self) -> str:
logger.warning("Failed to load shared style guidelines: %s", e)
return ""
- def _build_dynamic_extractor_agent(
- self,
- skill_name: str,
- schema_manager: A2uiSchemaManager | None = None,
- ) -> LlmAgent:
- """Builds an extractor agent loaded directly with the target skill's prompt."""
- skill_dir = _SKILL_BASE_PATH / skill_name
- skill = adk_skills.load_skill_from_dir(skill_dir)
- skill_instructions = skill.instructions
+ def _build_grounded_text_agent(self, client: LiteLlm) -> LlmAgent:
+ """Builds a persistent agent for Maps-grounded plain text responses."""
+ system_instruction = self._get_grounded_text_instruction()
+ generate_content_config = None
+ if (
+ client == self.extractor_client
+ and self.config.extractor_thinking_budget > 0
+ ):
+ generate_content_config = types.GenerateContentConfig(
+ thinking_config=types.ThinkingConfig(
+ thinking_budget=self.config.extractor_thinking_budget
+ )
+ )
+
+ tools = [self.make_grounding_lite_mcp()]
+ return LlmAgent(
+ model=client,
+ name="maui_grounded_text_agent",
+ description="Agent for text responses with Maps grounding",
+ instruction=system_instruction,
+ tools=tools,
+ generate_content_config=generate_content_config,
+ )
+
+ def _build_unified_extractor_instruction(self) -> str:
+ """Assembles unified extractor system instruction across supported template skills."""
+ instructions_list = [
+ "You are an expert location and navigation assistant with access to"
+ " Google Maps tools and layout template rendering tools."
+ ]
+
+ for bundle in self.template_registry.bundles.values():
+ instructions = bundle.skill_instructions
+ if instructions:
+ instructions_list.append(f"\n{instructions}")
+
shared_guidelines = self._load_shared_guidelines()
if shared_guidelines:
- skill_instructions = f"{skill_instructions}\n\n{shared_guidelines}"
+ instructions_list.append(f"## Style Guidelines\n{shared_guidelines}")
+
+ target_intent_rules = []
+ for intent, tool_class in sorted(_INTENT_TOOL_CLASSES.items()):
+ target_intent_rules.append(
+ f" - `[TARGET_INTENT: {intent}]`: Invoke"
+ f" `{tool_class.name}`. Do NOT invoke any other template"
+ " rendering tool."
+ )
+ target_intent_rules_text = "\n".join(target_intent_rules)
+
+ workflow_rules = (
+ "## Execution and Tool Usage Rules\n"
+ "1. Follow the previous rules for gathering the necessary information"
+ " using Google Maps tools.\n"
+ "2. When the prompt begins with `[TARGET_INTENT: ]`, you"
+ " MUST strictly invoke the corresponding template rendering tool as"
+ " your final step:\n"
+ f"{target_intent_rules_text}\n"
+ "3. Your final action MUST be this template rendering tool call. Do"
+ " NOT emit raw JSON or `` blocks in your text response."
+ )
+ instructions_list.append(workflow_rules)
- # Extractors use template_model, generic UI uses generic_model
- if skill_name.endswith("-template-response"):
- model_name = self.config.template_model
- else:
- model_name = self.config.generic_model
+ return "\n\n".join(instructions_list)
- logger.info(
- f"Building extractor agent for '{skill_name}' using model: {model_name}"
- )
+ def _build_unified_extractor_agent(
+ self,
+ schema_manager: A2uiSchemaManager | None = None,
+ ) -> LlmAgent:
+ """Builds a single unified extractor agent with all template rendering tools."""
+ raw_instructions = self._build_unified_extractor_instruction()
tools = [self.make_grounding_lite_mcp()]
- output_schema = _EXTRACTOR_SCHEMAS.get(skill_name)
-
- generate_content_config = None
- if output_schema:
- # Manually inject SetModelResponseTool
- set_response_tool = SetModelResponseTool(output_schema)
- tools.append(set_response_tool)
-
- # Manually append instruction
- workaround_instruction = (
- "IMPORTANT: You have access to other tools, but you must provide"
- " your final response using the set_model_response tool with the"
- " required structured format. After using any other tools needed to"
- " complete the task, always call set_model_response with your final"
- " answer in the specified schema format."
+ for intent, tool_class in _INTENT_TOOL_CLASSES.items():
+ bundle = self.template_registry.get_bundle_by_intent(intent)
+ surface_prefix = (
+ bundle.surface_prefix if bundle else f"{intent.lower()}-surface"
)
- if skill_name == _LOCAL_SEARCH_SKILL_NAME:
- workaround_instruction += (
- "\nCRITICAL CONSTRAINT: You MUST extract and display at most"
- f" {self.config.max_list_size} of the most relevant places. Do not"
- " mention, recommend, or extract more than"
- f" {self.config.max_list_size} places in your text response or your"
- " set_model_response tool call."
- )
- skill_instructions = f"{skill_instructions}\n\n{workaround_instruction}"
-
- if self.config.extractor_thinking_budget > 0:
- generate_content_config = types.GenerateContentConfig(
- thinking_config=types.ThinkingConfig(
- thinking_budget=self.config.extractor_thinking_budget
- )
- )
- logger.info(
- "Applying template extractor thinking budget limit:"
- f" {self.config.extractor_thinking_budget} tokens"
+ tools.append(
+ tool_class(
+ schema_manager=schema_manager,
+ max_list_size=self.config.max_list_size,
+ surface_id_prefix=surface_prefix,
+ )
+ )
+ tools.append(
+ RenderTextOnlyTemplateTool(
+ schema_manager=schema_manager,
+ surface_id_prefix="text-only-surface",
)
+ )
- if schema_manager:
- instruction = schema_manager.generate_system_prompt(
- role_description=skill_instructions,
- include_schema=True,
- include_examples=False,
- validate_examples=False,
+ generate_content_config = None
+ if self.config.extractor_thinking_budget > 0:
+ generate_content_config = types.GenerateContentConfig(
+ thinking_config=types.ThinkingConfig(
+ thinking_budget=self.config.extractor_thinking_budget
+ )
+ )
+ logger.info(
+ "Applying template extractor thinking budget limit:"
+ f" {self.config.extractor_thinking_budget} tokens"
)
- else:
- instruction = skill_instructions
+
+ # Template tools handle template merging and use schema_manager only for
+ # catalog validation. Do not call schema_manager.generate_system_prompt()
+ # here, as it injects raw A2UI schema and output instructions.
+ instruction = raw_instructions
return LlmAgent(
- model=LiteLlm(model=model_name),
- name="maui_agent",
- description="An extractor agent executing specific Maps tool tasks",
+ model=LiteLlm(model=self.config.template_model),
+ name="maui_unified_extractor_agent",
+ description=(
+ "A unified extractor agent executing Maps tasks and template"
+ " rendering"
+ ),
instruction=instruction,
tools=tools,
- output_schema=None, # Keep output_schema as None in LlmAgent
+ output_schema=None,
generate_content_config=generate_content_config,
on_tool_error_callback=self._on_tool_error,
+ after_tool_callback=self._after_tool_callback,
)
async def _run_extractor(
@@ -225,11 +305,20 @@ async def _run_extractor(
agent: LlmAgent,
current_message: types.Content,
session_id: str,
- ) -> tuple[dict[str, Any] | None, list[str]]:
- """Runs the extractor agent and collects its output (structured or text)."""
- parsed_json_data = None
+ state_delta: dict[str, Any] | None = None,
+ ) -> tuple[list[Part] | None, list[str], dict[str, Any] | None]:
+ """Runs the extractor agent and collects its output (rendered parts or text)."""
+ rendered_parts: list[Part] | None = None
+ rendered_data: dict[str, Any] | None = None
full_content_list = []
+ merged_state_delta = {
+ "expression": "{expression}",
+ "base_url": self.base_url,
+ }
+ if state_delta:
+ merged_state_delta.update(state_delta)
+
async for event in runner.run_async(
user_id=self._user_id,
session_id=session_id,
@@ -237,63 +326,48 @@ async def _run_extractor(
streaming_mode=run_config.StreamingMode.SSE
),
new_message=current_message,
- # Initialize session state.
- # "expression" is required to prevent KeyError during ADK's prompt
- # state injection, as the A2UI catalog schema contains "${expression}"
- # placeholders. "base_url" is passed for consistency with the main
- # agent session state.
- state_delta={
- "expression": "{expression}",
- "base_url": self.base_url,
- },
+ state_delta=merged_state_delta,
):
if hasattr(event, "get_function_calls"):
for fc in event.get_function_calls():
- if fc.name == "set_model_response":
+ if fc.name in _TEMPLATE_TOOL_NAMES:
logger.info(
- "Intercepted set_model_response tool call with args: %s",
+ "--- AGENT_WITH_TEMPLATES: Observed %s tool call with args:"
+ " %s ---",
+ fc.name,
fc.args,
)
- # Find SetModelResponseTool in agent tools
target_tool = None
for t in agent.tools:
- if getattr(t, "name", None) == "set_model_response":
+ if getattr(t, "name", None) == fc.name:
target_tool = t
break
if target_tool and hasattr(target_tool, "run_async"):
+ tool_ctx = SimpleNamespace(state={})
try:
- noop_tool_context = SimpleNamespace(
- actions=SimpleNamespace(set_model_response=None)
+ tool_result = await target_tool.run_async(
+ args=fc.args, tool_context=tool_ctx
)
- validated_data = await target_tool.run_async(
- args=fc.args, tool_context=noop_tool_context
- )
- # SetModelResponseTool.run_async catches ValidationError internally
- # and returns a dict with "error" key instead of raising the exception.
if (
- isinstance(validated_data, dict)
- and "error" in validated_data
+ isinstance(tool_result, dict)
+ and "error" not in tool_result
+ and STATE_RENDERED_A2UI_PARTS in tool_ctx.state
):
- logger.warning(
- "Local Pydantic validation failed: %s. Continuing.",
- validated_data["error"],
- )
- else:
- parsed_json_data = validated_data
+ rendered_parts = tool_ctx.state[STATE_RENDERED_A2UI_PARTS]
+ rendered_data = tool_ctx.state.get(STATE_RENDERED_A2UI_DATA)
logger.info(
- "Local Pydantic validation passed! Short-circuiting."
+ "--- AGENT_WITH_TEMPLATES: Template tool %s succeeded!"
+ " Captured %d rendered parts. ---",
+ fc.name,
+ len(rendered_parts),
)
break
- except pydantic.ValidationError as e:
+ except Exception as e: # pylint: disable=broad-exception-caught
logger.warning(
- "Local Pydantic validation failed: %s. Continuing.",
- e,
+ "--- AGENT_WITH_TEMPLATES: Tool execution error: %s ---", e
)
- else:
- parsed_json_data = fc.args
- break
if event.content and event.content.parts:
if event.partial:
@@ -306,69 +380,68 @@ async def _run_extractor(
if p.text:
full_content_list.append(p.text)
- return parsed_json_data, full_content_list
+ if rendered_parts is None and getattr(runner, "session_service", None):
+ get_session_fn = getattr(runner.session_service, "get_session", None)
+ if callable(get_session_fn):
+ try:
+ res = get_session_fn(
+ app_name=getattr(runner, "app_name", ""),
+ user_id=self._user_id,
+ session_id=session_id,
+ )
+ if inspect.isawaitable(res):
+ session = await res
+ if session and getattr(session, "state", None):
+ rendered_parts = session.state.get(STATE_RENDERED_A2UI_PARTS)
+ rendered_data = session.state.get(STATE_RENDERED_A2UI_DATA)
+ except Exception as e: # pylint: disable=broad-exception-caught
+ logger.debug("Could not retrieve session from session_service: %s", e)
+
+ return rendered_parts, full_content_list, rendered_data
async def _run_extractor_and_merge(
self,
- skill_name: str,
- template_name: str,
- surface_id_prefix: str,
+ intent: str,
cleaned_query: str,
session_id: str,
ui_version: str | None = None,
) -> tuple[list[Part] | None, str | None, dict[str, Any] | None]:
- """Runs the dynamic extractor agent and merges output into the template."""
- # 1. Resolve catalog schema manager and validator
- schema_manager = self._schema_managers.get(ui_version)
- selected_catalog = None
- if schema_manager:
- # Retrieve the resolved catalog config for validation.
- # Replacing the deprecated get_catalog("maps-agentic-ui-catalog")
- # API call.
- selected_catalog = schema_manager.get_selected_catalog()
-
- # 2. Build the extractor agent and runner
- agent = self._build_dynamic_extractor_agent(
- skill_name,
- schema_manager=schema_manager,
- )
- runner = self._build_runner(agent)
+ """Runs the persistent extractor agent runner and returns rendered template parts."""
+ version = _normalize_version(ui_version)
+
+ # 1. Resolve persistent runner and agent, falling back to the default
+ # version when the requested one has no pre-built extractor.
+ if version not in self._extractor_agents:
+ logger.warning(
+ "No extractor agent built for A2UI version '%s'. Falling back to"
+ " '%s'.",
+ version,
+ VERSION_0_9,
+ )
+ version = VERSION_0_9
+ agent = self._extractor_agents[version]
+ runner = self._extractor_runners[version]
- # 3. Setup user query message
+ # 2. Setup user query message with target intent hint
+ target_hint = intent
+ formatted_prompt = f"[TARGET_INTENT: {target_hint}]\n{cleaned_query}"
current_message = types.Content(
- role="user", parts=[types.Part.from_text(text=cleaned_query)]
+ role="user", parts=[types.Part.from_text(text=formatted_prompt)]
)
- # 4. Run extractor runner, collecting output
- parsed_json_data, full_content_list = await self._run_extractor(
- runner, agent, current_message, session_id
+ # 3. Run extractor runner, collecting output
+ rendered_parts, full_content_list, rendered_data = (
+ await self._run_extractor(
+ runner,
+ agent,
+ current_message,
+ session_id,
+ state_delta={"target_intent": target_hint},
+ )
)
- # 5. Handle output layout merging
- if parsed_json_data is not None:
- logger.info(
- "Template parameters extracted successfully. Merging template."
- )
- if "surface_id" not in parsed_json_data:
- short_id = uuid.uuid4().hex[:8]
- parsed_json_data["surface_id"] = f"{surface_id_prefix}-{short_id}"
-
- merged_actions = merge_template(
- template_name,
- parsed_json_data,
- max_list_size=self.config.max_list_size,
- )
-
- if selected_catalog:
- logger.info("Validating merged template against A2UI catalog schema.")
- try:
- selected_catalog.validator.validate(merged_actions)
- except Exception as e: # pylint: disable=broad-exception-caught
- logger.warning("Catalog validation failed: %s. Falling back.", e)
- return None, None, None
-
- final_parts = [create_a2ui_part(action) for action in merged_actions]
- return final_parts, None, parsed_json_data
+ if rendered_parts is not None:
+ return rendered_parts, None, rendered_data
else:
raw_text = "".join(full_content_list)
return None, raw_text, None
@@ -394,7 +467,7 @@ async def stream(
intent, cleaned_query = await self._classify_intent(query)
- if intent == IntentClass.OTHER_SPATIAL:
+ if intent == INTENT_OTHER_SPATIAL:
if self.config.fallback_mode == FallbackMode.DYNAMIC:
logger.warning(
"Router matched OTHER_SPATIAL and fallback_mode is DYNAMIC. "
@@ -417,7 +490,7 @@ async def stream(
}
return
- elif intent == IntentClass.TEXT_ONLY:
+ elif intent == INTENT_TEXT_ONLY:
logger.info("Executing fast text response flow for TEXT_ONLY intent.")
final_parts = await self._handle_text_only(cleaned_query, session_id)
yield {
@@ -457,7 +530,7 @@ async def stream(
async for part in super().stream(query, session_id, ui_version):
yield part
- async def _classify_intent(self, query: str) -> tuple[IntentClass, str]:
+ async def _classify_intent(self, query: str) -> tuple[str, str]:
"""Classifies the query intent and returns the intent and cleaned query."""
logger.info(
"Routing query: '%s' using model %s",
@@ -465,10 +538,13 @@ async def _classify_intent(self, query: str) -> tuple[IntentClass, str]:
self.config.router_model,
)
try:
+ classification_schema = self.template_registry.router_classification
router_config = {
- "system_instruction": ROUTER_SYSTEM_INSTRUCTION,
+ "system_instruction": (
+ self.template_registry.compile_router_instruction()
+ ),
"response_mime_type": "application/json",
- "response_schema": RouterClassification,
+ "response_schema": classification_schema,
}
if self.config.router_thinking_budget > 0:
router_config["thinking_config"] = types.ThinkingConfig(
@@ -492,10 +568,14 @@ async def _classify_intent(self, query: str) -> tuple[IntentClass, str]:
router_response_text += p.text
logger.info("Router response content: %s", router_response_text)
- classification = RouterClassification.model_validate_json(
+ classification = classification_schema.model_validate_json(
router_response_text
)
- intent = classification.intent
+ intent = str(
+ classification.intent.value
+ if hasattr(classification.intent, "value")
+ else classification.intent
+ )
cleaned_query = classification.query
logger.info(
"Intent classified: %s (Cleaned Query: '%s')", intent, cleaned_query
@@ -507,7 +587,7 @@ async def _classify_intent(self, query: str) -> tuple[IntentClass, str]:
e,
exc_info=True,
)
- return IntentClass.TEXT_ONLY, query
+ return INTENT_TEXT_ONLY, query
def _wrap_in_text_only(self, text: str, session_id: str) -> list[Part]:
"""Wraps plain text in a text_only template Part list."""
@@ -526,31 +606,24 @@ def _get_grounded_text_instruction(self) -> str:
return _GROUNDED_TEXT_BASE_INSTRUCTION
async def _handle_grounded_text(
- self, cleaned_query: str, session_id: str, client: LiteLlm
+ self,
+ cleaned_query: str,
+ session_id: str,
+ client: LiteLlm | None = None,
+ runner: Runner | None = None,
) -> list[Part]:
- """Generates a grounded plain text response using the provided model client with GroundingLite tools."""
- system_instruction = self._get_grounded_text_instruction()
- generate_content_config = None
- if (
- client == self.extractor_client
- and self.config.extractor_thinking_budget > 0
- ):
- generate_content_config = types.GenerateContentConfig(
- thinking_config=types.ThinkingConfig(
- thinking_budget=self.config.extractor_thinking_budget
- )
- )
+ """Generates a grounded plain text response using pre-configured runner with GroundingLite tools."""
+ if runner is None:
+ if client == self.fallback_client:
+ runner = self._fallback_text_runner
+ else:
+ runner = self._grounded_text_runner
+
+ if runner is None:
+ target_client = client or self.extractor_client
+ agent = self._build_grounded_text_agent(client=target_client)
+ runner = self._build_runner(agent)
- tools = [self.make_grounding_lite_mcp()]
- agent = LlmAgent(
- model=client,
- name="maui_grounded_text_agent",
- description="Agent for text responses with Maps grounding",
- instruction=system_instruction,
- tools=tools,
- generate_content_config=generate_content_config,
- )
- runner = self._build_runner(agent)
current_message = types.Content(
role="user", parts=[types.Part.from_text(text=cleaned_query)]
)
@@ -594,7 +667,10 @@ async def _handle_text_only(
) -> list[Part]:
"""Generates a plain text response for TEXT_ONLY intent using template_model with grounding."""
return await self._handle_grounded_text(
- cleaned_query, session_id, client=self.extractor_client
+ cleaned_query,
+ session_id,
+ client=self.extractor_client,
+ runner=self._grounded_text_runner,
)
async def _handle_grounded_text_fallback(
@@ -602,35 +678,29 @@ async def _handle_grounded_text_fallback(
) -> list[Part]:
"""Generates a grounded plain text response for fallback/complex spatial queries using generic_model."""
return await self._handle_grounded_text(
- cleaned_query, session_id, client=self.fallback_client
+ cleaned_query,
+ session_id,
+ client=self.fallback_client,
+ runner=self._fallback_text_runner,
)
async def _handle_extracted_intent(
self,
- intent: IntentClass,
+ intent: str,
query: str,
session_id: str,
ui_version: str | None = None,
) -> AsyncIterable[dict[str, Any]]:
"""Handles intents that use dynamic extractor agents and templates."""
- if intent == IntentClass.LOCAL_SEARCH:
- skill_name = _LOCAL_SEARCH_SKILL_NAME
- template_name = _LOCAL_SEARCH_TEMPLATE_NAME
- surface_prefix = _LOCAL_SEARCH_SURFACE_PREFIX
- elif intent == IntentClass.DIRECTIONS:
- skill_name = _DIRECTIONS_SKILL_NAME
- template_name = _DIRECTIONS_TEMPLATE_NAME
- surface_prefix = _DIRECTIONS_SURFACE_PREFIX
- else:
+ bundle = self.template_registry.get_bundle_by_intent(intent)
+ if not bundle or intent not in _INTENT_TOOL_CLASSES:
raise ValueError(f"Unsupported intent for extractor: {intent}")
logger.info("Router matched %s. Dispatching template extractor.", intent)
merged_parts, fallback_text, parsed_json_data = (
await self._run_extractor_and_merge(
- skill_name=skill_name,
- template_name=template_name,
- surface_id_prefix=surface_prefix,
+ intent=intent,
cleaned_query=query,
session_id=session_id,
ui_version=ui_version,
diff --git a/agent/python_agent/merger.py b/agent/python_agent/merger.py
index ffdd9b8..501899c 100644
--- a/agent/python_agent/merger.py
+++ b/agent/python_agent/merger.py
@@ -20,12 +20,20 @@
"""
import copy
+import importlib.resources
import json
-import os
+import re
from typing import Any, Literal, TypedDict
import uuid
-from extractor import normalize_travel_mode
+from templates.directions.schema import normalize_travel_mode
+
+# The catalog the templates bind their surface to when the host does not name
+# one. Hosts that register the Maps components in a catalog of their own (for
+# example Gemini Enterprise, whose composite catalog carries `GoogleMap` and
+# `PlaceDetailsCompact` alongside its Material and basic components) pass that
+# catalog's id instead, because a surface resolves against exactly one catalog.
+DEFAULT_CATALOG_ID = "a2ui://maps-agentic-ui-catalog.json"
class TextOutputDict(TypedDict):
@@ -104,9 +112,22 @@ def _prepare_local_search(
"""Validates and normalizes parameters for the local search template."""
data_copy = copy.deepcopy(data)
is_valid = True
+
+ # 1. Normalize heading
+ heading = data_copy.get("heading")
+ if heading and isinstance(heading, str):
+ clean_heading = re.sub(r"^#+\s*", "", heading).strip()
+ else:
+ anchor = data_copy.get("anchor_marker")
+ if isinstance(anchor, dict) and anchor.get("label"):
+ clean_heading = f"Places near {anchor['label']}"
+ else:
+ clean_heading = "Nearby Places"
+ data_copy["heading"] = clean_heading
+
places = data_copy.get("places")
- # 1. Validate that places is a non-empty list
+ # 2. Validate that places is a non-empty list
if not isinstance(places, list) or not places:
is_valid = False
else:
@@ -158,6 +179,8 @@ def _prepare_local_search(
}
if "placeId" in p:
marker["placeId"] = p["placeId"]
+ if "placePrimaryType" in p:
+ marker["placePrimaryType"] = p["placePrimaryType"]
markers.append(marker)
data_copy["markers"] = markers
else:
@@ -197,7 +220,30 @@ def _prepare_directions(data: dict[str, Any]) -> tuple[str, dict[str, Any]]:
routes = data_copy.get("routes")
- # 1. Validate that routes is a non-empty list of segment dicts
+ # 1. Normalize heading
+ heading = data_copy.get("heading")
+ if heading and isinstance(heading, str):
+ clean_heading = re.sub(r"^#+\s*", "", heading).strip()
+ else:
+ clean_heading = ""
+
+ if not clean_heading:
+ clean_heading = "Directions"
+ if isinstance(routes, list) and routes and isinstance(routes[0], dict):
+ origin = routes[0].get("origin")
+ destination = routes[-1].get("destination")
+ orig_label = origin.get("label") if isinstance(origin, dict) else None
+ dest_label = (
+ destination.get("label") if isinstance(destination, dict) else None
+ )
+ if orig_label and dest_label:
+ clean_heading = f"Route from {orig_label} to {dest_label}"
+ elif dest_label:
+ clean_heading = f"Directions to {dest_label}"
+
+ data_copy["heading"] = clean_heading
+
+ # 2. Validate that routes is a non-empty list of segment dicts
if not isinstance(routes, list) or not routes:
is_valid = False
else:
@@ -265,7 +311,10 @@ def _prepare_directions(data: dict[str, Any]) -> tuple[str, dict[str, Any]]:
def merge_template(
- template_name: str, data: dict[str, Any], max_list_size: int = 5
+ template_name: str,
+ data: dict[str, Any],
+ max_list_size: int = 5,
+ catalog_id: str = DEFAULT_CATALOG_ID,
) -> list[MergedMessage]:
"""Loads static template skeleton JSON and returns merged wire response.
@@ -279,6 +328,9 @@ def merge_template(
`TemplateExtractor` (e.g. `places`, `summary`, `center_lat`).
max_list_size: Maximum allowable child elements in lists (`places`) to
bound payload rendering latency.
+ catalog_id: Catalog the created surface binds to. Defaults to the Maps
+ catalog; hosts that register the Maps components under a catalog of
+ their own pass that id.
Returns:
A list of message dictionaries. For `text_only`, returns the 2-part A2UI
@@ -298,26 +350,41 @@ def merge_template(
template_name, data_copy = _prepare_local_search(data_copy, max_list_size)
elif template_name == "directions":
template_name, data_copy = _prepare_directions(data_copy)
- current_dir = os.path.dirname(os.path.abspath(__file__))
- templates_dir = os.path.join(current_dir, "templates")
- template_path = os.path.join(templates_dir, f"{template_name}.json")
-
- if not os.path.exists(template_path):
+ # Templates ship as package data. They are resolved through
+ # `importlib.resources` rather than a `__file__`-relative filesystem path
+ # because the agent is also served from a zip-imported archive, where
+ # `__file__` names an entry inside the archive that never exists on disk and
+ # every `os.path` probe against it reports missing.
+ templates_dir = importlib.resources.files(__package__).joinpath("templates")
+ resource_path = f"templates/{template_name}/layout.json"
+ template_path = templates_dir.joinpath(template_name, "layout.json")
+
+ # Ensure the catalog ID is set here as well.
+ data_copy["catalog_id"] = catalog_id
+
+ if not template_path.is_file():
+ # The message names the resource rather than interpolating
+ # `template_path`, because stringifying a traversable that points into an
+ # archive can itself raise and mask this error.
raise FileNotFoundError(
- f"Template '{template_name}' not found at {template_path}"
+ f"Template '{template_name}' not found: package '{__package__}'"
+ f" has no '{resource_path}'"
)
- with open(template_path, "r") as f:
- template_json = json.load(f)
+ template_json = json.loads(template_path.read_text(encoding="utf-8"))
# Smart Turn-Unique `surface_id` Scoping via Dynamic Template Discovery:
default_surface_ids = set()
- if os.path.exists(templates_dir):
- for fn in os.listdir(templates_dir):
- if fn.endswith(".json"):
- base_name = fn[:-5]
+ if templates_dir.is_dir():
+ for entry in templates_dir.iterdir():
+ name = entry.name
+ if name.endswith(".json"):
+ base_name = name[:-5]
default_surface_ids.add(f"{base_name}_surface")
default_surface_ids.add(f"{base_name.replace('_', '-')}-surface")
+ elif entry.is_dir():
+ default_surface_ids.add(f"{name}_surface")
+ default_surface_ids.add(f"{name.replace('_', '-')}-surface")
if (
not data_copy.get("surface_id")
diff --git a/agent/python_agent/place_id_resolution.py b/agent/python_agent/place_id_resolution.py
new file mode 100644
index 0000000..3525408
--- /dev/null
+++ b/agent/python_agent/place_id_resolution.py
@@ -0,0 +1,229 @@
+# 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
+#
+# https://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.
+
+"""Place ID resolution shared by the grounded agents.
+
+Grounding with Google Maps does not let the model see real Place IDs while it
+is generating, and asking it to recall them from parametric memory produces
+wrong IDs. Instead the system instruction tells the model to emit a
+placeholder, and this module rewrites those placeholders using the Place
+IDs that Grounding actually returned.
+
+Both `agent_with_grounding` (free-form A2UI) and `vertex_grounding_extractor`
+(template parameters) use this module so the two paths cannot drift apart.
+
+Placeholder format, which the prompt and this module must agree on exactly:
+
+ PLACE_ID_FOR_{count}_{title}
+
+`title` is the Maps source title with the " - Google Maps" branding suffix
+removed, in its original casing. `count` is the 1-based occurrence index of
+the source within that title, so five sources sharing a title get placeholders
+1 through 5.
+"""
+
+import collections
+import dataclasses
+import logging
+import re
+from typing import Any
+
+logger = logging.getLogger(__name__)
+
+PLACEHOLDER_PREFIX = "PLACE_ID_FOR_"
+
+# Kept beside the parser on purpose. The placeholder format is a contract
+# between this module and the model, and a prompt edit that drifts from
+# build_placeholder_index fails silently: every key misses and raw
+# placeholders ship to the client.
+#
+# The rules are two-branch because whether the model can see a real Place ID
+# depends on serving-side configuration. When it is off, no Place ID reaches the
+# model, and the placeholder is the only option.
+#
+# Preferring the authoritative value is strictly better, but the model does not
+# always get it, so we have to handle both cases.
+PROMPT_RULES = """PLACE ID RULES:
+Every `placeId` you emit MUST come from one of the two sources below. Always prefer source 1.
+1. AUTHORITATIVE PLACE ID (preferred). If the Google Maps result for a place carries a place_id field -- written either as a `place_id: places/ChIJ...` line or as a `place_id='places/ChIJ...'` field inside a PerQueryResult -- copy that value verbatim into `placeId`. Do NOT reformat, abbreviate, or truncate it.
+2. SYNTHETIC PLACEHOLDER (fallback). Use this if, and ONLY if, the Google Maps result for that place carries no place_id field:
+- Format: "PLACE_ID_FOR_{Count}_{Exact Title}"
+- Example: If the tool returns a place named "Chez Panisse" and gives no place_id, use "PLACE_ID_FOR_1_Chez Panisse". If it returns a second "Chez Panisse", use "PLACE_ID_FOR_2_Chez Panisse".
+- STRICT MATCHING: Do NOT change any characters, spaces, capitalization, or punctuation from the title returned by the tool.
+- COUNTING: Always prepend the occurrence count (starting at 1) for each title based on the order they were returned by the tool, even if the title only occurs once.
+NEVER invent a `ChIJ...` value that the tool did not give you. If you have no place_id from the tool, the placeholder in rule 2 is the only acceptable output."""
+
+_BRANDED_TITLE_SUFFIX = " - Google Maps"
+
+# Slicing at len(prefix) - 3 keeps the "ChI" that every Place ID starts with.
+_PLACE_ID_PREFIX = "places/ChI"
+
+
+@dataclasses.dataclass(frozen=True)
+class AttributionSource:
+ """A Maps attribution source from grounding metadata."""
+
+ title: str
+ place_id: str
+
+
+def normalize_place_id(raw_place_id: str) -> str:
+ """Strips the 'places/' resource prefix, which A2UI components do not want."""
+ if raw_place_id.startswith(_PLACE_ID_PREFIX):
+ return raw_place_id[len(_PLACE_ID_PREFIX) - 3 :]
+ return raw_place_id
+
+
+def canonical_place_title(raw_title: str) -> str:
+ """Drops the branding suffix the model never sees, keeping original casing."""
+ if raw_title.endswith(_BRANDED_TITLE_SUFFIX):
+ return raw_title[: -len(_BRANDED_TITLE_SUFFIX)]
+ return raw_title
+
+
+def extract_attribution_sources(response: Any) -> list[AttributionSource]:
+ """Pulls the Maps attribution sources out of a genai response.
+
+ Missing attributes are tolerated so callers do not have to guard every
+ access. Arrival order is load-bearing: it is what the ordinals count over.
+
+ Args:
+ response: A `google.genai` GenerateContentResponse, or anything shaped
+ like one.
+
+ Returns:
+ Sources that carry both a title and a Place ID, in arrival order.
+ """
+ candidates = getattr(response, "candidates", None)
+ metadata = (
+ getattr(candidates[0], "grounding_metadata", None) if candidates else None
+ )
+ raw_chunks = getattr(metadata, "grounding_chunks", None) if metadata else None
+
+ sources = []
+ for raw_chunk in raw_chunks or []:
+ maps_source = getattr(raw_chunk, "maps", None)
+ title = getattr(maps_source, "title", None)
+ place_id = getattr(maps_source, "place_id", None)
+ if title and place_id:
+ sources.append(AttributionSource(title=title, place_id=place_id))
+ return sources
+
+
+def _build_placeholder_index(
+ attribution_sources: list[AttributionSource],
+) -> dict[str, str]:
+ """Builds the placeholder-to-Place-ID substitution map.
+
+ Ordinals count source occurrences within a canonical title, which is the
+ COUNTING rule `PROMPT_RULES` gives the model. The model and this function
+ derive their ordinals independently, so they can disagree. A disagreement
+ usually leaves the placeholder unresolved, which is visible in the UI.
+
+ Args:
+ attribution_sources: Attribution sources in arrival order.
+
+ Returns:
+ Mapping from placeholder key to canonical Place ID.
+ """
+ placeholder_index = {}
+ title_counts = {}
+ for source in attribution_sources:
+ title = canonical_place_title(source.title)
+ place_id = normalize_place_id(source.place_id)
+ if not title or not place_id:
+ continue
+ title_counts[title] = title_counts.get(title, 0) + 1
+ placeholder_index[f"{PLACEHOLDER_PREFIX}{title_counts[title]}_{title}"] = (
+ place_id
+ )
+ return placeholder_index
+
+
+def resolve_place_ids(
+ text: str,
+ attribution_sources: list[AttributionSource],
+) -> tuple[str, int]:
+ """Replaces Place ID placeholders in a payload with grounded Place IDs.
+
+ Placeholders with no matching source are deliberately left in place rather
+ than substituted with a nearby ID. A visible placeholder fails loudly in the
+ UI, whereas a plausible wrong Place ID renders a confidently wrong venue.
+
+ After substitution, any remaining Places API resource names are reduced to
+ bare Place IDs, so neither branch of `PROMPT_RULES` can ship a resource name
+ to the A2UI components.
+
+ Args:
+ text: Serialized payload containing placeholders.
+ attribution_sources: Attribution sources in arrival order.
+
+ Returns:
+ Tuple of the rewritten payload and the count left unresolved.
+ """
+ if not text:
+ return text, 0
+
+ # Matches `PLACE_ID_FOR__` to extract ``.
+ placeholder_title_re = re.compile(
+ rf"^{PLACEHOLDER_PREFIX}[0-9]+_(?P.+)$"
+ )
+ placeholder_index = _build_placeholder_index(attribution_sources)
+ matched_titles = set()
+ for placeholder, place_id in placeholder_index.items():
+ if placeholder in text:
+ match = placeholder_title_re.match(placeholder)
+ if match:
+ matched_titles.add(match.group("title"))
+ text = text.replace(placeholder, place_id)
+
+ # Fallback pass for placeholders where the LLM used global list numbering
+ # (e.g., `PLACE_ID_FOR_2_` when `` only appeared once as index 1).
+ # Caveat: Titles already matched in pass 1 (`matched_titles`) are intentionally
+ # skipped here so that if multiple distinct branches share the same title
+ # (e.g., two "Starbucks" locations) and one placeholder was mis-indexed, we
+ # leave the ambiguous placeholder unresolved rather than substituting the
+ # wrong branch's Place ID.
+ if PLACEHOLDER_PREFIX in text:
+ title_counts = collections.Counter(
+ canonical_place_title(s.title)
+ for s in attribution_sources
+ if canonical_place_title(s.title) and normalize_place_id(s.place_id)
+ )
+ for source in sorted(
+ attribution_sources,
+ key=lambda s: len(canonical_place_title(s.title)),
+ reverse=True,
+ ):
+ title = canonical_place_title(source.title)
+ place_id = normalize_place_id(source.place_id)
+ if (
+ title
+ and place_id
+ and title not in matched_titles
+ and title_counts[title] == 1
+ ):
+ pattern = rf"{PLACEHOLDER_PREFIX}\d+_{re.escape(title)}"
+ if len(re.findall(pattern, text, flags=re.IGNORECASE)) == 1:
+ text = re.sub(pattern, place_id, text, count=1, flags=re.IGNORECASE)
+ matched_titles.add(title)
+
+ unresolved = text.count(PLACEHOLDER_PREFIX)
+ if unresolved:
+ logger.warning(
+ "%d Place ID placeholder(s) unresolved against %d source(s).",
+ unresolved,
+ len(placeholder_index),
+ )
+ return text, unresolved
diff --git a/agent/python_agent/shared/instructions/shared_style_guidelines.md b/agent/python_agent/shared/instructions/shared_style_guidelines.md
index 1c29c12..26b83b5 100644
--- a/agent/python_agent/shared/instructions/shared_style_guidelines.md
+++ b/agent/python_agent/shared/instructions/shared_style_guidelines.md
@@ -1,25 +1,34 @@
-## Conversational Text Style Guidelines
+## Response Text Guidelines
-When generating conversational text (such as summaries, descriptions, or
-directions), you must follow these formatting and content rules:
+### Role & Tone
-* **Content & Completeness**: Always fully and clearly answer each aspect of
- the user's prompt. Address all explicit constraints, qualitative criteria,
- comparisons, preferences, and sub-questions asked. Explain *why* places or
- routes fit the user's specific needs rather than providing a bare listing.
-* **Quantity & Nuance**: Make sure the answer is substantive, useful, and
- actionable. Respond with an appropriate depth of detail given the complexity
- of the question:
- * If comparing places or route alternatives, explicitly analyze their
- trade-offs (e.g. transit vs driving, travel time, convenience, cost, or
- atmosphere).
- * If the user asks about commute, context, or travel conditions, describe
- relevant timing and real-world nuances (e.g. rush-hour delays,
- navigation landmarks).
-* **Formatting**: Use markdown to apply formatting elements like bullet
- points, bolding, and tables to break up the text. Break content into
- multiple paragraphs as needed.
-* **Markdown**: Bold place names and provide links where appropriate.
-* **Titles and Headings**: Never title your response. You may include
- mid-level headings (using `###` and below) to organize content when it adds
- clarity.
+- **Voice**: Warm local expert. Show warmth through highly relevant logistics,
+ NEVER conversational filler.
+- **Style**: Vivid, objective, and sensory (e.g., "low-lit basement"). NEVER
+ use empty hype words ("amazing", "charming").
+- **Perspective**: NEVER use first-person ("I recommend", "I found").
+ Attribute subjective claims to public consensus or facts (e.g., "Locals
+ praise...").
+
+### Execution & Formatting
+
+- **Headings**: Always use sentence case. Plain text only - NO markdown.
+- **Primary headings**: A concise, constraint-confirming title reflecting the
+ prompt and primary reference location. Use only the primary reference
+ location without redundant city/state nesting.
+ - **Place Searches**: Always start with or include the exact number of
+ places provided in the UI response (e.g., '5 vegetarian restaurants near
+ The Plaza Hotel', '5 transit stops near Seattle Center').
+ - **Directions**: Provide a concise route title confirming the travel mode
+ and endpoints (e.g., 'Walking route from Seattle Center to Pike Place
+ Market', 'Driving directions to JFK Airport').
+- **Precision**: Fully answer the prompt and strictly satisfy all constraints.
+- **Count matching**: If the prompt requests a specific number of places
+ (e.g., "3 hidden gem activities", "top 2 cafes", "four places to visit"),
+ ALWAYS respond with that exact number of grounded places in the `places`
+ array when possible.
+- **Differentiate places**: Describe places by mentioning unique features,
+ specialties, and review highlights.
+- **Reviews**: Never hallucinate place reviews. Only describe user sentiment
+ in aggregate from a grounded source.
+- **Addresses**: Never state full addresses in a response.
diff --git a/agent/python_agent/shared/schema/maps_catalog_extension.json b/agent/python_agent/shared/schema/maps_catalog_extension.json
index 699754f..7296dd4 100644
--- a/agent/python_agent/shared/schema/maps_catalog_extension.json
+++ b/agent/python_agent/shared/schema/maps_catalog_extension.json
@@ -4,6 +4,7 @@
"title": "Google Maps Agentic UI Catalog Extensions",
"components": {
"GoogleMap": {
+ "description": "Renders an interactive Google Map with markers, an anchor marker and routes.",
"type": "object",
"allOf": [
{
@@ -44,7 +45,7 @@
"description": "The map mode."
},
"anchorMarker": {
- "$ref": "#/$defs/DynamicLatLng",
+ "$ref": "#/$defs/AnchorMarker",
"description": "The anchor marker location."
},
"markers": {
@@ -55,6 +56,7 @@
"description": "List of markers."
},
"routes": {
+ "description": "Routes to draw on the map, as origin/destination pairs.",
"type": "array",
"items": {
"type": "object",
@@ -88,6 +90,7 @@
"unevaluatedProperties": false
},
"PlaceDetailsCompact": {
+ "description": "Renders a compact Google Maps place card with photo, rating, type and price.",
"type": "object",
"allOf": [
{
@@ -148,6 +151,55 @@
}
]
},
+ "AnchorMarker": {
+ "oneOf": [
+ {
+ "$ref": "#/$defs/AnchorMarkerPin"
+ },
+ {
+ "$ref": "common_types.json#/$defs/DataBinding"
+ }
+ ]
+ },
+ "AnchorMarkerPin": {
+ "type": "object",
+ "properties": {
+ "lat": {
+ "type": "number"
+ },
+ "lng": {
+ "type": "number"
+ },
+ "label": {
+ "type": "string"
+ },
+ "placeId": {
+ "type": "string"
+ },
+ "placePrimaryType": {
+ "type": "string",
+ "enum": [
+ "food_and_drink",
+ "outdoor",
+ "retail",
+ "gas_station",
+ "ev",
+ "bank",
+ "lodging",
+ "emergency",
+ "entertainment",
+ "airport",
+ "parking",
+ "generic"
+ ]
+ }
+ },
+ "required": [
+ "lat",
+ "lng"
+ ],
+ "additionalProperties": false
+ },
"MapPin": {
"type": "object",
"properties": {
@@ -162,6 +214,23 @@
},
"placeId": {
"type": "string"
+ },
+ "placePrimaryType": {
+ "type": "string",
+ "enum": [
+ "food_and_drink",
+ "outdoor",
+ "retail",
+ "gas_station",
+ "ev",
+ "bank",
+ "lodging",
+ "emergency",
+ "entertainment",
+ "airport",
+ "parking",
+ "generic"
+ ]
}
},
"required": [
diff --git a/agent/python_agent/skills/google-maps-enriched-local-query-response/SKILL.md b/agent/python_agent/skills/google-maps-enriched-local-query-response/SKILL.md
index 53b29f5..791a84a 100644
--- a/agent/python_agent/skills/google-maps-enriched-local-query-response/SKILL.md
+++ b/agent/python_agent/skills/google-maps-enriched-local-query-response/SKILL.md
@@ -58,6 +58,20 @@ You are an expert in resolving location-based queries using the **A2UI framework
* **Pins**:
* `anchorMarker`: Use for the "main" focus (e.g., a hotel).
* `markers`: Use for related results (e.g., surrounding restaurants).
+ * **POI Types (`placePrimaryType`)**: Determine `placePrimaryType` using the descriptions or categories in the tool response. If insufficient, infer it from the user prompt and place title.
+ Supported categories:
+ - `food_and_drink`: Restaurants, cafes, bars, bakeries, coffee shops, dining.
+ - `outdoor`: Parks, trails, gardens, natural landmarks, beaches, scenic spots.
+ - `retail`: Stores, shops, boutiques, supermarkets, malls, markets.
+ - `gas_station`: Gas stations.
+ - `ev`: EV charging stations.
+ - `bank`: Banks, ATMs.
+ - `lodging`: Hotels, resorts, motels, hostels, B&Bs.
+ - `emergency`: Hospitals, urgent care, police, fire stations.
+ - `entertainment`: Theaters, museums, cinemas, stadiums, amusement parks, venues.
+ - `airport`: Airports.
+ - `parking`: Parking lots and garages.
+ - `generic`: Salons, repair, dry cleaners, post offices. Default fallback when ambiguous or not clearly matching above categories.
* **References**: Refer to items in the data model via `path` for dynamic content.
* **Child Components**: When using a Column or Row layout, ensure that each child component referenced in the `children` array is also included in the `surfaceUpdate` as its own component definition.
diff --git a/agent/python_agent/streaming_request_handler.py b/agent/python_agent/streaming_request_handler.py
new file mode 100644
index 0000000..fe25a35
--- /dev/null
+++ b/agent/python_agent/streaming_request_handler.py
@@ -0,0 +1,145 @@
+# Copyright 2025 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
+#
+# https://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 asyncio
+import logging
+from collections.abc import AsyncGenerator
+from typing import Any, cast
+
+from a2a.server.request_handlers import DefaultRequestHandler
+from a2a.server.context import ServerCallContext
+from a2a.types import (
+ Message,
+ MessageSendParams,
+ Task,
+ TaskArtifactUpdateEvent,
+ TaskStatusUpdateEvent,
+ TaskState,
+)
+from a2a.server.events import EventQueue
+from a2a.server.tasks import TaskManager
+from a2a.utils.errors import ServerError
+from a2a.utils.errors import TaskNotFoundError, InvalidParamsError
+
+logger = logging.getLogger(__name__)
+
+class QueueBridge(EventQueue):
+ def __init__(self, queue: asyncio.Queue):
+ super().__init__()
+ self._queue = queue
+ self._is_closed = False
+
+ async def enqueue_event(
+ self,
+ event: Message | Task | TaskStatusUpdateEvent | TaskArtifactUpdateEvent,
+ ) -> None:
+ if self._is_closed:
+ raise RuntimeError("Queue is closed")
+ await self._queue.put(event)
+
+ async def close(self, immediate: bool = False) -> None:
+ if self._is_closed:
+ return
+ self._is_closed = True
+ await self._queue.put(None)
+
+ def is_closed(self) -> bool:
+ return self._is_closed
+
+class StreamingRequestHandler(DefaultRequestHandler):
+ async def on_message_send_stream(
+ self,
+ params: MessageSendParams,
+ context: ServerCallContext | None = None,
+ ) -> AsyncGenerator[Message | Task | TaskStatusUpdateEvent | TaskArtifactUpdateEvent, None]:
+ task_manager = TaskManager(
+ task_id=params.message.task_id,
+ context_id=params.message.context_id,
+ task_store=self.task_store,
+ initial_message=params.message,
+ context=context,
+ )
+ task: Task | None = await task_manager.get_task()
+
+ TERMINAL_TASK_STATES = {
+ TaskState.completed,
+ TaskState.canceled,
+ TaskState.failed,
+ TaskState.rejected,
+ }
+
+ if task:
+ if task.status.state in TERMINAL_TASK_STATES:
+ raise ServerError(
+ error=InvalidParamsError(
+ message=f'Task {task.id} is in terminal state: {task.status.state.value}'
+ )
+ )
+ task = task_manager.update_with_message(params.message, task)
+ elif params.message.task_id:
+ raise ServerError(
+ error=TaskNotFoundError(
+ message=f'Task {params.message.task_id} was specified but does not exist'
+ )
+ )
+
+ request_context = await self._request_context_builder.build(
+ params=params,
+ task_id=task.id if task else None,
+ context_id=params.message.context_id,
+ task=task,
+ context=context,
+ )
+
+ task_id = cast('str', request_context.task_id)
+
+ if (
+ self._push_config_store
+ and params.configuration
+ and params.configuration.push_notification_config
+ ):
+ await self._push_config_store.set_info(
+ task_id, params.configuration.push_notification_config
+ )
+
+ queue = asyncio.Queue()
+ queue_bridge = QueueBridge(queue)
+
+ async def run_producer():
+ try:
+ await self.agent_executor.execute(request_context, queue_bridge)
+ except Exception as e:
+ logger.exception("Error in Streaming agent execution producer task")
+ await queue.put(e)
+ finally:
+ await queue_bridge.close()
+
+ producer_task = asyncio.create_task(run_producer())
+ producer_task.set_name(f"streaming_producer:{task_id}")
+
+ try:
+ while True:
+ event = await queue.get()
+ if event is None:
+ break
+ if isinstance(event, Exception):
+ raise event
+ yield event
+ finally:
+ if not producer_task.done():
+ producer_task.cancel()
+ try:
+ await producer_task
+ except asyncio.CancelledError:
+ pass
\ No newline at end of file
diff --git a/agent/python_agent/template_registry.py b/agent/python_agent/template_registry.py
new file mode 100644
index 0000000..a5562f9
--- /dev/null
+++ b/agent/python_agent/template_registry.py
@@ -0,0 +1,424 @@
+# 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
+#
+# https://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.
+
+"""Dynamic Template Registry and Router Instruction Compiler for MAUI Agent."""
+
+import dataclasses
+import enum
+import importlib
+import json
+import logging
+import pathlib
+from typing import Any
+
+import pydantic
+
+INTENT_OTHER_SPATIAL = "OTHER_SPATIAL"
+INTENT_TEXT_ONLY = "TEXT_ONLY"
+
+
+class RouterClassification(pydantic.BaseModel):
+ """Classification output schema for the query intent router."""
+
+ intent: str = pydantic.Field(
+ description="The classified intent archetype name."
+ )
+ query: str = pydantic.Field(description="The cleaned user query")
+
+
+class FewShotExample(pydantic.BaseModel):
+ """A few-shot query-intent example for router instructions."""
+
+ model_config = pydantic.ConfigDict(extra="ignore")
+
+ user_query: str
+ intent: str | None = None
+ query: str | None = None
+
+ def __getitem__(self, key: str) -> Any:
+ return getattr(self, key)
+
+ def get(self, key: str, default: Any = None) -> Any:
+ return getattr(self, key, default)
+
+
+class TemplateManifest(pydantic.BaseModel):
+ """Strongly-typed metadata schema parsed from a bundle's manifest.json."""
+
+ model_config = pydantic.ConfigDict(extra="ignore")
+
+ intent: str = ""
+ surface_prefix: str | None = None
+ archetype: str = ""
+ few_shot_examples: list[FewShotExample] = pydantic.Field(default_factory=list)
+
+
+@dataclasses.dataclass(frozen=True)
+class RouterIntentSpec:
+ """Specification for a router intent archetype and its few-shot examples."""
+
+ intent: str
+ archetype: str
+ few_shot_examples: list[FewShotExample] = dataclasses.field(
+ default_factory=list
+ )
+
+
+_BUILTIN_FALLBACK_ROUTER_INTENTS: tuple[RouterIntentSpec, ...] = (
+ RouterIntentSpec(
+ intent=INTENT_OTHER_SPATIAL,
+ archetype=(
+ "Queries requiring rich map-based visualization, boundaries,"
+ " coordinates, specific geographic displays, or complex"
+ " navigation combining routes with secondary overlays (e.g.,"
+ " weather, air quality forecasts, displaying all available"
+ " charging stations along a route)."
+ ),
+ few_shot_examples=[
+ FewShotExample(
+ user_query=(
+ "Walking route from Central Park to Times Square, but show"
+ " coffee shops and rain forecasts along the way"
+ ),
+ intent=INTENT_OTHER_SPATIAL,
+ query=(
+ "walking route from Central Park to Times Square with"
+ " coffee shop stops and rain forecast"
+ ),
+ ),
+ FewShotExample(
+ user_query=(
+ "show the boundary of Yosemite National Park on the map"
+ ),
+ intent=INTENT_OTHER_SPATIAL,
+ query="boundary of Yosemite National Park",
+ ),
+ ],
+ ),
+ RouterIntentSpec(
+ intent=INTENT_TEXT_ONLY,
+ archetype=(
+ "General information retrieval, questions, or requests for data"
+ " associated with locations that can be answered fully with text"
+ " without requiring a map interface."
+ ),
+ few_shot_examples=[],
+ ),
+)
+
+
+logger = logging.getLogger(__name__)
+
+
+@dataclasses.dataclass(frozen=True)
+class TemplateBundle:
+ """Metadata and assets representing a self-contained template intent."""
+
+ name: str
+ intent: str
+ surface_prefix: str
+ archetype: str
+ few_shot_examples: list[FewShotExample | dict[str, Any]]
+ schema_cls: type[pydantic.BaseModel]
+ layout_path: pathlib.Path
+ skill_dir: pathlib.Path
+ bundle_dir: pathlib.Path
+ skill_instructions: str = ""
+
+
+def _read_skill_instructions(skill_dir: pathlib.Path) -> str:
+ """Reads instructions body from SKILL.md directly, stripping frontmatter."""
+ skill_file = skill_dir / "SKILL.md"
+ if not skill_file.exists():
+ return ""
+ content = skill_file.read_text(encoding="utf-8")
+ if content.startswith("---"):
+ parts = content.split("---", 2)
+ if len(parts) >= 3:
+ return parts[2].strip()
+ return content.strip()
+
+
+_TEMPLATES_PACKAGE = (
+ "templates"
+)
+
+
+def _resolve_schema(bundle_name: str) -> type[pydantic.BaseModel]:
+ """Imports the ExtractorSchema class declared by a built-in bundle.
+
+ Dynamically resolves the schema module from the templates package
+ (e.g., templates..schema) without requiring manual allowlist
+ registration.
+
+ Args:
+ bundle_name: Directory name of the bundle under templates/.
+
+ Returns:
+ The bundle's ExtractorSchema class.
+
+ Raises:
+ KeyError: The bundle has no importable schema module.
+ TypeError: The module does not export an ExtractorSchema that subclasses
+ pydantic.BaseModel.
+ """
+ module_name = f"{_TEMPLATES_PACKAGE}.{bundle_name}.schema"
+ try:
+ module = importlib.import_module(module_name)
+ except ImportError as e:
+ raise KeyError(
+ f"Bundle '{bundle_name}' has no importable schema module at"
+ f" '{module_name}': {e}. Ensure templates/{bundle_name}/schema.py"
+ " exists, or build a TemplateBundle and pass it to"
+ " TemplateRegistry.register_bundle()."
+ ) from e
+ schema_cls = getattr(module, "ExtractorSchema", None)
+ if not (
+ isinstance(schema_cls, type)
+ and issubclass(schema_cls, pydantic.BaseModel)
+ ):
+ raise TypeError(
+ f"{module_name} must export 'ExtractorSchema' subclassing"
+ " pydantic.BaseModel"
+ )
+ return schema_cls
+
+
+class TemplateRegistry:
+ """Registry for discovering, caching, and querying template bundles."""
+
+ def __init__(self) -> None:
+ self._bundles: dict[str, TemplateBundle] = {}
+ self._bundles_by_intent: dict[str, TemplateBundle] = {}
+ self._cached_router_classification: type[RouterClassification] | None = None
+ self._templates_dir = pathlib.Path(__file__).parent / "templates"
+
+ self._discover_bundles()
+
+ def _discover_bundles(self) -> None:
+ """Loads every built-in bundle directory under templates/."""
+ if not self._templates_dir.exists():
+ logger.warning(
+ "Templates directory '%s' does not exist.", self._templates_dir
+ )
+ return
+
+ for item in sorted(self._templates_dir.iterdir()):
+ if item.is_dir() and (item / "manifest.json").exists():
+ self._load_bundle(item)
+
+ def _load_bundle(self, bundle_dir: pathlib.Path) -> None:
+ """Loads one built-in bundle directory.
+
+ Args:
+ bundle_dir: Directory holding the bundle's manifest, layout, and schema.
+
+ Raises:
+ ValueError: The manifest is unreadable or malformed.
+ KeyError: The bundle has no importable schema module.
+ TypeError: The bundle's schema module exports the wrong thing.
+ ImportError: The bundle's schema module does not import.
+ """
+ manifest_path = bundle_dir / "manifest.json"
+ try:
+ manifest_json = manifest_path.read_text(encoding="utf-8")
+ manifest = TemplateManifest.model_validate_json(manifest_json)
+ except (OSError, pydantic.ValidationError, ValueError) as e:
+ # Built-in bundles ship inside this build target, so an unreadable
+ # manifest is a build defect. Booting without the intent would degrade
+ # every query that needed it, with nothing but a log line to say why.
+ raise ValueError(f"Unreadable bundle manifest at {manifest_path}") from e
+
+ name = bundle_dir.name
+ intent = manifest.intent or name.upper()
+
+ surface_prefix = manifest.surface_prefix or f"{name}-surface"
+ schema_cls = _resolve_schema(name)
+
+ bundle = TemplateBundle(
+ name=name,
+ intent=intent,
+ surface_prefix=surface_prefix,
+ archetype=manifest.archetype,
+ few_shot_examples=manifest.few_shot_examples,
+ schema_cls=schema_cls,
+ layout_path=bundle_dir / "layout.json",
+ skill_dir=bundle_dir,
+ bundle_dir=bundle_dir,
+ skill_instructions=_read_skill_instructions(bundle_dir),
+ )
+ self.register_bundle(bundle)
+
+ def register_bundle(self, bundle: TemplateBundle) -> None:
+ """Registers a constructed TemplateBundle.
+
+ The caller owns importing the bundle's schema class and constructing the
+ TemplateBundle. The registry never loads code from a path.
+
+ Args:
+ bundle: The bundle to register. It displaces any bundle already holding
+ its name or its intent, and the collision is logged. A displaced bundle
+ is removed from both indexes so it cannot be routed to or advertised to
+ the router afterwards.
+ """
+ displaced = self._bundles.get(bundle.name)
+ if displaced is not None:
+ logger.warning(
+ "Bundle '%s' is already registered; replacing it.", bundle.name
+ )
+ self._bundles_by_intent.pop(displaced.intent, None)
+
+ claimant = self._bundles_by_intent.get(bundle.intent)
+ if claimant is not None and claimant.name != bundle.name:
+ logger.warning(
+ "Intent '%s' was claimed by bundle '%s'; bundle '%s' now owns it."
+ " Bundle '%s' is dropped, since an unroutable bundle would still"
+ " show up in the router prompt.",
+ bundle.intent,
+ claimant.name,
+ bundle.name,
+ claimant.name,
+ )
+ self._bundles.pop(claimant.name, None)
+
+ self._bundles[bundle.name] = bundle
+ self._bundles_by_intent[bundle.intent] = bundle
+ self._cached_router_classification = None
+ logger.info(
+ "Registered template bundle: %s (intent: %s)",
+ bundle.name,
+ bundle.intent,
+ )
+
+ def get_bundle(self, name: str) -> TemplateBundle | None:
+ """Looks up a bundle by its primary directory/bundle name (e.g., 'local_search')."""
+ return self._bundles.get(name)
+
+ def get_bundle_by_intent(
+ self, intent: str | enum.Enum
+ ) -> TemplateBundle | None:
+ """Looks up a bundle by its intent (e.g., 'LOCAL_SEARCH' or an enum member)."""
+ key = intent.value if hasattr(intent, "value") else str(intent)
+ return self._bundles_by_intent.get(key)
+
+ @property
+ def bundles(self) -> dict[str, TemplateBundle]:
+ return dict(self._bundles)
+
+ def list_bundles(self) -> list[TemplateBundle]:
+ return list(self._bundles.values())
+
+ @property
+ def supported_intents(self) -> set[str]:
+ return set(self._bundles_by_intent.keys())
+
+ @property
+ def router_classification(self) -> type[RouterClassification]:
+ """Dynamically constructs a constrained response schema enforcing valid intents."""
+ if self._cached_router_classification is not None:
+ return self._cached_router_classification
+
+ all_intents = sorted(
+ self.supported_intents | {INTENT_OTHER_SPATIAL, INTENT_TEXT_ONLY}
+ )
+ dynamic_intent_enum = enum.Enum(
+ "RouterIntent",
+ {intent: intent for intent in all_intents},
+ type=str,
+ )
+ self._cached_router_classification = pydantic.create_model(
+ "RouterClassification",
+ __base__=RouterClassification,
+ intent=(
+ dynamic_intent_enum,
+ pydantic.Field(description="The classified intent archetype name."),
+ ),
+ query=(str, pydantic.Field(description="The cleaned user query")),
+ )
+ return self._cached_router_classification
+
+ def compile_router_instruction(self) -> str:
+ """Compiles the dynamic router instruction from the registered bundles.
+
+ Bundles appear in the prompt ordered by intent, so the instruction text
+ depends only on which bundles are registered and not on the order they
+ were discovered or registered in. Two processes holding the same bundles
+ therefore send the model the same bytes.
+ """
+ ordered_bundles = sorted(
+ self._bundles.values(), key=lambda bundle: bundle.intent
+ )
+ all_intent_specs: list[TemplateBundle | RouterIntentSpec] = [
+ *ordered_bundles,
+ *_BUILTIN_FALLBACK_ROUTER_INTENTS,
+ ]
+
+ archetype_lines = [
+ f"- **{spec.intent}**: {spec.archetype}" for spec in all_intent_specs
+ ]
+
+ registered_intents_str = (
+ " or ".join(sorted(self._bundles_by_intent.keys()))
+ or "registered templates"
+ )
+
+ examples_blocks = []
+ example_index = 1
+
+ for spec in all_intent_specs:
+ for example in spec.few_shot_examples:
+ user_query = (
+ example.user_query
+ if isinstance(example, FewShotExample)
+ else example.get("user_query", "")
+ )
+ intent = (
+ (example.intent or spec.intent)
+ if isinstance(example, FewShotExample)
+ else example.get("intent", spec.intent)
+ )
+ extracted_query = (
+ (example.query or user_query)
+ if isinstance(example, FewShotExample)
+ else example.get("query", user_query)
+ )
+ output_json = json.dumps(
+ {"intent": intent, "query": extracted_query}, indent=2
+ )
+ examples_blocks.append(
+ f"### Example {example_index}\n"
+ f'**User Query:** "{user_query}"\n'
+ f"**Output:**\n{output_json}\n"
+ )
+ example_index += 1
+
+ archetypes_str = "\n".join(archetype_lines)
+ examples_str = "\n".join(examples_blocks)
+
+ return (
+ "## Role\nYou are an expert query intent router.\n\n## Task"
+ " Definition\nAnalyze a user's input and classify it into the most"
+ " appropriate intent category based on the structural complexity and"
+ " data requirements of the request.\n\n## Intent"
+ f" Archetypes\n{archetypes_str}\n\n## Classification Policy:"
+ " Conservative Routing\nIf a query satisfies the structure of a base"
+ f" intent (such as {registered_intents_str}) but also includes any"
+ " Auxiliary Data (e.g., weather forecasts, environmental factors), you"
+ " MUST promote the classification to OTHER_SPATIAL.\nNote: Simple"
+ ' multi-stop routes or routes with specified waypoints (e.g., "A to B'
+ ' via C") should be classified as DIRECTIONS, unless they require'
+ ' searching for stops along the way (e.g., "find coffee shops along'
+ ' the route") which requires LOCAL_SEARCH overlays and should be'
+ f" promoted to OTHER_SPATIAL.\n\n## Few-shot Examples\n\n{examples_str}"
+ )
diff --git a/agent/python_agent/template_tool.py b/agent/python_agent/template_tool.py
new file mode 100644
index 0000000..3325963
--- /dev/null
+++ b/agent/python_agent/template_tool.py
@@ -0,0 +1,400 @@
+# 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.
+
+"""ADK Tools for MAUI template population and rendering.
+
+This file contains a set of tools for rendering the MAUI A2UI templates.
+The tools are used by the MAUI agent to render the templates based on the
+user's query and the agent's extracted information.
+
+The currently supported templates are:
+- Local Search: Used to show a list of local places and a map.
+- Directions: Used to show a route on a map.
+- Text-only: Used to render a text-only response inside an A2UI surface.
+
+Tools are built dynamically based on their Pydantic schema to ensure
+type safety and accurate function declarations.
+"""
+
+from __future__ import annotations
+
+import copy
+import inspect
+import logging
+import time
+from typing import Any, Optional, Union
+import uuid
+
+from a2a.types import Part
+from google.adk.agents.readonly_context import ReadonlyContext
+from google.adk.tools._automatic_function_calling_util import build_function_declaration
+from google.adk.tools.base_tool import BaseTool
+from google.adk.tools.base_toolset import BaseToolset, ToolPredicate
+from google.adk.tools.set_model_response_tool import _merge_json_schema_descriptions
+from google.adk.tools.tool_context import ToolContext
+from google.genai import types
+import pydantic
+
+from a2ui.a2a.parts import create_a2ui_part
+from a2ui.schema.manager import A2uiSchemaManager
+from merger import DEFAULT_CATALOG_ID
+from merger import merge_template
+from templates.directions.schema import DirectionsExtractorSchema
+from templates.local_search.schema import LocalSearchExtractorSchema
+
+logger = logging.getLogger(__name__)
+
+STATE_RENDERED_A2UI_PARTS = "rendered_a2ui_parts"
+STATE_RENDERED_A2UI_DATA = "rendered_a2ui_data"
+
+
+class BaseTemplateTool(BaseTool):
+ """Base class for ADK tools that populate and render A2UI templates."""
+
+ name: str = ""
+ description: str = ""
+ template_name: str = ""
+ schema_class: type[pydantic.BaseModel] | None = None
+
+ def __init__(
+ self,
+ *,
+ name: str | None = None,
+ description: str | None = None,
+ template_name: str | None = None,
+ schema_class: type[pydantic.BaseModel] | None = None,
+ schema_manager: A2uiSchemaManager | None = None,
+ max_list_size: int = 5,
+ surface_id_prefix: str | None = None,
+ catalog_id: str = DEFAULT_CATALOG_ID,
+ ) -> None:
+ tool_name = name or self.name
+ tool_desc = description or self.description
+ super().__init__(name=tool_name, description=tool_desc)
+ self.template_name = template_name or self.template_name
+ self.schema_class = (
+ schema_class if schema_class is not None else self.schema_class
+ )
+ self.schema_manager = schema_manager
+ self.max_list_size = max_list_size
+ self.catalog_id = catalog_id
+ self.surface_id_prefix = (
+ surface_id_prefix or f"{self.template_name}-surface"
+ )
+ self._func = self._build_handler_func()
+
+ def _build_handler_func(self) -> Any:
+ """Builds the callable signature used for FunctionDeclaration generation."""
+ if self.schema_class is not None:
+ schema_fields = self.schema_class.model_fields
+ params = []
+ for field_name, field_info in schema_fields.items():
+ param = inspect.Parameter(
+ field_name,
+ inspect.Parameter.KEYWORD_ONLY,
+ annotation=field_info.annotation,
+ default=(
+ inspect.Parameter.empty
+ if field_info.is_required()
+ else field_info.get_default(call_default_factory=True)
+ ),
+ )
+ params.append(param)
+
+ def dynamic_tool_func(**kwargs: Any) -> str:
+ del kwargs
+ return f"Rendered {self.template_name} template."
+
+ new_sig = inspect.Signature(parameters=params)
+ setattr(dynamic_tool_func, "__signature__", new_sig)
+ setattr(dynamic_tool_func, "__name__", self.name)
+ setattr(dynamic_tool_func, "__doc__", self.description)
+ return dynamic_tool_func
+ else:
+
+ def text_only_tool_func(text: str) -> str:
+ """Render a text-only UI response."""
+ del text
+ return f"Rendered {self.template_name} template."
+
+ setattr(text_only_tool_func, "__name__", self.name)
+ setattr(text_only_tool_func, "__doc__", self.description)
+ return text_only_tool_func
+
+ def _preserve_schema_descriptions(
+ self, function_decl: types.FunctionDeclaration
+ ) -> None:
+ """Restores field descriptions from Pydantic schema onto FunctionDeclaration."""
+ if self.schema_class is not None:
+ source_schema = self.schema_class.model_json_schema()
+ if function_decl.parameters_json_schema is not None:
+ _merge_json_schema_descriptions(
+ function_decl.parameters_json_schema, source_schema
+ )
+ elif function_decl.parameters is not None:
+ from google.adk.tools.set_model_response_tool import ( # pylint: disable=g-import-not-at-top
+ _apply_descriptions_to_schema_properties,
+ )
+
+ _apply_descriptions_to_schema_properties(
+ function_decl.parameters.properties,
+ self.schema_class.model_fields,
+ )
+
+ def _get_declaration(self) -> Optional[types.FunctionDeclaration]:
+ """Gets OpenAPI FunctionDeclaration specification for this tool."""
+ function_decl = types.FunctionDeclaration.model_validate(
+ build_function_declaration(
+ func=self._func,
+ ignore_params=[],
+ variant=self._api_variant,
+ )
+ )
+ self._preserve_schema_descriptions(function_decl)
+ return function_decl
+
+ async def run_async(
+ self, *, args: dict[str, Any], tool_context: ToolContext
+ ) -> dict[str, Any]:
+ """Executes the template tool: validates args, merges template, and saves A2UI parts."""
+ start_time = time.perf_counter()
+ logger.info("--- TEMPLATE_TOOL: Invoked '%s' ---", self.name)
+ logger.info(" Tool: %s (template: %s)", self.name, self.template_name)
+ logger.info(" Parameters: %s", args)
+ validated_data = copy.deepcopy(args)
+
+ # 1. Validate arguments against Pydantic schema
+ if self.schema_class is not None:
+ try:
+ model_instance = self.schema_class.model_validate(args)
+ validated_data = model_instance.model_dump(exclude_none=True)
+ except pydantic.ValidationError as e:
+ elapsed_ms = (time.perf_counter() - start_time) * 1000
+ logger.warning(
+ "--- TEMPLATE_TOOL: Validation failed for '%s' in %.2f ms: %s ---",
+ self.name,
+ elapsed_ms,
+ e,
+ )
+ return {
+ "error": (
+ f"Validation failed for tool '{self.name}': {e}. "
+ "Please fix the parameters and call the tool again."
+ )
+ }
+
+ # 2. Ensure unique surface_id
+ if not validated_data.get("surface_id"):
+ short_id = uuid.uuid4().hex[:8]
+ validated_data["surface_id"] = f"{self.surface_id_prefix}-{short_id}"
+
+ # 3. Merge template
+ try:
+ merged_actions = merge_template(
+ self.template_name,
+ validated_data,
+ max_list_size=self.max_list_size,
+ catalog_id=self.catalog_id,
+ )
+ except Exception as e: # pylint: disable=broad-exception-caught
+ elapsed_ms = (time.perf_counter() - start_time) * 1000
+ logger.warning(
+ "--- TEMPLATE_TOOL: Failed to merge template '%s' in %.2f ms: %s ---",
+ self.template_name,
+ elapsed_ms,
+ e,
+ )
+ return {"error": f"Failed to merge template '{self.template_name}': {e}"}
+
+ # 4. Catalog schema validation
+ if self.schema_manager:
+ selected_catalog = self.schema_manager.get_selected_catalog()
+ if selected_catalog:
+ try:
+ selected_catalog.validator.validate(merged_actions)
+ except Exception as e: # pylint: disable=broad-exception-caught
+ elapsed_ms = (time.perf_counter() - start_time) * 1000
+ logger.warning(
+ "--- TEMPLATE_TOOL: Catalog validation failed for '%s' in %.2f"
+ " ms: %s ---",
+ self.template_name,
+ elapsed_ms,
+ e,
+ )
+ return {
+ "error": (
+ f"A2UI catalog schema validation failed: {e}. "
+ "Please fix the parameters and retry."
+ )
+ }
+
+ # 5. Convert to A2A Parts and persist to session state
+ rendered_parts: list[Part] = [
+ create_a2ui_part(action) for action in merged_actions
+ ]
+ if tool_context and getattr(tool_context, "state", None) is not None:
+ tool_context.state[STATE_RENDERED_A2UI_PARTS] = rendered_parts
+ tool_context.state[STATE_RENDERED_A2UI_DATA] = validated_data
+
+ elapsed_ms = (time.perf_counter() - start_time) * 1000
+ logger.info(
+ "--- TEMPLATE_TOOL: Successfully rendered '%s' (surface_id: %s) in %.2f"
+ " ms (%d parts) ---",
+ self.template_name,
+ validated_data["surface_id"],
+ elapsed_ms,
+ len(rendered_parts),
+ )
+
+ return {
+ "status": "success",
+ "surface_id": validated_data["surface_id"],
+ "template": self.template_name,
+ "latency_ms": round(elapsed_ms, 2),
+ "message": f"Successfully rendered {self.template_name} UI interface.",
+ }
+
+
+class RenderLocalSearchTemplateTool(BaseTemplateTool):
+ """ADK Tool that validates and renders a local search map layout."""
+
+ name: str = "render_local_search_template"
+ description: str = (
+ "Renders an interactive Google Maps local search UI component"
+ " populated with places, map markers, and a summary response."
+ )
+ template_name: str = "local_search"
+ schema_class: type[pydantic.BaseModel] | None = LocalSearchExtractorSchema
+
+ def __init__(
+ self,
+ *,
+ name: str | None = None,
+ description: str | None = None,
+ schema_manager: A2uiSchemaManager | None = None,
+ max_list_size: int = 5,
+ surface_id_prefix: str = "local-search-surface",
+ catalog_id: str = DEFAULT_CATALOG_ID,
+ ) -> None:
+ super().__init__(
+ name=name,
+ description=description,
+ schema_manager=schema_manager,
+ max_list_size=max_list_size,
+ surface_id_prefix=surface_id_prefix,
+ catalog_id=catalog_id,
+ )
+
+
+class RenderDirectionsTemplateTool(BaseTemplateTool):
+ """ADK Tool that validates and renders a directions and route map layout."""
+
+ name: str = "render_directions_template"
+ description: str = (
+ "Renders an interactive Google Maps directions and routing UI"
+ " component populated with route segments, travel mode, and a"
+ " summary response."
+ )
+ template_name: str = "directions"
+ schema_class: type[pydantic.BaseModel] | None = DirectionsExtractorSchema
+
+ def __init__(
+ self,
+ *,
+ name: str | None = None,
+ description: str | None = None,
+ schema_manager: A2uiSchemaManager | None = None,
+ max_list_size: int = 5,
+ surface_id_prefix: str = "directions-surface",
+ catalog_id: str = DEFAULT_CATALOG_ID,
+ ) -> None:
+ super().__init__(
+ name=name,
+ description=description,
+ schema_manager=schema_manager,
+ max_list_size=max_list_size,
+ surface_id_prefix=surface_id_prefix,
+ catalog_id=catalog_id,
+ )
+
+
+class RenderTextOnlyTemplateTool(BaseTemplateTool):
+ """ADK Tool that renders a text-only response inside an A2UI surface container."""
+
+ name: str = "render_text_only_template"
+ description: str = (
+ "Renders a text response formatted inside an A2UI surface container."
+ )
+ template_name: str = "text_only"
+ schema_class: type[pydantic.BaseModel] | None = None
+
+ def __init__(
+ self,
+ *,
+ name: str | None = None,
+ description: str | None = None,
+ schema_manager: A2uiSchemaManager | None = None,
+ surface_id_prefix: str = "text-only-surface",
+ catalog_id: str = DEFAULT_CATALOG_ID,
+ ) -> None:
+ super().__init__(
+ name=name,
+ description=description,
+ schema_manager=schema_manager,
+ max_list_size=1,
+ surface_id_prefix=surface_id_prefix,
+ catalog_id=catalog_id,
+ )
+
+
+class TemplateToolset(BaseToolset):
+ """Toolset bundling all A2UI template population tools."""
+
+ def __init__(
+ self,
+ *,
+ schema_manager: A2uiSchemaManager | None = None,
+ max_list_size: int = 5,
+ tool_filter: Optional[Union[ToolPredicate, list[str]]] = None,
+ tool_name_prefix: Optional[str] = None,
+ catalog_id: str = DEFAULT_CATALOG_ID,
+ ) -> None:
+ super().__init__(tool_filter=tool_filter, tool_name_prefix=tool_name_prefix)
+ self.schema_manager = schema_manager
+ self.max_list_size = max_list_size
+ self.catalog_id = catalog_id
+ self._tools: list[BaseTool] = [
+ RenderLocalSearchTemplateTool(
+ schema_manager=self.schema_manager,
+ max_list_size=self.max_list_size,
+ catalog_id=self.catalog_id,
+ ),
+ RenderDirectionsTemplateTool(
+ schema_manager=self.schema_manager,
+ max_list_size=self.max_list_size,
+ catalog_id=self.catalog_id,
+ ),
+ RenderTextOnlyTemplateTool(
+ schema_manager=self.schema_manager,
+ catalog_id=self.catalog_id,
+ ),
+ ]
+
+ async def get_tools(
+ self,
+ readonly_context: Optional[ReadonlyContext] = None,
+ ) -> list[BaseTool]:
+ """Returns the template tools exposed by this toolset."""
+ del readonly_context
+ return list(self._tools)
diff --git a/agent/python_agent/templates/__init__.py b/agent/python_agent/templates/__init__.py
new file mode 100644
index 0000000..6ca9e40
--- /dev/null
+++ b/agent/python_agent/templates/__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
+#
+# https://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.
+
+"""Template bundle packages and shared schemas."""
diff --git a/agent/python_agent/templates/common.py b/agent/python_agent/templates/common.py
new file mode 100644
index 0000000..ccb0c7a
--- /dev/null
+++ b/agent/python_agent/templates/common.py
@@ -0,0 +1,84 @@
+# 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
+#
+# https://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.
+
+"""Shared schema models and primitive types for MAUI template bundles."""
+
+from typing import Any, Literal
+
+import pydantic
+
+PlacePrimaryType = Literal[
+ "food_and_drink",
+ "outdoor",
+ "retail",
+ "gas_station",
+ "ev",
+ "bank",
+ "lodging",
+ "emergency",
+ "entertainment",
+ "airport",
+ "parking",
+ "generic",
+]
+
+
+class Pin(pydantic.BaseModel):
+ """Representation of a Map Pin."""
+
+ lat: float = pydantic.Field(description="Latitude coordinate")
+ lng: float = pydantic.Field(description="Longitude coordinate")
+ label: str = pydantic.Field(
+ description=(
+ "Descriptive display label string (e.g. name of address, business, or"
+ " landmark)"
+ )
+ )
+ # Note: Using camelCase field name to match frontend A2UI requirements.
+ placeId: str | None = pydantic.Field( # pylint: disable=invalid-name
+ default=None, description="Optional Google Maps Place ID"
+ )
+ placePrimaryType: PlacePrimaryType | None = pydantic.Field( # pylint: disable=invalid-name
+ default=None,
+ description="Optional primary POI category type string",
+ )
+
+ @pydantic.model_validator(mode="before")
+ @classmethod
+ def normalize_label(cls, data: Any) -> Any:
+ """Normalizes the pin label.
+
+ If 'label' is missing but 'name' is present, copies 'name' to 'label'.
+ If 'label' is still empty, defaults to 'Location' to ensure
+ the UI always has a valid string to render for the marker (avoiding raw
+ Place IDs).
+
+ Args:
+ data: The input dictionary before validation.
+
+ Returns:
+ The normalized dictionary.
+ """
+ if isinstance(data, dict):
+ if "label" not in data and "name" in data:
+ data["label"] = data["name"]
+ if not data.get("label"):
+ data["label"] = "Location"
+ return data
+
+
+__all__ = [
+ "Pin",
+ "PlacePrimaryType",
+]
diff --git a/agent/python_agent/skills/directions-template-response/SKILL.md b/agent/python_agent/templates/directions/SKILL.md
similarity index 52%
rename from agent/python_agent/skills/directions-template-response/SKILL.md
rename to agent/python_agent/templates/directions/SKILL.md
index 536c25e..8bb97c3 100644
--- a/agent/python_agent/skills/directions-template-response/SKILL.md
+++ b/agent/python_agent/templates/directions/SKILL.md
@@ -1,9 +1,11 @@
---
-name: directions-template-response
+name: directions
description: Extractor skill for directions and routing queries. Extracts routing details for template merging.
---
-# Directions Template Response Skill
+# Directions Guidelines
+
+## Directions Template Response Skill
## Core Objective
@@ -20,8 +22,8 @@ If the user's query requests a scenic bypass or detour:
2. **Compute Route Segments (Parallel Routing)**: Concurrently compute routes
for all sequential legs connecting the resolved stops (Origin -> Waypoint,
Waypoint -> Destination).
-3. **Dispatch Response**: Call `set_model_response` with the compiled routes
- and pins.
+3. **Dispatch Response**: Call `render_directions_template` with the compiled
+ routes and pins.
## Step-by-Step Workflow
@@ -73,19 +75,23 @@ If the user's query requests a scenic bypass or detour:
-122.4}}}`). Do **NOT** pass `latLng` directly as a root key inside
`origin` or `destination` (e.g. do not call
`compute_routes(origin={"placeId": "...", "latLng": ...})`).
+ * **GROUNDED ROUTING CONSTRAINT**: NEVER use model knowledge to assume
+ roads used or live traffic. Always rely only on data from
+ `compute_routes`.
* Verify route availability for requested `travel_mode`.
* **CONSTRUCT THE ROUTES ARRAY**: You MUST compile the computed segments
- into the `routes` array of the final `set_model_response` payload. The
- array must contain all segments sequentially (e.g. `[{"origin": Origin,
- "destination": Waypoint 1}, {"origin": Waypoint 1, "destination":
- Destination}]`). Do NOT omit the `routes` array or leave it empty if you
- successfully computed routes.
+ into the `routes` array of the final `render_directions_template`
+ payload. The array must contain all segments sequentially (e.g.
+ `[{"origin": Origin, "destination": Waypoint 1}, {"origin": Waypoint 1,
+ "destination": Destination}]`). Do NOT omit the `routes` array or leave
+ it empty if you successfully computed routes.
* **MANDATORY TRAVEL MODE IN DISPATCH**: `travel_mode` is REQUIRED and
- must NEVER be omitted in `set_model_response`. Always supply the
- normalized mode string (`driving`, `walking`, `transit`, or `bicycling`).
- * Call `set_model_response` with `DirectionsExtractorSchema` parameters
- (`summary`, `center_lat`, `center_lng`, `zoom`, `routes`,
- `travel_mode`).
+ must NEVER be omitted in `render_directions_template`. Always supply the
+ normalized mode string (`driving`, `walking`, `transit`, or
+ `bicycling`).
+ * Call `render_directions_template` with `DirectionsExtractorSchema`
+ parameters (`heading`, `summary`, `center_lat`, `center_lng`, `zoom`,
+ `routes`, `travel_mode`).
## Handling Routing Failures & Regional Limitations (CRITICAL)
@@ -103,7 +109,19 @@ or fails:
You MUST populate all required fields in the output schema:
-- **`summary`**: A detailed response summarizing the travel directions, following the **Conversational Text Style Guidelines** below.
+- **`heading`**: (REQUIRED) A concise, constraint-confirming primary heading
+ for the response. Plain text only (e.g., 'Walking route from Seattle Center
+ to Pike Place Market', 'Driving directions to JFK Airport'). Use sentence
+ case; do NOT include markdown hashtags or conversational filler.
+- **`summary`**: (REQUIRED) A natural, direct resolution of the route prompt
+ (e.g. 'Driving from [Origin] to [Destination] takes about 19 minutes (14
+ miles).', 'Walking from Seattle Center to Pike Place Market takes about 20
+ minutes (1 mile).'). Describe distance using units appropriate to the
+ location (miles vs. km). For driving and public transit modes, always round
+ distance to a whole number. NEVER describe time in seconds or decimals.
+ Always round seconds to the nearest minute. If it rounds to 0 minutes,
+ describe it as "less than a minute". Always describe time as
+ approximate (e.g. about, around, approximately).
- **`center_lat`**: Latitude of the center of the route map.
- **`center_lng`**: Longitude of the center of the route map.
- **`zoom`**: Recommended map zoom level. Default to 12.
@@ -114,26 +132,53 @@ You MUST populate all required fields in the output schema:
## Examples
### Example 1: Driving Route
-User Query: "Directions from San Francisco to San Jose by car"
-Tool Call:
-`set_model_response(summary="Driving from San Francisco to San Jose takes about 50 minutes via US-101 S.", center_lat=37.55, center_lng=-122.15, zoom=10, routes=[{"origin": {"lat": 37.7749, "lng": -122.4194, "label": "San Francisco", "placeId": "ChIJIQBpAG2ahYAR_6128GcTUEo"}, "destination": {"lat": 37.3382, "lng": -121.8863, "label": "San Jose", "placeId": "ChIJ9T_nxcC1j4ARmMo7S4ABIdM"}}], travel_mode="driving")`
+
+User Query: "Directions from San Francisco to San Jose by car" Tool Call:
+`render_directions_template(heading="Driving directions from San Francisco to San Jose", summary="Driving from San Francisco to San Jose
+takes about 50 minutes via US-101 S.", center_lat=37.55, center_lng=-122.15,
+zoom=10, routes=[{"origin": {"lat": 37.7749, "lng": -122.4194, "label": "San
+Francisco", "placeId": "ChIJIQBpAG2ahYAR_6128GcTUEo"}, "destination": {"lat":
+37.3382, "lng": -121.8863, "label": "San Jose", "placeId":
+"ChIJ9T_nxcC1j4ARmMo7S4ABIdM"}}], travel_mode="driving")`
### Example 2: Walking Route
-User Query: "How do I walk from Central Park to Times Square?"
-Tool Call:
-`set_model_response(summary="Walking from Central Park to Times Square takes about 18 minutes (0.9 miles) down 7th Ave.", center_lat=40.765, center_lng=-73.978, zoom=14, routes=[{"origin": {"lat": 40.768, "lng": -73.974, "label": "Central Park South", "placeId": "ChIJN1t_tDeuEmsRUsoyG83frY4"}, "destination": {"lat": 40.758, "lng": -73.985, "label": "Times Square", "placeId": "ChIJmQJItx6vwokRLxVi2JyuzRo"}}], travel_mode="walking")`
+
+User Query: "How do I walk from Central Park to Times Square?" Tool Call:
+`render_directions_template(heading="Walking route from Central Park to Times Square", summary="Walking from Central Park to Times Square
+takes about 18 minutes (0.9 miles) down 7th Ave.", center_lat=40.765,
+center_lng=-73.978, zoom=14, routes=[{"origin": {"lat": 40.768, "lng": -73.974,
+"label": "Central Park South", "placeId": "ChIJN1t_tDeuEmsRUsoyG83frY4"},
+"destination": {"lat": 40.758, "lng": -73.985, "label": "Times Square",
+"placeId": "ChIJmQJItx6vwokRLxVi2JyuzRo"}}], travel_mode="walking")`
### Example 3: Bicycling Route
-User Query: "Bike directions from Venice Beach to Santa Monica Pier"
-Tool Call:
-`set_model_response(summary="Biking from Venice Beach to Santa Monica Pier takes around 15 minutes along the Marvin Braude Bike Trail.", center_lat=33.998, center_lng=-118.483, zoom=13, routes=[{"origin": {"lat": 33.985, "lng": -118.469, "label": "Venice Beach", "placeId": "ChIJ-wjh2I-6woARx3H-n9uVn4A"}, "destination": {"lat": 34.009, "lng": -118.497, "label": "Santa Monica Pier", "placeId": "ChIJw8g0Xbm7woARQY1Xq41qB2M"}}], travel_mode="bicycling")`
+
+User Query: "Bike directions from Venice Beach to Santa Monica Pier" Tool Call:
+`render_directions_template(heading="Biking route from Venice Beach to Santa Monica Pier", summary="Biking from Venice Beach to Santa Monica
+Pier takes around 15 minutes along the Marvin Braude Bike Trail.",
+center_lat=33.998, center_lng=-118.483, zoom=13, routes=[{"origin": {"lat":
+33.985, "lng": -118.469, "label": "Venice Beach", "placeId":
+"ChIJ-wjh2I-6woARx3H-n9uVn4A"}, "destination": {"lat": 34.009, "lng": -118.497,
+"label": "Santa Monica Pier", "placeId": "ChIJw8g0Xbm7woARQY1Xq41qB2M"}}],
+travel_mode="bicycling")`
### Example 4: Transit Route
-User Query: "Take the subway from Grand Central to Brooklyn Bridge"
-Tool Call:
-`set_model_response(summary="Take the 4 or 5 subway line south from Grand Central - 42 St to Brooklyn Bridge - City Hall (approx. 12 minutes).", center_lat=40.731, center_lng=-73.988, zoom=12, routes=[{"origin": {"lat": 40.7527, "lng": -73.9772, "label": "Grand Central Terminal", "placeId": "ChIJ4zBEaKZQwokREuE50bbCGYs"}, "destination": {"lat": 40.7126, "lng": -74.0049, "label": "Brooklyn Bridge - City Hall", "placeId": "ChIJ40i5iRZawokRHqGfF2b_3yI"}}], travel_mode="transit")`
+
+User Query: "Take the subway from Grand Central to Brooklyn Bridge" Tool Call:
+`render_directions_template(heading="Transit directions from Grand Central to Brooklyn Bridge", summary="Take the 4 or 5 subway line south from
+Grand Central - 42 St to Brooklyn Bridge - City Hall (approx. 12 minutes).",
+center_lat=40.731, center_lng=-73.988, zoom=12, routes=[{"origin": {"lat":
+40.7527, "lng": -73.9772, "label": "Grand Central Terminal", "placeId":
+"ChIJ4zBEaKZQwokREuE50bbCGYs"}, "destination": {"lat": 40.7126, "lng": -74.0049,
+"label": "Brooklyn Bridge - City Hall", "placeId":
+"ChIJ40i5iRZawokRHqGfF2b_3yI"}}], travel_mode="transit")`
### Example 5: Unspecified Travel Mode (Defaults to Driving)
-User Query: "Directions from Austin to San Antonio"
-Tool Call:
-`set_model_response(summary="Driving from Austin to San Antonio takes about 1 hour and 20 minutes via I-35 S.", center_lat=29.85, center_lng=-98.15, zoom=9, routes=[{"origin": {"lat": 30.2672, "lng": -97.7431, "label": "Austin", "placeId": "ChIJLwW05NsQW4YRtxm00DkzqlU"}, "destination": {"lat": 29.4241, "lng": -98.4936, "label": "San Antonio", "placeId": "ChIJrw7QBK9YXIYRowalignfdg4"}}], travel_mode="driving")`
+
+User Query: "Directions from Austin to San Antonio" Tool Call:
+`render_directions_template(heading="Driving directions from Austin to San Antonio", summary="Driving from Austin to San Antonio takes
+about 1 hour and 20 minutes via I-35 S.", center_lat=29.85, center_lng=-98.15,
+zoom=9, routes=[{"origin": {"lat": 30.2672, "lng": -97.7431, "label": "Austin",
+"placeId": "ChIJLwW05NsQW4YRtxm00DkzqlU"}, "destination": {"lat": 29.4241,
+"lng": -98.4936, "label": "San Antonio", "placeId":
+"ChIJrw7QBK9YXIYRowalignfdg4"}}], travel_mode="driving")`
diff --git a/agent/python_agent/templates/directions/__init__.py b/agent/python_agent/templates/directions/__init__.py
new file mode 100644
index 0000000..174bec1
--- /dev/null
+++ b/agent/python_agent/templates/directions/__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
+#
+# https://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.
+
+"""Directions template bundle."""
diff --git a/agent/python_agent/templates/directions.json b/agent/python_agent/templates/directions/layout.json
similarity index 78%
rename from agent/python_agent/templates/directions.json
rename to agent/python_agent/templates/directions/layout.json
index 1bf5f12..389d960 100644
--- a/agent/python_agent/templates/directions.json
+++ b/agent/python_agent/templates/directions/layout.json
@@ -3,7 +3,7 @@
"version": "v0.9",
"createSurface": {
"surfaceId": "{{surface_id}}",
- "catalogId": "a2ui://maps-agentic-ui-catalog.json"
+ "catalogId": "{{catalog_id}}"
}
},
{
@@ -14,13 +14,13 @@
{
"id": "root",
"component": "Column",
- "children": ["summary-text", "map"]
+ "children": ["heading-text", "map", "summary-text"]
},
{
- "id": "summary-text",
+ "id": "heading-text",
"component": "Text",
"variant": "body",
- "text": "{{summary}}"
+ "text": "### {{heading}}"
},
{
"id": "map",
@@ -32,6 +32,12 @@
"zoom": "{{zoom}}",
"routes": "{{routes}}",
"travelMode": "{{travel_mode}}"
+ },
+ {
+ "id": "summary-text",
+ "component": "Text",
+ "variant": "body",
+ "text": "{{summary}}"
}
]
}
diff --git a/agent/python_agent/templates/directions/manifest.json b/agent/python_agent/templates/directions/manifest.json
new file mode 100644
index 0000000..f611a78
--- /dev/null
+++ b/agent/python_agent/templates/directions/manifest.json
@@ -0,0 +1,12 @@
+{
+ "intent": "DIRECTIONS",
+ "surface_prefix": "directions-surface",
+ "archetype": "Standard navigation, route directions, walking/driving/transit times, or navigation instructions between an origin and destination. This includes multi-stop routes and routes with specified waypoints.",
+ "few_shot_examples": [
+ {
+ "user_query": "Directions from Sacramento to Mendocino via Clear Lake",
+ "intent": "DIRECTIONS",
+ "query": "Directions from Sacramento to Mendocino via Clear Lake"
+ }
+ ]
+}
diff --git a/agent/python_agent/extractor.py b/agent/python_agent/templates/directions/schema.py
similarity index 51%
rename from agent/python_agent/extractor.py
rename to agent/python_agent/templates/directions/schema.py
index 53749a0..502c888 100644
--- a/agent/python_agent/extractor.py
+++ b/agent/python_agent/templates/directions/schema.py
@@ -12,97 +12,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-"""Pydantic schemas for structured data extraction from LLM responses."""
+"""Pydantic extraction schema for directions template bundle."""
from typing import Any, Literal
+
import pydantic
+from templates.common import Pin
+
BaseModel = pydantic.BaseModel
Field = pydantic.Field
-class Pin(BaseModel):
- """Representation of a Map Pin."""
-
- lat: float = Field(description="Latitude coordinate")
- lng: float = Field(description="Longitude coordinate")
- label: str = Field(
- description=(
- "Descriptive display label string (e.g. name of address, business, or"
- " landmark)"
- )
- )
- # Note: Using camelCase field name to match frontend A2UI requirements.
- placeId: str | None = Field( # pylint: disable=invalid-name
- default=None, description="Optional Google Maps Place ID"
- )
-
- @pydantic.model_validator(mode="before")
- @classmethod
- def normalize_label(cls, data: Any) -> Any:
- """Normalizes the pin label.
-
- If 'label' is missing but 'name' is present, copies 'name' to 'label'.
- If 'label' is still empty, defaults to 'Location' to ensure
- the UI always has a valid string to render for the marker (avoiding raw
- Place IDs).
-
- Args:
- data: The input dictionary before validation.
-
- Returns:
- The normalized dictionary.
- """
- if isinstance(data, dict):
- if "label" not in data and "name" in data:
- data["label"] = data["name"]
- if not data.get("label"):
- data["label"] = "Location"
- return data
-
-
-class PlacePin(BaseModel):
- """Simplified Map Pin representation for search results."""
-
- # Note: Using camelCase field name to match frontend A2UI requirements.
- # ADK's SetModelResponseTool serialization dumps using field names
- # without aliases.
- placeId: str = Field( # pylint: disable=invalid-name
- description="The unique Google Maps Place ID"
- )
- name: str = Field(description="Name of the place")
- lat: float = Field(description="Latitude coordinates")
- lng: float = Field(description="Longitude coordinates")
-
-
-class LocalSearchExtractorSchema(BaseModel):
- """Structured parameters to render a local search UI update."""
-
- summary: str = Field(
- description=(
- "A detailed response summarizing the search results that fully and"
- " clearly answers all aspects of the user's prompt (including"
- " qualitative criteria, preferences, and comparisons). Use markdown"
- " formatting (bullet points, bolding, tables) and break into"
- " paragraphs as needed. Bold place names."
- )
- )
- center_lat: float = Field(description="Latitude of the center of results")
- center_lng: float = Field(description="Longitude of the center of results")
- zoom: int = Field(
- default=13, description="Recommended map zoom level (typically 13)"
- )
- places: list[PlacePin] = Field(
- description="A list of places found (limit to max list size, e.g. 3)"
- )
- anchor_marker: Pin | None = Field(
- default=None,
- description=(
- "Optional starting or focus point marker (e.g. hotel location)"
- ),
- )
-
-
class RouteSegment(BaseModel):
"""A segment of a route, containing an origin and a destination pin."""
@@ -156,14 +77,20 @@ def normalize_travel_mode(mode: Any) -> str | None:
class DirectionsExtractorSchema(BaseModel):
"""Structured parameters to render a directions UI update."""
- summary: str = Field(
+ heading: str = Field(
description=(
- "A detailed response summarizing the travel directions and route"
- " options that fully answers all user questions, route comparisons,"
- " and travel context requested in the prompt. Use markdown formatting"
- " and break into paragraphs if helpful."
+ "A concise, constraint-confirming primary heading for the response."
+ " Plain text only (e.g., 'Walking route from Seattle Center to Pike"
+ " Place Market', 'Driving directions to JFK Airport')."
)
)
+ summary: str = Field(
+ description=(
+ "A natural, direct resolution of the route prompt describing"
+ " approximate travel duration and distance (e.g. 'Driving from"
+ " [Origin] to [Destination] takes about 19 minutes (14 miles).')."
+ ),
+ )
center_lat: float = Field(
description="Latitude of the center of the route map"
)
@@ -174,7 +101,7 @@ class DirectionsExtractorSchema(BaseModel):
default=12, description="Recommended map zoom level (typically 12)"
)
routes: list[RouteSegment] = Field(
- default_factory=list,
+ min_length=1,
description=(
"A list of route segments connecting the origin, intermediate"
" waypoints, and the destination in order."
@@ -200,3 +127,15 @@ def normalize_directions_data(cls, data: Any) -> Any:
data["travel_mode"] = normalized
return data
+
+
+ExtractorSchema = DirectionsExtractorSchema
+
+__all__ = [
+ "DirectionsExtractorSchema",
+ "ExtractorSchema",
+ "Pin",
+ "RouteSegment",
+ "TRAVEL_MODE_MAP",
+ "normalize_travel_mode",
+]
diff --git a/agent/python_agent/test_extractor.py b/agent/python_agent/templates/directions/test_schema.py
similarity index 58%
rename from agent/python_agent/test_extractor.py
rename to agent/python_agent/templates/directions/test_schema.py
index f4d77b9..bb09b53 100644
--- a/agent/python_agent/test_extractor.py
+++ b/agent/python_agent/templates/directions/test_schema.py
@@ -12,44 +12,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-"""Tests for extractor.py."""
+"""Unit tests for directions template bundle extraction schema."""
import unittest
import pydantic
-from extractor import (
+from templates.directions.schema import (
DirectionsExtractorSchema,
- LocalSearchExtractorSchema,
- Pin,
- PlacePin,
+ ExtractorSchema,
+ normalize_travel_mode,
)
-class TestExtractor(unittest.TestCase):
- """Unit tests for extractor schemas and data normalization."""
-
- def test_pin_normalize_label_copies_name(self):
- data = {"lat": 1.0, "lng": 2.0, "name": "My Place"}
- pin = Pin(**data)
- self.assertEqual(pin.label, "My Place")
-
- def test_pin_normalize_label_defaults_to_location(self):
- data = {"lat": 1.0, "lng": 2.0}
- pin = Pin(**data)
- self.assertEqual(pin.label, "Location")
-
- def test_pin_normalize_label_preserves_existing(self):
- data = {
- "lat": 1.0,
- "lng": 2.0,
- "label": "Custom Label",
- "name": "Ignored Name",
- }
- pin = Pin(**data)
- self.assertEqual(pin.label, "Custom Label")
+class TestDirectionsSchema(unittest.TestCase):
+ """Unit tests for directions schema and data normalization."""
def test_directions_extractor_schema_normalize_travel_mode(self):
"""Verifies that travel mode is normalized to lowercase."""
data = {
+ "heading": "Commute Route",
"summary": "Commute is 1h.",
"center_lat": 37.5,
"center_lng": 127.0,
@@ -65,6 +45,7 @@ def test_directions_extractor_schema_normalize_travel_mode(self):
def test_directions_extractor_schema_with_routes(self):
"""Verifies that DirectionsExtractorSchema can be initialized with routes."""
data = {
+ "heading": "Scenic Route",
"summary": "Scenic route.",
"center_lat": 37.5,
"center_lng": 127.0,
@@ -91,6 +72,7 @@ def test_directions_extractor_schema_missing_travel_mode_fails_validation(
):
"""Verifies that omitting travel_mode raises ValidationError."""
data = {
+ "heading": "Directions Route",
"summary": "Directions summary",
"center_lat": 37.5,
"center_lng": 127.0,
@@ -109,10 +91,14 @@ def test_directions_extractor_schema_invalid_travel_mode_fails_validation(
for invalid_mode in ["flying", "", None, "scooter", 123]:
with self.subTest(invalid_mode=invalid_mode):
data = {
+ "heading": "Directions Route",
"summary": "Directions summary",
"center_lat": 37.5,
"center_lng": 127.0,
- "routes": [],
+ "routes": [{
+ "origin": {"lat": 37.4, "lng": 126.9, "label": "Start"},
+ "destination": {"lat": 37.6, "lng": 127.1, "label": "End"},
+ }],
"travel_mode": invalid_mode,
}
with self.assertRaises(pydantic.ValidationError):
@@ -123,10 +109,14 @@ def test_directions_extractor_schema_all_valid_modes(self):
for mode in ["driving", "walking", "transit", "bicycling"]:
with self.subTest(mode=mode):
data = {
+ "heading": f"Going via {mode}",
"summary": f"Going via {mode}",
"center_lat": 37.5,
"center_lng": 127.0,
- "routes": [],
+ "routes": [{
+ "origin": {"lat": 37.4, "lng": 126.9, "label": "Start"},
+ "destination": {"lat": 37.6, "lng": 127.1, "label": "End"},
+ }],
"travel_mode": mode,
}
schema = DirectionsExtractorSchema(**data)
@@ -197,15 +187,102 @@ def test_directions_extractor_schema_normalize_all_synonyms(self):
for synonym in synonyms:
with self.subTest(synonym=synonym, expected=expected_mode):
data = {
+ "heading": "Commute",
"summary": "Commute",
"center_lat": 37.5,
"center_lng": 127.0,
- "routes": [],
+ "routes": [{
+ "origin": {"lat": 37.4, "lng": 126.9, "label": "Start"},
+ "destination": {"lat": 37.6, "lng": 127.1, "label": "End"},
+ }],
"travel_mode": synonym,
}
schema = DirectionsExtractorSchema(**data)
self.assertEqual(schema.travel_mode, expected_mode)
+ def test_directions_extractor_schema_with_heading(self):
+ """Verifies that DirectionsExtractorSchema validates with heading."""
+ data = {
+ "heading": "Walking route from Seattle Center to Pike Place Market",
+ "summary": "Walking takes about 25 minutes (1 mile).",
+ "center_lat": 47.6205,
+ "center_lng": -122.3493,
+ "travel_mode": "walking",
+ "routes": [{
+ "origin": {
+ "lat": 47.6205,
+ "lng": -122.3493,
+ "label": "Seattle Center",
+ },
+ "destination": {
+ "lat": 47.6097,
+ "lng": -122.3422,
+ "label": "Pike Place Market",
+ },
+ }],
+ }
+ schema = DirectionsExtractorSchema(**data)
+ self.assertEqual(
+ schema.heading, "Walking route from Seattle Center to Pike Place Market"
+ )
+
+ def test_directions_extractor_schema_missing_heading_fails_validation(self):
+ """Verifies that omitting heading raises ValidationError."""
+ data = {
+ "summary": "Walking takes about 25 minutes (1 mile).",
+ "center_lat": 47.6205,
+ "center_lng": -122.3493,
+ "travel_mode": "walking",
+ "routes": [{
+ "origin": {
+ "lat": 47.6205,
+ "lng": -122.3493,
+ "label": "Seattle Center",
+ },
+ "destination": {
+ "lat": 47.6097,
+ "lng": -122.3422,
+ "label": "Pike Place Market",
+ },
+ }],
+ }
+ with self.assertRaises(pydantic.ValidationError):
+ DirectionsExtractorSchema(**data)
+
+ def test_directions_extractor_schema_rejects_an_empty_route_list(self):
+ """Verifies that a directions card with nothing to draw fails validation.
+
+ The layout renders a route polyline, so an empty list produces a blank
+ map. Rejecting it here is what degrades the response to plain text.
+ """
+ with self.assertRaises(pydantic.ValidationError):
+ DirectionsExtractorSchema(
+ heading="Directions",
+ summary="No route available.",
+ center_lat=47.6205,
+ center_lng=-122.3493,
+ travel_mode="walking",
+ routes=[],
+ )
+
+ def test_directions_extractor_schema_missing_summary_fails_validation(self):
+ """Verifies that omitting summary raises ValidationError."""
+ with self.assertRaises(pydantic.ValidationError):
+ DirectionsExtractorSchema(
+ heading="Directions",
+ center_lat=47.6205,
+ center_lng=-122.3493,
+ travel_mode="walking",
+ routes=[{
+ "origin": {"lat": 37.4, "lng": 126.9, "label": "Start"},
+ "destination": {"lat": 37.6, "lng": 127.1, "label": "End"},
+ }],
+ )
+
+ def test_extractor_schema_alias(self):
+ """Verifies ExtractorSchema alias matches DirectionsExtractorSchema."""
+ self.assertIs(ExtractorSchema, DirectionsExtractorSchema)
+
if __name__ == "__main__":
unittest.main()
diff --git a/agent/python_agent/skills/local-search-template-response/SKILL.md b/agent/python_agent/templates/local_search/SKILL.md
similarity index 56%
rename from agent/python_agent/skills/local-search-template-response/SKILL.md
rename to agent/python_agent/templates/local_search/SKILL.md
index c9fc751..6c1579d 100644
--- a/agent/python_agent/skills/local-search-template-response/SKILL.md
+++ b/agent/python_agent/templates/local_search/SKILL.md
@@ -1,12 +1,15 @@
---
-name: local-search-template-response
+name: local_search
description: Extractor skill for local place search queries. Extracts location and list of places for template merging.
---
-# Core Objective
+# Local Search Guidelines
+
+## Core Objective
Extract structured parameters for local searches. You must call maps tools to
-locate matching businesses/places, and populate the response fields.
+locate matching businesses/places, and call `render_local_search_template` to
+render the results.
## Grounding & Tool-Calling Policy (CRITICAL)
@@ -15,9 +18,9 @@ locate matching businesses/places, and populate the response fields.
internal memory or training weights.
2. **MANDATORY TOOL CALLS**: You MUST call the `search_places` tool first to
find actual venues matching the user's query near the requested locations.
-3. **EXACT MATCH**: Any place name, coordinates, or Place ID returned in your
- final response MUST correspond exactly to the data returned by the
- `search_places` tool call.
+3. **EXACT MATCH & PLACE TYPES**: Any place name, coordinates, or Place ID returned in your
+ final response MUST correspond exactly to the data returned by the `search_places` tool call.
+ Determine `placePrimaryType` using the descriptions or categories in the tool response. If insufficient, infer it from the user prompt and place title.
## Multi-Step Location Resolution Policy (Anchored Search)
@@ -57,9 +60,11 @@ If search queries return empty results (`{}`) or fail:
## Output Fields
-You MUST populate all required fields in the output schema, and optionally the anchor marker if resolved:
+You MUST call `render_local_search_template` with all required fields in the
+schema, and optionally the anchor marker if resolved:
-- **`summary`**: A detailed response summarizing the search results, following the **Conversational Text Style Guidelines** below.
+- **`heading`**: A concise, constraint-confirming primary heading in sentence case that starts with or includes the exact number of places provided in the UI response, reflecting the prompt and primary reference location (e.g., '5 vegetarian restaurants near The Plaza Hotel', '5 transit stops near Seattle Center'). Use only the primary reference location without redundant city/state nesting. Plain text only; do NOT include markdown hashtags or conversational filler.
+- **`summary`**: A concise 1-paragraph overview that covers all returned places by weaving them into natural, contrasting groups (e.g., pairing lively group-friendly spots vs. intimate neighborhood bistros) rather than listing them one by one. Broadly characterize the dining or activity landscape near the reference location using concrete, sensory details, bolding every place name (e.g., **Carmine's** and **Tony's Di Napoli**), and directly addressing any prompt constraints. For nearby places, never describe distances as numbers (e.g., do not say "0.3 miles" or "500 meters"). Instead, generalize (e.g., "a short walk", "just steps away", or "a quick stroll"). Do NOT include conversational greetings ('Sure!', 'Here are...') and do NOT list place names in bullet points (individual place cards handle individual places).
- **`center_lat`**: Latitude of the center of results. Use the coordinates of
the resolved anchor location (or the average of the results if no anchor is
resolved).
@@ -67,5 +72,11 @@ You MUST populate all required fields in the output schema, and optionally the a
the resolved anchor location (or the average of the results if no anchor is
resolved).
- **`zoom`**: Recommended map zoom level. Default to 13.
-- **`places`**: A list of places found (limit to max list size, e.g. 3).
+- **`places`**: Return 5 grounded places in the 'places' array by default. If
+ the user prompt explicitly specifies a number of places, return exactly that
+ number in the 'places' array if possible. For each place, determine
+ `placePrimaryType` using the descriptions or categories in the tool response
+ (or infer it from the user prompt and place title) matching supported types
+ (`food_and_drink`, `outdoor`, `retail`, `gas_station`, `ev`, `bank`,
+ `lodging`, `emergency`, `entertainment`, `airport`, `parking`, `generic`).
- **`anchor_marker`**: (Optional) Pin details for the resolved starting/anchor location.
diff --git a/agent/python_agent/templates/local_search/__init__.py b/agent/python_agent/templates/local_search/__init__.py
new file mode 100644
index 0000000..f155006
--- /dev/null
+++ b/agent/python_agent/templates/local_search/__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
+#
+# https://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.
+
+"""Local search template bundle."""
diff --git a/agent/python_agent/templates/local_search.json b/agent/python_agent/templates/local_search/layout.json
similarity index 80%
rename from agent/python_agent/templates/local_search.json
rename to agent/python_agent/templates/local_search/layout.json
index 3d964e4..03c0ab2 100644
--- a/agent/python_agent/templates/local_search.json
+++ b/agent/python_agent/templates/local_search/layout.json
@@ -3,7 +3,7 @@
"version": "v0.9",
"createSurface": {
"surfaceId": "{{surface_id}}",
- "catalogId": "a2ui://maps-agentic-ui-catalog.json"
+ "catalogId": "{{catalog_id}}"
}
},
{
@@ -14,7 +14,13 @@
{
"id": "root",
"component": "Column",
- "children": ["summary-text", "map", "list"]
+ "children": ["heading-text", "summary-text", "map", "list"]
+ },
+ {
+ "id": "heading-text",
+ "component": "Text",
+ "variant": "body",
+ "text": "### {{heading}}"
},
{
"id": "summary-text",
@@ -30,6 +36,8 @@
"lng": "{{center_lng}}"
},
"zoom": "{{zoom}}",
+ "tilt": 0,
+ "mode": "roadmap",
"anchorMarker": "{{anchor_marker}}",
"markers": "{{markers}}"
},
diff --git a/agent/python_agent/templates/local_search/manifest.json b/agent/python_agent/templates/local_search/manifest.json
new file mode 100644
index 0000000..f9c6544
--- /dev/null
+++ b/agent/python_agent/templates/local_search/manifest.json
@@ -0,0 +1,12 @@
+{
+ "intent": "LOCAL_SEARCH",
+ "surface_prefix": "local-search-surface",
+ "archetype": "Search for categories of interest, places, businesses, or points of interest within a specific geographic proximity.",
+ "few_shot_examples": [
+ {
+ "user_query": "Find coffee shops near Central Park",
+ "intent": "LOCAL_SEARCH",
+ "query": "coffee shops near Central Park"
+ }
+ ]
+}
diff --git a/agent/python_agent/templates/local_search/schema.py b/agent/python_agent/templates/local_search/schema.py
new file mode 100644
index 0000000..a40685c
--- /dev/null
+++ b/agent/python_agent/templates/local_search/schema.py
@@ -0,0 +1,133 @@
+# 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
+#
+# https://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.
+
+"""Pydantic extraction schema for local_search template bundle."""
+
+from typing import Any, ClassVar
+
+import pydantic
+
+from templates.common import Pin
+from templates.common import PlacePrimaryType
+
+BaseModel = pydantic.BaseModel
+Field = pydantic.Field
+
+
+class PlacePin(BaseModel):
+ """Simplified Map Pin representation for search results."""
+
+ # Note: Using camelCase field name to match frontend A2UI requirements.
+ # ADK's SetModelResponseTool serialization dumps using field names
+ # without aliases.
+ placeId: str = Field( # pylint: disable=invalid-name
+ description="The unique Google Maps Place ID"
+ )
+ name: str = Field(description="Name of the place")
+ lat: float = Field(description="Latitude coordinates")
+ lng: float = Field(description="Longitude coordinates")
+ placePrimaryType: PlacePrimaryType | None = Field( # pylint: disable=invalid-name
+ default=None,
+ description="Optional primary POI category type string",
+ )
+
+ @pydantic.model_validator(mode="before")
+ @classmethod
+ def normalize_place_pin(cls, data: Any) -> Any:
+ if isinstance(data, dict):
+ if "name" not in data and "label" in data:
+ data["name"] = data["label"]
+ if "label" not in data and "name" in data:
+ data["label"] = data["name"]
+ return data
+
+
+class LocalSearchExtractorSchema(BaseModel):
+ """Structured parameters to render a local search UI update."""
+
+ # Collections the extractor prompt explicitly tells the model to limit. A
+ # place search can return dozens of candidates, and the model will happily
+ # narrate all of them even though the layout renders only `max_list_size`.
+ # Bundles whose collections are naturally small omit this and get no
+ # constraint paragraph.
+ clamped_collections: ClassVar[tuple[str, ...]] = ("places",)
+
+ heading: str = Field(
+ description=(
+ "A concise, constraint-confirming primary heading in sentence case"
+ " that starts with or includes the exact number of places provided"
+ " in the UI response, reflecting the prompt and primary reference"
+ " location (e.g. '5 vegetarian restaurants near The Plaza Hotel',"
+ " '5 transit stops near Seattle Center'). Plain text only; do"
+ " NOT include markdown hashtags or conversational filler."
+ ),
+ )
+ summary: str = Field(
+ description=(
+ "A concise 1-paragraph overview that covers all returned places by"
+ " weaving them into natural, contrasting groups (e.g., pairing"
+ " lively group-friendly spots vs. intimate neighborhood bistros)"
+ " rather than listing them one by one. Broadly characterize the"
+ " dining or activity landscape near the reference location using"
+ " concrete, sensory details, bolding every place name (e.g.,"
+ " **Carmine's** and **Tony's Di Napoli**), and directly addressing"
+ " any prompt constraints. For nearby places, never describe"
+ " distances as numbers (e.g., do not say '0.3 miles' or '500"
+ " meters'); instead generalize (e.g., 'a short walk', 'just steps"
+ " away', 'a quick stroll'). Plain text with markdown bolding only;"
+ " do NOT include conversational greetings ('Sure!', 'Here are...')"
+ " and do NOT list place names in bullet points."
+ ),
+ )
+ center_lat: float = Field(description="Latitude of the center of results")
+ center_lng: float = Field(description="Longitude of the center of results")
+ zoom: int = Field(
+ default=13, description="Recommended map zoom level (typically 13)"
+ )
+ places: list[PlacePin] = Field(
+ min_length=1,
+ description="A list of places found (limit to max list size, e.g. 5)",
+ )
+ anchor_marker: Pin | None = Field(
+ default=None,
+ description=(
+ "Optional starting or focus point marker (e.g. hotel location)"
+ ),
+ )
+
+ @pydantic.computed_field
+ @property
+ def markers(self) -> list[Pin]:
+ """Projects map pins from the places list."""
+ return [
+ Pin(
+ lat=p.lat,
+ lng=p.lng,
+ label=p.name,
+ placeId=p.placeId,
+ placePrimaryType=p.placePrimaryType,
+ )
+ for p in self.places
+ ]
+
+
+ExtractorSchema = LocalSearchExtractorSchema
+
+__all__ = [
+ "ExtractorSchema",
+ "LocalSearchExtractorSchema",
+ "Pin",
+ "PlacePin",
+ "PlacePrimaryType",
+]
diff --git a/agent/python_agent/templates/local_search/test_schema.py b/agent/python_agent/templates/local_search/test_schema.py
new file mode 100644
index 0000000..8fb7e29
--- /dev/null
+++ b/agent/python_agent/templates/local_search/test_schema.py
@@ -0,0 +1,187 @@
+# 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
+#
+# https://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.
+
+"""Unit tests for local_search template bundle extraction schema."""
+
+import unittest
+import pydantic
+from templates.local_search.schema import (
+ ExtractorSchema,
+ LocalSearchExtractorSchema,
+ Pin,
+ PlacePin,
+)
+
+
+class TestLocalSearchSchema(unittest.TestCase):
+ """Unit tests for local_search schema and data normalization."""
+
+ def test_pin_normalize_label_copies_name(self):
+ data = {"lat": 1.0, "lng": 2.0, "name": "My Place"}
+ pin = Pin(**data)
+ self.assertEqual(pin.label, "My Place")
+
+ def test_pin_normalize_label_defaults_to_location(self):
+ data = {"lat": 1.0, "lng": 2.0}
+ pin = Pin(**data)
+ self.assertEqual(pin.label, "Location")
+
+ def test_pin_with_place_primary_type(self):
+ data = {
+ "lat": 1.0,
+ "lng": 2.0,
+ "label": "Coffee Shop",
+ "placePrimaryType": "food_and_drink",
+ }
+ pin = Pin(**data)
+ self.assertEqual(pin.placePrimaryType, "food_and_drink")
+
+ def test_place_pin_with_place_primary_type(self):
+ data = {
+ "placeId": "ChIJ123",
+ "name": "Coffee Shop",
+ "lat": 1.0,
+ "lng": 2.0,
+ "placePrimaryType": "food_and_drink",
+ }
+ pin = PlacePin(**data)
+ self.assertEqual(pin.placePrimaryType, "food_and_drink")
+
+ def test_pin_normalize_label_preserves_existing(self):
+ data = {
+ "lat": 1.0,
+ "lng": 2.0,
+ "label": "Custom Label",
+ "name": "Ignored Name",
+ }
+ pin = Pin(**data)
+ self.assertEqual(pin.label, "Custom Label")
+
+ def test_local_search_extractor_schema_with_heading(self):
+ """Verifies that LocalSearchExtractorSchema validates with heading."""
+ data = {
+ "heading": "5 Transit Stops Near Seattle Center",
+ "summary": "Here are 5 transit stops.",
+ "center_lat": 47.6205,
+ "center_lng": -122.3493,
+ "places": [{
+ "placeId": "ChIJ111",
+ "name": "Stop 1",
+ "lat": 47.62,
+ "lng": -122.35,
+ }],
+ }
+ schema = LocalSearchExtractorSchema(**data)
+ self.assertEqual(schema.heading, "5 Transit Stops Near Seattle Center")
+
+ def test_local_search_extractor_schema_missing_heading_fails_validation(self):
+ """Verifies that omitting heading raises ValidationError."""
+ data = {
+ "summary": "Here are 5 transit stops.",
+ "center_lat": 47.6205,
+ "center_lng": -122.3493,
+ "places": [{
+ "placeId": "ChIJ111",
+ "name": "Stop 1",
+ "lat": 47.62,
+ "lng": -122.35,
+ }],
+ }
+ with self.assertRaises(pydantic.ValidationError):
+ LocalSearchExtractorSchema(**data)
+
+ def test_local_search_extractor_schema_computed_markers(self):
+ """Verifies that markers are computed from places automatically."""
+ data = {
+ "heading": "Coffee places",
+ "summary": "Here are 2 coffee places.",
+ "center_lat": 47.62,
+ "center_lng": -122.35,
+ "places": [
+ {
+ "placeId": "ChIJ111",
+ "name": "Espresso Vivace",
+ "lat": 47.62,
+ "lng": -122.32,
+ "placePrimaryType": "food_and_drink",
+ },
+ {
+ "placeId": "ChIJ222",
+ "name": "Milstead & Co.",
+ "lat": 47.64,
+ "lng": -122.35,
+ },
+ ],
+ }
+ schema = LocalSearchExtractorSchema(**data)
+ self.assertEqual(len(schema.markers), 2)
+ self.assertEqual(schema.markers[0].label, "Espresso Vivace")
+ self.assertEqual(schema.markers[0].lat, 47.62)
+ self.assertEqual(schema.markers[0].lng, -122.32)
+ self.assertEqual(schema.markers[0].placeId, "ChIJ111")
+ self.assertEqual(schema.markers[0].placePrimaryType, "food_and_drink")
+
+ self.assertEqual(schema.markers[1].label, "Milstead & Co.")
+ self.assertEqual(schema.markers[1].placeId, "ChIJ222")
+ self.assertIsNone(schema.markers[1].placePrimaryType)
+
+ # Verify model_dump includes markers
+ dumped = schema.model_dump(exclude_none=True)
+ self.assertIn("markers", dumped)
+ self.assertEqual(len(dumped["markers"]), 2)
+ self.assertEqual(dumped["markers"][0]["label"], "Espresso Vivace")
+ self.assertEqual(dumped["markers"][0]["placeId"], "ChIJ111")
+ self.assertEqual(dumped["markers"][0]["placePrimaryType"], "food_and_drink")
+ self.assertNotIn("placePrimaryType", dumped["markers"][1])
+
+ def test_local_search_extractor_schema_rejects_an_empty_places_list(self):
+ """Verifies that a local search card with nothing to show fails validation.
+
+ The layout renders a place list and its map markers, so zero places
+ produces a blank map. Rejecting it here is what degrades the response to
+ plain text.
+ """
+ data = {
+ "heading": "No places",
+ "summary": "No places found.",
+ "center_lat": 47.62,
+ "center_lng": -122.35,
+ "places": [],
+ }
+ with self.assertRaises(pydantic.ValidationError):
+ LocalSearchExtractorSchema(**data)
+
+ def test_local_search_extractor_schema_rejects_place_without_place_id(self):
+ """Verifies that a place missing placeId fails validation."""
+ data = {
+ "heading": "Coffee places",
+ "summary": "Here are coffee places.",
+ "center_lat": 47.62,
+ "center_lng": -122.35,
+ "places": [{
+ "name": "Coffee Shop Without ID",
+ "lat": 47.62,
+ "lng": -122.35,
+ }],
+ }
+ with self.assertRaises(pydantic.ValidationError):
+ LocalSearchExtractorSchema(**data)
+
+ def test_extractor_schema_alias(self):
+ """Verifies ExtractorSchema alias matches LocalSearchExtractorSchema."""
+ self.assertIs(ExtractorSchema, LocalSearchExtractorSchema)
+
+
+if __name__ == "__main__":
+ unittest.main()
diff --git a/agent/python_agent/templates/test_common.py b/agent/python_agent/templates/test_common.py
new file mode 100644
index 0000000..acaf9fb
--- /dev/null
+++ b/agent/python_agent/templates/test_common.py
@@ -0,0 +1,123 @@
+# 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
+#
+# https://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.
+
+"""Unit tests for shared template models and primitives."""
+
+import typing
+import unittest
+
+import pydantic
+
+from templates import common
+
+
+class PinTest(unittest.TestCase):
+ """Tests for the Pin model and its validators."""
+
+ def test_pin_valid_construction(self):
+ pin = common.Pin(
+ lat=37.7749,
+ lng=-122.4194,
+ label="San Francisco",
+ placeId="ChIJIQBpAG2ahYAR_6128GcTUEo",
+ placePrimaryType="retail",
+ )
+ self.assertEqual(pin.lat, 37.7749)
+ self.assertEqual(pin.lng, -122.4194)
+ self.assertEqual(pin.label, "San Francisco")
+ self.assertEqual(pin.placeId, "ChIJIQBpAG2ahYAR_6128GcTUEo")
+ self.assertEqual(pin.placePrimaryType, "retail")
+
+ def test_pin_normalizes_name_to_label_when_label_is_missing(self):
+ data = {
+ "lat": 47.6062,
+ "lng": -122.3321,
+ "name": "Pike Place Market",
+ }
+ pin = common.Pin.model_validate(data)
+ self.assertEqual(pin.label, "Pike Place Market")
+
+ def test_pin_defaults_to_location_when_label_and_name_are_empty(self):
+ data = {
+ "lat": 47.6062,
+ "lng": -122.3321,
+ }
+ pin = common.Pin.model_validate(data)
+ self.assertEqual(pin.label, "Location")
+
+ def test_pin_preserves_explicit_label_even_if_name_is_present(self):
+ data = {
+ "lat": 47.6062,
+ "lng": -122.3321,
+ "label": "Custom Label",
+ "name": "Ignored Name",
+ }
+ pin = common.Pin.model_validate(data)
+ self.assertEqual(pin.label, "Custom Label")
+
+ def test_pin_requires_coordinates(self):
+ with self.assertRaises(pydantic.ValidationError):
+ common.Pin.model_validate({"label": "Missing Coords"})
+
+
+class PlacePrimaryTypeTest(unittest.TestCase):
+ """Tests for the supported POI taxonomy."""
+
+ def test_matches_supported_taxonomy(self):
+ # Pinned so that adding or removing a category is a deliberate edit that
+ # also has to be mirrored in the client lookups and the agent skills.
+ self.assertEqual(
+ typing.get_args(common.PlacePrimaryType),
+ (
+ "food_and_drink",
+ "outdoor",
+ "retail",
+ "gas_station",
+ "ev",
+ "bank",
+ "lodging",
+ "emergency",
+ "entertainment",
+ "airport",
+ "parking",
+ "generic",
+ ),
+ )
+
+ def test_pin_accepts_every_supported_type(self):
+ for place_primary_type in typing.get_args(common.PlacePrimaryType):
+ with self.subTest(placePrimaryType=place_primary_type):
+ pin = common.Pin(
+ lat=1.0,
+ lng=2.0,
+ label="Place",
+ placePrimaryType=place_primary_type,
+ )
+ self.assertEqual(pin.placePrimaryType, place_primary_type)
+
+ def test_pin_rejects_retired_types(self):
+ # `service` was split into `gas_station`/`bank`, and `closed` was dropped.
+ for place_primary_type in ("service", "closed"):
+ with self.subTest(placePrimaryType=place_primary_type):
+ with self.assertRaises(pydantic.ValidationError):
+ common.Pin(
+ lat=1.0,
+ lng=2.0,
+ label="Place",
+ placePrimaryType=place_primary_type,
+ )
+
+
+if __name__ == "__main__":
+ unittest.main()
diff --git a/agent/python_agent/templates/text_only.json b/agent/python_agent/templates/text_only/layout.json
similarity index 90%
rename from agent/python_agent/templates/text_only.json
rename to agent/python_agent/templates/text_only/layout.json
index a088835..feee812 100644
--- a/agent/python_agent/templates/text_only.json
+++ b/agent/python_agent/templates/text_only/layout.json
@@ -3,7 +3,7 @@
"version": "v0.9",
"createSurface": {
"surfaceId": "{{surface_id}}",
- "catalogId": "a2ui://maps-agentic-ui-catalog.json"
+ "catalogId": "{{catalog_id}}"
}
},
{
diff --git a/agent/python_agent/test_after_tools_callback.py b/agent/python_agent/test_after_tools_callback.py
new file mode 100644
index 0000000..d56e5f3
--- /dev/null
+++ b/agent/python_agent/test_after_tools_callback.py
@@ -0,0 +1,307 @@
+# 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.
+
+"""Tests for after_tools_callback."""
+
+import unittest
+from unittest import mock
+
+from after_tools_callback import _add_maps_tools_tokens_to_part, after_maps_tools_callback, after_tools_callback
+
+
+class TestAfterToolsCallback(unittest.TestCase):
+
+ def test_after_tool_callback_aggregates_maps_tools_content_tokens(self):
+ mock_tool_context = mock.MagicMock()
+ mock_tool_context.state = {}
+
+ tool_response_1 = {
+ "content_token": "token_abc_123",
+ }
+ after_tools_callback(
+ tool=None,
+ args={},
+ tool_context=mock_tool_context,
+ tool_response=tool_response_1,
+ )
+ self.assertEqual(
+ mock_tool_context.state.get("maps_tools_content_tokens"),
+ ["token_abc_123"],
+ )
+
+ tool_response_2 = {
+ "content_token": "token_def_456",
+ }
+ after_tools_callback(
+ tool=None,
+ args={},
+ tool_context=mock_tool_context,
+ tool_response=tool_response_2,
+ )
+ self.assertEqual(
+ mock_tool_context.state.get("maps_tools_content_tokens"),
+ ["token_abc_123", "token_def_456"],
+ )
+
+ # Calling again with duplicate should not add duplicates
+ after_tools_callback(
+ tool=None,
+ args={},
+ tool_context=mock_tool_context,
+ tool_response={"content_token": "token_abc_123"},
+ )
+ self.assertEqual(
+ mock_tool_context.state.get("maps_tools_content_tokens"),
+ ["token_abc_123", "token_def_456"],
+ )
+
+ def test_after_tool_callback_limits_maps_tools_content_tokens(self):
+ mock_tool_context = mock.MagicMock()
+ mock_tool_context.state = {}
+
+ for i in range(15):
+ after_tools_callback(
+ tool=None,
+ args={},
+ tool_context=mock_tool_context,
+ tool_response={"content_token": f"token_{i}"},
+ )
+
+ tokens = mock_tool_context.state.get("maps_tools_content_tokens")
+ self.assertEqual(len(tokens), 10)
+ self.assertEqual(tokens[0], "token_5")
+ self.assertEqual(tokens[-1], "token_14")
+
+ def test_after_tool_callback_with_kwargs(self):
+ mock_tool_context = mock.MagicMock()
+ mock_tool_context.state = {}
+
+ after_tools_callback(
+ tool="mock_tool",
+ args={"query": "test"},
+ tool_context=mock_tool_context,
+ tool_response={"content_token": "token_xyz"},
+ extra_param="unused",
+ )
+ self.assertEqual(
+ mock_tool_context.state.get("maps_tools_content_tokens"),
+ ["token_xyz"],
+ )
+
+ def test_after_tools_callback_none_or_empty_response(self):
+ mock_tool_context = mock.MagicMock()
+ mock_tool_context.state = {}
+
+ # None tool response
+ result = after_tools_callback(
+ tool=None,
+ args={},
+ tool_context=mock_tool_context,
+ tool_response=None,
+ )
+ self.assertIsNone(result)
+ self.assertEqual(mock_tool_context.state, {})
+
+ # Empty dict tool response
+ result = after_tools_callback(
+ tool=None,
+ args={},
+ tool_context=mock_tool_context,
+ tool_response={},
+ )
+ self.assertIsNone(result)
+ self.assertEqual(mock_tool_context.state, {})
+
+ # Non-dict tool response
+ result = after_tools_callback(
+ tool=None,
+ args={},
+ tool_context=mock_tool_context,
+ tool_response="not a dict",
+ )
+ self.assertIsNone(result)
+ self.assertEqual(mock_tool_context.state, {})
+
+ result = after_tools_callback(
+ tool=None,
+ args={},
+ tool_context=mock_tool_context,
+ tool_response=["list_not_dict"],
+ )
+ self.assertIsNone(result)
+ self.assertEqual(mock_tool_context.state, {})
+
+ def test_after_maps_tools_callback_none_or_missing_context(self):
+ # None tool_context
+ result = after_maps_tools_callback(
+ tool_context=None,
+ tool_response={"content_token": "token_1"},
+ )
+ self.assertIsNone(result)
+
+ # tool_context with state=None
+ mock_context_no_state = mock.MagicMock()
+ mock_context_no_state.state = None
+ result = after_maps_tools_callback(
+ tool_context=mock_context_no_state,
+ tool_response={"content_token": "token_1"},
+ )
+ self.assertIsNone(result)
+
+ # tool_context without state attribute
+ class DummyContext:
+ pass
+
+ result = after_maps_tools_callback(
+ tool_context=DummyContext(),
+ tool_response={"content_token": "token_1"},
+ )
+ self.assertIsNone(result)
+
+ def test_after_maps_tools_callback_invalid_token_values(self):
+ mock_tool_context = mock.MagicMock()
+ mock_tool_context.state = {}
+
+ # None token
+ after_maps_tools_callback(
+ tool_context=mock_tool_context,
+ tool_response={"content_token": None},
+ )
+ self.assertEqual(mock_tool_context.state, {})
+
+ # Empty string token
+ after_maps_tools_callback(
+ tool_context=mock_tool_context,
+ tool_response={"content_token": ""},
+ )
+ self.assertEqual(mock_tool_context.state, {})
+
+ # Non-string token (int)
+ after_maps_tools_callback(
+ tool_context=mock_tool_context,
+ tool_response={"content_token": 12345},
+ )
+ self.assertEqual(mock_tool_context.state, {})
+
+ # Missing content_token key
+ after_maps_tools_callback(
+ tool_context=mock_tool_context,
+ tool_response={"places": []},
+ )
+ self.assertEqual(mock_tool_context.state, {})
+
+ def test_after_maps_tools_callback_non_list_state_content_tokens(self):
+ mock_tool_context = mock.MagicMock()
+
+ # If state['maps_tools_content_tokens'] is not a list (e.g. a string)
+ mock_tool_context.state = {"maps_tools_content_tokens": "invalid_string"}
+ after_maps_tools_callback(
+ tool_context=mock_tool_context,
+ tool_response={"content_token": "token_1"},
+ )
+ self.assertEqual(
+ mock_tool_context.state.get("maps_tools_content_tokens"),
+ ["token_1"],
+ )
+
+ # If state['maps_tools_content_tokens'] is None
+ mock_tool_context.state = {"maps_tools_content_tokens": None}
+ after_maps_tools_callback(
+ tool_context=mock_tool_context,
+ tool_response={"content_token": "token_2"},
+ )
+ self.assertEqual(
+ mock_tool_context.state.get("maps_tools_content_tokens"),
+ ["token_2"],
+ )
+
+
+class TestAddMapsToolsTokensToPart(unittest.TestCase):
+
+ def test_add_tokens_session_none_or_missing_state(self):
+ part = mock.MagicMock()
+ part.root.metadata = None
+
+ # session is None
+ _add_maps_tools_tokens_to_part(part, None)
+ self.assertIsNone(part.root.metadata)
+
+ # session.state is None
+ mock_session = mock.MagicMock()
+ mock_session.state = None
+ _add_maps_tools_tokens_to_part(part, mock_session)
+ self.assertIsNone(part.root.metadata)
+
+ def test_add_tokens_empty_tokens_in_session(self):
+ part = mock.MagicMock()
+ part.root.metadata = None
+
+ # maps_tools_content_tokens is not in state
+ session = mock.MagicMock()
+ session.state = {}
+ _add_maps_tools_tokens_to_part(part, session)
+ self.assertIsNone(part.root.metadata)
+
+ # maps_tools_content_tokens is empty list
+ session.state = {"maps_tools_content_tokens": []}
+ _add_maps_tools_tokens_to_part(part, session)
+ self.assertIsNone(part.root.metadata)
+
+ # maps_tools_content_tokens is None
+ session.state = {"maps_tools_content_tokens": None}
+ _add_maps_tools_tokens_to_part(part, session)
+ self.assertIsNone(part.root.metadata)
+
+ def test_add_tokens_with_metadata_none(self):
+ part = mock.MagicMock()
+ part.root.metadata = None
+
+ session = mock.MagicMock()
+ session.state = {"maps_tools_content_tokens": ["token_1", "token_2"]}
+
+ _add_maps_tools_tokens_to_part(part, session)
+ self.assertEqual(
+ part.root.metadata,
+ {"maps_tools_content_tokens": ["token_1", "token_2"]},
+ )
+
+ def test_add_tokens_with_existing_metadata(self):
+ part = mock.MagicMock()
+ part.root.metadata = {"existing_field": "existing_value"}
+
+ session = mock.MagicMock()
+ session.state = {"maps_tools_content_tokens": ["token_1"]}
+
+ _add_maps_tools_tokens_to_part(part, session)
+ self.assertEqual(
+ part.root.metadata,
+ {
+ "existing_field": "existing_value",
+ "maps_tools_content_tokens": ["token_1"],
+ },
+ )
+
+ def test_add_tokens_with_none_root(self):
+ part = mock.MagicMock()
+ part.root = None
+
+ session = mock.MagicMock()
+ session.state = {"maps_tools_content_tokens": ["token_1"]}
+
+ # Should not raise AttributeError
+ _add_maps_tools_tokens_to_part(part, session)
+
+
+if __name__ == "__main__":
+ unittest.main()
diff --git a/agent/python_agent/test_agent.py b/agent/python_agent/test_agent.py
new file mode 100644
index 0000000..1f9f723
--- /dev/null
+++ b/agent/python_agent/test_agent.py
@@ -0,0 +1,44 @@
+# 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
+#
+# https://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 unittest
+from agent import extract_surface_id
+
+class SurfaceIdExtractionTest(unittest.TestCase):
+
+ def test_extract_from_create_surface(self):
+ data = {"createSurface": {"surfaceId": "map_surface_1", "catalogId": "maps"}}
+ self.assertEqual(extract_surface_id(data), "map_surface_1")
+
+ def test_extract_from_update_components(self):
+ data = {"updateComponents": {"surfaceId": "details_card_2", "components": []}}
+ self.assertEqual(extract_surface_id(data), "details_card_2")
+
+ def test_extract_from_update_data_model(self):
+ data = {"updateDataModel": {"surfaceId": "weather_card_3", "dataModel": {}}}
+ self.assertEqual(extract_surface_id(data), "weather_card_3")
+
+ def test_extract_from_delete_surface(self):
+ data = {"deleteSurface": {"surfaceId": "old_surface_4"}}
+ self.assertEqual(extract_surface_id(data), "old_surface_4")
+
+ def test_extract_non_matching_or_malformed_data(self):
+ self.assertIsNone(extract_surface_id({"text": "hello"}))
+ self.assertIsNone(extract_surface_id(None))
+ self.assertIsNone(extract_surface_id("not_a_dict"))
+ self.assertIsNone(extract_surface_id({"createSurface": "malformed_shape"}))
+ self.assertIsNone(extract_surface_id({"createSurface": {}}))
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/agent/python_agent/test_agent_with_templates.py b/agent/python_agent/test_agent_with_templates.py
index 5072e61..e22e1af 100644
--- a/agent/python_agent/test_agent_with_templates.py
+++ b/agent/python_agent/test_agent_with_templates.py
@@ -108,7 +108,7 @@ def lite_llm_side_effect(*args, **kwargs):
return self.mock_router
elif model in (
"gemini/template-model",
- "gemini/gemini-3-flash-preview",
+ "gemini/gemini-3.7-flash",
"gemini/generic-model",
):
return self.mock_extractor
@@ -189,9 +189,9 @@ async def test_agent_text_only_flow(self, mock_lite_llm_class):
template_model="gemini/template-model",
)
agent = MAUIAgentWithTemplates(base_url="http://test-url", config=config)
+ agent._grounded_text_runner = mock_runner
- with mock.patch.object(agent, "_build_runner", return_value=mock_runner):
- results = await self._collect_stream(agent, "hello")
+ results = await self._collect_stream(agent, "hello")
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -230,9 +230,9 @@ async def test_agent_router_failure_fallback(self, mock_lite_llm_class):
template_model="gemini/template-model",
)
agent = MAUIAgentWithTemplates(base_url="http://test-url", config=config)
+ agent._grounded_text_runner = mock_runner
- with mock.patch.object(agent, "_build_runner", return_value=mock_runner):
- results = await self._collect_stream(agent, "hello")
+ results = await self._collect_stream(agent, "hello")
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -265,9 +265,9 @@ async def test_agent_extractor_empty_parts_handled_safely(
template_model="gemini/template-model",
)
agent = MAUIAgentWithTemplates(base_url="http://test-url", config=config)
+ agent._grounded_text_runner = mock_runner
- with mock.patch.object(agent, "_build_runner", return_value=mock_runner):
- results = await self._collect_stream(agent, "hello")
+ results = await self._collect_stream(agent, "hello")
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -317,10 +317,11 @@ async def test_agent_unsupported_intent_fallback(self, mock_lite_llm_class):
def test_init_without_config_uses_default(self):
agent = MAUIAgentWithTemplates(base_url="http://test-url")
self.assertIsNotNone(agent.config)
- self.assertEqual(agent.config.router_model, "gemini/gemini-3.1-flash-lite")
+ self.assertEqual(agent.config.router_model, "gemini/gemini-3.5-flash-lite")
self.assertEqual(
- agent.config.template_model, "gemini/gemini-3.1-flash-lite"
+ agent.config.template_model, "gemini/gemini-3.5-flash-lite"
)
+ self.assertEqual(agent.config.generic_model, "gemini/gemini-3.7-flash")
self.assertEqual(agent.config.fallback_mode, FallbackMode.TEXT)
@mock.patch(_LITELLM_PATH)
@@ -339,8 +340,9 @@ async def test_agent_directions_flow(self, mock_lite_llm_class):
mock_runner = mock.MagicMock()
mock_fc = MockFunctionCall(
- name="set_model_response",
+ name="render_directions_template",
args={
+ "heading": "Directions from home to work",
"summary": "Typical commute is 45 mins.",
"center_lat": 37.5,
"center_lng": 127.0,
@@ -370,17 +372,15 @@ async def test_agent_directions_flow(self, mock_lite_llm_class):
template_model="gemini/template-model",
)
agent = MAUIAgentWithTemplates(base_url="http://test-url", config=config)
+ agent._extractor_runners["0.9"] = mock_runner
- # Patch _build_runner
- with mock.patch.object(agent, "_build_runner", return_value=mock_runner):
- # Run stream
- results = []
- async for item in agent.stream(
- query="directions from home to work",
- session_id="session_123",
- ui_version="v0.9",
- ):
- results.append(item)
+ results = []
+ async for item in agent.stream(
+ query="directions from home to work",
+ session_id="session_123",
+ ui_version="v0.9",
+ ):
+ results.append(item)
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -432,15 +432,16 @@ async def test_agent_directions_flow_fallback(self, mock_lite_llm_class):
template_model="gemini/template-model",
)
agent = MAUIAgentWithTemplates(base_url="http://test-url", config=config)
+ agent._extractor_runners["0.9"] = mock_runner
+ agent._fallback_text_runner = mock_runner
- with mock.patch.object(agent, "_build_runner", return_value=mock_runner):
- results = []
- async for item in agent.stream(
- query="directions to work",
- session_id="session_123",
- ui_version="v0.9",
- ):
- results.append(item)
+ results = []
+ async for item in agent.stream(
+ query="directions to work",
+ session_id="session_123",
+ ui_version="v0.9",
+ ):
+ results.append(item)
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -470,8 +471,9 @@ async def test_agent_directions_flow_transit_mode(self, mock_lite_llm_class):
mock_runner = mock.MagicMock()
mock_fc = MockFunctionCall(
- name="set_model_response",
+ name="render_directions_template",
args={
+ "heading": "Bus directions to work",
"summary": "Take bus 10 to work.",
"center_lat": 37.5,
"center_lng": 127.0,
@@ -501,9 +503,9 @@ async def test_agent_directions_flow_transit_mode(self, mock_lite_llm_class):
template_model="gemini/template-model",
)
agent = MAUIAgentWithTemplates(base_url="http://test-url", config=config)
+ agent._extractor_runners["0.9"] = mock_runner
- with mock.patch.object(agent, "_build_runner", return_value=mock_runner):
- results = await self._collect_stream(agent, query="bus to work")
+ results = await self._collect_stream(agent, query="bus to work")
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -524,8 +526,9 @@ async def test_agent_directions_flow_walking_mode(self, mock_lite_llm_class):
mock_runner = mock.MagicMock()
mock_fc = MockFunctionCall(
- name="set_model_response",
+ name="render_directions_template",
args={
+ "heading": "Walking route to park",
"summary": "Walk for 15 minutes.",
"center_lat": 37.5,
"center_lng": 127.0,
@@ -555,9 +558,9 @@ async def test_agent_directions_flow_walking_mode(self, mock_lite_llm_class):
template_model="gemini/template-model",
)
agent = MAUIAgentWithTemplates(base_url="http://test-url", config=config)
+ agent._extractor_runners["0.9"] = mock_runner
- with mock.patch.object(agent, "_build_runner", return_value=mock_runner):
- results = await self._collect_stream(agent, query="walk to park")
+ results = await self._collect_stream(agent, query="walk to park")
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -580,8 +583,9 @@ async def test_agent_directions_flow_bicycling_mode(
mock_runner = mock.MagicMock()
mock_fc = MockFunctionCall(
- name="set_model_response",
+ name="render_directions_template",
args={
+ "heading": "Biking route to work",
"summary": "Bike for 25 minutes.",
"center_lat": 37.5,
"center_lng": 127.0,
@@ -611,9 +615,9 @@ async def test_agent_directions_flow_bicycling_mode(
template_model="gemini/template-model",
)
agent = MAUIAgentWithTemplates(base_url="http://test-url", config=config)
+ agent._extractor_runners["0.9"] = mock_runner
- with mock.patch.object(agent, "_build_runner", return_value=mock_runner):
- results = await self._collect_stream(agent, query="bike to work")
+ results = await self._collect_stream(agent, query="bike to work")
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -639,8 +643,9 @@ async def test_agent_directions_flow_missing_travel_mode_fallback(
)
mock_fc = MockFunctionCall(
- name="set_model_response",
+ name="render_directions_template",
args={
+ "heading": "Directions to work",
"summary": "Typical commute is 45 mins.",
"center_lat": 37.5,
"center_lng": 127.0,
@@ -680,13 +685,10 @@ async def test_agent_directions_flow_missing_travel_mode_fallback(
template_model="gemini/template-model",
)
agent = MAUIAgentWithTemplates(base_url="http://test-url", config=config)
+ agent._extractor_runners["0.9"] = mock_extractor_runner
+ agent._fallback_text_runner = mock_fallback_runner
- with mock.patch.object(
- agent,
- "_build_runner",
- side_effect=[mock_extractor_runner, mock_fallback_runner],
- ):
- results = await self._collect_stream(agent, query="directions to work")
+ results = await self._collect_stream(agent, query="directions to work")
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -721,8 +723,9 @@ async def test_agent_local_search_flow(self, mock_lite_llm_class):
mock_runner = mock.MagicMock()
mock_fc = MockFunctionCall(
- name="set_model_response",
+ name="render_local_search_template",
args={
+ "heading": "Top Sushi Places in Seattle",
"summary": "Here are some sushi places.",
"center_lat": 47.6062,
"center_lng": -122.3321,
@@ -744,14 +747,13 @@ async def test_agent_local_search_flow(self, mock_lite_llm_class):
template_model="gemini/template-model",
)
agent = MAUIAgentWithTemplates(base_url="http://test-url", config=config)
+ agent._extractor_runners["0.9"] = mock_runner
- # Patch _build_runner
- with mock.patch.object(agent, "_build_runner", return_value=mock_runner):
- results = []
- async for item in agent.stream(
- query="sushi Seattle", session_id="session_123", ui_version="v0.9"
- ):
- results.append(item)
+ results = []
+ async for item in agent.stream(
+ query="sushi Seattle", session_id="session_123", ui_version="v0.9"
+ ):
+ results.append(item)
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -763,6 +765,20 @@ async def test_agent_local_search_flow(self, mock_lite_llm_class):
create_surface["surfaceId"].startswith("local-search-surface-")
)
+ update_components = parts[1].root.data["updateComponents"]
+ heading_comp = next(
+ comp
+ for comp in update_components["components"]
+ if comp["id"] == "heading-text"
+ )
+ self.assertEqual(heading_comp["text"], "### Top Sushi Places in Seattle")
+
+ map_comp = next(
+ comp for comp in update_components["components"] if comp["id"] == "map"
+ )
+ self.assertEqual(map_comp["tilt"], 0)
+ self.assertEqual(map_comp["mode"], "roadmap")
+
update_data_model = parts[2].root.data["updateDataModel"]
# Verify places array was successfully populated in data model
self.assertEqual(update_data_model["path"], "/")
@@ -788,9 +804,9 @@ async def test_agent_local_search_flow_validation_failure_fallback(
mock_runner = mock.MagicMock()
- # Mock invalid set_model_response arguments (missing required center_lat)
+ # Mock invalid render_local_search_template arguments (missing required center_lat)
invalid_args = {"summary": "Invalid data", "places": []}
- mock_fc = MockFunctionCall("set_model_response", invalid_args)
+ mock_fc = MockFunctionCall("render_local_search_template", invalid_args)
mock_event_fc = MockEvent(function_calls=[mock_fc])
mock_event_text = MockEvent(
content=MockContent([MockPart("Fallback text here.")])
@@ -806,14 +822,14 @@ async def test_agent_local_search_flow_validation_failure_fallback(
template_model="gemini/template-model",
)
agent = MAUIAgentWithTemplates(base_url="http://test-url", config=config)
+ agent._extractor_runners["0.9"] = mock_runner
+ agent._fallback_text_runner = mock_runner
- # Patch _build_runner
- with mock.patch.object(agent, "_build_runner", return_value=mock_runner):
- results = []
- async for item in agent.stream(
- query="coffee", session_id="session_123", ui_version="v0.9"
- ):
- results.append(item)
+ results = []
+ async for item in agent.stream(
+ query="coffee", session_id="session_123", ui_version="v0.9"
+ ):
+ results.append(item)
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -843,8 +859,19 @@ async def test_agent_local_search_flow_catalog_validation_failure_fallback(
mock_runner = mock.MagicMock()
mock_fc = MockFunctionCall(
- "set_model_response",
- {"summary": "Coffee", "places": [{"name": "Starbucks"}]},
+ "render_local_search_template",
+ {
+ "heading": "Coffee Shops",
+ "summary": "Coffee",
+ "center_lat": 47.6,
+ "center_lng": -122.3,
+ "places": [{
+ "placeId": "1",
+ "name": "Starbucks",
+ "lat": 47.6,
+ "lng": -122.3,
+ }],
+ },
)
mock_runner.run_async.return_value = MockAsyncIterator(
[MockEvent(function_calls=[mock_fc])]
@@ -858,18 +885,22 @@ async def test_agent_local_search_flow_catalog_validation_failure_fallback(
"Mock validation error"
)
mock_schema_manager = mock.MagicMock()
- mock_schema_manager.get_catalog.return_value = mock_catalog
- agent._schema_managers = {"v0.9": mock_schema_manager}
+ mock_schema_manager.get_selected_catalog.return_value = mock_catalog
+ agent._schema_managers = {"0.9": mock_schema_manager}
+ for agent_inst in agent._extractor_agents.values():
+ for t in agent_inst.tools:
+ if hasattr(t, "schema_manager"):
+ t.schema_manager = mock_schema_manager
mock_fallback_runner = mock.MagicMock()
mock_fallback_runner.run_async.return_value = MockAsyncIterator(
[MockEvent(content=MockContent([MockPart("Fallback text from LLM.")]))]
)
- with mock.patch.object(
- agent, "_build_runner", side_effect=[mock_runner, mock_fallback_runner]
- ):
- results = await self._collect_stream(agent, "coffee")
+ agent._extractor_runners["0.9"] = mock_runner
+ agent._fallback_text_runner = mock_fallback_runner
+
+ results = await self._collect_stream(agent, "coffee")
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -899,12 +930,10 @@ async def test_agent_fallback_mode_text_on_extractor_failure(
])
agent = self._setup_agent(fallback_mode="TEXT")
- with mock.patch.object(
- agent,
- "_build_runner",
- side_effect=[mock_extractor_runner, mock_fallback_runner],
- ):
- results = await self._collect_stream(agent, "sushi Seattle")
+ agent._extractor_runners["0.9"] = mock_extractor_runner
+ agent._fallback_text_runner = mock_fallback_runner
+
+ results = await self._collect_stream(agent, "sushi Seattle")
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -936,15 +965,13 @@ async def test_agent_fallback_mode_dynamic_on_extractor_failure(
])
agent = self._setup_agent(fallback_mode="DYNAMIC")
- with mock.patch.object(
- agent,
- "_build_runner",
- side_effect=[mock_extractor_runner, mock_fallback_runner],
- ):
- with mock.patch(
- "agent.MAUIAgent.stream",
- ) as mock_super_stream:
- results = await self._collect_stream(agent, "sushi Seattle")
+ agent._extractor_runners["0.9"] = mock_extractor_runner
+ agent._fallback_text_runner = mock_fallback_runner
+
+ with mock.patch(
+ "agent.MAUIAgent.stream",
+ ) as mock_super_stream:
+ results = await self._collect_stream(agent, "sushi Seattle")
mock_super_stream.assert_not_called()
self.assertEqual(len(results), 1)
@@ -974,8 +1001,9 @@ async def test_agent_other_spatial_fallback_mode_text(
)
])
agent = self._setup_agent(fallback_mode="TEXT")
- with mock.patch.object(agent, "_build_runner", return_value=mock_runner):
- results = await self._collect_stream(agent, "weather Yosemite")
+ agent._fallback_text_runner = mock_runner
+
+ results = await self._collect_stream(agent, "weather Yosemite")
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -1046,9 +1074,10 @@ async def test_extractor_duplication_prevented(self, mock_lite_llm_class):
template_model="gemini/template-model",
)
agent = MAUIAgentWithTemplates(base_url="http://test-url", config=config)
+ agent._extractor_runners["0.9"] = mock_runner
+ agent._fallback_text_runner = mock_runner
- with mock.patch.object(agent, "_build_runner", return_value=mock_runner):
- results = await self._collect_stream(agent, "sushi")
+ results = await self._collect_stream(agent, "sushi")
self.assertEqual(len(results), 1)
self.assertTrue(results[0]["is_task_complete"])
@@ -1056,51 +1085,200 @@ async def test_extractor_duplication_prevented(self, mock_lite_llm_class):
text_comp = self._get_component_by_id(parts, "text-content")
self.assertEqual(text_comp["text"], "I'm sorry")
+ def test_persistent_extractor_runner_initialized_at_startup(self):
+ """Verifies persistent extractor agents and runners are pre-built during __init__."""
+ agent = MAUIAgentWithTemplates(base_url="http://test-url")
+ self.assertIn("0.9", agent._extractor_agents)
+ self.assertIn("0.9", agent._extractor_runners)
+ self.assertNotIn("v0.9", agent._extractor_agents)
+ self.assertNotIn("v0.9", agent._extractor_runners)
+ self.assertIsNotNone(agent._grounded_text_agent)
+ self.assertIsNotNone(agent._grounded_text_runner)
+ self.assertIsNotNone(agent._fallback_text_agent)
+ self.assertIsNotNone(agent._fallback_text_runner)
+
+ # Check tools in unified extractor
+ unified_agent = agent._extractor_agents["0.9"]
+ tool_names = [getattr(t, "name", str(t)) for t in unified_agent.tools]
+ self.assertIn("render_local_search_template", tool_names)
+ self.assertIn("render_directions_template", tool_names)
+ self.assertIn("render_text_only_template", tool_names)
+
+ @mock.patch(_LITELLM_PATH)
+ async def test_persistent_extractor_runner_reused_across_queries(
+ self, mock_lite_llm_class
+ ):
+ """Verifies that the same persistent runner instance is reused across multiple queries."""
+ self._setup_mock_llm(mock_lite_llm_class)
+
+ self.mock_router.generate_content_async.return_value = (
+ self._mock_llm_stream('{"intent": "TEXT_ONLY", "query": "test"}')
+ )
+ mock_runner = mock.MagicMock()
+ mock_runner.run_async.return_value = MockAsyncIterator(
+ [MockEvent(content=MockContent([MockPart("Answer")]))]
+ )
+
+ agent = MAUIAgentWithTemplates(base_url="http://test-url")
+ agent._grounded_text_runner = mock_runner
+
+ # Query 1
+ await self._collect_stream(agent, "test 1", session_id="sess_1")
+ # Query 2
+ self.mock_router.generate_content_async.return_value = (
+ self._mock_llm_stream('{"intent": "TEXT_ONLY", "query": "test"}')
+ )
+ mock_runner.run_async.return_value = MockAsyncIterator(
+ [MockEvent(content=MockContent([MockPart("Answer")]))]
+ )
+ await self._collect_stream(agent, "test 2", session_id="sess_2")
+
+ self.assertEqual(mock_runner.run_async.call_count, 2)
+ # Check that session_id was passed distinctly
+ call1_kwargs = mock_runner.run_async.call_args_list[0].kwargs
+ call2_kwargs = mock_runner.run_async.call_args_list[1].kwargs
+ self.assertEqual(call1_kwargs["session_id"], "sess_1")
+ self.assertEqual(call2_kwargs["session_id"], "sess_2")
+
def test_build_runner_sets_auto_create_session(self):
agent = MAUIAgentWithTemplates(base_url="http://test-url")
mock_agent = mock.MagicMock(spec=LlmAgent)
runner = agent._build_runner(mock_agent) # pylint: disable=protected-access
self.assertTrue(runner.auto_create_session)
- def test_build_dynamic_extractor_agent_appends_shared_guidelines(self):
+ def test_build_unified_extractor_agent_appends_shared_guidelines(self):
"""Verifies that shared guidelines are appended to skill instructions."""
agent = MAUIAgentWithTemplates(base_url="http://test-url")
with mock.patch(
"builtins.open", mock.mock_open(read_data="Shared guidelines content")
) as mock_file:
- with mock.patch(
- "google.adk.skills.load_skill_from_dir"
- ) as mock_load_skill:
- mock_skill = mock.MagicMock()
- mock_skill.instructions = "Base skill instructions"
- mock_load_skill.return_value = mock_skill
-
- extractor_agent = agent._build_dynamic_extractor_agent( # pylint: disable=protected-access
- "local-search-template-response"
- )
- self.assertIn("Shared guidelines content", extractor_agent.instruction)
- self.assertIn("Base skill instructions", extractor_agent.instruction)
- mock_file.assert_called_once()
+ extractor_agent = (
+ agent._build_unified_extractor_agent() # pylint: disable=protected-access
+ )
+ self.assertIn("Shared guidelines content", extractor_agent.instruction)
+ self.assertIn("Directions Guidelines", extractor_agent.instruction)
+ mock_file.assert_called_once()
- def test_build_dynamic_extractor_agent_handles_file_read_error(self):
+ def test_build_unified_extractor_agent_handles_file_read_error(self):
"""Verifies that file read errors are handled gracefully when loading guidelines."""
agent = MAUIAgentWithTemplates(base_url="http://test-url")
with mock.patch("builtins.open", side_effect=OSError("Read error")):
- with mock.patch(
- "google.adk.skills.load_skill_from_dir"
- ) as mock_load_skill:
- mock_skill = mock.MagicMock()
- mock_skill.instructions = "Base skill instructions"
- mock_load_skill.return_value = mock_skill
-
- # Check that it handles OSError gracefully and proceeds
- extractor_agent = agent._build_dynamic_extractor_agent( # pylint: disable=protected-access
- "local-search-template-response"
- )
- self.assertNotIn(
- "Shared guidelines content", extractor_agent.instruction
- )
- self.assertIn("Base skill instructions", extractor_agent.instruction)
+ # Check that it handles OSError gracefully and proceeds
+ extractor_agent = (
+ agent._build_unified_extractor_agent() # pylint: disable=protected-access
+ )
+ self.assertIsNotNone(extractor_agent)
+
+ def test_build_unified_extractor_agent_directions_loads_skill_instructions(
+ self,
+ ):
+ """Verifies that directions skill instructions from disk are loaded into the extractor agent."""
+ agent = MAUIAgentWithTemplates(base_url="http://test-url")
+ extractor_agent = (
+ agent._build_unified_extractor_agent() # pylint: disable=protected-access
+ )
+ self.assertIn("less than a minute", extractor_agent.instruction)
+ self.assertIn(
+ "Always round seconds to the nearest minute",
+ extractor_agent.instruction,
+ )
+ tool_names = [t.name for t in extractor_agent.tools if hasattr(t, "name")]
+ self.assertIn("render_directions_template", tool_names)
+
+ def test_build_unified_extractor_instruction_target_intent_rules(self):
+ """Verifies that unified instruction defines explicit target intent rules."""
+ maui_agent = MAUIAgentWithTemplates(base_url="http://test-url")
+ # pylint: disable=protected-access
+ instruction = maui_agent._build_unified_extractor_instruction()
+ # pylint: enable=protected-access
+ expected_workflow_rules = (
+ "## Execution and Tool Usage Rules\n"
+ "1. Follow the previous rules for gathering the necessary information"
+ " using Google Maps tools.\n"
+ "2. When the prompt begins with `[TARGET_INTENT: ]`, you"
+ " MUST strictly invoke the corresponding template rendering tool as"
+ " your final step:\n"
+ " - `[TARGET_INTENT: DIRECTIONS]`: Invoke"
+ " `render_directions_template`. Do NOT invoke any other template"
+ " rendering tool.\n"
+ " - `[TARGET_INTENT: LOCAL_SEARCH]`: Invoke"
+ " `render_local_search_template`. Do NOT invoke any other template"
+ " rendering tool.\n"
+ "3. Your final action MUST be this template rendering tool call. Do"
+ " NOT emit raw JSON or `` blocks in your text response."
+ )
+ self.assertIn(expected_workflow_rules, instruction)
+
+ def test_build_unified_extractor_agent_bypasses_schema_instructions(self):
+ """Verifies schema instructions are bypassed and tools receive schema_manager."""
+ maui_agent = MAUIAgentWithTemplates(base_url="http://test-url")
+ mock_schema_manager = mock.MagicMock(
+ spec=agent_with_templates.A2uiSchemaManager
+ )
+ mock_schema_manager.generate_system_prompt.return_value = (
+ "Each A2UI JSON block MUST be wrapped in and "
+ " tags."
+ )
+ # pylint: disable=protected-access
+ extractor_agent = maui_agent._build_unified_extractor_agent(
+ schema_manager=mock_schema_manager
+ )
+ expected_instruction = maui_agent._build_unified_extractor_instruction()
+ # pylint: enable=protected-access
+ mock_schema_manager.generate_system_prompt.assert_not_called()
+ self.assertNotIn(
+ "Each A2UI JSON block MUST be wrapped",
+ extractor_agent.instruction,
+ )
+ self.assertEqual(
+ extractor_agent.instruction,
+ expected_instruction,
+ )
+ template_tools = [
+ tool
+ for tool in extractor_agent.tools
+ if isinstance(tool, agent_with_templates.BaseTemplateTool)
+ ]
+ self.assertTrue(template_tools)
+ for tool in template_tools:
+ self.assertEqual(tool.schema_manager, mock_schema_manager)
+
+ def test_template_registry_definitions(self):
+ """Verifies that template_registry entries are consistent and valid."""
+ agent = MAUIAgentWithTemplates(base_url="http://test-url")
+ self.assertIn("LOCAL_SEARCH", agent.template_registry.supported_intents)
+ self.assertIn("DIRECTIONS", agent.template_registry.supported_intents)
+ self.assertEqual(
+ agent_with_templates._SUPPORTED_INTENTS, # pylint: disable=protected-access
+ set(agent_with_templates._INTENT_TOOL_CLASSES.keys()), # pylint: disable=protected-access
+ )
+ for intent, tool_class in agent_with_templates._INTENT_TOOL_CLASSES.items(): # pylint: disable=protected-access
+ bundle = agent.template_registry.get_bundle_by_intent(intent)
+ self.assertIsNotNone(bundle)
+ self.assertTrue(bundle.name)
+ self.assertTrue(bundle.surface_prefix)
+ self.assertTrue(
+ issubclass(tool_class, agent_with_templates.BaseTemplateTool)
+ )
+ self.assertTrue(tool_class.name)
+ self.assertIn(
+ tool_class.name,
+ agent_with_templates._TEMPLATE_TOOL_NAMES, # pylint: disable=protected-access
+ )
+ self.assertTrue(
+ bundle.skill_dir.is_dir(),
+ f"Skill directory {bundle.skill_dir} does not exist",
+ )
+
+ def test_normalize_version(self):
+ """Verifies version strings collapse to the unprefixed schema key."""
+ normalize = agent_with_templates._normalize_version # pylint: disable=protected-access
+ self.assertEqual(normalize("0.9"), "0.9")
+ self.assertEqual(normalize("v0.9"), "0.9")
+ self.assertEqual(normalize("v0.9.1"), "0.9.1")
+ self.assertEqual(normalize(None), agent_with_templates.VERSION_0_9)
+ self.assertEqual(normalize(""), agent_with_templates.VERSION_0_9)
+
if __name__ == "__main__":
unittest.main()
diff --git a/agent/python_agent/test_merger.py b/agent/python_agent/test_merger.py
index f5e4f01..ef86425 100644
--- a/agent/python_agent/test_merger.py
+++ b/agent/python_agent/test_merger.py
@@ -14,9 +14,16 @@
"""Tests for A2UI Layout Template Merger (`merger.py`)."""
+import importlib
+import importlib.resources
+import os
import pathlib
import re
+import shutil
+import sys
+import tempfile
import unittest
+import zipfile
import a2ui
import agent
@@ -58,6 +65,79 @@ def test_merge_unknown_template_raises_error(self):
with self.assertRaises(FileNotFoundError):
merge_template("non_existent_template", {"text": "hello"})
+ def test_merge_defaults_to_maps_catalog_id(self):
+ """Verifies the surface binds to the Maps catalog when none is named."""
+ result = merge_template("text_only", {"text": "hello"})
+ self.assertEqual(
+ result[0]["createSurface"]["catalogId"],
+ "a2ui://maps-agentic-ui-catalog.json",
+ )
+ self.assertEqual(
+ result[0]["createSurface"]["catalogId"], merger.DEFAULT_CATALOG_ID
+ )
+
+ def test_merge_honors_custom_catalog_id(self):
+ """Verifies a host-supplied catalog id reaches every template's surface."""
+ host_catalog = "https://example.test/host_catalog.json"
+ local_search_data = {
+ "surface_id": "test-surface",
+ "summary": "Two places.",
+ "center_lat": 37.0,
+ "center_lng": -122.0,
+ "zoom": 12,
+ "places": [{"name": "A", "lat": 37.0, "lng": -122.0}],
+ }
+ directions_data = {
+ "surface_id": "test-surface",
+ "summary": "A route.",
+ "center_lat": 37.0,
+ "center_lng": -122.0,
+ "zoom": 12,
+ "routes": [{
+ "origin": {"lat": 37.0, "lng": -122.0, "label": "A"},
+ "destination": {"lat": 37.1, "lng": -122.1, "label": "B"},
+ }],
+ }
+ for template_name, data in (
+ ("text_only", {"text": "hello"}),
+ ("local_search", local_search_data),
+ ("directions", directions_data),
+ ):
+ with self.subTest(template=template_name):
+ result = merge_template(template_name, data, catalog_id=host_catalog)
+ self.assertEqual(result[0]["createSurface"]["catalogId"], host_catalog)
+
+ def test_text_only_fallback_keeps_custom_catalog_id(self):
+ """Verifies the catalog id survives the bail-out to `text_only`.
+
+ The prepare helpers discard the caller's dict and build a fresh one when
+ they fall back, so a catalog id applied before that point would be lost.
+ Losing it is silent: the placeholder resolves to None and the key is
+ stripped, leaving a surface bound to no catalog at all.
+ """
+ host_catalog = "https://example.test/host_catalog.json"
+ invalid_local_search = {
+ "surface_id": "test-surface",
+ "summary": "Short response.",
+ "center_lat": 37.0,
+ "center_lng": 127.0,
+ "zoom": 10,
+ "places": "NOT_A_LIST",
+ }
+ invalid_directions = {
+ "surface_id": "test-surface",
+ "summary": "Cannot compute directions.",
+ }
+ for template_name, data in (
+ ("local_search", invalid_local_search),
+ ("directions", invalid_directions),
+ ):
+ with self.subTest(template=template_name):
+ result = merge_template(template_name, data, catalog_id=host_catalog)
+ create_surface = result[0]["createSurface"]
+ self.assertIn("catalogId", create_surface)
+ self.assertEqual(create_surface["catalogId"], host_catalog)
+
def test_merge_text_only_full_json(self):
"""Verifies that text-only response is merged correctly."""
data = {
@@ -143,6 +223,7 @@ def test_merge_local_search_full_json(self):
"""Verifies merging a complete local search payload."""
data = {
"surface_id": "local-search-surface-abc",
+ "heading": "Top Coffee Shops in Seattle",
"summary": "Here are 3 highly-rated coffee shops in Seattle.",
"center_lat": "47.6062",
"center_lng": -122.3321,
@@ -185,7 +266,18 @@ def test_merge_local_search_full_json(self):
{
"id": "root",
"component": "Column",
- "children": ["summary-text", "map", "list"],
+ "children": [
+ "heading-text",
+ "summary-text",
+ "map",
+ "list",
+ ],
+ },
+ {
+ "id": "heading-text",
+ "component": "Text",
+ "variant": "body",
+ "text": "### Top Coffee Shops in Seattle",
},
{
"id": "summary-text",
@@ -200,6 +292,8 @@ def test_merge_local_search_full_json(self):
"component": "GoogleMap",
"center": {"lat": 47.6062, "lng": -122.3321},
"zoom": 14,
+ "tilt": 0,
+ "mode": "roadmap",
"markers": [
{
"lat": 47.62,
@@ -308,7 +402,7 @@ def test_merge_max_list_size_slicing(self):
result = merge_template("local_search", data, max_list_size=2)
# Check that updateComponents has only 2 markers
components = result[1]["updateComponents"]["components"]
- map_comp = next(c for c in components if c["id"] == "map")
+ map_comp = next(comp for comp in components if comp["id"] == "map")
self.assertEqual(len(map_comp["markers"]), 2)
# Check that updateDataModel has only 2 places
@@ -317,10 +411,57 @@ def test_merge_max_list_size_slicing(self):
self.assertEqual(places[0]["placeId"], "1")
self.assertEqual(places[1]["placeId"], "2")
+ def test_merge_local_search_heading_normalization(self):
+ """Verifies that heading is cleaned of markdown headers or synthesized from anchor."""
+ # Case 1: Heading with leading markdown hashtags
+ data_with_hash = {
+ "surface_id": "test-surface",
+ "heading": "### Best Bakeries",
+ "summary": "Here are bakeries.",
+ "center_lat": 47.6,
+ "center_lng": -122.3,
+ "zoom": 13,
+ "places": [{"placeId": "p1", "name": "B1", "lat": 47.6, "lng": -122.3}],
+ }
+ result = merge_template("local_search", data_with_hash)
+ comps = result[1]["updateComponents"]["components"]
+ heading_comp = next(comp for comp in comps if comp["id"] == "heading-text")
+ self.assertEqual(heading_comp["text"], "### Best Bakeries")
+
+ # Case 2: Missing heading with anchor marker
+ data_with_anchor = {
+ "surface_id": "test-surface",
+ "summary": "Here are bakeries.",
+ "center_lat": 47.6,
+ "center_lng": -122.3,
+ "zoom": 13,
+ "anchor_marker": {"lat": 47.6, "lng": -122.3, "label": "Space Needle"},
+ "places": [{"placeId": "p1", "name": "B1", "lat": 47.6, "lng": -122.3}],
+ }
+ result = merge_template("local_search", data_with_anchor)
+ comps = result[1]["updateComponents"]["components"]
+ heading_comp = next(comp for comp in comps if comp["id"] == "heading-text")
+ self.assertEqual(heading_comp["text"], "### Places near Space Needle")
+
+ # Case 3: Missing heading and no anchor
+ data_no_heading = {
+ "surface_id": "test-surface",
+ "summary": "Here are bakeries.",
+ "center_lat": 47.6,
+ "center_lng": -122.3,
+ "zoom": 13,
+ "places": [{"placeId": "p1", "name": "B1", "lat": 47.6, "lng": -122.3}],
+ }
+ result = merge_template("local_search", data_no_heading)
+ comps = result[1]["updateComponents"]["components"]
+ heading_comp = next(comp for comp in comps if comp["id"] == "heading-text")
+ self.assertEqual(heading_comp["text"], "### Nearby Places")
+
def test_merge_directions_full_json(self):
"""Verifies complete end-to-end directions template merging, placeholder replacement, and travel mode normalization."""
data = {
"surface_id": "directions-surface-xyz",
+ "heading": "Walking Route from Dobong to Gangnam",
"summary": "Typical commute is 1h 15m.",
"center_lat": "37.5665",
"center_lng": 126.9780,
@@ -352,13 +493,13 @@ def test_merge_directions_full_json(self):
{
"id": "root",
"component": "Column",
- "children": ["summary-text", "map"],
+ "children": ["heading-text", "map", "summary-text"],
},
{
- "id": "summary-text",
+ "id": "heading-text",
"component": "Text",
"variant": "body",
- "text": "Typical commute is 1h 15m.",
+ "text": "### Walking Route from Dobong to Gangnam",
},
{
"id": "map",
@@ -379,6 +520,12 @@ def test_merge_directions_full_json(self):
}],
"travelMode": "walking",
},
+ {
+ "id": "summary-text",
+ "component": "Text",
+ "variant": "body",
+ "text": "Typical commute is 1h 15m.",
+ },
],
},
},
@@ -395,6 +542,50 @@ def test_merge_directions_full_json(self):
result = merge_template("directions", data, max_list_size=3)
self.assertEqual(result, expected)
+ def test_merge_directions_heading_fallback(self):
+ """Verifies that missing heading is synthesized from route endpoints."""
+ # Case 1: Heading with leading markdown hashtags
+ data_with_hash = {
+ "surface_id": "test-surface",
+ "heading": "### Driving Route",
+ "summary": "About 15 minutes.",
+ "center_lat": 37.5,
+ "center_lng": 127.0,
+ "zoom": 12,
+ "routes": [{
+ "origin": {"lat": 37.5, "lng": 127.0, "label": "Origin"},
+ "destination": {"lat": 37.6, "lng": 127.1, "label": "Dest"},
+ }],
+ }
+ result = merge_template("directions", data_with_hash)
+ comps = result[1]["updateComponents"]["components"]
+ heading_comp = next(c for c in comps if c["id"] == "heading-text")
+ self.assertEqual(heading_comp["text"], "### Driving Route")
+
+ # Case 2: Missing heading with origin and destination labels
+ data_missing = {
+ "surface_id": "test-surface",
+ "summary": "About 15 minutes.",
+ "center_lat": 37.5,
+ "center_lng": 127.0,
+ "zoom": 12,
+ "routes": [{
+ "origin": {"lat": 37.5, "lng": 127.0, "label": "Seattle Center"},
+ "destination": {
+ "lat": 37.6,
+ "lng": 127.1,
+ "label": "Pike Place Market",
+ },
+ }],
+ }
+ result = merge_template("directions", data_missing)
+ comps = result[1]["updateComponents"]["components"]
+ heading_comp = next(c for c in comps if c["id"] == "heading-text")
+ self.assertEqual(
+ heading_comp["text"],
+ "### Route from Seattle Center to Pike Place Market",
+ )
+
def test_validate_directions_output_with_schema(self):
"""Verifies merged directions output passes schema validation."""
data = {
@@ -584,7 +775,7 @@ def test_missing_optional_placeholders_are_stripped(self):
result = merge_template("local_search", data, max_list_size=3)
update_components = result[1]["updateComponents"]
map_comp = next(
- c for c in update_components["components"] if c["id"] == "map"
+ comp for comp in update_components["components"] if comp["id"] == "map"
)
# Verify anchorMarker key is NOT in map component (cleanly stripped)
self.assertNotIn("anchorMarker", map_comp)
@@ -612,7 +803,7 @@ def test_markers_explicitly_provided_and_sanitized(self):
result = merge_template("local_search", data, max_list_size=3)
update_components = result[1]["updateComponents"]
map_comp = next(
- c for c in update_components["components"] if c["id"] == "map"
+ comp for comp in update_components["components"] if comp["id"] == "map"
)
expected_markers = [
{"lat": 47.63, "lng": -122.33, "label": "Custom 1"},
@@ -705,5 +896,129 @@ def test_merge_directions_malformed_routes_fallback(self):
)
+class TestMergerZipImportedPackage(unittest.TestCase):
+ """Covers template loading when the agent is served from a zip archive.
+
+ The agent also ships as a zipped archive that Python imports without ever
+ unpacking it to disk. In that mode `__file__` names an entry inside the
+ archive, so resolving templates by filesystem path makes every merge fail at
+ serving time while a suite run from an ordinary source tree keeps passing.
+ These tests exercise the archive explicitly so that gap cannot reopen.
+ """
+
+ _PACKAGE = "a2ui_zipped_merger_probe"
+
+ def _pack_merger_into_zip(self) -> str:
+ """Copies `merger` and its templates into a zip and returns its path."""
+ source = importlib.resources.files(merger.__package__)
+ temp_dir = tempfile.mkdtemp()
+ self.addCleanup(shutil.rmtree, temp_dir, ignore_errors=True)
+ archive_path = os.path.join(temp_dir, "merger_probe.zip")
+ with zipfile.ZipFile(archive_path, "w") as archive:
+ archive.writestr(f"{self._PACKAGE}/__init__.py", "")
+ archive.writestr(
+ f"{self._PACKAGE}/merger.py",
+ source.joinpath("merger.py").read_text(encoding="utf-8"),
+ )
+ for entry in source.joinpath("templates").iterdir():
+ layout = entry.joinpath("layout.json")
+ if not layout.is_file():
+ continue
+ archive.writestr(
+ f"{self._PACKAGE}/templates/{entry.name}/layout.json",
+ layout.read_text(encoding="utf-8"),
+ )
+ return archive_path
+
+ def _import_merger_from_zip(self):
+ """Imports the packed `merger`, whose templates exist only in the zip."""
+ archive_path = self._pack_merger_into_zip()
+ sys.path.insert(0, archive_path)
+ self.addCleanup(sys.path.remove, archive_path)
+ for name in (f"{self._PACKAGE}.merger", self._PACKAGE):
+ self.addCleanup(sys.modules.pop, name, None)
+ importlib.invalidate_caches()
+ return importlib.import_module(f"{self._PACKAGE}.merger")
+
+ def test_probe_templates_are_reachable_only_inside_the_archive(self):
+ """Asserts the probe exercises the archive rather than a copy on disk.
+
+ Without this the remaining tests could pass against an unpacked directory
+ and prove nothing, because that is the mode that never broke.
+ """
+ zipped_merger = self._import_merger_from_zip()
+
+ on_disk_templates = os.path.join(
+ os.path.dirname(os.path.abspath(zipped_merger.__file__)), "templates"
+ )
+
+ self.assertNotEqual(zipped_merger.__file__, merger.__file__)
+ self.assertFalse(os.path.exists(on_disk_templates))
+
+ def test_merges_every_shipped_template_from_the_archive(self):
+ """Verifies each template resolves as package data inside the archive."""
+ zipped_merger = self._import_merger_from_zip()
+ cases = {
+ "text_only": {"text": "hello"},
+ "local_search": {
+ "summary": "Coffee near the market.",
+ "center_lat": 47.6097,
+ "center_lng": -122.3422,
+ "zoom": 14,
+ "places": [
+ {"name": "Storyville", "lat": 47.6092, "lng": -122.3418}
+ ],
+ },
+ "directions": {
+ "summary": "About 50 minutes via US-101 S.",
+ "center_lat": 37.55,
+ "center_lng": -122.15,
+ "zoom": 10,
+ "travel_mode": "driving",
+ "routes": [{
+ "origin": {"lat": 37.7749, "lng": -122.4194, "label": "SF"},
+ "destination": {
+ "lat": 37.3382,
+ "lng": -121.8863,
+ "label": "SJ",
+ },
+ }],
+ },
+ }
+
+ for template_name, data in cases.items():
+ with self.subTest(template=template_name):
+ result = zipped_merger.merge_template(template_name, data)
+
+ self.assertTrue(result)
+ self.assertEqual(
+ result[0]["createSurface"]["catalogId"], merger.DEFAULT_CATALOG_ID
+ )
+
+ def test_unknown_template_still_raises_from_the_archive(self):
+ """A missing template must stay distinguishable from an unreadable one."""
+ zipped_merger = self._import_merger_from_zip()
+
+ with self.assertRaises(FileNotFoundError):
+ zipped_merger.merge_template("non_existent_template", {"text": "hello"})
+
+ def test_default_surface_id_is_uniquified_from_the_archive(self):
+ """Covers the template scan that decides whether a surface ID is generic.
+
+ The scan sat behind a filesystem probe that reported an empty directory
+ inside an archive instead of failing, so default surface IDs quietly
+ stopped being made unique per turn and no log line recorded it.
+ """
+ zipped_merger = self._import_merger_from_zip()
+
+ result = zipped_merger.merge_template(
+ "text_only", {"text": "hello", "surface_id": "text_only_surface"}
+ )
+
+ surface_id = result[0]["createSurface"]["surfaceId"]
+ self.assertNotEqual(surface_id, "text_only_surface")
+ self.assertTrue(surface_id.startswith("text_only_surface_"))
+
+
if __name__ == "__main__":
unittest.main()
diff --git a/agent/python_agent/test_place_id_resolution.py b/agent/python_agent/test_place_id_resolution.py
new file mode 100644
index 0000000..1064182
--- /dev/null
+++ b/agent/python_agent/test_place_id_resolution.py
@@ -0,0 +1,383 @@
+# 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
+#
+# https://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.
+
+"""Unit tests for Place ID placeholder substitution."""
+
+import unittest
+from unittest import mock
+
+import place_id_resolution
+
+
+def _create_mock_response(
+ chunks: list[tuple[str, str, str]] | None = None,
+) -> mock.MagicMock:
+ """Builds a mock genai response carrying Maps attribution sources.
+
+ The shape mirrors production: every Maps source arrives with a non-empty
+ `place_id`, which is what makes placeholder substitution viable at all.
+
+ Args:
+ chunks: List of (title, place_id) tuples.
+
+ Returns:
+ Mock response matching the Google GenAI SDK candidate structure.
+ """
+ mock_chunks = []
+ for title, place_id in chunks or []:
+ mock_chunk = mock.MagicMock()
+ mock_chunk.maps.title = title
+ mock_chunk.maps.place_id = place_id
+ mock_chunks.append(mock_chunk)
+
+ mock_meta = mock.MagicMock()
+ mock_meta.grounding_chunks = mock_chunks
+ mock_candidate = mock.MagicMock()
+ mock_candidate.grounding_metadata = mock_meta
+ mock_response = mock.MagicMock()
+ mock_response.candidates = [mock_candidate]
+ return mock_response
+
+
+def _chunk(title: str, place_id: str) -> place_id_resolution.AttributionSource:
+ """Shorthand for constructing an attribution source."""
+ return place_id_resolution.AttributionSource(title=title, place_id=place_id)
+
+
+class NormalizePlaceIdTest(unittest.TestCase):
+
+ def test_strips_places_resource_prefix(self):
+ self.assertEqual(
+ place_id_resolution.normalize_place_id(
+ "places/ChIJN1t_tDeuEmsRUsoyG83frY4"
+ ),
+ "ChIJN1t_tDeuEmsRUsoyG83frY4",
+ )
+
+ def test_leaves_bare_id_untouched(self):
+ self.assertEqual(
+ place_id_resolution.normalize_place_id("ChIJN1t_tDeuEmsRUsoyG83frY4"),
+ "ChIJN1t_tDeuEmsRUsoyG83frY4",
+ )
+
+ def test_leaves_prefixed_id_untouched_when_it_is_not_a_chi_id(self):
+ # Pins shipped behavior. The prefix check demands "places/ChI", so an ID
+ # from any other family keeps its resource prefix.
+ self.assertEqual(
+ place_id_resolution.normalize_place_id("places/GhIJabc"),
+ "places/GhIJabc",
+ )
+
+
+class CanonicalPlaceTitleTest(unittest.TestCase):
+
+ def test_strips_google_maps_branding_suffix(self):
+ self.assertEqual(
+ place_id_resolution.canonical_place_title("Chez Panisse - Google Maps"),
+ "Chez Panisse",
+ )
+
+ def test_leaves_branding_suffix_written_with_an_en_dash(self):
+ # Pins shipped behavior. Only the hyphen form is recognized.
+ self.assertEqual(
+ place_id_resolution.canonical_place_title(
+ "Chez Panisse \u2013 Google Maps"
+ ),
+ "Chez Panisse \u2013 Google Maps",
+ )
+
+ def test_preserves_original_casing(self):
+ # The prompt tells the model to copy the title character for character, so
+ # lowercasing here would make every substitution key miss.
+ self.assertEqual(
+ place_id_resolution.canonical_place_title("Starbucks Coffee Company"),
+ "Starbucks Coffee Company",
+ )
+
+ def test_leaves_review_prefix_in_place(self):
+ # Pins shipped behavior. Grounding emits user reviews as their own sources,
+ # and they canonicalize to a title distinct from the venue's.
+ self.assertEqual(
+ place_id_resolution.canonical_place_title(
+ "Review of Joe's Pizza - Google Maps"
+ ),
+ "Review of Joe's Pizza",
+ )
+
+ def test_leaves_unbranded_title_untouched(self):
+ self.assertEqual(
+ place_id_resolution.canonical_place_title("Joe's Pizza"), "Joe's Pizza"
+ )
+
+
+class ExtractAttributionSourcesTest(unittest.TestCase):
+
+ def test_extracts_title_and_place_id_in_arrival_order(self):
+ response = _create_mock_response([
+ ("Joe's Pizza - Google Maps", "places/ChIJ_joe"),
+ ("Prince St. Pizza - Google Maps", "places/ChIJ_prince"),
+ ])
+
+ chunks = place_id_resolution.extract_attribution_sources(response)
+
+ self.assertEqual(
+ chunks,
+ [
+ _chunk("Joe's Pizza - Google Maps", "places/ChIJ_joe"),
+ _chunk("Prince St. Pizza - Google Maps", "places/ChIJ_prince"),
+ ],
+ )
+
+ def test_returns_empty_when_response_has_no_candidates(self):
+ response = mock.MagicMock()
+ response.candidates = []
+ self.assertEqual(
+ place_id_resolution.extract_attribution_sources(response), []
+ )
+
+ def test_returns_empty_when_grounding_metadata_absent(self):
+ response = mock.MagicMock()
+ candidate = mock.MagicMock()
+ candidate.grounding_metadata = None
+ response.candidates = [candidate]
+ self.assertEqual(
+ place_id_resolution.extract_attribution_sources(response), []
+ )
+
+ def test_skips_sources_missing_a_place_id(self):
+ response = _create_mock_response([
+ ("Joe's Pizza - Google Maps", "places/ChIJ_joe"),
+ ("A Web Result", ""),
+ ])
+
+ chunks = place_id_resolution.extract_attribution_sources(response)
+
+ self.assertEqual(len(chunks), 1)
+ self.assertEqual(chunks[0].title, "Joe's Pizza - Google Maps")
+
+
+class BuildPlaceholderIndexTest(unittest.TestCase):
+
+ def test_five_same_titled_venues_get_five_distinct_ids(self):
+ chunks = [
+ _chunk("Starbucks - Google Maps", f"places/ChIJ_sbux_{i}")
+ for i in range(1, 6)
+ ]
+
+ placeholder_index = place_id_resolution._build_placeholder_index(chunks)
+
+ self.assertEqual(
+ placeholder_index,
+ {
+ "PLACE_ID_FOR_1_Starbucks": "ChIJ_sbux_1",
+ "PLACE_ID_FOR_2_Starbucks": "ChIJ_sbux_2",
+ "PLACE_ID_FOR_3_Starbucks": "ChIJ_sbux_3",
+ "PLACE_ID_FOR_4_Starbucks": "ChIJ_sbux_4",
+ "PLACE_ID_FOR_5_Starbucks": "ChIJ_sbux_5",
+ },
+ )
+
+ def test_review_source_lands_in_its_own_title_bucket(self):
+ # Pins shipped behavior. "Review of X" canonicalizes to a title distinct
+ # from "X", so it gets its own counter and produces a key the model never
+ # emits. Venue ordinals are only disturbed when a venue surfaces
+ # exclusively as a review source.
+ chunks = [
+ _chunk("Starbucks - Google Maps", "places/ChIJ_sbux_1"),
+ _chunk("Review of Starbucks - Google Maps", "places/ChIJ_sbux_1"),
+ _chunk("Starbucks - Google Maps", "places/ChIJ_sbux_2"),
+ ]
+
+ placeholder_index = place_id_resolution._build_placeholder_index(chunks)
+
+ self.assertEqual(
+ placeholder_index,
+ {
+ "PLACE_ID_FOR_1_Starbucks": "ChIJ_sbux_1",
+ "PLACE_ID_FOR_1_Review of Starbucks": "ChIJ_sbux_1",
+ "PLACE_ID_FOR_2_Starbucks": "ChIJ_sbux_2",
+ },
+ )
+
+ def test_distinct_titles_each_start_at_ordinal_one(self):
+ chunks = [
+ _chunk("Joe's Pizza - Google Maps", "places/ChIJ_joe"),
+ _chunk("Prince St. Pizza - Google Maps", "places/ChIJ_prince"),
+ ]
+
+ placeholder_index = place_id_resolution._build_placeholder_index(chunks)
+
+ self.assertEqual(
+ placeholder_index,
+ {
+ "PLACE_ID_FOR_1_Joe's Pizza": "ChIJ_joe",
+ "PLACE_ID_FOR_1_Prince St. Pizza": "ChIJ_prince",
+ },
+ )
+
+ def test_returns_empty_map_for_no_sources(self):
+ self.assertEqual(place_id_resolution._build_placeholder_index([]), {})
+
+
+class ResolvePlaceIdsTest(unittest.TestCase):
+
+ def test_rewrites_placeholders_with_grounded_place_ids(self):
+ text = (
+ '{"places": [{"placeId": "PLACE_ID_FOR_1_Joe\'s Pizza"},'
+ ' {"placeId": "PLACE_ID_FOR_1_Prince St. Pizza"}]}'
+ )
+ chunks = [
+ _chunk("Joe's Pizza - Google Maps", "places/ChIJ_joe"),
+ _chunk("Prince St. Pizza - Google Maps", "places/ChIJ_prince"),
+ ]
+
+ result, unresolved = place_id_resolution.resolve_place_ids(text, chunks)
+
+ self.assertEqual(
+ result,
+ '{"places": [{"placeId": "ChIJ_joe"}, {"placeId": "ChIJ_prince"}]}',
+ )
+ self.assertEqual(unresolved, 0)
+
+ def test_shorter_key_shadows_the_longer_one_sharing_its_prefix(self):
+ # Pins shipped behavior. Substitution walks the index in arrival order, so
+ # PLACE_ID_FOR_1_Joe's Pizza fires first and strands " Express" on a
+ # now-real Place ID. Observed live on "Grand Central" versus "Grand Central
+ # Terminal".
+ text = "PLACE_ID_FOR_1_Joe's Pizza Express"
+ chunks = [
+ _chunk("Joe's Pizza - Google Maps", "places/ChIJ_joe"),
+ _chunk("Joe's Pizza Express - Google Maps", "places/ChIJ_express"),
+ ]
+
+ result, unresolved = place_id_resolution.resolve_place_ids(text, chunks)
+
+ self.assertEqual(result, "ChIJ_joe Express")
+ self.assertEqual(unresolved, 0)
+
+ def test_leaves_placeholder_in_place_when_sources_run_short(self):
+ # Grounding cited fewer venues than the model named. A visible placeholder
+ # breaks the card loudly; a nearby Place ID would render a wrong venue with
+ # full confidence.
+ text = "PLACE_ID_FOR_1_Starbucks and PLACE_ID_FOR_2_Starbucks"
+ chunks = [_chunk("Starbucks - Google Maps", "places/ChIJ_sbux_1")]
+
+ with self.assertLogs(place_id_resolution.__name__, level="WARNING") as logs:
+ result, unresolved = place_id_resolution.resolve_place_ids(text, chunks)
+
+ self.assertEqual(result, "ChIJ_sbux_1 and PLACE_ID_FOR_2_Starbucks")
+ self.assertEqual(unresolved, 1)
+ self.assertIn("unresolved", logs.output[0])
+
+ def test_warns_and_passes_text_through_when_no_sources_returned(self):
+ text = "PLACE_ID_FOR_1_Starbucks"
+
+ with self.assertLogs(place_id_resolution.__name__, level="WARNING") as logs:
+ result, unresolved = place_id_resolution.resolve_place_ids(text, [])
+
+ self.assertEqual(result, text)
+ self.assertEqual(unresolved, 1)
+ self.assertIn("unresolved against 0 source(s)", logs.output[0])
+
+ def test_empty_text_is_a_no_op(self):
+ chunks = [_chunk("Starbucks - Google Maps", "places/ChIJ_sbux_1")]
+ self.assertEqual(place_id_resolution.resolve_place_ids("", chunks), ("", 0))
+
+ def test_text_without_placeholders_is_unchanged(self):
+ text = '{"places": [{"placeId": "ChIJ_already_real"}]}'
+ chunks = [_chunk("Starbucks - Google Maps", "places/ChIJ_sbux_1")]
+
+ result, unresolved = place_id_resolution.resolve_place_ids(text, chunks)
+
+ self.assertEqual(result, text)
+ self.assertEqual(unresolved, 0)
+
+ def test_resolves_global_list_numbered_placeholders_for_distinct_titles(self):
+ text = (
+ "PLACE_ID_FOR_1_Sushi Ginza Onodera, "
+ "PLACE_ID_FOR_2_Shinjuku Sushi Hatsume, "
+ "PLACE_ID_FOR_9_Sushi Dai"
+ )
+ chunks = [
+ _chunk("Sushi Ginza Onodera - Google Maps", "places/ChIJ_onodera"),
+ _chunk("Shinjuku Sushi Hatsume - Google Maps", "places/ChIJ_hatsume"),
+ _chunk("Sushi Dai - Google Maps", "places/ChIJ_sushidai"),
+ ]
+
+ result, unresolved = place_id_resolution.resolve_place_ids(text, chunks)
+
+ self.assertEqual(result, "ChIJ_onodera, ChIJ_hatsume, ChIJ_sushidai")
+ self.assertEqual(unresolved, 0)
+
+ def test_fallback_skips_duplicate_titles_when_both_misindexed(self):
+ text = (
+ "PLACE_ID_FOR_1_Tartine, "
+ "PLACE_ID_FOR_2_Boudin, "
+ "PLACE_ID_FOR_3_Starbucks, "
+ "PLACE_ID_FOR_4_Starbucks"
+ )
+ chunks = [
+ _chunk("Tartine - Google Maps", "places/ChIJ_tartine"),
+ _chunk("Boudin - Google Maps", "places/ChIJ_boudin"),
+ _chunk("Starbucks - Google Maps", "places/ChIJ_sbux_1"),
+ _chunk("Starbucks - Google Maps", "places/ChIJ_sbux_2"),
+ ]
+
+ result, unresolved = place_id_resolution.resolve_place_ids(text, chunks)
+
+ self.assertEqual(
+ result,
+ "ChIJ_tartine, ChIJ_boudin, "
+ "PLACE_ID_FOR_3_Starbucks, PLACE_ID_FOR_4_Starbucks",
+ )
+ self.assertEqual(unresolved, 2)
+
+
+class PromptContractTest(unittest.TestCase):
+
+ def test_prompt_rules_describe_the_resource_name_the_parser_strips(self):
+ # The authoritative branch tells the model to copy a `places/ChIJ...`
+ # value verbatim, and resolve_place_ids strips exactly that prefix. If the
+ # prompt were reworded to ask for a bare ID while the strip stayed, or vice
+ # versa, resource names would ship to the client. Pin the shared form.
+ self.assertIn(
+ place_id_resolution._PLACE_ID_PREFIX, # pylint: disable=protected-access
+ place_id_resolution.PROMPT_RULES,
+ )
+
+ def test_prompt_rules_describe_the_format_the_parser_builds(self):
+ # The prompt and build_placeholder_index must agree on the placeholder
+ # format. If they drift, every key misses and raw placeholders ship to
+ # the client, so pin the shared prefix and the ordinal example here.
+ self.assertIn(
+ f"{place_id_resolution.PLACEHOLDER_PREFIX}{{Count}}_{{Exact Title}}",
+ place_id_resolution.PROMPT_RULES,
+ )
+
+ built = place_id_resolution._build_placeholder_index([
+ _chunk("Chez Panisse - Google Maps", "places/ChIJ_cp_1"),
+ _chunk("Chez Panisse - Google Maps", "places/ChIJ_cp_2"),
+ ])
+
+ for example in (
+ f"{place_id_resolution.PLACEHOLDER_PREFIX}1_Chez Panisse",
+ f"{place_id_resolution.PLACEHOLDER_PREFIX}2_Chez Panisse",
+ ):
+ with self.subTest(placeholder=example):
+ self.assertIn(example, place_id_resolution.PROMPT_RULES)
+ self.assertIn(example, built)
+
+
+if __name__ == "__main__":
+ unittest.main()
diff --git a/agent/python_agent/test_router_config.py b/agent/python_agent/test_router_config.py
deleted file mode 100644
index 190bd5a..0000000
--- a/agent/python_agent/test_router_config.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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
-#
-# https://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.
-
-"""Tests for Router Configuration."""
-
-import unittest
-from router_config import IntentClass
-from router_config import ROUTER_SYSTEM_INSTRUCTION
-from router_config import RouterClassification
-
-
-class TestRouterConfig(unittest.TestCase):
- """Unit tests for Intent Router configuration schema and prompt."""
-
- def test_schema_instantiation(self):
- data = {"intent": "LOCAL_SEARCH", "query": "coffee near me"}
- classification = RouterClassification(**data)
- self.assertEqual(classification.intent, IntentClass.LOCAL_SEARCH)
- self.assertEqual(classification.query, "coffee near me")
-
- def test_schema_validation_error(self):
- data = {"intent": "INVALID_INTENT", "query": "coffee near me"}
- with self.assertRaises(ValueError):
- RouterClassification(**data)
-
- def test_instruction_not_empty(self):
- self.assertGreater(len(ROUTER_SYSTEM_INSTRUCTION), 0)
-
-
-if __name__ == "__main__":
- unittest.main()
diff --git a/agent/python_agent/test_streaming_request_handler.py b/agent/python_agent/test_streaming_request_handler.py
new file mode 100644
index 0000000..650b9e8
--- /dev/null
+++ b/agent/python_agent/test_streaming_request_handler.py
@@ -0,0 +1,45 @@
+# Copyright 2025 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
+#
+# https://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 asyncio
+import unittest
+from unittest import mock
+
+import streaming_request_handler
+
+class QueueBridgeTest(unittest.IsolatedAsyncioTestCase):
+ async def test_enqueue_event(self):
+ queue = asyncio.Queue()
+ bridge = streaming_request_handler.QueueBridge(queue)
+
+ # Test normal put
+ mock_event = mock.MagicMock()
+ await bridge.enqueue_event(mock_event)
+ self.assertEqual(await queue.get(), mock_event)
+
+ async def test_close_queue(self):
+ queue = asyncio.Queue()
+ bridge = streaming_request_handler.QueueBridge(queue)
+
+ # Test close behavior
+ await bridge.close()
+ self.assertTrue(bridge.is_closed())
+ self.assertIsNone(await queue.get())
+
+ # Test putting after close raises error
+ with self.assertRaises(RuntimeError):
+ await bridge.enqueue_event(mock.MagicMock())
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/agent/python_agent/test_template_registry.py b/agent/python_agent/test_template_registry.py
new file mode 100644
index 0000000..66defca
--- /dev/null
+++ b/agent/python_agent/test_template_registry.py
@@ -0,0 +1,379 @@
+# 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
+#
+# https://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.
+
+"""Tests for the template bundle registry."""
+
+import dataclasses
+import enum
+import pathlib
+import tempfile
+import unittest
+
+import pydantic
+
+import template_registry
+from templates.directions import schema as directions_schema
+from templates.local_search import schema as local_search_schema
+
+
+class _StubSchema(pydantic.BaseModel):
+ """Minimal schema for bundles constructed directly by a test."""
+
+ title: str
+
+
+def _make_bundle(
+ name: str = "custom_poi",
+ intent: str = "CUSTOM_POI",
+ skill_instructions: str = "",
+) -> template_registry.TemplateBundle:
+ """Builds a TemplateBundle without touching the filesystem."""
+ bundle_dir = pathlib.Path("/nonexistent") / name
+ return template_registry.TemplateBundle(
+ name=name,
+ intent=intent,
+ surface_prefix=f"{name.replace('_', '-')}-surface",
+ archetype=f"Archetype for {intent}.",
+ few_shot_examples=[{
+ "user_query": "Tell me about the Space Needle",
+ "intent": intent,
+ "query": "Space Needle Seattle",
+ }],
+ schema_cls=_StubSchema,
+ layout_path=bundle_dir / "layout.json",
+ skill_dir=bundle_dir,
+ bundle_dir=bundle_dir,
+ skill_instructions=skill_instructions,
+ )
+
+
+class SchemaResolutionTest(unittest.TestCase):
+ """Schemas resolve by import, never by executing a file."""
+
+ def test_builtin_bundles_resolve_schemas(self):
+ for bundle_name in ("local_search", "directions"):
+ with self.subTest(bundle=bundle_name):
+ schema_cls = template_registry._resolve_schema(bundle_name)
+ self.assertTrue(issubclass(schema_cls, pydantic.BaseModel))
+
+ def test_unmapped_bundle_raises_key_error(self):
+ with self.assertRaises(KeyError):
+ template_registry._resolve_schema("no_such_bundle")
+
+ def test_resolved_class_is_the_statically_imported_class(self):
+ """Guards against a second copy of each schema class in the process.
+
+ A registry that executes templates//schema.py directly defines a
+ class distinct from the one the build system compiles into the library,
+ so isinstance checks fail across the two copies.
+ """
+ registry = template_registry.TemplateRegistry()
+
+ self.assertIs(
+ registry.get_bundle("local_search").schema_cls,
+ local_search_schema.ExtractorSchema,
+ )
+ self.assertIs(
+ registry.get_bundle("directions").schema_cls,
+ directions_schema.ExtractorSchema,
+ )
+
+
+class DiscoveryTest(unittest.TestCase):
+ """Discovery of the bundles shipped in templates/."""
+
+ def setUp(self):
+ super().setUp()
+ self.registry = template_registry.TemplateRegistry()
+
+ def test_discovers_builtin_bundles(self):
+ names = {bundle.name for bundle in self.registry.list_bundles()}
+ self.assertIn("local_search", names)
+ self.assertIn("directions", names)
+
+ def test_populates_bundle_from_manifest(self):
+ bundle = self.registry.get_bundle("local_search")
+
+ self.assertEqual(bundle.intent, "LOCAL_SEARCH")
+ self.assertEqual(bundle.surface_prefix, "local-search-surface")
+ self.assertIn("points of interest", bundle.archetype)
+ self.assertEqual(len(bundle.few_shot_examples), 1)
+ self.assertEqual(
+ bundle.few_shot_examples[0]["user_query"],
+ "Find coffee shops near Central Park",
+ )
+
+ def test_bundle_assets_exist_on_disk(self):
+ for bundle in self.registry.list_bundles():
+ with self.subTest(bundle=bundle.name):
+ self.assertTrue(bundle.layout_path.exists())
+ self.assertTrue((bundle.skill_dir / "SKILL.md").exists())
+ self.assertGreater(len(bundle.skill_instructions), 0)
+ self.assertFalse(bundle.skill_instructions.startswith("---"))
+
+ def test_supported_intents(self):
+ self.assertEqual(
+ self.registry.supported_intents, {"LOCAL_SEARCH", "DIRECTIONS"}
+ )
+
+ def test_discovery_order_is_deterministic(self):
+ self.assertEqual(
+ [bundle.name for bundle in self.registry.list_bundles()],
+ ["directions", "local_search"],
+ )
+
+
+class GetBundleTest(unittest.TestCase):
+ """Lookup by name, by intent, and by enum-like key."""
+
+ def setUp(self):
+ super().setUp()
+ self.registry = template_registry.TemplateRegistry()
+
+ def test_lookup_by_name(self):
+ self.assertEqual(
+ self.registry.get_bundle("local_search").name, "local_search"
+ )
+
+ def test_lookup_by_intent(self):
+ self.assertEqual(
+ self.registry.get_bundle_by_intent("LOCAL_SEARCH").name, "local_search"
+ )
+
+ def test_lookup_by_enum_like_object(self):
+ class MockEnum:
+ value = "DIRECTIONS"
+
+ bundle = self.registry.get_bundle_by_intent(MockEnum())
+ self.assertEqual(bundle.name, "directions")
+
+ def test_unknown_key_returns_none(self):
+ self.assertIsNone(self.registry.get_bundle("NOT_A_TEMPLATE"))
+ self.assertIsNone(self.registry.get_bundle_by_intent("NOT_AN_INTENT"))
+
+
+class RegisterBundleTest(unittest.TestCase):
+ """register_bundle takes a constructed bundle and nothing else."""
+
+ def setUp(self):
+ super().setUp()
+ self.registry = template_registry.TemplateRegistry()
+
+ def test_registers_bundle_and_intent(self):
+ bundle = _make_bundle()
+ self.registry.register_bundle(bundle)
+
+ self.assertIs(self.registry.get_bundle("custom_poi"), bundle)
+ self.assertIs(self.registry.get_bundle_by_intent("CUSTOM_POI"), bundle)
+ self.assertIn("CUSTOM_POI", self.registry.supported_intents)
+
+ def test_registers_intent_with_the_router(self):
+ self.registry.register_bundle(_make_bundle(intent="ROUTER_VISIBLE_INTENT"))
+
+ classification = self.registry.router_classification(
+ intent="ROUTER_VISIBLE_INTENT", query="anything"
+ )
+ self.assertEqual(classification.intent, "ROUTER_VISIBLE_INTENT")
+ self.assertIn("ROUTER_VISIBLE_INTENT", self.registry.supported_intents)
+
+ def test_router_classification_rejects_unregistered_intent(self):
+ with self.assertRaises(pydantic.ValidationError):
+ self.registry.router_classification(
+ intent="UNREGISTERED_INTENT", query="anything"
+ )
+
+ def test_router_classification_generates_dynamic_enum_schema(self):
+ schema = self.registry.router_classification
+ self.assertTrue(issubclass(schema, template_registry.RouterClassification))
+ intent_field = schema.model_fields["intent"]
+ self.assertTrue(issubclass(intent_field.annotation, enum.Enum))
+ self.assertTrue(issubclass(intent_field.annotation, str))
+
+ classification = schema(intent="LOCAL_SEARCH", query="coffee near me")
+ self.assertEqual(classification.intent, "LOCAL_SEARCH")
+
+ with self.assertRaises(pydantic.ValidationError):
+ schema(intent="INVALID_INTENT", query="coffee near me")
+
+ def test_router_classification_is_cached(self):
+ first = self.registry.router_classification
+ second = self.registry.router_classification
+ self.assertIs(first, second)
+
+ self.registry.register_bundle(_make_bundle(intent="DYNAMIC_INTENT"))
+ third = self.registry.router_classification
+ self.assertIsNot(first, third)
+ classification = third(intent="DYNAMIC_INTENT", query="test query")
+ self.assertEqual(classification.intent, "DYNAMIC_INTENT")
+
+ def test_registered_intent_stays_out_of_other_registries(self):
+ self.registry.register_bundle(_make_bundle(intent="ROUTER_VISIBLE_INTENT"))
+ other = template_registry.TemplateRegistry()
+
+ self.assertNotIn("ROUTER_VISIBLE_INTENT", other.supported_intents)
+ self.assertIsNone(other.get_bundle_by_intent("ROUTER_VISIBLE_INTENT"))
+
+ def test_replacing_a_bundle_logs_a_warning(self):
+ self.registry.register_bundle(_make_bundle())
+ replacement = _make_bundle()
+
+ with self.assertLogs(template_registry.__name__, level="WARNING") as logs:
+ self.registry.register_bundle(replacement)
+
+ self.assertIs(self.registry.get_bundle("custom_poi"), replacement)
+ self.assertIn("already registered", "\n".join(logs.output))
+
+ def test_stealing_an_intent_drops_the_displaced_bundle(self):
+ self.registry.register_bundle(_make_bundle(name="first", intent="SHARED"))
+
+ with self.assertLogs(template_registry.__name__, level="WARNING") as logs:
+ self.registry.register_bundle(
+ _make_bundle(name="second", intent="SHARED")
+ )
+
+ self.assertEqual(
+ self.registry.get_bundle_by_intent("SHARED").name, "second"
+ )
+ self.assertIn("SHARED", "\n".join(logs.output))
+ # The displaced bundle is unroutable, so it must not linger in either
+ # index where it would still reach the router prompt.
+ self.assertIsNone(self.registry.get_bundle("first"))
+ self.assertNotIn(
+ "first", [bundle.name for bundle in self.registry.list_bundles()]
+ )
+
+ def test_renaming_an_intent_drops_the_stale_intent_key(self):
+ self.registry.register_bundle(_make_bundle(name="poi", intent="OLD"))
+
+ with self.assertLogs(template_registry.__name__, level="WARNING"):
+ self.registry.register_bundle(_make_bundle(name="poi", intent="NEW"))
+
+ self.assertIsNone(self.registry.get_bundle_by_intent("OLD"))
+ self.assertNotIn("OLD", self.registry.supported_intents)
+ self.assertIn("NEW", self.registry.supported_intents)
+
+
+class CompileRouterInstructionTest(unittest.TestCase):
+ """The router prompt is assembled from whatever is registered."""
+
+ def setUp(self):
+ super().setUp()
+ self.registry = template_registry.TemplateRegistry()
+ self.instruction = self.registry.compile_router_instruction()
+
+ def test_contains_registered_archetypes(self):
+ self.assertIn("- **LOCAL_SEARCH**", self.instruction)
+ self.assertIn("- **DIRECTIONS**", self.instruction)
+
+ def test_contains_pinned_non_template_archetypes(self):
+ self.assertIn("- **OTHER_SPATIAL**", self.instruction)
+ self.assertIn("- **TEXT_ONLY**", self.instruction)
+ self.assertIn("Conservative Routing", self.instruction)
+
+ def test_contains_bundle_few_shot_examples(self):
+ self.assertIn("Find coffee shops near Central Park", self.instruction)
+ self.assertIn(
+ "Directions from Sacramento to Mendocino via Clear Lake",
+ self.instruction,
+ )
+
+ def test_registered_bundle_reaches_the_prompt(self):
+ self.registry.register_bundle(_make_bundle())
+ instruction = self.registry.compile_router_instruction()
+
+ self.assertIn("- **CUSTOM_POI**", instruction)
+ self.assertIn("Tell me about the Space Needle", instruction)
+
+ def test_bundle_order_follows_intent_not_registration_order(self):
+ """A late registration still lands in intent order, not at the end."""
+ self.registry.register_bundle(
+ _make_bundle(name="alpha_poi", intent="ALPHA_POI")
+ )
+ instruction = self.registry.compile_router_instruction()
+
+ self.assertLess(
+ instruction.index("- **ALPHA_POI**"),
+ instruction.index("- **DIRECTIONS**"),
+ )
+ self.assertLess(
+ instruction.index("Tell me about the Space Needle"),
+ instruction.index("Directions from Sacramento to Mendocino"),
+ )
+
+ def test_matches_the_golden_prompt(self):
+ """The compiled prompt matches a checked-in copy of its own output.
+
+ The golden holds every archetype line and few-shot example that used to
+ be hardcoded in `router_config.ROUTER_SYSTEM_INSTRUCTION`, with bundle
+ entries reordered by intent. Pinning it here means a change to any
+ manifest surfaces as a reviewable diff on the prompt itself rather than
+ silently altering what the router sees.
+ """
+ golden_path = pathlib.Path(__file__).parent / "testdata"
+ golden = (golden_path / "router_instruction.golden.txt").read_text()
+
+ self.maxDiff = None
+ self.assertEqual(self.instruction, golden)
+
+
+class SkillInstructionsTest(unittest.TestCase):
+ """Tests for _read_skill_instructions and TemplateBundle.skill_instructions."""
+
+ def test_loads_and_strips_frontmatter(self):
+ with tempfile.TemporaryDirectory() as tmp_dir:
+ skill_dir = pathlib.Path(tmp_dir)
+ skill_file = skill_dir / "SKILL.md"
+ skill_file.write_text(
+ "---\nname: test_bundle\ndescription: Test\n---\n\n# Header\nBody",
+ encoding="utf-8",
+ )
+ self.assertEqual(
+ template_registry._read_skill_instructions(skill_dir),
+ "# Header\nBody",
+ )
+
+ def test_returns_content_without_frontmatter(self):
+ with tempfile.TemporaryDirectory() as tmp_dir:
+ skill_dir = pathlib.Path(tmp_dir)
+ skill_file = skill_dir / "SKILL.md"
+ skill_file.write_text(
+ "# Header\nBody without frontmatter", encoding="utf-8"
+ )
+ self.assertEqual(
+ template_registry._read_skill_instructions(skill_dir),
+ "# Header\nBody without frontmatter",
+ )
+
+ def test_missing_skill_file_returns_empty_string(self):
+ self.assertEqual(
+ template_registry._read_skill_instructions(
+ pathlib.Path("/nonexistent")
+ ),
+ "",
+ )
+ bundle = _make_bundle()
+ self.assertEqual(bundle.skill_instructions, "")
+
+ def test_built_in_bundles_have_non_empty_instructions(self):
+ registry = template_registry.TemplateRegistry()
+ local_search = registry.get_bundle("local_search")
+ self.assertIsNotNone(local_search)
+ self.assertIn("# Local Search Guidelines", local_search.skill_instructions)
+ directions = registry.get_bundle("directions")
+ self.assertIsNotNone(directions)
+ self.assertIn("# Directions Guidelines", directions.skill_instructions)
+
+
+if __name__ == "__main__":
+ unittest.main()
diff --git a/agent/python_agent/test_template_tool.py b/agent/python_agent/test_template_tool.py
new file mode 100644
index 0000000..28d470b
--- /dev/null
+++ b/agent/python_agent/test_template_tool.py
@@ -0,0 +1,344 @@
+# 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.
+
+"""Unit tests for template_tool.py ADK tools."""
+
+import pathlib
+from types import SimpleNamespace
+import unittest
+
+from a2a.types import DataPart
+from google.adk.tools.tool_context import ToolContext
+
+import a2ui
+import agent
+import template_tool
+
+BaseTemplateTool = template_tool.BaseTemplateTool
+RenderLocalSearchTemplateTool = template_tool.RenderLocalSearchTemplateTool
+RenderDirectionsTemplateTool = template_tool.RenderDirectionsTemplateTool
+RenderTextOnlyTemplateTool = template_tool.RenderTextOnlyTemplateTool
+TemplateToolset = template_tool.TemplateToolset
+STATE_RENDERED_A2UI_PARTS = template_tool.STATE_RENDERED_A2UI_PARTS
+
+
+def _create_schema_manager():
+ extension_path = (
+ pathlib.Path(__file__).parent
+ / "shared"
+ / "schema"
+ / "maps_catalog_extension.json"
+ )
+ return a2ui.schema.manager.A2uiSchemaManager(
+ version=a2ui.schema.constants.VERSION_0_9,
+ catalogs=[
+ a2ui.schema.catalog.CatalogConfig(
+ name="maps-agentic-ui-catalog",
+ provider=agent.MergedCatalogProvider(
+ a2ui.schema.constants.VERSION_0_9, str(extension_path)
+ ),
+ )
+ ],
+ schema_modifiers=[a2ui.schema.common_modifiers.remove_strict_validation],
+ )
+
+
+class MockToolContext:
+
+ def __init__(self):
+ self.state = {}
+ self.actions = SimpleNamespace()
+
+
+class TestTemplateTools(unittest.IsolatedAsyncioTestCase):
+ """Unit tests for ADK template tools."""
+
+ def setUp(self):
+ super().setUp()
+ self.schema_manager = _create_schema_manager()
+ self.tool_context = MockToolContext()
+
+ async def test_render_local_search_template_success(self):
+ tool = RenderLocalSearchTemplateTool(
+ schema_manager=self.schema_manager, max_list_size=3
+ )
+
+ args = {
+ "heading": "Nearby Places",
+ "summary": "Here are 2 coffee shops.",
+ "center_lat": 47.6062,
+ "center_lng": -122.3321,
+ "zoom": 14,
+ "places": [
+ {
+ "placeId": "ChIJ111",
+ "name": "Espresso Vivace",
+ "lat": 47.6200,
+ "lng": -122.3200,
+ },
+ {
+ "placeId": "ChIJ222",
+ "name": "Milstead & Co.",
+ "lat": 47.6400,
+ "lng": -122.3500,
+ },
+ ],
+ }
+
+ result = await tool.run_async(args=args, tool_context=self.tool_context)
+
+ self.assertEqual(result["status"], "success")
+ self.assertEqual(result["template"], "local_search")
+ self.assertIn("surface_id", result)
+
+ # Verify session state was populated with A2A parts
+ self.assertIn(STATE_RENDERED_A2UI_PARTS, self.tool_context.state)
+ parts = self.tool_context.state[STATE_RENDERED_A2UI_PARTS]
+ self.assertEqual(len(parts), 3)
+
+ create_surface_data = parts[0].root.data["createSurface"]
+ self.assertTrue(
+ create_surface_data["surfaceId"].startswith("local-search-surface-")
+ )
+
+ update_components = parts[1].root.data["updateComponents"]["components"]
+ heading_comp = next(
+ comp for comp in update_components if comp["id"] == "heading-text"
+ )
+ self.assertEqual(heading_comp["text"], "### Nearby Places")
+ map_comp = next(comp for comp in update_components if comp["id"] == "map")
+ self.assertEqual(len(map_comp["markers"]), 2)
+
+ update_data_model = parts[2].root.data["updateDataModel"]["value"]
+ self.assertEqual(len(update_data_model["places"]), 2)
+
+ async def test_render_local_search_template_with_heading(self):
+ tool = RenderLocalSearchTemplateTool(
+ schema_manager=self.schema_manager, max_list_size=3
+ )
+
+ args = {
+ "heading": "Top Coffee Shops in Seattle",
+ "summary": "Here are 2 coffee shops.",
+ "center_lat": 47.6062,
+ "center_lng": -122.3321,
+ "zoom": 14,
+ "places": [
+ {
+ "placeId": "ChIJ111",
+ "name": "Espresso Vivace",
+ "lat": 47.6200,
+ "lng": -122.3200,
+ },
+ ],
+ }
+
+ result = await tool.run_async(args=args, tool_context=self.tool_context)
+ self.assertEqual(result["status"], "success")
+
+ parts = self.tool_context.state[STATE_RENDERED_A2UI_PARTS]
+ update_components = parts[1].root.data["updateComponents"]["components"]
+ heading_comp = next(
+ comp for comp in update_components if comp["id"] == "heading-text"
+ )
+ self.assertEqual(heading_comp["text"], "### Top Coffee Shops in Seattle")
+
+ async def test_render_local_search_template_validation_failure(self):
+ tool = RenderLocalSearchTemplateTool(schema_manager=self.schema_manager)
+
+ # Missing mandatory center_lat and center_lng
+ args = {
+ "summary": "Places without center coordinates",
+ "places": [{"placeId": "1", "name": "P1", "lat": 1.0, "lng": 2.0}],
+ }
+
+ result = await tool.run_async(args=args, tool_context=self.tool_context)
+ self.assertIn("error", result)
+ self.assertIn("Validation failed for tool", result["error"])
+
+ async def test_render_local_search_template_missing_heading_validation_failure(
+ self,
+ ):
+ tool = RenderLocalSearchTemplateTool(schema_manager=self.schema_manager)
+
+ # Missing mandatory heading
+ args = {
+ "summary": "Places without heading",
+ "center_lat": 47.6062,
+ "center_lng": -122.3321,
+ "places": [{"placeId": "1", "name": "P1", "lat": 1.0, "lng": 2.0}],
+ }
+
+ result = await tool.run_async(args=args, tool_context=self.tool_context)
+ self.assertIn("error", result)
+ self.assertIn("Validation failed for tool", result["error"])
+
+ async def test_render_directions_template_success(self):
+ tool = RenderDirectionsTemplateTool(schema_manager=self.schema_manager)
+
+ args = {
+ "heading": "Driving directions from San Francisco to Oakland",
+ "summary": "Commute is 30 minutes.",
+ "center_lat": 37.7749,
+ "center_lng": -122.4194,
+ "zoom": 12,
+ "routes": [{
+ "origin": {
+ "lat": 37.7749,
+ "lng": -122.4194,
+ "label": "San Francisco",
+ "placeId": "ChIJ_SF",
+ },
+ "destination": {
+ "lat": 37.8044,
+ "lng": -122.2712,
+ "label": "Oakland",
+ "placeId": "ChIJ_OAK",
+ },
+ }],
+ "travel_mode": "driving",
+ }
+
+ result = await tool.run_async(args=args, tool_context=self.tool_context)
+
+ self.assertEqual(result["status"], "success")
+ self.assertEqual(result["template"], "directions")
+
+ self.assertIn(STATE_RENDERED_A2UI_PARTS, self.tool_context.state)
+ parts = self.tool_context.state[STATE_RENDERED_A2UI_PARTS]
+ self.assertEqual(len(parts), 3)
+
+ update_components = parts[1].root.data["updateComponents"]["components"]
+ root_comp = next(comp for comp in update_components if comp["id"] == "root")
+ self.assertEqual(
+ root_comp["children"], ["heading-text", "map", "summary-text"]
+ )
+ heading_comp = next(
+ comp for comp in update_components if comp["id"] == "heading-text"
+ )
+ self.assertEqual(
+ heading_comp["text"],
+ "### Driving directions from San Francisco to Oakland",
+ )
+ map_comp = next(comp for comp in update_components if comp["id"] == "map")
+ self.assertEqual(map_comp["travelMode"], "driving")
+ self.assertEqual(len(map_comp["routes"]), 1)
+
+ async def test_render_directions_template_missing_heading_fails(self):
+ tool = RenderDirectionsTemplateTool(schema_manager=self.schema_manager)
+
+ args = {
+ "summary": "Commute is 30 minutes.",
+ "center_lat": 37.7749,
+ "center_lng": -122.4194,
+ "zoom": 12,
+ "routes": [{
+ "origin": {"lat": 37.7749, "lng": -122.4194, "label": "A"},
+ "destination": {"lat": 37.8044, "lng": -122.2712, "label": "B"},
+ }],
+ "travel_mode": "driving",
+ }
+
+ result = await tool.run_async(args=args, tool_context=self.tool_context)
+ self.assertIn("error", result)
+ self.assertIn("Validation failed for tool", result["error"])
+
+ async def test_render_directions_template_invalid_travel_mode_fails(self):
+ tool = RenderDirectionsTemplateTool(schema_manager=self.schema_manager)
+
+ args = {
+ "summary": "Commute",
+ "center_lat": 37.7,
+ "center_lng": -122.4,
+ "zoom": 12,
+ "routes": [{
+ "origin": {"lat": 37.7, "lng": -122.4, "label": "A"},
+ "destination": {"lat": 37.8, "lng": -122.3, "label": "B"},
+ }],
+ "travel_mode": "ROCKET_SHIP", # Invalid mode
+ }
+
+ result = await tool.run_async(args=args, tool_context=self.tool_context)
+ self.assertIn("error", result)
+
+ async def test_render_text_only_template_success(self):
+ tool = RenderTextOnlyTemplateTool(schema_manager=self.schema_manager)
+
+ args = {
+ "text": "Hello world from text-only template.",
+ }
+
+ result = await tool.run_async(args=args, tool_context=self.tool_context)
+
+ self.assertEqual(result["status"], "success")
+ self.assertEqual(result["template"], "text_only")
+
+ self.assertIn(STATE_RENDERED_A2UI_PARTS, self.tool_context.state)
+ parts = self.tool_context.state[STATE_RENDERED_A2UI_PARTS]
+ self.assertEqual(len(parts), 2)
+ text_comp = parts[1].root.data["updateComponents"]["components"][1]
+ self.assertEqual(text_comp["text"], "Hello world from text-only template.")
+
+ async def test_template_toolset_returns_tools(self):
+ toolset = TemplateToolset(
+ schema_manager=self.schema_manager, max_list_size=3
+ )
+ tools = await toolset.get_tools()
+
+ self.assertEqual(len(tools), 3)
+ tool_names = [t.name for t in tools]
+ self.assertIn("render_local_search_template", tool_names)
+ self.assertIn("render_directions_template", tool_names)
+ self.assertIn("render_text_only_template", tool_names)
+
+ async def test_template_toolset_defaults_to_maps_catalog_id(self):
+ toolset = TemplateToolset(schema_manager=self.schema_manager)
+ tools = await toolset.get_tools()
+
+ for tool in tools:
+ with self.subTest(tool=tool.name):
+ self.assertEqual(tool.catalog_id, "a2ui://maps-agentic-ui-catalog.json")
+
+ async def test_template_toolset_propagates_catalog_id(self):
+ """A host names its catalog once; every tool in the set must honor it."""
+ host_catalog = "https://example.test/host_catalog.json"
+ toolset = TemplateToolset(
+ schema_manager=self.schema_manager, catalog_id=host_catalog
+ )
+ tools = await toolset.get_tools()
+
+ self.assertEqual(len(tools), 3)
+ for tool in tools:
+ with self.subTest(tool=tool.name):
+ self.assertEqual(tool.catalog_id, host_catalog)
+
+ def test_tool_declarations_valid(self):
+ tool_ls = RenderLocalSearchTemplateTool(schema_manager=self.schema_manager)
+ decl_ls = tool_ls._get_declaration()
+ self.assertIsNotNone(decl_ls)
+ self.assertEqual(decl_ls.name, "render_local_search_template")
+
+ tool_dir = RenderDirectionsTemplateTool(schema_manager=self.schema_manager)
+ decl_dir = tool_dir._get_declaration()
+ self.assertIsNotNone(decl_dir)
+ self.assertEqual(decl_dir.name, "render_directions_template")
+
+ tool_text = RenderTextOnlyTemplateTool(schema_manager=self.schema_manager)
+ decl_text = tool_text._get_declaration()
+ self.assertIsNotNone(decl_text)
+ self.assertEqual(decl_text.name, "render_text_only_template")
+
+
+if __name__ == "__main__":
+ unittest.main()
diff --git a/agent/python_agent/router_config.py b/agent/python_agent/testdata/router_instruction.golden.txt
similarity index 67%
rename from agent/python_agent/router_config.py
rename to agent/python_agent/testdata/router_instruction.golden.txt
index 4e137f0..10fe25e 100644
--- a/agent/python_agent/router_config.py
+++ b/agent/python_agent/testdata/router_instruction.golden.txt
@@ -1,41 +1,3 @@
-# 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
-#
-# https://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.
-"""Configuration for the Intent Router, including prompts and schemas."""
-
-import enum
-import pydantic
-
-
-class IntentClass(str, enum.Enum):
- """Supported intent categories for routing."""
-
- LOCAL_SEARCH = "LOCAL_SEARCH"
- DIRECTIONS = "DIRECTIONS"
- OTHER_SPATIAL = "OTHER_SPATIAL"
- TEXT_ONLY = "TEXT_ONLY"
-
-
-class RouterClassification(pydantic.BaseModel):
- """Schema for the classification output of the intent router."""
-
- intent: IntentClass = pydantic.Field(
- description="The classified intent archetype name."
- )
- query: str = pydantic.Field(description="The cleaned user query")
-
-
-ROUTER_SYSTEM_INSTRUCTION = """
## Role
You are an expert query intent router.
@@ -43,8 +5,8 @@ class RouterClassification(pydantic.BaseModel):
Analyze a user's input and classify it into the most appropriate intent category based on the structural complexity and data requirements of the request.
## Intent Archetypes
-- **LOCAL_SEARCH**: Search for categories of interest, places, businesses, or points of interest within a specific geographic proximity.
- **DIRECTIONS**: Standard navigation, route directions, walking/driving/transit times, or navigation instructions between an origin and destination. This includes multi-stop routes and routes with specified waypoints.
+- **LOCAL_SEARCH**: Search for categories of interest, places, businesses, or points of interest within a specific geographic proximity.
- **OTHER_SPATIAL**: Queries requiring rich map-based visualization, boundaries, coordinates, specific geographic displays, or complex navigation combining routes with secondary overlays (e.g., weather, air quality forecasts, displaying all available charging stations along a route).
- **TEXT_ONLY**: General information retrieval, questions, or requests for data associated with locations that can be answered fully with text without requiring a map interface.
@@ -55,6 +17,14 @@ class RouterClassification(pydantic.BaseModel):
## Few-shot Examples
### Example 1
+**User Query:** "Directions from Sacramento to Mendocino via Clear Lake"
+**Output:**
+{
+ "intent": "DIRECTIONS",
+ "query": "Directions from Sacramento to Mendocino via Clear Lake"
+}
+
+### Example 2
**User Query:** "Find coffee shops near Central Park"
**Output:**
{
@@ -62,7 +32,7 @@ class RouterClassification(pydantic.BaseModel):
"query": "coffee shops near Central Park"
}
-### Example 2
+### Example 3
**User Query:** "Walking route from Central Park to Times Square, but show coffee shops and rain forecasts along the way"
**Output:**
{
@@ -70,19 +40,10 @@ class RouterClassification(pydantic.BaseModel):
"query": "walking route from Central Park to Times Square with coffee shop stops and rain forecast"
}
-### Example 3
+### Example 4
**User Query:** "show the boundary of Yosemite National Park on the map"
**Output:**
{
"intent": "OTHER_SPATIAL",
"query": "boundary of Yosemite National Park"
}
-
-### Example 4
-**User Query:** "Directions from Sacramento to Mendocino via Clear Lake"
-**Output:**
-{
- "intent": "DIRECTIONS",
- "query": "Directions from Sacramento to Mendocino via Clear Lake"
-}
-"""
diff --git a/client/android/GoogleMapsA2UI/build.gradle b/client/android/GoogleMapsA2UI/build.gradle
index 702c9a0..be243f9 100644
--- a/client/android/GoogleMapsA2UI/build.gradle
+++ b/client/android/GoogleMapsA2UI/build.gradle
@@ -1,3 +1,17 @@
+// 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.
+
plugins {
id 'com.android.library' version '9.0.0'
id 'maven-publish'
@@ -31,6 +45,16 @@ android {
}
}
+ // Robolectric needs the AGP-merged manifest, resources and assets. Without
+ // this, `context.assets` is empty and Robolectric cannot read `targetSdk`,
+ // so it falls back to its minimum supported SDK where API 23/24 WebViewClient
+ // overloads do not exist.
+ testOptions {
+ unitTests {
+ includeAndroidResources = true
+ }
+ }
+
publishing {
singleVariant('release')
}
@@ -52,6 +76,9 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.6.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.robolectric:robolectric:4.11.1'
+ testImplementation 'com.google.truth:truth:1.4.2'
+ testImplementation 'org.mockito:mockito-core:5.11.0'
+ testImplementation 'org.mockito.kotlin:mockito-kotlin:5.2.1'
}
afterEvaluate {
diff --git a/client/android/GoogleMapsA2UI/src/main/assets/index.html b/client/android/GoogleMapsA2UI/src/main/assets/index.html
index 0f35689..b75f2b4 100644
--- a/client/android/GoogleMapsA2UI/src/main/assets/index.html
+++ b/client/android/GoogleMapsA2UI/src/main/assets/index.html
@@ -31,1202 +31,7616 @@
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
}
-
+