Skip to content

fix: keep google-auth transport imports out of Agent import #7359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
harshal-96 wants to merge 1 commit into from
Closed

fix: keep google-auth transport imports out of Agent import #7359

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/google/adk/utils/_gcp_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@

from google.auth import _cloud_sdk
from google.auth import exceptions as auth_exceptions
# google-auth does not expose a public API for direct Compute Engine metadata
# server probes (google.auth.default() requires credentials configuration).
# _metadata is the standard internal module used across Google Cloud SDKs.
from google.auth.compute_engine import _metadata
from google.auth.transport import requests as auth_requests

from . import env_utils

Expand Down Expand Up @@ -66,6 +61,16 @@ def get_project_id_from_metadata() -> str | None:
return _cached_project_id or None

try:
# Imported here, not at module level: both pull in requests, urllib3 and
# cryptography, which `from google.adk.agents import Agent` would
# otherwise load in every ADK process.
# google-auth does not expose a public API for direct Compute Engine
# metadata server probes (google.auth.default() requires credentials
# configuration). _metadata is the standard internal module used across
# Google Cloud SDKs.
from google.auth.compute_engine import _metadata # pylint: disable=import-outside-toplevel
from google.auth.transport import requests as auth_requests # pylint: disable=import-outside-toplevel

request = auth_requests.Request()
if not _metadata.ping(
request, timeout=_METADATA_TIMEOUT_SECONDS, retry_count=1
Expand Down
Loading