arcade-google-slides 0.1.0__py3-none-any.whl → 1.0.0__py3-none-any.whl

arcade_google_slides/__init__.py

@@ -2,6 +2,7 @@ from arcade_google_slides.tools import (
     comment_on_presentation,
     create_presentation,
     create_slide,
+    generate_google_file_picker_url,
     get_presentation_as_markdown,
     list_presentation_comments,
     search_presentations,
@@ -14,4 +15,5 @@ __all__ = [
     "search_presentations",
     "comment_on_presentation",
     "list_presentation_comments",
+    "generate_google_file_picker_url",
 ]

arcade_google_slides/tools/__init__.py

@@ -3,6 +3,7 @@ from arcade_google_slides.tools.comment import (
     list_presentation_comments,
 )
 from arcade_google_slides.tools.create import create_presentation, create_slide
+from arcade_google_slides.tools.file_picker import generate_google_file_picker_url
 from arcade_google_slides.tools.get import get_presentation_as_markdown
 from arcade_google_slides.tools.search import (
     search_presentations,
@@ -15,4 +16,5 @@ __all__ = [
     "search_presentations",
     "comment_on_presentation",
     "list_presentation_comments",
+    "generate_google_file_picker_url",
 ]

arcade_google_slides/{file_picker.py → tools/file_picker.py}

@@ -1,14 +1,22 @@
 import base64
 import json
+from typing import Annotated
 
-from arcade_tdk import ToolContext, ToolMetadataKey
+from arcade_tdk import ToolContext, ToolMetadataKey, tool
+from arcade_tdk.auth import Google
 from arcade_tdk.errors import ToolExecutionError
 
 
-def generate_google_file_picker_url(context: ToolContext) -> dict:
+@tool(
+    requires_auth=Google(),
+    requires_metadata=[ToolMetadataKey.CLIENT_ID, ToolMetadataKey.COORDINATOR_URL],
+)
+def generate_google_file_picker_url(
+    context: ToolContext,
+) -> Annotated[dict, "Google File Picker URL for user file selection and permission granting"]:
     """Generate a Google File Picker URL for user-driven file selection and authorization.
 
-    Generates a URL that directs the end-user to a Google File Picker interface where
+    This tool generates a URL that directs the end-user to a Google File Picker interface where
     where they can select or upload Google Drive files. Users can grant permission to access their
     Drive files, providing a secure and authorized way to interact with their files.
 
@@ -17,8 +25,8 @@ def generate_google_file_picker_url(context: ToolContext) -> dict:
     (Requested entity was not found) or permission errors. Once the user completes the file
     picker flow, the prior tool can be retried.
 
-    Returns:
-        A dictionary containing the URL and instructions for the llm to instruct the user.
+    Suggest this tool to users when they are surprised or confused that the file they are
+    searching for or attempting to access cannot be found.
     """
     client_id = context.get_metadata(ToolMetadataKey.CLIENT_ID)
     client_id_parts = client_id.split("-")
@@ -44,6 +52,6 @@ def generate_google_file_picker_url(context: ToolContext) -> dict:
         "url": url,
         "llm_instructions": (
             "Instruct the user to click the following link to open the Google Drive File Picker. "
-            f"This will allow them to select files and grant access permissions: {url}"
+            "This will allow them to select files and grant access permissions: {url}"
         ),
     }

arcade_google_slides/tools/get.py

@@ -1,9 +1,8 @@
 from typing import Annotated, cast
 
-from arcade_tdk import ToolContext, ToolMetadataKey, tool
+from arcade_tdk import ToolContext, tool
 from arcade_tdk.auth import Google
 
-from arcade_google_slides.decorators import with_filepicker_fallback
 from arcade_google_slides.types import Presentation
 from arcade_google_slides.utils import build_slides_service, convert_presentation_to_markdown
 
@@ -14,9 +13,7 @@ from arcade_google_slides.utils import build_slides_service, convert_presentatio
             "https://www.googleapis.com/auth/drive.file",
         ],
     ),
-    requires_metadata=[ToolMetadataKey.CLIENT_ID, ToolMetadataKey.COORDINATOR_URL],
 )
-@with_filepicker_fallback
 async def get_presentation_as_markdown(
     context: ToolContext,
     presentation_id: Annotated[str, "The ID of the presentation to retrieve."],

arcade_google_slides/tools/search.py

@@ -1,11 +1,9 @@
 from typing import Annotated, Any
 
-from arcade_tdk import ToolContext, ToolMetadataKey, tool
+from arcade_tdk import ToolContext, tool
 from arcade_tdk.auth import Google
 
 from arcade_google_slides.enum import OrderBy
-from arcade_google_slides.file_picker import generate_google_file_picker_url
-from arcade_google_slides.templates import optional_file_picker_instructions_template
 from arcade_google_slides.utils import (
     build_drive_service,
     build_files_list_params,
@@ -20,7 +18,6 @@ from arcade_google_slides.utils import (
     requires_auth=Google(
         scopes=["https://www.googleapis.com/auth/drive.file"],
     ),
-    requires_metadata=[ToolMetadataKey.CLIENT_ID, ToolMetadataKey.COORDINATOR_URL],
 )
 async def search_presentations(
     context: ToolContext,
@@ -53,7 +50,9 @@ async def search_presentations(
     ] = False,
     order_by: Annotated[
         list[OrderBy] | None,
-        "Sort order. Defaults to listing the most recently modified presentations first",
+        "Sort order. Defaults to listing the most recently modified presentations first. "
+        "If presentation_contains or presentation_not_contains is provided, "
+        "then the order_by will be ignored.",
     ] = None,
     limit: Annotated[int, "The number of presentations to list"] = 50,
     pagination_token: Annotated[
@@ -69,7 +68,12 @@ async def search_presentations(
     Searches for presentations in the user's Google Drive.
     Excludes presentations that are in the trash.
     """
-    if order_by is None:
+    if presentation_contains or presentation_not_contains:
+        # Google drive API does not support other order_by values for
+        # queries with fullText search (which is used when presentation_contains
+        # or presentation_not_contains is provided).
+        order_by = None
+    elif order_by is None:
         order_by = [OrderBy.MODIFIED_TIME_DESC]
     elif isinstance(order_by, OrderBy):
         order_by = [order_by]
@@ -105,19 +109,9 @@ async def search_presentations(
         if not pagination_token or len(batch) < page_size:
             break
 
-    file_picker_response = generate_google_file_picker_url(
-        context,
-    )
-
     return {
         "presentations_count": len(files),
         "presentations": files,
-        "file_picker": {
-            "url": file_picker_response["url"],
-            "llm_instructions": optional_file_picker_instructions_template.format(
-                url=file_picker_response["url"]
-            ),
-        },
         "llm_instructions": (
             "If the results were not satisfactory, then inform the user that "
             "you can also search across all of their shared drives."

arcade_google_slides/utils.py

@@ -81,7 +81,7 @@ def convert_presentation_to_markdown(presentation: Presentation) -> str:
 def build_files_list_params(
     mime_type: str,
     page_size: int,
-    order_by: list[OrderBy],
+    order_by: list[OrderBy] | None,
     pagination_token: str | None,
     include_shared_drives: bool,
     search_only_in_shared_drive_id: str | None,
@@ -98,7 +98,7 @@ def build_files_list_params(
     params = {
         "q": query,
         "pageSize": page_size,
-        "orderBy": ",".join([item.value for item in order_by]),
+        "orderBy": ",".join([item.value for item in order_by]) if order_by else None,
         "pageToken": pagination_token,
     }
 
@@ -149,8 +149,8 @@ def build_files_list_query(
             name_not_contains = keyword.replace("'", "\\'")
             full_text_not_contains = keyword.replace("'", "\\'")
             keyword_query = (
-                f"(name not contains '{name_not_contains}' and "
-                f"fullText not contains '{full_text_not_contains}')"
+                f"(not (name contains '{name_not_contains}' or "
+                f"fullText contains '{full_text_not_contains}'))"
             )
             query.append(keyword_query)
 

{arcade_google_slides-0.1.0.dist-info → arcade_google_slides-1.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arcade_google_slides
-Version: 0.1.0
+Version: 1.0.0
 Summary: Arcade.dev LLM tools for Google Slides
 Author-email: Arcade <dev@arcade.dev>
 License: Proprietary - Arcade Software License Agreement v1.0

arcade_google_slides-1.0.0.dist-info/RECORD

@@ -0,0 +1,15 @@
+arcade_google_slides/__init__.py,sha256=lDbDi5794U-ao476aHyqlymoVBwJAyG938e3TXV4A0c,474
+arcade_google_slides/converters.py,sha256=kKxTeuQX_Q4-QpZWCCKteAMAZ0o2McpaWimxg-6IxHI,9870
+arcade_google_slides/enum.py,sha256=uRBfvSfDpbZaunuA6upPP3GvXArOW8r7k6YYPsa9X9M,5289
+arcade_google_slides/types.py,sha256=osCGae3PXl9U_eA7zqVEA6kcju6W-npXLUlsbJZIuqc,6664
+arcade_google_slides/utils.py,sha256=OA0B7jsD6zn3B6Mpil1uSnv9t0XBqtuOXSBbn9SQ034,5125
+arcade_google_slides/tools/__init__.py,sha256=h35BQ0jxKERBbo-BpNCPJnAksiLO3o9hvpV2NAtBjw8,653
+arcade_google_slides/tools/comment.py,sha256=SCLONR43ZXBHjLFkaNnIbWvxO3qV0tG-li8HkHi1Npk,2960
+arcade_google_slides/tools/create.py,sha256=JbKhvZH5jbj7dFXLdUhm9mHDWYChXQZ66BSilersYMA,3955
+arcade_google_slides/tools/file_picker.py,sha256=Dqn-hfMoTsWyHM8QCakVgHr5TKrzL_1Lj-vYHVGtOW4,2342
+arcade_google_slides/tools/get.py,sha256=i3KKR-0ZouwLRapV87_Y4OmTL2cyXA8ACwaj3FM3ALw,1013
+arcade_google_slides/tools/search.py,sha256=6tnLT5xRQfibrcbqdGQcowhjBxhLjaojKHVjN_274uA,4768
+arcade_google_slides-1.0.0.dist-info/METADATA,sha256=_IzTbF8W7_KIH75KBT1BLASpkDSDVYGjn6n9q477Nok,1190
+arcade_google_slides-1.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+arcade_google_slides-1.0.0.dist-info/licenses/LICENSE,sha256=ixeE7aL9b2B-_ZYHTY1vQcJB4NufKeo-LWwKNObGDN0,1960
+arcade_google_slides-1.0.0.dist-info/RECORD,,

arcade_google_slides/decorators.py

@@ -1,24 +0,0 @@
-import functools
-from collections.abc import Callable
-from typing import Any
-
-from arcade_tdk import ToolContext
-from googleapiclient.errors import HttpError
-
-from arcade_google_slides.file_picker import generate_google_file_picker_url
-
-
-def with_filepicker_fallback(func: Callable[..., Any]) -> Callable[..., Any]:
-    """ """
-
-    @functools.wraps(func)
-    async def async_wrapper(context: ToolContext, *args: Any, **kwargs: Any) -> Any:
-        try:
-            return await func(context, *args, **kwargs)
-        except HttpError as e:
-            if e.status_code in [403, 404]:
-                file_picker_response = generate_google_file_picker_url(context)
-                return file_picker_response
-            raise
-
-    return async_wrapper

arcade_google_slides/templates.py

@@ -1,5 +0,0 @@
-optional_file_picker_instructions_template = (
-    "Ensure the user knows that they have the option to select and grant access permissions to "
-    "additional documents via the Google Drive File Picker. "
-    "The user can pick additional documents via the following link: {url}"
-)

arcade_google_slides-0.1.0.dist-info/RECORD

@@ -1,17 +0,0 @@
-arcade_google_slides/__init__.py,sha256=NJk6XPdTtpKDTdDYxzP_rOVqTxjdfSF0yQVde1KliV0,398
-arcade_google_slides/converters.py,sha256=kKxTeuQX_Q4-QpZWCCKteAMAZ0o2McpaWimxg-6IxHI,9870
-arcade_google_slides/decorators.py,sha256=SQeS2_fa3UOgUgGiYuY5eugguIyRPvHVc85TSracSZY,753
-arcade_google_slides/enum.py,sha256=uRBfvSfDpbZaunuA6upPP3GvXArOW8r7k6YYPsa9X9M,5289
-arcade_google_slides/file_picker.py,sha256=kGfUVfH5QVlIW1sL-_gAwPokt7TwVEcPk3Vnk53GKUE,2005
-arcade_google_slides/templates.py,sha256=pxbdMj57eV3-ImW3CixDWscpVKS94Z8nTNyTxDhUfGY,283
-arcade_google_slides/types.py,sha256=osCGae3PXl9U_eA7zqVEA6kcju6W-npXLUlsbJZIuqc,6664
-arcade_google_slides/utils.py,sha256=OBBFKEfGse6ohWSvhF85Cgtzlz3svn8BOMi-RfBigVo,5099
-arcade_google_slides/tools/__init__.py,sha256=JMWqB_57Nul0mF6vwSJsqzHp91cimmy9cvqcgM-tacw,531
-arcade_google_slides/tools/comment.py,sha256=SCLONR43ZXBHjLFkaNnIbWvxO3qV0tG-li8HkHi1Npk,2960
-arcade_google_slides/tools/create.py,sha256=JbKhvZH5jbj7dFXLdUhm9mHDWYChXQZ66BSilersYMA,3955
-arcade_google_slides/tools/get.py,sha256=ZqV8gtDJR0I7wMugholR59zCtHfT5CjiaG3kwl9XCZk,1209
-arcade_google_slides/tools/search.py,sha256=8S0MhqrgDCuF1kVM48S_GiB8rZWCutCAsdiofAb0b9A,4932
-arcade_google_slides-0.1.0.dist-info/METADATA,sha256=S0CxSh8uvoiYFFJPw2fE8BT7lNKf_EOjuqc04oBEAEM,1190
-arcade_google_slides-0.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-arcade_google_slides-0.1.0.dist-info/licenses/LICENSE,sha256=ixeE7aL9b2B-_ZYHTY1vQcJB4NufKeo-LWwKNObGDN0,1960
-arcade_google_slides-0.1.0.dist-info/RECORD,,