From ae7d19a4c648d8a7583148dbecf4b80a29472934 Mon Sep 17 00:00:00 2001
From: "Wei Sun (Jack)" <weisun@google.com>
Date: Mon, 19 May 2025 12:15:19 -0700
Subject: [PATCH] chore: Moves toolbox-core to extensions extra dependency.

PiperOrigin-RevId: 760722343
---
 pyproject.toml                   |  2 +-
 src/google/adk/tools/__init__.py | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 5be6c6e..6acaf28 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -45,7 +45,6 @@ dependencies = [
   "sqlalchemy>=2.0",                         # SQL database ORM
   "tzlocal>=5.3",                            # Time zone utilities
   "uvicorn>=0.34.0",                         # ASGI server for FastAPI
-  "toolbox-core>=0.1.0",
   # go/keep-sorted end
 ]
 dynamic = ["version"]
@@ -113,6 +112,7 @@ extensions = [
   "litellm>=1.63.11",                     # For LiteLLM support
   "llama-index-readers-file>=0.4.0",      # For retrieval using LlamaIndex.
   "lxml>=5.3.0",                          # For load_web_page tool.
+  "toolbox-core>=0.1.0",                  # For tools.toolbox_toolset.ToolboxToolset
 ]
 
 
diff --git a/src/google/adk/tools/__init__.py b/src/google/adk/tools/__init__.py
index a59269a..ef53301 100644
--- a/src/google/adk/tools/__init__.py
+++ b/src/google/adk/tools/__init__.py
@@ -11,26 +11,24 @@
 # 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.
-# pylint: disable=g-bad-import-order
-from .base_tool import BaseTool
+
 
 from ..auth.auth_tool import AuthToolArguments
 from .apihub_tool.apihub_toolset import APIHubToolset
+from .base_tool import BaseTool
 from .built_in_code_execution_tool import built_in_code_execution
-from .google_search_tool import google_search
-from .vertex_ai_search_tool import VertexAiSearchTool
 from .example_tool import ExampleTool
 from .exit_loop_tool import exit_loop
 from .function_tool import FunctionTool
 from .get_user_choice_tool import get_user_choice_tool as get_user_choice
+from .google_search_tool import google_search
 from .load_artifacts_tool import load_artifacts_tool as load_artifacts
 from .load_memory_tool import load_memory_tool as load_memory
 from .long_running_tool import LongRunningFunctionTool
 from .preload_memory_tool import preload_memory_tool as preload_memory
 from .tool_context import ToolContext
 from .transfer_to_agent_tool import transfer_to_agent
-from .toolbox_toolset import ToolboxToolset
-
+from .vertex_ai_search_tool import VertexAiSearchTool
 
 __all__ = [
     'APIHubToolset',
@@ -48,6 +46,5 @@ __all__ = [
     'LongRunningFunctionTool',
     'preload_memory',
     'ToolContext',
-    'ToolboxToolset',
     'transfer_to_agent',
 ]