Merge branch 'main' into raflFaisal/generaliseContainerEnvForAgent

Author: raflFaisal

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-** Please make sure you read the contribution guide and file the issues in the rigth place. **
+** Please make sure you read the contribution guide and file the issues in the right place. **
 [Contribution guide.](https://google.github.io/adk-docs/contributing-guide/)
 
 **Describe the bug**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-** Please make sure you read the contribution guide and file the issues in the rigth place. **
+** Please make sure you read the contribution guide and file the issues in the right place. **
 [Contribution guide.](https://google.github.io/adk-docs/contributing-guide/)
 
 **Is your feature request related to a problem? Please describe.**

CHANGELOG.md

@@ -1,5 +1,60 @@
 # Changelog
 
+## 1.0.0
+
+### ⚠ BREAKING CHANGES
+
+* Evaluation dataset schema is finalized with strong-type pydantic models.
+  (previously saved eval file needs re-generation, for both adk eval cli and
+  the eval tab in adk web UI).
+* `BuiltInCodeExecutor` (in code_executors package) replaces
+  `BuiltInCodeExecutionTool` (previously in tools package).
+* All methods in services are now async, including session service, artifact
+  service and memory service.
+  * `list_events` and `close_session` methods are removed from session service.
+* agent.py file structure with MCP tools are now easier and simpler ([now](https://github.com/google/adk-python/blob/3b5232c14f48e1d5b170f3698d91639b079722c8/contributing/samples/mcp_stdio_server_agent/agent.py#L33) vs [before](https://github.com/google/adk-python/blob/a4adb739c0d86b9ae4587547d2653d568f6567f2/contributing/samples/mcp_agent/agent.py#L41)).
+  Old format is not working anymore.
+* `Memory` schema and `MemoryService` is redesigned.
+* Mark various class attributes as private in the classes in the `tools` package.
+* Disabled session state injection if instruction provider is used.
+  (so that you can have `{var_name}` in the instruction, which is required for code snippets)
+* Toolbox integration is revamped: tools/toolbox_tool.py → tools/toolbox_toolset.py.
+* Removes the experimental `remote_agent.py`. We'll redesign it and bring it back.
+
+### Features
+
+* Dev UI:
+  * A brand new trace view for overall agent invocation.
+  * A revamped evaluation tab and comparison view for checking eval results.
+* Introduced `BaseToolset` to allow dynamically add/remove tools for agents.
+  * Revamped MCPToolset with the new BaseToolset interface.
+  * Revamped GoogleApiTool, GoogleApiToolset and ApplicationIntegrationToolset with the new BaseToolset interface.
+  * Resigned agent.py file structure when needing MCPToolset.
+  * Added ToolboxToolset.
+* Redesigned strong-typed agent evaluation schema.
+  * Allows users to create more cohesive eval sets.
+  * Allows evals to be extended for non-text modality.
+  * Allows for a structured interaction with the uber eval system.
+* Redesigned Memory schema and MemoryService interfaces.
+* Added token usage to LlmResponse.
+* Allowed specifying `--adk_version` in `adk deploy cloud_run` cli. Default is the current version.
+
+### Bug Fixes
+
+* Fixed `adk deploy cloud_run` failing bug.
+* Fixed logs not being printed due to `google-auth` library.
+
+### Miscellaneous Chores
+
+* Display full help text when adk cli receives invalid arguments.
+* `adk web` now binds `127.0.0.1` by default, instead of 0.0.0.0.
+* `InMemoryRunner` now takes `BaseAgent` in constructor.
+* Various docstring improvements.
+* Various UI tweaks.
+* Various bug fixes.
+* Update various contributing/samples for contributors to validate the implementation.
+
+
 ## 0.5.0
 
 ### ⚠ BREAKING CHANGES

README.md

@@ -14,7 +14,8 @@
     <h3 align="center">
       Important Links:
       <a href="https://google.github.io/adk-docs/">Docs</a> &
-      <a href="https://github.com/google/adk-samples">Samples</a>.
+      <a href="https://github.com/google/adk-samples">Samples</a> &
+      <a href="https://github.com/google/adk-java">Java ADK</a>.
     </h3>
 </html>
 
@@ -152,18 +153,14 @@ for how they can work together.
 
 ## 🤝 Contributing
 
-We welcome contributions from the community! Whether it's bug reports, feature requests, documentation improvements, or code contributions, please see our 
+We welcome contributions from the community! Whether it's bug reports, feature requests, documentation improvements, or code contributions, please see our
 - [General contribution guideline and flow](https://google.github.io/adk-docs/contributing-guide/#questions).
 - Then if you want to contribute code, please read [Code Contributing Guidelines](./CONTRIBUTING.md) to get started.
 
 ## 📄 License
 
 This project is licensed under the Apache 2.0 License - see the [LICENSE](LICENSE) file for details.
 
-## Preview
-
-This feature is subject to the "Pre-GA Offerings Terms" in the General Service Terms section of the [Service Specific Terms](https://cloud.google.com/terms/service-terms#1). Pre-GA features are available "as is" and might have limited support. For more information, see the [launch stage descriptions](https://cloud.google.com/products?hl=en#product-launch-stages).
-
 ---
 
 *Happy Agent Building!*

assets/adk-web-dev-ui-function-call.png

@@ -0,0 +1,54 @@
+#!/bin/bash
+# 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
+#
+#     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.
+
+# Autoformat ADK codebase.
+
+if ! command -v isort &> /dev/null
+then
+    echo "isort not found, refer to CONTRIBUTING.md to set up dev environment first."
+    exit
+fi
+
+if ! command -v pyink &> /dev/null
+then
+    echo "pyink not found, refer to CONTRIBUTING.md to set up dev environment first."
+    exit
+fi
+
+echo '---------------------------------------'
+echo '|  Organizing imports for src/...'
+echo '---------------------------------------'
+
+isort src/
+echo 'All done! ✨ 🍰 ✨'
+
+echo '---------------------------------------'
+echo '|  Organizing imports for tests/...'
+echo '---------------------------------------'
+
+isort tests/
+echo 'All done! ✨ 🍰 ✨'
+
+echo '---------------------------------------'
+echo '|  Auto-formatting src/...'
+echo '---------------------------------------'
+
+find -L src/ -type f -name "*.py" -exec pyink --config pyproject.toml {} +
+
+echo '---------------------------------------'
+echo '|  Auto-formatting tests/...'
+echo '---------------------------------------'
+
+find -L tests/ -type f -name "*.py" -exec pyink --config pyproject.toml {} +

autoformat.sh

@@ -20,7 +20,6 @@
 from google.adk.agents.llm_agent import LlmAgent
 from google.adk.tools.application_integration_tool import ApplicationIntegrationToolset
 
-
 # Load environment variables from .env file
 load_dotenv()
 
@@ -29,12 +28,12 @@
 connection_location = os.getenv("CONNECTION_LOCATION")
 
 
-jira_tool = ApplicationIntegrationToolset(
+jira_toolset = ApplicationIntegrationToolset(
     project=connection_project,
     location=connection_location,
     connection=connection_name,
     entity_operations={"Issues": [], "Projects": []},
-    tool_name="jira_issue_manager",
+    tool_name_prefix="jira_issue_manager",
 )
 
 root_agent = LlmAgent(
@@ -46,5 +45,5 @@
     If there is an error in the tool response, understand the error and try and see if you can fix the error and then  and execute the tool again. For example if a variable or parameter is missing, try and see if you can find it in the request or user query or default it and then execute the tool again or check for other tools that could give you the details.
     If there are any math operations like count or max, min in the user request, call the tool to get the data and perform the math operations and then return the result in the response. For example for maximum, fetch the list and then do the math operation.
     """,
-    tools=jira_tool.get_tools(),
+    tools=[jira_toolset],
 )

contributing/samples/application_integration_agent/agent.py

@@ -24,7 +24,7 @@ async def log_query(tool_context: ToolContext, query: str):
 
 
 root_agent = Agent(
-    model='gemini-2.0-flash-exp',
+    model='gemini-2.0-flash',
     name='log_agent',
     description='Log user query.',
     instruction="""Always log the user query and reploy "kk, I've logged."

contributing/samples/artifact_save_text/agent.py

@@ -16,32 +16,33 @@
 
 from dotenv import load_dotenv
 from google.adk import Agent
-from google.adk.tools.google_api_tool import bigquery_tool_set
+from google.adk.tools.google_api_tool import BigQueryToolset
 
 # Load environment variables from .env file
 load_dotenv()
 
 # Access the variable
 oauth_client_id = os.getenv("OAUTH_CLIENT_ID")
 oauth_client_secret = os.getenv("OAUTH_CLIENT_SECRET")
-bigquery_tool_set.configure_auth(oauth_client_id, oauth_client_secret)
-
-bigquery_datasets_list = bigquery_tool_set.get_tool("bigquery_datasets_list")
-bigquery_datasets_get = bigquery_tool_set.get_tool("bigquery_datasets_get")
-bigquery_datasets_insert = bigquery_tool_set.get_tool(
-    "bigquery_datasets_insert"
+tools_to_expose = [
+    "bigquery_datasets_list",
+    "bigquery_datasets_get",
+    "bigquery_datasets_insert",
+    "bigquery_tables_list",
+    "bigquery_tables_get",
+    "bigquery_tables_insert",
+]
+bigquery_toolset = BigQueryToolset(
+    client_id=oauth_client_id,
+    client_secret=oauth_client_secret,
+    tool_filter=tools_to_expose,
 )
 
-bigquery_tables_list = bigquery_tool_set.get_tool("bigquery_tables_list")
-bigquery_tables_get = bigquery_tool_set.get_tool("bigquery_tables_get")
-bigquery_tables_insert = bigquery_tool_set.get_tool("bigquery_tables_insert")
-
-
 root_agent = Agent(
     model="gemini-2.0-flash",
     name="bigquery_agent",
     instruction="""
-      You are a helpful Google BigQuery agent that help to manage users' data on Goolge BigQuery.
+      You are a helpful Google BigQuery agent that help to manage users' data on Google BigQuery.
       Use the provided tools to conduct various operations on users' data in Google BigQuery.
 
       Scenario 1:
@@ -73,12 +74,5 @@
       {userInfo?}
       </User>
 """,
-    tools=[
-        bigquery_datasets_list,
-        bigquery_datasets_get,
-        bigquery_datasets_insert,
-        bigquery_tables_list,
-        bigquery_tables_get,
-        bigquery_tables_insert,
-    ],
+    tools=[bigquery_toolset],
 )