airbyte-internal-ops 0.5.0__py3-none-any.whl → 0.5.1__py3-none-any.whl

airbyte_ops_mcp/constants.py

@@ -122,6 +122,64 @@ class OrganizationAliasEnum(StrEnum):
         return alias_mapping[org_id]
 
 
+# =============================================================================
+# Workspace ID Aliases
+# =============================================================================
+
+
+class WorkspaceAliasEnum(StrEnum):
+    """Workspace ID aliases that can be used in place of UUIDs.
+
+    Each member's name is the alias (e.g., "@devin-ai-sandbox") and its value
+    is the actual workspace UUID. Use `WorkspaceAliasEnum.resolve()` to
+    resolve aliases to actual IDs.
+    """
+
+    DEVIN_AI_SANDBOX = "266ebdfe-0d7b-4540-9817-de7e4505ba61"
+    """The Devin AI sandbox workspace for testing and development.
+
+    Alias: @devin-ai-sandbox
+    """
+
+    @classmethod
+    def resolve(cls, workspace_id: str | None) -> str | None:
+        """Resolve a workspace ID alias to its actual UUID.
+
+        Accepts either an alias string (e.g., "@devin-ai-sandbox") or a
+        WorkspaceAliasEnum enum member, and returns the actual UUID.
+
+        Returns:
+            The resolved workspace ID (UUID), or None if input is None.
+            If the input doesn't start with "@", it is returned unchanged.
+
+        Raises:
+            PyAirbyteInputError: If the input starts with "@" but is not a recognized alias.
+        """
+        if workspace_id is None:
+            return None
+
+        # Handle WorkspaceAliasEnum enum members directly
+        if isinstance(workspace_id, cls):
+            return workspace_id.value
+
+        # If it doesn't look like an alias, return as-is (assume it's a UUID)
+        if not workspace_id.startswith("@"):
+            return workspace_id
+
+        # Handle alias strings or raise an error if invalid
+        alias_mapping = {
+            "@devin-ai-sandbox": cls.DEVIN_AI_SANDBOX.value,
+        }
+        if workspace_id not in alias_mapping:
+            raise PyAirbyteInputError(
+                message=f"Unknown workspace alias: {workspace_id}",
+                context={
+                    "valid_aliases": list(alias_mapping.keys()),
+                },
+            )
+        return alias_mapping[workspace_id]
+
+
 CONNECTION_RETRIEVER_PG_CONNECTION_DETAILS_SECRET_ID = (
     "projects/587336813068/secrets/CONNECTION_RETRIEVER_PG_CONNECTION_DETAILS"
 )

airbyte_ops_mcp/{_legacy/airbyte_ci/metadata_service/docker_hub.py → docker_hub.py}

@@ -1,6 +1,13 @@
 #
 # Copyright (c) 2023 Airbyte, Inc., all rights reserved.
 #
+"""DockerHub API client with authentication, pagination, and retry support.
+
+Provides utilities for interacting with the DockerHub API, including fetching
+image tags and digests, checking image existence, and finding the latest version.
+Supports authenticated requests to avoid rate limits and includes retry logic
+for handling API flakiness.
+"""
 
 import os
 import time
@@ -95,17 +102,16 @@ def get_docker_hub_tags_and_digests(
             for result in json_response.get("results", [])
         }
     )
-    if paginate:
-        if next_page_url := json_response.get("next"):
-            tags_and_digests.update(
-                get_docker_hub_tags_and_digests(
-                    image_name,
-                    retries=retries,
-                    wait_sec=wait_sec,
-                    next_page_url=next_page_url,
-                    tags_and_digests=tags_and_digests,
-                )
+    if paginate and (next_page_url := json_response.get("next")):
+        tags_and_digests.update(
+            get_docker_hub_tags_and_digests(
+                image_name,
+                retries=retries,
+                wait_sec=wait_sec,
+                next_page_url=next_page_url,
+                tags_and_digests=tags_and_digests,
             )
+        )
     return tags_and_digests
 
 

airbyte_ops_mcp/mcp/cloud_connector_versions.py

@@ -29,6 +29,7 @@ from airbyte_ops_mcp.cloud_admin.models import (
     VersionOverrideOperationResult,
     WorkspaceVersionOverrideResult,
 )
+from airbyte_ops_mcp.constants import WorkspaceAliasEnum
 from airbyte_ops_mcp.github_api import (
     GitHubAPIError,
     GitHubCommentParseError,
@@ -97,8 +98,11 @@ def _resolve_cloud_auth() -> _ResolvedCloudAuth:
 )
 def get_cloud_connector_version(
     workspace_id: Annotated[
-        str,
-        Field(description="The Airbyte Cloud workspace ID."),
+        str | WorkspaceAliasEnum,
+        Field(
+            description="The Airbyte Cloud workspace ID (UUID) or alias. "
+            "Accepts '@devin-ai-sandbox' as an alias for the Devin AI sandbox workspace."
+        ),
     ],
     actor_id: Annotated[
         str, "The ID of the deployed connector (source or destination)"
@@ -118,6 +122,9 @@ def get_cloud_connector_version(
     2. HTTP headers: X-Airbyte-Cloud-Client-Id, X-Airbyte-Cloud-Client-Secret
     3. Environment variables: AIRBYTE_CLOUD_CLIENT_ID, AIRBYTE_CLOUD_CLIENT_SECRET
     """
+    # Resolve workspace ID alias
+    resolved_workspace_id = WorkspaceAliasEnum.resolve(workspace_id)
+
     try:
         auth = _resolve_cloud_auth()
 
@@ -127,11 +134,11 @@ def get_cloud_connector_version(
         version_data = api_client.get_connector_version(
             connector_id=actor_id,
             connector_type=actor_type,
-            api_root=constants.CLOUD_CONFIG_API_ROOT,  # Use Config API, not public API
+            config_api_root=constants.CLOUD_CONFIG_API_ROOT,
             client_id=auth.client_id,
             client_secret=auth.client_secret,
             bearer_token=auth.bearer_token,
-            workspace_id=workspace_id,
+            workspace_id=resolved_workspace_id,
         )
 
         # Determine if version is pinned from scoped config context (more reliable)
@@ -172,8 +179,11 @@ def get_cloud_connector_version(
 )
 def set_cloud_connector_version_override(
     workspace_id: Annotated[
-        str,
-        Field(description="The Airbyte Cloud workspace ID."),
+        str | WorkspaceAliasEnum,
+        Field(
+            description="The Airbyte Cloud workspace ID (UUID) or alias. "
+            "Accepts '@devin-ai-sandbox' as an alias for the Devin AI sandbox workspace."
+        ),
     ],
     actor_id: Annotated[
         str, "The ID of the deployed connector (source or destination)"
@@ -264,6 +274,10 @@ def set_cloud_connector_version_override(
     2. HTTP headers: X-Airbyte-Cloud-Client-Id, X-Airbyte-Cloud-Client-Secret
     3. Environment variables: AIRBYTE_CLOUD_CLIENT_ID, AIRBYTE_CLOUD_CLIENT_SECRET
     """
+    # Resolve workspace ID alias (workspace_id is required, so resolved value is never None)
+    resolved_workspace_id = WorkspaceAliasEnum.resolve(workspace_id)
+    assert resolved_workspace_id is not None  # Type narrowing: workspace_id is required
+
     # Validate admin access (check env var flag)
     try:
         require_internal_admin_flag_only()
@@ -351,7 +365,7 @@ def set_cloud_connector_version_override(
         current_version_data = api_client.get_connector_version(
             connector_id=actor_id,
             connector_type=actor_type,
-            api_root=constants.CLOUD_CONFIG_API_ROOT,  # Use Config API
+            config_api_root=constants.CLOUD_CONFIG_API_ROOT,
             client_id=auth.client_id,
             client_secret=auth.client_secret,
             bearer_token=auth.bearer_token,
@@ -372,10 +386,10 @@ def set_cloud_connector_version_override(
         result = api_client.set_connector_version_override(
             connector_id=actor_id,
             connector_type=actor_type,
-            api_root=constants.CLOUD_CONFIG_API_ROOT,  # Use Config API
+            config_api_root=constants.CLOUD_CONFIG_API_ROOT,
             client_id=auth.client_id,
             client_secret=auth.client_secret,
-            workspace_id=workspace_id,
+            workspace_id=resolved_workspace_id,
             version=version,
             unset=unset,
             override_reason=enhanced_override_reason,
@@ -388,7 +402,7 @@ def set_cloud_connector_version_override(
         updated_version_data = api_client.get_connector_version(
             connector_id=actor_id,
             connector_type=actor_type,
-            api_root=constants.CLOUD_CONFIG_API_ROOT,  # Use Config API
+            config_api_root=constants.CLOUD_CONFIG_API_ROOT,
             client_id=auth.client_id,
             client_secret=auth.client_secret,
             bearer_token=auth.bearer_token,
@@ -443,8 +457,11 @@ def set_cloud_connector_version_override(
 )
 def set_workspace_connector_version_override(
     workspace_id: Annotated[
-        str,
-        Field(description="The Airbyte Cloud workspace ID."),
+        str | WorkspaceAliasEnum,
+        Field(
+            description="The Airbyte Cloud workspace ID (UUID) or alias. "
+            "Accepts '@devin-ai-sandbox' as an alias for the Devin AI sandbox workspace."
+        ),
     ],
     connector_name: Annotated[
         str,
@@ -527,6 +544,10 @@ def set_workspace_connector_version_override(
     You must specify EXACTLY ONE of `version` OR `unset=True`, but not both.
     When setting a version, `override_reason` is required.
     """
+    # Resolve workspace ID alias (workspace_id is required, so resolved value is never None)
+    resolved_workspace_id = WorkspaceAliasEnum.resolve(workspace_id)
+    assert resolved_workspace_id is not None  # Type narrowing: workspace_id is required
+
     # Validate admin access (check env var flag)
     try:
         require_internal_admin_flag_only()
@@ -534,7 +555,7 @@ def set_workspace_connector_version_override(
         return WorkspaceVersionOverrideResult(
             success=False,
             message=f"Admin authentication failed: {e}",
-            workspace_id=workspace_id,
+            workspace_id=resolved_workspace_id,
             connector_name=connector_name,
             connector_type=connector_type,
         )
@@ -568,7 +589,7 @@ def set_workspace_connector_version_override(
         return WorkspaceVersionOverrideResult(
             success=False,
             message="Authorization validation failed: " + "; ".join(validation_errors),
-            workspace_id=workspace_id,
+            workspace_id=resolved_workspace_id,
             connector_name=connector_name,
             connector_type=connector_type,
         )
@@ -580,7 +601,7 @@ def set_workspace_connector_version_override(
         return WorkspaceVersionOverrideResult(
             success=False,
             message=f"Failed to parse approval comment URL: {e}",
-            workspace_id=workspace_id,
+            workspace_id=resolved_workspace_id,
             connector_name=connector_name,
             connector_type=connector_type,
         )
@@ -588,7 +609,7 @@ def set_workspace_connector_version_override(
         return WorkspaceVersionOverrideResult(
             success=False,
             message=f"Failed to fetch approval comment from GitHub: {e}",
-            workspace_id=workspace_id,
+            workspace_id=resolved_workspace_id,
             connector_name=connector_name,
             connector_type=connector_type,
         )
@@ -596,7 +617,7 @@ def set_workspace_connector_version_override(
         return WorkspaceVersionOverrideResult(
             success=False,
             message=str(e),
-            workspace_id=workspace_id,
+            workspace_id=resolved_workspace_id,
             connector_name=connector_name,
             connector_type=connector_type,
         )
@@ -616,10 +637,10 @@ def set_workspace_connector_version_override(
         auth = _resolve_cloud_auth()
 
         result = api_client.set_workspace_connector_version_override(
-            workspace_id=workspace_id,
+            workspace_id=resolved_workspace_id,
             connector_name=connector_name,
             connector_type=connector_type,
-            api_root=constants.CLOUD_CONFIG_API_ROOT,
+            config_api_root=constants.CLOUD_CONFIG_API_ROOT,
             client_id=auth.client_id,
             client_secret=auth.client_secret,
             bearer_token=auth.bearer_token,
@@ -641,7 +662,7 @@ def set_workspace_connector_version_override(
         return WorkspaceVersionOverrideResult(
             success=True,
             message=message,
-            workspace_id=workspace_id,
+            workspace_id=resolved_workspace_id,
             connector_name=connector_name,
             connector_type=connector_type,
             version=version if not unset else None,
@@ -651,7 +672,7 @@ def set_workspace_connector_version_override(
         return WorkspaceVersionOverrideResult(
             success=False,
             message=str(e),
-            workspace_id=workspace_id,
+            workspace_id=resolved_workspace_id,
             connector_name=connector_name,
             connector_type=connector_type,
         )
@@ -659,7 +680,7 @@ def set_workspace_connector_version_override(
         return WorkspaceVersionOverrideResult(
             success=False,
             message=f"Authentication failed: {e}",
-            workspace_id=workspace_id,
+            workspace_id=resolved_workspace_id,
             connector_name=connector_name,
             connector_type=connector_type,
         )
@@ -848,7 +869,7 @@ def set_organization_connector_version_override(
             organization_id=organization_id,
             connector_name=connector_name,
             connector_type=connector_type,
-            api_root=constants.CLOUD_CONFIG_API_ROOT,
+            config_api_root=constants.CLOUD_CONFIG_API_ROOT,
             client_id=auth.client_id,
             client_secret=auth.client_secret,
             bearer_token=auth.bearer_token,

airbyte_ops_mcp/mcp/prod_db_queries.py

@@ -16,12 +16,13 @@ from airbyte.exceptions import PyAirbyteInputError
 from fastmcp import FastMCP
 from pydantic import BaseModel, Field
 
-from airbyte_ops_mcp.constants import OrganizationAliasEnum
+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,
     query_connections_by_destination_connector,
+    query_connections_by_stream,
     query_connector_versions,
     query_dataplanes_list,
     query_destination_connection_stats,
@@ -299,8 +300,11 @@ def query_prod_dataplanes() -> list[dict[str, Any]]:
 )
 def query_prod_workspace_info(
     workspace_id: Annotated[
-        str,
-        Field(description="Workspace UUID to look up"),
+        str | WorkspaceAliasEnum,
+        Field(
+            description="Workspace UUID or alias to look up. "
+            "Accepts '@devin-ai-sandbox' as an alias for the Devin AI sandbox workspace."
+        ),
     ],
 ) -> dict[str, Any] | None:
     """Get workspace information including dataplane group.
@@ -313,7 +317,11 @@ def query_prod_workspace_info(
     dataplane_group_id, dataplane_name, created_at, tombstone
     Or None if workspace not found.
     """
-    return query_workspace_info(workspace_id)
+    # Resolve workspace ID alias (workspace_id is required, so resolved value is never None)
+    resolved_workspace_id = WorkspaceAliasEnum.resolve(workspace_id)
+    assert resolved_workspace_id is not None  # Type narrowing: workspace_id is required
+
+    return query_workspace_info(resolved_workspace_id)
 
 
 @mcp_tool(
@@ -868,6 +876,122 @@ def query_prod_connections_by_connector(
     ]
 
 
+@mcp_tool(
+    read_only=True,
+    idempotent=True,
+    open_world=True,
+)
+def query_prod_connections_by_stream(
+    stream_name: Annotated[
+        str,
+        Field(
+            description=(
+                "Name of the stream to search for in connection catalogs. "
+                "This must match the exact stream name as configured in the connection. "
+                "Examples: 'global_exclusions', 'campaigns', 'users'."
+            ),
+        ),
+    ],
+    source_definition_id: Annotated[
+        str | None,
+        Field(
+            description=(
+                "Source connector definition ID (UUID) to search for. "
+                "Provide this OR source_canonical_name (exactly one required). "
+                "Example: 'afa734e4-3571-11ec-991a-1e0031268139' for YouTube Analytics."
+            ),
+            default=None,
+        ),
+    ],
+    source_canonical_name: Annotated[
+        str | None,
+        Field(
+            description=(
+                "Canonical source connector name to search for. "
+                "Provide this OR source_definition_id (exactly one required). "
+                "Examples: 'source-klaviyo', 'Klaviyo', 'source-youtube-analytics'."
+            ),
+            default=None,
+        ),
+    ],
+    organization_id: Annotated[
+        str | OrganizationAliasEnum | None,
+        Field(
+            description=(
+                "Optional organization ID (UUID) or alias to filter results. "
+                "If provided, only connections in this organization will be returned. "
+                "Accepts '@airbyte-internal' as an alias for the Airbyte internal org."
+            ),
+            default=None,
+        ),
+    ],
+    limit: Annotated[
+        int,
+        Field(description="Maximum number of results (default: 100)", default=100),
+    ],
+) -> list[dict[str, Any]]:
+    """Find connections that have a specific stream enabled in their catalog.
+
+    This tool searches the connection's configured catalog (JSONB) for streams
+    matching the specified name. It's particularly useful when validating
+    connector fixes that affect specific streams - you can quickly find
+    customer connections that use the affected stream.
+
+    Use cases:
+    - Finding connections with a specific stream enabled for regression testing
+    - Validating connector fixes that affect particular streams
+    - Identifying which customers use rarely-enabled streams
+
+    Returns a list of connection dicts with workspace context and clickable Cloud UI URLs.
+    """
+    provided_params = [source_definition_id, source_canonical_name]
+    num_provided = sum(p is not None for p in provided_params)
+    if num_provided != 1:
+        raise PyAirbyteInputError(
+            message=(
+                "Exactly one of source_definition_id or source_canonical_name "
+                "must be provided."
+            ),
+        )
+
+    resolved_definition_id: str
+    if source_canonical_name:
+        resolved_definition_id = _resolve_canonical_name_to_definition_id(
+            canonical_name=source_canonical_name,
+        )
+    else:
+        assert source_definition_id is not None
+        resolved_definition_id = source_definition_id
+
+    resolved_organization_id = OrganizationAliasEnum.resolve(organization_id)
+
+    return [
+        {
+            "organization_id": str(row.get("organization_id", "")),
+            "workspace_id": str(row["workspace_id"]),
+            "workspace_name": row.get("workspace_name", ""),
+            "connection_id": str(row["connection_id"]),
+            "connection_name": row.get("connection_name", ""),
+            "connection_status": row.get("connection_status", ""),
+            "connection_url": (
+                f"{CLOUD_UI_BASE_URL}/workspaces/{row['workspace_id']}"
+                f"/connections/{row['connection_id']}/status"
+            ),
+            "source_id": str(row["source_id"]),
+            "source_name": row.get("source_name", ""),
+            "source_definition_id": str(row["source_definition_id"]),
+            "dataplane_group_id": str(row.get("dataplane_group_id", "")),
+            "dataplane_name": row.get("dataplane_name", ""),
+        }
+        for row in query_connections_by_stream(
+            connector_definition_id=resolved_definition_id,
+            stream_name=stream_name,
+            organization_id=resolved_organization_id,
+            limit=limit,
+        )
+    ]
+
+
 @mcp_tool(
     read_only=True,
     idempotent=True,

airbyte_ops_mcp/mcp/regression_tests.py

@@ -31,6 +31,7 @@ from airbyte.exceptions import (
 from fastmcp import FastMCP
 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
@@ -341,9 +342,10 @@ def run_regression_tests(
         "Ignored if skip_compare=True.",
     ] = None,
     workspace_id: Annotated[
-        str | None,
-        "Optional Airbyte Cloud workspace ID. If provided with connection_id, validates "
-        "that the connection belongs to this workspace before triggering tests.",
+        str | WorkspaceAliasEnum | None,
+        "Optional Airbyte Cloud workspace ID (UUID) or alias. If provided with connection_id, "
+        "validates that the connection belongs to this workspace before triggering tests. "
+        "Accepts '@devin-ai-sandbox' as an alias for the Devin AI sandbox workspace.",
     ] = None,
 ) -> RunRegressionTestsResponse:
     """Start a regression test run via GitHub Actions workflow.
@@ -368,6 +370,9 @@ def run_regression_tests(
     Requires GITHUB_CI_WORKFLOW_TRIGGER_PAT or GITHUB_TOKEN environment variable
     with 'actions:write' permission.
     """
+    # Resolve workspace ID alias
+    resolved_workspace_id = WorkspaceAliasEnum.resolve(workspace_id)
+
     # Generate a unique run ID for tracking
     run_id = str(uuid.uuid4())
 
@@ -383,9 +388,9 @@ def run_regression_tests(
         )
 
     # Validate workspace membership if workspace_id and connection_id are provided
-    if workspace_id and connection_id:
+    if resolved_workspace_id and connection_id:
         try:
-            validate_connection_workspace(connection_id, workspace_id)
+            validate_connection_workspace(connection_id, resolved_workspace_id)
         except (
             ValueError,
             AirbyteWorkspaceMismatchError,

airbyte_ops_mcp/{_legacy/airbyte_ci/metadata_service/validators/metadata_validator.py → metadata_validator.py}

@@ -1,6 +1,12 @@
 #
 # Copyright (c) 2023 Airbyte, Inc., all rights reserved.
 #
+"""Connector metadata validation for Airbyte connectors.
+
+Provides validation functions for connector metadata.yaml files, including checks
+for Docker image availability, version constraints, breaking changes, and registry
+configuration. Uses Pydantic models from airbyte-connector-models for schema validation.
+"""
 
 import logging
 import pathlib
@@ -9,14 +15,13 @@ from typing import Callable, List, Optional, Tuple, Union
 
 import semver
 import yaml
+from airbyte_connector_models.metadata.v0.connector_metadata_definition_v0 import (
+    ConnectorMetadataDefinitionV0,
+)
 from pydantic import ValidationError
 from pydash.objects import get
 
-from airbyte_ops_mcp._legacy.airbyte_ci.metadata_models.generated.ConnectorMetadataDefinitionV0 import (
-    ConnectorMetadataDefinitionV0,
-)  # type: ignore
-
-from ..docker_hub import get_latest_version_on_dockerhub, is_image_on_docker_hub
+from .docker_hub import get_latest_version_on_dockerhub, is_image_on_docker_hub
 
 logger = logging.getLogger(__name__)
 
@@ -42,7 +47,7 @@ def validate_metadata_images_in_dockerhub(
     if validator_opts.disable_dockerhub_checks:
         return True, None
 
-    metadata_definition_dict = metadata_definition.dict()
+    metadata_definition_dict = metadata_definition.model_dump(exclude_unset=True)
     base_docker_image = get(metadata_definition_dict, "data.dockerRepository")
     base_docker_version = get(metadata_definition_dict, "data.dockerImageTag")
 
@@ -111,7 +116,7 @@ def validate_at_least_one_language_tag(
 ) -> ValidationResult:
     """Ensure that there is at least one tag in the data.tags field that matches language:<LANG>."""
     tags = get(metadata_definition, "data.tags", [])
-    if not any([tag.startswith("language:") for tag in tags]):
+    if not any(tag.startswith("language:") for tag in tags):
         return False, "At least one tag must be of the form language:<LANG>"
 
     return True, None
@@ -145,7 +150,7 @@ def validate_major_version_bump_has_breaking_change_entry(
     _validator_opts: ValidatorOptions,
 ) -> ValidationResult:
     """Ensure that if the major version is incremented, there is a breaking change entry for that version."""
-    metadata_definition_dict = metadata_definition.dict()
+    metadata_definition_dict = metadata_definition.model_dump(exclude_unset=True)
     image_tag = get(metadata_definition_dict, "data.dockerImageTag")
 
     if not is_major_version(image_tag):
@@ -169,7 +174,7 @@ def validate_major_version_bump_has_breaking_change_entry(
         )
 
     breaking_changes = get(metadata_definition_dict, "data.releases.breakingChanges")
-    if breaking_changes is None or image_tag not in breaking_changes.keys():
+    if breaking_changes is None or image_tag not in breaking_changes:
         return (
             False,
             f"Major version {image_tag} needs a 'releases.breakingChanges' entry indicating what changed.",
@@ -194,7 +199,7 @@ def validate_metadata_base_images_in_dockerhub(
     if validator_opts.disable_dockerhub_checks:
         return True, None
 
-    metadata_definition_dict = metadata_definition.dict()
+    metadata_definition_dict = metadata_definition.model_dump(exclude_unset=True)
 
     image_address = get(
         metadata_definition_dict, "data.connectorBuildOptions.baseImage"
@@ -365,7 +370,8 @@ PRE_UPLOAD_VALIDATORS = [
 ]
 
 
-POST_UPLOAD_VALIDATORS = PRE_UPLOAD_VALIDATORS + [
+POST_UPLOAD_VALIDATORS = [
+    *PRE_UPLOAD_VALIDATORS,
     validate_metadata_images_in_dockerhub,
 ]
 
@@ -384,7 +390,7 @@ def validate_and_load(
     try:
         # Load the metadata file - this implicitly runs jsonschema validation
         metadata = yaml.safe_load(file_path.read_text())
-        metadata_model = ConnectorMetadataDefinitionV0.parse_obj(metadata)
+        metadata_model = ConnectorMetadataDefinitionV0.model_validate(metadata)
     except ValidationError as e:
         return None, f"Validation error: {e}"
 

airbyte_ops_mcp/prod_db_access/queries.py

@@ -24,6 +24,8 @@ from airbyte_ops_mcp.prod_db_access.sql import (
     SELECT_CONNECTIONS_BY_CONNECTOR_AND_ORG,
     SELECT_CONNECTIONS_BY_DESTINATION_CONNECTOR,
     SELECT_CONNECTIONS_BY_DESTINATION_CONNECTOR_AND_ORG,
+    SELECT_CONNECTIONS_BY_SOURCE_CONNECTOR_AND_STREAM,
+    SELECT_CONNECTIONS_BY_SOURCE_CONNECTOR_AND_STREAM_AND_ORG,
     SELECT_CONNECTOR_VERSIONS,
     SELECT_DATAPLANES_LIST,
     SELECT_DESTINATION_CONNECTION_STATS,
@@ -565,3 +567,52 @@ def query_destination_connection_stats(
         query_name="SELECT_DESTINATION_CONNECTION_STATS",
         gsm_client=gsm_client,
     )
+
+
+def query_connections_by_stream(
+    connector_definition_id: str,
+    stream_name: str,
+    organization_id: str | None = None,
+    limit: int = 100,
+    *,
+    gsm_client: secretmanager.SecretManagerServiceClient | None = None,
+) -> list[dict[str, Any]]:
+    """Query connections by source connector type that have a specific stream enabled.
+
+    This searches the connection's configured catalog (JSONB) for streams matching
+    the specified name. Useful for finding connections that use a particular stream
+    when validating connector fixes that affect specific streams.
+
+    Args:
+        connector_definition_id: Source connector definition UUID to filter by
+        stream_name: Name of the stream to search for in the connection's catalog
+        organization_id: Optional organization UUID to filter results by
+        limit: Maximum number of results (default: 100)
+        gsm_client: GCP Secret Manager client. If None, a new client will be instantiated.
+
+    Returns:
+        List of connection records with workspace and dataplane info
+    """
+    if organization_id is None:
+        return _run_sql_query(
+            SELECT_CONNECTIONS_BY_SOURCE_CONNECTOR_AND_STREAM,
+            parameters={
+                "connector_definition_id": connector_definition_id,
+                "stream_name": stream_name,
+                "limit": limit,
+            },
+            query_name="SELECT_CONNECTIONS_BY_SOURCE_CONNECTOR_AND_STREAM",
+            gsm_client=gsm_client,
+        )
+
+    return _run_sql_query(
+        SELECT_CONNECTIONS_BY_SOURCE_CONNECTOR_AND_STREAM_AND_ORG,
+        parameters={
+            "connector_definition_id": connector_definition_id,
+            "stream_name": stream_name,
+            "organization_id": organization_id,
+            "limit": limit,
+        },
+        query_name="SELECT_CONNECTIONS_BY_SOURCE_CONNECTOR_AND_STREAM_AND_ORG",
+        gsm_client=gsm_client,
+    )