diff --git a/src/google/adk/agents/callback_context.py b/src/google/adk/agents/callback_context.py
index 724d49ab..65d4931b 100644
--- a/src/google/adk/agents/callback_context.py
+++ b/src/google/adk/agents/callback_context.py
@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Optional, TYPE_CHECKING
+from typing import Optional
+from typing import TYPE_CHECKING
 
 from typing_extensions import override
 
diff --git a/src/google/adk/agents/readonly_context.py b/src/google/adk/agents/readonly_context.py
index 928e2d1b..54842536 100644
--- a/src/google/adk/agents/readonly_context.py
+++ b/src/google/adk/agents/readonly_context.py
@@ -15,11 +15,13 @@
 from __future__ import annotations
 
 from types import MappingProxyType
-from typing import Any, Optional
+from typing import Any
+from typing import Optional
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
   from google.genai import types
+
   from .invocation_context import InvocationContext
 
 
diff --git a/src/google/adk/auth/auth_credential.py b/src/google/adk/auth/auth_credential.py
index fae4fba4..db6fa976 100644
--- a/src/google/adk/auth/auth_credential.py
+++ b/src/google/adk/auth/auth_credential.py
@@ -13,7 +13,10 @@
 # limitations under the License.
 
 from enum import Enum
-from typing import Any, Dict, List, Optional
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
 
 from pydantic import alias_generators
 from pydantic import BaseModel
diff --git a/src/google/adk/cli/utils/evals.py b/src/google/adk/cli/utils/evals.py
index fb3ddf13..1cde0dfa 100644
--- a/src/google/adk/cli/utils/evals.py
+++ b/src/google/adk/cli/utils/evals.py
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, Tuple
+from typing import Any
+from typing import Tuple
 
 from deprecated import deprecated
 from google.genai import types as genai_types
diff --git a/src/google/adk/code_executors/code_execution_utils.py b/src/google/adk/code_executors/code_execution_utils.py
index d0d8d115..8a202183 100644
--- a/src/google/adk/code_executors/code_execution_utils.py
+++ b/src/google/adk/code_executors/code_execution_utils.py
@@ -19,7 +19,8 @@ import binascii
 import copy
 import dataclasses
 import re
-from typing import List, Optional
+from typing import List
+from typing import Optional
 
 from google.genai import types
 
diff --git a/src/google/adk/code_executors/container_code_executor.py b/src/google/adk/code_executors/container_code_executor.py
index 0ce2ec33..fee02ee6 100644
--- a/src/google/adk/code_executors/container_code_executor.py
+++ b/src/google/adk/code_executors/container_code_executor.py
@@ -27,7 +27,6 @@ from .base_code_executor import BaseCodeExecutor
 from .code_execution_utils import CodeExecutionInput
 from .code_execution_utils import CodeExecutionResult
 
-
 DEFAULT_IMAGE_TAG = 'adk-code-executor:latest'
 
 
diff --git a/src/google/adk/code_executors/vertex_ai_code_executor.py b/src/google/adk/code_executors/vertex_ai_code_executor.py
index 31a05851..ebd32d3a 100644
--- a/src/google/adk/code_executors/vertex_ai_code_executor.py
+++ b/src/google/adk/code_executors/vertex_ai_code_executor.py
@@ -15,7 +15,8 @@
 import datetime
 import mimetypes
 import os
-from typing import Any, Optional
+from typing import Any
+from typing import Optional
 
 from typing_extensions import override
 from vertexai.preview.extensions import Extension
diff --git a/src/google/adk/evaluation/eval_case.py b/src/google/adk/evaluation/eval_case.py
index 556071cd..172a8309 100644
--- a/src/google/adk/evaluation/eval_case.py
+++ b/src/google/adk/evaluation/eval_case.py
@@ -13,7 +13,9 @@
 # limitations under the License.
 
 
-from typing import Any, Optional, Tuple
+from typing import Any
+from typing import Optional
+from typing import Tuple
 
 from google.genai import types as genai_types
 from pydantic import alias_generators
diff --git a/src/google/adk/evaluation/eval_set.py b/src/google/adk/evaluation/eval_set.py
index 6e9fabab..428fb933 100644
--- a/src/google/adk/evaluation/eval_set.py
+++ b/src/google/adk/evaluation/eval_set.py
@@ -13,7 +13,9 @@
 # limitations under the License.
 
 from typing import Optional
+
 from pydantic import BaseModel
+
 from .eval_case import EvalCase
 
 
diff --git a/src/google/adk/evaluation/eval_set_results_manager.py b/src/google/adk/evaluation/eval_set_results_manager.py
index 5c907f0e..cfb6a933 100644
--- a/src/google/adk/evaluation/eval_set_results_manager.py
+++ b/src/google/adk/evaluation/eval_set_results_manager.py
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from abc import ABC, abstractmethod
+from abc import ABC
+from abc import abstractmethod
 
 from ..cli.cli_eval import EvalCaseResult
 from ..cli.cli_eval import EvalSetResult
diff --git a/src/google/adk/evaluation/eval_sets_manager.py b/src/google/adk/evaluation/eval_sets_manager.py
index d0bb6039..995e1396 100644
--- a/src/google/adk/evaluation/eval_sets_manager.py
+++ b/src/google/adk/evaluation/eval_sets_manager.py
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from abc import ABC, abstractmethod
+from abc import ABC
+from abc import abstractmethod
 
 from .eval_case import EvalCase
 from .eval_set import EvalSet
diff --git a/src/google/adk/evaluation/evaluator.py b/src/google/adk/evaluation/evaluator.py
index 5b7bc989..bc19313d 100644
--- a/src/google/adk/evaluation/evaluator.py
+++ b/src/google/adk/evaluation/evaluator.py
@@ -15,7 +15,9 @@
 from abc import ABC
 from enum import Enum
 from typing import Optional
+
 from pydantic import BaseModel
+
 from .eval_case import Invocation
 
 
diff --git a/src/google/adk/evaluation/local_eval_set_results_manager.py b/src/google/adk/evaluation/local_eval_set_results_manager.py
index a7538f1f..e0c742f7 100644
--- a/src/google/adk/evaluation/local_eval_set_results_manager.py
+++ b/src/google/adk/evaluation/local_eval_set_results_manager.py
@@ -16,7 +16,9 @@ import json
 import logging
 import os
 import time
+
 from typing_extensions import override
+
 from ..cli.cli_eval import EvalCaseResult
 from ..cli.cli_eval import EvalSetResult
 from .eval_set_results_manager import EvalSetResultsManager
diff --git a/src/google/adk/evaluation/response_evaluator.py b/src/google/adk/evaluation/response_evaluator.py
index c4447851..9acc533b 100644
--- a/src/google/adk/evaluation/response_evaluator.py
+++ b/src/google/adk/evaluation/response_evaluator.py
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, Optional
+from typing import Any
+from typing import Optional
 
 from deprecated import deprecated
 from google.genai import types as genai_types
diff --git a/src/google/adk/evaluation/trajectory_evaluator.py b/src/google/adk/evaluation/trajectory_evaluator.py
index 260c465c..ec45e9a9 100644
--- a/src/google/adk/evaluation/trajectory_evaluator.py
+++ b/src/google/adk/evaluation/trajectory_evaluator.py
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, cast
+from typing import Any
+from typing import cast
 
 from deprecated import deprecated
 from google.genai import types as genai_types
diff --git a/src/google/adk/examples/base_example_provider.py b/src/google/adk/examples/base_example_provider.py
index bb8aa573..e58d51fc 100644
--- a/src/google/adk/examples/base_example_provider.py
+++ b/src/google/adk/examples/base_example_provider.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import abc
+
 from .example import Example
 
 
diff --git a/src/google/adk/flows/llm_flows/contents.py b/src/google/adk/flows/llm_flows/contents.py
index faf5692d..b37d8aff 100644
--- a/src/google/adk/flows/llm_flows/contents.py
+++ b/src/google/adk/flows/llm_flows/contents.py
@@ -15,7 +15,9 @@
 from __future__ import annotations
 
 import copy
-from typing import AsyncGenerator, Generator, Optional
+from typing import AsyncGenerator
+from typing import Generator
+from typing import Optional
 
 from google.genai import types
 from typing_extensions import override
diff --git a/src/google/adk/models/base_llm.py b/src/google/adk/models/base_llm.py
index 6d71cf9e..159ae221 100644
--- a/src/google/adk/models/base_llm.py
+++ b/src/google/adk/models/base_llm.py
@@ -14,7 +14,8 @@
 from __future__ import annotations
 
 from abc import abstractmethod
-from typing import AsyncGenerator, TYPE_CHECKING
+from typing import AsyncGenerator
+from typing import TYPE_CHECKING
 
 from google.genai import types
 from pydantic import BaseModel
diff --git a/src/google/adk/models/base_llm_connection.py b/src/google/adk/models/base_llm_connection.py
index 90be8fb3..8cae2d99 100644
--- a/src/google/adk/models/base_llm_connection.py
+++ b/src/google/adk/models/base_llm_connection.py
@@ -14,7 +14,9 @@
 
 from abc import abstractmethod
 from typing import AsyncGenerator
+
 from google.genai import types
+
 from .llm_response import LlmResponse
 
 
diff --git a/src/google/adk/models/llm_response.py b/src/google/adk/models/llm_response.py
index 311b821c..6539ff1a 100644
--- a/src/google/adk/models/llm_response.py
+++ b/src/google/adk/models/llm_response.py
@@ -14,7 +14,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Optional
+from typing import Any
+from typing import Optional
 
 from google.genai import types
 from pydantic import alias_generators
diff --git a/src/google/adk/sessions/_session_util.py b/src/google/adk/sessions/_session_util.py
index 24f87244..a55df7d2 100644
--- a/src/google/adk/sessions/_session_util.py
+++ b/src/google/adk/sessions/_session_util.py
@@ -15,7 +15,8 @@
 """Utility functions for session service."""
 
 import base64
-from typing import Any, Optional
+from typing import Any
+from typing import Optional
 
 from google.genai import types
 
diff --git a/src/google/adk/telemetry.py b/src/google/adk/telemetry.py
index dd32b3bc..a899ea61 100644
--- a/src/google/adk/telemetry.py
+++ b/src/google/adk/telemetry.py
@@ -32,7 +32,6 @@ from .events.event import Event
 from .models.llm_request import LlmRequest
 from .models.llm_response import LlmResponse
 
-
 tracer = trace.get_tracer('gcp.vertex.agent')
 
 
diff --git a/src/google/adk/tools/apihub_tool/clients/apihub_client.py b/src/google/adk/tools/apihub_tool/clients/apihub_client.py
index 25cf98bc..cfee3b41 100644
--- a/src/google/adk/tools/apihub_tool/clients/apihub_client.py
+++ b/src/google/adk/tools/apihub_tool/clients/apihub_client.py
@@ -12,11 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from abc import ABC, abstractmethod
+from abc import ABC
+from abc import abstractmethod
 import base64
 import json
-from typing import Any, Dict, List, Optional, Tuple
-from urllib.parse import parse_qs, urlparse
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Tuple
+from urllib.parse import parse_qs
+from urllib.parse import urlparse
+
 from google.auth import default as default_service_credential
 from google.auth.transport.requests import Request
 from google.oauth2 import service_account
diff --git a/src/google/adk/tools/apihub_tool/clients/secret_client.py b/src/google/adk/tools/apihub_tool/clients/secret_client.py
index 2813861d..33bce484 100644
--- a/src/google/adk/tools/apihub_tool/clients/secret_client.py
+++ b/src/google/adk/tools/apihub_tool/clients/secret_client.py
@@ -14,6 +14,7 @@
 
 import json
 from typing import Optional
+
 import google.auth
 from google.auth import default as default_service_credential
 import google.auth.transport.requests
diff --git a/src/google/adk/tools/application_integration_tool/clients/connections_client.py b/src/google/adk/tools/application_integration_tool/clients/connections_client.py
index 8dec3896..ec7e108b 100644
--- a/src/google/adk/tools/application_integration_tool/clients/connections_client.py
+++ b/src/google/adk/tools/application_integration_tool/clients/connections_client.py
@@ -14,7 +14,11 @@
 
 import json
 import time
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Tuple
 
 import google.auth
 from google.auth import default as default_service_credential
diff --git a/src/google/adk/tools/application_integration_tool/clients/integration_client.py b/src/google/adk/tools/application_integration_tool/clients/integration_client.py
index d74dccfb..e271dc24 100644
--- a/src/google/adk/tools/application_integration_tool/clients/integration_client.py
+++ b/src/google/adk/tools/application_integration_tool/clients/integration_client.py
@@ -13,7 +13,9 @@
 # limitations under the License.
 
 import json
-from typing import List, Optional
+from typing import List
+from typing import Optional
+
 from google.adk.tools.application_integration_tool.clients.connections_client import ConnectionsClient
 import google.auth
 from google.auth import default as default_service_credential
diff --git a/src/google/adk/tools/base_toolset.py b/src/google/adk/tools/base_toolset.py
index e21d4021..a761f2c1 100644
--- a/src/google/adk/tools/base_toolset.py
+++ b/src/google/adk/tools/base_toolset.py
@@ -1,7 +1,8 @@
 from abc import ABC
 from abc import abstractmethod
-from typing import Optional, runtime_checkable
+from typing import Optional
 from typing import Protocol
+from typing import runtime_checkable
 
 from ..agents.readonly_context import ReadonlyContext
 from .base_tool import BaseTool
diff --git a/src/google/adk/tools/get_user_choice_tool.py b/src/google/adk/tools/get_user_choice_tool.py
index 99d86f0d..73975801 100644
--- a/src/google/adk/tools/get_user_choice_tool.py
+++ b/src/google/adk/tools/get_user_choice_tool.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from typing import Optional
+
 from .long_running_tool import LongRunningFunctionTool
 from .tool_context import ToolContext
 
diff --git a/src/google/adk/tools/mcp_tool/conversion_utils.py b/src/google/adk/tools/mcp_tool/conversion_utils.py
index 9718a736..47de7c3d 100644
--- a/src/google/adk/tools/mcp_tool/conversion_utils.py
+++ b/src/google/adk/tools/mcp_tool/conversion_utils.py
@@ -12,9 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, Dict
-from google.genai.types import Schema, Type
+from typing import Any
+from typing import Dict
+
+from google.genai.types import Schema
+from google.genai.types import Type
 import mcp.types as mcp_types
+
 from ..base_tool import BaseTool
 
 
diff --git a/src/google/adk/tools/openapi_tool/auth/credential_exchangers/base_credential_exchanger.py b/src/google/adk/tools/openapi_tool/auth/credential_exchangers/base_credential_exchanger.py
index 44ceec5a..44db0907 100644
--- a/src/google/adk/tools/openapi_tool/auth/credential_exchangers/base_credential_exchanger.py
+++ b/src/google/adk/tools/openapi_tool/auth/credential_exchangers/base_credential_exchanger.py
@@ -15,9 +15,7 @@
 import abc
 from typing import Optional
 
-from .....auth.auth_credential import (
-    AuthCredential,
-)
+from .....auth.auth_credential import AuthCredential
 from .....auth.auth_schemes import AuthScheme
 
 
diff --git a/src/google/adk/tools/openapi_tool/auth/credential_exchangers/service_account_exchanger.py b/src/google/adk/tools/openapi_tool/auth/credential_exchangers/service_account_exchanger.py
index 4dbcb6e6..53587f4e 100644
--- a/src/google/adk/tools/openapi_tool/auth/credential_exchangers/service_account_exchanger.py
+++ b/src/google/adk/tools/openapi_tool/auth/credential_exchangers/service_account_exchanger.py
@@ -21,14 +21,13 @@ from google.auth.transport.requests import Request
 from google.oauth2 import service_account
 import google.oauth2.credentials
 
-from .....auth.auth_credential import (
-    AuthCredential,
-    AuthCredentialTypes,
-    HttpAuth,
-    HttpCredentials,
-)
+from .....auth.auth_credential import AuthCredential
+from .....auth.auth_credential import AuthCredentialTypes
+from .....auth.auth_credential import HttpAuth
+from .....auth.auth_credential import HttpCredentials
 from .....auth.auth_schemes import AuthScheme
-from .base_credential_exchanger import AuthCredentialMissingError, BaseAuthCredentialExchanger
+from .base_credential_exchanger import AuthCredentialMissingError
+from .base_credential_exchanger import BaseAuthCredentialExchanger
 
 
 class ServiceAccountCredentialExchanger(BaseAuthCredentialExchanger):
diff --git a/src/google/adk/tools/openapi_tool/common/common.py b/src/google/adk/tools/openapi_tool/common/common.py
index 68c53d35..8aa7cc40 100644
--- a/src/google/adk/tools/openapi_tool/common/common.py
+++ b/src/google/adk/tools/openapi_tool/common/common.py
@@ -14,7 +14,11 @@
 
 import keyword
 import re
-from typing import Any, Dict, List, Optional, Union
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Union
 
 from fastapi.openapi.models import Response
 from fastapi.openapi.models import Schema
diff --git a/src/google/adk/tools/openapi_tool/openapi_spec_parser/__init__.py b/src/google/adk/tools/openapi_tool/openapi_spec_parser/__init__.py
index 171d5e25..68f877ce 100644
--- a/src/google/adk/tools/openapi_tool/openapi_spec_parser/__init__.py
+++ b/src/google/adk/tools/openapi_tool/openapi_spec_parser/__init__.py
@@ -12,10 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .openapi_spec_parser import OpenApiSpecParser, OperationEndpoint, ParsedOperation
+from .openapi_spec_parser import OpenApiSpecParser
+from .openapi_spec_parser import OperationEndpoint
+from .openapi_spec_parser import ParsedOperation
 from .openapi_toolset import OpenAPIToolset
 from .operation_parser import OperationParser
-from .rest_api_tool import AuthPreparationState, RestApiTool, snake_to_lower_camel, to_gemini_schema
+from .rest_api_tool import AuthPreparationState
+from .rest_api_tool import RestApiTool
+from .rest_api_tool import snake_to_lower_camel
+from .rest_api_tool import to_gemini_schema
 from .tool_auth_handler import ToolAuthHandler
 
 __all__ = [
diff --git a/src/google/adk/tools/openapi_tool/openapi_spec_parser/operation_parser.py b/src/google/adk/tools/openapi_tool/openapi_spec_parser/operation_parser.py
index 84e8c4d8..73e8ed61 100644
--- a/src/google/adk/tools/openapi_tool/openapi_spec_parser/operation_parser.py
+++ b/src/google/adk/tools/openapi_tool/openapi_spec_parser/operation_parser.py
@@ -14,7 +14,11 @@
 
 import inspect
 from textwrap import dedent
-from typing import Any, Dict, List, Optional, Union
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Union
 
 from fastapi.encoders import jsonable_encoder
 from fastapi.openapi.models import Operation