airbyte-internal-ops 0.1.4__py3-none-any.whl → 0.1.5__py3-none-any.whl

{airbyte_internal_ops-0.1.4.dist-info → airbyte_internal_ops-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: airbyte-internal-ops
-Version: 0.1.4
+Version: 0.1.5
 Summary: MCP and API interfaces that let the agents do the admin work
 Author-email: Aaron Steers <aj@airbyte.io>
 Keywords: admin,airbyte,api,mcp

{airbyte_internal_ops-0.1.4.dist-info → airbyte_internal_ops-0.1.5.dist-info}/RECORD

@@ -352,16 +352,16 @@ airbyte_ops_mcp/_legacy/airbyte_ci/metadata_service/templates/render.py,sha256=g
 airbyte_ops_mcp/_legacy/airbyte_ci/metadata_service/validators/metadata_validator.py,sha256=xh3Q7XgXcFaHS4Fa9A6anDecudaEXQX-SOetjgm5L4Q,14653
 airbyte_ops_mcp/airbyte_repo/__init__.py,sha256=3yEpCOop1h33UuCtU7-1UB3kun2QsxtgvsfVEpuqN6s,1572
 airbyte_ops_mcp/airbyte_repo/bump_version.py,sha256=rtXYv105BhElj7twQmy20VjNsj6vCb0Ulrzmc4Z-1cE,15384
-airbyte_ops_mcp/airbyte_repo/list_connectors.py,sha256=IyYLtcBDsRmxe0SGJd3VHsO_0iaiTjsNMV6BqBUtZPI,14634
-airbyte_ops_mcp/airbyte_repo/utils.py,sha256=IZ7bJJz3I0BBfSxRfINY193VylMeg2GEXe0A1ZCiR80,3030
+airbyte_ops_mcp/airbyte_repo/list_connectors.py,sha256=rMiQFPGANSQzaBncVUh4oO8zdLafU4gxxqZB9o7_FAA,15714
+airbyte_ops_mcp/airbyte_repo/utils.py,sha256=TXlOAfhiu_hVRNjCxB4PRPVDhTWCU5lYmgqz4QG_-EA,3201
 airbyte_ops_mcp/cli/__init__.py,sha256=XpL7FyVfgabfBF2JR7u7NwJ2krlYqjd_OwLcWf-Xc7s,114
 airbyte_ops_mcp/cli/_base.py,sha256=I8tWnyQf0ks4r3J8N8h-5GZxyn37T-55KsbuHnxYlcg,415
 airbyte_ops_mcp/cli/_shared.py,sha256=jg-xMyGzTCGPqKd8VTfE_3kGPIyO_3Kx5sQbG4rPc0Y,1311
 airbyte_ops_mcp/cli/app.py,sha256=SEdBpqFUG2O8zGV5ifwptxrLGFph_dLr66-MX9d69gQ,789
-airbyte_ops_mcp/cli/cloud.py,sha256=iEkwromM8VByNa9V-2zBnAJZfr6CzCTiYSajqu4hSok,31996
+airbyte_ops_mcp/cli/cloud.py,sha256=BMFYs5bTEgdOhxwzBrtSyYMKaHhXnMM_SGzK2hFDPBY,32076
 airbyte_ops_mcp/cli/gh.py,sha256=91b1AxFXvHQCFyXhrrym-756ZjnMCqvxFdmwCtma1zI,2046
 airbyte_ops_mcp/cli/registry.py,sha256=wHyfiysASuy-HGvLJIiU8TRguaiuqRaXQP9QJ-LC7bk,2940
-airbyte_ops_mcp/cli/repo.py,sha256=2LurE6AvRpdgYpiRZuvA33bI1-e7_e0QsFbEO7Bba_g,15780
+airbyte_ops_mcp/cli/repo.py,sha256=G1hoQpH0XYhUH3FFOsia9xabGB0LP9o3XcwBuqvFVo0,16331
 airbyte_ops_mcp/cloud_admin/__init__.py,sha256=cqE96Q10Kp6elhH9DAi6TVsIwSUy3sooDLLrxTaktGk,816
 airbyte_ops_mcp/cloud_admin/api_client.py,sha256=4vZv1J4S2Q8ETl6gIB20X1X6KHTVV-bx__b2Ax8oqyc,17358
 airbyte_ops_mcp/cloud_admin/auth.py,sha256=j45pRR8fg6CLwVdn7Uu5KW_kTz_CjRP6ZJGUzqHj_Dk,2558
@@ -400,14 +400,14 @@ airbyte_ops_mcp/mcp/connector_analysis.py,sha256=OC4KrOSkMkKPkOisWnSv96BDDE5TQYH
 airbyte_ops_mcp/mcp/connector_qa.py,sha256=aImpqdnqBPDrz10BS0owsV4kuIU2XdalzgbaGZsbOL0,258
 airbyte_ops_mcp/mcp/github.py,sha256=5ZPsSTy4-gummS96xGoG-n2RwCgyg3-UWAvmEmxd5x4,7686
 airbyte_ops_mcp/mcp/github_repo_ops.py,sha256=D7yDtqMISFqaUzqnyA0dLE_6j6G3wHrNz8Byo8ajR8E,4929
-airbyte_ops_mcp/mcp/live_tests.py,sha256=4KTGCfct69WTCCrxZ23l-Nrz3iKZA5tuieNM_Aa4aTs,17408
+airbyte_ops_mcp/mcp/live_tests.py,sha256=KnxZLuUNmm_3Clt0DU8H9rJ01zOKefnL_wqdSCMDjkE,17992
 airbyte_ops_mcp/mcp/metadata.py,sha256=fwGW97WknR5lfKcQnFtK6dU87aA6TmLj1NkKyqDAV9g,270
 airbyte_ops_mcp/mcp/prerelease.py,sha256=2Mr0LdCLhEc9Q7CEtmganJXHGHCLCXODKlkSapLsSsY,9484
 airbyte_ops_mcp/mcp/prompts.py,sha256=6opN4ZweQxfSdtoK0gL6wTrlxkRvxTQvH1VTmAuhoBE,1645
 airbyte_ops_mcp/mcp/registry.py,sha256=PW-VYUj42qx2pQ_apUkVaoUFq7VgB9zEU7-aGrkSCCw,290
 airbyte_ops_mcp/mcp/server.py,sha256=oJOrwZP7hAwx2pjChZUZYv-aA4NITWiCRiXFiKVOf8E,2843
-airbyte_ops_mcp/mcp/server_info.py,sha256=VcNLn6CSy2UcgM2V1ep9-JGwV63p3cK1G14BFHXEn0U,2402
-airbyte_internal_ops-0.1.4.dist-info/METADATA,sha256=5vi9tCrTgfHK0NnN7hG2jkdRsuBalql3pCVO8nVh2RE,2866
-airbyte_internal_ops-0.1.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-airbyte_internal_ops-0.1.4.dist-info/entry_points.txt,sha256=eUgJ9xIy9PlR-CgRbqRMsh1NVp6jz08v9bul9vCYlU4,111
-airbyte_internal_ops-0.1.4.dist-info/RECORD,,
+airbyte_ops_mcp/mcp/server_info.py,sha256=4yNBA_N_vUyLwVJqp7abyFuzZkcnv6-ck_Beb2SXqTE,2426
+airbyte_internal_ops-0.1.5.dist-info/METADATA,sha256=XmVAvFOU6d8fO_atjptKKYgjPPQeBYspi2pupKXHxiY,2866
+airbyte_internal_ops-0.1.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+airbyte_internal_ops-0.1.5.dist-info/entry_points.txt,sha256=eUgJ9xIy9PlR-CgRbqRMsh1NVp6jz08v9bul9vCYlU4,111
+airbyte_internal_ops-0.1.5.dist-info/RECORD,,

airbyte_ops_mcp/airbyte_repo/list_connectors.py

@@ -7,15 +7,22 @@ by comparing git diffs between branches.
 
 from __future__ import annotations
 
+import logging
 import re
 import subprocess
 from dataclasses import dataclass
 from enum import StrEnum
 from functools import lru_cache
 from pathlib import Path
+from typing import Any
+
+import yaml
 
 CONNECTOR_PATH_PREFIX = "airbyte-integrations/connectors"
 METADATA_FILE_NAME = "metadata.yaml"
+GIT_DEFAULT_BRANCH = "origin/master"
+
+logger = logging.getLogger(__name__)
 
 
 class ConnectorLanguage(StrEnum):
@@ -29,7 +36,7 @@ class ConnectorLanguage(StrEnum):
 
 def get_modified_connectors(
     repo_path: str | Path,
-    base_ref: str = "origin/main",
+    base_ref: str = GIT_DEFAULT_BRANCH,
     head_ref: str = "HEAD",
 ) -> list[str]:
     """Get list of connector IDs that have been modified.
@@ -40,14 +47,14 @@ def get_modified_connectors(
 
     Args:
         repo_path: Path to the Airbyte monorepo
-        base_ref: Base git reference to compare against (default: "origin/main")
+        base_ref: Base git reference to compare against (default: "origin/master")
         head_ref: Head git reference to compare (default: "HEAD")
 
     Returns:
         List of connector technical names (e.g., ["source-faker", "destination-postgres"])
 
     Example:
-        >>> connectors = get_changed_connectors("/path/to/airbyte", "origin/main")
+        >>> connectors = get_changed_connectors("/path/to/airbyte", "origin/master")
         >>> print(connectors)
         ['source-faker', 'destination-postgres']
     """
@@ -158,6 +165,39 @@ def get_all_connectors(repo_path: str | Path) -> set[str]:
     return {p.name for p in connectors_dir.iterdir() if p.is_dir()}
 
 
+def get_connector_metadata(
+    repo_path: str | Path,
+    connector_name: str,
+) -> dict[str, Any] | None:
+    """Get metadata for a specific connector.
+
+    Args:
+        repo_path: Path to the Airbyte monorepo
+        connector_name: Technical name of the connector (e.g., "source-faker")
+
+    Returns:
+        The connector's metadata dict (the 'data' section), or None if not found
+
+    Example:
+        >>> metadata = get_connector_metadata("/path/to/airbyte", "source-faker")
+        >>> metadata.get("supportLevel")
+        'certified'
+    """
+    repo_path = Path(repo_path)
+    connector_dir = repo_path / CONNECTOR_PATH_PREFIX / connector_name
+    metadata_file = connector_dir / METADATA_FILE_NAME
+
+    if not metadata_file.exists():
+        return None
+
+    try:
+        with open(metadata_file) as f:
+            metadata = yaml.safe_load(f)
+        return metadata.get("data", {})
+    except Exception:
+        return None
+
+
 def get_connectors_by_language(
     repo_path: str | Path,
     language: ConnectorLanguage,
@@ -408,7 +448,7 @@ def list_connectors(
 
     # Apply modified filter
     if modified is not None:
-        base = base_ref if base_ref is not None else "origin/main"
+        base = base_ref if base_ref is not None else GIT_DEFAULT_BRANCH
         head = head_ref if head_ref is not None else "HEAD"
         changed_set = set(get_modified_connectors(repo_path, base, head))
         if modified:

airbyte_ops_mcp/airbyte_repo/utils.py

@@ -81,9 +81,11 @@ def resolve_diff_range(
 
     # Determine base_ref and head_ref based on PR detection
     if pr_number is not None:
-        # PR detected - use origin/main vs HEAD (assumes CI checked out the PR)
-        # TODO: In future, use GitHub API to get PR diff directly
-        base_ref = "origin/main"
+        # PR detected - use origin/{base_branch} vs HEAD (assumes CI checked out the PR)
+        # Use GITHUB_BASE_REF if available (set by GitHub Actions for PRs)
+        # This handles repos with different default branches (main, master, etc.)
+        base_branch = os.getenv("GITHUB_BASE_REF", "master")
+        base_ref = f"origin/{base_branch}"
         head_ref = "HEAD"
     else:
         # No PR detected - fallback to HEAD~1 vs HEAD (post-merge use case)

airbyte_ops_mcp/cli/cloud.py

@@ -23,7 +23,12 @@ from airbyte_protocol.models import ConfiguredAirbyteCatalog
 from cyclopts import App, Parameter
 
 from airbyte_ops_mcp.cli._base import app
-from airbyte_ops_mcp.cli._shared import print_error, print_json, print_success
+from airbyte_ops_mcp.cli._shared import (
+    exit_with_error,
+    print_error,
+    print_json,
+    print_success,
+)
 from airbyte_ops_mcp.cloud_admin.connection_config import fetch_connection_config
 from airbyte_ops_mcp.live_tests.ci_output import (
     generate_regression_report,
@@ -391,12 +396,11 @@ def live_test(
     # If connector_name is provided, build the image from source
     if connector_name:
         if connector_image:
-            print_error("Cannot specify both connector_image and connector_name")
             write_github_output("success", False)
             write_github_output(
                 "error", "Cannot specify both connector_image and connector_name"
             )
-            return
+            exit_with_error("Cannot specify both connector_image and connector_name")
 
         repo_root_path = Path(repo_root) if repo_root else None
         built_image = _build_connector_image_from_source(
@@ -407,19 +411,18 @@ def live_test(
         if not built_image:
             write_github_output("success", False)
             write_github_output("error", f"Failed to build image for {connector_name}")
-            return
+            exit_with_error(f"Failed to build image for {connector_name}")
         resolved_connector_image = built_image
 
     if connection_id:
         if config_path or catalog_path:
-            print_error(
-                "Cannot specify both connection_id and config_path/catalog_path"
-            )
             write_github_output("success", False)
             write_github_output(
                 "error", "Cannot specify both connection_id and file paths"
             )
-            return
+            exit_with_error(
+                "Cannot specify both connection_id and config_path/catalog_path"
+            )
 
         print_success(f"Fetching config/catalog from connection: {connection_id}")
         connection_data = fetch_connection_data(connection_id)
@@ -439,25 +442,23 @@ def live_test(
         catalog_file = Path(catalog_path) if catalog_path else None
 
     if not resolved_connector_image:
-        print_error(
+        write_github_output("success", False)
+        write_github_output("error", "Missing connector image")
+        exit_with_error(
             "You must provide one of the following: a connector_image, a connector_name, "
             "or a connection_id for a connection that has an associated connector image. "
             "If using connection_id, ensure the connection has a connector image configured."
         )
-        write_github_output("success", False)
-        write_github_output("error", "Missing connector image")
-        return
 
     # If connector_name was provided, we just built the image locally and it is already
     # available in Docker, so we skip the image availability check/pull. Only try to pull
     # if we didn't just build it (i.e., using a pre-built image from registry).
     if not connector_name and not ensure_image_available(resolved_connector_image):
-        print_error(f"Failed to pull connector image: {resolved_connector_image}")
         write_github_output("success", False)
         write_github_output(
             "error", f"Failed to pull image: {resolved_connector_image}"
         )
-        return
+        exit_with_error(f"Failed to pull connector image: {resolved_connector_image}")
 
     result = _run_connector_command(
         connector_image=resolved_connector_image,
@@ -494,7 +495,7 @@ def live_test(
     if result["success"]:
         print_success(f"Live test passed for {resolved_connector_image}")
     else:
-        print_error(f"Live test failed for {resolved_connector_image}")
+        exit_with_error(f"Live test failed for {resolved_connector_image}")
 
 
 def _run_with_optional_http_metrics(
@@ -673,12 +674,11 @@ def regression_test(
     # If connector_name is provided, build the target image from source
     if connector_name:
         if target_image:
-            print_error("Cannot specify both target_image and connector_name")
             write_github_output("success", False)
             write_github_output(
                 "error", "Cannot specify both target_image and connector_name"
             )
-            return
+            exit_with_error("Cannot specify both target_image and connector_name")
 
         repo_root_path = Path(repo_root) if repo_root else None
         built_image = _build_connector_image_from_source(
@@ -689,19 +689,18 @@ def regression_test(
         if not built_image:
             write_github_output("success", False)
             write_github_output("error", f"Failed to build image for {connector_name}")
-            return
+            exit_with_error(f"Failed to build image for {connector_name}")
         resolved_target_image = built_image
 
     if connection_id:
         if config_path or catalog_path:
-            print_error(
-                "Cannot specify both connection_id and config_path/catalog_path"
-            )
             write_github_output("success", False)
             write_github_output(
                 "error", "Cannot specify both connection_id and file paths"
             )
-            return
+            exit_with_error(
+                "Cannot specify both connection_id and config_path/catalog_path"
+            )
 
         print_success(f"Fetching config/catalog from connection: {connection_id}")
         connection_data = fetch_connection_data(connection_id)
@@ -723,36 +722,36 @@ def regression_test(
 
     # Validate that we have both images
     if not resolved_target_image:
-        print_error(
+        write_github_output("success", False)
+        write_github_output("error", "No target image specified")
+        exit_with_error(
             "You must provide one of the following: a target_image or a connector_name "
             "to build the target image from source."
         )
-        write_github_output("success", False)
-        write_github_output("error", "No target image specified")
-        return
 
     if not resolved_control_image:
-        print_error(
+        write_github_output("success", False)
+        write_github_output("error", "No control image specified")
+        exit_with_error(
             "You must provide one of the following: a control_image or a connection_id "
             "for a connection that has an associated connector image."
         )
-        write_github_output("success", False)
-        write_github_output("error", "No control image specified")
-        return
 
     # Pull images if they weren't just built locally
     # If connector_name was provided, we just built the target image locally
     if not connector_name and not ensure_image_available(resolved_target_image):
-        print_error(f"Failed to pull target connector image: {resolved_target_image}")
         write_github_output("success", False)
         write_github_output("error", f"Failed to pull image: {resolved_target_image}")
-        return
+        exit_with_error(
+            f"Failed to pull target connector image: {resolved_target_image}"
+        )
 
     if not ensure_image_available(resolved_control_image):
-        print_error(f"Failed to pull control connector image: {resolved_control_image}")
         write_github_output("success", False)
         write_github_output("error", f"Failed to pull image: {resolved_control_image}")
-        return
+        exit_with_error(
+            f"Failed to pull control connector image: {resolved_control_image}"
+        )
 
     target_output = output_path / "target"
     control_output = output_path / "control"
@@ -819,7 +818,7 @@ def regression_test(
     write_github_summary(summary)
 
     if regression_detected:
-        print_error(
+        exit_with_error(
             f"Regression detected between {resolved_target_image} and {resolved_control_image}"
         )
     elif both_succeeded:
@@ -827,7 +826,7 @@ def regression_test(
             f"Regression test passed for {resolved_target_image} vs {resolved_control_image}"
         )
     else:
-        print_error(
+        exit_with_error(
             f"Both versions failed for {resolved_target_image} vs {resolved_control_image}"
         )
 

airbyte_ops_mcp/cli/repo.py

@@ -27,6 +27,7 @@ from airbyte_ops_mcp.airbyte_repo.list_connectors import (
     CONNECTOR_PATH_PREFIX,
     METADATA_FILE_NAME,
     _detect_connector_language,
+    get_connectors_with_local_cdk,
 )
 from airbyte_ops_mcp.cli._base import app
 from airbyte_ops_mcp.cli._shared import exit_with_error, print_json
@@ -160,6 +161,15 @@ def list_connectors(
         bool,
         Parameter(help="Include only modified connectors (requires PR context)."),
     ] = False,
+    local_cdk: Annotated[
+        bool,
+        Parameter(
+            help=(
+                "Include connectors using local CDK reference. "
+                "When combined with --modified-only, adds local-CDK connectors to the modified set."
+            )
+        ),
+    ] = False,
     language: Annotated[
         list[str] | None,
         Parameter(help="Languages to include (python, java, low-code, manifest-only)."),
@@ -286,6 +296,11 @@ def list_connectors(
     connectors = list(result.connectors)
     repo_path_obj = Path(repo_path)
 
+    # Add connectors with local CDK reference if --local-cdk flag is set
+    if local_cdk:
+        local_cdk_connectors = get_connectors_with_local_cdk(repo_path)
+        connectors = sorted(set(connectors) | local_cdk_connectors)
+
     # Apply connector type filter
     if connector_type_filter:
         connectors = [

airbyte_ops_mcp/mcp/live_tests.py

@@ -17,6 +17,7 @@ from typing import Annotated, Any
 
 import requests
 from airbyte.cloud import CloudWorkspace
+from airbyte.cloud.auth import resolve_cloud_client_id, resolve_cloud_client_secret
 from fastmcp import FastMCP
 from pydantic import BaseModel, Field
 
@@ -388,15 +389,29 @@ def run_live_connection_tests(
 
     # Validate workspace membership if workspace_id is provided
     if workspace_id:
-        try:
-            workspace = CloudWorkspace(workspace_id=workspace_id)
-            # This will raise an exception if the connection doesn't belong to the workspace
-            workspace.get_connection(connection_id)
-        except Exception as e:
+        client_id = resolve_cloud_client_id()
+        client_secret = resolve_cloud_client_secret()
+        if not client_id or not client_secret:
+            return RunLiveConnectionTestsResponse(
+                run_id=run_id,
+                status=TestRunStatus.FAILED,
+                message=(
+                    "Missing Airbyte Cloud credentials. "
+                    "Set AIRBYTE_CLOUD_CLIENT_ID and AIRBYTE_CLOUD_CLIENT_SECRET env vars."
+                ),
+                workflow_url=None,
+            )
+        workspace = CloudWorkspace(
+            workspace_id=workspace_id,
+            client_id=client_id,
+            client_secret=client_secret,
+        )
+        connection = workspace.get_connection(connection_id)
+        if connection is None:
             return RunLiveConnectionTestsResponse(
                 run_id=run_id,
                 status=TestRunStatus.FAILED,
-                message=f"Connection {connection_id} validation failed for workspace {workspace_id}: {e}",
+                message=f"Connection {connection_id} not found in workspace {workspace_id}",
                 workflow_url=None,
             )
 

airbyte_ops_mcp/mcp/server_info.py

@@ -19,7 +19,7 @@ from airbyte_ops_mcp.mcp._mcp_utils import (
 
 
 @lru_cache(maxsize=1)
-def _get_version_info() -> dict[str, str | None]:
+def _get_version_info() -> dict[str, str | list[str] | None]:
     """Get version information for the MCP server.
 
     Returns:
@@ -66,7 +66,7 @@ def _get_version_info() -> dict[str, str | None]:
     mime_type="application/json",
     domain=ToolDomain.SERVER_INFO,
 )
-def mcp_server_info() -> dict[str, str | None]:
+def mcp_server_info() -> dict[str, str | list[str] | None]:
     """Resource that returns information for the MCP server.
 
     This includes package version, release history, help URLs, as well as other information.