workspace-mcp 1.1.10__tar.gz → 1.1.12__tar.gz

{workspace_mcp-1.1.10/workspace_mcp.egg-info → workspace_mcp-1.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workspace-mcp
-Version: 1.1.10
+Version: 1.1.12
 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
@@ -27,7 +27,7 @@ Classifier: Topic :: Communications :: Chat
 Classifier: Topic :: Office/Business
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Typing :: Typed
-Requires-Python: >=3.11
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fastapi>=0.115.12
@@ -46,7 +46,7 @@ Dynamic: license-file
 # Google Workspace MCP Server <img src="https://github.com/user-attachments/assets/b89524e4-6e6e-49e6-ba77-00d6df0c6e5c" width="80" align="right" />
 
 [![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/)
+[![Python 3.10+](https://img.shields.io/badge/Python-3.10%2B-blue.svg)](https://www.python.org/downloads/)
 [![PyPI](https://img.shields.io/pypi/v/workspace-mcp.svg)](https://pypi.org/project/workspace-mcp/)
 [![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)
@@ -151,7 +151,7 @@ If you’re developing, deploying to servers, or using another MCP-capable clien
 #### Instant CLI (uvx)
 
 ```bash
-# Requires Python 3.11+ and uvx
+# Requires Python 3.10+ and uvx
 export GOOGLE_OAUTH_CLIENT_ID="xxx"
 export GOOGLE_OAUTH_CLIENT_SECRET="yyy"
 uvx workspace-mcp --tools gmail drive calendar
@@ -174,7 +174,7 @@ uvx workspace-mcp --tools gmail drive calendar tasks
 uvx workspace-mcp --transport streamable-http
 ```
 
-*Requires Python 3.11+ and [uvx](https://github.com/astral-sh/uv). The package is available on [PyPI](https://pypi.org/project/workspace-mcp).*
+*Requires Python 3.10+ and [uvx](https://github.com/astral-sh/uv). The package is available on [PyPI](https://pypi.org/project/workspace-mcp).*
 
 ### Development Installation
 
@@ -188,7 +188,7 @@ uv run main.py
 
 ### Prerequisites
 
-- **Python 3.11+**
+- **Python 3.10+**
 - **[uvx](https://github.com/astral-sh/uv)** (for instant installation) or [uv](https://github.com/astral-sh/uv) (for development)
 - **Google Cloud Project** with OAuth 2.0 credentials
 
@@ -524,6 +524,14 @@ async def your_new_tool(service, param1: str, param2: int = 10):
 
 To use this server as a tool provider within Open WebUI:
 
+### Instant Start (No Config Needed)
+Just copy and paste the below, set your values and you're off!
+```bash
+GOOGLE_OAUTH_CLIENT_ID="your_client_id" GOOGLE_OAUTH_CLIENT_SECRET="your_client_secret" uvx mcpo --port 8000 --api-key "top-secret" -- uvx workspace-mcp
+```
+
+Otherwise:
+
 ### 1. Create MCPO Configuration
 
 Create a file named `config.json` with the following structure to have `mcpo` make the streamable HTTP endpoint available as an OpenAPI spec tool:

{workspace_mcp-1.1.10 → workspace_mcp-1.1.12}/README.md

@@ -3,7 +3,7 @@
 # Google Workspace MCP Server <img src="https://github.com/user-attachments/assets/b89524e4-6e6e-49e6-ba77-00d6df0c6e5c" width="80" align="right" />
 
 [![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/)
+[![Python 3.10+](https://img.shields.io/badge/Python-3.10%2B-blue.svg)](https://www.python.org/downloads/)
 [![PyPI](https://img.shields.io/pypi/v/workspace-mcp.svg)](https://pypi.org/project/workspace-mcp/)
 [![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)
@@ -108,7 +108,7 @@ If you’re developing, deploying to servers, or using another MCP-capable clien
 #### Instant CLI (uvx)
 
 ```bash
-# Requires Python 3.11+ and uvx
+# Requires Python 3.10+ and uvx
 export GOOGLE_OAUTH_CLIENT_ID="xxx"
 export GOOGLE_OAUTH_CLIENT_SECRET="yyy"
 uvx workspace-mcp --tools gmail drive calendar
@@ -131,7 +131,7 @@ uvx workspace-mcp --tools gmail drive calendar tasks
 uvx workspace-mcp --transport streamable-http
 ```
 
-*Requires Python 3.11+ and [uvx](https://github.com/astral-sh/uv). The package is available on [PyPI](https://pypi.org/project/workspace-mcp).*
+*Requires Python 3.10+ and [uvx](https://github.com/astral-sh/uv). The package is available on [PyPI](https://pypi.org/project/workspace-mcp).*
 
 ### Development Installation
 
@@ -145,7 +145,7 @@ uv run main.py
 
 ### Prerequisites
 
-- **Python 3.11+**
+- **Python 3.10+**
 - **[uvx](https://github.com/astral-sh/uv)** (for instant installation) or [uv](https://github.com/astral-sh/uv) (for development)
 - **Google Cloud Project** with OAuth 2.0 credentials
 
@@ -481,6 +481,14 @@ async def your_new_tool(service, param1: str, param2: int = 10):
 
 To use this server as a tool provider within Open WebUI:
 
+### Instant Start (No Config Needed)
+Just copy and paste the below, set your values and you're off!
+```bash
+GOOGLE_OAUTH_CLIENT_ID="your_client_id" GOOGLE_OAUTH_CLIENT_SECRET="your_client_secret" uvx mcpo --port 8000 --api-key "top-secret" -- uvx workspace-mcp
+```
+
+Otherwise:
+
 ### 1. Create MCPO Configuration
 
 Create a file named `config.json` with the following structure to have `mcpo` make the streamable HTTP endpoint available as an OpenAPI spec tool:

{workspace_mcp-1.1.10 → workspace_mcp-1.1.12}/auth/google_auth.py

@@ -15,7 +15,7 @@ from google.auth.transport.requests import Request
 from google.auth.exceptions import RefreshError
 from googleapiclient.discovery import build
 from googleapiclient.errors import HttpError
-from auth.scopes import OAUTH_STATE_TO_SESSION_ID_MAP, SCOPES
+from auth.scopes import SCOPES
 
 # Configure logging
 logging.basicConfig(level=logging.INFO)
@@ -346,7 +346,6 @@ def create_oauth_flow(
 
 
 async def start_auth_flow(
-    mcp_session_id: Optional[str],
     user_google_email: Optional[str],
     service_name: str,  # e.g., "Google Calendar", "Gmail" for user messages
     redirect_uri: str,  # Added redirect_uri as a required parameter
@@ -355,7 +354,6 @@ async def start_auth_flow(
     Initiates the Google OAuth flow and returns an actionable message for the user.
 
     Args:
-        mcp_session_id: The active MCP session ID.
         user_google_email: The user's specified Google email, if provided.
         service_name: The name of the Google service requiring auth (for user messages).
         redirect_uri: The URI Google will redirect to after authorization.
@@ -378,7 +376,7 @@ async def start_auth_flow(
     )
 
     logger.info(
-        f"[start_auth_flow] Initiating auth for {user_display_name} (session: {mcp_session_id}) with global SCOPES."
+        f"[start_auth_flow] Initiating auth for {user_display_name} with global SCOPES."
     )
 
     try:
@@ -391,11 +389,6 @@ async def start_auth_flow(
             os.environ["OAUTHLIB_INSECURE_TRANSPORT"] = "1"
 
         oauth_state = os.urandom(16).hex()
-        if mcp_session_id:
-            OAUTH_STATE_TO_SESSION_ID_MAP[oauth_state] = mcp_session_id
-            logger.info(
-                f"[start_auth_flow] Stored mcp_session_id '{mcp_session_id}' for oauth_state '{oauth_state}'."
-            )
 
         flow = create_oauth_flow(
             scopes=SCOPES,  # Use global SCOPES
@@ -417,11 +410,7 @@ async def start_auth_flow(
             "**LLM, after presenting the link, instruct the user as follows:**",
             "1. Click the link and complete the authorization in their browser.",
         ]
-        session_info_for_llm = (
-            f" (this will link to your current session {mcp_session_id})"
-            if mcp_session_id
-            else ""
-        )
+        session_info_for_llm = ""
 
         if not initial_email_provided:
             message_lines.extend(
@@ -773,7 +762,6 @@ async def get_authenticated_google_service(
 
         # Generate auth URL and raise exception with it
         auth_response = await start_auth_flow(
-            mcp_session_id=None,  # Session ID not available in service layer
             user_google_email=user_google_email,
             service_name=f"Google {service_name.title()}",
             redirect_uri=redirect_uri,

{workspace_mcp-1.1.10 → workspace_mcp-1.1.12}/auth/oauth_callback_server.py

@@ -18,7 +18,7 @@ from typing import Optional
 from urllib.parse import urlparse
 
 from auth.google_auth import handle_auth_callback, check_client_secrets
-from auth.scopes import OAUTH_STATE_TO_SESSION_ID_MAP, SCOPES
+from auth.scopes import SCOPES
 from auth.oauth_responses import create_error_response, create_success_response, create_server_error_response
 
 logger = logging.getLogger(__name__)
@@ -68,11 +68,7 @@ class MinimalOAuthServer:
 
                 logger.info(f"OAuth callback: Received code (state: {state}). Attempting to exchange for tokens.")
 
-                mcp_session_id: Optional[str] = OAUTH_STATE_TO_SESSION_ID_MAP.pop(state, None)
-                if mcp_session_id:
-                    logger.info(f"OAuth callback: Retrieved MCP session ID '{mcp_session_id}' for state '{state}'.")
-                else:
-                    logger.warning(f"OAuth callback: No MCP session ID found for state '{state}'. Auth will not be tied to a specific session.")
+                # Session ID tracking removed - not needed
 
                 # Exchange code for credentials
                 redirect_uri = get_oauth_redirect_uri(port=self.port, base_uri=self.base_uri)
@@ -80,11 +76,10 @@ class MinimalOAuthServer:
                     scopes=SCOPES,
                     authorization_response=str(request.url),
                     redirect_uri=redirect_uri,
-                    session_id=mcp_session_id
+                    session_id=None
                 )
 
-                log_session_part = f" (linked to session: {mcp_session_id})" if mcp_session_id else ""
-                logger.info(f"OAuth callback: Successfully authenticated user: {verified_user_id} (state: {state}){log_session_part}.")
+                logger.info(f"OAuth callback: Successfully authenticated user: {verified_user_id} (state: {state}).")
 
                 # Return success page using shared template
                 return create_success_response(verified_user_id)

{workspace_mcp-1.1.10 → workspace_mcp-1.1.12}/auth/scopes.py

@@ -5,14 +5,9 @@ This module centralizes OAuth scope definitions for Google Workspace integration
 Separated from service_decorator.py to avoid circular imports.
 """
 import logging
-from typing import Dict
 
 logger = logging.getLogger(__name__)
 
-# Temporary map to associate OAuth state with MCP session ID
-# This should ideally be a more robust cache in a production system (e.g., Redis)
-OAUTH_STATE_TO_SESSION_ID_MAP: Dict[str, str] = {}
-
 # Individual OAuth Scope Constants
 USERINFO_EMAIL_SCOPE = 'https://www.googleapis.com/auth/userinfo.email'
 OPENID_SCOPE = 'openid'

{workspace_mcp-1.1.10 → workspace_mcp-1.1.12}/core/server.py

@@ -16,7 +16,6 @@ from auth.oauth_responses import create_error_response, create_success_response,
 
 # Import shared configuration
 from auth.scopes import (
-    OAUTH_STATE_TO_SESSION_ID_MAP,
     SCOPES,
     USERINFO_EMAIL_SCOPE,  # noqa: F401
     OPENID_SCOPE,  # noqa: F401
@@ -129,11 +128,7 @@ async def oauth2_callback(request: Request) -> HTMLResponse:
 
         logger.info(f"OAuth callback: Received code (state: {state}). Attempting to exchange for tokens.")
 
-        mcp_session_id: Optional[str] = OAUTH_STATE_TO_SESSION_ID_MAP.pop(state, None)
-        if mcp_session_id:
-            logger.info(f"OAuth callback: Retrieved MCP session ID '{mcp_session_id}' for state '{state}'.")
-        else:
-            logger.warning(f"OAuth callback: No MCP session ID found for state '{state}'. Auth will not be tied to a specific session directly via this callback.")
+        # Session ID tracking removed - not needed
 
         # Exchange code for credentials. handle_auth_callback will save them.
         # The user_id returned here is the Google-verified email.
@@ -141,11 +136,10 @@ async def oauth2_callback(request: Request) -> HTMLResponse:
             scopes=SCOPES, # Ensure all necessary scopes are requested
             authorization_response=str(request.url),
             redirect_uri=get_oauth_redirect_uri_for_current_mode(),
-            session_id=mcp_session_id # Pass session_id if available
+            session_id=None # Session ID tracking removed
         )
 
-        log_session_part = f" (linked to session: {mcp_session_id})" if mcp_session_id else ""
-        logger.info(f"OAuth callback: Successfully authenticated user: {verified_user_id} (state: {state}){log_session_part}.")
+        logger.info(f"OAuth callback: Successfully authenticated user: {verified_user_id} (state: {state}).")
 
         # Return success page using shared template
         return create_success_response(verified_user_id)
@@ -159,14 +153,13 @@ async def oauth2_callback(request: Request) -> HTMLResponse:
 @server.tool()
 async def start_google_auth(
     service_name: str,
-    user_google_email: str = USER_GOOGLE_EMAIL,
-    mcp_session_id: Optional[str] = Header(None, alias="mcp-session-id")
+    user_google_email: str = USER_GOOGLE_EMAIL
 ) -> str:
     """
     Initiates the Google OAuth 2.0 authentication flow for the specified user email and service.
     This is the primary method to establish credentials when no valid session exists or when targeting a specific account for a particular service.
     It generates an authorization URL that the LLM must present to the user.
-    The authentication attempt is linked to the current MCP session via `mcp_session_id`.
+    This initiates a new authentication flow for the specified user and service.
 
     LLM Guidance:
     - Use this tool when you need to authenticate a user for a specific Google service (e.g., "Google Calendar", "Google Docs", "Gmail", "Google Drive")
@@ -182,7 +175,6 @@ async def start_google_auth(
     Args:
         user_google_email (str): The user's full Google email address (e.g., 'example@gmail.com'). This is REQUIRED.
         service_name (str): The name of the Google service for which authentication is being requested (e.g., "Google Calendar", "Google Docs"). This is REQUIRED.
-        mcp_session_id (Optional[str]): The active MCP session ID (automatically injected by FastMCP from the mcp-session-id header). Links the OAuth flow state to the session.
 
     Returns:
         str: A detailed message for the LLM with the authorization URL and instructions to guide the user through the authentication process.
@@ -197,7 +189,7 @@ async def start_google_auth(
         logger.error(f"[start_google_auth] {error_msg}")
         raise Exception(error_msg)
 
-    logger.info(f"Tool 'start_google_auth' invoked for user_google_email: '{user_google_email}', service: '{service_name}', session: '{mcp_session_id}'.")
+    logger.info(f"Tool 'start_google_auth' invoked for user_google_email: '{user_google_email}', service: '{service_name}'.")
 
     # Ensure OAuth callback is available for current transport mode
     redirect_uri = get_oauth_redirect_uri_for_current_mode()
@@ -205,7 +197,6 @@ async def start_google_auth(
         raise Exception("Failed to start OAuth callback server. Please try again.")
 
     auth_result = await start_auth_flow(
-        mcp_session_id=mcp_session_id,
         user_google_email=user_google_email,
         service_name=service_name,
         redirect_uri=redirect_uri

{workspace_mcp-1.1.10 → workspace_mcp-1.1.12}/gcalendar/calendar_tools.py

@@ -122,9 +122,11 @@ async def get_events(
     time_min: Optional[str] = None,
     time_max: Optional[str] = None,
     max_results: int = 25,
+    query: Optional[str] = None,
 ) -> str:
     """
     Retrieves a list of events from a specified Google Calendar within a given time range.
+    You can also search for events by keyword by supplying the optional "query" param. 
 
     Args:
         user_google_email (str): The user's Google email address. Required.
@@ -132,12 +134,13 @@ async def get_events(
         time_min (Optional[str]): The start of the time range (inclusive) in RFC3339 format (e.g., '2024-05-12T10:00:00Z' or '2024-05-12'). If omitted, defaults to the current time.
         time_max (Optional[str]): The end of the time range (exclusive) in RFC3339 format. If omitted, events starting from `time_min` onwards are considered (up to `max_results`).
         max_results (int): The maximum number of events to return. Defaults to 25.
+        query (Optional[str]): A keyword to search for within event fields (summary, description, location).
 
     Returns:
         str: A formatted list of events (summary, start and end times, link) within the specified range.
     """
     logger.info(
-        f"[get_events] Raw time parameters - time_min: '{time_min}', time_max: '{time_max}'"
+        f"[get_events] Raw time parameters - time_min: '{time_min}', time_max: '{time_max}', query: '{query}'"
     )
 
     # Ensure time_min and time_max are correctly formatted for the API
@@ -161,19 +164,25 @@ async def get_events(
         )
 
     logger.info(
-        f"[get_events] Final API parameters - calendarId: '{calendar_id}', timeMin: '{effective_time_min}', timeMax: '{effective_time_max}', maxResults: {max_results}"
+        f"[get_events] Final API parameters - calendarId: '{calendar_id}', timeMin: '{effective_time_min}', timeMax: '{effective_time_max}', maxResults: {max_results}, query: '{query}'"
     )
 
+    # Build the request parameters dynamically
+    request_params = {
+        "calendarId": calendar_id,
+        "timeMin": effective_time_min,
+        "timeMax": effective_time_max,
+        "maxResults": max_results,
+        "singleEvents": True,
+        "orderBy": "startTime",
+    }
+
+    if query:
+        request_params["q"] = query
+
     events_result = await asyncio.to_thread(
         lambda: service.events()
-        .list(
-            calendarId=calendar_id,
-            timeMin=effective_time_min,
-            timeMax=effective_time_max,
-            maxResults=max_results,
-            singleEvents=True,
-            orderBy="startTime",
-        )
+        .list(**request_params)
         .execute()
     )
     items = events_result.get("items", [])

{workspace_mcp-1.1.10 → workspace_mcp-1.1.12}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "workspace-mcp"
-version = "1.1.10"
+version = "1.1.12"
 description = "Comprehensive, highly performant Google Workspace Streamable HTTP & SSE MCP Server for Calendar, Gmail, Docs, Sheets, Slides & Drive"
 readme = "README.md"
 keywords = [ "mcp", "google", "workspace", "llm", "ai", "claude", "model", "context", "protocol", "server"]
-requires-python = ">=3.11"
+requires-python = ">=3.10"
 dependencies = [
  "fastapi>=0.115.12",
  "fastmcp>=2.3.3",

{workspace_mcp-1.1.10 → workspace_mcp-1.1.12/workspace_mcp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workspace-mcp
-Version: 1.1.10
+Version: 1.1.12
 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
@@ -27,7 +27,7 @@ Classifier: Topic :: Communications :: Chat
 Classifier: Topic :: Office/Business
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Typing :: Typed
-Requires-Python: >=3.11
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: fastapi>=0.115.12
@@ -46,7 +46,7 @@ Dynamic: license-file
 # Google Workspace MCP Server <img src="https://github.com/user-attachments/assets/b89524e4-6e6e-49e6-ba77-00d6df0c6e5c" width="80" align="right" />
 
 [![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/)
+[![Python 3.10+](https://img.shields.io/badge/Python-3.10%2B-blue.svg)](https://www.python.org/downloads/)
 [![PyPI](https://img.shields.io/pypi/v/workspace-mcp.svg)](https://pypi.org/project/workspace-mcp/)
 [![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)
@@ -151,7 +151,7 @@ If you’re developing, deploying to servers, or using another MCP-capable clien
 #### Instant CLI (uvx)
 
 ```bash
-# Requires Python 3.11+ and uvx
+# Requires Python 3.10+ and uvx
 export GOOGLE_OAUTH_CLIENT_ID="xxx"
 export GOOGLE_OAUTH_CLIENT_SECRET="yyy"
 uvx workspace-mcp --tools gmail drive calendar
@@ -174,7 +174,7 @@ uvx workspace-mcp --tools gmail drive calendar tasks
 uvx workspace-mcp --transport streamable-http
 ```
 
-*Requires Python 3.11+ and [uvx](https://github.com/astral-sh/uv). The package is available on [PyPI](https://pypi.org/project/workspace-mcp).*
+*Requires Python 3.10+ and [uvx](https://github.com/astral-sh/uv). The package is available on [PyPI](https://pypi.org/project/workspace-mcp).*
 
 ### Development Installation
 
@@ -188,7 +188,7 @@ uv run main.py
 
 ### Prerequisites
 
-- **Python 3.11+**
+- **Python 3.10+**
 - **[uvx](https://github.com/astral-sh/uv)** (for instant installation) or [uv](https://github.com/astral-sh/uv) (for development)
 - **Google Cloud Project** with OAuth 2.0 credentials
 
@@ -524,6 +524,14 @@ async def your_new_tool(service, param1: str, param2: int = 10):
 
 To use this server as a tool provider within Open WebUI:
 
+### Instant Start (No Config Needed)
+Just copy and paste the below, set your values and you're off!
+```bash
+GOOGLE_OAUTH_CLIENT_ID="your_client_id" GOOGLE_OAUTH_CLIENT_SECRET="your_client_secret" uvx mcpo --port 8000 --api-key "top-secret" -- uvx workspace-mcp
+```
+
+Otherwise:
+
 ### 1. Create MCPO Configuration
 
 Create a file named `config.json` with the following structure to have `mcpo` make the streamable HTTP endpoint available as an OpenAPI spec tool: