airbyte-agent-mcp 0.1.30__py3-none-any.whl → 0.1.53__py3-none-any.whl

airbyte_agent_mcp/_vendored/connector_sdk/cloud_utils/__init__.py

@@ -0,0 +1,5 @@
+"""Cloud API utilities for Airbyte Platform integration."""
+
+from .client import AirbyteCloudClient
+
+__all__ = ["AirbyteCloudClient"]

airbyte_agent_mcp/_vendored/connector_sdk/cloud_utils/client.py

@@ -0,0 +1,213 @@
+"""AirbyteCloudClient for Airbyte Platform API integration."""
+
+from __future__ import annotations
+
+from datetime import datetime, timedelta
+from typing import Any
+
+import httpx
+
+
+class AirbyteCloudClient:
+    """Client for interacting with Airbyte Platform APIs.
+
+    Handles authentication, token caching, and API calls to:
+    - Get bearer tokens for authentication
+    - Look up connector instances for users
+    - Execute connectors via the cloud API
+
+    Example:
+        client = AirbyteCloudClient(
+            client_id="your-client-id",
+            client_secret="your-client-secret"
+        )
+
+        # Get a connector instance
+        instance_id = await client.get_connector_instance_id(
+            external_user_id="user-123",
+            connector_definition_id="stripe-def-456"
+        )
+
+        # Execute the connector
+        result = await client.execute_connector(
+            instance_id=instance_id,
+            entity="customers",
+            action="list",
+            params={"limit": 10}
+        )
+    """
+
+    AUTH_BASE_URL = "https://cloud.airbyte.com"  # For token endpoint
+    API_BASE_URL = "https://api.airbyte.ai"  # For instance lookup & execution
+
+    def __init__(self, client_id: str, client_secret: str):
+        """Initialize AirbyteCloudClient.
+
+        Args:
+            client_id: Airbyte client ID for authentication
+            client_secret: Airbyte client secret for authentication
+        """
+        self._client_id = client_id
+        self._client_secret = client_secret
+
+        # Token cache (instance-level)
+        self._cached_token: str | None = None
+        self._token_expires_at: datetime | None = None
+        self._http_client = httpx.AsyncClient(
+            timeout=httpx.Timeout(300.0),  # 5 minute timeout
+            follow_redirects=True,
+        )
+
+    async def get_bearer_token(self) -> str:
+        """Get bearer token for API authentication.
+
+        Caches the token and only requests a new one when the cached token
+        is expired or missing. Adds a 60-second buffer before expiration
+        to avoid edge cases.
+
+        Returns:
+            Bearer token string
+
+        Raises:
+            httpx.HTTPStatusError: If the token request fails with 4xx/5xx
+            httpx.RequestError: If the network request fails
+
+        Example:
+            token = await client.get_bearer_token()
+            # Use token in Authorization header: f"Bearer {token}"
+        """
+        # Check if we have a cached token that hasn't expired
+        if self._cached_token and self._token_expires_at:
+            # Add 60 second buffer before expiration to avoid edge cases
+            now = datetime.now()
+            if now < self._token_expires_at:
+                # Token is still valid, return cached version
+                return self._cached_token
+
+        # Token is missing or expired, fetch a new one
+        url = f"{self.AUTH_BASE_URL}/api/v1/applications/token"
+        request_body = {
+            "client_id": self._client_id,
+            "client_secret": self._client_secret,
+        }
+
+        response = await self._http_client.post(url, json=request_body)
+        response.raise_for_status()
+
+        data = response.json()
+        access_token = data["access_token"]
+        expires_in = 15 * 60  # default 15 min expiry time * 60 seconds
+
+        # Calculate expiration time with 60 second buffer
+        expires_at = datetime.now() + timedelta(seconds=expires_in - 60)
+        self._cached_token = access_token
+        self._token_expires_at = expires_at
+
+        return access_token
+
+    async def get_connector_instance_id(
+        self,
+        external_user_id: str,
+        connector_definition_id: str,
+    ) -> str:
+        """Get connector instance ID for a user.
+
+        Looks up the connector instance that belongs to the specified user
+        and connector definition. Validates that exactly one instance exists.
+
+        Args:
+            external_user_id: User identifier in the Airbyte system
+            connector_definition_id: UUID of the connector definition
+
+        Returns:
+            Connector instance ID (UUID string)
+
+        Raises:
+            ValueError: If 0 or more than 1 instance is found
+            httpx.HTTPStatusError: If API returns 4xx/5xx status code
+            httpx.RequestError: If network request fails
+
+        Example:
+            instance_id = await client.get_connector_instance_id(
+                external_user_id="user-123",
+                connector_definition_id="550e8400-e29b-41d4-a716-446655440000"
+            )
+        """
+
+        token = await self.get_bearer_token()
+        url = f"{self.API_BASE_URL}/api/v1/connectors/instances_for_user"
+        params = {
+            "external_user_id": external_user_id,
+            "definition_id": connector_definition_id,
+        }
+
+        headers = {"Authorization": f"Bearer {token}"}
+        response = await self._http_client.get(url, params=params, headers=headers)
+        response.raise_for_status()
+
+        data = response.json()
+        instances = data["instances"]
+
+        if len(instances) == 0:
+            raise ValueError(f"No connector instance found for user '{external_user_id}' " f"and connector '{connector_definition_id}'")
+
+        if len(instances) > 1:
+            raise ValueError(
+                f"Multiple connector instances found for user '{external_user_id}' "
+                f"and connector '{connector_definition_id}'. Expected exactly 1, "
+                f"found {len(instances)}"
+            )
+
+        instance_id = instances[0]["id"]
+        return instance_id
+
+    async def execute_connector(
+        self,
+        instance_id: str,
+        entity: str,
+        action: str,
+        params: dict[str, Any] | None,
+    ) -> dict[str, Any]:
+        """Execute a connector operation.
+
+        Args:
+            instance_id: Connector instance UUID
+            entity: Entity name (e.g., "customers", "invoices")
+            action: Operation action (e.g., "list", "get", "create")
+            params: Optional parameters for the operation
+
+        Returns:
+            Raw JSON response dict from the API
+
+        Raises:
+            httpx.HTTPStatusError: If API returns 4xx/5xx status code
+            httpx.RequestError: If network request fails
+
+        Example:
+            result = await client.execute_connector(
+                instance_id="inst-123",
+                entity="customers",
+                action="list",
+                params={"limit": 10}
+            )
+        """
+        token = await self.get_bearer_token()
+        url = f"{self.API_BASE_URL}/api/v1/connectors/instances/{instance_id}/execute"
+        headers = {"Authorization": f"Bearer {token}"}
+        request_body = {
+            "entity": entity,
+            "action": action,
+            "params": params,
+        }
+
+        response = await self._http_client.post(url, json=request_body, headers=headers)
+        response.raise_for_status()
+
+        return response.json()
+
+    async def close(self):
+        """Close the HTTP client.
+
+        Call this when you're done using the client to clean up resources.
+        """
+        await self._http_client.aclose()

airbyte_agent_mcp/_vendored/connector_sdk/connector_model_loader.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import re
 from pathlib import Path
 from typing import Any
+from uuid import UUID
 
 import jsonref
 import yaml
@@ -105,7 +106,7 @@ def resolve_schema_refs(schema: Any, spec_dict: dict) -> dict[str, Any]:
 
     try:
         # Resolve all references
-        resolved_spec = jsonref.replace_refs(
+        resolved_spec = jsonref.replace_refs(  # type: ignore[union-attr]
             temp_spec,
             base_uri="",
             jsonschema=True,  # Use JSONSchema draft 7 semantics
@@ -117,9 +118,11 @@ def resolve_schema_refs(schema: Any, spec_dict: dict) -> dict[str, Any]:
 
         # Remove any remaining jsonref proxy objects by converting to plain dict
         return _deproxy_schema(resolved_schema)
-    except (jsonref.JsonRefError, KeyError, RecursionError):
+    except (AttributeError, KeyError, RecursionError, Exception):
         # If resolution fails, return the original schema
         # This allows the system to continue even with malformed $refs
+        # AttributeError covers the case where jsonref might be None
+        # Exception catches jsonref.JsonRefError and other jsonref exceptions
         return schema_dict
 
 
@@ -390,23 +393,35 @@ def convert_openapi_to_connector_model(spec: OpenAPIConnector) -> ConnectorModel
     for entity_name, endpoints_dict in entities_map.items():
         actions = list(endpoints_dict.keys())
 
-        # Get schema from components if available
+        # Get schema and stream_name from components if available
         schema = None
+        entity_stream_name = None
         if spec.components:
             # Look for a schema matching the entity name
             for schema_name, schema_def in spec.components.schemas.items():
                 if schema_def.x_airbyte_entity_name == entity_name or schema_name.lower() == entity_name.lower():
                     schema = schema_def.model_dump(by_alias=True)
+                    entity_stream_name = schema_def.x_airbyte_stream_name
                     break
 
-        entity = EntityDefinition(name=entity_name, actions=actions, endpoints=endpoints_dict, schema=schema)
+        entity = EntityDefinition(
+            name=entity_name,
+            stream_name=entity_stream_name,
+            actions=actions,
+            endpoints=endpoints_dict,
+            schema=schema,
+        )
         entities.append(entity)
 
     # Extract retry config from x-airbyte-retry-config extension
     retry_config = spec.info.x_airbyte_retry_config
+    connector_id = spec.info.x_airbyte_connector_id
+    if not connector_id:
+        raise InvalidOpenAPIError("Missing required x-airbyte-connector-id field")
 
     # Create ConnectorModel
     model = ConnectorModel(
+        id=connector_id,
         name=name,
         version=version,
         base_url=base_url,
@@ -926,8 +941,20 @@ def load_connector_model(definition_path: str | Path) -> ConnectorModel:
         )
         entities.append(entity)
 
+    # Get connector ID
+    connector_id_value = connector_meta.get("id")
+    if connector_id_value:
+        # Try to parse as UUID (handles string UUIDs)
+        if isinstance(connector_id_value, str):
+            connector_id = UUID(connector_id_value)
+        else:
+            connector_id = connector_id_value
+    else:
+        raise ValueError
+
     # Build ConnectorModel
     model = ConnectorModel(
+        id=connector_id,
         name=connector_meta["name"],
         version=connector_meta.get("version", OPENAPI_DEFAULT_VERSION),
         base_url=raw_definition.get("base_url", connector_meta.get("base_url", "")),

airbyte_agent_mcp/_vendored/connector_sdk/constants.py

@@ -74,5 +74,5 @@ except PackageNotFoundError:
     SDK_VERSION = "0.0.0-dev"
 """Current version of the Airbyte SDK."""
 
-MINIMUM_PYTHON_VERSION = "3.9"
+MINIMUM_PYTHON_VERSION = "3.13"
 """Minimum Python version required to run the SDK."""

airbyte_agent_mcp/_vendored/connector_sdk/executor/hosted_executor.py

@@ -1,12 +1,11 @@
-"""Hosted executor for proxying operations through the backend API."""
+"""Hosted executor for proxying operations through the cloud API."""
 
 from __future__ import annotations
 
-import os
-
-import httpx
 from opentelemetry import trace
 
+from ..cloud_utils import AirbyteCloudClient
+
 from .models import (
     ExecutionConfig,
     ExecutionResult,
@@ -14,30 +13,36 @@ from .models import (
 
 
 class HostedExecutor:
-    """Executor that proxies execution through the Sonar backend API.
+    """Executor that proxies execution through the Airbyte Cloud API.
 
-    This is the "hosted mode" executor that makes HTTP calls to the backend API
-    instead of directly calling external services. The backend handles all
+    This is the "hosted mode" executor that makes HTTP calls to the cloud API
+    instead of directly calling external services. The cloud API handles all
     connector logic, secrets management, and execution.
 
-    The API URL is configured at initialization via the api_url parameter,
-    which defaults to the AIRBYTE_CONNECTOR_API_URL environment variable.
+    The executor takes an external_user_id and uses the AirbyteCloudClient to:
+    1. Authenticate with the Airbyte Platform (bearer token with caching)
+    2. Look up the user's connector instance
+    3. Execute the connector operation via the cloud API
 
     Implements ExecutorProtocol.
 
     Example:
+        # Create executor with user ID, credentials, and connector definition ID
         executor = HostedExecutor(
-            connector_id="stripe-prod-123",
+            external_user_id="user-123",
             airbyte_client_id="client_abc123",
-            airbyte_client_secret="secret_xyz789"
+            airbyte_client_secret="secret_xyz789",
+            connector_definition_id="abc123-def456-ghi789",
         )
 
-        config = ExecutionConfig(
+        # Execute an operation
+        execution_config = ExecutionConfig(
             entity="customers",
-            action="list"
+            action="list",
+            params={"limit": 10}
         )
 
-        result = await executor.execute(config)
+        result = await executor.execute(execution_config)
         if result.success:
             print(f"Data: {result.data}")
         else:
@@ -46,53 +51,45 @@ class HostedExecutor:
 
     def __init__(
         self,
-        connector_id: str,
+        external_user_id: str,
         airbyte_client_id: str,
         airbyte_client_secret: str,
-        api_url: str | None = None,
+        connector_definition_id: str,
     ):
         """Initialize hosted executor.
 
         Args:
-            connector_id: ID of the connector to execute (e.g., "stripe-prod-123")
+            external_user_id: User identifier in the Airbyte system
             airbyte_client_id: Airbyte client ID for authentication
             airbyte_client_secret: Airbyte client secret for authentication
-            api_url: API URL for the hosted executor backend. Defaults to
-                AIRBYTE_CONNECTOR_API_URL environment variable or "http://localhost:8001"
+            connector_definition_id: Connector definition ID used to look up
+                the user's connector instance.
 
         Example:
             executor = HostedExecutor(
-                connector_id="my-connector-id",
-                airbyte_client_id="client_abc123",
-                airbyte_client_secret="secret_xyz789"
-            )
-
-            # Or with custom API URL:
-            executor = HostedExecutor(
-                connector_id="my-connector-id",
+                external_user_id="user-123",
                 airbyte_client_id="client_abc123",
                 airbyte_client_secret="secret_xyz789",
-                api_url="https://api.production.com"
+                connector_definition_id="abc123-def456-ghi789",
             )
         """
-        self.connector_id = connector_id
-        self.airbyte_client_id = airbyte_client_id
-        self.airbyte_client_secret = airbyte_client_secret
-        self.api_url = api_url or os.getenv("AIRBYTE_CONNECTOR_API_URL", "http://localhost:8001")
-
-        # Create synchronous HTTP client
-        # We use sync client even though execute() is async for simplicity
-        # The async wrapper allows it to work with the protocol
-        self.client = httpx.Client(
-            timeout=httpx.Timeout(300.0),  # 5 minute timeout
-            follow_redirects=True,
+        self._external_user_id = external_user_id
+        self._connector_definition_id = connector_definition_id
+
+        # Create AirbyteCloudClient for API interactions
+        self._cloud_client = AirbyteCloudClient(
+            client_id=airbyte_client_id,
+            client_secret=airbyte_client_secret,
         )
 
     async def execute(self, config: ExecutionConfig) -> ExecutionResult:
-        """Execute connector via backend API (ExecutorProtocol implementation).
+        """Execute connector via cloud API (ExecutorProtocol implementation).
 
-        Makes an HTTP POST request to /connectors/{connector_id}/execute with
-        OAuth authentication and the configuration in the request body.
+        Flow:
+        1. Get connector id from connector model
+        2. Look up the user's connector instance ID
+        3. Execute the connector operation via the cloud API
+        4. Parse the response into ExecutionResult
 
         Args:
             config: Execution configuration (entity, action, params)
@@ -101,88 +98,100 @@ class HostedExecutor:
             ExecutionResult with success/failure status
 
         Raises:
+            ValueError: If no instance or multiple instances found for user
             httpx.HTTPStatusError: If API returns 4xx/5xx status code
             httpx.RequestError: If network request fails
 
         Example:
             config = ExecutionConfig(
                 entity="customers",
-                action="list"
+                action="list",
+                params={"limit": 10}
             )
             result = await executor.execute(config)
         """
         tracer = trace.get_tracer("airbyte.connector-sdk.executor.hosted")
 
         with tracer.start_as_current_span("airbyte.hosted_executor.execute") as span:
-            # Add span attributes
-            span.set_attribute("connector.id", self.connector_id)
+            # Add span attributes for observability
+            span.set_attribute("connector.definition_id", self._connector_definition_id)
             span.set_attribute("connector.entity", config.entity)
             span.set_attribute("connector.action", config.action)
-            span.set_attribute("connector.api_url", self.api_url)
+            span.set_attribute("user.external_id", self._external_user_id)
             if config.params:
                 # Only add non-sensitive param keys
                 span.set_attribute("connector.param_keys", list(config.params.keys()))
 
-            # Build API URL from instance api_url
-            url = f"{self.api_url}/connectors/{self.connector_id}/execute"
-            span.set_attribute("http.url", url)
-
-            # Build request body matching ExecutionRequest model
-            # Extract entity, action, and params from config attributes
-            request_body = {
-                "entity": config.entity,
-                "action": config.action,
-                "params": config.params,
-            }
-
             try:
-                # Make synchronous HTTP request
-                # (wrapped in async method for protocol compatibility)
-                response = self.client.post(url, json=request_body)
+                # Step 1: Get connector definition id
+                connector_definition_id = self._connector_definition_id
+
+                # Step 2: Get the connector instance ID for this user
+                instance_id = await self._cloud_client.get_connector_instance_id(
+                    external_user_id=self._external_user_id,
+                    connector_definition_id=connector_definition_id,
+                )
 
-                # Add response status code to span
-                span.set_attribute("http.status_code", response.status_code)
+                span.set_attribute("connector.instance_id", instance_id)
 
-                # Raise exception for 4xx/5xx status codes
-                response.raise_for_status()
+                # Step 3: Execute the connector via the cloud API
+                response = await self._cloud_client.execute_connector(
+                    instance_id=instance_id,
+                    entity=config.entity,
+                    action=config.action,
+                    params=config.params,
+                )
 
-                # Parse JSON response
-                result_data = response.json()
+                # Step 4: Parse the response into ExecutionResult
+                # The response_data is a dict from the API
+                result = self._parse_execution_result(response)
 
                 # Mark span as successful
-                span.set_attribute("connector.success", True)
+                span.set_attribute("connector.success", result.success)
 
-                # Return success result
-                return ExecutionResult(success=True, data=result_data, error=None)
+                return result
 
-            except httpx.HTTPStatusError as e:
-                # HTTP error (4xx, 5xx) - record and re-raise
+            except ValueError as e:
+                # Instance lookup validation error (0 or >1 instances)
                 span.set_attribute("connector.success", False)
-                span.set_attribute("connector.error_type", "HTTPStatusError")
-                span.set_attribute("http.status_code", e.response.status_code)
+                span.set_attribute("connector.error_type", "ValueError")
                 span.record_exception(e)
                 raise
 
             except Exception as e:
-                # Catch-all for any other unexpected exceptions
+                # HTTP errors and other exceptions
                 span.set_attribute("connector.success", False)
                 span.set_attribute("connector.error_type", type(e).__name__)
                 span.record_exception(e)
                 raise
 
-    def close(self):
-        """Close the HTTP client.
+    def _parse_execution_result(self, response: dict) -> ExecutionResult:
+        """Parse API response into ExecutionResult.
 
-        Call this when you're done using the executor to clean up resources.
+        Args:
+            response_data: Raw JSON response from the cloud API
+
+        Returns:
+            ExecutionResult with parsed data
+        """
+
+        return ExecutionResult(
+            success=True,
+            data=response["result"],
+            meta=response.get("connector_metadata"),
+            error=None,
+        )
+
+    async def close(self):
+        """Close the cloud client and cleanup resources.
+
+        Call this when you're done using the executor to clean up HTTP connections.
 
         Example:
-            executor = HostedExecutor(
-                workspace_id="workspace-123",
-                connector_id="my-connector"
-            )
+            executor = HostedExecutor(...)
             try:
                 result = await executor.execute(config)
             finally:
-                executor.close()
+                await executor.close()
         """
-        self.client.close()
+        await self._cloud_client.close()