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.
58 lines
2.3 KiB
Python
58 lines
2.3 KiB
Python
from typing import Annotated, Any
|
|
|
|
from arcade_tdk import ToolContext, tool
|
|
|
|
from arcade_google_hotels.enums import GoogleHotelsSortBy
|
|
from arcade_google_hotels.utils import call_serpapi, prepare_params
|
|
|
|
|
|
@tool(requires_secrets=["SERP_API_KEY"])
|
|
async def search_hotels(
|
|
context: ToolContext,
|
|
location: Annotated[str, "Location to search for hotels, e.g., a city name, a state, etc."],
|
|
check_in_date: Annotated[str, "Check-in date in YYYY-MM-DD format"],
|
|
check_out_date: Annotated[str, "Check-out date in YYYY-MM-DD format"],
|
|
query: Annotated[
|
|
str | None, "Anything that would be used in a regular Google Hotels search"
|
|
] = None,
|
|
currency: Annotated[str | None, "Currency code for prices. Defaults to 'USD'"] = "USD",
|
|
min_price: Annotated[int | None, "Minimum price per night. Defaults to no minimum"] = None,
|
|
max_price: Annotated[int | None, "Maximum price per night. Defaults to no maximum"] = None,
|
|
num_adults: Annotated[int | None, "Number of adults per room. Defaults to 2"] = 2,
|
|
num_children: Annotated[int | None, "Number of children per room. Defaults to 0"] = 0,
|
|
sort_by: Annotated[
|
|
GoogleHotelsSortBy, "The sorting order of the results. Defaults to RELEVANCE"
|
|
] = GoogleHotelsSortBy.RELEVANCE,
|
|
num_results: Annotated[
|
|
int | None, "Maximum number of results to return. Defaults to 5. Max 20"
|
|
] = 5,
|
|
) -> Annotated[dict[str, Any], "Hotel search results from the Google Hotels API"]:
|
|
"""Retrieve hotel search results using the Google Hotels API."""
|
|
# Prepare the request
|
|
params = prepare_params(
|
|
"google_hotels",
|
|
q=f"{query}, {location}" if query else location,
|
|
check_in_date=check_in_date,
|
|
check_out_date=check_out_date,
|
|
currency=currency,
|
|
min_price=min_price,
|
|
max_price=max_price,
|
|
adults=num_adults,
|
|
children=num_children,
|
|
sort_by=sort_by.to_api_value(),
|
|
)
|
|
|
|
# Execute the request
|
|
results = call_serpapi(context, params)
|
|
|
|
# Parse the results
|
|
properties = results.get("properties", [])[:num_results]
|
|
|
|
# Remove unwanted fields from each property
|
|
for hotel in properties:
|
|
hotel.pop("images", None)
|
|
hotel.pop("extracted_hotel_class", None)
|
|
hotel.pop("reviews_breakdown", None)
|
|
hotel.pop("serpapi_property_details_link", None)
|
|
|
|
return {"properties": properties}
|