8000 rename tool_set to toolset to uniform the naming · fu/adk-python@931fb33 · GitHub
[go: up one dir, main page]
Skip to content

Commit 931fb33

Browse files
seanzhougooglecopybara-github
seanzhougoogle
authored and
copybara-github
committed
rename tool_set to toolset to uniform the naming
PiperOrigin-RevId: 758422703
1 parent af978fe commit 931fb33

File tree

5 files changed

+101
-101
lines changed

5 files changed

+101
-101
lines changed

‎contributing/samples/bigquery_agent/agent.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
from dotenv import load_dotenv
1818
from google.adk import Agent
19-
from google.adk.tools.google_api_tool import bigquery_tool_set
19+
from google.adk.tools.google_api_tool import bigquery_toolset
2020

2121
# Load environment variables from .env file
2222
load_dotenv()
2323

2424
# Access the variable
2525
oauth_client_id = os.getenv("OAUTH_CLIENT_ID")
2626
oauth_client_secret = os.getenv("OAUTH_CLIENT_SECRET")
27-
bigquery_tool_set.configure_auth(oauth_client_id, oauth_client_secret)
27+
bigquery_toolset.configure_auth(oauth_client_id, oauth_client_secret)
2828

2929
tools_to_expose = [
3030
"bigquery_datasets_list",
@@ -34,7 +34,7 @@
3434
"bigquery_tables_get",
3535
"bigquery_tables_insert",
3636
]
37-
bigquery_tool_set.set_tool_filter(
37+
bigquery_toolset.set_tool_filter(
3838
lambda tool, ctx=None: tool.name in tools_to_expose
3939
)
4040

@@ -74,5 +74,5 @@
7474
{userInfo?}
7575
</User>
7676
""",
77-
tools=[bigquery_tool_set],
77+
tools=[bigquery_toolset],
7878
)

‎contributing/samples/oauth_calendar_agent/agent.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from google.adk.auth import AuthCredentialTypes
2828
from google.adk.auth import OAuth2Auth
2929
from google.adk.tools import ToolContext
30-
from google.adk.tools.google_api_tool import calendar_tool_set
30+
from google.adk.tools.google_api_tool import calendar_toolset
3131
from google.auth.transport.requests import Request
3232
from google.oauth2.credentials import Credentials
3333
from googleapiclient.discovery import build
@@ -42,15 +42,15 @@
4242

4343
SCOPES = ["https://www.googleapis.com/auth/calendar"]
4444

45-
calendar_tool_set.configure_auth(
45+
calendar_toolset.configure_auth(
4646
client_id=oauth_client_id, client_secret=oauth_client_secret
4747
)
48-
calendar_tool_set.set_tool_filter(
49-
# you can also replace below customized `list_calendar_events` with build-in
50-
# google calendar tool by adding `calendar_events_list` in the filter list
51-
lambda tool, ctx=None: tool.name
52-
in ["calendar_events_get"]
53-
)
48+
49+
get_calendar_events = calendar_toolset.get_tool("calendar_events_get")
50+
# list_calendar_events = calendar_toolset.get_tool("calendar_events_list")
51+
# you can replace below customized list_calendar_events tool with above ADK
52+
# build-in google calendar tool which is commented for now to acheive same
53+
# effect.
5454

5555

5656
def list_calendar_events(
@@ -210,6 +210,6 @@ def update_time(callback_context: CallbackContext):
210210
211211
Currnet time: {_time}
212212
""",
213-
tools=[list_calendar_events, calendar_tool_set],
213+
tools=[list_calendar_events, get_calendar_events],
214214
before_agent_callback=update_time,
215215
)

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

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -12,76 +12,76 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
__all__ = [
15-
'bigquery_tool_set',
16-
'calendar_tool_set',
17-
'gmail_tool_set',
18-
'youtube_tool_set',
19-
'slides_tool_set',
20-
'sheets_tool_set',
21-
'docs_tool_set',
15+
'bigquery_toolset',
16+
'calendar_toolset',
17+
'gmail_toolset',
18+
'youtube_toolset',
19+
'slides_toolset',
20+
'sheets_toolset',
21+
'docs_toolset',
2222
]
2323

2424
# Nothing is imported here automatically
2525
# Each tool set will only be imported when accessed
2626

27-
_bigquery_tool_set = None
28-
_calendar_tool_set = None
29-
_gmail_tool_set = None
30-
_youtube_tool_set = None
31-
_slides_tool_set = None
32-
_sheets_tool_set = None
33-
_docs_tool_set = None
27+
_bigquery_toolset = None
28+
_calendar_toolset = None
29+
_gmail_toolset = None
30+
_youtube_toolset = None
31+
_slides_toolset = None
32+
_sheets_toolset = None
33+
_docs_toolset = None
3434

3535

3636
def __getattr__(name):
37-
global _bigquery_tool_set, _calendar_tool_set, _gmail_tool_set, _youtube_tool_set, _slides_tool_set, _sheets_tool_set, _docs_tool_set
37+
global _bigquery_toolset, _calendar_toolset, _gmail_toolset, _youtube_toolset, _slides_toolset, _sheets_toolset, _docs_toolset
3838

3939
match name:
40-
case 'bigquery_tool_set':
41-
if _bigquery_tool_set is None:
42-
from .google_api_tool_sets import bigquery_tool_set as bigquery
40+
case 'bigquery_toolset':
41+
if _bigquery_toolset is None:
42+
from .google_api_toolsets import bigquery_toolset as bigquery
4343

44-
_bigquery_tool_set = bigquery
45-
return _bigquery_tool_set
44+
_bigquery_toolset = bigquery
45+
return _bigquery_toolset
4646

47-
case 'calendar_tool_set':
48-
if _calendar_tool_set is None:
49-
from .google_api_tool_sets import calendar_tool_set as calendar
47+
case 'calendar_toolset':
48+
if _calendar_toolset is None:
49+
from .google_api_toolsets import calendar_toolset as calendar
5050

51-
_calendar_tool_set = calendar
52-
return _calendar_tool_set
51+
_calendar_toolset = calendar
52+
return _calendar_toolset
5353

54-
case 'gmail_tool_set':
55-
if _gmail_tool_set is None:
56-
from .google_api_tool_sets import gmail_tool_set as gmail
54+
case 'gmail_toolset':
55+
if _gmail_toolset is None:
56+
from .google_api_toolsets import gmail_toolset as gmail
5757

58-
_gmail_tool_set = gmail
59-
return _gmail_tool_set
58+
_gmail_toolset = gmail
59+
return _gmail_toolset
6060

61-
case 'youtube_tool_set':
62-
if _youtube_tool_set is None:
63-
from .google_api_tool_sets import youtube_tool_set as youtube
61+
case 'youtube_toolset':
62+
if _youtube_toolset is None:
63+
from .google_api_toolsets import youtube_toolset as youtube
6464

65-
_youtube_tool_set = youtube
66-
return _youtube_tool_set
65+
_youtube_toolset = youtube
66+
return _youtube_toolset
6767

68-
case 'slides_tool_set':
69-
if _slides_tool_set is None:
70-
from .google_api_tool_sets import slides_tool_set as slides
68+
case 'slides_toolset':
69+
if _slides_toolset is None:
70+
from .google_api_toolsets import slides_toolset as slides
7171

72-
_slides_tool_set = slides
73-
return _slides_tool_set
72+
_slides_toolset = slides
73+
return _slides_toolset
7474

75-
case 'sheets_tool_set':
76-
if _sheets_tool_set is None:
77-
from .google_api_tool_sets import sheets_tool_set as sheets
75+
case 'sheets_toolset':
76+
if _sheets_toolset is None:
77+
from .google_api_toolsets import sheets_toolset as sheets
7878

79-
_sheets_tool_set = sheets
80-
return _sheets_tool_set
79+
_sheets_toolset = sheets
80+
return _sheets_toolset
8181

82-
case 'docs_tool_set':
83-
if _docs_tool_set is None:
84-
from .google_api_tool_sets import docs_tool_set as docs
82+
case 'docs_toolset':
83+
if _docs_toolset is None:
84+
from .google_api_toolsets import docs_toolset as docs
8585

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

‎src/google/adk/tools/google_api_tool/google_api_tool_set.py renamed to ‎src/google/adk/tools/google_api_tool/google_api_toolset.py

File renamed without changes.

‎src/google/adk/tools/google_api_tool/google_api_tool_sets.py renamed to ‎src/google/adk/tools/google_api_tool/google_api_toolsets.py

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515

1616
import logging
1717

18-
from .google_api_tool_set import GoogleApiToolset
18+
from .google_api_toolset import GoogleApiToolset
1919

2020
logger = logging.getLogger(__name__)
2121

22-
_bigquery_tool_set = None
23-
_calendar_tool_set = None
24-
_gmail_tool_set = None
25-
_youtube_tool_set = None
26-
_slides_tool_set = None
27-
_sheets_tool_set = None
28-
_docs_tool_set = None
22+
_bigquery_toolset = None
23+
_calendar_toolset = None
24+
_gmail_toolset = None
25+
_youtube_toolset = None
26+
_slides_toolset = None
27+
_sheets_toolset = None
28+
_docs_toolset = None
2929

3030

3131
def __getattr__(name):
@@ -37,76 +37,76 @@ def __getattr__(name):
3737
3838
Args:
3939
name (str): The name of the tool set to retrieve (e.g.,
40-
"bigquery_tool_set").
40+
"bigquery_toolset").
4141
4242
Returns:
4343
GoogleApiToolSet: The requested tool set instance.
4444
4545
Raises:
4646
AttributeError: If the requested tool set name is not recognized.
4747
"""
48-
global _bigquery_tool_set, _calendar_tool_set, _gmail_tool_set, _youtube_tool_set, _slides_tool_set, _sheets_tool_set, _docs_tool_set
48+
global _bigquery_toolset, _calendar_toolset, _gmail_toolset, _youtube_toolset, _slides_toolset, _sheets_toolset, _docs_toolset
4949

5050
match name:
51-
case "bigquery_tool_set":
52-
if _bigquery_tool_set is None:
53-
_bigquery_tool_set = GoogleApiToolset.load_toolset(
51+
case "bigquery_toolset":
52+
if _bigquery_toolset is None:
53+
_bigquery_toolset = GoogleApiToolset.load_toolset(
5454
api_name="bigquery",
5555
api_version="v2",
5656
)
5757

58-
return _bigquery_tool_set
58+
return _bigquery_toolset
5959

60-
case "calendar_tool_set":
61-
if _calendar_tool_set is None:
62-
_calendar_tool_set = GoogleApiToolset.load_toolset(
60+
case "calendar_toolset":
61+
if _calendar_toolset is None:
62+
_calendar_toolset = GoogleApiToolset.load_toolset(
6363
api_name="calendar",
6464
api_version="v3",
6565
)
6666

67-
return _calendar_tool_set
67+
return _calendar_toolset
6868

69-
case "gmail_tool_set":
70-
if _gmail_tool_set is None:
71-
_gmail_tool_set = GoogleApiToolset.load_toolset(
69+
case "gmail_toolset":
70+
if _gmail_toolset is None:
71+
_gmail_toolset = GoogleApiToolset.load_toolset(
7272
api_name="gmail",
7373
api_version="v1",
7474
)
7575

76-
return _gmail_tool_set
76+
return _gmail_toolset
7777

78-
case "youtube_tool_set":
79-
if _youtube_tool_set is None:
80-
_youtube_tool_set = GoogleApiToolset.load_toolset(
78+
case "youtube_toolset":
79+
if _youtube_toolset is None:
80+
_youtube_toolset = GoogleApiToolset.load_toolset(
8181
api_name="youtube",
8282
api_version="v3",
8383
)
8484

85-
return _youtube_tool_set
85+
return _youtube_toolset
8686

87-
case "slides_tool_set":
88-
if _slides_tool_set is None:
89-
_slides_tool_set = GoogleApiToolset.load_toolset(
87+
case "slides_toolset":
88+
if _slides_toolset is None:
89+
_slides_toolset = GoogleApiToolset.load_toolset(
9090
api_name="slides",
9191
api_version="v1",
9292
)
9393

94-
return _slides_tool_set
94+
return _slides_toolset
9595

96-
case "sheets_tool_set":
97-
if _sheets_tool_set is None:
98-
_sheets_tool_set = GoogleApiToolset.load_toolset(
96+
case "sheets_toolset":
97+
if _sheets_toolset is None:
98+
_sheets_toolset = GoogleApiToolset.load_toolset(
9999
api_name="sheets",
100100
api_version="v4",
101101
)
102102

103-
return _sheets_tool_set
103+
return _sheets_toolset
104104

105-
case "docs_tool_set":
106-
if _docs_tool_set is None:
107-
_docs_tool_set = GoogleApiToolset.load_toolset(
105+
case "docs_toolset":
106+
if _docs_toolset is None:
107+
_docs_toolset = GoogleApiToolset.load_toolset(
108108
api_name="docs",
109109
api_version="v1",
110110
)
111111

112-
return _docs_tool_set
112+
return _docs_toolset

0 commit comments

Comments
 (0)
0