google-workspace-mcp 1.0.4__py3-none-any.whl → 1.1.5__py3-none-any.whl

google_workspace_mcp/__main__.py

@@ -19,13 +19,12 @@ from google_workspace_mcp.resources import drive as drive_resources  # noqa: F40
 from google_workspace_mcp.resources import gmail as gmail_resources  # noqa: F401
 from google_workspace_mcp.resources import sheets_resources  # noqa: F401
 from google_workspace_mcp.resources import slides as slides_resources  # noqa: F401
-from google_workspace_mcp.tools import calendar as calendar_tools  # noqa: F401
 
 # Register tools
-from google_workspace_mcp.tools import (
-    docs_tools,  # noqa: F401
-    sheets_tools,  # noqa: F401
-)
+from google_workspace_mcp.tools import add_image as add_image_tools  # noqa: F401
+from google_workspace_mcp.tools import calendar as calendar_tools  # noqa: F401
+from google_workspace_mcp.tools import docs_tools  # noqa: F401
+from google_workspace_mcp.tools import sheets_tools  # noqa: F401
 from google_workspace_mcp.tools import drive as drive_tools  # noqa: F401
 from google_workspace_mcp.tools import gmail as gmail_tools  # noqa: F401
 from google_workspace_mcp.tools import slides as slides_tools  # noqa: F401
@@ -41,3 +40,5 @@ def main():
 
 if __name__ == "__main__":
     main()
+if __name__ == "__main__":
+    main()

google_workspace_mcp/services/drive.py

@@ -27,8 +27,29 @@ class DriveService(BaseGoogleService):
         """Initialize the Drive service."""
         super().__init__("drive", "v3")
 
+    def _escape_drive_query(self, query: str) -> str:
+        """
+        Basic query cleaning for Drive API queries.
+
+        Args:
+            query: Query string (users should manually escape apostrophes with \')
+
+        Returns:
+            Cleaned query string for Drive API
+        """
+        # Simply remove surrounding double quotes if present
+        # Users should handle apostrophe escaping manually (e.g., John\'s Documents)
+        if query.startswith('"') and query.endswith('"'):
+            query = query[1:-1]
+
+        return query
+
     def search_files(
-        self, query: str, page_size: int = 10, shared_drive_id: str | None = None
+        self,
+        query: str,
+        page_size: int = 10,
+        shared_drive_id: str | None = None,
+        include_shared_drives: bool = True,
     ) -> list[dict[str, Any]]:
         """
         Search for files in Google Drive.
@@ -37,36 +58,42 @@ class DriveService(BaseGoogleService):
             query: Search query string
             page_size: Maximum number of files to return (1-1000)
             shared_drive_id: Optional shared drive ID to search within a specific shared drive
+            include_shared_drives: Whether to include shared drives in search (default True)
 
         Returns:
             List of file metadata dictionaries (id, name, mimeType, etc.) or an error dictionary
         """
         try:
             logger.info(
-                f"Searching files with query: '{query}', page_size: {page_size}, shared_drive_id: {shared_drive_id}"
+                f"Searching files with query: '{query}', page_size: {page_size}, "
+                f"shared_drive_id: {shared_drive_id}, include_shared_drives: {include_shared_drives}"
             )
 
             # Validate and constrain page_size
             page_size = max(1, min(page_size, 1000))
 
-            # Build list parameters with shared drive support
+            # Properly escape the query for Drive API
+            escaped_query = self._escape_drive_query(query)
+
+            # Build list parameters with comprehensive shared drive support
             list_params = {
-                "q": query,  # Use the query directly without modification
+                "q": escaped_query,
                 "pageSize": page_size,
-                "fields": "files(id, name, mimeType, modifiedTime, size, webViewLink, iconLink)",
+                "fields": "files(id, name, mimeType, modifiedTime, size, webViewLink, iconLink, parents)",
                 "supportsAllDrives": True,
                 "includeItemsFromAllDrives": True,
             }
 
             if shared_drive_id:
+                # Search within a specific shared drive
                 list_params["driveId"] = shared_drive_id
-                list_params["corpora"] = (
-                    "drive"  # Search within the specified shared drive
-                )
+                list_params["corpora"] = "drive"
+            elif include_shared_drives:
+                # Search across all drives (user's files + shared drives + shared folders)
+                list_params["corpora"] = "allDrives"
             else:
-                list_params["corpora"] = (
-                    "user"  # Default to user's files if no specific shared drive ID
-                )
+                # Search only user's personal files
+                list_params["corpora"] = "user"
 
             results = self.service.files().list(**list_params).execute()
             files = results.get("files", [])
@@ -234,7 +261,7 @@ class DriveService(BaseGoogleService):
         # Export the file
         try:
             request = self.service.files().export_media(
-                fileId=file_id, mimeType=export_mime_type
+                fileId=file_id, mimeType=export_mime_type, supportsAllDrives=True
             )
 
             content_bytes = self._download_content(request)