airbyte-internal-ops 0.2.3__py3-none-any.whl → 0.3.0__py3-none-any.whl

airbyte_ops_mcp/mcp/cloud_connector_versions.py

@@ -27,6 +27,12 @@ from airbyte_ops_mcp.cloud_admin.models import (
     ConnectorVersionInfo,
     VersionOverrideOperationResult,
 )
+from airbyte_ops_mcp.github_api import (
+    GitHubAPIError,
+    GitHubCommentParseError,
+    GitHubUserEmailNotFoundError,
+    get_admin_email_from_approval_comment,
+)
 from airbyte_ops_mcp.mcp._http_headers import (
     resolve_bearer_token,
     resolve_client_id,
@@ -115,6 +121,7 @@ def get_cloud_connector_version(
 
         # Use vendored API client instead of connector.get_connector_version()
         # Use Config API root for version management operations
+        # Pass workspace_id to get detailed scoped configuration context
         version_data = api_client.get_connector_version(
             connector_id=actor_id,
             connector_type=actor_type,
@@ -122,13 +129,31 @@ def get_cloud_connector_version(
             client_id=auth.client_id,
             client_secret=auth.client_secret,
             bearer_token=auth.bearer_token,
+            workspace_id=workspace_id,
+        )
+
+        # Determine if version is pinned from scoped config context (more reliable)
+        # The API's isVersionOverrideApplied only returns true for USER-created pins,
+        # not system-generated pins (e.g., breaking_change origin). Check scopedConfigs
+        # for a more accurate picture of whether ANY pin exists.
+        scoped_configs = version_data.get("scopedConfigs", {})
+        has_any_pin = (
+            any(config is not None for config in scoped_configs.values())
+            if scoped_configs
+            else False
+        )
+
+        # Use scoped config existence as the source of truth for "is pinned"
+        # Fall back to API's isVersionOverrideApplied if no scoped config data
+        is_pinned = (
+            has_any_pin if scoped_configs else version_data["isVersionOverrideApplied"]
         )
 
         return ConnectorVersionInfo(
             connector_id=actor_id,
             connector_type=actor_type,
             version=version_data["dockerImageTag"],
-            is_version_pinned=version_data["isVersionOverrideApplied"],
+            is_version_pinned=is_pinned,
         )
     except CloudAuthError:
         raise
@@ -155,6 +180,15 @@ def set_cloud_connector_version_override(
         Literal["source", "destination"],
         "The type of connector (source or destination)",
     ],
+    approval_comment_url: Annotated[
+        str,
+        Field(
+            description="URL to a GitHub comment where the admin has explicitly "
+            "requested or authorized this deployment. Must be a valid GitHub comment URL. "
+            "Required for authorization. The admin email is automatically derived from "
+            "the comment author's GitHub profile.",
+        ),
+    ],
     version: Annotated[
         str | None,
         Field(
@@ -186,14 +220,6 @@ def set_cloud_connector_version_override(
             default=None,
         ),
     ],
-    admin_user_email: Annotated[
-        str | None,
-        Field(
-            description="Email of the admin user authorizing this operation. "
-            "Must be an @airbyte.io email address. Required for authorization.",
-            default=None,
-        ),
-    ],
     issue_url: Annotated[
         str | None,
         Field(
@@ -202,15 +228,6 @@ def set_cloud_connector_version_override(
             default=None,
         ),
     ],
-    approval_comment_url: Annotated[
-        str | None,
-        Field(
-            description="URL to a GitHub comment where the admin has explicitly "
-            "requested or authorized this deployment. Must be a valid GitHub comment URL. "
-            "Required for authorization.",
-            default=None,
-        ),
-    ],
     ai_agent_session_url: Annotated[
         str | None,
         Field(
@@ -224,9 +241,13 @@ def set_cloud_connector_version_override(
 
     **Admin-only operation** - Requires:
     - AIRBYTE_INTERNAL_ADMIN_FLAG=airbyte.io environment variable
-    - admin_user_email parameter (must be @airbyte.io email)
     - issue_url parameter (GitHub issue URL for context)
-    - approval_comment_url parameter (GitHub comment URL with approval)
+    - approval_comment_url parameter (GitHub comment URL with approval from an @airbyte.io user)
+
+    The admin user email is automatically derived from the approval_comment_url by:
+    1. Fetching the comment from GitHub API to get the author's username
+    2. Fetching the user's profile to get their public email
+    3. Validating the email is an @airbyte.io address
 
     You must specify EXACTLY ONE of `version` OR `unset=True`, but not both.
     When setting a version, `override_reason` is required.
@@ -252,16 +273,9 @@ def set_cloud_connector_version_override(
             connector_type=actor_type,
         )
 
-    # Validate new authorization parameters
+    # Validate authorization parameters
     validation_errors: list[str] = []
 
-    if not admin_user_email:
-        validation_errors.append("admin_user_email is required for authorization")
-    elif "@airbyte.io" not in admin_user_email:
-        validation_errors.append(
-            f"admin_user_email must be an @airbyte.io email address, got: {admin_user_email}"
-        )
-
     if not issue_url:
         validation_errors.append(
             "issue_url is required for authorization (GitHub issue URL)"
@@ -271,11 +285,7 @@ def set_cloud_connector_version_override(
             f"issue_url must be a valid GitHub URL (https://github.com/...), got: {issue_url}"
         )
 
-    if not approval_comment_url:
-        validation_errors.append(
-            "approval_comment_url is required for authorization (GitHub comment URL)"
-        )
-    elif not approval_comment_url.startswith("https://github.com/"):
+    if not approval_comment_url.startswith("https://github.com/"):
         validation_errors.append(
             f"approval_comment_url must be a valid GitHub URL, got: {approval_comment_url}"
         )
@@ -296,6 +306,31 @@ def set_cloud_connector_version_override(
             connector_type=actor_type,
         )
 
+    # Derive admin email from approval comment URL
+    try:
+        admin_user_email = get_admin_email_from_approval_comment(approval_comment_url)
+    except GitHubCommentParseError as e:
+        return VersionOverrideOperationResult(
+            success=False,
+            message=f"Failed to parse approval comment URL: {e}",
+            connector_id=actor_id,
+            connector_type=actor_type,
+        )
+    except GitHubAPIError as e:
+        return VersionOverrideOperationResult(
+            success=False,
+            message=f"Failed to fetch approval comment from GitHub: {e}",
+            connector_id=actor_id,
+            connector_type=actor_type,
+        )
+    except GitHubUserEmailNotFoundError as e:
+        return VersionOverrideOperationResult(
+            success=False,
+            message=str(e),
+            connector_id=actor_id,
+            connector_type=actor_type,
+        )
+
     # Build enhanced override reason with audit fields (only for 'set' operations)
     enhanced_override_reason = override_reason
     if not unset and override_reason:

airbyte_ops_mcp/mcp/gcp_logs.py

@@ -0,0 +1,92 @@
+# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
+"""MCP tools for GCP Cloud Logging operations.
+
+This module provides MCP tools for querying GCP Cloud Logging,
+particularly for looking up error details by error ID.
+"""
+
+from __future__ import annotations
+
+from typing import Annotated
+
+from fastmcp import FastMCP
+from pydantic import Field
+
+from airbyte_ops_mcp.gcp_logs import (
+    GCPLogSearchResult,
+    GCPSeverity,
+    fetch_error_logs,
+)
+from airbyte_ops_mcp.gcp_logs.error_lookup import DEFAULT_GCP_PROJECT
+from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
+
+
+@mcp_tool(
+    read_only=True,
+    idempotent=True,
+)
+def lookup_cloud_backend_error(
+    error_id: Annotated[
+        str,
+        Field(
+            description=(
+                "The error ID (UUID) to search for. This is typically returned "
+                "in API error responses as {'errorId': '...'}"
+            )
+        ),
+    ],
+    project: Annotated[
+        str,
+        Field(
+            default=DEFAULT_GCP_PROJECT,
+            description=(
+                "GCP project ID to search in. Defaults to 'prod-ab-cloud-proj' "
+                "(Airbyte Cloud production)."
+            ),
+        ),
+    ],
+    lookback_days: Annotated[
+        int,
+        Field(
+            default=7,
+            description="Number of days to look back in logs. Defaults to 7.",
+        ),
+    ],
+    min_severity_filter: Annotated[
+        GCPSeverity | None,
+        Field(
+            default=None,
+            description="Optional minimum severity level to filter logs.",
+        ),
+    ],
+    max_log_entries: Annotated[
+        int,
+        Field(
+            default=200,
+            description="Maximum number of log entries to return. Defaults to 200.",
+        ),
+    ],
+) -> GCPLogSearchResult:
+    """Look up error details from GCP Cloud Logging by error ID.
+
+    When an Airbyte Cloud API returns an error response with only an error ID
+    (e.g., {"errorId": "3173452e-8f22-4286-a1ec-b0f16c1e078a"}), this tool
+    fetches the full stack trace and error details from GCP Cloud Logging.
+
+    The tool searches for log entries containing the error ID and fetches
+    related entries (multi-line stack traces) from the same timestamp and pod.
+
+    Requires GCP credentials with Logs Viewer role on the target project.
+    """
+    return fetch_error_logs(
+        error_id=error_id,
+        project=project,
+        lookback_days=lookback_days,
+        min_severity_filter=min_severity_filter,
+        max_log_entries=max_log_entries,
+    )
+
+
+def register_gcp_logs_tools(app: FastMCP) -> None:
+    """Register GCP logs tools with the FastMCP app."""
+    register_mcp_tools(app)

airbyte_ops_mcp/mcp/server.py

@@ -24,6 +24,7 @@ from airbyte_ops_mcp.constants import MCP_SERVER_NAME
 from airbyte_ops_mcp.mcp.cloud_connector_versions import (
     register_cloud_connector_version_tools,
 )
+from airbyte_ops_mcp.mcp.gcp_logs import register_gcp_logs_tools
 from airbyte_ops_mcp.mcp.github import register_github_tools
 from airbyte_ops_mcp.mcp.github_repo_ops import register_github_repo_ops_tools
 from airbyte_ops_mcp.mcp.prerelease import register_prerelease_tools
@@ -62,6 +63,7 @@ def register_server_assets(app: FastMCP) -> None:
     register_prerelease_tools(app)
     register_cloud_connector_version_tools(app)
     register_prod_db_query_tools(app)
+    register_gcp_logs_tools(app)
     register_prompts(app)
     register_regression_tests_tools(app)