google-adk 1.4.0__py3-none-any.whl → 1.4.1__py3-none-any.whl

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/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/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/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/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/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/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/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/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.dist-info → google_adk-1.4.1.dist-info}/METADATA

@@ -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.dist-info → google_adk-1.4.1.dist-info}/RECORD

@@ -2,10 +2,10 @@ google/adk/__init__.py,sha256=sSPQK3r0tW8ahl-k8SXkZvMcbiTbGICCtrw6KkFucyg,726
 google/adk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 google/adk/runners.py,sha256=Tqv3HrulZGBO5YZ9bNbtAihDl-SsPv1SnW5nzUBRfZs,18558
 google/adk/telemetry.py,sha256=0ZHioyg4GD-A4xd2TPB_W1uW2_m5kMQGHosPwCu9cIc,8641
-google/adk/version.py,sha256=1bJw7-dWWcu5lzJG0xHN5h9smUy3_7Hc4dZY0XZLkug,626
+google/adk/version.py,sha256=204Nt6sEgRq2nGzXu_YAVnNA2p7LJ05QFNcBial7Gqw,626
 google/adk/a2a/__init__.py,sha256=Q9FlRO2IfSE9yEaiAYzWkOMBJPCaNYqh4ihcp0t0BQs,574
 google/adk/a2a/converters/__init__.py,sha256=Q9FlRO2IfSE9yEaiAYzWkOMBJPCaNYqh4ihcp0t0BQs,574
-google/adk/a2a/converters/part_converter.py,sha256=2SxRkKRlhOih7mg33uefNVlBhOYOcOMomQhLSuV3_Kc,5056
+google/adk/a2a/converters/part_converter.py,sha256=lZXhEnnFGSbxJDDo_mClGISIiRxk9Rv0bwC0NtYS4Hw,5286
 google/adk/agents/__init__.py,sha256=WsCiBlvI-ISWrcntboo_sULvVJNwLNxXCe42UGPLKdY,1041
 google/adk/agents/active_streaming_tool.py,sha256=vFuh_PkdF5EyyneBBJ7Al8ojeTIR3OtsxLjckr9DbXE,1194
 google/adk/agents/base_agent.py,sha256=fCwAcR12IVVx8qXWGVf773zOmQEKnXDPwmoYYQwUfR4,12168
@@ -25,25 +25,24 @@ google/adk/artifacts/base_artifact_service.py,sha256=H-t5nckLTfr330utj8vxjH45z81
 google/adk/artifacts/gcs_artifact_service.py,sha256=-YU4NhZiGMnHHCg00aJWgKq4JWkQLh7EH5OuGusM5bE,5608
 google/adk/artifacts/in_memory_artifact_service.py,sha256=Iw34Ja89JwGgd3sulbxxk5pVMqzEZJCt4F2m15MC37U,4059
 google/adk/auth/__init__.py,sha256=GoFe0aZGdp0ExNE4rXNn1RuXLaB64j7Z-2C5e2Hsh8c,908
-google/adk/auth/auth_credential.py,sha256=w_icK-fWNyhk_tr-mhX97tzqjuxmWIDnurmTQgRvLEo,7055
+google/adk/auth/auth_credential.py,sha256=F1cMHe_gda5N6RXlyB0IYLLos-Jz-WcNFkIm9SjSiGQ,7012
 google/adk/auth/auth_handler.py,sha256=aUJrY8fzPvSZwi1rtB_N7fHuHt6DE-H8D8HnkDUCyZQ,6828
 google/adk/auth/auth_preprocessor.py,sha256=RleOG5I7L1EWVRdX_bC1WtKnt0FDKAcXSSh1RexJqtE,4309
 google/adk/auth/auth_schemes.py,sha256=dxx9bxjOWoae1fSVxbpaVTwa0I4v76_QJJFEX--1ueA,2260
 google/adk/auth/auth_tool.py,sha256=2N-lR5UrgBhwPaErwRusT1MrNDQGb8fuiMHO5x3cmck,3674
-google/adk/auth/credential_manager.py,sha256=OSJxYMJqTotyK4UueLeDDdmUfGuMuPC_nmwHjifPC_s,9671
+google/adk/auth/credential_manager.py,sha256=G5iqpStGHl4wZxkeqNDNljrEt1L_XNSfNVM9mmOqUhg,9503
 google/adk/auth/oauth2_credential_util.py,sha256=gIb1OUGA4NZRnIeLLk29T_Q9J8ibTxe7-357UhCW3FY,3340
 google/adk/auth/credential_service/__init__.py,sha256=Q9FlRO2IfSE9yEaiAYzWkOMBJPCaNYqh4ihcp0t0BQs,574
 google/adk/auth/credential_service/base_credential_service.py,sha256=4SK1UW9NiLNLrc_grpG3xyIPXySGpl0DIv9bTm-onWE,2325
 google/adk/auth/credential_service/in_memory_credential_service.py,sha256=xXG-3_uq3CU1Eilp8NGBhje0X77ROlAT5BKyJmLLyHg,2161
-google/adk/auth/exchanger/__init__.py,sha256=HCZ8KUqeXORwhjXqHCuezCrXsyVYliuo8YrLXvxS9wY,845
+google/adk/auth/exchanger/__init__.py,sha256=RHCK_Zg7hXzBKvz2Vrwvbx_cMXWittidIZToszaL3Nc,720
 google/adk/auth/exchanger/base_credential_exchanger.py,sha256=Uqzs_NhEDmuH5n0U_ES5fHlMSagyYEc5JKu-5GdOC_A,1644
 google/adk/auth/exchanger/credential_exchanger_registry.py,sha256=Nsk9BMmhFbZsXQwPckm8elXfbk6iIRSrvegR6DpcONo,1855
 google/adk/auth/exchanger/oauth2_credential_exchanger.py,sha256=FA0EYC-zfD1gO9CV9xDYYfPxU2EAJdYwVyWjVy3C6Bw,3649
-google/adk/auth/exchanger/service_account_credential_exchanger.py,sha256=AYVZcvOuOhNKPgwwgSOcxyZegi6xq4IW8vvNs_IMvXE,3804
 google/adk/auth/refresher/__init__.py,sha256=DEEkESlvEteCpO4QcDExm6K8S8y7l_oS-A2TK1Oh1xU,720
 google/adk/auth/refresher/base_credential_refresher.py,sha256=oDWBAuSnt5-00f8LwTrwTptuwkkUXknad8Zbp2mmOA4,2192
 google/adk/auth/refresher/credential_refresher_registry.py,sha256=ioHclgxCtpSeiUcMq9jwzPn0IzzxrQLpWSpHy90folA,1877
-google/adk/auth/refresher/oauth2_credential_refresher.py,sha256=TqpUMOo_Ln1bZSFYaTiHonSlUvb5-3Mn9npnYC2dF6g,5329
+google/adk/auth/refresher/oauth2_credential_refresher.py,sha256=HARpIwwXNxqo4_CNDpRFrN-p7RsnShgu21hgRFVwv4Q,4035
 google/adk/cli/__init__.py,sha256=ouPYnIY02VmGNfpA6IT8oSQdfeZd1LHVoDSt_x8zQPU,609
 google/adk/cli/__main__.py,sha256=gN8rRWlkh_3gLI-oYByxrKpCW9BIfDwrr0YuyisxmHo,646
 google/adk/cli/agent_graph.py,sha256=Kj5_a4UE1QXmqdRv4i4LI4hKHOrLkBS22Q759F3aRug,9879
@@ -116,7 +115,7 @@ google/adk/flows/llm_flows/auto_flow.py,sha256=CnuFelyZhB_ns4U_5_dW0x_KQlzu02My7
 google/adk/flows/llm_flows/base_llm_flow.py,sha256=uGqJ-b_Xygqgae1dndNh9tgTaj3luMKq3Qj4_jDf278,22660
 google/adk/flows/llm_flows/basic.py,sha256=263pfk6PIqKO-7BWo--bsBbpZJ8u5R9OK__WhpBgIbM,2848
 google/adk/flows/llm_flows/contents.py,sha256=bAklBI8YWctd0pGQCRwCVDqDxASiCNV_t8tJChPLbFg,13055
-google/adk/flows/llm_flows/functions.py,sha256=r082klTW5MRHs8H3e5DgkeYwBDk8kEw583UsnqINiZk,17556
+google/adk/flows/llm_flows/functions.py,sha256=NRzs9MfqCI8JjKBJCPk3iO_xXn0PzaBfy7NjQrdVsUU,17512
 google/adk/flows/llm_flows/identity.py,sha256=X4CRg12NvnopmydU9gbFJI4lW1_otN-w_GOAuPvKrXo,1651
 google/adk/flows/llm_flows/instructions.py,sha256=sO2dQ5hn6ybjXs2fWYWvEFVtACdpiiP0yKf9eNVjhhM,2879
 google/adk/flows/llm_flows/single_flow.py,sha256=gC677SxxammKx1XkZBzUdgBjDzeymKRcRQQxFGIur8Y,1904
@@ -207,7 +206,7 @@ google/adk/tools/google_api_tool/googleapi_to_openapi_converter.py,sha256=mo1ew3
 google/adk/tools/mcp_tool/__init__.py,sha256=UIXmz81_7s-kpZNSTOhpWXtQeMxXpjTwMRoDPDbCTkQ,1515
 google/adk/tools/mcp_tool/conversion_utils.py,sha256=PfPSBAPzAgBsEWk2goKOFHz4fM-9ralW-nMkCbs0b38,5339
 google/adk/tools/mcp_tool/mcp_session_manager.py,sha256=9QRcprgzfpUHBTePXE2rrUb3LKRQeGo38-Gb6LPbH2w,12946
-google/adk/tools/mcp_tool/mcp_tool.py,sha256=rqPTmd4xf5-oQjjLtdqwtAmjaYemZ6RlSdh3Y5iOR2A,6427
+google/adk/tools/mcp_tool/mcp_tool.py,sha256=9tHuqpjBKqcMeI8WvVXfWuWvxov8kzuG85REboblpL8,6081
 google/adk/tools/mcp_tool/mcp_toolset.py,sha256=dp3IhfdrK07CvZ5LERVtUBzlbbUOhnrmI0ND8Fn2eGk,6323
 google/adk/tools/openapi_tool/__init__.py,sha256=UMsewNCQjd-r1GBX1OMuUJTzJ0AlQuegIc98g04-0oU,724
 google/adk/tools/openapi_tool/auth/__init__.py,sha256=NVRXscqN4V0CSCvIp8J_ee8Xyw4m-OGoZn7SmrtOsQk,637
@@ -224,7 +223,7 @@ google/adk/tools/openapi_tool/openapi_spec_parser/openapi_spec_parser.py,sha256=
 google/adk/tools/openapi_tool/openapi_spec_parser/openapi_toolset.py,sha256=zxQtizsdW8FIqhpSzGfhkQLbBXIDZOK_0h8TrXayYZ4,5532
 google/adk/tools/openapi_tool/openapi_spec_parser/operation_parser.py,sha256=PhgkKRtSQi-gZa2RBeEzCX0A0Aekk2kLIo_cuf9aAQ0,9078
 google/adk/tools/openapi_tool/openapi_spec_parser/rest_api_tool.py,sha256=TMLDr-ODSEiok0l1ObPmuwcTOvOAjuxoMNBw_QwG5Pg,14650
-google/adk/tools/openapi_tool/openapi_spec_parser/tool_auth_handler.py,sha256=ALVwmWZzvc9kvqp3lBovZ_N4_LY0F1CrPUItNn-PXFI,10059
+google/adk/tools/openapi_tool/openapi_spec_parser/tool_auth_handler.py,sha256=9bqnlvmcr6i8Dab73ntzbynkFFWCYMhk7R-DS-jkOz4,10013
 google/adk/tools/retrieval/__init__.py,sha256=0euJjx0ReH8JmUI5-JU8kWRswqLxobRCDjx5zvX4rHY,1188
 google/adk/tools/retrieval/base_retrieval_tool.py,sha256=4aar8Kg-6rQG7Ht1n18D5fvJnuffodFdSjeCp-GzA7w,1174
 google/adk/tools/retrieval/files_retrieval.py,sha256=UvxXjs3t8O2VO7o4wagHah2ydHT6sl0bLMsKxDVTOHU,1271
@@ -234,8 +233,8 @@ google/adk/utils/__init__.py,sha256=Q9FlRO2IfSE9yEaiAYzWkOMBJPCaNYqh4ihcp0t0BQs,
 google/adk/utils/feature_decorator.py,sha256=DzGHMTStf4-S9BNiA4EqcCJbrdKijhgeSUSPdzM44H8,5048
 google/adk/utils/instructions_utils.py,sha256=al9Z-P8qOrbxNju8cqkeH7qRg0oQH7hfmvTG-0oSAQk,3996
 google/adk/utils/variant_utils.py,sha256=u9IuOn2aXG3ibDYshgLoogBXqH9Gd84ixArQoeLQiE8,1463
-google_adk-1.4.0.dist-info/entry_points.txt,sha256=zL9CU-6V2yQ2oc5lrcyj55ROHrpiIePsvQJ4H6SL-zI,43
-google_adk-1.4.0.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-google_adk-1.4.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-google_adk-1.4.0.dist-info/METADATA,sha256=ZJf1XYtlb1017k3bc5mNCXcOQuIwkevN2Lvx1avtj20,9981
-google_adk-1.4.0.dist-info/RECORD,,
+google_adk-1.4.1.dist-info/entry_points.txt,sha256=zL9CU-6V2yQ2oc5lrcyj55ROHrpiIePsvQJ4H6SL-zI,43
+google_adk-1.4.1.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+google_adk-1.4.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+google_adk-1.4.1.dist-info/METADATA,sha256=tt1qvxkFHQe0DgLQdGdiBikrs9VHhSAtbJqyT4i7rHQ,9981
+google_adk-1.4.1.dist-info/RECORD,,

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