07c52100f3
# 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.
90 lines
2.8 KiB
Python
90 lines
2.8 KiB
Python
from unittest.mock import patch
|
|
|
|
import pytest
|
|
from arcade_tdk import ToolContext, ToolSecretItem
|
|
|
|
from arcade_google_jobs.exceptions import LanguageNotFoundError
|
|
from arcade_google_jobs.tools.google_jobs import search_jobs
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_context():
|
|
return ToolContext(secrets=[ToolSecretItem(key="serp_api_key", value="fake_api_key")])
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@patch("arcade_google_jobs.utils.SerpClient")
|
|
async def test_search_jobs_success(mock_serp_client, mock_context):
|
|
mock_serp_client_instance = mock_serp_client.return_value
|
|
mock_serp_client_instance.search().as_dict.return_value = {
|
|
"jobs_results": [
|
|
{"title": "Job 1", "link": "http://example.com/1"},
|
|
{"title": "Job 2", "link": "http://example.com/2"},
|
|
]
|
|
}
|
|
|
|
result = await search_jobs(mock_context, "engenheiro de software", "Brazil", "pt", 10, None)
|
|
assert result == {
|
|
"jobs": [
|
|
{"title": "Job 1", "link": "http://example.com/1"},
|
|
{"title": "Job 2", "link": "http://example.com/2"},
|
|
],
|
|
"next_page_token": None,
|
|
}
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@patch("arcade_google_jobs.utils.SerpClient")
|
|
async def test_search_jobs_success_with_custom_language_and_location(
|
|
mock_serp_client, mock_context
|
|
):
|
|
mock_serp_client_instance = mock_serp_client.return_value
|
|
mock_serp_client_instance.search().as_dict.return_value = {
|
|
"jobs_results": [
|
|
{"title": "Job 1", "link": "http://example.com/1"},
|
|
{"title": "Job 2", "link": "http://example.com/2"},
|
|
]
|
|
}
|
|
|
|
result = await search_jobs(
|
|
context=mock_context,
|
|
query="engenheiro de software",
|
|
location="Brazil",
|
|
language="pt",
|
|
limit=10,
|
|
next_page_token=None,
|
|
)
|
|
|
|
mock_serp_client_instance.search.assert_called_with({
|
|
"engine": "google_jobs",
|
|
"q": "engenheiro de software",
|
|
"hl": "pt",
|
|
"location": "Brazil",
|
|
})
|
|
|
|
assert result == {
|
|
"jobs": [
|
|
{"title": "Job 1", "link": "http://example.com/1"},
|
|
{"title": "Job 2", "link": "http://example.com/2"},
|
|
],
|
|
"next_page_token": None,
|
|
}
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@patch("arcade_google_jobs.utils.SerpClient")
|
|
async def test_search_jobs_language_not_found_error(mock_serp_client, mock_context):
|
|
mock_serp_client_instance = mock_serp_client.return_value
|
|
mock_serp_client_instance.search().as_dict.return_value = {
|
|
"jobs_results": [
|
|
{"title": "Job 1", "link": "http://example.com/1"},
|
|
{"title": "Job 2", "link": "http://example.com/2"},
|
|
]
|
|
}
|
|
|
|
with pytest.raises(LanguageNotFoundError):
|
|
await search_jobs(
|
|
context=mock_context,
|
|
query="backend engineer",
|
|
language="invalid_language",
|
|
)
|