adcp 1.6.1__py3-none-any.whl → 2.1.0__py3-none-any.whl

adcp/__init__.py

@@ -48,122 +48,87 @@ from adcp.testing import (
     test_agent_client,
     test_agent_no_auth,
 )
+
+# Import all generated types - users can import what they need from adcp.types.generated
+from adcp.types import aliases, generated
+
+# Re-export semantic type aliases for better ergonomics
+from adcp.types.aliases import (
+    ActivateSignalErrorResponse,
+    ActivateSignalSuccessResponse,
+    BuildCreativeErrorResponse,
+    BuildCreativeSuccessResponse,
+    CreateMediaBuyErrorResponse,
+    CreateMediaBuySuccessResponse,
+    PreviewCreativeFormatRequest,
+    PreviewCreativeInteractiveResponse,
+    PreviewCreativeManifestRequest,
+    PreviewCreativeStaticResponse,
+    PreviewRenderHtml,
+    PreviewRenderIframe,
+    PreviewRenderImage,
+    PropertyIdActivationKey,
+    PropertyTagActivationKey,
+    ProvidePerformanceFeedbackErrorResponse,
+    ProvidePerformanceFeedbackSuccessResponse,
+    SyncCreativesErrorResponse,
+    SyncCreativesSuccessResponse,
+    UpdateMediaBuyErrorResponse,
+    UpdateMediaBuyPackagesRequest,
+    UpdateMediaBuyPropertiesRequest,
+    UpdateMediaBuySuccessResponse,
+)
 from adcp.types.core import AgentConfig, Protocol, TaskResult, TaskStatus, WebhookMetadata
+
+# Re-export commonly-used request/response types for convenience
+# Users should import from main package (e.g., `from adcp import GetProductsRequest`)
+# rather than internal modules for better API stability
 from adcp.types.generated import (
-    ActivateSignalError,
-    # Request/Response types
+    # Audience & Targeting
     ActivateSignalRequest,
     ActivateSignalResponse,
-    ActivateSignalSuccess,
-    ActivationKey,
-    AgentDeployment,
-    AgentDestination,
-    BothPreviewRender,
-    # Brand types
-    BrandManifest,
-    BrandManifestRef,
+    # Creative Operations
     BuildCreativeRequest,
     BuildCreativeResponse,
-    # Channel types
-    Channels,
-    CreateMediaBuyError,
+    # Media Buy Operations
     CreateMediaBuyRequest,
     CreateMediaBuyResponse,
-    CreateMediaBuySuccess,
-    # Creative types
-    CreativeAsset,
-    CreativeAssignment,
-    CreativeManifest,
-    CreativePolicy,
-    DaastAsset,
-    # Metrics types
-    DeliveryMetrics,
-    # Delivery types
-    DeliveryType,
-    Deployment,
-    # Deployment types
-    Destination,
+    # Common data types
     Error,
     Format,
-    FormatId,
-    FrequencyCap,
     GetMediaBuyDeliveryRequest,
     GetMediaBuyDeliveryResponse,
     GetProductsRequest,
     GetProductsResponse,
     GetSignalsRequest,
     GetSignalsResponse,
-    HtmlPreviewRender,
-    InlineDaastAsset,
-    InlineVastAsset,
-    Key_valueActivationKey,
     ListAuthorizedPropertiesRequest,
     ListAuthorizedPropertiesResponse,
     ListCreativeFormatsRequest,
     ListCreativeFormatsResponse,
     ListCreativesRequest,
     ListCreativesResponse,
-    Measurement,
-    # Core domain types
-    MediaBuy,
-    # Status enums
-    MediaBuyStatus,
-    # Sub-asset types
-    MediaSubAsset,
-    Pacing,
-    Package,
-    PackageStatus,
-    PerformanceFeedback,
-    Placement,
-    PlatformDeployment,
-    PlatformDestination,
     PreviewCreativeRequest,
     PreviewCreativeResponse,
-    # Preview render types
-    PreviewRender,
-    PricingModel,
-    # Pricing types
-    PricingOption,
     Product,
-    PromotedProducts,
-    # Property and placement types
     Property,
-    ProtocolEnvelope,
     ProvidePerformanceFeedbackRequest,
     ProvidePerformanceFeedbackResponse,
-    PushNotificationConfig,
-    ReportingCapabilities,
-    Response,
-    Segment_idActivationKey,
-    StandardFormatIds,
-    StartTiming,
-    SubAsset,
-    SyncCreativesError,
     SyncCreativesRequest,
     SyncCreativesResponse,
-    SyncCreativesSuccess,
-    # Targeting types
-    Targeting,
-    # Task types
-    TaskType,
-    TextSubAsset,
-    UpdateMediaBuyError,
     UpdateMediaBuyRequest,
     UpdateMediaBuyResponse,
-    UpdateMediaBuySuccess,
-    UrlDaastAsset,
-    UrlPreviewRender,
-    UrlVastAsset,
-    # Asset delivery types (VAST/DAAST)
-    VastAsset,
-    # Protocol types
-    WebhookPayload,
 )
-from adcp.types.generated import (
-    TaskStatus as GeneratedTaskStatus,
+from adcp.types.generated import TaskStatus as GeneratedTaskStatus
+from adcp.validation import (
+    ValidationError,
+    validate_adagents,
+    validate_agent_authorization,
+    validate_product,
+    validate_publisher_properties_item,
 )
 
-__version__ = "1.6.1"
+__version__ = "2.1.0"
 
 __all__ = [
     # Client classes
@@ -175,6 +140,37 @@ __all__ = [
     "TaskResult",
     "TaskStatus",
     "WebhookMetadata",
+    # Common request/response types (re-exported for convenience)
+    "CreateMediaBuyRequest",
+    "CreateMediaBuyResponse",
+    "GetMediaBuyDeliveryRequest",
+    "GetMediaBuyDeliveryResponse",
+    "GetProductsRequest",
+    "GetProductsResponse",
+    "UpdateMediaBuyRequest",
+    "UpdateMediaBuyResponse",
+    "BuildCreativeRequest",
+    "BuildCreativeResponse",
+    "ListCreativeFormatsRequest",
+    "ListCreativeFormatsResponse",
+    "ListCreativesRequest",
+    "ListCreativesResponse",
+    "PreviewCreativeRequest",
+    "PreviewCreativeResponse",
+    "SyncCreativesRequest",
+    "SyncCreativesResponse",
+    "ActivateSignalRequest",
+    "ActivateSignalResponse",
+    "GetSignalsRequest",
+    "GetSignalsResponse",
+    "ListAuthorizedPropertiesRequest",
+    "ListAuthorizedPropertiesResponse",
+    "ProvidePerformanceFeedbackRequest",
+    "ProvidePerformanceFeedbackResponse",
+    "Error",
+    "Format",
+    "Product",
+    "Property",
     # Adagents validation
     "fetch_adagents",
     "verify_agent_authorization",
@@ -210,113 +206,38 @@ __all__ = [
     "AdagentsValidationError",
     "AdagentsNotFoundError",
     "AdagentsTimeoutError",
-    # Request/Response types
-    "ActivateSignalRequest",
-    "ActivateSignalResponse",
-    "ActivateSignalSuccess",
-    "ActivateSignalError",
-    "ActivationKey",
-    "Segment_idActivationKey",
-    "Key_valueActivationKey",
-    "BuildCreativeRequest",
-    "BuildCreativeResponse",
-    "CreateMediaBuyRequest",
-    "CreateMediaBuyResponse",
-    "CreateMediaBuySuccess",
-    "CreateMediaBuyError",
-    "GetMediaBuyDeliveryRequest",
-    "GetMediaBuyDeliveryResponse",
-    "GetProductsRequest",
-    "GetProductsResponse",
-    "GetSignalsRequest",
-    "GetSignalsResponse",
-    "ListAuthorizedPropertiesRequest",
-    "ListAuthorizedPropertiesResponse",
-    "ListCreativeFormatsRequest",
-    "ListCreativeFormatsResponse",
-    "ListCreativesRequest",
-    "ListCreativesResponse",
-    "PreviewCreativeRequest",
-    "PreviewCreativeResponse",
-    "ProvidePerformanceFeedbackRequest",
-    "ProvidePerformanceFeedbackResponse",
-    "SyncCreativesRequest",
-    "SyncCreativesResponse",
-    "SyncCreativesSuccess",
-    "SyncCreativesError",
-    "UpdateMediaBuyRequest",
-    "UpdateMediaBuyResponse",
-    "UpdateMediaBuySuccess",
-    "UpdateMediaBuyError",
-    # Core domain types
-    "MediaBuy",
-    "Product",
-    "Package",
-    "Error",
-    # Creative types
-    "CreativeAsset",
-    "CreativeManifest",
-    "CreativeAssignment",
-    "CreativePolicy",
-    "Format",
-    "FormatId",
-    # Property and placement types
-    "Property",
-    "Placement",
-    # Targeting types
-    "Targeting",
-    "FrequencyCap",
-    "Pacing",
-    # Brand types
-    "BrandManifest",
-    "BrandManifestRef",
-    # Metrics types
-    "DeliveryMetrics",
-    "Measurement",
-    "PerformanceFeedback",
-    # Status enums
-    "MediaBuyStatus",
-    "PackageStatus",
-    # Pricing types
-    "PricingOption",
-    "PricingModel",
-    # Delivery types
-    "DeliveryType",
-    "StartTiming",
-    # Channel types
-    "Channels",
-    "StandardFormatIds",
-    # Protocol types
-    "WebhookPayload",
-    "ProtocolEnvelope",
-    "Response",
-    "PromotedProducts",
-    "PushNotificationConfig",
-    "ReportingCapabilities",
-    # Deployment types
-    "Destination",
-    "Deployment",
-    "PlatformDestination",
-    "AgentDestination",
-    "PlatformDeployment",
-    "AgentDeployment",
-    # Sub-asset types
-    "MediaSubAsset",
-    "SubAsset",
-    "TextSubAsset",
-    # Asset delivery types (VAST/DAAST)
-    "VastAsset",
-    "UrlVastAsset",
-    "InlineVastAsset",
-    "DaastAsset",
-    "UrlDaastAsset",
-    "InlineDaastAsset",
-    # Preview render types
-    "PreviewRender",
-    "UrlPreviewRender",
-    "HtmlPreviewRender",
-    "BothPreviewRender",
-    # Task types
-    "TaskType",
+    # Validation utilities
+    "ValidationError",
+    "validate_adagents",
+    "validate_agent_authorization",
+    "validate_product",
+    "validate_publisher_properties_item",
+    # Generated types modules
+    "generated",
+    "aliases",
     "GeneratedTaskStatus",
+    # Semantic type aliases (for better API ergonomics)
+    "ActivateSignalSuccessResponse",
+    "ActivateSignalErrorResponse",
+    "BuildCreativeSuccessResponse",
+    "BuildCreativeErrorResponse",
+    "CreateMediaBuySuccessResponse",
+    "CreateMediaBuyErrorResponse",
+    "ProvidePerformanceFeedbackSuccessResponse",
+    "ProvidePerformanceFeedbackErrorResponse",
+    "SyncCreativesSuccessResponse",
+    "SyncCreativesErrorResponse",
+    "UpdateMediaBuySuccessResponse",
+    "UpdateMediaBuyErrorResponse",
+    "PreviewCreativeFormatRequest",
+    "PreviewCreativeManifestRequest",
+    "PreviewCreativeStaticResponse",
+    "PreviewCreativeInteractiveResponse",
+    "PreviewRenderImage",
+    "PreviewRenderHtml",
+    "PreviewRenderIframe",
+    "PropertyIdActivationKey",
+    "PropertyTagActivationKey",
+    "UpdateMediaBuyPackagesRequest",
+    "UpdateMediaBuyPropertiesRequest",
 ]

adcp/adagents.py

@@ -14,6 +14,7 @@ from urllib.parse import urlparse
 import httpx
 
 from adcp.exceptions import AdagentsNotFoundError, AdagentsTimeoutError, AdagentsValidationError
+from adcp.validation import ValidationError, validate_adagents
 
 
 def _normalize_domain(domain: str) -> str:
@@ -56,9 +57,7 @@ def _validate_publisher_domain(domain: str) -> str:
     suspicious_chars = ["\\", "@", "\n", "\r", "\t"]
     for char in suspicious_chars:
         if char in domain:
-            raise AdagentsValidationError(
-                f"Invalid character in publisher domain: {char!r}"
-            )
+            raise AdagentsValidationError(f"Invalid character in publisher domain: {char!r}")
 
     domain = domain.strip()
 
@@ -70,9 +69,7 @@ def _validate_publisher_domain(domain: str) -> str:
 
     # Check for spaces after stripping leading/trailing whitespace
     if " " in domain:
-        raise AdagentsValidationError(
-            "Invalid character in publisher domain: ' '"
-        )
+        raise AdagentsValidationError("Invalid character in publisher domain: ' '")
 
     # Remove protocol if present (common user error) - do this BEFORE checking for slashes
     if "://" in domain:
@@ -87,9 +84,7 @@ def _validate_publisher_domain(domain: str) -> str:
 
     # Final validation - must look like a domain
     if "." not in domain:
-        raise AdagentsValidationError(
-            f"Publisher domain must contain at least one dot: {domain!r}"
-        )
+        raise AdagentsValidationError(f"Publisher domain must contain at least one dot: {domain!r}")
 
     return domain
 
@@ -359,13 +354,17 @@ async def fetch_adagents(
             raise AdagentsValidationError("adagents.json must be a JSON object")
 
         if "authorized_agents" not in data:
-            raise AdagentsValidationError(
-                "adagents.json must have 'authorized_agents' field"
-            )
+            raise AdagentsValidationError("adagents.json must have 'authorized_agents' field")
 
         if not isinstance(data["authorized_agents"], list):
             raise AdagentsValidationError("'authorized_agents' must be an array")
 
+        # Validate mutual exclusivity constraints
+        try:
+            validate_adagents(data)
+        except ValidationError as e:
+            raise AdagentsValidationError(f"Invalid adagents.json structure: {e}") from e
+
         return data
 
     except httpx.TimeoutException as e:

adcp/client.py

@@ -23,6 +23,7 @@ from adcp.types.core import (
     AgentConfig,
     Protocol,
     TaskResult,
+    TaskStatus,
 )
 from adcp.types.generated import (
     ActivateSignalRequest,
@@ -47,6 +48,7 @@ from adcp.types.generated import (
     SyncCreativesResponse,
     WebhookPayload,
 )
+from adcp.types.generated_poc.task_status import TaskStatus as GeneratedTaskStatus
 from adcp.utils.operation_id import create_operation_id
 
 logger = logging.getLogger(__name__)
@@ -624,7 +626,6 @@ class ADCPClient:
         Returns:
             TaskResult with task-specific typed response data
         """
-        from adcp.types.core import TaskStatus
         from adcp.utils.response_parser import parse_json_or_text
 
         # Map task types to their response types (using string literals, not enum)
@@ -643,8 +644,8 @@ class ADCPClient:
 
         # Handle completed tasks with result parsing
 
-        if webhook.status == "completed" and webhook.result is not None:
-            response_type = response_type_map.get(webhook.task_type)
+        if webhook.status == GeneratedTaskStatus.completed and webhook.result is not None:
+            response_type = response_type_map.get(webhook.task_type.value)
             if response_type:
                 try:
                     parsed_result: Any = parse_json_or_text(webhook.result, response_type)
@@ -664,17 +665,21 @@ class ADCPClient:
                     # Fall through to untyped result
 
         # Handle failed, input-required, or unparseable results
-        # Convert webhook status string to TaskStatus enum
-        try:
-            task_status = TaskStatus(webhook.status)
-        except ValueError:
-            # Fallback to FAILED for unknown statuses
-            task_status = TaskStatus.FAILED
+        # Convert webhook status to core TaskStatus enum
+        # Map generated enum values to core enum values
+        status_map = {
+            GeneratedTaskStatus.completed: TaskStatus.COMPLETED,
+            GeneratedTaskStatus.submitted: TaskStatus.SUBMITTED,
+            GeneratedTaskStatus.working: TaskStatus.WORKING,
+            GeneratedTaskStatus.failed: TaskStatus.FAILED,
+            GeneratedTaskStatus.input_required: TaskStatus.NEEDS_INPUT,
+        }
+        task_status = status_map.get(webhook.status, TaskStatus.FAILED)
 
         return TaskResult[Any](
             status=task_status,
             data=webhook.result,
-            success=webhook.status == "completed",
+            success=webhook.status == GeneratedTaskStatus.completed,
             error=webhook.error if isinstance(webhook.error, str) else None,
             metadata={
                 "task_id": webhook.task_id,
@@ -732,7 +737,7 @@ class ADCPClient:
                 type=ActivityType.WEBHOOK_RECEIVED,
                 operation_id=webhook.operation_id or "unknown",
                 agent_id=self.agent_config.id,
-                task_type=webhook.task_type,
+                task_type=webhook.task_type.value,
                 timestamp=datetime.now(timezone.utc).isoformat(),
                 metadata={"payload": payload},
             )

adcp/types/aliases.py

@@ -0,0 +1,209 @@
+"""Semantic type aliases for generated AdCP types.
+
+This module provides user-friendly aliases for generated types where the
+auto-generated names don't match user expectations from reading the spec.
+
+The code generator (datamodel-code-generator) creates numbered suffixes for
+discriminated union variants (e.g., Response1, Response2), but users expect
+semantic names (e.g., SuccessResponse, ErrorResponse).
+
+Categories of aliases:
+
+1. Discriminated Union Response Variants
+   - Success/Error cases for API responses
+   - Named to match the semantic meaning from the spec
+
+2. Preview/Render Types
+   - Input/Output/Request/Response variants
+   - Numbered types mapped to their semantic purpose
+
+3. Activation Keys
+   - Signal activation key variants
+
+DO NOT EDIT the generated types directly - they are regenerated from schemas.
+Add aliases here for any types where the generated name is unclear.
+
+Validation:
+This module will raise ImportError at import time if any of the referenced
+generated types do not exist. This ensures that schema changes are caught
+immediately rather than at runtime when users try to use the aliases.
+"""
+
+from __future__ import annotations
+
+# Import all generated types that need semantic aliases
+from adcp.types.generated import (
+    # Activation responses
+    ActivateSignalResponse1,
+    ActivateSignalResponse2,
+    # Activation keys
+    ActivationKey1,
+    ActivationKey2,
+    # Build creative responses
+    BuildCreativeResponse1,
+    BuildCreativeResponse2,
+    # Create media buy responses
+    CreateMediaBuyResponse1,
+    CreateMediaBuyResponse2,
+    # Preview creative requests
+    PreviewCreativeRequest1,
+    PreviewCreativeRequest2,
+    # Preview creative responses
+    PreviewCreativeResponse1,
+    PreviewCreativeResponse2,
+    # Preview renders
+    PreviewRender1,
+    PreviewRender2,
+    PreviewRender3,
+    # Performance feedback responses
+    ProvidePerformanceFeedbackResponse1,
+    ProvidePerformanceFeedbackResponse2,
+    # Sync creatives responses
+    SyncCreativesResponse1,
+    SyncCreativesResponse2,
+    # Update media buy requests
+    UpdateMediaBuyRequest1,
+    UpdateMediaBuyRequest2,
+    # Update media buy responses
+    UpdateMediaBuyResponse1,
+    UpdateMediaBuyResponse2,
+)
+
+# ============================================================================
+# RESPONSE TYPE ALIASES - Success/Error Discriminated Unions
+# ============================================================================
+# These are atomic operations where the response is EITHER success OR error,
+# never both. The numbered suffixes from the generator don't convey this
+# critical semantic distinction.
+
+# Activate Signal Response Variants
+ActivateSignalSuccessResponse = ActivateSignalResponse1
+"""Success response - signal activation succeeded."""
+
+ActivateSignalErrorResponse = ActivateSignalResponse2
+"""Error response - signal activation failed."""
+
+# Build Creative Response Variants
+BuildCreativeSuccessResponse = BuildCreativeResponse1
+"""Success response - creative built successfully, manifest returned."""
+
+BuildCreativeErrorResponse = BuildCreativeResponse2
+"""Error response - creative build failed, no manifest created."""
+
+# Create Media Buy Response Variants
+CreateMediaBuySuccessResponse = CreateMediaBuyResponse1
+"""Success response - media buy created successfully with media_buy_id."""
+
+CreateMediaBuyErrorResponse = CreateMediaBuyResponse2
+"""Error response - media buy creation failed, no media buy created."""
+
+# Performance Feedback Response Variants
+ProvidePerformanceFeedbackSuccessResponse = ProvidePerformanceFeedbackResponse1
+"""Success response - performance feedback accepted."""
+
+ProvidePerformanceFeedbackErrorResponse = ProvidePerformanceFeedbackResponse2
+"""Error response - performance feedback rejected."""
+
+# Sync Creatives Response Variants
+SyncCreativesSuccessResponse = SyncCreativesResponse1
+"""Success response - sync operation processed creatives."""
+
+SyncCreativesErrorResponse = SyncCreativesResponse2
+"""Error response - sync operation failed."""
+
+# Update Media Buy Response Variants
+UpdateMediaBuySuccessResponse = UpdateMediaBuyResponse1
+"""Success response - media buy updated successfully."""
+
+UpdateMediaBuyErrorResponse = UpdateMediaBuyResponse2
+"""Error response - media buy update failed, no changes applied."""
+
+# ============================================================================
+# REQUEST TYPE ALIASES - Operation Variants
+# ============================================================================
+
+# Preview Creative Request Variants
+PreviewCreativeFormatRequest = PreviewCreativeRequest1
+"""Preview request using format_id to identify creative format."""
+
+PreviewCreativeManifestRequest = PreviewCreativeRequest2
+"""Preview request using creative_manifest_url to identify creative."""
+
+# Update Media Buy Request Variants
+UpdateMediaBuyPackagesRequest = UpdateMediaBuyRequest1
+"""Update request modifying packages in the media buy."""
+
+UpdateMediaBuyPropertiesRequest = UpdateMediaBuyRequest2
+"""Update request modifying media buy properties (not packages)."""
+
+# ============================================================================
+# ACTIVATION KEY ALIASES
+# ============================================================================
+
+PropertyIdActivationKey = ActivationKey1
+"""Activation key using property_id for identification."""
+
+PropertyTagActivationKey = ActivationKey2
+"""Activation key using property_tags for identification."""
+
+# ============================================================================
+# PREVIEW/RENDER TYPE ALIASES
+# ============================================================================
+
+# Preview Creative Response Variants
+PreviewCreativeStaticResponse = PreviewCreativeResponse1
+"""Preview response with static renders (image/HTML snapshots)."""
+
+PreviewCreativeInteractiveResponse = PreviewCreativeResponse2
+"""Preview response with interactive renders (iframe embedding)."""
+
+# Preview Render Variants
+PreviewRenderImage = PreviewRender1
+"""Image-based preview render (PNG/JPEG)."""
+
+PreviewRenderHtml = PreviewRender2
+"""HTML-based preview render (static markup)."""
+
+PreviewRenderIframe = PreviewRender3
+"""Interactive iframe-based preview render."""
+
+# ============================================================================
+# EXPORTS
+# ============================================================================
+
+__all__ = [
+    # Activation responses
+    "ActivateSignalSuccessResponse",
+    "ActivateSignalErrorResponse",
+    # Activation keys
+    "PropertyIdActivationKey",
+    "PropertyTagActivationKey",
+    # Build creative responses
+    "BuildCreativeSuccessResponse",
+    "BuildCreativeErrorResponse",
+    # Create media buy responses
+    "CreateMediaBuySuccessResponse",
+    "CreateMediaBuyErrorResponse",
+    # Performance feedback responses
+    "ProvidePerformanceFeedbackSuccessResponse",
+    "ProvidePerformanceFeedbackErrorResponse",
+    # Preview creative requests
+    "PreviewCreativeFormatRequest",
+    "PreviewCreativeManifestRequest",
+    # Preview creative responses
+    "PreviewCreativeStaticResponse",
+    "PreviewCreativeInteractiveResponse",
+    # Preview renders
+    "PreviewRenderImage",
+    "PreviewRenderHtml",
+    "PreviewRenderIframe",
+    # Sync creatives responses
+    "SyncCreativesSuccessResponse",
+    "SyncCreativesErrorResponse",
+    # Update media buy requests
+    "UpdateMediaBuyPackagesRequest",
+    "UpdateMediaBuyPropertiesRequest",
+    # Update media buy responses
+    "UpdateMediaBuySuccessResponse",
+    "UpdateMediaBuyErrorResponse",
+]