chore: Replace imports by importing from actual module instead of from package (__init__.py)

PiperOrigin-RevId: 786342250

contributing/samples/a2a_auth/agent.py

@@ -13,11 +13,11 @@
 # limitations under the License.
 
 
-from google.adk.agents import Agent
+from google.adk.agents.llm_agent import Agent
 from google.adk.agents.remote_a2a_agent import AGENT_CARD_WELL_KNOWN_PATH
 from google.adk.agents.remote_a2a_agent import RemoteA2aAgent
 from google.adk.tools.langchain_tool import LangchainTool
-from langchain_community.tools import YouTubeSearchTool
+from langchain_community.tools.youtube.search import YouTubeSearchTool
 
 # Instantiate the tool
 langchain_yt_tool = YouTubeSearchTool()

contributing/samples/a2a_basic/agent.py

@@ -14,7 +14,7 @@
 
 import random
 
-from google.adk.agents import Agent
+from google.adk.agents.llm_agent import Agent
 from google.adk.agents.remote_a2a_agent import AGENT_CARD_WELL_KNOWN_PATH
 from google.adk.agents.remote_a2a_agent import RemoteA2aAgent
 from google.adk.tools.example_tool import ExampleTool

contributing/samples/a2a_human_in_loop/agent.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-from google.adk import Agent
+from google.adk.agents.llm_agent import Agent
 from google.adk.agents.remote_a2a_agent import AGENT_CARD_WELL_KNOWN_PATH
 from google.adk.agents.remote_a2a_agent import RemoteA2aAgent
 from google.genai import types

contributing/samples/a2a_human_in_loop/remote_a2a/human_in_loop/agent.py

@@ -15,8 +15,8 @@
 from typing import Any
 
 from google.adk import Agent
-from google.adk.tools import ToolContext
 from google.adk.tools.long_running_tool import LongRunningFunctionTool
+from google.adk.tools.tool_context import ToolContext
 from google.genai import types
 
 

contributing/samples/adk_answering_agent/agent.py

@@ -21,8 +21,8 @@ from adk_answering_agent.settings import REPO
 from adk_answering_agent.settings import VERTEXAI_DATASTORE_ID
 from adk_answering_agent.utils import error_response
 from adk_answering_agent.utils import run_graphql_query
-from google.adk.agents import Agent
-from google.adk.tools import VertexAiSearchTool
+from google.adk.agents.llm_agent import Agent
+from google.adk.tools.vertex_ai_search_tool import VertexAiSearchTool
 import requests
 
 if IS_INTERACTIVE:

contributing/samples/adk_pr_agent/main.py

@@ -20,7 +20,7 @@ import time
 import agent
 from google.adk.agents.run_config import RunConfig
 from google.adk.runners import InMemoryRunner
-from google.adk.sessions import Session
+from google.adk.sessions.session import Session
 from google.genai import types
 
 

contributing/samples/adk_triaging_agent/agent.py

@@ -23,7 +23,7 @@ from adk_triaging_agent.utils import error_response
 from adk_triaging_agent.utils import get_request
 from adk_triaging_agent.utils import patch_request
 from adk_triaging_agent.utils import post_request
-from google.adk import Agent
+from google.adk.agents.llm_agent import Agent
 import requests
 
 LABEL_TO_OWNER = {

contributing/samples/bigquery/agent.py

@@ -14,10 +14,10 @@
 
 import os
 
-from google.adk.agents import llm_agent
-from google.adk.auth import AuthCredentialTypes
-from google.adk.tools.bigquery import BigQueryCredentialsConfig
-from google.adk.tools.bigquery import BigQueryToolset
+from google.adk.agents.llm_agent import LlmAgent
+from google.adk.auth.auth_credential import AuthCredentialTypes
+from google.adk.tools.bigquery.bigquery_credentials import BigQueryCredentialsConfig
+from google.adk.tools.bigquery.bigquery_toolset import BigQueryToolset
 from google.adk.tools.bigquery.config import BigQueryToolConfig
 from google.adk.tools.bigquery.config import WriteMode
 import google.auth

contributing/samples/callbacks/agent.py

@@ -15,8 +15,8 @@
 import random
 
 from google.adk import Agent
-from google.adk.planners import BuiltInPlanner
-from google.adk.planners import PlanReActPlanner
+from google.adk.planners.built_in_planner import BuiltInPlanner
+from google.adk.planners.plan_re_act_planner import PlanReActPlanner
 from google.adk.tools.tool_context import ToolContext
 from google.genai import types
 

contributing/samples/callbacks/main.py

@@ -19,10 +19,10 @@ import warnings
 import agent
 from dotenv import load_dotenv
 from google.adk import Runner
-from google.adk.artifacts import InMemoryArtifactService
+from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
 from google.adk.cli.utils import logs
-from google.adk.sessions import InMemorySessionService
-from google.adk.sessions import Session
+from google.adk.sessions.in_memory_session_service import InMemorySessionService
+from google.adk.sessions.session import Session
 from google.genai import types
 
 load_dotenv(override=True)

contributing/samples/fields_planner/agent.py

@@ -14,9 +14,9 @@
 
 import random
 
-from google.adk import Agent
-from google.adk.planners import BuiltInPlanner
-from google.adk.planners import PlanReActPlanner
+from google.adk.agents.llm_agent import Agent
+from google.adk.planners.built_in_planner import BuiltInPlanner
+from google.adk.planners.plan_re_act_planner import PlanReActPlanner
 from google.adk.tools.tool_context import ToolContext
 from google.genai import types
 

contributing/samples/fields_planner/main.py

@@ -19,10 +19,9 @@ import warnings
 import agent
 from dotenv import load_dotenv
 from google.adk import Runner
-from google.adk.artifacts import InMemoryArtifactService
+from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
 from google.adk.cli.utils import logs
-from google.adk.sessions import InMemorySessionService
-from google.adk.sessions import Session
+from google.adk.sessions.session import Session
 from google.genai import types
 
 load_dotenv(override=True)

contributing/samples/generate_image/agent.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 from google.adk import Agent
-from google.adk.tools import load_artifacts
-from google.adk.tools import ToolContext
+from google.adk.tools.load_artifacts_tool import load_artifacts
+from google.adk.tools.tool_context import ToolContext
 from google.genai import Client
 from google.genai import types
 

contributing/samples/google_api/agent.py

@@ -15,8 +15,8 @@
 import os
 
 from dotenv import load_dotenv
-from google.adk import Agent
-from google.adk.tools.google_api_tool import BigQueryToolset
+from google.adk.agents.llm_agent import Agent
+from google.adk.tools.google_api_tool.google_api_toolsets import BigQueryToolset
 
 # Load environment variables from .env file
 load_dotenv()

contributing/samples/google_search_agent/agent.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from google.adk import Agent
-from google.adk.tools import google_search
+from google.adk.tools.google_search_tool import google_search
 
 root_agent = Agent(
     model='gemini-2.0-flash-001',

contributing/samples/hello_world/main.py

@@ -20,7 +20,7 @@ from dotenv import load_dotenv
 from google.adk.agents.run_config import RunConfig
 from google.adk.cli.utils import logs
 from google.adk.runners import InMemoryRunner
-from google.adk.sessions import Session
+from google.adk.sessions.session import Session
 from google.genai import types
 
 load_dotenv(override=True)

contributing/samples/hello_world_anthropic/main.py

@@ -19,10 +19,10 @@ import time
 import agent
 from dotenv import load_dotenv
 from google.adk import Runner
-from google.adk.artifacts import InMemoryArtifactService
+from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
 from google.adk.cli.utils import logs
-from google.adk.sessions import InMemorySessionService
-from google.adk.sessions import Session
+from google.adk.sessions.in_memory_session_service import InMemorySessionService
+from google.adk.sessions.session import Session
 from google.genai import types
 
 load_dotenv(override=True)

contributing/samples/hello_world_litellm/agent.py

@@ -15,7 +15,7 @@
 
 import random
 
-from google.adk import Agent
+from google.adk.agents.llm_agent import Agent
 from google.adk.models.lite_llm import LiteLlm
 
 

contributing/samples/hello_world_litellm/main.py

@@ -18,11 +18,11 @@ import time
 
 import agent
 from dotenv import load_dotenv
-from google.adk import Runner
-from google.adk.artifacts import InMemoryArtifactService
+from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
 from google.adk.cli.utils import logs
-from google.adk.sessions import InMemorySessionService
-from google.adk.sessions import Session
+from google.adk.runners import Runner
+from google.adk.sessions.in_memory_session_service import InMemorySessionService
+from google.adk.sessions.session import Session
 from google.genai import types
 
 load_dotenv(override=True)

contributing/samples/hello_world_litellm_add_function_to_prompt/main.py

@@ -19,10 +19,10 @@ import time
 import agent
 from dotenv import load_dotenv
 from google.adk import Runner
-from google.adk.artifacts import InMemoryArtifactService
+from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
 from google.adk.cli.utils import logs
-from google.adk.sessions import InMemorySessionService
-from google.adk.sessions import Session
+from google.adk.sessions.in_memory_session_service import InMemorySessionService
+from google.adk.sessions.session import Session
 from google.genai import types
 
 load_dotenv(override=True)