# 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.
131 lines
3.8 KiB
Python
131 lines
3.8 KiB
Python
from unittest.mock import patch
|
|
|
|
import pytest
|
|
from arcade_tdk import ToolContext, ToolSecretItem
|
|
|
|
from arcade_google_maps.exceptions import CountryNotFoundError, LanguageNotFoundError
|
|
from arcade_google_maps.tools.google_maps import (
|
|
get_directions_between_addresses,
|
|
get_directions_between_coordinates,
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_context():
|
|
return ToolContext(secrets=[ToolSecretItem(key="serp_api_key", value="fake_api_key")])
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@patch("arcade_google_maps.utils.SerpClient")
|
|
async def test_get_directions_between_coordinates_success(mock_serp_client, mock_context):
|
|
mock_serp_client_instance = mock_serp_client.return_value
|
|
mock_serp_client_instance.search.return_value.as_dict.return_value = {
|
|
"directions": [
|
|
{
|
|
"arrive_around": 1741789839,
|
|
"distance": "100 miles",
|
|
"duration": "1 hour",
|
|
}
|
|
]
|
|
}
|
|
|
|
result = await get_directions_between_coordinates(
|
|
context=mock_context,
|
|
origin_latitude="1",
|
|
origin_longitude="2",
|
|
destination_latitude="3",
|
|
destination_longitude="4",
|
|
)
|
|
|
|
assert result == {
|
|
"directions": [
|
|
{
|
|
"arrive_around": {
|
|
"datetime": "2025-03-12T14:30:39+00:00",
|
|
"timestamp": 1741789839,
|
|
},
|
|
"distance": "100 miles",
|
|
"duration": "1 hour",
|
|
}
|
|
]
|
|
}
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@patch("arcade_google_maps.utils.SerpClient")
|
|
async def test_get_directions_between_addresses_success(mock_serp_client, mock_context):
|
|
mock_serp_client_instance = mock_serp_client.return_value
|
|
mock_serp_client_instance.search.return_value.as_dict.return_value = {
|
|
"directions": [
|
|
{
|
|
"arrive_around": 1741789839,
|
|
"distance": "100 miles",
|
|
"duration": "1 hour",
|
|
}
|
|
]
|
|
}
|
|
|
|
result = await get_directions_between_addresses(
|
|
context=mock_context,
|
|
origin_address="1",
|
|
destination_address="2",
|
|
)
|
|
|
|
assert result == {
|
|
"directions": [
|
|
{
|
|
"arrive_around": {
|
|
"datetime": "2025-03-12T14:30:39+00:00",
|
|
"timestamp": 1741789839,
|
|
},
|
|
"distance": "100 miles",
|
|
"duration": "1 hour",
|
|
}
|
|
]
|
|
}
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@patch("arcade_google_maps.utils.SerpClient")
|
|
async def test_get_directions_between_addresses_country_not_found(mock_serp_client, mock_context):
|
|
mock_serp_client_instance = mock_serp_client.return_value
|
|
mock_serp_client_instance.search.return_value.as_dict.return_value = {
|
|
"directions": [
|
|
{
|
|
"arrive_around": 1741789839,
|
|
"distance": "100 miles",
|
|
"duration": "1 hour",
|
|
}
|
|
]
|
|
}
|
|
|
|
with pytest.raises(CountryNotFoundError):
|
|
await get_directions_between_addresses(
|
|
context=mock_context,
|
|
origin_address="1",
|
|
destination_address="2",
|
|
country="invalid",
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@patch("arcade_google_maps.utils.SerpClient")
|
|
async def test_get_directions_between_addresses_language_not_found(mock_serp_client, mock_context):
|
|
mock_serp_client_instance = mock_serp_client.return_value
|
|
mock_serp_client_instance.search.return_value.as_dict.return_value = {
|
|
"directions": [
|
|
{
|
|
"arrive_around": 1741789839,
|
|
"distance": "100 miles",
|
|
"duration": "1 hour",
|
|
}
|
|
]
|
|
}
|
|
|
|
with pytest.raises(LanguageNotFoundError):
|
|
await get_directions_between_addresses(
|
|
context=mock_context,
|
|
origin_address="1",
|
|
destination_address="2",
|
|
language="invalid",
|
|
)
|