From e0851a1e5731dfc3d8d561191a1846f32b706158 Mon Sep 17 00:00:00 2001 From: "Wei Sun (Jack)" Date: Wed, 21 May 2025 23:39:57 -0700 Subject: [PATCH] chore: batch organize imports. PiperOrigin-RevId: 761824628 --- pyproject.toml | 1 - src/google/adk/flows/llm_flows/base_llm_flow.py | 2 +- src/google/adk/flows/llm_flows/single_flow.py | 2 +- src/google/adk/sessions/database_session_service.py | 2 +- src/google/adk/sessions/vertex_ai_session_service.py | 5 +++-- src/google/adk/tools/agent_tool.py | 2 +- .../integration_connector_tool.py | 2 +- src/google/adk/tools/google_api_tool/google_api_tool.py | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 6acaf28..1c12f6a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -151,7 +151,6 @@ profile = "google" single_line_exclusions = [] known_third_party = ["google.adk"] - [tool.pytest.ini_options] testpaths = ["tests"] asyncio_default_fixture_loop_scope = "function" diff --git a/src/google/adk/flows/llm_flows/base_llm_flow.py b/src/google/adk/flows/llm_flows/base_llm_flow.py index e0bbfa0..788f1aa 100644 --- a/src/google/adk/flows/llm_flows/base_llm_flow.py +++ b/src/google/adk/flows/llm_flows/base_llm_flow.py @@ -25,6 +25,7 @@ from typing import TYPE_CHECKING from websockets.exceptions import ConnectionClosedOK +from . import functions from ...agents.base_agent import BaseAgent from ...agents.callback_context import CallbackContext from ...agents.invocation_context import InvocationContext @@ -40,7 +41,6 @@ from ...telemetry import trace_call_llm from ...telemetry import trace_send_data from ...telemetry import tracer from ...tools.tool_context import ToolContext -from . import functions if TYPE_CHECKING: from ...agents.llm_agent import LlmAgent diff --git a/src/google/adk/flows/llm_flows/single_flow.py b/src/google/adk/flows/llm_flows/single_flow.py index 0a642b4..787a767 100644 --- a/src/google/adk/flows/llm_flows/single_flow.py +++ b/src/google/adk/flows/llm_flows/single_flow.py @@ -16,13 +16,13 @@ import logging -from ...auth import auth_preprocessor from . import _code_execution from . import _nl_planning from . import basic from . import contents from . import identity from . import instructions +from ...auth import auth_preprocessor from .base_llm_flow import BaseLlmFlow logger = logging.getLogger('google_adk.' + __name__) diff --git a/src/google/adk/sessions/database_session_service.py b/src/google/adk/sessions/database_session_service.py index 648abd5..42d06ea 100644 --- a/src/google/adk/sessions/database_session_service.py +++ b/src/google/adk/sessions/database_session_service.py @@ -47,8 +47,8 @@ from sqlalchemy.types import TypeDecorator from typing_extensions import override from tzlocal import get_localzone -from ..events.event import Event from . import _session_util +from ..events.event import Event from .base_session_service import BaseSessionService from .base_session_service import GetSessionConfig from .base_session_service import ListSessionsResponse diff --git a/src/google/adk/sessions/vertex_ai_session_service.py b/src/google/adk/sessions/vertex_ai_session_service.py index b3cbd93..f4d9f3b 100644 --- a/src/google/adk/sessions/vertex_ai_session_service.py +++ b/src/google/adk/sessions/vertex_ai_session_service.py @@ -18,12 +18,13 @@ from typing import Any from typing import Optional from dateutil import parser -from google import genai from typing_extensions import override +from google import genai + +from . import _session_util from ..events.event import Event from ..events.event_actions import EventActions -from . import _session_util from .base_session_service import BaseSessionService from .base_session_service import GetSessionConfig from .base_session_service import ListSessionsResponse diff --git a/src/google/adk/tools/agent_tool.py b/src/google/adk/tools/agent_tool.py index 84e6b09..2b23dcf 100644 --- a/src/google/adk/tools/agent_tool.py +++ b/src/google/adk/tools/agent_tool.py @@ -21,10 +21,10 @@ from google.genai import types from pydantic import model_validator from typing_extensions import override +from . import _automatic_function_calling_util from ..memory.in_memory_memory_service import InMemoryMemoryService from ..runners import Runner from ..sessions.in_memory_session_service import InMemorySessionService -from . import _automatic_function_calling_util from .base_tool import BaseTool from .tool_context import ToolContext diff --git a/src/google/adk/tools/application_integration_tool/integration_connector_tool.py b/src/google/adk/tools/application_integration_tool/integration_connector_tool.py index d9d5bcb..47084cf 100644 --- a/src/google/adk/tools/application_integration_tool/integration_connector_tool.py +++ b/src/google/adk/tools/application_integration_tool/integration_connector_tool.py @@ -21,9 +21,9 @@ from typing import Union from google.genai.types import FunctionDeclaration from typing_extensions import override +from .. import BaseTool from ...auth.auth_credential import AuthCredential from ...auth.auth_schemes import AuthScheme -from .. import BaseTool from ..openapi_tool.openapi_spec_parser.rest_api_tool import RestApiTool from ..openapi_tool.openapi_spec_parser.rest_api_tool import to_gemini_schema from ..openapi_tool.openapi_spec_parser.tool_auth_handler import ToolAuthHandler diff --git a/src/google/adk/tools/google_api_tool/google_api_tool.py b/src/google/adk/tools/google_api_tool/google_api_tool.py index 33cd1d8..4fc254b 100644 --- a/src/google/adk/tools/google_api_tool/google_api_tool.py +++ b/src/google/adk/tools/google_api_tool/google_api_tool.py @@ -19,10 +19,10 @@ from typing import Optional from google.genai.types import FunctionDeclaration from typing_extensions import override +from .. import BaseTool from ...auth import AuthCredential from ...auth import AuthCredentialTypes from ...auth import OAuth2Auth -from .. import BaseTool from ..openapi_tool import RestApiTool from ..tool_context import ToolContext