8000 fix: update google api toolset to remove 'match' for python 3.9 compl… · Syntax404-coder/adk-python@da55b5a · GitHub
[go: up one dir, main page]
Skip to content

Commit da55b5a

Browse files
seanzhougooglecopybara-github
seanzhougoogle
authored and
copybara-github
committed
fix: update google api toolset to remove 'match' for python 3.9 compliant
PiperOrigin-RevId: 758438091
1 parent d046367 commit da55b5a

File tree

3 files changed

+99
-101
lines changed

3 files changed

+99
-101
lines changed

‎src/google/adk/tools/application_integration_tool/application_integration_toolset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def __init__(
130130
self.tool_name = tool_name
131131
self.tool_instructions = tool_instructions
132132
self.service_account_json = service_account_json
133-
self.tool_filter = tool_filter
133+
self._tool_filter = tool_filter
134134

135135
integration_client = IntegrationClient(
136136
project,
@@ -191,7 +191,7 @@ def _parse_spec_to_toolset(self, spec_dict, connection_details):
191191
spec_dict=spec_dict,
192192
auth_credential=auth_credential,
193193
auth_scheme=auth_scheme,
194-
tool_filter=self.tool_filter,
194+
tool_filter=self._tool_filter,
195195
)
196196
return
197197

‎src/google/adk/tools/google_api_tool/__init__.py

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -36,52 +36,51 @@
3636
def __getattr__(name):
3737
global _bigquery_toolset, _calendar_toolset, _gmail_toolset, _youtube_toolset, _slides_toolset, _sheets_toolset, _docs_toolset
3838

39-
match name:
40-
case 'bigquery_toolset':
41-
if _bigquery_toolset is None:
42-
from .google_api_toolsets import bigquery_toolset as bigquery
39+
if name == 'bigquery_toolset':
40+
if _bigquery_toolset is None:
41+
from .google_api_toolsets import bigquery_toolset as bigquery
4342

44-
_bigquery_toolset = bigquery
45-
return _bigquery_toolset
43+
_bigquery_toolset = bigquery
44+
return _bigquery_toolset
4645

47-
case 'calendar_toolset':
48-
if _calendar_toolset is None:
49-
from .google_api_toolsets import calendar_toolset as calendar
46+
if name == 'calendar_toolset':
47+
if _calendar_toolset is None:
48+
from .google_api_toolsets import calendar_toolset as calendar
5049

51-
_calendar_toolset = calendar
52-
return _calendar_toolset
50+
_calendar_toolset = calendar
51+
return _calendar_toolset
5352

54-
case 'gmail_toolset':
55-
if _gmail_toolset is None:
56-
from .google_api_toolsets import gmail_toolset as gmail
53+
if name == 'gmail_toolset':
54+
if _gmail_toolset is None:
55+
from .google_api_toolsets import gmail_toolset as gmail
5756

58-
_gmail_toolset = gmail
59-
return _gmail_toolset
57+
_gmail_toolset = gmail
58+
return _gmail_toolset
6059

61-
case 'youtube_toolset':
62-
if _youtube_toolset is None:
63-
from .google_api_toolsets import youtube_toolset as youtube
60+
if name == 'youtube_toolset':
61+
if _youtube_toolset is None:
62+
from .google_api_toolsets import youtube_toolset as youtube
6463

65-
_youtube_toolset = youtube
66-
return _youtube_toolset
64+
_youtube_toolset = youtube
65+
return _youtube_toolset
6766

68-
case 'slides_toolset':
69-
if _slides_toolset is None:
70-
from .google_api_toolsets import slides_toolset as slides
67+
if name == 'slides_toolset':
68+
if _slides_toolset is None:
69+
from .google_api_toolsets import slides_toolset as slides
7170

72-
_slides_toolset = slides
73-
return _slides_toolset
71+
_slides_toolset = slides
72+
return _slides_toolset
7473

75-
case 'sheets_toolset':
76-
if _sheets_toolset is None:
77-
from .google_api_toolsets import sheets_toolset as sheets
74+
if name == 'sheets_toolset':
75+
if _sheets_toolset is None:
76+
from .google_api_toolsets import sheets_toolset as sheets
7877

79-
_sheets_toolset = sheets
80-
return _sheets_toolset
78+
_sheets_toolset = sheets
79+
return _sheets_toolset
8180

82-
case 'docs_toolset':
83-
if _docs_toolset is None:
84-
from .google_api_toolsets import docs_toolset as docs
81+
if name == 'docs_toolset':
82+
if _docs_toolset is None:
83+
from .google_api_toolsets import docs_toolset as docs
8584

86-
_docs_toolset = docs
87-
return _docs_toolset
85+
_docs_toolset = docs
86+
return _docs_toolset

‎src/google/adk/tools/google_api_tool/google_api_toolsets.py

Lines changed: 62 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -47,66 +47,65 @@ def __getattr__(name):
4747
"""
4848
global _bigquery_toolset, _calendar_toolset, _gmail_toolset, _youtube_toolset, _slides_toolset, _sheets_toolset, _docs_toolset
4949

50-
match name:
51-
case "bigquery_toolset":
52-
if _bigquery_toolset is None:
53-
_bigquery_toolset = GoogleApiToolset.load_toolset(
54-
api_name="bigquery",
55-
api_version="v2",
56-
)
57-
58-
return F438 _bigquery_toolset
59-
60-
case "calendar_toolset":
61-
if _calendar_toolset is None:
62-
_calendar_toolset = GoogleApiToolset.load_toolset(
63-
api_name="calendar",
64-
api_version="v3",
65-
)
66-
67-
return _calendar_toolset
68-
69-
case "gmail_toolset":
70-
if _gmail_toolset is None:
71-
_gmail_toolset = GoogleApiToolset.load_toolset(
72-
api_name="gmail",
73-
api_version="v1",
74-
)
75-
76-
return _gmail_toolset
77-
78-
case "youtube_toolset":
79-
if _youtube_toolset is None:
80-
_youtube_toolset = GoogleApiToolset.load_toolset(
81-
api_name="youtube",
82-
api_version="v3",
83-
)
84-
85-
return _youtube_toolset
86-
87-
case "slides_toolset":
88-
if _slides_toolset is None:
89-
_slides_toolset = GoogleApiToolset.load_toolset(
90-
api_name="slides",
91-
api_version="v1",
92-
)
93-
94-
return _slides_toolset
95-
96-
case "sheets_toolset":
97-
if _sheets_toolset is None:
98-
_sheets_toolset = GoogleApiToolset.load_toolset(
99-
api_name="sheets",
100-
api_version="v4",
101-
)
102-
103-
return _sheets_toolset
104-
105-
case "docs_toolset":
106-
if _docs_toolset is None:
107-
_docs_toolset = GoogleApiToolset.load_toolset(
108-
api_name="docs",
109-
api_version="v1",
110-
)
111-
112-
return _docs_toolset
50+
if name == "bigquery_toolset":
51+
if _bigquery_toolset is None:
52+
_bigquery_toolset = GoogleApiToolset.load_toolset(
53+
api_name="bigquery",
54+
api_version="v2",
55+
)
56+
57+
return _bigquery_toolset
58+
59+
if name == "calendar_toolset":
60+
if _calendar_toolset is None:
61+
_calendar_toolset = GoogleApiToolset.load_toolset(
62+
api_name="calendar",
63+
api_version="v3",
64+
)
65+
66+
return _calendar_toolset
67+
68+
if name == "gmail_toolset":
69+
if _gmail_toolset is None:
70+
_gmail_toolset = GoogleApiToolset.load_toolset(
71+
api_name="gmail",
72+
api_version="v1",
73+
)
74+
75+
return _gmail_toolset
76+
77+
if name == "youtube_toolset":
78+
if _youtube_toolset is None:
79+
_youtube_toolset = GoogleApiToolset.load_toolset(
80+
api_name="youtube",
81+
api_version="v3",
82+
)
83+
84+
return _youtube_toolset
85+
86+
if name == "slides_toolset":
87+
if _slides_toolset is None:
88+
_slides_toolset = GoogleApiToolset.load_toolset(
89+
api_name="slides",
90+
api_version="v1",
91+
)
92+
93+
return _slides_toolset
94+
95+
if name == "sheets_toolset":
96+
if _sheets_toolset is None:
97+
_sheets_toolset = GoogleApiToolset.load_toolset(
98+
api_name="sheets",
99+
api_version="v4",
100+
)
101+
102+
return _sheets_toolset
103+
104+
if name == "docs_toolset":
105+
if _docs_toolset is None:
106+
_docs_toolset = GoogleApiToolset.load_toolset(
107+
api_name="docs",
108+
api_version="v1",
109+
)
110+
111+
return _docs_toolset

0 commit comments

Comments
 (0)
0