adcp 2.6.0__tar.gz → 2.7.0__tar.gz

{adcp-2.6.0/src/adcp.egg-info → adcp-2.7.0}/PKG-INFO

@@ -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 → adcp-2.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "adcp"
-version = "2.6.0"
+version = "2.7.0"
 description = "Official Python client for the Ad Context Protocol (AdCP)"
 authors = [
     {name = "AdCP Community", email = "maintainers@adcontextprotocol.org"}

{adcp-2.6.0 → adcp-2.7.0}/src/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-2.6.0 → adcp-2.7.0}/src/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-2.6.0 → adcp-2.7.0}/src/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-2.6.0 → adcp-2.7.0}/src/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-2.6.0 → adcp-2.7.0}/src/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-2.6.0 → adcp-2.7.0}/src/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-2.6.0 → adcp-2.7.0}/src/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,