sitebay-mcp 0.1.1751286041__py3-none-any.whl → 0.1.1757498234__py3-none-any.whl

sitebay_mcp/tools/operations.py

@@ -10,7 +10,9 @@ from ..exceptions import SiteBayError
 async def sitebay_site_shell_command(
     client: SiteBayClient,
     fqdn: str,
-    command: str
+    command: str,
+    cwd: Optional[str] = None,
+    auto_track_dir: Optional[bool] = None,
 ) -> str:
     """
     Execute a shell command on a WordPress site (including WP-CLI commands).
@@ -23,7 +25,9 @@ async def sitebay_site_shell_command(
         Command output or error message
     """
     try:
-        result = await client.execute_shell_command(fqdn, command)
+        result = await client.execute_shell_command(
+            fqdn, cmd=command, cwd=cwd, auto_track_dir=auto_track_dir
+        )
         
         # Handle different response formats
         if isinstance(result, dict):
@@ -38,6 +42,8 @@ async def sitebay_site_shell_command(
         
         response = f"**Command executed on {fqdn}:**\n"
         response += f"```bash\n{command}\n```\n\n"
+        if cwd is not None:
+            response += f"Working dir: {cwd}\n\n"
         response += f"**Output:**\n```\n{output}\n```"
         
         return response
@@ -50,26 +56,52 @@ async def sitebay_site_edit_file(
     client: SiteBayClient,
     fqdn: str,
     file_path: str,
-    content: str
+    file_edit_using_search_replace_blocks: str,
 ) -> str:
     """
-    Edit a file in the site's wp-content directory.
+    Edit a file in the site's wp-content directory using diff-edit blocks.
     
     Args:
         fqdn: The fully qualified domain name of the site
-        file_path: Path to the file relative to wp-content (e.g., "themes/mytheme/style.css")
-        content: New content for the file
+        file_path: Path to the file relative to wp-content (e.g., "wp-content/themes/mytheme/style.css")
+        file_edit_using_search_replace_blocks: A single string containing blocks in the form:
+            <<<<<< SEARCH\nold text\n=======\nnew text\n>>>>>> REPLACE
     
     Returns:
         Success message or error
     """
     try:
-        result = await client.edit_file(fqdn, file_path, content)
+        # Normalize path (server also handles this, but we pre-normalize to help users)
+        normalized_path = file_path.replace(
+            "/bitnami/wordpress/wp-content", "wp-content"
+        )
+        
+        if not normalized_path.startswith("wp-content"):
+            return (
+                "❌ Invalid file_path: must start with 'wp-content/'. "
+                "Example: wp-content/themes/mytheme/style.css"
+            )
+        
+        text = file_edit_using_search_replace_blocks
+        if (
+            "<<<<<<< SEARCH" not in text
+            or "=======" not in text
+            or ">>>>>> REPLACE" not in text
+        ):
+            return (
+                "❌ Invalid diff-edit block format. Make sure blocks are in correct sequence, "
+                "and the markers are on separate lines:\n\n"
+                "<<<<<< SEARCH\n    example old\n=======\n    example new\n>>>>>> REPLACE\n"
+            )
+        
+        result = await client.edit_file(
+            fqdn, normalized_path, text
+        )
         
         response = f"✅ **File Updated Successfully**\n\n"
         response += f"• **Site**: {fqdn}\n"
         response += f"• **File**: wp-content/{file_path}\n"
-        response += f"• **Content Length**: {len(content)} characters\n"
+        response += f"• **Content Length**: {len(text)} characters\n"
         
         if isinstance(result, str) and result:
             response += f"\n**Server Response:**\n```\n{result}\n```"
@@ -86,47 +118,7 @@ async def sitebay_site_get_events(
     after_datetime: Optional[str] = None,
     limit: int = 20
 ) -> str:
-    """
-    Get recent events for a site (deployments, updates, restores, etc.).
-    
-    Args:
-        fqdn: The fully qualified domain name of the site
-        after_datetime: Optional datetime to filter events after (ISO format)
-        limit: Maximum number of events to return (default: 20)
-    
-    Returns:
-        Formatted list of site events
-    """
-    try:
-        events = await client.get_site_events(fqdn, after_datetime)
-        
-        if not events:
-            return f"No events found for {fqdn}."
-        
-        # Limit the results
-        events = events[:limit]
-        
-        result = f"**Recent Events for {fqdn}** (showing {len(events)} events):\n\n"
-        
-        for event in events:
-            result += f"• **{event.get('event_type', 'Unknown Event')}**\n"
-            result += f"  - Time: {event.get('created_at', 'Unknown')}\n"
-            result += f"  - Status: {event.get('status', 'Unknown')}\n"
-            
-            if event.get('description'):
-                result += f"  - Description: {event.get('description')}\n"
-            
-            if event.get('metadata'):
-                metadata = event.get('metadata') or {}
-                for key, value in metadata.items():
-                    result += f"  - {key.title()}: {value}\n"
-            
-            result += "\n"
-        
-        return result
-        
-    except SiteBayError as e:
-        return f"Error getting events for {fqdn}: {str(e)}"
+    return "Site events are not available via schema endpoints."
 
 
 async def sitebay_site_external_path_list(
@@ -142,26 +134,7 @@ async def sitebay_site_external_path_list(
     Returns:
         List of external path configurations
     """
-    try:
-        paths = await client.list_external_paths(fqdn)
-        
-        if not paths:
-            return f"No external paths configured for {fqdn}."
-        
-        result = f"**External Paths for {fqdn}**:\n\n"
-        
-        for path in paths:
-            result += f"• **Path**: {path.get('path', 'Unknown')}\n"
-            result += f"  - Target URL: {path.get('target_url', 'Unknown')}\n"
-            result += f"  - Status: {path.get('status', 'Unknown')}\n"
-            result += f"  - Created: {path.get('created_at', 'Unknown')}\n"
-            result += f"  - ID: {path.get('id', 'Unknown')}\n"
-            result += "\n"
-        
-        return result
-        
-    except SiteBayError as e:
-        return f"Error listing external paths for {fqdn}: {str(e)}"
+    return "External path tools are no longer supported."
 
 
 async def sitebay_site_external_path_create(
@@ -183,83 +156,9 @@ async def sitebay_site_external_path_create(
     Returns:
         Success message with path details
     """
-    try:
-        path_data = {
-            "path": path,
-            "target_url": target_url,
-        }
-        
-        if description:
-            path_data["description"] = description
-        
-        external_path = await client.create_external_path(fqdn, path_data)
-        
-        result = f"✅ **External Path Created Successfully**\n\n"
-        result += f"• **Site**: {fqdn}\n"
-        result += f"• **Path**: {external_path.get('path')}\n"
-        result += f"• **Target URL**: {external_path.get('target_url')}\n"
-        result += f"• **Status**: {external_path.get('status')}\n"
-        result += f"• **ID**: {external_path.get('id')}\n"
-        
-        if description:
-            result += f"• **Description**: {description}\n"
-        
-        result += f"\n🔗 Your site path {fqdn}{path} now proxies to {target_url}"
-        
-        return result
-        
-    except SiteBayError as e:
-        return f"Error creating external path for {fqdn}: {str(e)}"
+    return "External path tools are no longer supported."
 
 
-async def sitebay_site_external_path_update(
-    client: SiteBayClient,
-    fqdn: str,
-    path_id: str,
-    path: Optional[str] = None,
-    target_url: Optional[str] = None,
-    description: Optional[str] = None
-) -> str:
-    """
-    Update an external path configuration.
-    
-    Args:
-        fqdn: The fully qualified domain name of the site
-        path_id: The ID of the external path to update
-        path: New path value (optional)
-        target_url: New target URL (optional)
-        description: New description (optional)
-    
-    Returns:
-        Update confirmation message
-    """
-    try:
-        path_data = {}
-        
-        if path:
-            path_data["path"] = path
-        if target_url:
-            path_data["target_url"] = target_url
-        if description:
-            path_data["description"] = description
-        
-        if not path_data:
-            return "No updates specified. Please provide at least one field to update."
-        
-        external_path = await client.update_external_path(fqdn, path_id, path_data)
-        
-        result = f"✅ **External Path Updated Successfully**\n\n"
-        result += f"• **Site**: {fqdn}\n"
-        result += f"• **Path**: {external_path.get('path')}\n"
-        result += f"• **Target URL**: {external_path.get('target_url')}\n"
-        result += f"• **Status**: {external_path.get('status')}\n"
-        result += f"• **ID**: {external_path.get('id')}\n"
-        
-        return result
-        
-    except SiteBayError as e:
-        return f"Error updating external path for {fqdn}: {str(e)}"
-
 
 async def sitebay_site_external_path_delete(
     client: SiteBayClient,
@@ -276,10 +175,4 @@ async def sitebay_site_external_path_delete(
     Returns:
         Deletion confirmation message
     """
-    try:
-        await client.delete_external_path(fqdn, path_id)
-        
-        return f"✅ **External Path Deleted Successfully**\n\nExternal path {path_id} has been removed from {fqdn}."
-        
-    except SiteBayError as e:
-        return f"Error deleting external path for {fqdn}: {str(e)}"
+    return "External path tools are no longer supported."

sitebay_mcp/tools/sites.py

@@ -21,9 +21,9 @@ async def sitebay_list_sites(
         Formatted string with site details
     """
     try:
-        if team_id is not None and not isinstance(team_id, str):
-            msg = "team_id must be a string if provided"
-            raise ValueError(msg)
+        # Normalize team_id to string (UUID4 expected by API)
+        if team_id is not None:
+            team_id = str(team_id)
 
         sites = await client.list_sites(team_id=team_id)
 
@@ -40,13 +40,10 @@ async def sitebay_list_sites(
         
         for site in sites:
             result += f"• **{site.get('fqdn', 'Unknown')}**\n"
-            result += f"  - Status: {site.get('status', 'Unknown')}\n"
-            result += f"  - Region: {site.get('region_name', 'Unknown')}\n"
-            result += f"  - WordPress Version: {site.get('wp_version', 'Unknown')}\n"
-            result += f"  - PHP Version: {site.get('php_version', 'Unknown')}\n"
+            result += f"  - Active: {site.get('active', 'Unknown')}\n"
+            result += f"  - HTTP Auth Enabled: {site.get('http_auth_enabled', 'Unknown')}\n"
+            result += f"  - Is Free: {site.get('is_free', 'Unknown')}\n"
             result += f"  - Created: {site.get('created_at', 'Unknown')}\n"
-            if site.get('staging_site'):
-                result += f"  - Has Staging Site: Yes\n"
             result += "\n"
         
         return result
@@ -74,20 +71,14 @@ async def sitebay_get_site(
         site = await client.get_site(fqdn)
         
         result = f"**Site Details for {fqdn}**\n\n"
-        result += f"• **Status**: {site.get('status', 'Unknown')}\n"
-        result += f"• **Region**: {site.get('region_name', 'Unknown')}\n"
-        result += f"• **WordPress Version**: {site.get('wp_version', 'Unknown')}\n"
-        result += f"• **PHP Version**: {site.get('php_version', 'Unknown')}\n"
-        result += f"• **MySQL Version**: {site.get('mysql_version', 'Unknown')}\n"
-        result += f"• **Site URL**: {site.get('site_url', 'Unknown')}\n"
-        result += f"• **Admin URL**: {site.get('admin_url', 'Unknown')}\n"
+        result += f"• **Active**: {site.get('active', 'Unknown')}\n"
+        result += f"• **HTTP Auth Enabled**: {site.get('http_auth_enabled', 'Unknown')}\n"
+        result += f"• **Is Free**: {site.get('is_free', 'Unknown')}\n"
+        result += f"• **Git URL**: {site.get('git_url', '—')}\n"
         result += f"• **Created**: {site.get('created_at', 'Unknown')}\n"
         result += f"• **Updated**: {site.get('updated_at', 'Unknown')}\n"
         
-        if site.get('staging_site'):
-            result += f"• **Staging Site**: Available\n"
-        else:
-            result += f"• **Staging Site**: Not created\n"
+
         
         if site.get('git_enabled'):
             result += f"• **Git Integration**: Enabled\n"
@@ -102,61 +93,73 @@ async def sitebay_get_site(
 
 async def sitebay_create_site(
     client: SiteBayClient,
+    team_id: str,
     fqdn: str,
-    wp_title: str,
-    wp_username: str,
-    wp_password: str,
-    wp_email: str,
-    region_name: Optional[str] = None,
-    template_id: Optional[str] = None,
-    team_id: Optional[str] = None
+    wordpress_blog_name: str,
+    wordpress_first_name: str,
+    wordpress_last_name: str,
+    wordpress_email: str,
+    wordpress_username: str,
+    wordpress_password: str,
+    git_url: Optional[str] = None,
+    ready_made_site_name: Optional[str] = None,
+    is_free: Optional[bool] = None,
 ) -> str:
     """
-    Create a new WordPress site.
+    Create a new WordPress site (SiteLiveCreate schema).
     
     Args:
-        fqdn: The fully qualified domain name for the new site
-        wp_title: WordPress site title
-        wp_username: WordPress admin username
-        wp_password: WordPress admin password
-        wp_email: WordPress admin email
-        region_name: Optional region name (uses default if not specified)
-        template_id: Optional template ID to use for site creation
-        team_id: Optional team ID to create site under
+        team_id: Team UUID
+        fqdn: New site domain
+        wordpress_blog_name: Blog/site title
+        wordpress_first_name: Admin first name
+        wordpress_last_name: Admin last name
+        wordpress_email: Admin email
+        wordpress_username: Admin username
+        wordpress_password: Admin password
+        git_url: Optional repository URL
+        ready_made_site_name: Optional ready-made site name
+        is_free: Optional free plan flag
     
     Returns:
         Formatted string with new site details
     """
     try:
-        site_data = {
+        site_data: Dict[str, Any] = {
+            "team_id": team_id,
             "fqdn": fqdn,
-            "wp_title": wp_title,
-            "wp_username": wp_username,
-            "wp_password": wp_password,
-            "wp_email": wp_email,
+            "wordpress_blog_name": wordpress_blog_name,
+            "wordpress_first_name": wordpress_first_name,
+            "wordpress_last_name": wordpress_last_name,
+            "wordpress_email": wordpress_email,
+            "wordpress_username": wordpress_username,
+            "wordpress_password": wordpress_password,
         }
-        
-        if region_name:
-            site_data["region_name"] = region_name
-        if template_id:
-            site_data["template_id"] = template_id
-        if team_id:
-            site_data["team_id"] = team_id
-        
+        if git_url:
+            site_data["git_url"] = git_url
+        if ready_made_site_name:
+            site_data["ready_made_site_name"] = ready_made_site_name
+        if is_free is not None:
+            site_data["is_free"] = is_free
+
         site = await client.create_site(site_data)
-        
+
         result = f"✅ **Site Created Successfully!**\n\n"
         result += f"• **Domain**: {site.get('fqdn')}\n"
-        result += f"• **Status**: {site.get('status')}\n"
-        result += f"• **Region**: {site.get('region_name')}\n"
-        result += f"• **Site URL**: {site.get('site_url')}\n"
-        result += f"• **Admin URL**: {site.get('admin_url')}\n"
-        result += f"• **WordPress Admin**: {wp_username}\n"
-        result += f"• **WordPress Email**: {wp_email}\n"
-        result += f"\n🚀 Your WordPress site is being deployed and will be ready shortly!"
-        
+        result += f"• **Active**: {site.get('active', 'Unknown')}\n"
+        result += f"• **HTTP Auth Enabled**: {site.get('http_auth_enabled', 'Unknown')}\n"
+        result += f"• **Admin Username**: {wordpress_username}\n"
+        result += f"• **Admin Email**: {wordpress_email}\n"
+        if git_url:
+            result += f"• **Git URL**: {git_url}\n"
+        if ready_made_site_name:
+            result += f"• **Ready-made**: {ready_made_site_name}\n"
+        if is_free is not None:
+            result += f"• **Plan**: {'Free' if is_free else 'Paid'}\n"
+        result += "\n🚀 Your WordPress site is being deployed and will be ready shortly!"
+
         return result
-        
+
     except SiteBayError as e:
         return f"Error creating site: {str(e)}"
 
@@ -164,42 +167,46 @@ async def sitebay_create_site(
 async def sitebay_update_site(
     client: SiteBayClient,
     fqdn: str,
-    wp_title: Optional[str] = None,
-    wp_username: Optional[str] = None,
-    wp_password: Optional[str] = None,
-    wp_email: Optional[str] = None,
-    php_version: Optional[str] = None
+    cf_dev_mode_enabled: Optional[bool] = None,
+    new_fqdn: Optional[str] = None,
+    git_url: Optional[str] = None,
+    http_auth_enabled: Optional[bool] = None,
+    team_id: Optional[str] = None,
+    is_free: Optional[bool] = None,
 ) -> str:
     """
-    Update an existing WordPress site configuration.
+    Update an existing SiteBay site configuration.
     
     Args:
         fqdn: The fully qualified domain name of the site to update
-        wp_title: New WordPress site title
-        wp_username: New WordPress admin username
-        wp_password: New WordPress admin password
-        wp_email: New WordPress admin email
-        php_version: New PHP version (e.g., "8.1", "8.2")
+        cf_dev_mode_enabled: Enable/disable Cloudflare dev mode
+        new_fqdn: New domain for the site
+        git_url: Git repository URL
+        http_auth_enabled: Enable/disable HTTP basic auth
+        team_id: Move site to a different team
+        is_free: Toggle free plan flag
     
     Returns:
         Formatted string with update confirmation
     """
     try:
-        site_data = {}
+        site_data: Dict[str, Any] = {}
         
-        if wp_title:
-            site_data["wp_title"] = wp_title
-        if wp_username:
-            site_data["wp_username"] = wp_username
-        if wp_password:
-            site_data["wp_password"] = wp_password
-        if wp_email:
-            site_data["wp_email"] = wp_email
-        if php_version:
-            site_data["php_version"] = php_version
+        if cf_dev_mode_enabled is not None:
+            site_data["cf_dev_mode_enabled"] = cf_dev_mode_enabled
+        if new_fqdn:
+            site_data["new_fqdn"] = new_fqdn
+        if git_url:
+            site_data["git_url"] = git_url
+        if http_auth_enabled is not None:
+            site_data["http_auth_enabled"] = http_auth_enabled
+        if team_id:
+            site_data["team_id"] = team_id
+        if is_free is not None:
+            site_data["is_free"] = is_free
         
         if not site_data:
-            return "No updates specified. Please provide at least one field to update."
+            return "No updates specified. Provide at least one supported field."
         
         site = await client.update_site(fqdn, site_data)
         
@@ -207,16 +214,18 @@ async def sitebay_update_site(
         result += f"• **Domain**: {site.get('fqdn')}\n"
         result += f"• **Status**: {site.get('status')}\n"
         
-        if wp_title:
-            result += f"• **Title**: Updated to '{wp_title}'\n"
-        if wp_username:
-            result += f"• **Admin Username**: Updated to '{wp_username}'\n"
-        if wp_password:
-            result += f"• **Admin Password**: Updated\n"
-        if wp_email:
-            result += f"• **Admin Email**: Updated to '{wp_email}'\n"
-        if php_version:
-            result += f"• **PHP Version**: Updated to {php_version}\n"
+        if cf_dev_mode_enabled is not None:
+            result += f"• **Cloudflare Dev Mode**: {'Enabled' if cf_dev_mode_enabled else 'Disabled'}\n"
+        if new_fqdn:
+            result += f"• **New Domain**: {new_fqdn}\n"
+        if git_url:
+            result += f"• **Git URL**: {git_url}\n"
+        if http_auth_enabled is not None:
+            result += f"• **HTTP Auth**: {'Enabled' if http_auth_enabled else 'Disabled'}\n"
+        if team_id:
+            result += f"• **Team ID**: Moved to {team_id}\n"
+        if is_free is not None:
+            result += f"• **Plan**: {'Free' if is_free else 'Paid'}\n"
         
         return result
         
@@ -227,30 +236,16 @@ async def sitebay_update_site(
 async def sitebay_delete_site(
     client: SiteBayClient,
     fqdn: str,
-    confirm: bool = False
 ) -> str:
     """
     Delete a WordPress site permanently.
     
     Args:
         fqdn: The fully qualified domain name of the site to delete
-        confirm: Must be True to actually delete the site (safety check)
     
     Returns:
         Confirmation message or error
     """
-    if not confirm:
-        return (
-            f"⚠️  **CONFIRMATION REQUIRED**\n\n"
-            f"You are about to permanently delete the site: **{fqdn}**\n\n"
-            f"This action will:\n"
-            f"• Delete all website files and content\n"
-            f"• Delete the database and all data\n"
-            f"• Remove any staging sites\n"
-            f"• Cannot be undone\n\n"
-            f"To proceed with deletion, call this function again with confirm=True"
-        )
-    
     try:
         await client.delete_site(fqdn)
         
@@ -260,4 +255,4 @@ async def sitebay_delete_site(
         )
         
     except SiteBayError as e:
-        return f"Error deleting site: {str(e)}"
+        return f"Error deleting site: {str(e)}"