# 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.
219 lines
8.4 KiB
Python
219 lines
8.4 KiB
Python
from typing import Annotated, Any
|
|
|
|
from arcade_tdk import ToolContext, ToolMetadataKey, tool
|
|
from arcade_tdk.auth import Google
|
|
|
|
from arcade_google_docs.doc_to_html import convert_document_to_html
|
|
from arcade_google_docs.doc_to_markdown import convert_document_to_markdown
|
|
from arcade_google_docs.enum import DocumentFormat, OrderBy
|
|
from arcade_google_docs.file_picker import generate_google_file_picker_url
|
|
from arcade_google_docs.templates import optional_file_picker_instructions_template
|
|
from arcade_google_docs.tools import get_document_by_id
|
|
from arcade_google_docs.utils import (
|
|
build_drive_service,
|
|
build_files_list_params,
|
|
)
|
|
|
|
|
|
# Implements: https://googleapis.github.io/google-api-python-client/docs/dyn/drive_v3.files.html#list
|
|
# Example `arcade chat` query: `list my 5 most recently modified documents`
|
|
# TODO: Support query with natural language. Currently, the tool expects a fully formed query
|
|
# string as input with the syntax defined here: https://developers.google.com/drive/api/guides/search-files
|
|
@tool(
|
|
requires_auth=Google(
|
|
scopes=["https://www.googleapis.com/auth/drive.file"],
|
|
),
|
|
requires_metadata=[ToolMetadataKey.CLIENT_ID, ToolMetadataKey.COORDINATOR_URL],
|
|
)
|
|
async def search_documents(
|
|
context: ToolContext,
|
|
document_contains: Annotated[
|
|
list[str] | None,
|
|
"Keywords or phrases that must be in the document title or body. Provide a list of "
|
|
"keywords or phrases if needed.",
|
|
] = None,
|
|
document_not_contains: Annotated[
|
|
list[str] | None,
|
|
"Keywords or phrases that must NOT be in the document title or body. Provide a list of "
|
|
"keywords or phrases if needed.",
|
|
] = None,
|
|
search_only_in_shared_drive_id: Annotated[
|
|
str | None,
|
|
"The ID of the shared drive to restrict the search to. If provided, the search will only "
|
|
"return documents from this drive. Defaults to None, which searches across all drives.",
|
|
] = None,
|
|
include_shared_drives: Annotated[
|
|
bool,
|
|
"Whether to include documents from shared drives. Defaults to False (searches only in "
|
|
"the user's 'My Drive').",
|
|
] = False,
|
|
include_organization_domain_documents: Annotated[
|
|
bool,
|
|
"Whether to include documents from the organization's domain. This is applicable to admin "
|
|
"users who have permissions to view organization-wide documents in a Google Workspace "
|
|
"account. Defaults to False.",
|
|
] = False,
|
|
order_by: Annotated[
|
|
list[OrderBy] | None,
|
|
"Sort order. Defaults to listing the most recently modified documents first",
|
|
] = None,
|
|
limit: Annotated[int, "The number of documents to list"] = 50,
|
|
pagination_token: Annotated[
|
|
str | None, "The pagination token to continue a previous request"
|
|
] = None,
|
|
) -> Annotated[
|
|
dict,
|
|
"A dictionary containing 'documents_count' (number of documents returned) and 'documents' "
|
|
"(a list of document details including 'kind', 'mimeType', 'id', and 'name' for each document)",
|
|
]:
|
|
"""
|
|
Searches for documents in the user's Google Drive. Excludes documents that are in the trash.
|
|
"""
|
|
if order_by is None:
|
|
order_by = [OrderBy.MODIFIED_TIME_DESC]
|
|
elif isinstance(order_by, OrderBy):
|
|
order_by = [order_by]
|
|
|
|
page_size = min(10, limit)
|
|
files: list[dict[str, Any]] = []
|
|
|
|
service = build_drive_service(context.get_auth_token_or_empty())
|
|
|
|
params = build_files_list_params(
|
|
mime_type="application/vnd.google-apps.document",
|
|
document_contains=document_contains,
|
|
document_not_contains=document_not_contains,
|
|
page_size=page_size,
|
|
order_by=order_by,
|
|
pagination_token=pagination_token,
|
|
include_shared_drives=include_shared_drives,
|
|
search_only_in_shared_drive_id=search_only_in_shared_drive_id,
|
|
include_organization_domain_documents=include_organization_domain_documents,
|
|
)
|
|
|
|
while len(files) < limit:
|
|
if pagination_token:
|
|
params["pageToken"] = pagination_token
|
|
else:
|
|
params.pop("pageToken", None)
|
|
|
|
results = service.files().list(**params).execute()
|
|
batch = results.get("files", [])
|
|
files.extend(batch[: limit - len(files)])
|
|
|
|
pagination_token = results.get("nextPageToken")
|
|
if not pagination_token or len(batch) < page_size:
|
|
break
|
|
|
|
file_picker_response = generate_google_file_picker_url(
|
|
context,
|
|
)
|
|
|
|
return {
|
|
"documents_count": len(files),
|
|
"documents": files,
|
|
"file_picker": {
|
|
"url": file_picker_response["url"],
|
|
"llm_instructions": optional_file_picker_instructions_template.format(
|
|
url=file_picker_response["url"]
|
|
),
|
|
},
|
|
}
|
|
|
|
|
|
@tool(
|
|
requires_auth=Google(
|
|
scopes=["https://www.googleapis.com/auth/drive.file"],
|
|
),
|
|
requires_metadata=[ToolMetadataKey.CLIENT_ID, ToolMetadataKey.COORDINATOR_URL],
|
|
)
|
|
async def search_and_retrieve_documents(
|
|
context: ToolContext,
|
|
return_format: Annotated[
|
|
DocumentFormat,
|
|
"The format of the document to return. Defaults to Markdown.",
|
|
] = DocumentFormat.MARKDOWN,
|
|
document_contains: Annotated[
|
|
list[str] | None,
|
|
"Keywords or phrases that must be in the document title or body. Provide a list of "
|
|
"keywords or phrases if needed.",
|
|
] = None,
|
|
document_not_contains: Annotated[
|
|
list[str] | None,
|
|
"Keywords or phrases that must NOT be in the document title or body. Provide a list of "
|
|
"keywords or phrases if needed.",
|
|
] = None,
|
|
search_only_in_shared_drive_id: Annotated[
|
|
str | None,
|
|
"The ID of the shared drive to restrict the search to. If provided, the search will only "
|
|
"return documents from this drive. Defaults to None, which searches across all drives.",
|
|
] = None,
|
|
include_shared_drives: Annotated[
|
|
bool,
|
|
"Whether to include documents from shared drives. Defaults to False (searches only in "
|
|
"the user's 'My Drive').",
|
|
] = False,
|
|
include_organization_domain_documents: Annotated[
|
|
bool,
|
|
"Whether to include documents from the organization's domain. This is applicable to admin "
|
|
"users who have permissions to view organization-wide documents in a Google Workspace "
|
|
"account. Defaults to False.",
|
|
] = False,
|
|
order_by: Annotated[
|
|
list[OrderBy] | None,
|
|
"Sort order. Defaults to listing the most recently modified documents first",
|
|
] = None,
|
|
limit: Annotated[int, "The number of documents to list"] = 50,
|
|
pagination_token: Annotated[
|
|
str | None, "The pagination token to continue a previous request"
|
|
] = None,
|
|
) -> Annotated[
|
|
dict,
|
|
"A dictionary containing 'documents_count' (number of documents returned) and 'documents' "
|
|
"(a list of documents with their content).",
|
|
]:
|
|
"""
|
|
Searches for documents in the user's Google Drive and returns a list of documents (with text
|
|
content) matching the search criteria. Excludes documents that are in the trash.
|
|
|
|
Note: use this tool only when the user prompt requires the documents' content. If the user only
|
|
needs a list of documents, use the `search_documents` tool instead.
|
|
"""
|
|
response = await search_documents(
|
|
context=context,
|
|
document_contains=document_contains,
|
|
document_not_contains=document_not_contains,
|
|
search_only_in_shared_drive_id=search_only_in_shared_drive_id,
|
|
include_shared_drives=include_shared_drives,
|
|
include_organization_domain_documents=include_organization_domain_documents,
|
|
order_by=order_by,
|
|
limit=limit,
|
|
pagination_token=pagination_token,
|
|
)
|
|
|
|
documents = []
|
|
|
|
for item in response["documents"]:
|
|
document = await get_document_by_id(context, document_id=item["id"])
|
|
|
|
if return_format == DocumentFormat.MARKDOWN:
|
|
document = convert_document_to_markdown(document)
|
|
elif return_format == DocumentFormat.HTML:
|
|
document = convert_document_to_html(document)
|
|
|
|
documents.append(document)
|
|
|
|
file_picker_response = generate_google_file_picker_url(
|
|
context,
|
|
)
|
|
|
|
return {
|
|
"documents_count": len(documents),
|
|
"documents": documents,
|
|
"file_picker": {
|
|
"url": file_picker_response["url"],
|
|
"llm_instructions": optional_file_picker_instructions_template.format(
|
|
url=file_picker_response["url"]
|
|
),
|
|
},
|
|
}
|