fix: complete FormatId union support and update all ImageAsset usages

- Add core/**/*.py to FormatId union reference fixes
- Add GetProductsRequest and other request types to model_rebuild list
- Update all ImageAsset creations to include required width/height fields
  - preview_cache.py: _create_sample_manifest_for_format_id
  - test_preview_html.py: all test manifests

Test results: 306 passing (all tests passing!)

This completes the schema sync work. All tests now pass with the new
FormatId discriminated union and updated asset dimension requirements.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: bokelley

scripts/consolidate_exports.py

@@ -236,8 +236,11 @@ def generate_consolidated_exports() -> str:
         "Placement.model_rebuild()",
         "",
         "# Rebuild request types that reference FormatId discriminated unions",
+        "GetProductsRequest.model_rebuild()",
         "ListCreativeFormatsRequest.model_rebuild()",
         "BuildCreativeRequest.model_rebuild()",
+        "SyncCreativesRequest.model_rebuild()",
+        "ListCreativesRequest.model_rebuild()",
         "",
         "# Rebuild response types that reference FormatId discriminated unions",
         "GetProductsResponse.model_rebuild()",

scripts/post_generate_fixes.py

@@ -190,7 +190,7 @@ def fix_format_id_union_references():
     This fixes field annotations to accept both variants.
     """
     files_to_fix = []
-    for pattern in ["creative/**/*.py", "media_buy/**/*.py"]:
+    for pattern in ["core/**/*.py", "creative/**/*.py", "media_buy/**/*.py"]:
         files_to_fix.extend(OUTPUT_DIR.glob(pattern))
 
     for file_path in files_to_fix:

src/adcp/types/_generated.py

@@ -10,7 +10,7 @@
 DO NOT EDIT MANUALLY.
 
 Generated from: https://github.com/adcontextprotocol/adcp/tree/main/schemas
-Generation date: 2025-11-22 19:30:48 UTC
+Generation date: 2025-11-22 19:37:19 UTC
 """
 # ruff: noqa: E501, I001
 from __future__ import annotations
@@ -243,8 +243,11 @@
 Placement.model_rebuild()
 
 # Rebuild request types that reference FormatId discriminated unions
+GetProductsRequest.model_rebuild()
 ListCreativeFormatsRequest.model_rebuild()
 BuildCreativeRequest.model_rebuild()
+SyncCreativesRequest.model_rebuild()
+ListCreativesRequest.model_rebuild()
 
 # Rebuild response types that reference FormatId discriminated unions
 GetProductsResponse.model_rebuild()

src/adcp/types/generated_poc/core/creative_asset.py

@@ -69,8 +69,7 @@ class CreativeAsset(AdCPBaseModel):
         Field(description='Assets required by the format, keyed by asset_role'),
     ]
     creative_id: Annotated[str, Field(description='Unique identifier for the creative')]
-    format_id: Annotated[
-        FormatId2,
+    format_id: Annotated[FormatId1 | FormatId2,
         Field(
             description='Format identifier specifying which format this creative conforms to. Can be: (1) concrete format_id referencing a format with fixed dimensions, (2) template format_id referencing a template format, or (3) parameterized format_id with dimensions/duration parameters for template formats.',
             title='Format ID',

src/adcp/types/generated_poc/core/creative_manifest.py

@@ -54,8 +54,7 @@ class CreativeManifest(AdCPBaseModel):
         ),
     ]
     ext: ext_1.ExtensionObject | None = None
-    format_id: Annotated[
-        FormatId2,
+    format_id: Annotated[FormatId1 | FormatId2,
         Field(
             description="Format identifier this manifest is for. Can be a template format (id only) or a deterministic format (id + dimensions/duration). For dimension-specific creatives, include width/height/unit in the format_id to create a unique identifier (e.g., {id: 'display_static', width: 300, height: 250, unit: 'px'}).",
             title='Format ID',

src/adcp/types/generated_poc/core/format.py

@@ -148,8 +148,7 @@ class FormatCard(AdCPBaseModel):
     model_config = ConfigDict(
         extra='forbid',
     )
-    format_id: Annotated[
-        FormatId2,
+    format_id: Annotated[FormatId1 | FormatId2,
         Field(
             description='Creative format defining the card layout (typically format_card_standard)',
             title='Format ID',
@@ -165,8 +164,7 @@ class FormatCardDetailed(AdCPBaseModel):
     model_config = ConfigDict(
         extra='forbid',
     )
-    format_id: Annotated[
-        FormatId2,
+    format_id: Annotated[FormatId1 | FormatId2,
         Field(
             description='Creative format defining the detailed card layout (typically format_card_detailed)',
             title='Format ID',
@@ -224,16 +222,15 @@ class Format(AdCPBaseModel):
             description='Optional detailed card with carousel and full specifications. Provides rich format documentation similar to ad spec pages.'
         ),
     ] = None
-    format_id: Annotated[
-        FormatId2,
+    format_id: Annotated[FormatId1 | FormatId2,
         Field(
             description='Structured format identifier with agent URL and format name',
             title='Format ID',
         ),
     ]
     name: Annotated[str, Field(description='Human-readable format name')]
     output_format_ids: Annotated[
-        list[FormatId2] | None,
+        list[FormatId1 | FormatId2] | None,
         Field(
             description='For generative formats: array of format IDs that this format can generate. When a format accepts inputs like brand_manifest and message, this specifies what concrete output formats can be produced (e.g., a generative banner format might output standard image banner formats).'
         ),

src/adcp/types/generated_poc/core/package.py

@@ -42,7 +42,7 @@ class Package(AdCPBaseModel):
     ] = None
     ext: ext_1.ExtensionObject | None = None
     format_ids_to_provide: Annotated[
-        list[FormatId2] | None,
+        list[FormatId1 | FormatId2] | None,
         Field(description='Format IDs that creative assets will be provided for this package'),
     ] = None
     impressions: Annotated[

src/adcp/types/generated_poc/core/placement.py

@@ -20,7 +20,7 @@ class Placement(AdCPBaseModel):
         str | None, Field(description='Detailed description of where and how the placement appears')
     ] = None
     format_ids: Annotated[
-        list[FormatId2] | None,
+        list[FormatId1 | FormatId2] | None,
         Field(
             description='Format IDs supported by this specific placement. Can include: (1) concrete format_ids (fixed dimensions), (2) template format_ids without parameters (accepts any dimensions/duration), or (3) parameterized format_ids (specific dimension/duration constraints).',
             min_length=1,

src/adcp/types/generated_poc/core/product.py

@@ -48,8 +48,7 @@ class ProductCard(AdCPBaseModel):
     model_config = ConfigDict(
         extra='forbid',
     )
-    format_id: Annotated[
-        FormatId2,
+    format_id: Annotated[FormatId1 | FormatId2,
         Field(
             description='Creative format defining the card layout (typically product_card_standard)',
             title='Format ID',
@@ -65,8 +64,7 @@ class ProductCardDetailed(AdCPBaseModel):
     model_config = ConfigDict(
         extra='forbid',
     )
-    format_id: Annotated[
-        FormatId2,
+    format_id: Annotated[FormatId1 | FormatId2,
         Field(
             description='Creative format defining the detailed card layout (typically product_card_detailed)',
             title='Format ID',
@@ -110,7 +108,7 @@ class Product(AdCPBaseModel):
     ] = None
     ext: ext_1.ExtensionObject | None = None
     format_ids: Annotated[
-        list[FormatId2],
+        list[FormatId1 | FormatId2],
         Field(
             description='Array of supported creative format IDs - structured format_id objects with agent_url and id'
         ),

src/adcp/types/generated_poc/core/product_filters.py

@@ -74,7 +74,7 @@ class ProductFilters(AdCPBaseModel):
         ),
     ] = None
     format_ids: Annotated[
-        list[FormatId2] | None, Field(description='Filter by specific format IDs')
+        list[FormatId1 | FormatId2] | None, Field(description='Filter by specific format IDs')
     ] = None
     format_types: Annotated[
         list[format_category.FormatCategory] | None, Field(description='Filter by format types')