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.
55 lines
1.9 KiB
Python
55 lines
1.9 KiB
Python
import pytest
|
|
|
|
from arcade_outlook_mail._utils import _create_filter_expression
|
|
from arcade_outlook_mail.enums import EmailFilterProperty, FilterOperator
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"property_, operator, value, expected_filter_expr",
|
|
[
|
|
(
|
|
EmailFilterProperty.SUBJECT,
|
|
FilterOperator.EQUAL,
|
|
"Hello",
|
|
"receivedDateTime ge 1900-01-01T00:00:00Z and subject eq 'Hello'",
|
|
),
|
|
(
|
|
EmailFilterProperty.SUBJECT,
|
|
FilterOperator.STARTS_WITH,
|
|
"He",
|
|
"receivedDateTime ge 1900-01-01T00:00:00Z and startsWith(subject, 'He')",
|
|
),
|
|
(
|
|
EmailFilterProperty.CONVERSATION_ID,
|
|
FilterOperator.EQUAL,
|
|
"12345askdfjh=wef67890",
|
|
"receivedDateTime ge 1900-01-01T00:00:00Z and conversationId eq '12345askdfjh=wef67890'",
|
|
),
|
|
(
|
|
EmailFilterProperty.CONVERSATION_ID,
|
|
FilterOperator.NOT_EQUAL,
|
|
"67890",
|
|
"receivedDateTime ge 1900-01-01T00:00:00Z and conversationId ne 67890",
|
|
),
|
|
(
|
|
EmailFilterProperty.RECEIVED_DATE_TIME,
|
|
FilterOperator.GREATER_THAN,
|
|
"2024-01-01",
|
|
"receivedDateTime gt '2024-01-01'",
|
|
),
|
|
(
|
|
EmailFilterProperty.SENDER,
|
|
FilterOperator.EQUAL,
|
|
"a@ex.com",
|
|
"receivedDateTime ge 1900-01-01T00:00:00Z and sender/emailAddress/address eq 'a@ex.com'",
|
|
),
|
|
(
|
|
EmailFilterProperty.SENDER,
|
|
FilterOperator.CONTAINS,
|
|
"joe",
|
|
"receivedDateTime ge 1900-01-01T00:00:00Z and contains(sender/emailAddress/address, 'joe')",
|
|
),
|
|
],
|
|
)
|
|
def test_create_filter_expression(property_, operator, value, expected_filter_expr):
|
|
assert _create_filter_expression(property_, operator, value) == expected_filter_expr
|