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

PiperOrigin-RevId: 786342250

tests/unittests/tools/application_integration_tool/test_application_integration_toolset.py

@@ -18,15 +18,15 @@ from unittest import mock
 
 from fastapi.openapi.models import Operation
 from google.adk.agents.readonly_context import ReadonlyContext
-from google.adk.auth import AuthCredentialTypes
-from google.adk.auth import OAuth2Auth
 from google.adk.auth.auth_credential import AuthCredential
+from google.adk.auth.auth_credential import AuthCredentialTypes
+from google.adk.auth.auth_credential import OAuth2Auth
 from google.adk.tools.application_integration_tool.application_integration_toolset import ApplicationIntegrationToolset
 from google.adk.tools.application_integration_tool.integration_connector_tool import IntegrationConnectorTool
 from google.adk.tools.openapi_tool.auth.auth_helpers import dict_to_auth_scheme
-from google.adk.tools.openapi_tool.openapi_spec_parser import ParsedOperation
 from google.adk.tools.openapi_tool.openapi_spec_parser import rest_api_tool
 from google.adk.tools.openapi_tool.openapi_spec_parser.openapi_spec_parser import OperationEndpoint
+from google.adk.tools.openapi_tool.openapi_spec_parser.openapi_spec_parser import ParsedOperation
 import pytest
 
 

tests/unittests/tools/application_integration_tool/test_integration_connector_tool.py

@@ -14,8 +14,8 @@
 
 from unittest import mock
 
-from google.adk.auth import AuthCredential
-from google.adk.auth import AuthCredentialTypes
+from google.adk.auth.auth_credential import AuthCredential
+from google.adk.auth.auth_credential import AuthCredentialTypes
 from google.adk.auth.auth_credential import HttpAuth
 from google.adk.auth.auth_credential import HttpCredentials
 from google.adk.tools.application_integration_tool.integration_connector_tool import IntegrationConnectorTool

tests/unittests/tools/bigquery/test_bigquery_credentials_manager.py

@@ -17,11 +17,11 @@ import json
 from unittest.mock import Mock
 from unittest.mock import patch
 
-from google.adk.auth import AuthConfig
-from google.adk.tools import ToolContext
+from google.adk.auth.auth_tool import AuthConfig
 from google.adk.tools.bigquery.bigquery_credentials import BIGQUERY_TOKEN_CACHE_KEY
 from google.adk.tools.bigquery.bigquery_credentials import BigQueryCredentialsConfig
 from google.adk.tools.bigquery.bigquery_credentials import BigQueryCredentialsManager
+from google.adk.tools.tool_context import ToolContext
 from google.auth.credentials import Credentials as AuthCredentials
 from google.auth.exceptions import RefreshError
 # Mock the Google OAuth and API dependencies

tests/unittests/tools/bigquery/test_bigquery_query_tool.py

@@ -23,7 +23,7 @@ from unittest import mock
 
 import dateutil
 import dateutil.relativedelta
-from google.adk.tools import BaseTool
+from google.adk.tools.base_tool import BaseTool
 from google.adk.tools.bigquery import BigQueryCredentialsConfig
 from google.adk.tools.bigquery import BigQueryToolset
 from google.adk.tools.bigquery.config import BigQueryToolConfig

tests/unittests/tools/bigquery/test_bigquery_tool.py

@@ -16,10 +16,10 @@
 from unittest.mock import Mock
 from unittest.mock import patch
 
-from google.adk.tools import ToolContext
 from google.adk.tools.bigquery.bigquery_credentials import BigQueryCredentialsConfig
 from google.adk.tools.bigquery.bigquery_credentials import BigQueryCredentialsManager
 from google.adk.tools.bigquery.bigquery_tool import BigQueryTool
+from google.adk.tools.tool_context import ToolContext
 # Mock the Google OAuth and API dependencies
 from google.oauth2.credentials import Credentials
 import pytest

tests/unittests/tools/google_api_tool/test_google_api_toolset.py

@@ -15,16 +15,16 @@ from typing import Optional
 from unittest import mock
 
 from google.adk.agents.readonly_context import ReadonlyContext
-from google.adk.auth import OpenIdConnectWithConfig
 from google.adk.auth.auth_credential import ServiceAccount
 from google.adk.auth.auth_credential import ServiceAccountCredential
-from google.adk.tools import BaseTool
+from google.adk.auth.auth_schemes import OpenIdConnectWithConfig
+from google.adk.tools.base_tool import BaseTool
 from google.adk.tools.base_toolset import ToolPredicate
 from google.adk.tools.google_api_tool.google_api_tool import GoogleApiTool
 from google.adk.tools.google_api_tool.google_api_toolset import GoogleApiToolset
 from google.adk.tools.google_api_tool.googleapi_to_openapi_converter import GoogleApiToOpenApiConverter
-from google.adk.tools.openapi_tool import OpenAPIToolset
-from google.adk.tools.openapi_tool import RestApiTool
+from google.adk.tools.openapi_tool.openapi_spec_parser.openapi_toolset import OpenAPIToolset
+from google.adk.tools.openapi_tool.openapi_spec_parser.rest_api_tool import RestApiTool
 import pytest
 
 TEST_API_NAME = "calendar"

tests/unittests/tools/retrieval/test_vertex_ai_rag_retrieval.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from google.adk.agents import Agent
+from google.adk.agents.llm_agent import Agent
 from google.adk.tools.function_tool import FunctionTool
 from google.adk.tools.retrieval.vertex_ai_rag_retrieval import VertexAiRagRetrieval
 from google.genai import types

tests/unittests/tools/test_agent_tool.py

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from google.adk.agents import Agent
-from google.adk.agents import SequentialAgent
 from google.adk.agents.callback_context import CallbackContext
+from google.adk.agents.llm_agent import Agent
+from google.adk.agents.sequential_agent import SequentialAgent
 from google.adk.tools.agent_tool import AgentTool
 from google.adk.utils.variant_utils import GoogleLLMVariant
 from google.genai import types

tests/unittests/tools/test_build_function_declaration.py

@@ -16,7 +16,7 @@ from typing import Dict
 from typing import List
 
 from google.adk.tools import _automatic_function_calling_util
-from google.adk.tools.agent_tool import ToolContext
+from google.adk.tools.tool_context import ToolContext
 from google.adk.utils.variant_utils import GoogleLLMVariant
 from google.genai import types
 # TODO: crewai requires python 3.10 as minimum