# 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.
114 lines
3.5 KiB
Python
114 lines
3.5 KiB
Python
from typing import Annotated
|
|
|
|
from arcade_tdk import ToolContext, tool
|
|
from arcade_tdk.auth import Google
|
|
from arcade_tdk.errors import RetryableToolError
|
|
|
|
from arcade_google_sheets.models import (
|
|
SheetDataInput,
|
|
Spreadsheet,
|
|
SpreadsheetProperties,
|
|
)
|
|
from arcade_google_sheets.utils import (
|
|
build_sheets_service,
|
|
create_sheet,
|
|
parse_write_to_cell_response,
|
|
validate_write_to_cell_params,
|
|
)
|
|
|
|
|
|
@tool(
|
|
requires_auth=Google(
|
|
scopes=["https://www.googleapis.com/auth/drive.file"],
|
|
)
|
|
)
|
|
def create_spreadsheet(
|
|
context: ToolContext,
|
|
title: Annotated[str, "The title of the new spreadsheet"] = "Untitled spreadsheet",
|
|
data: Annotated[
|
|
str | None,
|
|
"The data to write to the spreadsheet. A JSON string "
|
|
"(property names enclosed in double quotes) representing a dictionary that "
|
|
"maps row numbers to dictionaries that map column letters to cell values. "
|
|
"For example, data[23]['C'] would be the value of the cell in row 23, column C. "
|
|
"Type hint: dict[int, dict[str, Union[int, float, str, bool]]]",
|
|
] = None,
|
|
) -> Annotated[dict, "The created spreadsheet's id and title"]:
|
|
"""Create a new spreadsheet with the provided title and data in its first sheet
|
|
|
|
Returns the newly created spreadsheet's id and title
|
|
"""
|
|
service = build_sheets_service(context.get_auth_token_or_empty())
|
|
|
|
try:
|
|
sheet_data = SheetDataInput(data=data) # type: ignore[arg-type]
|
|
except Exception as e:
|
|
msg = "Invalid JSON or unexpected data format for parameter `data`"
|
|
raise RetryableToolError(
|
|
message=msg,
|
|
additional_prompt_content=f"{msg}: {e}",
|
|
retry_after_ms=100,
|
|
)
|
|
|
|
spreadsheet = Spreadsheet(
|
|
properties=SpreadsheetProperties(title=title),
|
|
sheets=[create_sheet(sheet_data)],
|
|
)
|
|
|
|
body = spreadsheet.model_dump()
|
|
|
|
response = (
|
|
service.spreadsheets()
|
|
.create(body=body, fields="spreadsheetId,spreadsheetUrl,properties/title")
|
|
.execute()
|
|
)
|
|
|
|
return {
|
|
"title": response["properties"]["title"],
|
|
"spreadsheetId": response["spreadsheetId"],
|
|
"spreadsheetUrl": response["spreadsheetUrl"],
|
|
}
|
|
|
|
|
|
@tool(
|
|
requires_auth=Google(
|
|
scopes=["https://www.googleapis.com/auth/drive.file"],
|
|
)
|
|
)
|
|
def write_to_cell(
|
|
context: ToolContext,
|
|
spreadsheet_id: Annotated[str, "The id of the spreadsheet to write to"],
|
|
column: Annotated[str, "The column string to write to. For example, 'A', 'F', or 'AZ'"],
|
|
row: Annotated[int, "The row number to write to"],
|
|
value: Annotated[str, "The value to write to the cell"],
|
|
sheet_name: Annotated[
|
|
str, "The name of the sheet to write to. Defaults to 'Sheet1'"
|
|
] = "Sheet1",
|
|
) -> Annotated[dict, "The status of the operation"]:
|
|
"""
|
|
Write a value to a single cell in a spreadsheet.
|
|
"""
|
|
service = build_sheets_service(context.get_auth_token_or_empty())
|
|
validate_write_to_cell_params(service, spreadsheet_id, sheet_name, column, row)
|
|
|
|
range_ = f"'{sheet_name}'!{column.upper()}{row}"
|
|
body = {
|
|
"range": range_,
|
|
"majorDimension": "ROWS",
|
|
"values": [[value]],
|
|
}
|
|
|
|
sheet_properties = (
|
|
service.spreadsheets()
|
|
.values()
|
|
.update(
|
|
spreadsheetId=spreadsheet_id,
|
|
range=range_,
|
|
valueInputOption="USER_ENTERED",
|
|
includeValuesInResponse=True,
|
|
body=body,
|
|
)
|
|
.execute()
|
|
)
|
|
|
|
return parse_write_to_cell_response(sheet_properties)
|