adcp 2.6.0__py3-none-any.whl → 2.7.0__py3-none-any.whl

adcp/__init__.py

@@ -56,47 +56,6 @@ from adcp.testing import (
 from adcp.types import _generated as generated
 from adcp.types import aliases
 
-# 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 (
-    # Audience & Targeting
-    ActivateSignalRequest,
-    ActivateSignalResponse,
-    # Creative Operations
-    BuildCreativeRequest,
-    BuildCreativeResponse,
-    # Media Buy Operations
-    CreateMediaBuyRequest,
-    CreateMediaBuyResponse,
-    # Common data types
-    Error,
-    Format,
-    GetMediaBuyDeliveryRequest,
-    GetMediaBuyDeliveryResponse,
-    GetProductsRequest,
-    GetProductsResponse,
-    GetSignalsRequest,
-    GetSignalsResponse,
-    ListAuthorizedPropertiesRequest,
-    ListAuthorizedPropertiesResponse,
-    ListCreativeFormatsRequest,
-    ListCreativeFormatsResponse,
-    ListCreativesRequest,
-    ListCreativesResponse,
-    PreviewCreativeRequest,
-    PreviewCreativeResponse,
-    Product,
-    Property,
-    ProvidePerformanceFeedbackRequest,
-    ProvidePerformanceFeedbackResponse,
-    SyncCreativesRequest,
-    SyncCreativesResponse,
-    UpdateMediaBuyRequest,
-    UpdateMediaBuyResponse,
-)
-from adcp.types._generated import TaskStatus as GeneratedTaskStatus
-
 # Re-export semantic type aliases for better ergonomics
 from adcp.types.aliases import (
     ActivateSignalErrorResponse,
@@ -141,11 +100,20 @@ from adcp.types.aliases import (
 )
 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
 # Re-export core domain types and pricing options from stable API
 # These are commonly used in typical workflows
 from adcp.types.stable import (
+    # Audience & Targeting
+    ActivateSignalRequest,
+    ActivateSignalResponse,
     # Core domain types
     BrandManifest,
+    # Creative Operations
+    BuildCreativeRequest,
+    BuildCreativeResponse,
     # Pricing options (all 9 types for product creation)
     CpcPricingOption,
     CpcvPricingOption,
@@ -153,19 +121,54 @@ from adcp.types.stable import (
     CpmFixedRatePricingOption,
     CppPricingOption,
     CpvPricingOption,
+    # Media Buy Operations
+    CreateMediaBuyRequest,
+    CreateMediaBuyResponse,
     Creative,
     CreativeManifest,
     # Status enums (for control flow)
     CreativeStatus,
+    # Common data types
+    Error,
     FlatRatePricingOption,
+    Format,
+    FormatId,
+    GetMediaBuyDeliveryRequest,
+    GetMediaBuyDeliveryResponse,
+    GetProductsRequest,
+    GetProductsResponse,
+    GetSignalsRequest,
+    GetSignalsResponse,
+    ListAuthorizedPropertiesRequest,
+    ListAuthorizedPropertiesResponse,
+    ListCreativeFormatsRequest,
+    ListCreativeFormatsResponse,
+    ListCreativesRequest,
+    ListCreativesResponse,
     MediaBuy,
     MediaBuyStatus,
     Package,
+    PackageRequest,
     PackageStatus,
+    PreviewCreativeRequest,
+    PreviewCreativeResponse,
+    PriceGuidance,
     PricingModel,
+    Product,
+    Property,
+    ProvidePerformanceFeedbackRequest,
+    ProvidePerformanceFeedbackResponse,
+    PushNotificationConfig,
+    SyncCreativesRequest,
+    SyncCreativesResponse,
+    UpdateMediaBuyRequest,
+    UpdateMediaBuyResponse,
     VcpmAuctionPricingOption,
     VcpmFixedRatePricingOption,
 )
+from adcp.types.stable import (
+    TaskStatus as GeneratedTaskStatus,
+)
 from adcp.validation import (
     ValidationError,
     validate_adagents,
@@ -174,7 +177,7 @@ from adcp.validation import (
     validate_publisher_properties_item,
 )
 
-__version__ = "2.6.0"
+__version__ = "2.7.0"
 
 __all__ = [
     # Client classes
@@ -215,6 +218,7 @@ __all__ = [
     "ProvidePerformanceFeedbackResponse",
     "Error",
     "Format",
+    "FormatId",
     "Product",
     "Property",
     # Core domain types (from stable API)
@@ -223,6 +227,7 @@ __all__ = [
     "CreativeManifest",
     "MediaBuy",
     "Package",
+    "PackageRequest",
     # Package type aliases
     "CreatedPackageReference",
     # Status enums (for control flow)
@@ -230,7 +235,7 @@ __all__ = [
     "MediaBuyStatus",
     "PackageStatus",
     "PricingModel",
-    # Pricing options (all 9 types)
+    # Pricing-related types
     "CpcPricingOption",
     "CpcvPricingOption",
     "CpmAuctionPricingOption",
@@ -238,8 +243,11 @@ __all__ = [
     "CppPricingOption",
     "CpvPricingOption",
     "FlatRatePricingOption",
+    "PriceGuidance",
     "VcpmAuctionPricingOption",
     "VcpmFixedRatePricingOption",
+    # Configuration types
+    "PushNotificationConfig",
     # Adagents validation
     "AuthorizationContext",
     "fetch_adagents",

adcp/client.py

@@ -17,7 +17,15 @@ from adcp.exceptions import ADCPWebhookSignatureError
 from adcp.protocols.a2a import A2AAdapter
 from adcp.protocols.base import ProtocolAdapter
 from adcp.protocols.mcp import MCPAdapter
-from adcp.types._generated import (
+from adcp.types.core import (
+    Activity,
+    ActivityType,
+    AgentConfig,
+    Protocol,
+    TaskResult,
+    TaskStatus,
+)
+from adcp.types.stable import (
     ActivateSignalRequest,
     ActivateSignalResponse,
     GetMediaBuyDeliveryRequest,
@@ -40,15 +48,9 @@ from adcp.types._generated import (
     SyncCreativesResponse,
     WebhookPayload,
 )
-from adcp.types.core import (
-    Activity,
-    ActivityType,
-    AgentConfig,
-    Protocol,
-    TaskResult,
-    TaskStatus,
+from adcp.types.stable import (
+    TaskStatus as GeneratedTaskStatus,
 )
-from adcp.types.generated_poc.task_status import TaskStatus as GeneratedTaskStatus
 from adcp.utils.operation_id import create_operation_id
 
 logger = logging.getLogger(__name__)

adcp/simple.py

@@ -23,7 +23,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
 from adcp.exceptions import ADCPSimpleAPIError
-from adcp.types._generated import (
+from adcp.types.stable import (
     ActivateSignalRequest,
     ActivateSignalResponse,
     GetMediaBuyDeliveryRequest,

adcp/types/_generated.py

@@ -10,7 +10,7 @@ Auto-generated by datamodel-code-generator from JSON schemas.
 DO NOT EDIT MANUALLY.
 
 Generated from: https://github.com/adcontextprotocol/adcp/tree/main/schemas
-Generation date: 2025-11-18 12:52:17 UTC
+Generation date: 2025-11-19 02:03:09 UTC
 """
 # ruff: noqa: E501, I001
 from __future__ import annotations
@@ -19,7 +19,7 @@ from __future__ import annotations
 from adcp.types.generated_poc.activate_signal_request import ActivateSignalRequest
 from adcp.types.generated_poc.activate_signal_response import ActivateSignalResponse, ActivateSignalResponse1, ActivateSignalResponse2
 from adcp.types.generated_poc.activation_key import ActivationKey1, ActivationKey2
-from adcp.types.generated_poc.adagents import AuthorizedAgents, AuthorizedAgents1, AuthorizedAgents2, AuthorizedAgents3, AuthorizedSalesAgents, Contact, PropertyId, PropertyTag, PublisherProperties, PublisherProperties1, Tags
+from adcp.types.generated_poc.adagents import AuthorizedAgents, AuthorizedAgents1, AuthorizedAgents2, AuthorizedAgents3, AuthorizedSalesAgents, Contact, PropertyId, PropertyTag, Tags
 from adcp.types.generated_poc.asset_type import AssetTypeSchema, ContentLength, Dimensions, Duration, FileSize, Quality, Requirements, Type
 from adcp.types.generated_poc.audio_asset import AudioAsset
 from adcp.types.generated_poc.brand_manifest import Asset, AssetType, BrandManifest, Colors, Disclaimer, FeedFormat, Fonts, Logo, Metadata, ProductCatalog, UpdateFrequency
@@ -33,7 +33,7 @@ from adcp.types.generated_poc.cpm_fixed_option import CpmFixedRatePricingOption
 from adcp.types.generated_poc.cpp_option import CppPricingOption, Parameters
 from adcp.types.generated_poc.cpv_option import CpvPricingOption, ViewThreshold, ViewThreshold1
 from adcp.types.generated_poc.create_media_buy_request import CreateMediaBuyRequest, ReportingFrequency, ReportingWebhook, RequestedMetric
-from adcp.types.generated_poc.create_media_buy_response import CreateMediaBuyResponse, CreateMediaBuyResponse1, CreateMediaBuyResponse2, Package
+from adcp.types.generated_poc.create_media_buy_response import CreateMediaBuyResponse, CreateMediaBuyResponse1, CreateMediaBuyResponse2
 from adcp.types.generated_poc.creative_asset import CreativeAsset, Input
 from adcp.types.generated_poc.creative_assignment import CreativeAssignment
 from adcp.types.generated_poc.creative_manifest import CreativeManifest
@@ -80,7 +80,7 @@ from adcp.types.generated_poc.preview_creative_request import Input2, OutputForm
 from adcp.types.generated_poc.preview_creative_response import Input4, Preview, Preview1, Preview2, PreviewCreativeResponse, PreviewCreativeResponse1, PreviewCreativeResponse2, Response, Response1, Results, Results1
 from adcp.types.generated_poc.preview_render import Embedding, PreviewRender, PreviewRender1, PreviewRender2, PreviewRender3
 from adcp.types.generated_poc.pricing_model import PricingModel
-from adcp.types.generated_poc.product import DeliveryMeasurement, Product, ProductCard, ProductCardDetailed, PublisherProperties4, PublisherProperties5
+from adcp.types.generated_poc.product import DeliveryMeasurement, Product, ProductCard, ProductCardDetailed
 from adcp.types.generated_poc.promoted_offerings import AssetSelectors, Offering, PromotedOfferings
 from adcp.types.generated_poc.promoted_products import PromotedProducts
 from adcp.types.generated_poc.property import Identifier, Property, PropertyType, Tag
@@ -88,6 +88,7 @@ from adcp.types.generated_poc.protocol_envelope import ProtocolEnvelope
 from adcp.types.generated_poc.provide_performance_feedback_request import ProvidePerformanceFeedbackRequest
 from adcp.types.generated_poc.provide_performance_feedback_response import ProvidePerformanceFeedbackResponse, ProvidePerformanceFeedbackResponse1, ProvidePerformanceFeedbackResponse2
 from adcp.types.generated_poc.publisher_identifier_types import PublisherIdentifierTypes
+from adcp.types.generated_poc.publisher_property_selector import PublisherPropertySelector1, PublisherPropertySelector2, PublisherPropertySelector3
 from adcp.types.generated_poc.push_notification_config import Authentication, PushNotificationConfig, Scheme
 from adcp.types.generated_poc.reporting_capabilities import AvailableMetric, AvailableReportingFrequency, ReportingCapabilities
 from adcp.types.generated_poc.response import ProtocolResponse
@@ -113,6 +114,10 @@ from adcp.types.generated_poc.video_asset import VideoAsset
 from adcp.types.generated_poc.webhook_asset import Method, Method1, ResponseType, Security, WebhookAsset
 from adcp.types.generated_poc.webhook_payload import WebhookPayload
 
+# Special imports for name collisions (qualified names for types defined in multiple modules)
+from adcp.types.generated_poc.create_media_buy_response import Package as _PackageFromCreateMediaBuyResponse
+from adcp.types.generated_poc.package import Package as _PackageFromPackage
+
 # Backward compatibility aliases for renamed types
 Channels = AdvertisingChannels
 
@@ -146,9 +151,9 @@ __all__ = [
     "ListCreativesResponse", "Logo", "MarkdownAsset", "MarkdownFlavor", "Measurement",
     "MeasurementPeriod", "MediaBuy", "MediaBuyDelivery", "MediaBuyStatus", "Metadata", "Method",
     "Method1", "MetricType", "ModuleType", "NotificationType", "Offering", "OutputFormat",
-    "Pacing", "Package", "PackageRequest", "PackageStatus", "Packages", "Packages1", "Packages2",
-    "Packages3", "Pagination", "Parameters", "Performance", "PerformanceFeedback", "Placement",
-    "Preview", "Preview1", "Preview2", "PreviewCreativeRequest", "PreviewCreativeRequest1",
+    "Pacing", "PackageRequest", "PackageStatus", "Packages", "Packages1", "Packages2", "Packages3",
+    "Pagination", "Parameters", "Performance", "PerformanceFeedback", "Placement", "Preview",
+    "Preview1", "Preview2", "PreviewCreativeRequest", "PreviewCreativeRequest1",
     "PreviewCreativeRequest2", "PreviewCreativeResponse", "PreviewCreativeResponse1",
     "PreviewCreativeResponse2", "PreviewRender", "PreviewRender1", "PreviewRender2",
     "PreviewRender3", "PriceGuidance", "Pricing", "PricingModel", "PrimaryCountry", "Product",
@@ -157,7 +162,7 @@ __all__ = [
     "PropertyType", "ProtocolEnvelope", "ProtocolResponse", "ProvidePerformanceFeedbackRequest",
     "ProvidePerformanceFeedbackResponse", "ProvidePerformanceFeedbackResponse1",
     "ProvidePerformanceFeedbackResponse2", "PublisherDomain", "PublisherIdentifierTypes",
-    "PublisherProperties", "PublisherProperties1", "PublisherProperties4", "PublisherProperties5",
+    "PublisherPropertySelector1", "PublisherPropertySelector2", "PublisherPropertySelector3",
     "PushNotificationConfig", "Quality", "QuartileData", "QuerySummary", "Render",
     "ReportingCapabilities", "ReportingFrequency", "ReportingPeriod", "ReportingWebhook",
     "Request", "RequestedMetric", "Requirements", "Response", "Response1", "ResponseType",
@@ -171,5 +176,6 @@ __all__ = [
     "UpdateMediaBuyResponse", "UpdateMediaBuyResponse1", "UpdateMediaBuyResponse2", "UrlAsset",
     "UrlType", "ValidationMode", "VastAsset1", "VastAsset2", "VastVersion",
     "VcpmAuctionPricingOption", "VcpmFixedRatePricingOption", "VenueBreakdownItem", "VideoAsset",
-    "ViewThreshold", "ViewThreshold1", "WebhookAsset", "WebhookPayload"
+    "ViewThreshold", "ViewThreshold1", "WebhookAsset", "WebhookPayload",
+    "_PackageFromCreateMediaBuyResponse", "_PackageFromPackage"
 ]

adcp/types/aliases.py

@@ -31,7 +31,6 @@ 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,
@@ -64,6 +63,9 @@ from adcp.types._generated import (
     PreviewRender1,
     PreviewRender2,
     PreviewRender3,
+    # Publisher properties types
+    PropertyId,
+    PropertyTag,
     # Performance feedback responses
     ProvidePerformanceFeedbackResponse1,
     ProvidePerformanceFeedbackResponse2,
@@ -83,26 +85,23 @@ from adcp.types._generated import (
     VastAsset1,
     VastAsset2,
 )
-
-# Import Package types directly from their modules to avoid collision issues
-from adcp.types.generated_poc.create_media_buy_response import (
-    Package as CreatedPackageInternal,
+from adcp.types._generated import (
+    PublisherPropertySelector1 as PublisherPropertiesInternal,
 )
-from adcp.types.generated_poc.package import Package as FullPackageInternal
-
-# Import PublisherProperties types and related types from product module
-from adcp.types.generated_poc.product import (
-    PropertyId,
-    PropertyTag,
+from adcp.types._generated import (
+    PublisherPropertySelector2 as PublisherPropertiesByIdInternal,
 )
-from adcp.types.generated_poc.product import (
-    PublisherProperties as PublisherPropertiesInternal,
+from adcp.types._generated import (
+    PublisherPropertySelector3 as PublisherPropertiesByTagInternal,
 )
-from adcp.types.generated_poc.product import (
-    PublisherProperties4 as PublisherPropertiesByIdInternal,
+
+# Import all generated types that need semantic aliases
+from adcp.types._generated import (
+    # Package types (from name collision resolution)
+    _PackageFromCreateMediaBuyResponse as CreatedPackageInternal,
 )
-from adcp.types.generated_poc.product import (
-    PublisherProperties5 as PublisherPropertiesByTagInternal,
+from adcp.types._generated import (
+    _PackageFromPackage as FullPackageInternal,
 )
 
 # ============================================================================

adcp/types/generated_poc/adagents.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  adagents.json
-#   timestamp: 2025-11-18T03:35:10+00:00
+#   timestamp: 2025-11-19T02:02:39+00:00
 
 from __future__ import annotations
 
@@ -9,7 +9,7 @@ from typing import Annotated, Literal
 from adcp.types.base import AdCPBaseModel
 from pydantic import AnyUrl, AwareDatetime, ConfigDict, EmailStr, Field, RootModel
 
-from . import property
+from . import property, publisher_property_selector
 
 
 class PropertyId(RootModel[str]):
@@ -72,81 +72,6 @@ class AuthorizedAgents1(AdCPBaseModel):
     url: Annotated[AnyUrl, Field(description="The authorized agent's API endpoint URL")]
 
 
-class PublisherProperties(AdCPBaseModel):
-    model_config = ConfigDict(
-        extra='forbid',
-    )
-    property_ids: Annotated[
-        list[PropertyId],
-        Field(
-            description="Specific property IDs from the publisher's adagents.json properties array",
-            min_length=1,
-        ),
-    ]
-    publisher_domain: Annotated[
-        str,
-        Field(
-            description="Domain where the publisher's adagents.json is hosted (e.g., 'cnn.com')",
-            pattern='^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$',
-        ),
-    ]
-    selection_type: Annotated[
-        Literal['by_id'],
-        Field(description='Discriminator indicating selection by specific property IDs'),
-    ]
-
-
-class PublisherProperties1(AdCPBaseModel):
-    model_config = ConfigDict(
-        extra='forbid',
-    )
-    property_tags: Annotated[
-        list[PropertyTag],
-        Field(
-            description="Property tags from the publisher's adagents.json tags. Agent is authorized for all properties with these tags",
-            min_length=1,
-        ),
-    ]
-    publisher_domain: Annotated[
-        str,
-        Field(
-            description="Domain where the publisher's adagents.json is hosted (e.g., 'cnn.com')",
-            pattern='^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$',
-        ),
-    ]
-    selection_type: Annotated[
-        Literal['by_tag'], Field(description='Discriminator indicating selection by property tags')
-    ]
-
-
-class AuthorizedAgents3(AdCPBaseModel):
-    model_config = ConfigDict(
-        extra='forbid',
-    )
-    authorization_type: Annotated[
-        Literal['publisher_properties'],
-        Field(
-            description='Discriminator indicating authorization for properties from other publisher domains'
-        ),
-    ]
-    authorized_for: Annotated[
-        str,
-        Field(
-            description='Human-readable description of what this agent is authorized to sell',
-            max_length=500,
-            min_length=1,
-        ),
-    ]
-    publisher_properties: Annotated[
-        list[PublisherProperties | PublisherProperties1],
-        Field(
-            description='Properties from other publisher domains this agent is authorized for. Each entry specifies a publisher domain and which of their properties this agent can sell',
-            min_length=1,
-        ),
-    ]
-    url: Annotated[AnyUrl, Field(description="The authorized agent's API endpoint URL")]
-
-
 class Contact(AdCPBaseModel):
     model_config = ConfigDict(
         extra='forbid',
@@ -226,6 +151,38 @@ class AuthorizedAgents2(AdCPBaseModel):
     url: Annotated[AnyUrl, Field(description="The authorized agent's API endpoint URL")]
 
 
+class AuthorizedAgents3(AdCPBaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    authorization_type: Annotated[
+        Literal['publisher_properties'],
+        Field(
+            description='Discriminator indicating authorization for properties from other publisher domains'
+        ),
+    ]
+    authorized_for: Annotated[
+        str,
+        Field(
+            description='Human-readable description of what this agent is authorized to sell',
+            max_length=500,
+            min_length=1,
+        ),
+    ]
+    publisher_properties: Annotated[
+        list[
+            publisher_property_selector.PublisherPropertySelector1
+            | publisher_property_selector.PublisherPropertySelector2
+            | publisher_property_selector.PublisherPropertySelector3
+        ],
+        Field(
+            description='Properties from other publisher domains this agent is authorized for. Each entry specifies a publisher domain and which of their properties this agent can sell',
+            min_length=1,
+        ),
+    ]
+    url: Annotated[AnyUrl, Field(description="The authorized agent's API endpoint URL")]
+
+
 class AuthorizedSalesAgents(AdCPBaseModel):
     model_config = ConfigDict(
         extra='forbid',

adcp/types/generated_poc/product.py

@@ -1,13 +1,13 @@
 # generated by datamodel-codegen:
 #   filename:  product.json
-#   timestamp: 2025-11-18T05:05:53+00:00
+#   timestamp: 2025-11-19T02:02:39+00:00
 
 from __future__ import annotations
 
-from typing import Annotated, Any, Literal
+from typing import Annotated, Any
 
 from adcp.types.base import AdCPBaseModel
-from pydantic import AwareDatetime, ConfigDict, Field, RootModel
+from pydantic import AwareDatetime, ConfigDict, Field
 
 from . import cpc_option, cpcv_option, cpm_auction_option, cpm_fixed_option, cpp_option, cpv_option
 from . import creative_policy as creative_policy_1
@@ -15,7 +15,7 @@ from . import delivery_type as delivery_type_1
 from . import flat_rate_option
 from . import format_id as format_id_1
 from . import measurement as measurement_1
-from . import placement
+from . import placement, publisher_property_selector
 from . import reporting_capabilities as reporting_capabilities_1
 from . import vcpm_auction_option, vcpm_fixed_option
 
@@ -69,77 +69,6 @@ class ProductCardDetailed(AdCPBaseModel):
     ]
 
 
-class PublisherProperties(AdCPBaseModel):
-    model_config = ConfigDict(
-        extra='forbid',
-    )
-    publisher_domain: Annotated[
-        str,
-        Field(
-            description="Domain where publisher's adagents.json is hosted (e.g., 'cnn.com')",
-            pattern='^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$',
-        ),
-    ]
-    selection_type: Annotated[
-        Literal['all'],
-        Field(
-            description='Discriminator indicating all properties from this publisher are included'
-        ),
-    ]
-
-
-class PropertyId(RootModel[str]):
-    root: Annotated[str, Field(pattern='^[a-z0-9_]+$')]
-
-
-class PublisherProperties4(AdCPBaseModel):
-    model_config = ConfigDict(
-        extra='forbid',
-    )
-    property_ids: Annotated[
-        list[PropertyId],
-        Field(description="Specific property IDs from the publisher's adagents.json", min_length=1),
-    ]
-    publisher_domain: Annotated[
-        str,
-        Field(
-            description="Domain where publisher's adagents.json is hosted (e.g., 'cnn.com')",
-            pattern='^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$',
-        ),
-    ]
-    selection_type: Annotated[
-        Literal['by_id'],
-        Field(description='Discriminator indicating selection by specific property IDs'),
-    ]
-
-
-class PropertyTag(PropertyId):
-    pass
-
-
-class PublisherProperties5(AdCPBaseModel):
-    model_config = ConfigDict(
-        extra='forbid',
-    )
-    property_tags: Annotated[
-        list[PropertyTag],
-        Field(
-            description="Property tags from the publisher's adagents.json. Product covers all properties with these tags",
-            min_length=1,
-        ),
-    ]
-    publisher_domain: Annotated[
-        str,
-        Field(
-            description="Domain where publisher's adagents.json is hosted (e.g., 'cnn.com')",
-            pattern='^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$',
-        ),
-    ]
-    selection_type: Annotated[
-        Literal['by_tag'], Field(description='Discriminator indicating selection by property tags')
-    ]
-
-
 class Product(AdCPBaseModel):
     model_config = ConfigDict(
         extra='forbid',
@@ -212,7 +141,11 @@ class Product(AdCPBaseModel):
     ] = None
     product_id: Annotated[str, Field(description='Unique identifier for the product')]
     publisher_properties: Annotated[
-        list[PublisherProperties | PublisherProperties4 | PublisherProperties5],
+        list[
+            publisher_property_selector.PublisherPropertySelector1
+            | publisher_property_selector.PublisherPropertySelector2
+            | publisher_property_selector.PublisherPropertySelector3
+        ],
         Field(
             description="Publisher properties covered by this product. Buyers fetch actual property definitions from each publisher's adagents.json and validate agent authorization. Selection patterns mirror the authorization patterns in adagents.json for consistency.",
             min_length=1,

adcp/types/generated_poc/publisher_property_selector.py

@@ -0,0 +1,81 @@
+# generated by datamodel-codegen:
+#   filename:  publisher-property-selector.json
+#   timestamp: 2025-11-19T02:02:39+00:00
+
+from __future__ import annotations
+
+from typing import Annotated, Literal
+
+from adcp.types.base import AdCPBaseModel
+from pydantic import ConfigDict, Field, RootModel
+
+
+class PublisherPropertySelector1(AdCPBaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    publisher_domain: Annotated[
+        str,
+        Field(
+            description="Domain where publisher's adagents.json is hosted (e.g., 'cnn.com')",
+            pattern='^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$',
+        ),
+    ]
+    selection_type: Annotated[
+        Literal['all'],
+        Field(
+            description='Discriminator indicating all properties from this publisher are included'
+        ),
+    ]
+
+
+class PropertyId(RootModel[str]):
+    root: Annotated[str, Field(pattern='^[a-z0-9_]+$')]
+
+
+class PublisherPropertySelector2(AdCPBaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    property_ids: Annotated[
+        list[PropertyId],
+        Field(description="Specific property IDs from the publisher's adagents.json", min_length=1),
+    ]
+    publisher_domain: Annotated[
+        str,
+        Field(
+            description="Domain where publisher's adagents.json is hosted (e.g., 'cnn.com')",
+            pattern='^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$',
+        ),
+    ]
+    selection_type: Annotated[
+        Literal['by_id'],
+        Field(description='Discriminator indicating selection by specific property IDs'),
+    ]
+
+
+class PropertyTag(PropertyId):
+    pass
+
+
+class PublisherPropertySelector3(AdCPBaseModel):
+    model_config = ConfigDict(
+        extra='forbid',
+    )
+    property_tags: Annotated[
+        list[PropertyTag],
+        Field(
+            description="Property tags from the publisher's adagents.json. Selector covers all properties with these tags",
+            min_length=1,
+        ),
+    ]
+    publisher_domain: Annotated[
+        str,
+        Field(
+            description="Domain where publisher's adagents.json is hosted (e.g., 'cnn.com')",
+            pattern='^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$',
+        ),
+    ]
+    selection_type: Annotated[
+        Literal['by_tag'], Field(description='Discriminator indicating selection by property tags')
+    ]

adcp/types/stable.py

@@ -48,6 +48,7 @@ from adcp.types._generated import (
     Error,
     FlatRatePricingOption,
     Format,
+    FormatId,
     GetMediaBuyDeliveryRequest,
     GetMediaBuyDeliveryResponse,
     GetProductsRequest,
@@ -66,14 +67,17 @@ from adcp.types._generated import (
     MarkdownAsset,
     MediaBuy,
     MediaBuyStatus,
+    PackageRequest,
     PackageStatus,
     PreviewCreativeRequest,
     PreviewCreativeResponse,
+    PriceGuidance,
     PricingModel,
     Product,
     Property,
     ProvidePerformanceFeedbackRequest,
     ProvidePerformanceFeedbackResponse,
+    PushNotificationConfig,
     SyncCreativesRequest,
     SyncCreativesResponse,
     TasksGetRequest,
@@ -90,11 +94,12 @@ from adcp.types._generated import (
     VcpmFixedRatePricingOption,
     VideoAsset,
     WebhookAsset,
+    WebhookPayload,
 )
 
 # Import all generated types from internal consolidated module
-# Import Package directly from its module to avoid collision with Response Package
-from adcp.types.generated_poc.package import Package
+# Import Package from _generated (uses qualified name to avoid collision)
+from adcp.types._generated import _PackageFromPackage as Package
 
 # Note: BrandManifest is currently split into BrandManifest1/2 due to upstream schema
 # using anyOf incorrectly. This will be fixed upstream to create a single BrandManifest type.
@@ -142,11 +147,13 @@ __all__ = [
     "CreativeManifest",
     "Error",
     "Format",
+    "FormatId",
     "MediaBuy",
     "Package",
+    "PackageRequest",
     "Product",
     "Property",
-    # Pricing options
+    # Pricing-related types
     "CpcPricingOption",
     "CpcvPricingOption",
     "CpmAuctionPricingOption",
@@ -154,6 +161,7 @@ __all__ = [
     "CppPricingOption",
     "CpvPricingOption",
     "FlatRatePricingOption",
+    "PriceGuidance",
     "VcpmAuctionPricingOption",
     "VcpmFixedRatePricingOption",
     # Status enums
@@ -163,6 +171,8 @@ __all__ = [
     "PricingModel",
     "TaskStatus",
     "TaskType",
+    # Configuration types
+    "PushNotificationConfig",
     # Assets
     "AudioAsset",
     "CssAsset",
@@ -174,4 +184,5 @@ __all__ = [
     "UrlAsset",
     "VideoAsset",
     "WebhookAsset",
+    "WebhookPayload",
 ]

adcp/utils/preview_cache.py

@@ -10,7 +10,7 @@ from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
     from adcp.client import ADCPClient
-    from adcp.types._generated import CreativeManifest, Format, FormatId, Product
+    from adcp.types.stable import CreativeManifest, Format, FormatId, Product
 
 logger = logging.getLogger(__name__)
 
@@ -67,7 +67,7 @@ class PreviewURLGenerator:
         Returns:
             Preview data with preview_url and metadata, or None if generation fails
         """
-        from adcp.types._generated import PreviewCreativeRequest1
+        from adcp.types.aliases import PreviewCreativeFormatRequest
 
         cache_key = _make_manifest_cache_key(format_id, manifest.model_dump(exclude_none=True))
 
@@ -75,7 +75,7 @@ class PreviewURLGenerator:
             return self._preview_cache[cache_key]
 
         try:
-            request = PreviewCreativeRequest1(
+            request = PreviewCreativeFormatRequest(
                 request_type="single",
                 format_id=format_id,
                 creative_manifest=manifest,
@@ -123,7 +123,7 @@ class PreviewURLGenerator:
         Returns:
             List of preview data dicts (or None for failures), in same order as requests
         """
-        from adcp.types._generated import PreviewCreativeRequest
+        from adcp.types.stable import PreviewCreativeRequest
 
         if not requests:
             return []
@@ -396,7 +396,7 @@ def _create_sample_manifest_for_format(fmt: Format) -> CreativeManifest | None:
     Returns:
         Sample CreativeManifest, or None if unable to create one
     """
-    from adcp.types._generated import CreativeManifest
+    from adcp.types.stable import CreativeManifest
 
     if not fmt.assets_required:
         return None
@@ -436,7 +436,7 @@ def _create_sample_manifest_for_format_id(
     Returns:
         Sample CreativeManifest with placeholder assets
     """
-    from adcp.types._generated import CreativeManifest, ImageAsset, UrlAsset
+    from adcp.types.stable import CreativeManifest, ImageAsset, UrlAsset
 
     assets = {
         "primary_asset": ImageAsset(url="https://example.com/sample-image.jpg"),
@@ -456,7 +456,7 @@ def _create_sample_asset(asset_type: str | None) -> Any:
     Returns:
         Sample asset object (Pydantic model)
     """
-    from adcp.types._generated import (
+    from adcp.types.stable import (
         HtmlAsset,
         ImageAsset,
         TextAsset,

{adcp-2.6.0.dist-info → adcp-2.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: adcp
-Version: 2.6.0
+Version: 2.7.0
 Summary: Official Python client for the Ad Context Protocol (AdCP)
 Author-email: AdCP Community <maintainers@adcontextprotocol.org>
 License: Apache-2.0

{adcp-2.6.0.dist-info → adcp-2.7.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
-adcp/__init__.py,sha256=WTIxgfr9VU1apx9J6AinZ3xwV61Z2O0smUnQEdEarmY,9034
+adcp/__init__.py,sha256=yoj3l_T1DPfbYUIWSMWMXOsxTqhIyhbeuvlAtU-HAGg,9188
 adcp/__main__.py,sha256=YF2GUXF1LICW1TPxNQiGIfSp5cpAsejoEG2fuOgbzrc,12839
 adcp/adagents.py,sha256=o-vTBmdZvu9aER-TAlLLL3s-WGYY8N67jnrAH24lST8,22333
-adcp/client.py,sha256=Z70D0bHcLNmr0NBGXbFUvW8dBdzHkcv8CmFcYo3pIjw,28803
+adcp/client.py,sha256=EzHS5Aysau3liwkGp_clYkYxTHACeqP4zNT8jSLz0hs,28789
 adcp/config.py,sha256=Vsy7ZPOI8G3fB_i5Nk-CHbC7wdasCUWuKlos0fwA0kY,2017
 adcp/exceptions.py,sha256=1aZEWpaM92OxD2jl9yKsqJp5ReSWaj0S0DFhxChhLlA,6732
 adcp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adcp/simple.py,sha256=A3Ly_GadbXNodi-LCjbP1uYAkFl0bAtz9hCpTGwCDPE,10441
+adcp/simple.py,sha256=OYoAF9MBK4dkvYQz3eMOVNEC-OZUNRkCgLDxmKSNZZY,10437
 adcp/validation.py,sha256=NsTwTQbLmd1Z1bMcztR1llJB21ai1xuw5aVrca7LoE8,6793
 adcp/protocols/__init__.py,sha256=6UFwACQ0QadBUzy17wUROHqsJDp8ztPW2jzyl53Zh_g,262
 adcp/protocols/a2a.py,sha256=FHgc6G_eU2qD0vH7_RyS1eZvUFSb2j3-EsceoHPi384,12467
@@ -14,16 +14,16 @@ adcp/protocols/mcp.py,sha256=d9uSpGd0BKvQ0JxztkfDvHwoDrDYhuiw5oivpYOAbmM,16647
 adcp/testing/__init__.py,sha256=ZWp_floWjVZfy8RBG5v_FUXQ8YbN7xjXvVcX-_zl_HU,1416
 adcp/testing/test_helpers.py,sha256=-UKuxxyKQald5EvXxguQH34b3J0JdsxKH_nRT6GTjkQ,10029
 adcp/types/__init__.py,sha256=V_Tme95-OoTGZkrMTQwNP76cN5QelO-Q-9sRTg-EBIA,2926
-adcp/types/_generated.py,sha256=p4U_P3BROGjCnS0Cd2o9ZJ_bShQLffB3D9_0D29JB0g,14926
-adcp/types/aliases.py,sha256=puqrz_cwlfSq6Td78EIaWtDUzcsCGMVM98Pv3T7qSlo,18445
+adcp/types/_generated.py,sha256=XYYu3xvuZ0ivIOHt5pViD8FBXehTv3OlAQcxQsd2TzA,15307
+adcp/types/aliases.py,sha256=cTQa2SKWA4dzJEClWe0nkdZ0Z2G_6bbORqnfwHyyWmE,18325
 adcp/types/base.py,sha256=QoEuVfI4yzefup0dc2KN11AcJTbcGxRep7xOw5hXfs8,837
 adcp/types/core.py,sha256=RXkKCWCXS9BVJTNpe3Opm5O1I_LaQPMUuVwa-ipvS1Q,4839
-adcp/types/stable.py,sha256=Q_rxnpLuUGfqGusiJcMuPADIGLQgs2uLp98S4YnAksw,4997
+adcp/types/stable.py,sha256=m0HUdlkwQPGFPSGBrkEHp7fuCjKHhw9_E5WQuQsIn50,5244
 adcp/types/generated_poc/__init__.py,sha256=bgFFvPK1-e04eOnyw0qmtVMzoA2V7GeAMPDVrx-VIwA,103
 adcp/types/generated_poc/activate_signal_request.py,sha256=mI1MskO30yEcbQQ7ueEExMF7FhfARQj0_kbz5CAdSzQ,1188
 adcp/types/generated_poc/activate_signal_response.py,sha256=ltt5yDsocK3VfELeRuMjUiNMmUZe__VP5az6fsMCOuc,2015
 adcp/types/generated_poc/activation_key.py,sha256=FFUHvn-q0zKMdImOv-VHKS_78U8FVikUE8M-IOuiamg,952
-adcp/types/generated_poc/adagents.py,sha256=5HqvEckcnEZkrGDbZxa7zBR0xeLaj7WGii-dZDjvFbY,8490
+adcp/types/generated_poc/adagents.py,sha256=tuMLnT5RRwVFCe8otpHugkz33a3IS3naLUCHUgxvk9c,7192
 adcp/types/generated_poc/asset_type.py,sha256=mNeAkjoEACZbj7lvqjAHcQ6vSNW8dt1qFNxp0fON-Qw,3169
 adcp/types/generated_poc/audio_asset.py,sha256=gu1HQI0310qmY27OzHzBD_gPTPYJv7GzCDgrEymZJ-k,795
 adcp/types/generated_poc/brand_manifest.py,sha256=jJYmM81eTMqVoBFHvoUJEaCrlKcsS_WQa8aJfUcAv3Y,7501
@@ -85,7 +85,7 @@ adcp/types/generated_poc/preview_creative_request.py,sha256=ul7gJhSQPR9EnPXfjoD5
 adcp/types/generated_poc/preview_creative_response.py,sha256=d2OGyfRATgOlLv9B7ow04fzwMyUCmLYbm9s1cg4MRlU,6140
 adcp/types/generated_poc/preview_render.py,sha256=zLlG5IaZsyxZOPzHqjBiyyl7MU3aqVJtZonySAj2ZBk,5076
 adcp/types/generated_poc/pricing_model.py,sha256=8HPxHhLHcOA8vvkqyj5Uem8dWxRgsnbx73l2WAWm-Zg,324
-adcp/types/generated_poc/product.py,sha256=nxKXK6jsnHsanB1K3jkws19yW0cd1VOFmdjM2XAYN4Y,7993
+adcp/types/generated_poc/product.py,sha256=QRgqTw0ABkDSrMy_IpNfawY2xBDH57zGniteBwZx_6o,6038
 adcp/types/generated_poc/promoted_offerings.py,sha256=R5a551tIy43kZ2BUk-Lktu0t5hXLJfcNZWLHNDBgXp0,3223
 adcp/types/generated_poc/promoted_products.py,sha256=kdPVuzMgOCsHjQiW6YIg9AYriLAFqTFYd-4oDEmEexM,1252
 adcp/types/generated_poc/property.py,sha256=r6km5T5-Sd7tf6w7XmINWyAetlExq1TDNEee8hexaVE,2563
@@ -93,6 +93,7 @@ adcp/types/generated_poc/protocol_envelope.py,sha256=4XAHgtypta00roZnzsAhfVu1n_h
 adcp/types/generated_poc/provide_performance_feedback_request.py,sha256=nuhQuva-W4rQMCfK-0rmeX2lwVA9UcbGP4InKFDRm2Q,2820
 adcp/types/generated_poc/provide_performance_feedback_response.py,sha256=6eVf1r8O_8PPBOXdB1w_7JdZUPkPvip7WVIMsANqoGI,1973
 adcp/types/generated_poc/publisher_identifier_types.py,sha256=CctG8XQRfR1wtxo9bCCuU4oGZ8UoTa87FE0R-kPxYy0,321
+adcp/types/generated_poc/publisher_property_selector.py,sha256=QgxN9jiS9dExTYzLKYsdndDVFXfbLONxcz5Q6xbJhtM,2424
 adcp/types/generated_poc/push_notification_config.py,sha256=s69T-mz9dSiKPJj-U1icEvqYn0T_Lwl4eygKiM0KhCM,1732
 adcp/types/generated_poc/reporting_capabilities.py,sha256=Q-Bdl-Vyqky6q3doorGXcvDCb6Kl3go3qnaptp6RJgY,2107
 adcp/types/generated_poc/response.py,sha256=BrWU9po0mAyIs8htcKgqsO8hehXo0pekqC7hyZNCwrA,707
@@ -119,11 +120,11 @@ adcp/types/generated_poc/webhook_asset.py,sha256=iSSikTEiBBZl0nVEx7tTMHHb1Tknv7l
 adcp/types/generated_poc/webhook_payload.py,sha256=59d5lN932v_WQC3gHwf_QV4SxKlfsqJmjmtp5ZtziWM,3563
 adcp/utils/__init__.py,sha256=uetvSJB19CjQbtwEYZiTnumJG11GsafQmXm5eR3hL7E,153
 adcp/utils/operation_id.py,sha256=wQX9Bb5epXzRq23xoeYPTqzu5yLuhshg7lKJZihcM2k,294
-adcp/utils/preview_cache.py,sha256=oc1AUkPrHHmUqfZa5920OCKY7qrDDR86XO6oi1PEHTA,18504
+adcp/utils/preview_cache.py,sha256=PH9bSDOPQzLKqkC_o0a9Xn2i4cNC2oy76dkJdS3j7ck,18491
 adcp/utils/response_parser.py,sha256=uPk2vIH-RYZmq7y3i8lC4HTMQ3FfKdlgXKTjgJ1955M,6253
-adcp-2.6.0.dist-info/licenses/LICENSE,sha256=PF39NR3Ae8PLgBhg3Uxw6ju7iGVIf8hfv9LRWQdii_U,629
-adcp-2.6.0.dist-info/METADATA,sha256=r91G1kiiN13GSt8F5PBOxJQiqHBayDibdtvAd8v-blI,25810
-adcp-2.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-adcp-2.6.0.dist-info/entry_points.txt,sha256=DQKpcGsJX8DtVI_SGApQ7tNvqUB4zkTLaTAEpFgmi3U,44
-adcp-2.6.0.dist-info/top_level.txt,sha256=T1_NF0GefncFU9v_k56oDwKSJREyCqIM8lAwNZf0EOs,5
-adcp-2.6.0.dist-info/RECORD,,
+adcp-2.7.0.dist-info/licenses/LICENSE,sha256=PF39NR3Ae8PLgBhg3Uxw6ju7iGVIf8hfv9LRWQdii_U,629
+adcp-2.7.0.dist-info/METADATA,sha256=SXCp0-h2nmhbbaRPPH4wO4C6pqWqdqYLbQRr7uon4rE,25810
+adcp-2.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+adcp-2.7.0.dist-info/entry_points.txt,sha256=DQKpcGsJX8DtVI_SGApQ7tNvqUB4zkTLaTAEpFgmi3U,44
+adcp-2.7.0.dist-info/top_level.txt,sha256=T1_NF0GefncFU9v_k56oDwKSJREyCqIM8lAwNZf0EOs,5
+adcp-2.7.0.dist-info/RECORD,,