Skip to content

Commit 927c75f

Browse files
seanzhougooglecopybara-github
authored andcommitted
chore: Replace imports by importing from actual module instead of from package (__init__.py)
PiperOrigin-RevId: 786342250
1 parent 430b820 commit 927c75f

File tree

110 files changed

+221
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+221
-218
lines changed

contributing/samples/a2a_auth/agent.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
# limitations under the License.
1414

1515

16-
from google.adk.agents import Agent
16+
from google.adk.agents.llm_agent import Agent
1717
from google.adk.agents.remote_a2a_agent import AGENT_CARD_WELL_KNOWN_PATH
1818
from google.adk.agents.remote_a2a_agent import RemoteA2aAgent
1919
from google.adk.tools.langchain_tool import LangchainTool
20-
from langchain_community.tools import YouTubeSearchTool
20+
from langchain_community.tools.youtube.search import YouTubeSearchTool
2121

2222
# Instantiate the tool
2323
langchain_yt_tool = YouTubeSearchTool()

contributing/samples/a2a_basic/agent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import random
1616

17-
from google.adk.agents import Agent
17+
from google.adk.agents.llm_agent import Agent
1818
from google.adk.agents.remote_a2a_agent import AGENT_CARD_WELL_KNOWN_PATH
1919
from google.adk.agents.remote_a2a_agent import RemoteA2aAgent
2020
from google.adk.tools.example_tool import ExampleTool

contributing/samples/a2a_human_in_loop/agent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515

16-
from google.adk import Agent
16+
from google.adk.agents.llm_agent import Agent
1717
from google.adk.agents.remote_a2a_agent import AGENT_CARD_WELL_KNOWN_PATH
1818
from google.adk.agents.remote_a2a_agent import RemoteA2aAgent
1919
from google.genai import types

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
from typing import Any
1616

1717
from google.adk import Agent
18-
from google.adk.tools import ToolContext
1918
from google.adk.tools.long_running_tool import LongRunningFunctionTool
19+
from google.adk.tools.tool_context import ToolContext
2020
from google.genai import types
2121

2222

contributing/samples/adk_answering_agent/agent.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
from adk_answering_agent.settings import VERTEXAI_DATASTORE_ID
2222
from adk_answering_agent.utils import error_response
2323
from adk_answering_agent.utils import run_graphql_query
24-
from google.adk.agents import Agent
25-
from google.adk.tools import VertexAiSearchTool
24+
from google.adk.agents.llm_agent import Agent
25+
from google.adk.tools.vertex_ai_search_tool import VertexAiSearchTool
2626
import requests
2727

2828
if IS_INTERACTIVE:

contributing/samples/adk_pr_agent/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import agent
2121
from google.adk.agents.run_config import RunConfig
2222
from google.adk.runners import InMemoryRunner
23-
from google.adk.sessions import Session
23+
from google.adk.sessions.session import Session
2424
from google.genai import types
2525

2626

contributing/samples/adk_triaging_agent/agent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from adk_triaging_agent.utils import get_request
2424
from adk_triaging_agent.utils import patch_request
2525
from adk_triaging_agent.utils import post_request
26-
from google.adk import Agent
26+
from google.adk.agents.llm_agent import Agent
2727
import requests
2828

2929
LABEL_TO_OWNER = {

contributing/samples/bigquery/agent.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
import os
1616

17-
from google.adk.agents import llm_agent
18-
from google.adk.auth import AuthCredentialTypes
19-
from google.adk.tools.bigquery import BigQueryCredentialsConfig
20-
from google.adk.tools.bigquery import BigQueryToolset
17+
from google.adk.agents.llm_agent import LlmAgent
18+
from google.adk.auth.auth_credential import AuthCredentialTypes
19+
from google.adk.tools.bigquery.bigquery_credentials import BigQueryCredentialsConfig
20+
from google.adk.tools.bigquery.bigquery_toolset import BigQueryToolset
2121
from google.adk.tools.bigquery.config import BigQueryToolConfig
2222
from google.adk.tools.bigquery.config import WriteMode
2323
import google.auth

contributing/samples/callbacks/agent.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import random
1616

1717
from google.adk import Agent
18-
from google.adk.planners import BuiltInPlanner
19-
from google.adk.planners import PlanReActPlanner
18+
from google.adk.planners.built_in_planner import BuiltInPlanner
19+
from google.adk.planners.plan_re_act_planner import PlanReActPlanner
2020
from google.adk.tools.tool_context import ToolContext
2121
from google.genai import types
2222

contributing/samples/callbacks/main.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import agent
2020
from dotenv import load_dotenv
2121
from google.adk import Runner
22-
from google.adk.artifacts import InMemoryArtifactService
22+
from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
2323
from google.adk.cli.utils import logs
24-
from google.adk.sessions import InMemorySessionService
25-
from google.adk.sessions import Session
24+
from google.adk.sessions.in_memory_session_service import InMemorySessionService
25+
from google.adk.sessions.session import Session
2626
from google.genai import types
2727

2828
load_dotenv(override=True)

0 commit comments

Comments
 (0)