workspace-mcp 1.1.5__tar.gz → 1.1.6__tar.gz

{workspace_mcp-1.1.5 → workspace_mcp-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workspace-mcp
-Version: 1.1.5
+Version: 1.1.6
 Summary: Comprehensive, highly performant Google Workspace Streamable HTTP & SSE MCP Server for Calendar, Gmail, Docs, Sheets, Slides & Drive
 Author-email: Taylor Wilsdon <taylor@taylorwilsdon.com>
 License: MIT
@@ -47,11 +47,11 @@ Dynamic: license-file
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Python 3.11+](https://img.shields.io/badge/Python-3.11%2B-blue.svg)](https://www.python.org/downloads/)
 [![PyPI](https://img.shields.io/pypi/v/workspace-mcp.svg)](https://pypi.org/project/workspace-mcp/)
-[![UV](https://img.shields.io/badge/Package%20Installer-UV-blueviolet)](https://github.com/astral-sh/uv)
+[![PyPI Downloads](https://static.pepy.tech/badge/workspace-mcp/month)](https://pepy.tech/projects/workspace-mcp)
 [![Website](https://img.shields.io/badge/Website-workspacemcp.com-green.svg)](https://workspacemcp.com)
 [![Verified on MseeP](https://mseep.ai/badge.svg)](https://mseep.ai/app/eebbc4a6-0f8c-41b2-ace8-038e5516dba0)
 
-**This is the single most feature-complete Google Workspace MCP server**
+**This is the single most feature-complete Google Workspace MCP server** now with 1-click Claude installation
 
 *Full natural language control over Google Calendar, Drive, Gmail, Docs, Sheets, Slides, Forms, Tasks, and Chat through all MCP clients, AI assistants and developer tools.*
 
@@ -122,11 +122,12 @@ A production-ready MCP server that integrates all major Google Workspace service
 
 >
 **Why DXT?**
-> Desktop Extensions (`.dxt`) bundle the server, dependencies, and manifest so users go from download → working MCP in **three clicks** – no terminal, no JSON editing, no version conflicts.
+> Desktop Extensions (`.dxt`) bundle the server, dependencies, and manifest so users go from download → working MCP in **one click** – no terminal, no JSON editing, no version conflicts.
 
 #### Required Configuration
 <details>
 <summary>Environment - you will configure these in Claude itself, see screenshot:</summary>
+
 | Variable | Purpose |
 |----------|---------|
 | `GOOGLE_OAUTH_CLIENT_ID` | OAuth client ID from Google Cloud |
@@ -136,8 +137,10 @@ A production-ready MCP server that integrates all major Google Workspace service
 
 Claude Desktop stores these securely in the OS keychain; set them once in the extension pane.
 </details>
-Screenshot here
 
+<div align="center">
+  <video width="832" src="https://github.com/user-attachments/assets/83cca4b3-5e94-448b-acb3-6e3a27341d3a"></video>
+</div>
 ---
 
 ### 2. Advanced / Cross-Platform Installation
@@ -308,8 +311,12 @@ After running the script, just restart Claude Desktop and you're ready to go.
   "mcpServers": {
     "google_workspace": {
       "command": "uv",
-      "args": ["run", "main.py"],
-      "cwd": "/path/to/google_workspace_mcp",
+      "args": [
+        "run",
+        "--directory",
+        "/path/to/repo/google_workspace_mcp",
+        "main.py"
+      ],
       "env": {
         "GOOGLE_OAUTH_CLIENT_ID": "your-client-id.apps.googleusercontent.com",
         "GOOGLE_OAUTH_CLIENT_SECRET": "your-client-secret",

{workspace_mcp-1.1.5 → workspace_mcp-1.1.6}/README.md

@@ -5,11 +5,11 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Python 3.11+](https://img.shields.io/badge/Python-3.11%2B-blue.svg)](https://www.python.org/downloads/)
 [![PyPI](https://img.shields.io/pypi/v/workspace-mcp.svg)](https://pypi.org/project/workspace-mcp/)
-[![UV](https://img.shields.io/badge/Package%20Installer-UV-blueviolet)](https://github.com/astral-sh/uv)
+[![PyPI Downloads](https://static.pepy.tech/badge/workspace-mcp/month)](https://pepy.tech/projects/workspace-mcp)
 [![Website](https://img.shields.io/badge/Website-workspacemcp.com-green.svg)](https://workspacemcp.com)
 [![Verified on MseeP](https://mseep.ai/badge.svg)](https://mseep.ai/app/eebbc4a6-0f8c-41b2-ace8-038e5516dba0)
 
-**This is the single most feature-complete Google Workspace MCP server**
+**This is the single most feature-complete Google Workspace MCP server** now with 1-click Claude installation
 
 *Full natural language control over Google Calendar, Drive, Gmail, Docs, Sheets, Slides, Forms, Tasks, and Chat through all MCP clients, AI assistants and developer tools.*
 
@@ -80,11 +80,12 @@ A production-ready MCP server that integrates all major Google Workspace service
 
 >
 **Why DXT?**
-> Desktop Extensions (`.dxt`) bundle the server, dependencies, and manifest so users go from download → working MCP in **three clicks** – no terminal, no JSON editing, no version conflicts.
+> Desktop Extensions (`.dxt`) bundle the server, dependencies, and manifest so users go from download → working MCP in **one click** – no terminal, no JSON editing, no version conflicts.
 
 #### Required Configuration
 <details>
 <summary>Environment - you will configure these in Claude itself, see screenshot:</summary>
+
 | Variable | Purpose |
 |----------|---------|
 | `GOOGLE_OAUTH_CLIENT_ID` | OAuth client ID from Google Cloud |
@@ -94,8 +95,10 @@ A production-ready MCP server that integrates all major Google Workspace service
 
 Claude Desktop stores these securely in the OS keychain; set them once in the extension pane.
 </details>
-Screenshot here
 
+<div align="center">
+  <video width="832" src="https://github.com/user-attachments/assets/83cca4b3-5e94-448b-acb3-6e3a27341d3a"></video>
+</div>
 ---
 
 ### 2. Advanced / Cross-Platform Installation
@@ -266,8 +269,12 @@ After running the script, just restart Claude Desktop and you're ready to go.
   "mcpServers": {
     "google_workspace": {
       "command": "uv",
-      "args": ["run", "main.py"],
-      "cwd": "/path/to/google_workspace_mcp",
+      "args": [
+        "run",
+        "--directory",
+        "/path/to/repo/google_workspace_mcp",
+        "main.py"
+      ],
       "env": {
         "GOOGLE_OAUTH_CLIENT_ID": "your-client-id.apps.googleusercontent.com",
         "GOOGLE_OAUTH_CLIENT_SECRET": "your-client-secret",

workspace_mcp-1.1.6/core/utils.py

@@ -0,0 +1,296 @@
+import io
+import logging
+import os
+import tempfile
+import zipfile, xml.etree.ElementTree as ET
+import ssl
+import time
+import asyncio
+import functools
+
+from typing import List, Optional
+
+from googleapiclient.errors import HttpError
+
+logger = logging.getLogger(__name__)
+
+
+class TransientNetworkError(Exception):
+    """Custom exception for transient network errors after retries."""
+
+    pass
+
+
+def check_credentials_directory_permissions(credentials_dir: str = None) -> None:
+    """
+    Check if the service has appropriate permissions to create and write to the .credentials directory.
+
+    Args:
+        credentials_dir: Path to the credentials directory (default: uses get_default_credentials_dir())
+
+    Raises:
+        PermissionError: If the service lacks necessary permissions
+        OSError: If there are other file system issues
+    """
+    if credentials_dir is None:
+        from auth.google_auth import get_default_credentials_dir
+
+        credentials_dir = get_default_credentials_dir()
+
+    try:
+        # Check if directory exists
+        if os.path.exists(credentials_dir):
+            # Directory exists, check if we can write to it
+            test_file = os.path.join(credentials_dir, ".permission_test")
+            try:
+                with open(test_file, "w") as f:
+                    f.write("test")
+                os.remove(test_file)
+                logger.info(
+                    f"Credentials directory permissions check passed: {os.path.abspath(credentials_dir)}"
+                )
+            except (PermissionError, OSError) as e:
+                raise PermissionError(
+                    f"Cannot write to existing credentials directory '{os.path.abspath(credentials_dir)}': {e}"
+                )
+        else:
+            # Directory doesn't exist, try to create it and its parent directories
+            try:
+                os.makedirs(credentials_dir, exist_ok=True)
+                # Test writing to the new directory
+                test_file = os.path.join(credentials_dir, ".permission_test")
+                with open(test_file, "w") as f:
+                    f.write("test")
+                os.remove(test_file)
+                logger.info(
+                    f"Created credentials directory with proper permissions: {os.path.abspath(credentials_dir)}"
+                )
+            except (PermissionError, OSError) as e:
+                # Clean up if we created the directory but can't write to it
+                try:
+                    if os.path.exists(credentials_dir):
+                        os.rmdir(credentials_dir)
+                except:
+                    pass
+                raise PermissionError(
+                    f"Cannot create or write to credentials directory '{os.path.abspath(credentials_dir)}': {e}"
+                )
+
+    except PermissionError:
+        raise
+    except Exception as e:
+        raise OSError(
+            f"Unexpected error checking credentials directory permissions: {e}"
+        )
+
+
+def extract_office_xml_text(file_bytes: bytes, mime_type: str) -> Optional[str]:
+    """
+    Very light-weight XML scraper for Word, Excel, PowerPoint files.
+    Returns plain-text if something readable is found, else None.
+    No external deps – just std-lib zipfile + ElementTree.
+    """
+    shared_strings: List[str] = []
+    ns_excel_main = "http://schemas.openxmlformats.org/spreadsheetml/2006/main"
+
+    try:
+        with zipfile.ZipFile(io.BytesIO(file_bytes)) as zf:
+            targets: List[str] = []
+            # Map MIME → iterable of XML files to inspect
+            if (
+                mime_type
+                == "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+            ):
+                targets = ["word/document.xml"]
+            elif (
+                mime_type
+                == "application/vnd.openxmlformats-officedocument.presentationml.presentation"
+            ):
+                targets = [n for n in zf.namelist() if n.startswith("ppt/slides/slide")]
+            elif (
+                mime_type
+                == "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+            ):
+                targets = [
+                    n
+                    for n in zf.namelist()
+                    if n.startswith("xl/worksheets/sheet") and "drawing" not in n
+                ]
+                # Attempt to parse sharedStrings.xml for Excel files
+                try:
+                    shared_strings_xml = zf.read("xl/sharedStrings.xml")
+                    shared_strings_root = ET.fromstring(shared_strings_xml)
+                    for si_element in shared_strings_root.findall(
+                        f"{{{ns_excel_main}}}si"
+                    ):
+                        text_parts = []
+                        # Find all <t> elements, simple or within <r> runs, and concatenate their text
+                        for t_element in si_element.findall(f".//{{{ns_excel_main}}}t"):
+                            if t_element.text:
+                                text_parts.append(t_element.text)
+                        shared_strings.append("".join(text_parts))
+                except KeyError:
+                    logger.info(
+                        "No sharedStrings.xml found in Excel file (this is optional)."
+                    )
+                except ET.ParseError as e:
+                    logger.error(f"Error parsing sharedStrings.xml: {e}")
+                except (
+                    Exception
+                ) as e:  # Catch any other unexpected error during sharedStrings parsing
+                    logger.error(
+                        f"Unexpected error processing sharedStrings.xml: {e}",
+                        exc_info=True,
+                    )
+            else:
+                return None
+
+            pieces: List[str] = []
+            for member in targets:
+                try:
+                    xml_content = zf.read(member)
+                    xml_root = ET.fromstring(xml_content)
+                    member_texts: List[str] = []
+
+                    if (
+                        mime_type
+                        == "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                    ):
+                        for cell_element in xml_root.findall(
+                            f".//{{{ns_excel_main}}}c"
+                        ):  # Find all <c> elements
+                            value_element = cell_element.find(
+                                f"{{{ns_excel_main}}}v"
+                            )  # Find <v> under <c>
+
+                            # Skip if cell has no value element or value element has no text
+                            if value_element is None or value_element.text is None:
+                                continue
+
+                            cell_type = cell_element.get("t")
+                            if cell_type == "s":  # Shared string
+                                try:
+                                    ss_idx = int(value_element.text)
+                                    if 0 <= ss_idx < len(shared_strings):
+                                        member_texts.append(shared_strings[ss_idx])
+                                    else:
+                                        logger.warning(
+                                            f"Invalid shared string index {ss_idx} in {member}. Max index: {len(shared_strings)-1}"
+                                        )
+                                except ValueError:
+                                    logger.warning(
+                                        f"Non-integer shared string index: '{value_element.text}' in {member}."
+                                    )
+                            else:  # Direct value (number, boolean, inline string if not 's')
+                                member_texts.append(value_element.text)
+                    else:  # Word or PowerPoint
+                        for elem in xml_root.iter():
+                            # For Word: <w:t> where w is "http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+                            # For PowerPoint: <a:t> where a is "http://schemas.openxmlformats.org/drawingml/2006/main"
+                            if (
+                                elem.tag.endswith("}t") and elem.text
+                            ):  # Check for any namespaced tag ending with 't'
+                                cleaned_text = elem.text.strip()
+                                if (
+                                    cleaned_text
+                                ):  # Add only if there's non-whitespace text
+                                    member_texts.append(cleaned_text)
+
+                    if member_texts:
+                        pieces.append(
+                            " ".join(member_texts)
+                        )  # Join texts from one member with spaces
+
+                except ET.ParseError as e:
+                    logger.warning(
+                        f"Could not parse XML in member '{member}' for {mime_type} file: {e}"
+                    )
+                except Exception as e:
+                    logger.error(
+                        f"Error processing member '{member}' for {mime_type}: {e}",
+                        exc_info=True,
+                    )
+                    # continue processing other members
+
+            if not pieces:  # If no text was extracted at all
+                return None
+
+            # Join content from different members (sheets/slides) with double newlines for separation
+            text = "\n\n".join(pieces).strip()
+            return text or None  # Ensure None is returned if text is empty after strip
+
+    except zipfile.BadZipFile:
+        logger.warning(f"File is not a valid ZIP archive (mime_type: {mime_type}).")
+        return None
+    except (
+        ET.ParseError
+    ) as e:  # Catch parsing errors at the top level if zipfile itself is XML-like
+        logger.error(f"XML parsing error at a high level for {mime_type}: {e}")
+        return None
+    except Exception as e:
+        logger.error(
+            f"Failed to extract office XML text for {mime_type}: {e}", exc_info=True
+        )
+        return None
+
+
+def handle_http_errors(tool_name: str, is_read_only: bool = False):
+    """
+    A decorator to handle Google API HttpErrors and transient SSL errors in a standardized way.
+
+    It wraps a tool function, catches HttpError, logs a detailed error message,
+    and raises a generic Exception with a user-friendly message.
+
+    If is_read_only is True, it will also catch ssl.SSLError and retry with
+    exponential backoff. After exhausting retries, it raises a TransientNetworkError.
+
+    Args:
+        tool_name (str): The name of the tool being decorated (e.g., 'list_calendars').
+        is_read_only (bool): If True, the operation is considered safe to retry on
+                             transient network errors. Defaults to False.
+    """
+
+    def decorator(func):
+        @functools.wraps(func)
+        async def wrapper(*args, **kwargs):
+            max_retries = 3
+            base_delay = 1
+
+            for attempt in range(max_retries):
+                try:
+                    return await func(*args, **kwargs)
+                except ssl.SSLError as e:
+                    if is_read_only and attempt < max_retries - 1:
+                        delay = base_delay * (2**attempt)
+                        logger.warning(
+                            f"SSL error in {tool_name} on attempt {attempt + 1}: {e}. Retrying in {delay} seconds..."
+                        )
+                        await asyncio.sleep(delay)
+                    else:
+                        logger.error(
+                            f"SSL error in {tool_name} on final attempt: {e}. Raising exception."
+                        )
+                        raise TransientNetworkError(
+                            f"A transient SSL error occurred in '{tool_name}' after {max_retries} attempts. "
+                            "This is likely a temporary network or certificate issue. Please try again shortly."
+                        ) from e
+                except HttpError as error:
+                    user_google_email = kwargs.get("user_google_email", "N/A")
+                    message = (
+                        f"API error in {tool_name}: {error}. "
+                        f"You might need to re-authenticate for user '{user_google_email}'. "
+                        f"LLM: Try 'start_google_auth' with the user's email and the appropriate service_name."
+                    )
+                    logger.error(message, exc_info=True)
+                    raise Exception(message) from error
+                except TransientNetworkError:
+                    # Re-raise without wrapping to preserve the specific error type
+                    raise
+                except Exception as e:
+                    message = f"An unexpected error occurred in {tool_name}: {e}"
+                    logger.exception(message)
+                    raise Exception(message) from e
+
+        return wrapper
+
+    return decorator

{workspace_mcp-1.1.5 → workspace_mcp-1.1.6}/gTasks/tasks_tools.py

@@ -13,12 +13,14 @@ from googleapiclient.errors import HttpError
 
 from auth.service_decorator import require_google_service
 from core.server import server
+from core.utils import handle_http_errors
 
 logger = logging.getLogger(__name__)
 
 
 @server.tool()
 @require_google_service("tasks", "tasks_read")
+@handle_http_errors("list_task_lists")
 async def list_task_lists(
     service,
     user_google_email: str,
@@ -78,6 +80,7 @@ async def list_task_lists(
 
 @server.tool()
 @require_google_service("tasks", "tasks_read")
+@handle_http_errors("get_task_list")
 async def get_task_list(
     service,
     user_google_email: str,
@@ -121,6 +124,7 @@ async def get_task_list(
 
 @server.tool()
 @require_google_service("tasks", "tasks")
+@handle_http_errors("create_task_list")
 async def create_task_list(
     service,
     user_google_email: str,
@@ -168,6 +172,7 @@ async def create_task_list(
 
 @server.tool()
 @require_google_service("tasks", "tasks")
+@handle_http_errors("update_task_list")
 async def update_task_list(
     service,
     user_google_email: str,
@@ -217,6 +222,7 @@ async def update_task_list(
 
 @server.tool()
 @require_google_service("tasks", "tasks")
+@handle_http_errors("delete_task_list")
 async def delete_task_list(
     service,
     user_google_email: str,
@@ -256,6 +262,7 @@ async def delete_task_list(
 
 @server.tool()
 @require_google_service("tasks", "tasks_read")
+@handle_http_errors("list_tasks")
 async def list_tasks(
     service,
     user_google_email: str,
@@ -361,6 +368,7 @@ async def list_tasks(
 
 @server.tool()
 @require_google_service("tasks", "tasks_read")
+@handle_http_errors("get_task")
 async def get_task(
     service,
     user_google_email: str,
@@ -421,6 +429,7 @@ async def get_task(
 
 @server.tool()
 @require_google_service("tasks", "tasks")
+@handle_http_errors("create_task")
 async def create_task(
     service,
     user_google_email: str,
@@ -495,6 +504,7 @@ async def create_task(
 
 @server.tool()
 @require_google_service("tasks", "tasks")
+@handle_http_errors("update_task")
 async def update_task(
     service,
     user_google_email: str,
@@ -576,6 +586,7 @@ async def update_task(
 
 @server.tool()
 @require_google_service("tasks", "tasks")
+@handle_http_errors("delete_task")
 async def delete_task(
     service,
     user_google_email: str,
@@ -617,6 +628,7 @@ async def delete_task(
 
 @server.tool()
 @require_google_service("tasks", "tasks")
+@handle_http_errors("move_task")
 async def move_task(
     service,
     user_google_email: str,
@@ -695,6 +707,7 @@ async def move_task(
 
 @server.tool()
 @require_google_service("tasks", "tasks")
+@handle_http_errors("clear_completed_tasks")
 async def clear_completed_tasks(
     service,
     user_google_email: str,

{workspace_mcp-1.1.5 → workspace_mcp-1.1.6}/gcalendar/calendar_tools.py

@@ -80,8 +80,8 @@ def _correct_time_format_for_api(
 
 
 @server.tool()
+@handle_http_errors("list_calendars", is_read_only=True)
 @require_google_service("calendar", "calendar_read")
-@handle_http_errors("list_calendars")
 async def list_calendars(service, user_google_email: str) -> str:
     """
     Retrieves a list of calendars accessible to the authenticated user.
@@ -114,8 +114,8 @@ async def list_calendars(service, user_google_email: str) -> str:
 
 
 @server.tool()
+@handle_http_errors("get_events", is_read_only=True)
 @require_google_service("calendar", "calendar_read")
-@handle_http_errors("get_events")
 async def get_events(
     service,
     user_google_email: str,
@@ -202,8 +202,8 @@ async def get_events(
 
 
 @server.tool()
-@require_google_service("calendar", "calendar_events")
 @handle_http_errors("create_event")
+@require_google_service("calendar", "calendar_events")
 async def create_event(
     service,
     user_google_email: str,
@@ -326,8 +326,8 @@ async def create_event(
 
 
 @server.tool()
-@require_google_service("calendar", "calendar_events")
 @handle_http_errors("modify_event")
+@require_google_service("calendar", "calendar_events")
 async def modify_event(
     service,
     user_google_email: str,
@@ -446,8 +446,8 @@ async def modify_event(
 
 
 @server.tool()
-@require_google_service("calendar", "calendar_events")
 @handle_http_errors("delete_event")
+@require_google_service("calendar", "calendar_events")
 async def delete_event(service, user_google_email: str, event_id: str, calendar_id: str = "primary") -> str:
     """
     Deletes an existing event.
@@ -500,8 +500,8 @@ async def delete_event(service, user_google_email: str, event_id: str, calendar_
 
 
 @server.tool()
+@handle_http_errors("get_event", is_read_only=True)
 @require_google_service("calendar", "calendar_read")
-@handle_http_errors("get_event")
 async def get_event(
     service,
     user_google_email: str,

{workspace_mcp-1.1.5 → workspace_mcp-1.1.6}/gdocs/docs_tools.py

@@ -20,8 +20,8 @@ from core.comments import create_comment_tools
 logger = logging.getLogger(__name__)
 
 @server.tool()
+@handle_http_errors("search_docs", is_read_only=True)
 @require_google_service("drive", "drive_read")
-@handle_http_errors("search_docs")
 async def search_docs(
     service,
     user_google_email: str,
@@ -57,11 +57,11 @@ async def search_docs(
     return "\n".join(output)
 
 @server.tool()
+@handle_http_errors("get_doc_content", is_read_only=True)
 @require_multiple_services([
     {"service_type": "drive", "scopes": "drive_read", "param_name": "drive_service"},
     {"service_type": "docs", "scopes": "docs_read", "param_name": "docs_service"}
 ])
-@handle_http_errors("get_doc_content")
 async def get_doc_content(
     drive_service,
     docs_service,
@@ -157,8 +157,8 @@ async def get_doc_content(
     return header + body_text
 
 @server.tool()
+@handle_http_errors("list_docs_in_folder", is_read_only=True)
 @require_google_service("drive", "drive_read")
-@handle_http_errors("list_docs_in_folder")
 async def list_docs_in_folder(
     service,
     user_google_email: str,
@@ -189,8 +189,8 @@ async def list_docs_in_folder(
     return "\n".join(out)
 
 @server.tool()
-@require_google_service("docs", "docs_write")
 @handle_http_errors("create_doc")
+@require_google_service("docs", "docs_write")
 async def create_doc(
     service,
     user_google_email: str,

{workspace_mcp-1.1.5 → workspace_mcp-1.1.6}/gdrive/drive_tools.py

@@ -76,8 +76,8 @@ def _build_drive_list_params(
     return list_params
 
 @server.tool()
+@handle_http_errors("search_drive_files", is_read_only=True)
 @require_google_service("drive", "drive_read")
-@handle_http_errors("search_drive_files")
 async def search_drive_files(
     service,
     user_google_email: str,
@@ -143,8 +143,8 @@ async def search_drive_files(
     return text_output
 
 @server.tool()
+@handle_http_errors("get_drive_file_content", is_read_only=True)
 @require_google_service("drive", "drive_read")
-@handle_http_errors("get_drive_file_content")
 async def get_drive_file_content(
     service,
     user_google_email: str,
@@ -200,7 +200,7 @@ async def get_drive_file_content(
         "application/vnd.openxmlformats-officedocument.presentationml.presentation",
         "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
     }
-    
+
     if mime_type in office_mime_types:
         office_text = extract_office_xml_text(file_content_bytes, mime_type)
         if office_text:
@@ -233,8 +233,8 @@ async def get_drive_file_content(
 
 
 @server.tool()
+@handle_http_errors("list_drive_items", is_read_only=True)
 @require_google_service("drive", "drive_read")
-@handle_http_errors("list_drive_items")
 async def list_drive_items(
     service,
     user_google_email: str,
@@ -289,8 +289,8 @@ async def list_drive_items(
     return text_output
 
 @server.tool()
-@require_google_service("drive", "drive_file")
 @handle_http_errors("create_drive_file")
+@require_google_service("drive", "drive_file")
 async def create_drive_file(
     service,
     user_google_email: str,