NeoAnd/adk-python
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/adk-python.git synced 2025-07-14 01:41:25 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: update google api toolset to remove 'match' for python 3.9 compliant

Browse Source 
PiperOrigin-RevId: 758438091
This commit is contained in:
Xiang (Sean) Zhou 2025-05-13 17:20:32 -07:00 committed by Copybara-Service
parent d046367826
commit da55b5a943
3 changed files with 86 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/google/adk/tools/application_integration_tool/application_integration_toolset.py
View File

@ -130,7 +130,7 @@ class ApplicationIntegrationToolset:
self.tool_name = tool_name self.tool_name = tool_name
self.tool_instructions = tool_instructions self.tool_instructions = tool_instructions
self.service_account_json = service_account_json self.service_account_json = service_account_json
self.tool_filter = tool_filter self._tool_filter = tool_filter
integration_client = IntegrationClient( integration_client = IntegrationClient(
project, project,
@ -191,7 +191,7 @@ class ApplicationIntegrationToolset:
spec_dict=spec_dict, spec_dict=spec_dict,
auth_credential=auth_credential, auth_credential=auth_credential,
auth_scheme=auth_scheme, auth_scheme=auth_scheme,
tool_filter=self.tool_filter, tool_filter=self._tool_filter,
) )
return return

71
src/google/adk/tools/google_api_tool/__init__.py
View File

@ -36,52 +36,51 @@ _docs_toolset = None
def __getattr__(name): def __getattr__(name):
global _bigquery_toolset, _calendar_toolset, _gmail_toolset, _youtube_toolset, _slides_toolset, _sheets_toolset, _docs_toolset global _bigquery_toolset, _calendar_toolset, _gmail_toolset, _youtube_toolset, _slides_toolset, _sheets_toolset, _docs_toolset
match name: if name == 'bigquery_toolset':
case 'bigquery_toolset': if _bigquery_toolset is None:
if _bigquery_toolset is None: from .google_api_toolsets import bigquery_toolset as bigquery
from .google_api_toolsets import bigquery_toolset as bigquery
_bigquery_toolset = bigquery _bigquery_toolset = bigquery
return _bigquery_toolset return _bigquery_toolset
case 'calendar_toolset': if name == 'calendar_toolset':
if _calendar_toolset is None: if _calendar_toolset is None:
from .google_api_toolsets import calendar_toolset as calendar from .google_api_toolsets import calendar_toolset as calendar
_calendar_toolset = calendar _calendar_toolset = calendar
return _calendar_toolset return _calendar_toolset
case 'gmail_toolset': if name == 'gmail_toolset':
if _gmail_toolset is None: if _gmail_toolset is None:
from .google_api_toolsets import gmail_toolset as gmail from .google_api_toolsets import gmail_toolset as gmail
_gmail_toolset = gmail _gmail_toolset = gmail
return _gmail_toolset return _gmail_toolset
case 'youtube_toolset': if name == 'youtube_toolset':
if _youtube_toolset is None: if _youtube_toolset is None:
from .google_api_toolsets import youtube_toolset as youtube from .google_api_toolsets import youtube_toolset as youtube
_youtube_toolset = youtube _youtube_toolset = youtube
return _youtube_toolset return _youtube_toolset
case 'slides_toolset': if name == 'slides_toolset':
if _slides_toolset is None: if _slides_toolset is None:
from .google_api_toolsets import slides_toolset as slides from .google_api_toolsets import slides_toolset as slides
_slides_toolset = slides _slides_toolset = slides
return _slides_toolset return _slides_toolset
case 'sheets_toolset': if name == 'sheets_toolset':
if _sheets_toolset is None: if _sheets_toolset is None:
from .google_api_toolsets import sheets_toolset as sheets from .google_api_toolsets import sheets_toolset as sheets
_sheets_toolset = sheets _sheets_toolset = sheets
return _sheets_toolset return _sheets_toolset
case 'docs_toolset': if name == 'docs_toolset':
if _docs_toolset is None: if _docs_toolset is None:
from .google_api_toolsets import docs_toolset as docs from .google_api_toolsets import docs_toolset as docs
_docs_toolset = docs _docs_toolset = docs
return _docs_toolset return _docs_toolset

99
src/google/adk/tools/google_api_tool/google_api_toolsets.py
View File

@ -47,66 +47,65 @@ def __getattr__(name):
""" """
global _bigquery_toolset, _calendar_toolset, _gmail_toolset, _youtube_toolset, _slides_toolset, _sheets_toolset, _docs_toolset global _bigquery_toolset, _calendar_toolset, _gmail_toolset, _youtube_toolset, _slides_toolset, _sheets_toolset, _docs_toolset
match name: if name == "bigquery_toolset":
case "bigquery_toolset": if _bigquery_toolset is None:
if _bigquery_toolset is None: _bigquery_toolset = GoogleApiToolset.load_toolset(
_bigquery_toolset = GoogleApiToolset.load_toolset( api_name="bigquery",
api_name="bigquery", api_version="v2",
api_version="v2", )
)
return _bigquery_toolset return _bigquery_toolset
case "calendar_toolset": if name == "calendar_toolset":
if _calendar_toolset is None: if _calendar_toolset is None:
_calendar_toolset = GoogleApiToolset.load_toolset( _calendar_toolset = GoogleApiToolset.load_toolset(
api_name="calendar", api_name="calendar",
api_version="v3", api_version="v3",
) )
return _calendar_toolset return _calendar_toolset
case "gmail_toolset": if name == "gmail_toolset":
if _gmail_toolset is None: if _gmail_toolset is None:
_gmail_toolset = GoogleApiToolset.load_toolset( _gmail_toolset = GoogleApiToolset.load_toolset(
api_name="gmail", api_name="gmail",
api_version="v1", api_version="v1",
) )
return _gmail_toolset return _gmail_toolset
case "youtube_toolset": if name == "youtube_toolset":
if _youtube_toolset is None: if _youtube_toolset is None:
_youtube_toolset = GoogleApiToolset.load_toolset( _youtube_toolset = GoogleApiToolset.load_toolset(
api_name="youtube", api_name="youtube",
api_version="v3", api_version="v3",
) )
return _youtube_toolset return _youtube_toolset
case "slides_toolset": if name == "slides_toolset":
if _slides_toolset is None: if _slides_toolset is None:
_slides_toolset = GoogleApiToolset.load_toolset( _slides_toolset = GoogleApiToolset.load_toolset(
api_name="slides", api_name="slides",
api_version="v1", api_version="v1",
) )
return _slides_toolset return _slides_toolset
case "sheets_toolset": if name == "sheets_toolset":
if _sheets_toolset is None: if _sheets_toolset is None:
_sheets_toolset = GoogleApiToolset.load_toolset( _sheets_toolset = GoogleApiToolset.load_toolset(
api_name="sheets", api_name="sheets",
api_version="v4", api_version="v4",
) )
return _sheets_toolset return _sheets_toolset
case "docs_toolset": if name == "docs_toolset":
if _docs_toolset is None: if _docs_toolset is None:
_docs_toolset = GoogleApiToolset.load_toolset( _docs_toolset = GoogleApiToolset.load_toolset(
api_name="docs", api_name="docs",
api_version="v1", api_version="v1",
) )
return _docs_toolset return _docs_toolset