airbyte-agent-amazon-ads 0.1.9__py3-none-any.whl → 0.1.15__py3-none-any.whl

airbyte_agent_amazon_ads/_vendored/connector_sdk/connector_model_loader.py

@@ -62,6 +62,53 @@ class TokenExtractValidationError(ConnectorModelLoaderError):
     pass
 
 
+# Expected auth_mapping keys for each auth type.
+# These are the auth parameters that each security scheme expects, NOT the user's credential field names.
+EXPECTED_AUTH_MAPPING_KEYS: dict[AuthType, set[str]] = {
+    AuthType.BEARER: {"token"},
+    AuthType.BASIC: {"username", "password"},
+    AuthType.API_KEY: {"api_key"},
+    AuthType.OAUTH2: {"access_token", "refresh_token", "client_id", "client_secret"},
+}
+
+
+def _validate_auth_mapping_keys(
+    auth_type: AuthType,
+    auth_config: AirbyteAuthConfig | None,
+    scheme_name: str = "default",
+) -> None:
+    """Validate that auth_mapping keys match expected parameters for the auth type.
+
+    The auth_mapping keys must be the parameters expected by the security scheme
+    (e.g., "token" for bearer), not the user's credential field names.
+
+    Args:
+        auth_type: The authentication type
+        auth_config: The x-airbyte-auth-config containing auth_mapping
+        scheme_name: Name of the security scheme for error messages
+
+    Raises:
+        InvalidOpenAPIError: If auth_mapping keys don't match expected parameters
+    """
+    if auth_config is None or auth_config.auth_mapping is None:
+        return  # No explicit auth_mapping, will use defaults
+
+    expected_keys = EXPECTED_AUTH_MAPPING_KEYS.get(auth_type)
+    if expected_keys is None:
+        return  # Unknown auth type, skip validation
+
+    actual_keys = set(auth_config.auth_mapping.keys())
+    invalid_keys = actual_keys - expected_keys
+
+    if invalid_keys:
+        raise InvalidOpenAPIError(
+            f"Invalid auth_mapping keys for {auth_type.value} auth in scheme '{scheme_name}': {invalid_keys}. "
+            f"Expected keys for {auth_type.value}: {sorted(expected_keys)}. "
+            f"Note: auth_mapping keys must be the auth parameters (e.g., 'token' for bearer), "
+            f'not your credential field names. Use template syntax to map: token: "${{your_field}}"'
+        )
+
+
 def extract_path_params(path: str) -> list[str]:
     """Extract parameter names from path template.
 
@@ -711,7 +758,6 @@ def _generate_default_auth_config(auth_type: AuthType) -> AirbyteAuthConfig:
                     description="Authentication bearer token",
                     format=None,
                     pattern=None,
-                    airbyte_secret=False,
                     default=None,
                 )
             },
@@ -731,7 +777,6 @@ def _generate_default_auth_config(auth_type: AuthType) -> AirbyteAuthConfig:
                     description="Authentication username",
                     format=None,
                     pattern=None,
-                    airbyte_secret=False,
                     default=None,
                 ),
                 "password": AuthConfigFieldSpec(
@@ -740,7 +785,6 @@ def _generate_default_auth_config(auth_type: AuthType) -> AirbyteAuthConfig:
                     description="Authentication password",
                     format=None,
                     pattern=None,
-                    airbyte_secret=False,
                     default=None,
                 ),
             },
@@ -760,7 +804,6 @@ def _generate_default_auth_config(auth_type: AuthType) -> AirbyteAuthConfig:
                     description="API authentication key",
                     format=None,
                     pattern=None,
-                    airbyte_secret=False,
                     default=None,
                 )
             },
@@ -785,7 +828,6 @@ def _generate_default_auth_config(auth_type: AuthType) -> AirbyteAuthConfig:
                     description="OAuth2 access token",
                     format=None,
                     pattern=None,
-                    airbyte_secret=False,
                     default=None,
                 ),
                 "refresh_token": AuthConfigFieldSpec(
@@ -794,7 +836,6 @@ def _generate_default_auth_config(auth_type: AuthType) -> AirbyteAuthConfig:
                     description="OAuth2 refresh token (optional)",
                     format=None,
                     pattern=None,
-                    airbyte_secret=False,
                     default=None,
                 ),
                 "client_id": AuthConfigFieldSpec(
@@ -803,7 +844,6 @@ def _generate_default_auth_config(auth_type: AuthType) -> AirbyteAuthConfig:
                     description="OAuth2 client ID (optional)",
                     format=None,
                     pattern=None,
-                    airbyte_secret=False,
                     default=None,
                 ),
                 "client_secret": AuthConfigFieldSpec(
@@ -812,7 +852,6 @@ def _generate_default_auth_config(auth_type: AuthType) -> AirbyteAuthConfig:
                     description="OAuth2 client secret (optional)",
                     format=None,
                     pattern=None,
-                    airbyte_secret=False,
                     default=None,
                 ),
             },
@@ -924,6 +963,9 @@ def _parse_single_security_scheme(scheme: Any) -> AuthConfig:
         oauth2_config = _parse_oauth2_config(scheme)
         # Use explicit x-airbyte-auth-config if present, otherwise generate default
         auth_config_obj = scheme.x_airbyte_auth_config or _generate_default_auth_config(AuthType.OAUTH2)
+        # Validate auth_mapping keys if explicitly provided
+        if scheme.x_airbyte_auth_config:
+            _validate_auth_mapping_keys(AuthType.OAUTH2, scheme.x_airbyte_auth_config)
         return AuthConfig(
             type=AuthType.OAUTH2,
             config=oauth2_config,
@@ -934,6 +976,10 @@ def _parse_single_security_scheme(scheme: Any) -> AuthConfig:
     # Use explicit x-airbyte-auth-config if present, otherwise generate default
     auth_config_obj = scheme.x_airbyte_auth_config or _generate_default_auth_config(auth_type)
 
+    # Validate auth_mapping keys if explicitly provided
+    if scheme.x_airbyte_auth_config:
+        _validate_auth_mapping_keys(auth_type, scheme.x_airbyte_auth_config)
+
     return AuthConfig(
         type=auth_type,
         config=auth_config,

airbyte_agent_amazon_ads/_vendored/connector_sdk/http_client.py

@@ -490,7 +490,7 @@ class HTTPClient:
 
                 if not response_text.strip():
                     response_data = {}
-                elif "application/json" in content_type or not content_type:
+                elif "application/json" in content_type or "+json" in content_type or not content_type:
                     response_data = await response.json()
                 else:
                     error_msg = f"Expected JSON response for {method.upper()} {url}, got content-type: {content_type}"

airbyte_agent_amazon_ads/_vendored/connector_sdk/schema/security.py

@@ -55,7 +55,6 @@ class AuthConfigFieldSpec(BaseModel):
     description: str | None = None
     format: str | None = None  # e.g., "email", "uri"
     pattern: str | None = None  # Regex validation
-    airbyte_secret: bool = Field(False, alias="airbyte_secret")
     default: Any | None = None
 
 

airbyte_agent_amazon_ads/connector.py

@@ -91,7 +91,7 @@ class AmazonAdsConnector:
     """
 
     connector_name = "amazon-ads"
-    connector_version = "1.0.3"
+    connector_version = "1.0.4"
     vendored_sdk_version = "0.1.0"  # Version of vendored connector-sdk
 
     # Map of (entity, action) -> needs_envelope for envelope wrapping decision

airbyte_agent_amazon_ads/connector_model.py

@@ -26,7 +26,7 @@ from uuid import (
 AmazonAdsConnectorModel: ConnectorModel = ConnectorModel(
     id=UUID('c6b0a29e-1da9-4512-9002-7bfd0cba2246'),
     name='amazon-ads',
-    version='1.0.3',
+    version='1.0.4',
     base_url='{region}',
     auth=AuthConfig(
         type=AuthType.OAUTH2,
@@ -44,17 +44,14 @@ AmazonAdsConnectorModel: ConnectorModel = ConnectorModel(
                 'client_id': AuthConfigFieldSpec(
                     title='Client ID',
                     description='The client ID of your Amazon Ads API application',
-                    airbyte_secret=True,
                 ),
                 'client_secret': AuthConfigFieldSpec(
                     title='Client Secret',
                     description='The client secret of your Amazon Ads API application',
-                    airbyte_secret=True,
                 ),
                 'refresh_token': AuthConfigFieldSpec(
                     title='Refresh Token',
                     description='The refresh token obtained from the OAuth authorization flow',
-                    airbyte_secret=True,
                 ),
             },
             auth_mapping={

{airbyte_agent_amazon_ads-0.1.9.dist-info → airbyte_agent_amazon_ads-0.1.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: airbyte-agent-amazon-ads
-Version: 0.1.9
+Version: 0.1.15
 Summary: Airbyte Amazon-Ads Connector for AI platforms
 Project-URL: Homepage, https://github.com/airbytehq/airbyte-agent-connectors
 Project-URL: Documentation, https://docs.airbyte.com/ai-agents/
@@ -101,7 +101,7 @@ This example assumes you've already authenticated your connector with Airbyte. S
 from airbyte_agent_amazon-ads import AmazonAdsConnector
 
 connector = AmazonAdsConnector(
-    external_user_id="<your-scoped-token>",
+    external_user_id="<your_external_user_id>",
     airbyte_client_id="<your-client-id>",
     airbyte_client_secret="<your-client-secret>"
 )
@@ -132,6 +132,6 @@ For the service's official API docs, see the [Amazon-Ads API reference](https://
 
 ## Version information
 
-- **Package version:** 0.1.9
-- **Connector version:** 1.0.3
-- **Generated with Connector SDK commit SHA:** 609c1d86c76b36ff699b57123a5a8c2050d958c3
+- **Package version:** 0.1.15
+- **Connector version:** 1.0.4
+- **Generated with Connector SDK commit SHA:** 0f5e1914fa0d7d52de7bc0018afab712184a0847

{airbyte_agent_amazon_ads-0.1.9.dist-info → airbyte_agent_amazon_ads-0.1.15.dist-info}/RECORD

@@ -1,17 +1,17 @@
 airbyte_agent_amazon_ads/__init__.py,sha256=f883U_4eSRjMLgjqpi5rGcKZ0U44ME_Z0IY-XZhwlPc,1896
-airbyte_agent_amazon_ads/connector.py,sha256=LUhUhLTmj2oF8J7-0jO4I8KfPK4L082yTzwUyz_DKL0,23895
-airbyte_agent_amazon_ads/connector_model.py,sha256=lOTUqeFdrTtnW2GLh5hBwxp9Xwg0lTPTAE5EcOaQteE,98118
+airbyte_agent_amazon_ads/connector.py,sha256=YrDIUHrjMpBc2fj91SETviF1q5zZVdLLwEHSJUMO8P4,23895
+airbyte_agent_amazon_ads/connector_model.py,sha256=EBw-dpn0Vf5NpZCxGI-pHxaB52h4e1ApHfOXKGPPuCQ,97995
 airbyte_agent_amazon_ads/models.py,sha256=TOHCY0p3cE0rWVv3YfYvyvL-lmdYBcoGRTXtFNNBztc,9182
 airbyte_agent_amazon_ads/types.py,sha256=EW-jvOmXyJQqe2ESiDCs7nCIIsFreDCIZBlA6aplxpA,6728
 airbyte_agent_amazon_ads/_vendored/__init__.py,sha256=ILl7AHXMui__swyrjxrh9yRa4dLiwBvV6axPWFWty80,38
 airbyte_agent_amazon_ads/_vendored/connector_sdk/__init__.py,sha256=T5o7roU6NSpH-lCAGZ338sE5dlh4ZU6i6IkeG1zpems,1949
 airbyte_agent_amazon_ads/_vendored/connector_sdk/auth_strategies.py,sha256=5Sb9moUp623o67Q2wMa8iZldJH08y4gQdoutoO_75Iw,42088
 airbyte_agent_amazon_ads/_vendored/connector_sdk/auth_template.py,sha256=nju4jqlFC_KI82ILNumNIyiUtRJcy7J94INIZ0QraI4,4454
-airbyte_agent_amazon_ads/_vendored/connector_sdk/connector_model_loader.py,sha256=nCu6oym6LoKrS94NTivU1vyQE_qnU-rhx8ExpuOX_LU,39544
+airbyte_agent_amazon_ads/_vendored/connector_sdk/connector_model_loader.py,sha256=AW9bsdggzuc3ydy2bYYF33L6LxLKLQer9Wm47IOuQw0,41492
 airbyte_agent_amazon_ads/_vendored/connector_sdk/constants.py,sha256=AtzOvhDMWbRJgpsQNWl5tkogHD6mWgEY668PgRmgtOY,2737
 airbyte_agent_amazon_ads/_vendored/connector_sdk/exceptions.py,sha256=ss5MGv9eVPmsbLcLWetuu3sDmvturwfo6Pw3M37Oq5k,481
 airbyte_agent_amazon_ads/_vendored/connector_sdk/extensions.py,sha256=XWRRoJOOrwUHSKbuQt5DU7CCu8ePzhd_HuP7c_uD77w,21376
-airbyte_agent_amazon_ads/_vendored/connector_sdk/http_client.py,sha256=yucwu3OvJh5wLQa1mk-gTKjtqjKKucMw5ltmlE7mk1c,28000
+airbyte_agent_amazon_ads/_vendored/connector_sdk/http_client.py,sha256=09Fclbq4wrg38EM2Yh2kHiykQVXqdAGby024elcEz8E,28027
 airbyte_agent_amazon_ads/_vendored/connector_sdk/introspection.py,sha256=kRVI4TDQDLdcCnTBUML8ycAtdqAQufVh-027sMkb4i8,19165
 airbyte_agent_amazon_ads/_vendored/connector_sdk/secrets.py,sha256=J9ezMu4xNnLW11xY5RCre6DHP7YMKZCqwGJfk7ufHAM,6855
 airbyte_agent_amazon_ads/_vendored/connector_sdk/types.py,sha256=in8gHsn5nsScujOfHZmkOgNmqmJKiPyNNjg59m5fGWc,8807
@@ -47,11 +47,11 @@ airbyte_agent_amazon_ads/_vendored/connector_sdk/schema/components.py,sha256=nJI
 airbyte_agent_amazon_ads/_vendored/connector_sdk/schema/connector.py,sha256=mSZk1wr2YSdRj9tTRsPAuIlCzd_xZLw-Bzl1sMwE0rE,3731
 airbyte_agent_amazon_ads/_vendored/connector_sdk/schema/extensions.py,sha256=5hgpFHK7fzpzegCkJk882DeIP79bCx_qairKJhvPMZ8,9590
 airbyte_agent_amazon_ads/_vendored/connector_sdk/schema/operations.py,sha256=RpzGtAI4yvAtMHAfMUMcUwgHv_qJojnKlNb75_agUF8,5729
-airbyte_agent_amazon_ads/_vendored/connector_sdk/schema/security.py,sha256=6ljzf_JHs4amnQX9AhePcEsT8P3ZnTSC4xeg7-cvsNQ,9100
+airbyte_agent_amazon_ads/_vendored/connector_sdk/schema/security.py,sha256=1CVCavrPdHHyk7B6JtUD75yRS_hWLCemZF1zwGbdqxg,9036
 airbyte_agent_amazon_ads/_vendored/connector_sdk/telemetry/__init__.py,sha256=RaLgkBU4dfxn1LC5Y0Q9rr2PJbrwjxvPgBLmq8_WafE,211
 airbyte_agent_amazon_ads/_vendored/connector_sdk/telemetry/config.py,sha256=tLmQwAFD0kP1WyBGWBS3ysaudN9H3e-3EopKZi6cGKg,885
 airbyte_agent_amazon_ads/_vendored/connector_sdk/telemetry/events.py,sha256=8Y1NbXiwISX-V_wRofY7PqcwEXD0dLMnntKkY6XFU2s,1328
 airbyte_agent_amazon_ads/_vendored/connector_sdk/telemetry/tracker.py,sha256=Ftrk0_ddfM7dZG8hF9xBuPwhbc9D6JZ7Q9qs5o3LEyA,5579
-airbyte_agent_amazon_ads-0.1.9.dist-info/METADATA,sha256=_RbZLdC2MqkaarpWQu6NQfNnfDXX2PhXwCFm6dxsf-0,5157
-airbyte_agent_amazon_ads-0.1.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-airbyte_agent_amazon_ads-0.1.9.dist-info/RECORD,,
+airbyte_agent_amazon_ads-0.1.15.dist-info/METADATA,sha256=n7_0YW3uvFU8L3v8xkzxrmbTTMIBSNSYsshxvM_RnqY,5163
+airbyte_agent_amazon_ads-0.1.15.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+airbyte_agent_amazon_ads-0.1.15.dist-info/RECORD,,