encounter/adk-python
0
0
Fork 0
mirror of https://github.com/encounter/adk-python.git synced 2026-07-09 18:19:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix!: Make credential manager to accept tool_context instead of callback_context

Browse Source 
This seems a breaking change, but actually credential manager is used internally only and also it won't work if some one call it using callback context

Co-authored-by: Xiang (Sean) Zhou <seanzhougoogle@google.com>
PiperOrigin-RevId: 863534476
This commit is contained in:
Xiang (Sean) Zhou
2026-01-30 21:59:43 -08:00
committed by Copybara-Service
parent 798d0053c8
commit fe82f3cde8
2 changed files with 54 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/google/adk/auth/credential_manager.py
+19 -19
View File
@@ -19,8 +19,8 @@ from typing import Optional
from fastapi.openapi.models import OAuth2
from ..agents.callback_context import CallbackContext
from ..tools.openapi_tool.auth.credential_exchangers.service_account_exchanger import ServiceAccountCredentialExchanger
from ..tools.tool_context import ToolContext
from ..utils.feature_decorator import experimental
from .auth_credential import AuthCredential
from .auth_credential import AuthCredentialTypes
@@ -72,7 +72,7 @@ class CredentialManager:
)
# Load and prepare credential
credential = await manager.load_auth_credential(callback_context)
credential = await manager.load_auth_credential(tool_context)
```
"""
@@ -124,11 +124,11 @@ class CredentialManager:
"""
self._exchanger_registry.register(credential_type, exchanger_instance)
async def request_credential(self, callback_context: CallbackContext) -> None:
callback_context.request_credential(self._auth_config)
async def request_credential(self, tool_context: ToolContext) -> None:
tool_context.request_credential(self._auth_config)
async def get_auth_credential(
self, callback_context: CallbackContext
self, tool_context: ToolContext
) -> Optional[AuthCredential]:
"""Load and prepare authentication credential through a structured workflow."""
@@ -140,14 +140,14 @@ class CredentialManager:
return self._auth_config.raw_auth_credential
# Step 3: Try to load existing processed credential
credential = await self._load_existing_credential(callback_context)
credential = await self._load_existing_credential(tool_context)
# Step 4: If no existing credential, load from auth response
# TODO instead of load from auth response, we can store auth response in
# credential service.
was_from_auth_response = False
if not credential:
credential = await self._load_from_auth_response(callback_context)
credential = await self._load_from_auth_response(tool_context)
was_from_auth_response = True
# Step 5: If still no credential available, check if client credentials
@@ -169,38 +169,38 @@ class CredentialManager:
# Step 8: Save credential if it was modified
if was_from_auth_response or was_exchanged or was_refreshed:
await self._save_credential(callback_context, credential)
await self._save_credential(tool_context, credential)
return credential
async def _load_existing_credential(
self, callback_context: CallbackContext
self, tool_context: ToolContext
) -> Optional[AuthCredential]:
"""Load existing credential from credential service."""
# Try loading from credential service first
credential = await self._load_from_credential_service(callback_context)
credential = await self._load_from_credential_service(tool_context)
if credential:
return credential
return None
async def _load_from_credential_service(
self, callback_context: CallbackContext
self, tool_context: ToolContext
) -> Optional[AuthCredential]:
"""Load credential from credential service if available."""
credential_service = callback_context._invocation_context.credential_service
credential_service = tool_context._invocation_context.credential_service
if credential_service:
# Note: This should be made async in a future refactor
# For now, assuming synchronous operation
return await callback_context.load_credential(self._auth_config)
return await tool_context.load_credential(self._auth_config)
return None
async def _load_from_auth_response(
self, callback_context: CallbackContext
self, tool_context: ToolContext
) -> Optional[AuthCredential]:
"""Load credential from auth response in callback context."""
return callback_context.get_auth_response(self._auth_config)
"""Load credential from auth response in tool context."""
return tool_context.get_auth_response(self._auth_config)
async def _exchange_credential(
self, credential: AuthCredential
@@ -290,15 +290,15 @@ class CredentialManager:
# Additional validation can be added here
async def _save_credential(
self, callback_context: CallbackContext, credential: AuthCredential
self, tool_context: ToolContext, credential: AuthCredential
) -> None:
"""Save credential to credential service if available."""
# Update the exchanged credential in config
self._auth_config.exchanged_auth_credential = credential
credential_service = callback_context._invocation_context.credential_service
credential_service = tool_context._invocation_context.credential_service
if credential_service:
await callback_context.save_credential(self._auth_config)
await tool_context.save_credential(self._auth_config)
async def _populate_auth_scheme(self) -> bool:
"""Auto-discover server metadata and populate missing auth scheme info.