# 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.
95 lines
3.1 KiB
Python
95 lines
3.1 KiB
Python
from typing import Annotated, Any
|
|
|
|
from arcade_tdk import ToolContext
|
|
from arcade_tdk.errors import ToolExecutionError
|
|
from arcade_tdk.tool import tool
|
|
|
|
from arcade_walmart.enums import WalmartSortBy
|
|
from arcade_walmart.utils import (
|
|
call_serpapi,
|
|
extract_walmart_product_details,
|
|
extract_walmart_results,
|
|
get_walmart_last_page_integer,
|
|
prepare_params,
|
|
)
|
|
|
|
|
|
@tool(requires_secrets=["SERP_API_KEY"])
|
|
async def search_products(
|
|
context: ToolContext,
|
|
keywords: Annotated[str, "Keywords to search for. E.g. 'apple iphone' or 'samsung galaxy'"],
|
|
sort_by: Annotated[
|
|
WalmartSortBy,
|
|
"Sort the results by the specified criteria. "
|
|
f"Defaults to '{WalmartSortBy.RELEVANCE.value}'.",
|
|
] = WalmartSortBy.RELEVANCE,
|
|
min_price: Annotated[
|
|
float | None,
|
|
"Minimum price to filter the results by. E.g. 100.00",
|
|
] = None,
|
|
max_price: Annotated[
|
|
float | None,
|
|
"Maximum price to filter the results by. E.g. 100.00",
|
|
] = None,
|
|
next_day_delivery: Annotated[
|
|
bool,
|
|
"Filters products that are eligible for next day delivery. "
|
|
"Defaults to False (returns all products, regardless of delivery status).",
|
|
] = False,
|
|
page: Annotated[
|
|
int,
|
|
"Page number to fetch. Defaults to 1 (first page of results). "
|
|
"The maximum page value is 100.",
|
|
] = 1,
|
|
) -> Annotated[dict[str, Any], "List of Walmart products matching the search query."]:
|
|
"""Search Walmart products using SerpAPI."""
|
|
if page > 100:
|
|
raise ToolExecutionError(f"The maximum page value for Walmart search is 100, got {page}.")
|
|
|
|
sort_by_value = sort_by.to_api_value()
|
|
|
|
params = prepare_params(
|
|
"walmart",
|
|
query=keywords,
|
|
sort=sort_by_value,
|
|
# When the user selects a sorting option, we have to disable the relevance sorting
|
|
# using the soft_sort parameter.
|
|
soft_sort=not sort_by_value,
|
|
min_price=min_price,
|
|
max_price=max_price,
|
|
nd_en=next_day_delivery,
|
|
page=page,
|
|
include_filters=False,
|
|
)
|
|
|
|
response = call_serpapi(context, params)
|
|
|
|
return {
|
|
"products": extract_walmart_results(response.get("organic_results", [])),
|
|
"current_page": page,
|
|
"last_available_page": get_walmart_last_page_integer(response),
|
|
}
|
|
|
|
|
|
@tool(requires_secrets=["SERP_API_KEY"])
|
|
async def get_product_details(
|
|
context: ToolContext,
|
|
item_id: Annotated[
|
|
str,
|
|
"Item ID. E.g. '414600577'. This can be retrieved from the search results of the "
|
|
f"{search_products.__tool_name__} tool.",
|
|
],
|
|
) -> Annotated[dict[str, Any], "Product details"]:
|
|
"""Get product details from Walmart."""
|
|
params = prepare_params("walmart_product", product_id=item_id)
|
|
response = call_serpapi(context, params)
|
|
|
|
product_result = response.get("product_result")
|
|
|
|
if not product_result:
|
|
return {
|
|
"product_details": None,
|
|
"message": f"No product details found for item ID '{item_id}'.",
|
|
}
|
|
|
|
return {"product_details": extract_walmart_product_details(product_result)}
|