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

adcp/__init__.py

@@ -48,122 +48,20 @@ 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 generated
 from adcp.types.core import AgentConfig, Protocol, TaskResult, TaskStatus, WebhookMetadata
-from adcp.types.generated import (
-    ActivateSignalError,
-    # Request/Response types
-    ActivateSignalRequest,
-    ActivateSignalResponse,
-    ActivateSignalSuccess,
-    ActivationKey,
-    AgentDeployment,
-    AgentDestination,
-    BothPreviewRender,
-    # Brand types
-    BrandManifest,
-    BrandManifestRef,
-    BuildCreativeRequest,
-    BuildCreativeResponse,
-    # Channel types
-    Channels,
-    CreateMediaBuyError,
-    CreateMediaBuyRequest,
-    CreateMediaBuyResponse,
-    CreateMediaBuySuccess,
-    # Creative types
-    CreativeAsset,
-    CreativeAssignment,
-    CreativeManifest,
-    CreativePolicy,
-    DaastAsset,
-    # Metrics types
-    DeliveryMetrics,
-    # Delivery types
-    DeliveryType,
-    Deployment,
-    # Deployment types
-    Destination,
-    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.0.0"
 
 __all__ = [
     # Client classes
@@ -210,113 +108,13 @@ __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 module
+    "generated",
     "GeneratedTaskStatus",
 ]

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},
             )