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

airbyte_agent_mcp/_vendored/connector_sdk/auth_strategies.py

@@ -610,9 +610,7 @@ class OAuth2AuthStrategy(AuthStrategy):
         has_refresh_token = bool(secrets.get("refresh_token"))
 
         if not has_access_token and not has_refresh_token:
-            raise AuthenticationError(
-                "Missing OAuth2 credentials. Provide either 'access_token' " "or 'refresh_token' (for refresh-token-only mode)."
-            )
+            raise AuthenticationError("Missing OAuth2 credentials. Provide either 'access_token' or 'refresh_token' (for refresh-token-only mode).")
 
     def can_refresh(self, secrets: OAuth2RefreshSecrets) -> bool:
         """Check if token refresh is possible.
@@ -1106,8 +1104,7 @@ class AuthStrategyFactory:
         strategy = cls._strategies.get(auth_type)
         if strategy is None:
             raise AuthenticationError(
-                f"Authentication type '{auth_type.value}' is not implemented. "
-                f"Supported types: {', '.join(s.value for s in cls._strategies.keys())}"
+                f"Authentication type '{auth_type.value}' is not implemented. Supported types: {', '.join(s.value for s in cls._strategies.keys())}"
             )
         return strategy
 

airbyte_agent_mcp/_vendored/connector_sdk/auth_template.py

@@ -17,7 +17,7 @@ class MissingVariableError(ValueError):
     def __init__(self, var_name: str, available_fields: list):
         self.var_name = var_name
         self.available_fields = available_fields
-        super().__init__(f"Template variable '${{{var_name}}}' not found in config. " f"Available fields: {available_fields}")
+        super().__init__(f"Template variable '${{{var_name}}}' not found in config. Available fields: {available_fields}")
 
 
 def apply_template(template: str, values: Dict[str, str]) -> str:

airbyte_agent_mcp/_vendored/connector_sdk/cloud_utils/client.py

@@ -13,7 +13,7 @@ class AirbyteCloudClient:
 
     Handles authentication, token caching, and API calls to:
     - Get bearer tokens for authentication
-    - Look up connector instances for users
+    - Look up connectors for users
     - Execute connectors via the cloud API
 
     Example:
@@ -22,15 +22,15 @@ class AirbyteCloudClient:
             client_secret="your-client-secret"
         )
 
-        # Get a connector instance
-        instance_id = await client.get_connector_instance_id(
+        # Get a connector ID
+        connector_id = await client.get_connector_id(
             external_user_id="user-123",
-            connector_definition_id="stripe-def-456"
+            connector_definition_id="550e8400-e29b-41d4-a716-446655440000"
         )
 
         # Execute the connector
         result = await client.execute_connector(
-            instance_id=instance_id,
+            connector_id=connector_id,
             entity="customers",
             action="list",
             params={"limit": 10}
@@ -105,37 +105,37 @@ class AirbyteCloudClient:
 
         return access_token
 
-    async def get_connector_instance_id(
+    async def get_connector_id(
         self,
         external_user_id: str,
         connector_definition_id: str,
     ) -> str:
-        """Get connector instance ID for a user.
+        """Get connector ID for a user.
 
-        Looks up the connector instance that belongs to the specified user
-        and connector definition. Validates that exactly one instance exists.
+        Looks up the connector that belongs to the specified user
+        and connector definition. Validates that exactly one connector 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)
+            Connector ID (UUID string)
 
         Raises:
-            ValueError: If 0 or more than 1 instance is found
+            ValueError: If 0 or more than 1 connector 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(
+            connector_id = await client.get_connector_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"
+        url = f"{self.API_BASE_URL}/api/v1/connectors/connectors_for_user"
         params = {
             "external_user_id": external_user_id,
             "definition_id": connector_definition_id,
@@ -146,24 +146,24 @@ class AirbyteCloudClient:
         response.raise_for_status()
 
         data = response.json()
-        instances = data["instances"]
+        connectors = data["connectors"]
 
-        if len(instances) == 0:
-            raise ValueError(f"No connector instance found for user '{external_user_id}' " f"and connector '{connector_definition_id}'")
+        if len(connectors) == 0:
+            raise ValueError(f"No connector found for user '{external_user_id}' and connector definition '{connector_definition_id}'")
 
-        if len(instances) > 1:
+        if len(connectors) > 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)}"
+                f"Multiple connectors found for user '{external_user_id}' "
+                f"and connector definition '{connector_definition_id}'. Expected exactly 1, "
+                f"found {len(connectors)}"
             )
 
-        instance_id = instances[0]["id"]
-        return instance_id
+        connector_id = connectors[0]["id"]
+        return connector_id
 
     async def execute_connector(
         self,
-        instance_id: str,
+        connector_id: str,
         entity: str,
         action: str,
         params: dict[str, Any] | None,
@@ -171,7 +171,7 @@ class AirbyteCloudClient:
         """Execute a connector operation.
 
         Args:
-            instance_id: Connector instance UUID
+            connector_id: Connector UUID (source ID)
             entity: Entity name (e.g., "customers", "invoices")
             action: Operation action (e.g., "list", "get", "create")
             params: Optional parameters for the operation
@@ -185,14 +185,14 @@ class AirbyteCloudClient:
 
         Example:
             result = await client.execute_connector(
-                instance_id="inst-123",
+                connector_id="550e8400-e29b-41d4-a716-446655440000",
                 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"
+        url = f"{self.API_BASE_URL}/api/v1/connectors/sources/{connector_id}/execute"
         headers = {"Authorization": f"Bearer {token}"}
         request_body = {
             "entity": entity,

airbyte_agent_mcp/_vendored/connector_sdk/connector_model_loader.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import logging
 import re
 from pathlib import Path
 from typing import Any
@@ -518,13 +519,14 @@ def _parse_oauth2_config(scheme: Any) -> dict[str, str]:
                 config["refresh_url"] = refresh_url
 
     # Extract custom refresh configuration from x-airbyte-token-refresh extension
+    # Note: x_token_refresh is a Dict[str, Any], not a Pydantic model, so use .get()
     x_token_refresh = getattr(scheme, "x_token_refresh", None)
     if x_token_refresh:
-        auth_style = getattr(x_token_refresh, "auth_style", None)
+        auth_style = x_token_refresh.get("auth_style")
         if auth_style:
             config["auth_style"] = auth_style
 
-        body_format = getattr(x_token_refresh, "body_format", None)
+        body_format = x_token_refresh.get("body_format")
         if body_format:
             config["body_format"] = body_format
 
@@ -768,8 +770,6 @@ def _parse_auth_from_openapi(spec: OpenAPIConnector) -> AuthConfig:
             options.append(auth_option)
         except Exception as e:
             # Log warning but continue - skip invalid schemes
-            import logging
-
             logger = logging.getLogger(__name__)
             logger.warning(f"Skipping invalid security scheme '{scheme_name}': {e}")
             continue

airbyte_agent_mcp/_vendored/connector_sdk/executor/hosted_executor.py

@@ -21,7 +21,7 @@ class HostedExecutor:
 
     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
+    2. Look up the user's connector
     3. Execute the connector operation via the cloud API
 
     Implements ExecutorProtocol.
@@ -63,7 +63,7 @@ class HostedExecutor:
             airbyte_client_id: Airbyte client ID for authentication
             airbyte_client_secret: Airbyte client secret for authentication
             connector_definition_id: Connector definition ID used to look up
-                the user's connector instance.
+                the user's connector.
 
         Example:
             executor = HostedExecutor(
@@ -86,8 +86,8 @@ class HostedExecutor:
         """Execute connector via cloud API (ExecutorProtocol implementation).
 
         Flow:
-        1. Get connector id from connector model
-        2. Look up the user's connector instance ID
+        1. Get connector definition id from executor config
+        2. Look up the user's connector ID
         3. Execute the connector operation via the cloud API
         4. Parse the response into ExecutionResult
 
@@ -98,7 +98,7 @@ class HostedExecutor:
             ExecutionResult with success/failure status
 
         Raises:
-            ValueError: If no instance or multiple instances found for user
+            ValueError: If no connector or multiple connectors found for user
             httpx.HTTPStatusError: If API returns 4xx/5xx status code
             httpx.RequestError: If network request fails
 
@@ -126,24 +126,23 @@ class HostedExecutor:
                 # 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(
+                # Step 2: Get the connector ID for this user
+                connector_id = await self._cloud_client.get_connector_id(
                     external_user_id=self._external_user_id,
                     connector_definition_id=connector_definition_id,
                 )
 
-                span.set_attribute("connector.instance_id", instance_id)
+                span.set_attribute("connector.connector_id", connector_id)
 
                 # Step 3: Execute the connector via the cloud API
                 response = await self._cloud_client.execute_connector(
-                    instance_id=instance_id,
+                    connector_id=connector_id,
                     entity=config.entity,
                     action=config.action,
                     params=config.params,
                 )
 
                 # 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
@@ -152,7 +151,7 @@ class HostedExecutor:
                 return result
 
             except ValueError as e:
-                # Instance lookup validation error (0 or >1 instances)
+                # Connector lookup validation error (0 or >1 connectors)
                 span.set_attribute("connector.success", False)
                 span.set_attribute("connector.error_type", "ValueError")
                 span.record_exception(e)

airbyte_agent_mcp/_vendored/connector_sdk/executor/local_executor.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+import inspect
 import logging
 import os
 import re
@@ -11,6 +12,7 @@ from collections.abc import AsyncIterator
 from typing import Any, Protocol
 from urllib.parse import quote
 
+from jinja2 import Environment, StrictUndefined
 from jsonpath_ng import parse as parse_jsonpath
 from opentelemetry import trace
 
@@ -506,8 +508,6 @@ class LocalExecutor:
             result = handler.execute_operation(config.entity, action, params)
 
             # Check if it's an async generator (download) or awaitable (standard)
-            import inspect
-
             if inspect.isasyncgen(result):
                 # Download operation: return generator directly
                 return ExecutionResult(
@@ -814,7 +814,6 @@ class LocalExecutor:
             >>> _substitute_file_field_params("attachments[{attachment_index}].url", {"attachment_index": 0})
             "attachments[0].url"
         """
-        from jinja2 import Environment, StrictUndefined
 
         # Use custom delimiters to match OpenAPI path parameter syntax {var}
         # StrictUndefined raises clear error if a template variable is missing
@@ -1099,35 +1098,93 @@ class LocalExecutor:
 
         return interpolate_value(variables)
 
+    def _wrap_primitives(self, data: Any) -> dict[str, Any] | list[dict[str, Any]] | None:
+        """Wrap primitive values in dict format for consistent response structure.
+
+        Transforms primitive API responses into dict format so downstream code
+        can always expect dict-based data structures.
+
+        Args:
+            data: Response data (could be primitive, list, dict, or None)
+
+        Returns:
+            - If data is a primitive (str, int, float, bool): {"value": data}
+            - If data is a list: wraps all non-dict elements as {"value": item}
+            - If data is already a dict or list of dicts: unchanged
+            - If data is None: None
+
+        Examples:
+            >>> executor._wrap_primitives(42)
+            {"value": 42}
+            >>> executor._wrap_primitives([1, 2, 3])
+            [{"value": 1}, {"value": 2}, {"value": 3}]
+            >>> executor._wrap_primitives([1, {"id": 2}, 3])
+            [{"value": 1}, {"id": 2}, {"value": 3}]
+            >>> executor._wrap_primitives([[1, 2], 3])
+            [{"value": [1, 2]}, {"value": 3}]
+            >>> executor._wrap_primitives({"id": 1})
+            {"id": 1}  # unchanged
+        """
+        if data is None:
+            return None
+
+        # Handle primitive scalars
+        if isinstance(data, (bool, str, int, float)):
+            return {"value": data}
+
+        # Handle lists - wrap non-dict elements
+        if isinstance(data, list):
+            if not data:
+                return []  # Empty list unchanged
+
+            wrapped = []
+            for item in data:
+                if isinstance(item, dict):
+                    wrapped.append(item)
+                else:
+                    wrapped.append({"value": item})
+            return wrapped
+
+        # Dict - return unchanged
+        if isinstance(data, dict):
+            return data
+
+        # Unknown type - wrap for safety
+        return {"value": data}
+
     def _extract_records(
         self,
-        response_data: dict[str, Any],
+        response_data: Any,
         endpoint: EndpointDefinition,
-    ) -> dict[str, Any] | list[Any] | None:
+    ) -> dict[str, Any] | list[dict[str, Any]] | None:
         """Extract records from response using record extractor.
 
         Type inference based on action:
         - list, search: Returns array ([] if not found)
         - get, create, update, delete: Returns single record (None if not found)
 
+        Automatically wraps primitive values (int, str, float, bool) in {"value": primitive}
+        format to ensure consistent dict-based responses for downstream code.
+
         Args:
-            response_data: Full API response
+            response_data: Full API response (can be dict, list, primitive, or None)
             endpoint: Endpoint with optional record extractor and action
 
         Returns:
             - Extracted data if extractor configured and path found
             - [] or None if path not found (based on action)
             - Original response if no extractor configured or on error
+            - Primitives are wrapped as {"value": primitive}
         """
         # Check if endpoint has record extractor
         extractor = endpoint.record_extractor
         if not extractor:
-            return response_data
+            return self._wrap_primitives(response_data)
 
         # Determine if this action returns array or single record
         action = endpoint.action
         if not action:
-            return response_data
+            return self._wrap_primitives(response_data)
 
         is_array_action = action in (Action.LIST, Action.API_SEARCH)
 
@@ -1140,17 +1197,19 @@ class LocalExecutor:
                 # Path not found - return empty based on action
                 return [] if is_array_action else None
 
-            # Return extracted data
+            # Return extracted data with primitive wrapping
             if is_array_action:
                 # For array actions, return the array (or list of matches)
-                return matches[0] if len(matches) == 1 else matches
+                result = matches[0] if len(matches) == 1 else matches
             else:
                 # For single record actions, return first match
-                return matches[0]
+                result = matches[0]
+
+            return self._wrap_primitives(result)
 
         except Exception as e:
             logging.warning(f"Failed to apply record extractor '{extractor}': {e}. Returning original response.")
-            return response_data
+            return self._wrap_primitives(response_data)
 
     def _extract_metadata(
         self,
@@ -1235,7 +1294,7 @@ class LocalExecutor:
 
         if missing_fields:
             raise MissingParameterError(
-                f"Missing required body fields for {entity}.{action.value}: {missing_fields}. " f"Provided parameters: {list(params.keys())}"
+                f"Missing required body fields for {entity}.{action.value}: {missing_fields}. Provided parameters: {list(params.keys())}"
             )
 
     async def close(self):

airbyte_agent_mcp/_vendored/connector_sdk/extensions.py

@@ -666,8 +666,7 @@ EXTENSION_REGISTRY = {
         "type": "dict[str, str]",
         "required": False,
         "description": (
-            "Dictionary mapping field names to JSONPath expressions for extracting metadata "
-            "(pagination, request IDs, etc.) from response envelopes"
+            "Dictionary mapping field names to JSONPath expressions for extracting metadata (pagination, request IDs, etc.) from response envelopes"
         ),
     },
     AIRBYTE_FILE_URL: {

airbyte_agent_mcp/_vendored/connector_sdk/http/response.py

@@ -80,6 +80,8 @@ class HTTPResponse:
             HTTPStatusError: For 4xx or 5xx status codes.
         """
         if 400 <= self._status_code < 600:
+            # NOTE: Import here intentionally to avoid circular import.
+            # exceptions.py imports HTTPResponse for type hints.
             from .exceptions import HTTPStatusError
 
             raise HTTPStatusError(

airbyte_agent_mcp/_vendored/connector_sdk/logging/logger.py

@@ -5,7 +5,7 @@ import json
 import time
 import uuid
 from pathlib import Path
-from typing import Any, Dict, Optional, Set
+from typing import Any, Dict, Set
 
 from .types import LogSession, RequestLog
 
@@ -31,9 +31,9 @@ class RequestLogger:
 
     def __init__(
         self,
-        log_file: Optional[str] = None,
-        connector_name: Optional[str] = None,
-        max_logs: Optional[int] = 10000,
+        log_file: str | None = None,
+        connector_name: str | None = None,
+        max_logs: int | None = 10000,
     ):
         """
         Initialize the request logger.
@@ -99,9 +99,9 @@ class RequestLogger:
         method: str,
         url: str,
         path: str,
-        headers: Optional[Dict[str, str]] = None,
-        params: Optional[Dict[str, Any]] = None,
-        body: Optional[Any] = None,
+        headers: Dict[str, str] | None = None,
+        params: Dict[str, Any] | None = None,
+        body: Any | None = None,
     ) -> str:
         """
         Log the start of an HTTP request.
@@ -133,7 +133,7 @@ class RequestLogger:
         self,
         request_id: str,
         status_code: int,
-        response_body: Optional[Any] = None,
+        response_body: Any | None = None,
     ) -> None:
         """
         Log a successful HTTP response.
@@ -176,7 +176,7 @@ class RequestLogger:
         self,
         request_id: str,
         error: str,
-        status_code: Optional[int] = None,
+        status_code: int | None = None,
     ) -> None:
         """
         Log an HTTP request error.

airbyte_agent_mcp/_vendored/connector_sdk/logging/types.py

@@ -2,7 +2,7 @@
 
 import base64
 from datetime import UTC, datetime
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List
 
 from pydantic import BaseModel, ConfigDict, Field, field_serializer, field_validator
 
@@ -27,12 +27,12 @@ class RequestLog(BaseModel):
     url: str
     path: str
     headers: Dict[str, str] = Field(default_factory=dict)
-    params: Optional[Dict[str, Any]] = None
-    body: Optional[Any] = None
-    response_status: Optional[int] = None
-    response_body: Optional[Any] = None
-    timing_ms: Optional[float] = None
-    error: Optional[str] = None
+    params: Dict[str, Any] | None = None
+    body: Any | None = None
+    response_status: int | None = None
+    response_body: Any | None = None
+    timing_ms: float | None = None
+    error: str | None = None
 
     @field_serializer("timestamp")
     def serialize_datetime(self, value: datetime) -> str:
@@ -50,9 +50,9 @@ class LogSession(BaseModel):
 
     session_id: str
     started_at: datetime = Field(default_factory=_utc_now)
-    connector_name: Optional[str] = None
+    connector_name: str | None = None
     logs: List[RequestLog] = Field(default_factory=list)
-    max_logs: Optional[int] = Field(
+    max_logs: int | None = Field(
         default=10000,
         description="Maximum number of logs to keep in memory. "
         "When limit is reached, oldest logs should be flushed before removal. "
@@ -60,7 +60,7 @@ class LogSession(BaseModel):
     )
     chunk_logs: List[bytes] = Field(
         default_factory=list,
-        description="Captured chunks from streaming responses. " "Each chunk is logged when log_chunk_fetch() is called.",
+        description="Captured chunks from streaming responses. Each chunk is logged when log_chunk_fetch() is called.",
     )
 
     @field_validator("chunk_logs", mode="before")

airbyte_agent_mcp/_vendored/connector_sdk/observability/config.py

@@ -6,7 +6,7 @@ import tempfile
 import uuid
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import yaml
 
@@ -53,7 +53,7 @@ def _delete_legacy_files() -> None:
             logger.debug(f"Could not delete legacy file {legacy_path}: {e}")
 
 
-def _migrate_legacy_config() -> Optional[SDKConfig]:
+def _migrate_legacy_config() -> SDKConfig | None:
     """
     Migrate from legacy file-based config to new YAML format.
 

airbyte_agent_mcp/_vendored/connector_sdk/observability/models.py

@@ -2,7 +2,7 @@
 
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 
 
 @dataclass
@@ -12,8 +12,8 @@ class OperationMetadata:
     entity: str
     action: str
     timestamp: datetime
-    timing_ms: Optional[float] = None
-    status_code: Optional[int] = None
-    error_type: Optional[str] = None
-    error_message: Optional[str] = None
-    params: Optional[Dict[str, Any]] = None
+    timing_ms: float | None = None
+    status_code: int | None = None
+    error_type: str | None = None
+    error_message: str | None = None
+    params: Dict[str, Any] | None = None

airbyte_agent_mcp/_vendored/connector_sdk/observability/session.py

@@ -3,14 +3,14 @@
 import logging
 import uuid
 from datetime import UTC, datetime
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 
 from .config import SDKConfig, load_config
 
 logger = logging.getLogger(__name__)
 
 # Cache the config at module level to avoid repeated reads
-_cached_config: Optional[SDKConfig] = None
+_cached_config: SDKConfig | None = None
 
 
 def _get_config() -> SDKConfig:
@@ -39,7 +39,7 @@ def get_persistent_user_id() -> str:
     return _get_config().user_id
 
 
-def get_public_ip() -> Optional[str]:
+def get_public_ip() -> str | None:
     """
     Fetch the public IP address of the user.
 
@@ -47,6 +47,8 @@ def get_public_ip() -> Optional[str]:
     Uses httpx for a robust HTTP request to a public IP service.
     """
     try:
+        # NOTE: Import here intentionally - this is a non-critical network call
+        # that may fail. Importing at module level would make httpx a hard dependency.
         import httpx
 
         # Use a short timeout to avoid blocking
@@ -77,9 +79,9 @@ class ObservabilitySession:
     def __init__(
         self,
         connector_name: str,
-        connector_version: Optional[str] = None,
+        connector_version: str | None = None,
         execution_context: str = "direct",
-        session_id: Optional[str] = None,
+        session_id: str | None = None,
     ):
         self.session_id = session_id or str(uuid.uuid4())
         self.user_id = get_persistent_user_id()