# 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.
122 lines
4.7 KiB
Python
122 lines
4.7 KiB
Python
from typing import Annotated
|
|
|
|
from arcade_tdk import ToolContext, tool
|
|
from arcade_tdk.auth import Microsoft
|
|
from arcade_tdk.errors import ToolExecutionError
|
|
|
|
from arcade_outlook_mail._utils import (
|
|
fetch_emails,
|
|
prepare_list_emails_request_config,
|
|
remove_none_values,
|
|
)
|
|
from arcade_outlook_mail.client import get_client
|
|
from arcade_outlook_mail.enums import (
|
|
EmailFilterProperty,
|
|
FilterOperator,
|
|
WellKnownFolderNames,
|
|
)
|
|
from arcade_outlook_mail.message import Message
|
|
|
|
|
|
@tool(requires_auth=Microsoft(scopes=["Mail.Read"]))
|
|
async def list_emails(
|
|
context: ToolContext,
|
|
limit: Annotated[int, "The number of messages to return. Max is 100. Defaults to 5."] = 5,
|
|
pagination_token: Annotated[
|
|
str | None, "The pagination token to continue a previous request"
|
|
] = None,
|
|
) -> Annotated[dict, "A dictionary containing a list of emails"]:
|
|
"""List emails in the user's mailbox across all folders.
|
|
|
|
Since this tool lists email across all folders, it may return sent items, drafts,
|
|
and other items that are not in the inbox.
|
|
"""
|
|
client = get_client(context.get_auth_token_or_empty())
|
|
request_config = prepare_list_emails_request_config(limit)
|
|
message_builder = client.me.messages
|
|
|
|
response = await fetch_emails(message_builder, pagination_token, request_config)
|
|
messages = [Message.from_sdk(msg).to_dict() for msg in response.value or []]
|
|
pagination_token = response.odata_next_link
|
|
|
|
result = {
|
|
"messages": messages,
|
|
"num_messages": len(messages),
|
|
"pagination_token": pagination_token,
|
|
}
|
|
result = remove_none_values(result)
|
|
return result
|
|
|
|
|
|
@tool(requires_auth=Microsoft(scopes=["Mail.Read"]))
|
|
async def list_emails_in_folder(
|
|
context: ToolContext,
|
|
well_known_folder_name: Annotated[
|
|
WellKnownFolderNames | None,
|
|
"The name of the folder to list emails from. Defaults to None.",
|
|
] = None,
|
|
folder_id: Annotated[
|
|
str | None,
|
|
"The ID of the folder to list emails from if the folder is not a well-known folder. "
|
|
"Defaults to None.",
|
|
] = None,
|
|
limit: Annotated[int, "The number of messages to return. Max is 100. Defaults to 5."] = 5,
|
|
pagination_token: Annotated[
|
|
str | None, "The pagination token to continue a previous request"
|
|
] = None,
|
|
) -> Annotated[
|
|
dict, "A dictionary containing a list of emails and a pagination token, if applicable"
|
|
]:
|
|
"""List the user's emails in the specified folder.
|
|
|
|
Exactly one of `well_known_folder_name` or `folder_id` MUST be provided.
|
|
"""
|
|
if not (bool(well_known_folder_name) ^ bool(folder_id)):
|
|
raise ToolExecutionError(
|
|
message="Exactly one of `well_known_folder_name` or `folder_id` must be provided."
|
|
)
|
|
folder_name = well_known_folder_name.value if well_known_folder_name else folder_id
|
|
client = get_client(context.get_auth_token_or_empty())
|
|
request_config = prepare_list_emails_request_config(limit)
|
|
message_builder = client.me.mail_folders.by_mail_folder_id(folder_name).messages # type: ignore [arg-type]
|
|
|
|
response = await fetch_emails(message_builder, pagination_token, request_config)
|
|
messages = [Message.from_sdk(msg).to_dict() for msg in response.value or []]
|
|
pagination_token = response.odata_next_link
|
|
|
|
result = {
|
|
"messages": messages,
|
|
"num_messages": len(messages),
|
|
"pagination_token": pagination_token,
|
|
}
|
|
result = remove_none_values(result)
|
|
return result
|
|
|
|
|
|
@tool(requires_auth=Microsoft(scopes=["Mail.Read"]))
|
|
async def list_emails_by_property(
|
|
context: ToolContext,
|
|
property: Annotated[EmailFilterProperty, "The property to filter the emails by."], # noqa: A002
|
|
operator: Annotated[FilterOperator, "The operator to use for the filter."],
|
|
value: Annotated[str, "The value to filter the emails by"],
|
|
limit: Annotated[int, "The number of messages to return. Max is 100. Defaults to 5."] = 5,
|
|
pagination_token: Annotated[
|
|
str | None, "The pagination token to continue a previous request"
|
|
] = None,
|
|
) -> Annotated[dict, "A dictionary containing a list of emails"]:
|
|
"""List emails in the user's mailbox across all folders filtering by a property."""
|
|
client = get_client(context.get_auth_token_or_empty())
|
|
request_config = prepare_list_emails_request_config(limit, property, operator, value)
|
|
message_builder = client.me.messages
|
|
|
|
response = await fetch_emails(message_builder, pagination_token, request_config)
|
|
messages = [Message.from_sdk(msg).to_dict() for msg in response.value or []]
|
|
pagination_token = response.odata_next_link
|
|
|
|
result = {
|
|
"messages": messages,
|
|
"num_messages": len(messages),
|
|
"pagination_token": pagination_token,
|
|
}
|
|
result = remove_none_values(result)
|
|
return result
|