PyPI - google-adk - Versions diffs - 1.2.1__tar.gz → 1.4.0__tar.gz - Mend

google-adk 1.2.1tar.gz → 1.4.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (245) hide show

{google_adk-1.2.1 → google_adk-1.4.0}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-adk
-Version: 1.2.1
+Version: 1.4.0
 Summary: Agent Development Kit
 Author-email: Google LLC <googleapis-packages@google.com>
 Requires-Python: >=3.9
@@ -19,6 +19,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: License :: OSI Approved :: Apache Software License
 License-File: LICENSE
+Requires-Dist: anyio>=4.9.0;python_version>='3.10'
 Requires-Dist: authlib>=1.5.1
 Requires-Dist: click>=8.1.8
 Requires-Dist: fastapi>=0.115.0
@@ -34,12 +35,17 @@ Requires-Dist: opentelemetry-api>=1.31.0
 Requires-Dist: opentelemetry-exporter-gcp-trace>=1.9.0
 Requires-Dist: opentelemetry-sdk>=1.31.0
 Requires-Dist: pydantic>=2.0, <3.0.0
+Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: PyYAML>=6.0.2
+Requires-Dist: requests>=2.32.4
 Requires-Dist: sqlalchemy>=2.0
-Requires-Dist: tzlocal>=5.3
+Requires-Dist: starlette>=0.46.2
 Requires-Dist: typing-extensions>=4.5, <5
+Requires-Dist: tzlocal>=5.3
 Requires-Dist: uvicorn>=0.34.0
+Requires-Dist: websockets>=15.0.1
+Requires-Dist: a2a-sdk>=0.2.7 ; extra == "a2a" and (python_version>='3.10')
 Requires-Dist: flit>=3.10.0 ; extra == "dev"
 Requires-Dist: isort>=6.0.0 ; extra == "dev"
 Requires-Dist: pyink>=24.10.0 ; extra == "dev"
@@ -76,6 +82,7 @@ Project-URL: changelog, https://github.com/google/adk-python/blob/main/CHANGELOG
 Project-URL: documentation, https://google.github.io/adk-docs/
 Project-URL: homepage, https://google.github.io/adk-docs/
 Project-URL: repository, https://github.com/google/adk-python
+Provides-Extra: a2a
 Provides-Extra: dev
 Provides-Extra: docs
 Provides-Extra: eval
@@ -87,6 +94,7 @@ Provides-Extra: test
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](LICENSE)
 [![Python Unit Tests](https://github.com/google/adk-python/actions/workflows/python-unit-tests.yml/badge.svg)](https://github.com/google/adk-python/actions/workflows/python-unit-tests.yml)
 [![r/agentdevelopmentkit](https://img.shields.io/badge/Reddit-r%2Fagentdevelopmentkit-FF4500?style=flat&logo=reddit&logoColor=white)](https://www.reddit.com/r/agentdevelopmentkit/)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/google/adk-python)
 <html>
     <h2 align="center">

{google_adk-1.2.1 → google_adk-1.4.0}/README.md RENAMED Viewed

@@ -3,6 +3,7 @@
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](LICENSE)
 [![Python Unit Tests](https://github.com/google/adk-python/actions/workflows/python-unit-tests.yml/badge.svg)](https://github.com/google/adk-python/actions/workflows/python-unit-tests.yml)
 [![r/agentdevelopmentkit](https://img.shields.io/badge/Reddit-r%2Fagentdevelopmentkit-FF4500?style=flat&logo=reddit&logoColor=white)](https://www.reddit.com/r/agentdevelopmentkit/)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/google/adk-python)
 <html>
     <h2 align="center">

{google_adk-1.2.1 → google_adk-1.4.0}/pyproject.toml RENAMED Viewed

@@ -25,27 +25,32 @@ classifiers = [ # List of https://pypi.org/classifiers/
 ]
 dependencies = [
   # go/keep-sorted start
-  "authlib>=1.5.1",                                  # For RestAPI Tool
-  "click>=8.1.8",                                    # For CLI tools
-  "fastapi>=0.115.0",                                # FastAPI framework
-  "google-api-python-client>=2.157.0",               # Google API client discovery
-  "google-cloud-aiplatform[agent_engines]>=1.95.1",  # For VertexAI integrations, e.g. example store.
-  "google-cloud-secret-manager>=2.22.0",             # Fetching secrets in RestAPI Tool
-  "google-cloud-speech>=2.30.0",                     # For Audio Transcription
-  "google-cloud-storage>=2.18.0, <3.0.0",            # For GCS Artifact service
-  "google-genai>=1.17.0",                            # Google GenAI SDK
-  "graphviz>=0.20.2",                                # Graphviz for graph rendering
-  "mcp>=1.8.0;python_version>='3.10'",               # For MCP Toolset
-  "opentelemetry-api>=1.31.0",                       # OpenTelemetry
+  "anyio>=4.9.0;python_version>='3.10'",            # For MCP Session Manager
+  "authlib>=1.5.1",                                 # For RestAPI Tool
+  "click>=8.1.8",                                   # For CLI tools
+  "fastapi>=0.115.0",                               # FastAPI framework
+  "google-api-python-client>=2.157.0",              # Google API client discovery
+  "google-cloud-aiplatform[agent_engines]>=1.95.1", # For VertexAI integrations, e.g. example store.
+  "google-cloud-secret-manager>=2.22.0",            # Fetching secrets in RestAPI Tool
+  "google-cloud-speech>=2.30.0",                    # For Audio Transcription
+  "google-cloud-storage>=2.18.0, <3.0.0",           # For GCS Artifact service
+  "google-genai>=1.17.0",                           # Google GenAI SDK
+  "graphviz>=0.20.2",                               # Graphviz for graph rendering
+  "mcp>=1.8.0;python_version>='3.10'",              # For MCP Toolset
+  "opentelemetry-api>=1.31.0",                      # OpenTelemetry
   "opentelemetry-exporter-gcp-trace>=1.9.0",
   "opentelemetry-sdk>=1.31.0",
-  "pydantic>=2.0, <3.0.0",                           # For data validation/models
-  "python-dotenv>=1.0.0",                            # To manage environment variables
-  "PyYAML>=6.0.2",                                   # For APIHubToolset.
-  "sqlalchemy>=2.0",                                 # SQL database ORM
-  "tzlocal>=5.3",                                    # Time zone utilities
+  "pydantic>=2.0, <3.0.0",                          # For data validation/models
+  "python-dateutil>=2.9.0.post0",                   # For Vertext AI Session Service
+  "python-dotenv>=1.0.0",                           # To manage environment variables
+  "PyYAML>=6.0.2",                                  # For APIHubToolset.
+  "requests>=2.32.4",
+  "sqlalchemy>=2.0",                                # SQL database ORM
+  "starlette>=0.46.2",                              # For FastAPI CLI
   "typing-extensions>=4.5, <5",
-  "uvicorn>=0.34.0",                                 # ASGI server for FastAPI
+  "tzlocal>=5.3",                                   # Time zone utilities
+  "uvicorn>=0.34.0",                                # ASGI server for FastAPI
+  "websockets>=15.0.1",                             # For BaseLlmFlow
   # go/keep-sorted end
 ]
 dynamic = ["version"]
@@ -71,6 +76,12 @@ dev = [
   # go/keep-sorted end
 ]
+a2a = [
+  # go/keep-sorted start
+  "a2a-sdk>=0.2.7;python_version>='3.10'"
+  # go/keep-sorted end
+]
 eval = [
   # go/keep-sorted start
   "google-cloud-aiplatform[evaluation]>=1.87.0",
@@ -84,7 +95,7 @@ test = [
   "anthropic>=0.43.0",               # For anthropic model tests
   "langchain-community>=0.3.17",
   "langgraph>=0.2.60",               # For LangGraphAgent
-  "litellm>=1.71.2",                # For LiteLLM tests
+  "litellm>=1.71.2",                 # For LiteLLM tests
   "llama-index-readers-file>=0.4.0", # For retrieval tests
   "pytest-asyncio>=0.25.0",
@@ -140,24 +151,30 @@ pyink-annotation-pragmas = [
 requires = ["flit_core >=3.8,<4"]
 build-backend = "flit_core.buildapi"
 [tool.flit.sdist]
 include = ['src/**/*', 'README.md', 'pyproject.toml', 'LICENSE']
 exclude = ['src/**/*.sh']
 [tool.flit.module]
 name = "google.adk"
 include = ["py.typed"]
 [tool.isort]
 profile = "google"
 single_line_exclusions = []
+line_length = 200                  # Prevent line wrap flickering.
 known_third_party = ["google.adk"]
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 asyncio_default_fixture_loop_scope = "function"
 asyncio_mode = "auto"
 [tool.mypy]
 python_version = "3.9"
 exclude = "tests/"

google_adk-1.4.0/src/google/adk/a2a/converters/part_converter.py ADDED Viewed

@@ -0,0 +1,166 @@
+# 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.
+"""
+module containing utilities for conversion betwen A2A Part and Google GenAI Part
+"""
+from __future__ import annotations
+import json
+import logging
+from typing import Optional
+from a2a import types as a2a_types
+from google.genai import types as genai_types
+from ...utils.feature_decorator import working_in_progress
+logger = logging.getLogger('google_adk.' + __name__)
+A2A_DATA_PART_METADATA_TYPE_KEY = 'type'
+A2A_DATA_PART_METADATA_TYPE_FUNCTION_CALL = 'function_call'
+A2A_DATA_PART_METADATA_TYPE_FUNCTION_RESPONSE = 'function_response'
+@working_in_progress
+def convert_a2a_part_to_genai_part(
+    a2a_part: a2a_types.Part,
+) -> Optional[genai_types.Part]:
+  """Convert an A2A Part to a Google GenAI Part."""
+  part = a2a_part.root
+  if isinstance(part, a2a_types.TextPart):
+    return genai_types.Part(text=part.text)
+  if isinstance(part, a2a_types.FilePart):
+    if isinstance(part.file, a2a_types.FileWithUri):
+      return genai_types.Part(
+          file_data=genai_types.FileData(
+              file_uri=part.file.uri, mime_type=part.file.mimeType
+          )
+      )
+    elif isinstance(part.file, a2a_types.FileWithBytes):
+      return genai_types.Part(
+          inline_data=genai_types.Blob(
+              data=part.file.bytes.encode('utf-8'), mime_type=part.file.mimeType
+          )
+      )
+    else:
+      logger.warning(
+          'Cannot convert unsupported file type: %s for A2A part: %s',
+          type(part.file),
+          a2a_part,
+      )
+      return None
+  if isinstance(part, a2a_types.DataPart):
+    # Conver the Data Part to funcall and function reponse.
+    # This is mainly for converting human in the loop and auth request and
+    # response.
+    # TODO once A2A defined how to suervice such information, migrate below
+    # logic accordinlgy
+    if part.metadata and A2A_DATA_PART_METADATA_TYPE_KEY in part.metadata:
+      if (
+          part.metadata[A2A_DATA_PART_METADATA_TYPE_KEY]
+          == A2A_DATA_PART_METADATA_TYPE_FUNCTION_CALL
+      ):
+        return genai_types.Part(
+            function_call=genai_types.FunctionCall.model_validate(
+                part.data, by_alias=True
+            )
+        )
+      if (
+          part.metadata[A2A_DATA_PART_METADATA_TYPE_KEY]
+          == A2A_DATA_PART_METADATA_TYPE_FUNCTION_RESPONSE
+      ):
+        return genai_types.Part(
+            function_response=genai_types.FunctionResponse.model_validate(
+                part.data, by_alias=True
+            )
+        )
+    return genai_types.Part(text=json.dumps(part.data))
+  logger.warning(
+      'Cannot convert unsupported part type: %s for A2A part: %s',
+      type(part),
+      a2a_part,
+  )
+  return None
+@working_in_progress
+def convert_genai_part_to_a2a_part(
+    part: genai_types.Part,
+) -> Optional[a2a_types.Part]:
+  """Convert a Google GenAI Part to an A2A Part."""
+  if part.text:
+    return a2a_types.TextPart(text=part.text)
+  if part.file_data:
+    return a2a_types.FilePart(
+        file=a2a_types.FileWithUri(
+            uri=part.file_data.file_uri,
+            mimeType=part.file_data.mime_type,
+        )
+    )
+  if part.inline_data:
+    return a2a_types.Part(
+        root=a2a_types.FilePart(
+            file=a2a_types.FileWithBytes(
+                bytes=part.inline_data.data,
+                mimeType=part.inline_data.mime_type,
+            )
+        )
+    )
+  # Conver the funcall and function reponse to A2A DataPart.
+  # This is mainly for converting human in the loop and auth request and
+  # response.
+  # TODO once A2A defined how to suervice such information, migrate below
+  # logic accordinlgy
+  if part.function_call:
+    return a2a_types.Part(
+        root=a2a_types.DataPart(
+            data=part.function_call.model_dump(
+                by_alias=True, exclude_none=True
+            ),
+            metadata={
+                A2A_DATA_PART_METADATA_TYPE_KEY: (
+                    A2A_DATA_PART_METADATA_TYPE_FUNCTION_CALL
+                )
+            },
+        )
+    )
+  if part.function_response:
+    return a2a_types.Part(
+        root=a2a_types.DataPart(
+            data=part.function_response.model_dump(
+                by_alias=True, exclude_none=True
+            ),
+            metadata={
+                A2A_DATA_PART_METADATA_TYPE_KEY: (
+                    A2A_DATA_PART_METADATA_TYPE_FUNCTION_RESPONSE
+                )
+            },
+        )
+    )
+  logger.warning(
+      'Cannot convert unsupported part for Google GenAI part: %s',
+      part,
+  )
+  return None

{google_adk-1.2.1 → google_adk-1.4.0}/src/google/adk/agents/invocation_context.py RENAMED Viewed

@@ -22,6 +22,7 @@ from pydantic import BaseModel
 from pydantic import ConfigDict
 from ..artifacts.base_artifact_service import BaseArtifactService
+from ..auth.credential_service.base_credential_service import BaseCredentialService
 from ..memory.base_memory_service import BaseMemoryService
 from ..sessions.base_session_service import BaseSessionService
 from ..sessions.session import Session
@@ -115,6 +116,7 @@ class InvocationContext(BaseModel):
   artifact_service: Optional[BaseArtifactService] = None
   session_service: BaseSessionService
   memory_service: Optional[BaseMemoryService] = None
+  credential_service: Optional[BaseCredentialService] = None
   invocation_id: str
   """The id of this invocation context. Readonly."""

{google_adk-1.2.1 → google_adk-1.4.0}/src/google/adk/agents/llm_agent.py RENAMED Viewed

@@ -129,7 +129,7 @@ class LlmAgent(BaseAgent):
   global_instruction: Union[str, InstructionProvider] = ''
   """Instructions for all the agents in the entire agent tree.
-  global_instruction ONLY takes effect in root agent.
+  ONLY the global_instruction in root agent will take effect.
   For example: use global_instruction to make all agents have a stable identity
   or personality.
@@ -204,11 +204,6 @@ class LlmAgent(BaseAgent):
   """
   # Advance features - End
-  # TODO: remove below fields after migration. - Start
-  # These fields are added back for easier migration.
-  examples: Optional[ExamplesUnion] = None
-  # TODO: remove above fields after migration. - End
   # Callbacks - Start
   before_model_callback: Optional[BeforeModelCallback] = None
   """Callback or list of callbacks to be called before calling the LLM.

{google_adk-1.2.1 → google_adk-1.4.0}/src/google/adk/agents/run_config.py RENAMED Viewed

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from __future__ import annotations
 from enum import Enum
 import logging
 import sys
@@ -68,6 +70,15 @@ class RunConfig(BaseModel):
   input_audio_transcription: Optional[types.AudioTranscriptionConfig] = None
   """Input transcription for live agents with audio input from user."""
+  realtime_input_config: Optional[types.RealtimeInputConfig] = None
+  """Realtime input config for live agents with audio input from user."""
+  enable_affective_dialog: Optional[bool] = None
+  """If enabled, the model will detect emotions and adapt its responses accordingly."""
+  proactivity: Optional[types.ProactivityConfig] = None
+  """Configures the proactivity of the model. This allows the model to respond proactively to the input and to ignore irrelevant input."""
   max_llm_calls: int = 500
   """
   A limit on the total number of llm calls for a given run.

{google_adk-1.2.1 → google_adk-1.4.0}/src/google/adk/auth/auth_credential.py RENAMED Viewed

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from __future__ import annotations
 from enum import Enum
 from typing import Any
 from typing import Dict
@@ -75,6 +77,8 @@ class OAuth2Auth(BaseModelWithConfig):
   auth_code: Optional[str] = None
   access_token: Optional[str] = None
   refresh_token: Optional[str] = None
+  expires_at: Optional[int] = None
+  expires_in: Optional[int] = None
 class ServiceAccountCredential(BaseModelWithConfig):
@@ -226,3 +230,4 @@ 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.2.1 → google_adk-1.4.0}/src/google/adk/auth/auth_handler.py RENAMED Viewed

@@ -16,16 +16,13 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
-from fastapi.openapi.models import OAuth2
 from fastapi.openapi.models import SecurityBase
 from .auth_credential import AuthCredential
-from .auth_credential import AuthCredentialTypes
-from .auth_credential import OAuth2Auth
 from .auth_schemes import AuthSchemeType
-from .auth_schemes import OAuthGrantType
 from .auth_schemes import OpenIdConnectWithConfig
 from .auth_tool import AuthConfig
+from .exchanger.oauth2_credential_exchanger import OAuth2CredentialExchanger
 if TYPE_CHECKING:
   from ..sessions.state import State
@@ -33,86 +30,31 @@ if TYPE_CHECKING:
 try:
   from authlib.integrations.requests_client import OAuth2Session
-  SUPPORT_TOKEN_EXCHANGE = True
+  AUTHLIB_AVIALABLE = True
 except ImportError:
-  SUPPORT_TOKEN_EXCHANGE = False
+  AUTHLIB_AVIALABLE = False
 class AuthHandler:
+  """A handler that handles the auth flow in Agent Development Kit to help
+  orchestrate the credential request and response flow (e.g. OAuth flow)
+  This class should only be used by Agent Development Kit.
+  """
   def __init__(self, auth_config: AuthConfig):
     self.auth_config = auth_config
-  def exchange_auth_token(
+  async def exchange_auth_token(
       self,
   ) -> AuthCredential:
-    """Generates an auth token from the authorization response.
-    Returns:
-        An AuthCredential object containing the access token.
-    Raises:
-        ValueError: If the token endpoint is not configured in the auth
-            scheme.
-        AuthCredentialMissingError: If the access token cannot be retrieved
-            from the token endpoint.
-    """
-    auth_scheme = self.auth_config.auth_scheme
-    auth_credential = self.auth_config.exchanged_auth_credential
-    if not SUPPORT_TOKEN_EXCHANGE:
-      return auth_credential
-    if isinstance(auth_scheme, OpenIdConnectWithConfig):
-      if not hasattr(auth_scheme, "token_endpoint"):
-        return self.auth_config.exchanged_auth_credential
-      token_endpoint = auth_scheme.token_endpoint
-      scopes = auth_scheme.scopes
-    elif isinstance(auth_scheme, OAuth2):
-      if (
-          not auth_scheme.flows.authorizationCode
-          or not auth_scheme.flows.authorizationCode.tokenUrl
-      ):
-        return self.auth_config.exchanged_auth_credential
-      token_endpoint = auth_scheme.flows.authorizationCode.tokenUrl
-      scopes = list(auth_scheme.flows.authorizationCode.scopes.keys())
-    else:
-      return self.auth_config.exchanged_auth_credential
-    if (
-        not auth_credential
-        or not auth_credential.oauth2
-        or not auth_credential.oauth2.client_id
-        or not auth_credential.oauth2.client_secret
-        or auth_credential.oauth2.access_token
-        or auth_credential.oauth2.refresh_token
-    ):
-      return self.auth_config.exchanged_auth_credential
-    client = OAuth2Session(
-        auth_credential.oauth2.client_id,
-        auth_credential.oauth2.client_secret,
-        scope=" ".join(scopes),
-        redirect_uri=auth_credential.oauth2.redirect_uri,
-        state=auth_credential.oauth2.state,
+    exchanger = OAuth2CredentialExchanger()
+    return await exchanger.exchange(
+        self.auth_config.exchanged_auth_credential, self.auth_config.auth_scheme
     )
-    tokens = client.fetch_token(
-        token_endpoint,
-        authorization_response=auth_credential.oauth2.auth_response_uri,
-        code=auth_credential.oauth2.auth_code,
-        grant_type=OAuthGrantType.AUTHORIZATION_CODE,
-    )
-    updated_credential = AuthCredential(
-        auth_type=AuthCredentialTypes.OAUTH2,
-        oauth2=OAuth2Auth(
-            access_token=tokens.get("access_token"),
-            refresh_token=tokens.get("refresh_token"),
-        ),
-    )
-    return updated_credential
-  def parse_and_store_auth_response(self, state: State) -> None:
+  async def parse_and_store_auth_response(self, state: State) -> None:
-    credential_key = self.get_credential_key()
+    credential_key = "temp:" + self.auth_config.credential_key
     state[credential_key] = self.auth_config.exchanged_auth_credential
     if not isinstance(
@@ -123,14 +65,14 @@ class AuthHandler:
     ):
       return
-    state[credential_key] = self.exchange_auth_token()
+    state[credential_key] = await self.exchange_auth_token()
   def _validate(self) -> None:
     if not self.auth_scheme:
       raise ValueError("auth_scheme is empty.")
   def get_auth_response(self, state: State) -> AuthCredential:
-    credential_key = self.get_credential_key()
+    credential_key = "temp:" + self.auth_config.credential_key
     return state.get(credential_key, None)
   def generate_auth_request(self) -> AuthConfig:
@@ -192,29 +134,6 @@ class AuthHandler:
         exchanged_auth_credential=exchanged_credential,
     )
-  def get_credential_key(self) -> str:
-    """Generates a unique key for the given auth scheme and credential."""
-    auth_scheme = self.auth_config.auth_scheme
-    auth_credential = self.auth_config.raw_auth_credential
-    if auth_scheme.model_extra:
-      auth_scheme = auth_scheme.model_copy(deep=True)
-      auth_scheme.model_extra.clear()
-    scheme_name = (
-        f"{auth_scheme.type_.name}_{hash(auth_scheme.model_dump_json())}"
-        if auth_scheme
-        else ""
-    )
-    if auth_credential.model_extra:
-      auth_credential = auth_credential.model_copy(deep=True)
-      auth_credential.model_extra.clear()
-    credential_name = (
-        f"{auth_credential.auth_type.value}_{hash(auth_credential.model_dump_json())}"
-        if auth_credential
-        else ""
-    )
-    return f"temp:adk_{scheme_name}_{credential_name}"
   def generate_auth_uri(
       self,
   ) -> AuthCredential:
@@ -227,6 +146,13 @@ class AuthHandler:
         ValueError: If the authorization endpoint is not configured in the auth
             scheme.
     """
+    if not AUTHLIB_AVIALABLE:
+      return (
+          self.auth_config.raw_auth_credential.model_copy(deep=True)
+          if self.auth_config.raw_auth_credential
+          else None
+      )
     auth_scheme = self.auth_config.auth_scheme
     auth_credential = self.auth_config.raw_auth_credential

{google_adk-1.2.1 → google_adk-1.4.0}/src/google/adk/auth/auth_preprocessor.py RENAMED Viewed

@@ -67,9 +67,9 @@ class _AuthLlmRequestProcessor(BaseLlmRequestProcessor):
         # function call
         request_euc_function_call_ids.add(function_call_response.id)
         auth_config = AuthConfig.model_validate(function_call_response.response)
-        AuthHandler(auth_config=auth_config).parse_and_store_auth_response(
-            state=invocation_context.session.state
-        )
+        await AuthHandler(
+            auth_config=auth_config
+        ).parse_and_store_auth_response(state=invocation_context.session.state)
       break
     if not request_euc_function_call_ids:

{google_adk-1.2.1 → google_adk-1.4.0}/src/google/adk/auth/auth_tool.py RENAMED Viewed

@@ -12,6 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from __future__ import annotations
+from typing import Optional
+from typing_extensions import deprecated
 from .auth_credential import AuthCredential
 from .auth_credential import BaseModelWithConfig
 from .auth_schemes import AuthScheme
@@ -43,6 +49,46 @@ class AuthConfig(BaseModelWithConfig):
   this field to guide the user through the OAuth2 flow and fill auth response in
   this field"""
+  credential_key: Optional[str] = None
+  """A user specified key used to load and save this credential in a credential
+  service.
+  """
+  def __init__(self, **data):
+    super().__init__(**data)
+    if self.credential_key:
+      return
+    self.credential_key = self.get_credential_key()
+  @deprecated("This method is deprecated. Use credential_key instead.")
+  def get_credential_key(self):
+    """Builds a hash key based on auth_scheme and raw_auth_credential used to
+    save / load this credential to / from a credentials service.
+    """
+    auth_scheme = self.auth_scheme
+    if auth_scheme.model_extra:
+      auth_scheme = auth_scheme.model_copy(deep=True)
+      auth_scheme.model_extra.clear()
+    scheme_name = (
+        f"{auth_scheme.type_.name}_{hash(auth_scheme.model_dump_json())}"
+        if auth_scheme
+        else ""
+    )
+    auth_credential = self.raw_auth_credential
+    if auth_credential and auth_credential.model_extra:
+      auth_credential = auth_credential.model_copy(deep=True)
+      auth_credential.model_extra.clear()
+    credential_name = (
+        f"{auth_credential.auth_type.value}_{hash(auth_credential.model_dump_json())}"
+        if auth_credential
+        else ""
+    )
+    return f"adk_{scheme_name}_{credential_name}"
 class AuthToolArguments(BaseModelWithConfig):
   """the arguments for the special long running function tool that is used to

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

google-adk 1.2.1tar.gz → 1.4.0tar.gz