workspace-mcp 1.0.0__py3-none-any.whl → 1.0.2__py3-none-any.whl

gslides/slides_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("slides", "slides")
+@handle_http_errors("create_presentation")
 async def create_presentation(
     service,
     user_google_email: str,
@@ -36,39 +38,30 @@ async def create_presentation(
     """
     logger.info(f"[create_presentation] Invoked. Email: '{user_google_email}', Title: '{title}'")
 
-    try:
-        body = {
-            'title': title
-        }
-        
-        result = await asyncio.to_thread(
-            service.presentations().create(body=body).execute
-        )
-        
-        presentation_id = result.get('presentationId')
-        presentation_url = f"https://docs.google.com/presentation/d/{presentation_id}/edit"
-        
-        confirmation_message = f"""Presentation Created Successfully for {user_google_email}:
+    body = {
+        'title': title
+    }
+    
+    result = await asyncio.to_thread(
+        service.presentations().create(body=body).execute
+    )
+    
+    presentation_id = result.get('presentationId')
+    presentation_url = f"https://docs.google.com/presentation/d/{presentation_id}/edit"
+    
+    confirmation_message = f"""Presentation Created Successfully for {user_google_email}:
 - Title: {title}
 - Presentation ID: {presentation_id}
 - URL: {presentation_url}
 - Slides: {len(result.get('slides', []))} slide(s) created"""
-        
-        logger.info(f"Presentation created successfully for {user_google_email}")
-        return confirmation_message
-        
-    except HttpError as error:
-        message = f"API error: {error}. You might need to re-authenticate. LLM: Try 'start_google_auth' with the user's email ({user_google_email}) and service_name='Google Slides'."
-        logger.error(message, exc_info=True)
-        raise Exception(message)
-    except Exception as e:
-        message = f"Unexpected error: {e}."
-        logger.exception(message)
-        raise Exception(message)
+    
+    logger.info(f"Presentation created successfully for {user_google_email}")
+    return confirmation_message
 
 
 @server.tool()
 @require_google_service("slides", "slides_read")
+@handle_http_errors("get_presentation")
 async def get_presentation(
     service,
     user_google_email: str,
@@ -86,22 +79,21 @@ async def get_presentation(
     """
     logger.info(f"[get_presentation] Invoked. Email: '{user_google_email}', ID: '{presentation_id}'")
 
-    try:
-        result = await asyncio.to_thread(
-            service.presentations().get(presentationId=presentation_id).execute
-        )
-        
-        title = result.get('title', 'Untitled')
-        slides = result.get('slides', [])
-        page_size = result.get('pageSize', {})
-        
-        slides_info = []
-        for i, slide in enumerate(slides, 1):
-            slide_id = slide.get('objectId', 'Unknown')
-            page_elements = slide.get('pageElements', [])
-            slides_info.append(f"  Slide {i}: ID {slide_id}, {len(page_elements)} element(s)")
-        
-        confirmation_message = f"""Presentation Details for {user_google_email}:
+    result = await asyncio.to_thread(
+        service.presentations().get(presentationId=presentation_id).execute
+    )
+    
+    title = result.get('title', 'Untitled')
+    slides = result.get('slides', [])
+    page_size = result.get('pageSize', {})
+    
+    slides_info = []
+    for i, slide in enumerate(slides, 1):
+        slide_id = slide.get('objectId', 'Unknown')
+        page_elements = slide.get('pageElements', [])
+        slides_info.append(f"  Slide {i}: ID {slide_id}, {len(page_elements)} element(s)")
+    
+    confirmation_message = f"""Presentation Details for {user_google_email}:
 - Title: {title}
 - Presentation ID: {presentation_id}
 - URL: https://docs.google.com/presentation/d/{presentation_id}/edit
@@ -110,22 +102,14 @@ async def get_presentation(
 
 Slides Breakdown:
 {chr(10).join(slides_info) if slides_info else '  No slides found'}"""
-        
-        logger.info(f"Presentation retrieved successfully for {user_google_email}")
-        return confirmation_message
-        
-    except HttpError as error:
-        message = f"API error: {error}. You might need to re-authenticate. LLM: Try 'start_google_auth' with the user's email ({user_google_email}) and service_name='Google Slides'."
-        logger.error(message, exc_info=True)
-        raise Exception(message)
-    except Exception as e:
-        message = f"Unexpected error: {e}."
-        logger.exception(message)
-        raise Exception(message)
+    
+    logger.info(f"Presentation retrieved successfully for {user_google_email}")
+    return confirmation_message
 
 
 @server.tool()
 @require_google_service("slides", "slides")
+@handle_http_errors("batch_update_presentation")
 async def batch_update_presentation(
     service,
     user_google_email: str,
@@ -145,53 +129,44 @@ async def batch_update_presentation(
     """
     logger.info(f"[batch_update_presentation] Invoked. Email: '{user_google_email}', ID: '{presentation_id}', Requests: {len(requests)}")
 
-    try:
-        body = {
-            'requests': requests
-        }
-        
-        result = await asyncio.to_thread(
-            service.presentations().batchUpdate(
-                presentationId=presentation_id,
-                body=body
-            ).execute
-        )
-        
-        replies = result.get('replies', [])
-        
-        confirmation_message = f"""Batch Update Completed for {user_google_email}:
+    body = {
+        'requests': requests
+    }
+    
+    result = await asyncio.to_thread(
+        service.presentations().batchUpdate(
+            presentationId=presentation_id,
+            body=body
+        ).execute
+    )
+    
+    replies = result.get('replies', [])
+    
+    confirmation_message = f"""Batch Update Completed for {user_google_email}:
 - Presentation ID: {presentation_id}
 - URL: https://docs.google.com/presentation/d/{presentation_id}/edit
 - Requests Applied: {len(requests)}
 - Replies Received: {len(replies)}"""
-        
-        if replies:
-            confirmation_message += "\n\nUpdate Results:"
-            for i, reply in enumerate(replies, 1):
-                if 'createSlide' in reply:
-                    slide_id = reply['createSlide'].get('objectId', 'Unknown')
-                    confirmation_message += f"\n  Request {i}: Created slide with ID {slide_id}"
-                elif 'createShape' in reply:
-                    shape_id = reply['createShape'].get('objectId', 'Unknown')
-                    confirmation_message += f"\n  Request {i}: Created shape with ID {shape_id}"
-                else:
-                    confirmation_message += f"\n  Request {i}: Operation completed"
-        
-        logger.info(f"Batch update completed successfully for {user_google_email}")
-        return confirmation_message
-        
-    except HttpError as error:
-        message = f"API error: {error}. You might need to re-authenticate. LLM: Try 'start_google_auth' with the user's email ({user_google_email}) and service_name='Google Slides'."
-        logger.error(message, exc_info=True)
-        raise Exception(message)
-    except Exception as e:
-        message = f"Unexpected error: {e}."
-        logger.exception(message)
-        raise Exception(message)
+    
+    if replies:
+        confirmation_message += "\n\nUpdate Results:"
+        for i, reply in enumerate(replies, 1):
+            if 'createSlide' in reply:
+                slide_id = reply['createSlide'].get('objectId', 'Unknown')
+                confirmation_message += f"\n  Request {i}: Created slide with ID {slide_id}"
+            elif 'createShape' in reply:
+                shape_id = reply['createShape'].get('objectId', 'Unknown')
+                confirmation_message += f"\n  Request {i}: Created shape with ID {shape_id}"
+            else:
+                confirmation_message += f"\n  Request {i}: Operation completed"
+    
+    logger.info(f"Batch update completed successfully for {user_google_email}")
+    return confirmation_message
 
 
 @server.tool()
 @require_google_service("slides", "slides_read")
+@handle_http_errors("get_page")
 async def get_page(
     service,
     user_google_email: str,
@@ -211,35 +186,34 @@ async def get_page(
     """
     logger.info(f"[get_page] Invoked. Email: '{user_google_email}', Presentation: '{presentation_id}', Page: '{page_object_id}'")
 
-    try:
-        result = await asyncio.to_thread(
-            service.presentations().pages().get(
-                presentationId=presentation_id,
-                pageObjectId=page_object_id
-            ).execute
-        )
-        
-        page_type = result.get('pageType', 'Unknown')
-        page_elements = result.get('pageElements', [])
-        
-        elements_info = []
-        for element in page_elements:
-            element_id = element.get('objectId', 'Unknown')
-            if 'shape' in element:
-                shape_type = element['shape'].get('shapeType', 'Unknown')
-                elements_info.append(f"  Shape: ID {element_id}, Type: {shape_type}")
-            elif 'table' in element:
-                table = element['table']
-                rows = table.get('rows', 0)
-                cols = table.get('columns', 0)
-                elements_info.append(f"  Table: ID {element_id}, Size: {rows}x{cols}")
-            elif 'line' in element:
-                line_type = element['line'].get('lineType', 'Unknown')
-                elements_info.append(f"  Line: ID {element_id}, Type: {line_type}")
-            else:
-                elements_info.append(f"  Element: ID {element_id}, Type: Unknown")
-        
-        confirmation_message = f"""Page Details for {user_google_email}:
+    result = await asyncio.to_thread(
+        service.presentations().pages().get(
+            presentationId=presentation_id,
+            pageObjectId=page_object_id
+        ).execute
+    )
+    
+    page_type = result.get('pageType', 'Unknown')
+    page_elements = result.get('pageElements', [])
+    
+    elements_info = []
+    for element in page_elements:
+        element_id = element.get('objectId', 'Unknown')
+        if 'shape' in element:
+            shape_type = element['shape'].get('shapeType', 'Unknown')
+            elements_info.append(f"  Shape: ID {element_id}, Type: {shape_type}")
+        elif 'table' in element:
+            table = element['table']
+            rows = table.get('rows', 0)
+            cols = table.get('columns', 0)
+            elements_info.append(f"  Table: ID {element_id}, Size: {rows}x{cols}")
+        elif 'line' in element:
+            line_type = element['line'].get('lineType', 'Unknown')
+            elements_info.append(f"  Line: ID {element_id}, Type: {line_type}")
+        else:
+            elements_info.append(f"  Element: ID {element_id}, Type: Unknown")
+    
+    confirmation_message = f"""Page Details for {user_google_email}:
 - Presentation ID: {presentation_id}
 - Page ID: {page_object_id}
 - Page Type: {page_type}
@@ -247,22 +221,14 @@ async def get_page(
 
 Page Elements:
 {chr(10).join(elements_info) if elements_info else '  No elements found'}"""
-        
-        logger.info(f"Page retrieved successfully for {user_google_email}")
-        return confirmation_message
-        
-    except HttpError as error:
-        message = f"API error: {error}. You might need to re-authenticate. LLM: Try 'start_google_auth' with the user's email ({user_google_email}) and service_name='Google Slides'."
-        logger.error(message, exc_info=True)
-        raise Exception(message)
-    except Exception as e:
-        message = f"Unexpected error: {e}."
-        logger.exception(message)
-        raise Exception(message)
+    
+    logger.info(f"Page retrieved successfully for {user_google_email}")
+    return confirmation_message
 
 
 @server.tool()
 @require_google_service("slides", "slides_read")
+@handle_http_errors("get_page_thumbnail")
 async def get_page_thumbnail(
     service,
     user_google_email: str,
@@ -284,33 +250,23 @@ async def get_page_thumbnail(
     """
     logger.info(f"[get_page_thumbnail] Invoked. Email: '{user_google_email}', Presentation: '{presentation_id}', Page: '{page_object_id}', Size: '{thumbnail_size}'")
 
-    try:
-        result = await asyncio.to_thread(
-            service.presentations().pages().getThumbnail(
-                presentationId=presentation_id,
-                pageObjectId=page_object_id,
-                thumbnailPropertiesImageSize=thumbnail_size
-            ).execute
-        )
-        
-        thumbnail_url = result.get('contentUrl', '')
-        
-        confirmation_message = f"""Thumbnail Generated for {user_google_email}:
+    result = await asyncio.to_thread(
+        service.presentations().pages().getThumbnail(
+            presentationId=presentation_id,
+            pageObjectId=page_object_id,
+            thumbnailPropertiesImageSize=thumbnail_size
+        ).execute
+    )
+    
+    thumbnail_url = result.get('contentUrl', '')
+    
+    confirmation_message = f"""Thumbnail Generated for {user_google_email}:
 - Presentation ID: {presentation_id}
 - Page ID: {page_object_id}
 - Thumbnail Size: {thumbnail_size}
 - Thumbnail URL: {thumbnail_url}
 
 You can view or download the thumbnail using the provided URL."""
-        
-        logger.info(f"Thumbnail generated successfully for {user_google_email}")
-        return confirmation_message
-        
-    except HttpError as error:
-        message = f"API error: {error}. You might need to re-authenticate. LLM: Try 'start_google_auth' with the user's email ({user_google_email}) and service_name='Google Slides'."
-        logger.error(message, exc_info=True)
-        raise Exception(message)
-    except Exception as e:
-        message = f"Unexpected error: {e}."
-        logger.exception(message)
-        raise Exception(message)
+    
+    logger.info(f"Thumbnail generated successfully for {user_google_email}")
+    return confirmation_message

main.py

@@ -33,6 +33,12 @@ try:
 except Exception as e:
     sys.stderr.write(f"CRITICAL: Failed to set up file logging to '{log_file_path}': {e}\n")
 
+def safe_print(text):
+    try:
+        print(text)
+    except UnicodeEncodeError:
+        print(text.encode('ascii', errors='replace').decode())
+
 def main():
     """
     Main entry point for the Google Workspace MCP server.
@@ -53,20 +59,20 @@ def main():
     port = int(os.getenv("PORT", os.getenv("WORKSPACE_MCP_PORT", 8000)))
     base_uri = os.getenv("WORKSPACE_MCP_BASE_URI", "http://localhost")
 
-    print("🔧 Google Workspace MCP Server")
-    print("=" * 35)
-    print("📋 Server Information:")
+    safe_print("🔧 Google Workspace MCP Server")
+    safe_print("=" * 35)
+    safe_print("📋 Server Information:")
     try:
-        version = metadata.version("google-workspace-mcp")
+        version = metadata.version("workspace-mcp")
     except metadata.PackageNotFoundError:
         version = "dev"
-    print(f"   📦 Version: {version}")
-    print(f"   🌐 Transport: {args.transport}")
+    safe_print(f"   📦 Version: {version}")
+    safe_print(f"   🌐 Transport: {args.transport}")
     if args.transport == 'streamable-http':
-        print(f"   🔗 URL: {base_uri}:{port}")
-        print(f"   🔐 OAuth Callback: {base_uri}:{port}/oauth2callback")
-    print(f"   👤 Mode: {'Single-user' if args.single_user else 'Multi-user'}")
-    print(f"   🐍 Python: {sys.version.split()[0]}")
+        safe_print(f"   🔗 URL: {base_uri}:{port}")
+        safe_print(f"   🔐 OAuth Callback: {base_uri}:{port}/oauth2callback")
+    safe_print(f"   👤 Mode: {'Single-user' if args.single_user else 'Multi-user'}")
+    safe_print(f"   🐍 Python: {sys.version.split()[0]}")
     print()
 
     # Import tool modules to register them with the MCP server via decorators
@@ -94,32 +100,32 @@ def main():
 
     # Import specified tools or all tools if none specified
     tools_to_import = args.tools if args.tools is not None else tool_imports.keys()
-    print(f"🛠️  Loading {len(tools_to_import)} tool module{'s' if len(tools_to_import) != 1 else ''}:")
+    safe_print(f"🛠️  Loading {len(tools_to_import)} tool module{'s' if len(tools_to_import) != 1 else ''}:")
     for tool in tools_to_import:
         tool_imports[tool]()
-        print(f"   {tool_icons[tool]} {tool.title()} - Google {tool.title()} API integration")
+        safe_print(f"   {tool_icons[tool]} {tool.title()} - Google {tool.title()} API integration")
     print()
 
-    print(f"📊 Configuration Summary:")
-    print(f"   🔧 Tools Enabled: {len(tools_to_import)}/{len(tool_imports)}")
-    print(f"   🔑 Auth Method: OAuth 2.0 with PKCE")
-    print(f"   📝 Log Level: {logging.getLogger().getEffectiveLevel()}")
+    safe_print(f"📊 Configuration Summary:")
+    safe_print(f"   🔧 Tools Enabled: {len(tools_to_import)}/{len(tool_imports)}")
+    safe_print(f"   🔑 Auth Method: OAuth 2.0 with PKCE")
+    safe_print(f"   📝 Log Level: {logging.getLogger().getEffectiveLevel()}")
     print()
 
     # Set global single-user mode flag
     if args.single_user:
         os.environ['MCP_SINGLE_USER_MODE'] = '1'
-        print("🔐 Single-user mode enabled")
+        safe_print("🔐 Single-user mode enabled")
         print()
 
     # Check credentials directory permissions before starting
     try:
-        print("🔍 Checking credentials directory permissions...")
+        safe_print("🔍 Checking credentials directory permissions...")
         check_credentials_directory_permissions()
-        print("✅ Credentials directory permissions verified")
+        safe_print("✅ Credentials directory permissions verified")
         print()
     except (PermissionError, OSError) as e:
-        print(f"❌ Credentials directory permission check failed: {e}")
+        safe_print(f"❌ Credentials directory permission check failed: {e}")
         print("   Please ensure the service has write permissions to create/access the .credentials directory")
         logger.error(f"Failed credentials directory permission check: {e}")
         sys.exit(1)
@@ -129,15 +135,15 @@ def main():
         set_transport_mode(args.transport)
 
         if args.transport == 'streamable-http':
-            print(f"🚀 Starting server on {base_uri}:{port}")
+            safe_print(f"🚀 Starting server on {base_uri}:{port}")
         else:
-            print("🚀 Starting server in stdio mode")
+            safe_print("🚀 Starting server in stdio mode")
             # Start minimal OAuth callback server for stdio mode
             from auth.oauth_callback_server import ensure_oauth_callback_available
             if ensure_oauth_callback_available('stdio', port, base_uri):
                 print(f"   OAuth callback server started on {base_uri}:{port}/oauth2callback")
             else:
-                print("   ⚠️  Warning: Failed to start OAuth callback server")
+                safe_print("   ⚠️  Warning: Failed to start OAuth callback server")
 
         print("   Ready for MCP connections!")
         print()
@@ -148,13 +154,13 @@ def main():
         else:
             server.run()
     except KeyboardInterrupt:
-        print("\n👋 Server shutdown requested")
+        safe_print("\n👋 Server shutdown requested")
         # Clean up OAuth callback server if running
         from auth.oauth_callback_server import cleanup_oauth_callback_server
         cleanup_oauth_callback_server()
         sys.exit(0)
     except Exception as e:
-        print(f"\n❌ Server error: {e}")
+        safe_print(f"\n❌ Server error: {e}")
         logger.error(f"Unexpected error running server: {e}", exc_info=True)
         # Clean up OAuth callback server if running
         from auth.oauth_callback_server import cleanup_oauth_callback_server