TradeMe · calvingiles · Jun 12, 2025 · Jun 6, 2025 · Jun 6, 2025 · Jun 6, 2025
diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](LICENSE)
 [![Python Unit Tests](https://github.com/google/adk-python/actions/workflows/python-unit-tests.yml/badge.svg)](https://github.com/google/adk-python/actions/workflows/python-unit-tests.yml)
 [![r/agentdevelopmentkit](https://img.shields.io/badge/Reddit-r%2Fagentdevelopmentkit-FF4500?style=flat&logo=reddit&logoColor=white)](https://www.reddit.com/r/agentdevelopmentkit/)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/google/adk-python)
 
 <html>
     <h2 align="center">

diff --git a/contributing/samples/bigquery/agent.py b/contributing/samples/bigquery/agent.py
@@ -17,11 +17,15 @@
 from google.adk.agents import llm_agent
 from google.adk.tools.bigquery import BigQueryCredentialsConfig
 from google.adk.tools.bigquery import BigQueryToolset
+from google.adk.tools.bigquery.config import BigQueryToolConfig
+from google.adk.tools.bigquery.config import WriteMode
 import google.auth
 
 RUN_WITH_ADC = False
 
 
+tool_config = BigQueryToolConfig(write_mode=WriteMode.ALLOWED)
+
 if RUN_WITH_ADC:
   # Initialize the tools to use the application default credentials.
   application_default_credentials, _ = google.auth.default()
@@ -37,7 +41,9 @@
       client_secret=os.getenv("OAUTH_CLIENT_SECRET"),
   )
 
-bigquery_toolset = BigQueryToolset(credentials_config=credentials_config)
+bigquery_toolset = BigQueryToolset(
+    credentials_config=credentials_config, bigquery_tool_config=tool_config
+)
 
 # The variable name `root_agent` determines what your root agent is for the
 # debug CLI

diff --git a/contributing/samples/integration_connector_euc_agent/__init__.py b/contributing/samples/integration_connector_euc_agent/__init__.py
@@ -1 +1,15 @@
+# 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.
+
 from . import agent
diff --git a/...n/fixture/customer_support_ma/__init__.py → contributing/samples/rag_agent/__init__.py b/...n/fixture/customer_support_ma/__init__.py → contributing/samples/rag_agent/__init__.py
diff --git a/contributing/samples/rag_agent/agent.py b/contributing/samples/rag_agent/agent.py
@@ -0,0 +1,51 @@
+# 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.
+
+import os
+
+from dotenv import load_dotenv
+from google.adk.agents import Agent
+from google.adk.tools.retrieval.vertex_ai_rag_retrieval import VertexAiRagRetrieval
+from vertexai.preview import rag
+
+load_dotenv()
+
+ask_vertex_retrieval = VertexAiRagRetrieval(
+    name="retrieve_rag_documentation",
+    description=(
+        "Use this tool to retrieve documentation and reference materials for"
+        " the question from the RAG corpus,"
+    ),
+    rag_resources=[
+        rag.RagResource(
+            # please fill in your own rag corpus
+            # e.g. projects/123/locations/us-central1/ragCorpora/456
+            rag_corpus=os.environ.get("RAG_CORPUS"),
+        )
+    ],
+    similarity_top_k=1,
+    vector_distance_threshold=0.6,
+)
+
+root_agent = Agent(
+    model="gemini-2.0-flash-001",
+    name="root_agent",
+    instruction=(
+        "You are an AI assistant with access to specialized corpus of"
+        " documents. Your role is to provide accurate and concise answers to"
+        " questions based on documents that are retrievable using"
+        " ask_vertex_retrieval."
+    ),
+    tools=[ask_vertex_retrieval],
+)
diff --git a/contributing/samples/session_state_agent/__init__.py b/contributing/samples/session_state_agent/__init__.py
@@ -1 +1,15 @@
+# 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.
+
 from . import agent
diff --git a/src/google/adk/agents/llm_agent.py b/src/google/adk/agents/llm_agent.py
@@ -129,7 +129,7 @@ class LlmAgent(BaseAgent):
   global_instruction: Union[str, InstructionProvider] = ''
   """Instructions for all the agents in the entire agent tree.
 
-  global_instruction ONLY takes effect in root agent.
+  ONLY the global_instruction in root agent will take effect.
 
   For example: use global_instruction to make all agents have a stable identity
   or personality.
@@ -204,11 +204,6 @@ class LlmAgent(BaseAgent):
   """
   # Advance features - End
 
-  # TODO: remove below fields after migration. - Start
-  # These fields are added back for easier migration.
-  examples: Optional[ExamplesUnion] = None
-  # TODO: remove above fields after migration. - End
-
   # Callbacks - Start
   before_model_callback: Optional[BeforeModelCallback] = None
   """Callback or list of callbacks to be called before calling the LLM.

diff --git a/src/google/adk/approval/approval_policy.py b/src/google/adk/approval/approval_policy.py
@@ -128,8 +128,13 @@ def register_tool_policy(cls, policy: FunctionToolPolicy):
     """
     if policy.policy_name is None:
       raise ValueError("Policy name cannot be None")
-    if policy not in cls.tool_policies:
-      cls.tool_policies.append(policy)
+    for existing_policy in cls.tool_policies:
+      if existing_policy.policy_name != policy.policy_name:
+        continue
+      if existing_policy.actions != policy.actions:
+        continue
+      return
+    cls.tool_policies.append(policy)
 
   @classmethod
   def get_tool_policies(cls, tool_name: str) -> list[FunctionToolPolicy]:

diff --git a/src/google/adk/auth/auth_handler.py b/src/google/adk/auth/auth_handler.py
@@ -112,7 +112,7 @@ def exchange_auth_token(
 
   def parse_and_store_auth_response(self, state: State) -> None:
 
-    credential_key = self.get_credential_key()
+    credential_key = "temp:" + self.auth_config.get_credential_key()
 
     state[credential_key] = self.auth_config.exchanged_auth_credential
     if not isinstance(
@@ -130,7 +130,7 @@ def _validate(self) -> None:
       raise ValueError("auth_scheme is empty.")
 
   def get_auth_response(self, state: State) -> AuthCredential:
-    credential_key = self.get_credential_key()
+    credential_key = "temp:" + self.auth_config.get_credential_key()
     return state.get(credential_key, None)
 
   def generate_auth_request(self) -> AuthConfig:
@@ -192,29 +192,6 @@ def generate_auth_request(self) -> AuthConfig:
         exchanged_auth_credential=exchanged_credential,
     )
 
-  def get_credential_key(self) -> str:
-    """Generates a unique key for the given auth scheme and credential."""
-    auth_scheme = self.auth_config.auth_scheme
-    auth_credential = self.auth_config.raw_auth_credential
-    if auth_scheme.model_extra:
-      auth_scheme = auth_scheme.model_copy(deep=True)
-      auth_scheme.model_extra.clear()
-    scheme_name = (
-        f"{auth_scheme.type_.name}_{hash(auth_scheme.model_dump_json())}"
-        if auth_scheme
-        else ""
-    )
-    if auth_credential.model_extra:
-      auth_credential = auth_credential.model_copy(deep=True)
-      auth_credential.model_extra.clear()
-    credential_name = (
-        f"{auth_credential.auth_type.value}_{hash(auth_credential.model_dump_json())}"
-        if auth_credential
-        else ""
-    )
-
-    return f"temp:adk_{scheme_name}_{credential_name}"
-
   def generate_auth_uri(
       self,
   ) -> AuthCredential:

diff --git a/src/google/adk/auth/auth_tool.py b/src/google/adk/auth/auth_tool.py
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from .auth_credential import AuthCredential
 from .auth_credential import BaseModelWithConfig
 from .auth_schemes import AuthScheme
@@ -43,6 +45,34 @@ class AuthConfig(BaseModelWithConfig):
   this field to guide the user through the OAuth2 flow and fill auth response in
   this field"""
 
+  def get_credential_key(self):
+    """Generates a hash key based on auth_scheme and raw_auth_credential. This
+    hash key can be used to store / retrieve exchanged_auth_credential in a
+    credentials store.
+    """
+    auth_scheme = self.auth_scheme
+
+    if auth_scheme.model_extra:
+      auth_scheme = auth_scheme.model_copy(deep=True)
+      auth_scheme.model_extra.clear()
+    scheme_name = (
+        f"{auth_scheme.type_.name}_{hash(auth_scheme.model_dump_json())}"
+        if auth_scheme
+        else ""
+    )
+
+    auth_credential = self.raw_auth_credential
+    if auth_credential.model_extra:
+      auth_credential = auth_credential.model_copy(deep=True)
+      auth_credential.model_extra.clear()
+    credential_name = (
+        f"{auth_credential.auth_type.value}_{hash(auth_credential.model_dump_json())}"
+        if auth_credential
+        else ""
+    )
+
+    return f"adk_{scheme_name}_{credential_name}"
+
 
 class AuthToolArguments(BaseModelWithConfig):
   """the arguments for the special long running function tool that is used to