# 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.
175 lines
6.1 KiB
Python
175 lines
6.1 KiB
Python
import contextlib
|
|
import re
|
|
from datetime import datetime
|
|
from typing import Any, cast
|
|
from zoneinfo import ZoneInfo
|
|
|
|
from arcade_tdk import ToolContext
|
|
from arcade_tdk.errors import ToolExecutionError
|
|
from serpapi import Client as SerpClient
|
|
|
|
from arcade_google_maps.constants import (
|
|
DEFAULT_GOOGLE_MAPS_COUNTRY,
|
|
DEFAULT_GOOGLE_MAPS_DISTANCE_UNIT,
|
|
DEFAULT_GOOGLE_MAPS_LANGUAGE,
|
|
DEFAULT_GOOGLE_MAPS_TRAVEL_MODE,
|
|
)
|
|
from arcade_google_maps.enums import GoogleMapsDistanceUnit, GoogleMapsTravelMode
|
|
from arcade_google_maps.exceptions import CountryNotFoundError, LanguageNotFoundError
|
|
from arcade_google_maps.google_data import COUNTRY_CODES, LANGUAGE_CODES
|
|
|
|
|
|
def prepare_params(engine: str, **kwargs: Any) -> dict[str, Any]:
|
|
"""
|
|
Prepares a parameters dictionary for the SerpAPI call.
|
|
|
|
Parameters:
|
|
engine: The engine name (e.g., "google", "google_finance").
|
|
kwargs: Any additional parameters to include.
|
|
|
|
Returns:
|
|
A dictionary containing the base parameters plus any extras,
|
|
excluding any parameters whose value is None.
|
|
"""
|
|
params = {"engine": engine}
|
|
params.update({k: v for k, v in kwargs.items() if v is not None})
|
|
return params
|
|
|
|
|
|
def call_serpapi(context: ToolContext, params: dict) -> dict:
|
|
"""
|
|
Execute a search query using the SerpAPI client and return the results as a dictionary.
|
|
|
|
Args:
|
|
context: The tool context containing required secrets.
|
|
params: A dictionary of parameters for the SerpAPI search.
|
|
|
|
Returns:
|
|
The search results as a dictionary.
|
|
"""
|
|
api_key = context.get_secret("SERP_API_KEY")
|
|
client = SerpClient(api_key=api_key)
|
|
try:
|
|
search = client.search(params)
|
|
return cast(dict[str, Any], search.as_dict())
|
|
except Exception as e:
|
|
# SerpAPI error messages sometimes contain the API key, so we need to sanitize it
|
|
sanitized_e = re.sub(r"(api_key=)[^ &]+", r"\1***", str(e))
|
|
raise ToolExecutionError(
|
|
message="Failed to fetch search results",
|
|
developer_message=sanitized_e,
|
|
)
|
|
|
|
|
|
def get_google_maps_directions(
|
|
context: ToolContext,
|
|
origin_address: str | None = None,
|
|
destination_address: str | None = None,
|
|
origin_latitude: str | None = None,
|
|
origin_longitude: str | None = None,
|
|
destination_latitude: str | None = None,
|
|
destination_longitude: str | None = None,
|
|
language: str | None = DEFAULT_GOOGLE_MAPS_LANGUAGE,
|
|
country: str | None = DEFAULT_GOOGLE_MAPS_COUNTRY,
|
|
distance_unit: GoogleMapsDistanceUnit = DEFAULT_GOOGLE_MAPS_DISTANCE_UNIT,
|
|
travel_mode: GoogleMapsTravelMode = DEFAULT_GOOGLE_MAPS_TRAVEL_MODE,
|
|
) -> list[dict[str, Any]]:
|
|
"""Get directions from Google Maps.
|
|
|
|
Provide either all(origin_address, destination_address) or
|
|
all(origin_latitude, origin_longitude, destination_latitude, destination_longitude).
|
|
|
|
Args:
|
|
context: Tool context containing required Serp API Key secret.
|
|
origin_address: Origin address.
|
|
destination_address: Destination address.
|
|
origin_latitude: Origin latitude.
|
|
origin_longitude: Origin longitude.
|
|
destination_latitude: Destination latitude.
|
|
destination_longitude: Destination longitude.
|
|
language: Language to use in the Google Maps search. Defaults to 'en' (English).
|
|
country: 2-letter country code to use in the Google Maps search. Defaults to None
|
|
(no country is specified).
|
|
distance_unit: Distance unit to use in the Google Maps search. Defaults to 'km'
|
|
(kilometers).
|
|
travel_mode: Travel mode to use in the Google Maps search. Defaults to 'best'
|
|
(best mode).
|
|
|
|
Returns:
|
|
The directions from Google Maps.
|
|
"""
|
|
if isinstance(language, str):
|
|
language = language.lower()
|
|
|
|
if language not in LANGUAGE_CODES:
|
|
raise LanguageNotFoundError(language)
|
|
|
|
params = prepare_params(
|
|
engine="google_maps_directions",
|
|
hl=language,
|
|
distance_unit=distance_unit.to_api_value(),
|
|
travel_mode=travel_mode.to_api_value(),
|
|
)
|
|
|
|
if any([
|
|
origin_latitude,
|
|
origin_longitude,
|
|
destination_latitude,
|
|
destination_longitude,
|
|
]) and any([origin_address, destination_address]):
|
|
raise ValueError("Either coordinates or addresses must be provided, not both")
|
|
|
|
elif all([origin_latitude, origin_longitude, destination_latitude, destination_longitude]):
|
|
params["start_coords"] = f"{origin_latitude},{origin_longitude}"
|
|
params["end_coords"] = f"{destination_latitude},{destination_longitude}"
|
|
|
|
elif all([origin_address, destination_address]):
|
|
params["start_addr"] = str(origin_address)
|
|
params["end_addr"] = str(destination_address)
|
|
|
|
else:
|
|
raise ValueError("Either coordinates or addresses must be provided")
|
|
|
|
if country:
|
|
country = country.lower()
|
|
if country not in COUNTRY_CODES:
|
|
raise CountryNotFoundError(country)
|
|
params["gl"] = country
|
|
|
|
results = call_serpapi(context, params)
|
|
|
|
directions = cast(list[dict[str, Any]], results.get("directions", []))
|
|
|
|
for direction in directions:
|
|
clean_google_maps_direction(direction)
|
|
|
|
if "arrive_around" in direction:
|
|
direction["arrive_around"] = enrich_google_maps_arrive_around(
|
|
direction["arrive_around"]
|
|
)
|
|
|
|
return directions
|
|
|
|
|
|
def clean_google_maps_direction(direction: dict[str, Any]) -> None:
|
|
for trip in direction.get("trips", []):
|
|
with contextlib.suppress(KeyError):
|
|
del trip["start_stop"]["data_id"]
|
|
del trip["end_stop"]["data_id"]
|
|
|
|
for detail in trip.get("details", []):
|
|
with contextlib.suppress(KeyError):
|
|
del detail["geo_photo"]
|
|
del detail["gps_coordinates"]
|
|
|
|
for stop in trip.get("stops", []):
|
|
with contextlib.suppress(KeyError):
|
|
del stop["data_id"]
|
|
|
|
|
|
def enrich_google_maps_arrive_around(timestamp: int | None) -> dict[str, Any]:
|
|
if not timestamp:
|
|
return {}
|
|
|
|
dt = datetime.fromtimestamp(timestamp, tz=ZoneInfo("UTC")).isoformat()
|
|
return {"datetime": dt, "timestamp": timestamp}
|