# 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.
116 lines
3.3 KiB
Python
116 lines
3.3 KiB
Python
from enum import Enum
|
|
|
|
|
|
class Corpora(str, Enum):
|
|
"""
|
|
Bodies of items (files/documents) to which the query applies.
|
|
Prefer 'user' or 'drive' to 'allDrives' for efficiency.
|
|
By default, corpora is set to 'user'.
|
|
"""
|
|
|
|
USER = "user"
|
|
DOMAIN = "domain"
|
|
DRIVE = "drive"
|
|
ALL_DRIVES = "allDrives"
|
|
|
|
|
|
class DocumentFormat(str, Enum):
|
|
MARKDOWN = "markdown"
|
|
HTML = "html"
|
|
GOOGLE_API_JSON = "google_api_json"
|
|
|
|
|
|
class OrderBy(str, Enum):
|
|
"""
|
|
Sort keys for ordering files in Google Drive.
|
|
Each key has both ascending and descending options.
|
|
"""
|
|
|
|
CREATED_TIME = (
|
|
# When the file was created (ascending)
|
|
"createdTime"
|
|
)
|
|
CREATED_TIME_DESC = (
|
|
# When the file was created (descending)
|
|
"createdTime desc"
|
|
)
|
|
FOLDER = (
|
|
# The folder ID, sorted using alphabetical ordering (ascending)
|
|
"folder"
|
|
)
|
|
FOLDER_DESC = (
|
|
# The folder ID, sorted using alphabetical ordering (descending)
|
|
"folder desc"
|
|
)
|
|
MODIFIED_BY_ME_TIME = (
|
|
# The last time the file was modified by the user (ascending)
|
|
"modifiedByMeTime"
|
|
)
|
|
MODIFIED_BY_ME_TIME_DESC = (
|
|
# The last time the file was modified by the user (descending)
|
|
"modifiedByMeTime desc"
|
|
)
|
|
MODIFIED_TIME = (
|
|
# The last time the file was modified by anyone (ascending)
|
|
"modifiedTime"
|
|
)
|
|
MODIFIED_TIME_DESC = (
|
|
# The last time the file was modified by anyone (descending)
|
|
"modifiedTime desc"
|
|
)
|
|
NAME = (
|
|
# The name of the file, sorted using alphabetical ordering (e.g., 1, 12, 2, 22) (ascending)
|
|
"name"
|
|
)
|
|
NAME_DESC = (
|
|
# The name of the file, sorted using alphabetical ordering (e.g., 1, 12, 2, 22) (descending)
|
|
"name desc"
|
|
)
|
|
NAME_NATURAL = (
|
|
# The name of the file, sorted using natural sort ordering (e.g., 1, 2, 12, 22) (ascending)
|
|
"name_natural"
|
|
)
|
|
NAME_NATURAL_DESC = (
|
|
# The name of the file, sorted using natural sort ordering (e.g., 1, 2, 12, 22) (descending)
|
|
"name_natural desc"
|
|
)
|
|
QUOTA_BYTES_USED = (
|
|
# The number of storage quota bytes used by the file (ascending)
|
|
"quotaBytesUsed"
|
|
)
|
|
QUOTA_BYTES_USED_DESC = (
|
|
# The number of storage quota bytes used by the file (descending)
|
|
"quotaBytesUsed desc"
|
|
)
|
|
RECENCY = (
|
|
# The most recent timestamp from the file's date-time fields (ascending)
|
|
"recency"
|
|
)
|
|
RECENCY_DESC = (
|
|
# The most recent timestamp from the file's date-time fields (descending)
|
|
"recency desc"
|
|
)
|
|
SHARED_WITH_ME_TIME = (
|
|
# When the file was shared with the user, if applicable (ascending)
|
|
"sharedWithMeTime"
|
|
)
|
|
SHARED_WITH_ME_TIME_DESC = (
|
|
# When the file was shared with the user, if applicable (descending)
|
|
"sharedWithMeTime desc"
|
|
)
|
|
STARRED = (
|
|
# Whether the user has starred the file (ascending)
|
|
"starred"
|
|
)
|
|
STARRED_DESC = (
|
|
# Whether the user has starred the file (descending)
|
|
"starred desc"
|
|
)
|
|
VIEWED_BY_ME_TIME = (
|
|
# The last time the file was viewed by the user (ascending)
|
|
"viewedByMeTime"
|
|
)
|
|
VIEWED_BY_ME_TIME_DESC = (
|
|
# The last time the file was viewed by the user (descending)
|
|
"viewedByMeTime desc"
|
|
)
|