airbyte-internal-ops 0.1.4__tar.gz → 0.1.5__tar.gz

{airbyte_internal_ops-0.1.4 → airbyte_internal_ops-0.1.5}/.github/workflows/lint-check.yml

@@ -6,6 +6,9 @@ on:
       - main
   pull_request: {}
 
+permissions:
+  contents: read
+
 jobs:
   ruff-lint-check:
     name: Ruff Lint Check
@@ -52,3 +55,26 @@ jobs:
 
       - name: Run dependency analysis
         run: uv run deptry .
+
+  pyrefly-check:
+    name: Type Checking
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          version: "latest"
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: uv sync --group dev
+
+      - name: Run type check
+        run: uv run pyrefly check

{airbyte_internal_ops-0.1.4 → airbyte_internal_ops-0.1.5}/PKG-INFO

@@ -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 → airbyte_internal_ops-0.1.5}/poe_tasks.toml

@@ -33,8 +33,8 @@ clean = "rm -rf .pytest_cache .coverage htmlcov dist .ruff_cache"
 version = { "shell" = "echo 'airbyte-internal-ops version:' && python -c 'import airbyte_ops_mcp; print(airbyte_ops_mcp.__version__)'" }
 
 [tool.poe.tasks.typecheck]
-help = "Run type checking with mypy"
-cmd = "echo 'Type checking not yet configured - consider adding mypy'"
+help = "Run type checking with pyrefly"
+cmd = "pyrefly check"
 
 [tool.poe.tasks.security]
 help = "Run security checks with bandit"  

{airbyte_internal_ops-0.1.4 → airbyte_internal_ops-0.1.5}/pyproject.toml

@@ -58,6 +58,7 @@ dev = [
     "types-pyyaml>=6.0.12",
     "types-requests>=2.32.0",
     "types-beautifulsoup4>=4.12.0",
+    "pyrefly>=0.45.2",
 ]
 erd = [
     "google-generativeai>=0.7.2,<1.0",

airbyte_internal_ops-0.1.5/pyrefly.toml

@@ -0,0 +1,9 @@
+# Pyrefly Type Checker Configuration
+# https://pyrefly.org/en/docs/configuration/
+
+python-version = "3.11"
+project-includes = ["src/airbyte_ops_mcp/mcp"]
+project-excludes = [
+    "tests/**",
+    "docs/**",
+]

{airbyte_internal_ops-0.1.4 → airbyte_internal_ops-0.1.5}/src/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_internal_ops-0.1.4 → airbyte_internal_ops-0.1.5}/src/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_internal_ops-0.1.4 → airbyte_internal_ops-0.1.5}/src/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_internal_ops-0.1.4 → airbyte_internal_ops-0.1.5}/src/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_internal_ops-0.1.4 → airbyte_internal_ops-0.1.5}/src/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_internal_ops-0.1.4 → airbyte_internal_ops-0.1.5}/src/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.