airbyte-internal-ops 0.5.2__tar.gz → 0.6.0__tar.gz

airbyte_internal_ops-0.6.0/.github/workflows/publish.yml

@@ -0,0 +1,41 @@
+# This workflow publishes the python package to PyPI.
+#
+# Triggers:
+# - release: published - When user clicks "Publish" on a draft release (downloads pre-built assets)
+#
+# Authentication: This workflow expects GitHub OIDC for passwordless PyPI publishing.
+# For more info: https://docs.pypi.org/trusted-publishers/
+
+name: Publish Package
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish_to_pypi:
+    name: Publish Package to PyPI
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    environment:
+      name: PyPI
+      url: https://pypi.org/project/airbyte-internal-ops/
+    steps:
+      - name: Download wheel and sdist from release
+        uses: robinraju/release-downloader@v1.12
+        with:
+          tag: ${{ github.event.release.tag_name }}
+          fileName: "*.whl"
+          out-file-path: dist
+
+      - name: Download sdist from release
+        uses: robinraju/release-downloader@v1.12
+        with:
+          tag: ${{ github.event.release.tag_name }}
+          fileName: "*.tar.gz"
+          out-file-path: dist
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@v1.13.0

airbyte_internal_ops-0.6.0/.github/workflows/release-drafter.yml

@@ -0,0 +1,52 @@
+name: Release Drafter
+
+on:
+  workflow_dispatch: {}
+  push:
+    branches:
+      - main
+
+concurrency:
+  group: release-drafter
+  cancel-in-progress: false
+
+jobs:
+  draft_release:
+    name: Draft Release
+    permissions:
+      contents: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create or update draft release
+        uses: aaronsteers/semantic-pr-release-drafter@v0.4.0
+        id: release-drafter
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          version: "latest"
+
+      - name: Checkout Repo
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Build package
+        env:
+          TAG_NAME: ${{ steps.release-drafter.outputs.tag_name }}
+        run: |
+          echo "Building with version from tag: ${TAG_NAME}"
+          # Strip 'v' prefix for uv-dynamic-versioning
+          UV_DYNAMIC_VERSIONING_BYPASS="${TAG_NAME#v}" uv build
+
+      - name: Attach assets to draft release
+        uses: aaronsteers/semantic-pr-release-drafter@v0.4.0
+        with:
+          attach-files: |
+            dist/*.whl
+            dist/*.tar.gz
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

airbyte_internal_ops-0.6.0/.github/workflows/semantic-pr-check.yml

@@ -0,0 +1,56 @@
+# Semantic PR Title Validation
+#
+# This workflow validates PR titles follow conventional commit format.
+
+name: Semantic PR Title Validation
+
+on:
+  pull_request:
+    types: [opened, edited, ready_for_review]
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  validate-pr-title:
+    name: Validate PR Title
+    # Skip if 'edited' event but the title wasn't changed (e.g., only description was edited)
+    if: >
+      github.event.action != 'edited'
+      || (
+        github.event.changes.title &&
+        github.event.changes.title.from != ''
+      )
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check semantic PR title
+        uses: amannn/action-semantic-pull-request@v5
+        if: ${{ github.event.pull_request.draft == false }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          # Configure which types are allowed (newline-delimited).
+          # Comparison is case-insensitive, so only lowercase variants are needed.
+          # See: https://github.com/commitizen/conventional-commit-types/blob/master/index.json
+          types: |
+            fix
+            feat
+            docs
+            ci
+            chore
+            build
+            test
+            refactor
+            perf
+            style
+
+      - name: Check for "do not merge" in PR title
+        if: ${{ github.event.pull_request.draft == false }}
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const title = context.payload.pull_request.title.toLowerCase();
+            if (title.includes('do not merge') || title.includes('do-not-merge')) {
+              core.setFailed('PR title contains "do not merge" or "do-not-merge". Please remove this before merging.');
+            }

airbyte_internal_ops-0.6.0/.github/workflows/validate-build.yml

@@ -0,0 +1,46 @@
+name: Validate Build
+
+on:
+  push:
+    branches:
+      - main
+  pull_request: {}
+
+permissions:
+  contents: read
+
+jobs:
+  build-check:
+    name: Build and Inspect Python Package
+    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.12"
+
+      - name: Disable direct references for build check
+        # Forcibly disable allow-direct-references to catch git dependencies at build time.
+        run: |
+          echo "Before:" && grep allow-direct-references pyproject.toml
+          sed -i 's/allow-direct-references *= *true/allow-direct-references = false/' pyproject.toml
+          echo "After:" && grep allow-direct-references pyproject.toml
+
+      - name: Build package
+        run: uv build
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v6
+        with:
+          name: Packages-${{ github.run_id }}
+          path: |
+            dist/*.whl
+            dist/*.tar.gz

{airbyte_internal_ops-0.5.2 → airbyte_internal_ops-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: airbyte-internal-ops
-Version: 0.5.2
+Version: 0.6.0
 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
@@ -21,6 +21,7 @@ Requires-Dist: cloud-sql-python-connector[pg8000]<2.0,>=1.7.0
 Requires-Dist: cyclopts<5.0,>=4.0.0
 Requires-Dist: docker<7.0,>=6.0
 Requires-Dist: dpath<3.0,>=2.1.5
+Requires-Dist: fastmcp-extensions<1.0,>=0.2.0
 Requires-Dist: fastmcp<3.0,>=2.12.1
 Requires-Dist: gitpython<4.0,>=3.1.29
 Requires-Dist: google-cloud-logging<4.0,>=3.9.0

{airbyte_internal_ops-0.5.2 → airbyte_internal_ops-0.6.0}/infra/sentry/__main__.py

@@ -252,6 +252,7 @@ def define_abctl_project() -> tuple[sentry.Project, OutputVarsMap]:
         filters=sentry.ProjectFiltersArgs(
             error_messages=[
                 "*kong.ParseError: unexpected argument start",
+                "*errors.joinError: failed to determine if any previous psql version exists: error reading pgdata version file*",
                 "*values.yaml*no such file or directory*",
                 "*values.yml*no such file or directory*",
             ],

{airbyte_internal_ops-0.5.2 → airbyte_internal_ops-0.6.0}/poe_tasks.toml

@@ -1,6 +1,11 @@
 # PoeThePoet task definitions
 # https://poethepoet.natn.io/
 
+# Global environment variables
+[tool.poe.env]
+# The pointer to our app. Used in MCP helper tasks.
+MCP_SERVER_APP = "airbyte_ops_mcp.mcp.server:app"
+
 [tool.poe.tasks]
 
 # Linting and formatting
@@ -62,8 +67,12 @@ args = [{ name = "scope", default = "", help = "Optional scope/context to focus
 
 [tool.poe.tasks.mcp-tool-test]
 help = "Test MCP tools directly with JSON arguments: poe mcp-tool-test <tool_name> '<json_args>'"
-cmd = "python bin/test_mcp_tool.py"
+cmd = "python -m fastmcp_extensions.utils.test_tool --app $MCP_SERVER_APP"
 
 [tool.poe.tasks.mcp-tool-test-http]
 help = "Test MCP tools over HTTP transport (stateless): poe mcp-tool-test-http [tool_name] ['<json_args>']"
-cmd = "python bin/test_mcp_tool_http.py"
+cmd = "python -m fastmcp_extensions.utils.test_tool --http --app $MCP_SERVER_APP"
+
+[tool.poe.tasks.mcp-server-describe]
+help = "Describe MCP server tool list (count, total characters, average)"
+cmd = "python -m fastmcp_extensions.utils.describe_server --app $MCP_SERVER_APP --name airbyte-ops-mcp"

{airbyte_internal_ops-0.5.2 → airbyte_internal_ops-0.6.0}/pyproject.toml

@@ -19,6 +19,7 @@ dependencies = [
     "docker>=6.0,<7.0",
     "dpath>=2.1.5,<3.0",
     "fastmcp>=2.12.1,<3.0",
+    "fastmcp-extensions>=0.2.0,<1.0",
     "gitpython>=3.1.29,<4.0",
     "google-cloud-logging>=3.9.0,<4.0",
     "google-cloud-secret-manager>=2.18.0,<3.0",
@@ -149,6 +150,12 @@ vcs = "git"
 style = "pep440"
 fallback-version = "0.0.0"
 
+[tool.hatch.metadata]
+# We allow git-based dependencies during development.
+# However, PyPI does not allow this so we toggle to `false` in CI build checks
+# to ensure dependencies are properly pinned before merge.
+allow-direct-references = true
+
 [tool.hatch.build.targets.wheel]
 packages = ["src/airbyte_ops_mcp"]
 

{airbyte_internal_ops-0.5.2 → airbyte_internal_ops-0.6.0}/src/airbyte_ops_mcp/constants.py

@@ -10,6 +10,19 @@ from airbyte.exceptions import PyAirbyteInputError
 MCP_SERVER_NAME = "airbyte-internal-ops"
 """The name of the MCP server."""
 
+
+class ServerConfigKey(StrEnum):
+    """Config keys for MCP server configuration arguments.
+
+    These keys are used both when defining server_config_args in mcp_server()
+    and when retrieving config values via get_mcp_config().
+    """
+
+    BEARER_TOKEN = "bearer_token"
+    CLIENT_ID = "client_id"
+    CLIENT_SECRET = "client_secret"
+
+
 USER_AGENT = "Airbyte-Internal-Ops Python client"
 """User-Agent string for HTTP requests to Airbyte Cloud APIs."""
 

airbyte_internal_ops-0.6.0/src/airbyte_ops_mcp/mcp/__init__.py

@@ -0,0 +1,12 @@
+"""MCP tools organized by functional domain.
+
+This package contains all MCP tool implementations organized by module name.
+Domain is automatically inferred from the file stem where tools are defined:
+- github_repo_ops: GitHub repository operations
+- cloud_connector_versions: Cloud connector version management
+- prod_db_queries: Production database queries
+- github_actions: GitHub Actions workflow operations
+- regression_tests: Connector regression testing
+- prerelease: Connector prerelease operations
+- gcp_logs: GCP log queries
+"""

{airbyte_internal_ops-0.5.2 → airbyte_internal_ops-0.6.0}/src/airbyte_ops_mcp/mcp/cloud_connector_versions.py

@@ -15,7 +15,8 @@ from typing import Annotated, Literal
 
 from airbyte import constants
 from airbyte.exceptions import PyAirbyteInputError
-from fastmcp import FastMCP
+from fastmcp import Context, FastMCP
+from fastmcp_extensions import get_mcp_config, mcp_tool, register_mcp_tools
 from pydantic import Field
 
 from airbyte_ops_mcp.cloud_admin import api_client
@@ -29,19 +30,13 @@ from airbyte_ops_mcp.cloud_admin.models import (
     VersionOverrideOperationResult,
     WorkspaceVersionOverrideResult,
 )
-from airbyte_ops_mcp.constants import WorkspaceAliasEnum
+from airbyte_ops_mcp.constants import ServerConfigKey, WorkspaceAliasEnum
 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,
-    resolve_client_secret,
-)
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 
 
 @dataclass(frozen=True)
@@ -56,33 +51,36 @@ class _ResolvedCloudAuth:
     client_secret: str | None = None
 
 
-def _resolve_cloud_auth() -> _ResolvedCloudAuth:
+def _resolve_cloud_auth(ctx: Context) -> _ResolvedCloudAuth:
     """Resolve authentication credentials for Airbyte Cloud API.
 
     Credentials are resolved in priority order:
     1. Bearer token (Authorization header or AIRBYTE_CLOUD_BEARER_TOKEN env var)
     2. Client credentials (X-Airbyte-Cloud-Client-Id/Secret headers or env vars)
 
+    Args:
+        ctx: FastMCP Context object from the current tool invocation.
+
     Returns:
         _ResolvedCloudAuth with either bearer_token or client credentials set.
 
     Raises:
         CloudAuthError: If credentials cannot be resolved from headers or env vars.
     """
-    # Try bearer token first (preferred)
-    bearer_token = resolve_bearer_token()
+    # Try bearer token first (preferred, but not required)
+    bearer_token = get_mcp_config(ctx, ServerConfigKey.BEARER_TOKEN)
     if bearer_token:
-        return _ResolvedCloudAuth(bearer_token=str(bearer_token))
+        return _ResolvedCloudAuth(bearer_token=bearer_token)
 
     # Fall back to client credentials
     try:
-        client_id = resolve_client_id()
-        client_secret = resolve_client_secret()
+        client_id = get_mcp_config(ctx, ServerConfigKey.CLIENT_ID)
+        client_secret = get_mcp_config(ctx, ServerConfigKey.CLIENT_SECRET)
         return _ResolvedCloudAuth(
-            client_id=str(client_id),
-            client_secret=str(client_secret),
+            client_id=client_id,
+            client_secret=client_secret,
         )
-    except Exception as e:
+    except ValueError as e:
         raise CloudAuthError(
             f"Failed to resolve credentials. Ensure credentials are provided "
             f"via Authorization header (Bearer token), "
@@ -111,6 +109,8 @@ def get_cloud_connector_version(
         Literal["source", "destination"],
         "The type of connector (source or destination)",
     ],
+    *,
+    ctx: Context,
 ) -> ConnectorVersionInfo:
     """Get the current version information for a deployed connector.
 
@@ -126,7 +126,7 @@ def get_cloud_connector_version(
     resolved_workspace_id = WorkspaceAliasEnum.resolve(workspace_id)
 
     try:
-        auth = _resolve_cloud_auth()
+        auth = _resolve_cloud_auth(ctx)
 
         # Use vendored API client instead of connector.get_connector_version()
         # Use Config API root for version management operations
@@ -248,6 +248,8 @@ def set_cloud_connector_version_override(
             default=None,
         ),
     ],
+    *,
+    ctx: Context,
 ) -> VersionOverrideOperationResult:
     """Set or clear a version override for a deployed connector.
 
@@ -359,7 +361,7 @@ def set_cloud_connector_version_override(
 
     # Resolve auth and get current version info
     try:
-        auth = _resolve_cloud_auth()
+        auth = _resolve_cloud_auth(ctx)
 
         # Get current version info before the operation
         current_version_data = api_client.get_connector_version(
@@ -529,6 +531,8 @@ def set_workspace_connector_version_override(
             default=None,
         ),
     ],
+    *,
+    ctx: Context,
 ) -> WorkspaceVersionOverrideResult:
     """Set or clear a workspace-level version override for a connector type.
 
@@ -634,7 +638,7 @@ def set_workspace_connector_version_override(
 
     # Resolve auth and call API client
     try:
-        auth = _resolve_cloud_auth()
+        auth = _resolve_cloud_auth(ctx)
 
         result = api_client.set_workspace_connector_version_override(
             workspace_id=resolved_workspace_id,
@@ -762,6 +766,8 @@ def set_organization_connector_version_override(
             default=None,
         ),
     ],
+    *,
+    ctx: Context,
 ) -> OrganizationVersionOverrideResult:
     """Set or clear an organization-level version override for a connector type.
 
@@ -863,7 +869,7 @@ def set_organization_connector_version_override(
 
     # Resolve auth and call API client
     try:
-        auth = _resolve_cloud_auth()
+        auth = _resolve_cloud_auth(ctx)
 
         result = api_client.set_organization_connector_version_override(
             organization_id=organization_id,
@@ -921,4 +927,4 @@ def register_cloud_connector_version_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=__name__)
+    register_mcp_tools(app, mcp_module=__name__)

{airbyte_internal_ops-0.5.2 → airbyte_internal_ops-0.6.0}/src/airbyte_ops_mcp/mcp/gcp_logs.py

@@ -10,6 +10,7 @@ from __future__ import annotations
 from typing import Annotated
 
 from fastmcp import FastMCP
+from fastmcp_extensions import mcp_tool, register_mcp_tools
 from pydantic import Field
 
 from airbyte_ops_mcp.gcp_logs import (
@@ -18,7 +19,6 @@ from airbyte_ops_mcp.gcp_logs import (
     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(

{airbyte_internal_ops-0.5.2 → airbyte_internal_ops-0.6.0}/src/airbyte_ops_mcp/mcp/github_actions.py

@@ -12,6 +12,7 @@ from typing import Annotated
 
 import requests
 from fastmcp import FastMCP
+from fastmcp_extensions import mcp_tool, register_mcp_tools
 from pydantic import BaseModel, Field
 
 from airbyte_ops_mcp.github_actions import (
@@ -23,7 +24,6 @@ from airbyte_ops_mcp.github_api import (
     get_pr_head_ref,
     resolve_github_token,
 )
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 
 # Token env vars for workflow triggering (in order of preference)
 WORKFLOW_TRIGGER_TOKEN_ENV_VARS = [
@@ -400,4 +400,4 @@ def register_github_actions_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=__name__)
+    register_mcp_tools(app, mcp_module=__name__)

{airbyte_internal_ops-0.5.2 → airbyte_internal_ops-0.6.0}/src/airbyte_ops_mcp/mcp/github_repo_ops.py

@@ -10,12 +10,12 @@ from __future__ import annotations
 from typing import Annotated, Literal
 
 from fastmcp import FastMCP
+from fastmcp_extensions import mcp_tool, register_mcp_tools
 from pydantic import BaseModel
 
 from airbyte_ops_mcp.airbyte_repo.bump_version import bump_connector_version
 from airbyte_ops_mcp.airbyte_repo.list_connectors import list_connectors
 from airbyte_ops_mcp.airbyte_repo.utils import resolve_diff_range
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 
 
 class ConnectorListResponse(BaseModel):
@@ -162,4 +162,4 @@ def register_github_repo_ops_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=__name__)
+    register_mcp_tools(app, mcp_module=__name__)

{airbyte_internal_ops-0.5.2 → airbyte_internal_ops-0.6.0}/src/airbyte_ops_mcp/mcp/prerelease.py

@@ -16,6 +16,7 @@ from typing import Annotated, Literal
 import requests
 import yaml
 from fastmcp import FastMCP
+from fastmcp_extensions import mcp_tool, register_mcp_tools
 from pydantic import BaseModel, Field
 
 from airbyte_ops_mcp.github_actions import trigger_workflow_dispatch
@@ -24,7 +25,6 @@ from airbyte_ops_mcp.github_api import (
     get_pr_head_ref,
     resolve_github_token,
 )
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 
 
 class ConnectorRepo(StrEnum):
@@ -278,4 +278,4 @@ def register_prerelease_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=__name__)
+    register_mcp_tools(app, mcp_module=__name__)

{airbyte_internal_ops-0.5.2 → airbyte_internal_ops-0.6.0}/src/airbyte_ops_mcp/mcp/prod_db_queries.py

@@ -14,10 +14,10 @@ from typing import Annotated, Any
 import requests
 from airbyte.exceptions import PyAirbyteInputError
 from fastmcp import FastMCP
+from fastmcp_extensions import mcp_tool, register_mcp_tools
 from pydantic import BaseModel, Field
 
 from airbyte_ops_mcp.constants import OrganizationAliasEnum, WorkspaceAliasEnum
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 from airbyte_ops_mcp.prod_db_access.queries import (
     query_actors_pinned_to_version,
     query_connections_by_connector,
@@ -1274,4 +1274,4 @@ def query_prod_connector_connection_stats(
 
 def register_prod_db_query_tools(app: FastMCP) -> None:
     """Register prod DB query tools with the FastMCP app."""
-    register_mcp_tools(app, domain=__name__)
+    register_mcp_tools(app, mcp_module=__name__)

{airbyte_internal_ops-0.5.2 → airbyte_internal_ops-0.6.0}/src/airbyte_ops_mcp/mcp/prompts.py

@@ -10,10 +10,10 @@ from __future__ import annotations
 from typing import Annotated
 
 from fastmcp import FastMCP
+from fastmcp_extensions import mcp_prompt, register_mcp_prompts
 from pydantic import Field
 
 from airbyte_ops_mcp.mcp._guidance import TEST_MY_TOOLS_GUIDANCE
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_prompt, register_mcp_prompts
 
 
 @mcp_prompt(
@@ -56,4 +56,4 @@ def register_prompts(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_prompts(app, domain=__name__)
+    register_mcp_prompts(app, mcp_module=__name__)

{airbyte_internal_ops-0.5.2 → airbyte_internal_ops-0.6.0}/src/airbyte_ops_mcp/mcp/regression_tests.py

@@ -29,12 +29,12 @@ from airbyte.exceptions import (
     AirbyteWorkspaceMismatchError,
 )
 from fastmcp import FastMCP
+from fastmcp_extensions import mcp_tool, register_mcp_tools
 from pydantic import BaseModel, Field
 
 from airbyte_ops_mcp.constants import WorkspaceAliasEnum
 from airbyte_ops_mcp.github_actions import trigger_workflow_dispatch
 from airbyte_ops_mcp.github_api import GITHUB_API_BASE, resolve_github_token
-from airbyte_ops_mcp.mcp._mcp_utils import mcp_tool, register_mcp_tools
 from airbyte_ops_mcp.mcp.prerelease import ConnectorRepo
 
 logger = logging.getLogger(__name__)
@@ -471,4 +471,4 @@ def register_regression_tests_tools(app: FastMCP) -> None:
     Args:
         app: FastMCP application instance
     """
-    register_mcp_tools(app, domain=__name__)
+    register_mcp_tools(app, mcp_module=__name__)