# PR Description ## Split toolkits This PR splits the `Microsoft`, `Google`, and `Search` toolkits into multiple toolkits each. * `Microsoft` --> `OutlookCalendar`, `OutlookMail`. * `Google` -----> `GoogleCalendar`, `GoogleContacts`, `GoogleDocs`, `GoogleDrive`, `Gmail`, `GoogleSheets` * `Search` -----> `GoogleFinance`, `GoogleFlights`, `GoogleHotels`, `GoogleJobs`, `GoogleMaps`, `GoogleNews`, `GoogleSearch`, `GoogleShopping`, `Walmart`, `Youtube` > The original monolithic toolkits (`Microsoft`, `Google`, `Search`) are not removed in this PR. The plan is to keep those toolkits around while we > 1. Stop documenting the toolkits, > 2. Stop displaying the toolkits in the dashboard, and > 3. Help customers migrate over to the new split toolkits. ## Rename toolkits This PR renames the following toolkits * `Web` ------------> `Firecrawl` * `CodeSandbox` ---> `E2B` > The `Web` and `CodeSandbox` toolkits are not removed in this PR. The plan is to keep them around while we > 1. Stop documenting the toolkits, > 2. Stop displaying the toolkits in the dashboard, and > 3. Help customers migrate over to the new renamed toolkits. ## Rename tools Since toolkit names were changed, this called for some tools to be renamed as well. * `GoogleSearch.SearchGoogle` ----------------> `GoogleSearch.Search` * `GoogleShopping.SearchShoppingProducts` ---> `GoogleShopping.SearchProducts` * `Walmart.SearchWalmartProducts` ------------> `Walmart.SearchProducts` * `Walmart.GetWalmartProductDetails` ---------> `Walmart.GetProductDetails` * `Youtube.SearchYoutubeVideos` --------------> `Youtube.SearchForVideos` ## Google File Picker Improvements to the Google File Picker experience were also added in this PR. The following tools will ALWAYS provide llm_instructions in their response to "let the end-user know that they have the option to select more files via the file picker url if they want to": * `GoogleDocs.SearchDocuments` * `GoogleDocs.SearchAndRetrieveDocuments` * `GoogleDrive.GetFileTreeStructure` The following tools will only provide the file picker URL if a 404 or 403 from the Google API: * `GoogleDocs.InsertTextAtEndOfDocument` * `GoogleDocs.GetDocumentById` * `GoogleSheets.GetSpreadsheet` * `GoogleSheets.WriteToCell` Also, a standalone `GoogleDrive.GenerateGoogleFilePickerUrl` tool exists. ## Other * The `SearchDocuments` and `SearchAndRetrieveDocuments` tools used to be organized within the Drive portion of the Google toolkit, but I moved these into the new GoogleDocs toolkit because they are specific to Docs. # Progress - [x] `OutlookCalendar` - [x] `OutlookMail` - [x] `GoogleFinance` - [x] `GoogleFlights` - [x] `GoogleHotels` - [x] `GoogleJobs` - [x] `GoogleMaps` - [x] `GoogleNews` - [x] `GoogleSearch` - [x] `GoogleShopping` - [x] `Walmart` - [x] `Youtube` - [x] `GoogleCalendar` - [x] `GoogleContacts` - [x] `GoogleDocs` - [x] `GoogleDrive` - [x] `Gmail` - [x] `GoogleSheets` - [x] `Firecrawl` - [x] `E2B` - [x] File picker # Discussion * Repeated code is a consequence of splitting toolkits that use the same provider. I am open to any ideas that would allow multiple toolkits to reference common code. Comment your ideas in this PR.
49 lines
2 KiB
Python
49 lines
2 KiB
Python
import base64
|
|
import json
|
|
|
|
from arcade_tdk import ToolContext, ToolMetadataKey
|
|
from arcade_tdk.errors import ToolExecutionError
|
|
|
|
|
|
def generate_google_file_picker_url(context: ToolContext) -> dict:
|
|
"""Generate a Google File Picker URL for user-driven file selection and authorization.
|
|
|
|
Generates a URL that directs the end-user to a Google File Picker interface where
|
|
where they can select or upload Google Drive files. Users can grant permission to access their
|
|
Drive files, providing a secure and authorized way to interact with their files.
|
|
|
|
This is particularly useful when prior tools (e.g., those accessing or modifying
|
|
Google Docs, Google Sheets, etc.) encountered failures due to file non-existence
|
|
(Requested entity was not found) or permission errors. Once the user completes the file
|
|
picker flow, the prior tool can be retried.
|
|
|
|
Returns:
|
|
A dictionary containing the URL and instructions for the llm to instruct the user.
|
|
"""
|
|
client_id = context.get_metadata(ToolMetadataKey.CLIENT_ID)
|
|
client_id_parts = client_id.split("-")
|
|
if not client_id_parts:
|
|
raise ToolExecutionError(
|
|
message="Invalid Google Client ID",
|
|
developer_message=f"Google Client ID '{client_id}' is not valid",
|
|
)
|
|
app_id = client_id_parts[0]
|
|
cloud_coordinator_url = context.get_metadata(ToolMetadataKey.COORDINATOR_URL).strip("/")
|
|
|
|
config = {
|
|
"auth": {
|
|
"client_id": client_id,
|
|
"app_id": app_id,
|
|
},
|
|
}
|
|
config_json = json.dumps(config)
|
|
config_base64 = base64.urlsafe_b64encode(config_json.encode("utf-8")).decode("utf-8")
|
|
url = f"{cloud_coordinator_url}/google/drive_picker?config={config_base64}"
|
|
|
|
return {
|
|
"url": url,
|
|
"llm_instructions": (
|
|
"Instruct the user to click the following link to open the Google Drive File Picker. "
|
|
f"This will allow them to select files and grant access permissions: {url}"
|
|
),
|
|
}
|