diff --git a/contributing/samples/adk_agent_builder_assistant/README.md b/src/google/adk/cli/built_in_agents/README.md similarity index 100% rename from contributing/samples/adk_agent_builder_assistant/README.md rename to src/google/adk/cli/built_in_agents/README.md diff --git a/contributing/samples/adk_agent_builder_assistant/__init__.py b/src/google/adk/cli/built_in_agents/__init__.py similarity index 96% rename from contributing/samples/adk_agent_builder_assistant/__init__.py rename to src/google/adk/cli/built_in_agents/__init__.py index d581a1b6..d88b442f 100644 --- a/contributing/samples/adk_agent_builder_assistant/__init__.py +++ b/src/google/adk/cli/built_in_agents/__init__.py @@ -18,6 +18,7 @@ This package provides an intelligent assistant for building multi-agent systems using YAML configurations. It can be used directly as an agent or integrated with ADK tools and web interfaces. """ +from __future__ import annotations from . import agent # Import to make agent.root_agent available from .agent_builder_assistant import AgentBuilderAssistant diff --git a/contributing/samples/adk_agent_builder_assistant/agent.py b/src/google/adk/cli/built_in_agents/agent.py similarity index 96% rename from contributing/samples/adk_agent_builder_assistant/agent.py rename to src/google/adk/cli/built_in_agents/agent.py index 269e869f..71268996 100644 --- a/contributing/samples/adk_agent_builder_assistant/agent.py +++ b/src/google/adk/cli/built_in_agents/agent.py @@ -13,6 +13,7 @@ # limitations under the License. """Agent Builder Assistant instance for ADK web testing.""" +from __future__ import annotations from .agent_builder_assistant import AgentBuilderAssistant diff --git a/contributing/samples/adk_agent_builder_assistant/agent_builder_assistant.py b/src/google/adk/cli/built_in_agents/agent_builder_assistant.py similarity index 99% rename from contributing/samples/adk_agent_builder_assistant/agent_builder_assistant.py rename to src/google/adk/cli/built_in_agents/agent_builder_assistant.py index 7393f35d..3f28604e 100644 --- a/contributing/samples/adk_agent_builder_assistant/agent_builder_assistant.py +++ b/src/google/adk/cli/built_in_agents/agent_builder_assistant.py @@ -13,6 +13,7 @@ # limitations under the License. """Agent factory for creating Agent Builder Assistant with embedded schema.""" +from __future__ import annotations from pathlib import Path import textwrap diff --git a/contributing/samples/adk_agent_builder_assistant/instruction_embedded.template b/src/google/adk/cli/built_in_agents/instruction_embedded.template similarity index 100% rename from contributing/samples/adk_agent_builder_assistant/instruction_embedded.template rename to src/google/adk/cli/built_in_agents/instruction_embedded.template diff --git a/contributing/samples/adk_agent_builder_assistant/sub_agents/__init__.py b/src/google/adk/cli/built_in_agents/sub_agents/__init__.py similarity index 95% rename from contributing/samples/adk_agent_builder_assistant/sub_agents/__init__.py rename to src/google/adk/cli/built_in_agents/sub_agents/__init__.py index d201f31e..c0e2aaf9 100644 --- a/contributing/samples/adk_agent_builder_assistant/sub_agents/__init__.py +++ b/src/google/adk/cli/built_in_agents/sub_agents/__init__.py @@ -13,6 +13,7 @@ # limitations under the License. """Sub-agents for Agent Builder Assistant.""" +from __future__ import annotations from .google_search_agent import create_google_search_agent from .url_context_agent import create_url_context_agent diff --git a/contributing/samples/adk_agent_builder_assistant/sub_agents/google_search_agent.py b/src/google/adk/cli/built_in_agents/sub_agents/google_search_agent.py similarity index 98% rename from contributing/samples/adk_agent_builder_assistant/sub_agents/google_search_agent.py rename to src/google/adk/cli/built_in_agents/sub_agents/google_search_agent.py index 277164ef..845d8a5a 100644 --- a/contributing/samples/adk_agent_builder_assistant/sub_agents/google_search_agent.py +++ b/src/google/adk/cli/built_in_agents/sub_agents/google_search_agent.py @@ -13,6 +13,7 @@ # limitations under the License. """Sub-agent for Google Search functionality.""" +from __future__ import annotations from google.adk.agents import LlmAgent from google.adk.tools import google_search diff --git a/contributing/samples/adk_agent_builder_assistant/sub_agents/url_context_agent.py b/src/google/adk/cli/built_in_agents/sub_agents/url_context_agent.py similarity index 98% rename from contributing/samples/adk_agent_builder_assistant/sub_agents/url_context_agent.py rename to src/google/adk/cli/built_in_agents/sub_agents/url_context_agent.py index 0c7a83e5..86005cd6 100644 --- a/contributing/samples/adk_agent_builder_assistant/sub_agents/url_context_agent.py +++ b/src/google/adk/cli/built_in_agents/sub_agents/url_context_agent.py @@ -13,6 +13,7 @@ # limitations under the License. """Sub-agent for URL context fetching functionality.""" +from __future__ import annotations from google.adk.agents import LlmAgent from google.adk.tools import url_context diff --git a/contributing/samples/adk_agent_builder_assistant/tools/__init__.py b/src/google/adk/cli/built_in_agents/tools/__init__.py similarity index 97% rename from contributing/samples/adk_agent_builder_assistant/tools/__init__.py rename to src/google/adk/cli/built_in_agents/tools/__init__.py index c282cfa4..d68046ba 100644 --- a/contributing/samples/adk_agent_builder_assistant/tools/__init__.py +++ b/src/google/adk/cli/built_in_agents/tools/__init__.py @@ -13,6 +13,7 @@ # limitations under the License. """Tools for Agent Builder Assistant.""" +from __future__ import annotations from .cleanup_unused_files import cleanup_unused_files from .delete_files import delete_files diff --git a/contributing/samples/adk_agent_builder_assistant/tools/cleanup_unused_files.py b/src/google/adk/cli/built_in_agents/tools/cleanup_unused_files.py similarity index 100% rename from contributing/samples/adk_agent_builder_assistant/tools/cleanup_unused_files.py rename to src/google/adk/cli/built_in_agents/tools/cleanup_unused_files.py diff --git a/contributing/samples/adk_agent_builder_assistant/tools/delete_files.py b/src/google/adk/cli/built_in_agents/tools/delete_files.py similarity index 99% rename from contributing/samples/adk_agent_builder_assistant/tools/delete_files.py rename to src/google/adk/cli/built_in_agents/tools/delete_files.py index 170f8e9e..0df5c630 100644 --- a/contributing/samples/adk_agent_builder_assistant/tools/delete_files.py +++ b/src/google/adk/cli/built_in_agents/tools/delete_files.py @@ -13,6 +13,7 @@ # limitations under the License. """File deletion tool for Agent Builder Assistant.""" +from __future__ import annotations from datetime import datetime from pathlib import Path diff --git a/contributing/samples/adk_agent_builder_assistant/tools/explore_project.py b/src/google/adk/cli/built_in_agents/tools/explore_project.py similarity index 99% rename from contributing/samples/adk_agent_builder_assistant/tools/explore_project.py rename to src/google/adk/cli/built_in_agents/tools/explore_project.py index b9beb172..d1b71e07 100644 --- a/contributing/samples/adk_agent_builder_assistant/tools/explore_project.py +++ b/src/google/adk/cli/built_in_agents/tools/explore_project.py @@ -13,6 +13,7 @@ # limitations under the License. """Project explorer tool for analyzing structure and suggesting file paths.""" +from __future__ import annotations from pathlib import Path from typing import Any diff --git a/contributing/samples/adk_agent_builder_assistant/tools/query_schema.py b/src/google/adk/cli/built_in_agents/tools/query_schema.py similarity index 99% rename from contributing/samples/adk_agent_builder_assistant/tools/query_schema.py rename to src/google/adk/cli/built_in_agents/tools/query_schema.py index bdcc7100..8c077877 100644 --- a/contributing/samples/adk_agent_builder_assistant/tools/query_schema.py +++ b/src/google/adk/cli/built_in_agents/tools/query_schema.py @@ -13,6 +13,7 @@ # limitations under the License. """ADK AgentConfig schema query tool for dynamic schema information access.""" +from __future__ import annotations from typing import Any from typing import Dict diff --git a/contributing/samples/adk_agent_builder_assistant/tools/read_config_files.py b/src/google/adk/cli/built_in_agents/tools/read_config_files.py similarity index 99% rename from contributing/samples/adk_agent_builder_assistant/tools/read_config_files.py rename to src/google/adk/cli/built_in_agents/tools/read_config_files.py index 63b1bc58..c3627753 100644 --- a/contributing/samples/adk_agent_builder_assistant/tools/read_config_files.py +++ b/src/google/adk/cli/built_in_agents/tools/read_config_files.py @@ -13,6 +13,7 @@ # limitations under the License. """Configuration file reader tool for existing YAML configs.""" +from __future__ import annotations from pathlib import Path from typing import Any diff --git a/contributing/samples/adk_agent_builder_assistant/tools/read_files.py b/src/google/adk/cli/built_in_agents/tools/read_files.py similarity index 98% rename from contributing/samples/adk_agent_builder_assistant/tools/read_files.py rename to src/google/adk/cli/built_in_agents/tools/read_files.py index 4afaf271..67197122 100644 --- a/contributing/samples/adk_agent_builder_assistant/tools/read_files.py +++ b/src/google/adk/cli/built_in_agents/tools/read_files.py @@ -13,6 +13,7 @@ # limitations under the License. """File reading tool for Agent Builder Assistant.""" +from __future__ import annotations from pathlib import Path from typing import Any diff --git a/contributing/samples/adk_agent_builder_assistant/tools/search_adk_knowledge.py b/src/google/adk/cli/built_in_agents/tools/search_adk_knowledge.py similarity index 98% rename from contributing/samples/adk_agent_builder_assistant/tools/search_adk_knowledge.py rename to src/google/adk/cli/built_in_agents/tools/search_adk_knowledge.py index fd2db0b6..a63b7d11 100644 --- a/contributing/samples/adk_agent_builder_assistant/tools/search_adk_knowledge.py +++ b/src/google/adk/cli/built_in_agents/tools/search_adk_knowledge.py @@ -13,6 +13,7 @@ # limitations under the License. """ADK knowledge search tool.""" +from __future__ import annotations from typing import Any import uuid diff --git a/contributing/samples/adk_agent_builder_assistant/tools/search_adk_source.py b/src/google/adk/cli/built_in_agents/tools/search_adk_source.py similarity index 99% rename from contributing/samples/adk_agent_builder_assistant/tools/search_adk_source.py rename to src/google/adk/cli/built_in_agents/tools/search_adk_source.py index 9d3a3a93..a787689a 100644 --- a/contributing/samples/adk_agent_builder_assistant/tools/search_adk_source.py +++ b/src/google/adk/cli/built_in_agents/tools/search_adk_source.py @@ -13,6 +13,7 @@ # limitations under the License. """ADK source code search tool for Agent Builder Assistant.""" +from __future__ import annotations from pathlib import Path import re diff --git a/contributing/samples/adk_agent_builder_assistant/tools/write_config_files.py b/src/google/adk/cli/built_in_agents/tools/write_config_files.py similarity index 100% rename from contributing/samples/adk_agent_builder_assistant/tools/write_config_files.py rename to src/google/adk/cli/built_in_agents/tools/write_config_files.py diff --git a/contributing/samples/adk_agent_builder_assistant/tools/write_files.py b/src/google/adk/cli/built_in_agents/tools/write_files.py similarity index 99% rename from contributing/samples/adk_agent_builder_assistant/tools/write_files.py rename to src/google/adk/cli/built_in_agents/tools/write_files.py index 953a04b2..8ade17c5 100644 --- a/contributing/samples/adk_agent_builder_assistant/tools/write_files.py +++ b/src/google/adk/cli/built_in_agents/tools/write_files.py @@ -13,6 +13,7 @@ # limitations under the License. """File writing tool for Agent Builder Assistant.""" +from __future__ import annotations from datetime import datetime from pathlib import Path diff --git a/contributing/samples/adk_agent_builder_assistant/utils/__init__.py b/src/google/adk/cli/built_in_agents/utils/__init__.py similarity index 96% rename from contributing/samples/adk_agent_builder_assistant/utils/__init__.py rename to src/google/adk/cli/built_in_agents/utils/__init__.py index cb1f18d6..ea4e35fe 100644 --- a/contributing/samples/adk_agent_builder_assistant/utils/__init__.py +++ b/src/google/adk/cli/built_in_agents/utils/__init__.py @@ -13,6 +13,7 @@ # limitations under the License. """Utility modules for Agent Builder Assistant.""" +from __future__ import annotations from .adk_source_utils import find_adk_source_folder from .adk_source_utils import get_adk_schema_path diff --git a/contributing/samples/adk_agent_builder_assistant/utils/adk_source_utils.py b/src/google/adk/cli/built_in_agents/utils/adk_source_utils.py similarity index 99% rename from contributing/samples/adk_agent_builder_assistant/utils/adk_source_utils.py rename to src/google/adk/cli/built_in_agents/utils/adk_source_utils.py index ef020e46..bf3a75ae 100644 --- a/contributing/samples/adk_agent_builder_assistant/utils/adk_source_utils.py +++ b/src/google/adk/cli/built_in_agents/utils/adk_source_utils.py @@ -13,6 +13,7 @@ # limitations under the License. """Utilities for finding ADK source folder dynamically and loading schema.""" +from __future__ import annotations import json import logging diff --git a/contributing/samples/adk_agent_builder_assistant/utils/path_normalizer.py b/src/google/adk/cli/built_in_agents/utils/path_normalizer.py similarity index 100% rename from contributing/samples/adk_agent_builder_assistant/utils/path_normalizer.py rename to src/google/adk/cli/built_in_agents/utils/path_normalizer.py diff --git a/contributing/samples/adk_agent_builder_assistant/utils/resolve_root_directory.py b/src/google/adk/cli/built_in_agents/utils/resolve_root_directory.py similarity index 98% rename from contributing/samples/adk_agent_builder_assistant/utils/resolve_root_directory.py rename to src/google/adk/cli/built_in_agents/utils/resolve_root_directory.py index e670038a..6d151eda 100644 --- a/contributing/samples/adk_agent_builder_assistant/utils/resolve_root_directory.py +++ b/src/google/adk/cli/built_in_agents/utils/resolve_root_directory.py @@ -13,6 +13,7 @@ # limitations under the License. """Working directory helper tool to resolve path context issues.""" +from __future__ import annotations import os from pathlib import Path diff --git a/src/google/adk/cli/utils/agent_loader.py b/src/google/adk/cli/utils/agent_loader.py index 0755c914..3efd1df5 100644 --- a/src/google/adk/cli/utils/agent_loader.py +++ b/src/google/adk/cli/utils/agent_loader.py @@ -37,7 +37,7 @@ logger = logging.getLogger("google_adk." + __name__) # Special agents directory for agents with names starting with double underscore SPECIAL_AGENTS_DIR = os.path.join( - os.path.dirname(__file__), "..", "..", "built_in_agents" + os.path.dirname(__file__), "..", "built_in_agents" )