google-adk 1.4.0__tar.gz → 1.4.1__tar.gz

{google_adk-1.4.0 → google_adk-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-adk
-Version: 1.4.0
+Version: 1.4.1
 Summary: Agent Development Kit
 Author-email: Google LLC <googleapis-packages@google.com>
 Requires-Python: >=3.9

{google_adk-1.4.0 → google_adk-1.4.1}/src/google/adk/a2a/converters/part_converter.py

@@ -20,9 +20,20 @@ from __future__ import annotations
 
 import json
 import logging
+import sys
 from typing import Optional
 
-from a2a import types as a2a_types
+try:
+  from a2a import types as a2a_types
+except ImportError as e:
+  if sys.version_info < (3, 10):
+    raise ImportError(
+        'A2A Tool requires Python 3.10 or above. Please upgrade your Python'
+        ' version.'
+    ) from e
+  else:
+    raise e
+
 from google.genai import types as genai_types
 
 from ...utils.feature_decorator import working_in_progress

{google_adk-1.4.0 → google_adk-1.4.1}/src/google/adk/auth/auth_credential.py

@@ -230,4 +230,3 @@ class AuthCredential(BaseModelWithConfig):
   http: Optional[HttpAuth] = None
   service_account: Optional[ServiceAccount] = None
   oauth2: Optional[OAuth2Auth] = None
-  google_oauth2_json: Optional[str] = None

{google_adk-1.4.0 → google_adk-1.4.1}/src/google/adk/auth/credential_manager.py

@@ -76,11 +76,7 @@ class CredentialManager:
     self._refresher_registry = CredentialRefresherRegistry()
 
     # Register default exchangers and refreshers
-    from .exchanger.service_account_credential_exchanger import ServiceAccountCredentialExchanger
-
-    self._exchanger_registry.register(
-        AuthCredentialTypes.SERVICE_ACCOUNT, ServiceAccountCredentialExchanger()
-    )
+    # TODO: support service account credential exchanger
     from .refresher.oauth2_credential_refresher import OAuth2CredentialRefresher
 
     oauth2_refresher = OAuth2CredentialRefresher()

{google_adk-1.4.0 → google_adk-1.4.1}/src/google/adk/auth/exchanger/__init__.py

@@ -15,9 +15,7 @@
 """Credential exchanger module."""
 
 from .base_credential_exchanger import BaseCredentialExchanger
-from .service_account_credential_exchanger import ServiceAccountCredentialExchanger
 
 __all__ = [
     "BaseCredentialExchanger",
-    "ServiceAccountCredentialExchanger",
 ]

{google_adk-1.4.0 → google_adk-1.4.1}/src/google/adk/auth/refresher/oauth2_credential_refresher.py

@@ -60,27 +60,12 @@ class OAuth2CredentialRefresher(BaseCredentialRefresher):
     Returns:
         True if the credential needs to be refreshed, False otherwise.
     """
-    # Handle Google OAuth2 credentials (from service account exchange)
-    if auth_credential.google_oauth2_json:
-      try:
-        google_credential = Credentials.from_authorized_user_info(
-            json.loads(auth_credential.google_oauth2_json)
-        )
-        return google_credential.expired and bool(
-            google_credential.refresh_token
-        )
-      except Exception as e:
-        logger.warning("Failed to parse Google OAuth2 JSON credential: %s", e)
-        return False
 
     # Handle regular OAuth2 credentials
-    elif auth_credential.oauth2 and auth_scheme:
+    if auth_credential.oauth2:
       if not AUTHLIB_AVIALABLE:
         return False
 
-      if not auth_credential.oauth2:
-        return False
-
       return OAuth2Token({
           "expires_at": auth_credential.oauth2.expires_at,
           "expires_in": auth_credential.oauth2.expires_in,
@@ -105,22 +90,9 @@ class OAuth2CredentialRefresher(BaseCredentialRefresher):
         The refreshed credential.
 
     """
-    # Handle Google OAuth2 credentials (from service account exchange)
-    if auth_credential.google_oauth2_json:
-      try:
-        google_credential = Credentials.from_authorized_user_info(
-            json.loads(auth_credential.google_oauth2_json)
-        )
-        if google_credential.expired and google_credential.refresh_token:
-          google_credential.refresh(Request())
-          auth_credential.google_oauth2_json = google_credential.to_json()
-          logger.info("Successfully refreshed Google OAuth2 JSON credential")
-      except Exception as e:
-        # TODO reconsider whether we should raise error when refresh failed.
-        logger.error("Failed to refresh Google OAuth2 JSON credential: %s", e)
 
     # Handle regular OAuth2 credentials
-    elif auth_credential.oauth2 and auth_scheme:
+    if auth_credential.oauth2 and auth_scheme:
       if not AUTHLIB_AVIALABLE:
         return auth_credential
 

{google_adk-1.4.0 → google_adk-1.4.1}/src/google/adk/flows/llm_flows/functions.py

@@ -288,8 +288,7 @@ async def handle_function_calls_live(
       trace_tool_call(
           tool=tool,
           args=function_args,
-          response_event_id=function_response_event.id,
-          function_response=function_response,
+          function_response_event=function_response_event,
       )
       function_response_events.append(function_response_event)
 

{google_adk-1.4.0 → google_adk-1.4.1}/src/google/adk/tools/mcp_tool/mcp_tool.py

@@ -138,11 +138,6 @@ class MCPTool(BaseAuthenticatedTool):
     if credential:
       if credential.oauth2:
         headers = {"Authorization": f"Bearer {credential.oauth2.access_token}"}
-      elif credential.google_oauth2_json:
-        google_credential = Credentials.from_authorized_user_info(
-            json.loads(credential.google_oauth2_json)
-        )
-        headers = {"Authorization": f"Bearer {google_credential.token}"}
       elif credential.http:
         # Handle HTTP authentication schemes
         if (
@@ -178,10 +173,9 @@ class MCPTool(BaseAuthenticatedTool):
         headers = {"X-API-Key": credential.api_key}
       elif credential.service_account:
         # Service accounts should be exchanged for access tokens before reaching this point
-        # If we reach here, we can try to use google_oauth2_json or log a warning
         logger.warning(
-            "Service account credentials should be exchanged for access"
-            " tokens before MCP session creation"
+            "Service account credentials should be exchanged before MCP"
+            " session creation"
         )
 
     return headers

{google_adk-1.4.0 → google_adk-1.4.1}/src/google/adk/tools/openapi_tool/openapi_spec_parser/tool_auth_handler.py

@@ -233,7 +233,6 @@ class ToolAuthHandler:
             AuthCredentialTypes.OPEN_ID_CONNECT,
         )
         and not credential.oauth2.access_token
-        and not credential.google_oauth2_json
     )
 
   async def prepare_auth_credentials(

{google_adk-1.4.0 → google_adk-1.4.1}/src/google/adk/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 # version: major.minor.patch
-__version__ = "1.4.0"
+__version__ = "1.4.1"

google_adk-1.4.0/src/google/adk/auth/exchanger/service_account_credential_exchanger.py

@@ -1,104 +0,0 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Credential fetcher for Google Service Account."""
-
-from __future__ import annotations
-
-from typing import Optional
-
-import google.auth
-from google.auth.transport.requests import Request
-from google.oauth2 import service_account
-from typing_extensions import override
-
-from ...utils.feature_decorator import experimental
-from ..auth_credential import AuthCredential
-from ..auth_credential import AuthCredentialTypes
-from ..auth_schemes import AuthScheme
-from .base_credential_exchanger import BaseCredentialExchanger
-
-
-@experimental
-class ServiceAccountCredentialExchanger(BaseCredentialExchanger):
-  """Exchanges Google Service Account credentials for an access token.
-
-  Uses the default service credential if `use_default_credential = True`.
-  Otherwise, uses the service account credential provided in the auth
-  credential.
-  """
-
-  @override
-  async def exchange(
-      self,
-      auth_credential: AuthCredential,
-      auth_scheme: Optional[AuthScheme] = None,
-  ) -> AuthCredential:
-    """Exchanges the service account auth credential for an access token.
-
-    If the AuthCredential contains a service account credential, it will be used
-    to exchange for an access token. Otherwise, if use_default_credential is True,
-    the default application credential will be used for exchanging an access token.
-
-    Args:
-        auth_scheme: The authentication scheme.
-        auth_credential: The credential to exchange.
-
-    Returns:
-        An AuthCredential in OAUTH2 format, containing the exchanged credential JSON.
-
-    Raises:
-        ValueError: If service account credentials are missing or invalid.
-        Exception: If credential exchange or refresh fails.
-    """
-    if auth_credential is None:
-      raise ValueError("Credential cannot be None.")
-
-    if auth_credential.auth_type != AuthCredentialTypes.SERVICE_ACCOUNT:
-      raise ValueError("Credential is not a service account credential.")
-
-    if auth_credential.service_account is None:
-      raise ValueError(
-          "Service account credentials are missing. Please provide them."
-      )
-
-    if (
-        auth_credential.service_account.service_account_credential is None
-        and not auth_credential.service_account.use_default_credential
-    ):
-      raise ValueError(
-          "Service account credentials are invalid. Please set the"
-          " service_account_credential field or set `use_default_credential ="
-          " True` to use application default credential in a hosted service"
-          " like Google Cloud Run."
-      )
-
-    try:
-      if auth_credential.service_account.use_default_credential:
-        credentials, _ = google.auth.default()
-      else:
-        config = auth_credential.service_account
-        credentials = service_account.Credentials.from_service_account_info(
-            config.service_account_credential.model_dump(), scopes=config.scopes
-        )
-
-      # Refresh credentials to ensure we have a valid access token
-      credentials.refresh(Request())
-
-      return AuthCredential(
-          auth_type=AuthCredentialTypes.OAUTH2,
-          google_oauth2_json=credentials.to_json(),
-      )
-    except Exception as e:
-      raise ValueError(f"Failed to exchange service account token: {e}") from e