fix: update for latest schema changes and FormatId discriminated union

- Remove Render type (removed from upstream schemas)
- Add FormatId backward compatibility union (FormatId1 | FormatId2)
- Fix module-qualified FormatId references in generated code
- Add comprehensive model_rebuild() calls for FormatId-related types
- Update ImageAsset and VideoAsset to include required width/height fields
- Add PreviewCreativeRequest discriminator for request_type field
- Fix FormatId2-only references to use full union type
- Update consolidate_exports.py to include all necessary model rebuilds

Test results: 291 passing (up from 280), 15 failing (down from 26)

The remaining failures are related to upstream schema evolution that
requires updates to test fixtures and mock data.

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

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

Author: bokelley

schemas/cache/.hashes.json

@@ -6,34 +6,35 @@
   "https://adcontextprotocol.org/schemas/2.4.0/core/assets/css-asset.json": "6db98d27f3b2a487008696a83576619c3dfbca116d09114b0afaace47f81822b",
   "https://adcontextprotocol.org/schemas/2.4.0/core/assets/daast-asset.json": "e29482b0c951bd2f623c3e84aaf48c2df7e8a7cd4dd91770d05cfc5ca4f1aa54",
   "https://adcontextprotocol.org/schemas/2.4.0/core/assets/html-asset.json": "2fe28b9ad4d57f4bc4ed5266b99490200a836a530094fcfb20d590a81a647a62",
-  "https://adcontextprotocol.org/schemas/2.4.0/core/assets/image-asset.json": "31fcf279a97db2ea7116bac8779141421791fdcfbd9dbf2b72841b91c7852b95",
+  "https://adcontextprotocol.org/schemas/2.4.0/core/assets/image-asset.json": "7f49c58a707b8d322f0117b87683fe0dcc211832dc7e277d85d6981e241f0153",
   "https://adcontextprotocol.org/schemas/2.4.0/core/assets/javascript-asset.json": "a6c52199a7dcfbfdc14fd59be7d8bc77fe9396957f231165ad03aaa5965d6ec2",
   "https://adcontextprotocol.org/schemas/2.4.0/core/assets/text-asset.json": "7ff931a8cf30554b4038694ccbe3f50f8d61c5fcde377d674dc449cd9b4e40e8",
   "https://adcontextprotocol.org/schemas/2.4.0/core/assets/url-asset.json": "0f3e962e859475f8646b21e7b8bcf85d45783ae0b2981b7e017a5ead39400f82",
   "https://adcontextprotocol.org/schemas/2.4.0/core/assets/vast-asset.json": "aad8e446a913d6c2731da3b53cd8bf3a98baa52f70846d4c32781f05301edb77",
-  "https://adcontextprotocol.org/schemas/2.4.0/core/assets/video-asset.json": "fec9d9e9398d5f4dcb0b379fe6ec650aa8af62e98e5009c81e42c57bf0d1628d",
+  "https://adcontextprotocol.org/schemas/2.4.0/core/assets/video-asset.json": "7a59c7657d7316169d03742cfbfbbf624230e7916b0f7d7066649033173e21ab",
   "https://adcontextprotocol.org/schemas/2.4.0/core/assets/webhook-asset.json": "01605cbf686038880507ddaaecbd8004f73aca77f2f4c9d455de6737a0334ec1",
   "https://adcontextprotocol.org/schemas/2.4.0/core/brand-manifest-ref.json": "bf8a42652a8b203765a8a3676b1b9f56b00cd54ae8c34e37aaaa03bd001dc009",
   "https://adcontextprotocol.org/schemas/2.4.0/core/brand-manifest.json": "3d8c16f481bf7c7f3df2d02ac5b955430596c18c8719f1817f0bea4a43c254de",
   "https://adcontextprotocol.org/schemas/2.4.0/core/context.json": "b055843d32481d2e9d4c149c4ce121e17db4c80e13a8391e6a87a5a3c8ea380d",
-  "https://adcontextprotocol.org/schemas/2.4.0/core/creative-asset.json": "d3d3a12a53d929a0c963f47729fdc193f23c48ab86e1d471a498070263dafd85",
+  "https://adcontextprotocol.org/schemas/2.4.0/core/creative-asset.json": "76efc334d9f4a81beb12b66c982bfdbfd577f2948dc2ff5bedb1dd615e0185ad",
   "https://adcontextprotocol.org/schemas/2.4.0/core/creative-assignment.json": "f49b9bbd01e2c6562df3337f3ff604dc2fd93b798ea75b02b8bb665854440b8b",
   "https://adcontextprotocol.org/schemas/2.4.0/core/creative-filters.json": "42d4a051eef8072103101955941302e3dd8c337e316458379b565e6d0085a3ad",
-  "https://adcontextprotocol.org/schemas/2.4.0/core/creative-manifest.json": "5497f619bd86eaae209ae17b786b0a825868cf0c591de34d623646bf9a0b6530",
+  "https://adcontextprotocol.org/schemas/2.4.0/core/creative-manifest.json": "e476a3df19cebe6eae7dd7a8a09dc492fcb02f115fa78679ed92a3cca079cae9",
   "https://adcontextprotocol.org/schemas/2.4.0/core/creative-policy.json": "037d34bfec8541125f1d6c16ce3816c028525b29952ed924a79e460e51c237d0",
   "https://adcontextprotocol.org/schemas/2.4.0/core/delivery-metrics.json": "6bdafffcaf003c2341df03e16ee7d8117fe06e0b2da0966fef81ae755d09d91c",
   "https://adcontextprotocol.org/schemas/2.4.0/core/deployment.json": "316e399a0aeba7b43edbbf57c1429f4a77f776b521d0f1a9d771679a853da5ff",
   "https://adcontextprotocol.org/schemas/2.4.0/core/destination.json": "0486f9fde3ca12933b77c59c72afdbbfb041d0e5545546e5ee99e57217a2a466",
+  "https://adcontextprotocol.org/schemas/2.4.0/core/dimensions.json": "bf7353f2baf6332e8293f8c82003ec028e2c0bcf47802022e1c27f0bb91dd67c",
   "https://adcontextprotocol.org/schemas/2.4.0/core/error.json": "6b837e3162cf8df2b185e55f378768103c7f11bea80b8291e78dc663ecf10277",
   "https://adcontextprotocol.org/schemas/2.4.0/core/ext.json": "6ec59d98a178e1b0dbc54cd8dcc6f262c6db95795b99bfe03ff01160b724b5aa",
-  "https://adcontextprotocol.org/schemas/2.4.0/core/format-id.json": "e198e63894ebb13eb3e17509e32d8e3371b9b426ab4a2cab236e998b913aa73a",
-  "https://adcontextprotocol.org/schemas/2.4.0/core/format.json": "3ecd5446f3bb3c24656e33920409b8660d5dca83dec4ab2535a1b51072cb24aa",
+  "https://adcontextprotocol.org/schemas/2.4.0/core/format-id.json": "25b3c11d977bdf6cc9f13be069a5dfbe776c6f7dacbf5eb534a01f8b6a7ff2a0",
+  "https://adcontextprotocol.org/schemas/2.4.0/core/format.json": "79462d39d93f95f6427dea3c15943020ae3ba659d217db954b2d9187ba087eba",
   "https://adcontextprotocol.org/schemas/2.4.0/core/frequency-cap.json": "286f70e4352b63cac176ec96caacbf7d0b20e9717a073e28e68e691a1f53b8b7",
   "https://adcontextprotocol.org/schemas/2.4.0/core/measurement.json": "66bde691cfe46e18ae63ca9a3e455063c105cc9e89c421a81275c8d3e083b879",
   "https://adcontextprotocol.org/schemas/2.4.0/core/media-buy.json": "2078adec6342a596447976992dd5c61fca8aeb239acab7ba6268d595b4b3757c",
   "https://adcontextprotocol.org/schemas/2.4.0/core/package.json": "2d2f395f6a496937b89e6684e3bee8dd9af418c4f2bf8775d30eb0ef7b72b696",
   "https://adcontextprotocol.org/schemas/2.4.0/core/performance-feedback.json": "4d7e262071065ca2ce8f331ea7c6f3c14fb3ab4eec2060be7d3f6d4e29027614",
-  "https://adcontextprotocol.org/schemas/2.4.0/core/placement.json": "0863c165e85ce55331bf6dcbdca431303446645e5d48fe3308cf4aee112577ac",
+  "https://adcontextprotocol.org/schemas/2.4.0/core/placement.json": "3d0231d85daebd66f6d7b747ea7f04e3aba4cb4e118de0bd1fcfc65d95b23781",
   "https://adcontextprotocol.org/schemas/2.4.0/core/pricing-option.json": "5cd7a96a5014721fb4476eb14bcf2fb01699320097002770f4d672a735225a88",
   "https://adcontextprotocol.org/schemas/2.4.0/core/product-filters.json": "daac19ed4d0ce269e9dc5468478ab7229d5a748642cc85059bba2236c31377e7",
   "https://adcontextprotocol.org/schemas/2.4.0/core/product.json": "8faed7a29a98e8e3812b26983a82a0e4e2bb49e1036616b5d53a8ffbc996a2c9",
@@ -55,8 +56,8 @@
   "https://adcontextprotocol.org/schemas/2.4.0/creative/asset-types/index.json": "cc18077b6d5b10b79a8323a946142c734dd0776bc4614e972cc26ca16b9a59fd",
   "https://adcontextprotocol.org/schemas/2.4.0/creative/list-creative-formats-request.json": "8251c982483875b6e1efb33bd428177672e4956bb64e59ba194ab4e7be9077f0",
   "https://adcontextprotocol.org/schemas/2.4.0/creative/list-creative-formats-response.json": "4a0c25d03d14c1e4a58a4b29a3e2899f6177e1acaa4e99498e79d1621967f491",
-  "https://adcontextprotocol.org/schemas/2.4.0/creative/preview-creative-request.json": "07c1858a5163bd21c739324bfce3c699238e9ed436603a22c1ab4dcac810b961",
-  "https://adcontextprotocol.org/schemas/2.4.0/creative/preview-creative-response.json": "698ecd7a285caf8df68c91018adf2704fc9febe8662cdc829e63cb48ce291ebe",
+  "https://adcontextprotocol.org/schemas/2.4.0/creative/preview-creative-request.json": "6b817bca6fb010e50dc7f94843e1b20141d37719064bde8ffdbd561907a7063b",
+  "https://adcontextprotocol.org/schemas/2.4.0/creative/preview-creative-response.json": "c53955f6992a964342438a1b12966afac9bc4fe1a348c4551d23eeb7bf00f26b",
   "https://adcontextprotocol.org/schemas/2.4.0/creative/preview-render.json": "ef68905cc925a177147aaf10c348d258f6f85d6b6fb0c1b365c0e1e6f1b74604",
   "https://adcontextprotocol.org/schemas/2.4.0/enums/adcp-domain.json": "32e8854160436d517f511169f1160b799666ae63546141de7001464453157173",
   "https://adcontextprotocol.org/schemas/2.4.0/enums/asset-content-type.json": "29e06254297f2e19c277f017611147e4c0e8f2b4506a864d00f4a8c9e09ff42d",
@@ -75,6 +76,7 @@
   "https://adcontextprotocol.org/schemas/2.4.0/enums/feed-format.json": "32ac58b621ec45df1592e81d2fe84e6d8580db8112ed5106453da480ff2b28a5",
   "https://adcontextprotocol.org/schemas/2.4.0/enums/feedback-source.json": "17d368fde0067508bc5509d3802c53be3a9ccad32d284b8d68847f4a7af98dda",
   "https://adcontextprotocol.org/schemas/2.4.0/enums/format-category.json": "068cdd6e078dcfcfac65b6610d5460de500473659b98b7892a741847b740232f",
+  "https://adcontextprotocol.org/schemas/2.4.0/enums/format-id-parameter.json": "3c38de0f61aed325ea14a82a5d605a38e8845f4536376bb45ea8283a3274fc0d",
   "https://adcontextprotocol.org/schemas/2.4.0/enums/frequency-cap-scope.json": "2810bd566441f63793dbd4af75bff57d8f508b455f8edc5e838969713366379b",
   "https://adcontextprotocol.org/schemas/2.4.0/enums/history-entry-type.json": "0fd21194230f6574649e3a33ede00372f84463e430cce1a3a19a2a283dbeb4d6",
   "https://adcontextprotocol.org/schemas/2.4.0/enums/http-method.json": "8291dfc45d4896a8692503d69ba34b98a42ab31f5d8cddb9a3fc6d466b123104",
@@ -104,9 +106,9 @@
   "https://adcontextprotocol.org/schemas/2.4.0/enums/webhook-response-type.json": "840ab464d32222546a0d2a8346059cfb4abf617f82aabbcf6611213c2a32c557",
   "https://adcontextprotocol.org/schemas/2.4.0/enums/webhook-security-method.json": "cf764b0bfa9707a0c456936e632be7dd7581346c3f1a8e124124df00dfe07f5e",
   "https://adcontextprotocol.org/schemas/2.4.0/media-buy/build-creative-request.json": "3adc36d9cbb2ba2736e4962f7673f85494f6f6ef51432b79560909017b69dc71",
-  "https://adcontextprotocol.org/schemas/2.4.0/media-buy/build-creative-response.json": "9bc0f6550e795aaa0f8ad722598240d865b87cc1d4748309e8f37c9f6d880c6b",
+  "https://adcontextprotocol.org/schemas/2.4.0/media-buy/build-creative-response.json": "75f669a1ce0956b6124818cc2cfecfea3ab4c7d2434c2cca02c1d14cd99223e6",
   "https://adcontextprotocol.org/schemas/2.4.0/media-buy/create-media-buy-request.json": "53f6470c65aa5f88cd8457398da637079c99f546b46fdb18f9fb050e961b9c44",
-  "https://adcontextprotocol.org/schemas/2.4.0/media-buy/create-media-buy-response.json": "a5dbb2dabf280b3b02e7fe4a5d5133fb33fdc82818826b67e8e901bb26c9ffc1",
+  "https://adcontextprotocol.org/schemas/2.4.0/media-buy/create-media-buy-response.json": "fe6bdf418c4fb61e89cdcf890a6e2d0e6cd8bf5aeb2f1512b792d24694db466e",
   "https://adcontextprotocol.org/schemas/2.4.0/media-buy/get-media-buy-delivery-request.json": "704d59897180d31560e25e236c1c7a3324ef7a2a7e6e724d353e2ffaa6ebb6d8",
   "https://adcontextprotocol.org/schemas/2.4.0/media-buy/get-media-buy-delivery-response.json": "bd6a34f2182bbe7f60abb5804fe7f69d444077a96784e50f3b0e0cbc968b5405",
   "https://adcontextprotocol.org/schemas/2.4.0/media-buy/get-products-request.json": "8cd76c5e7b36ff7edacb690e5e97e19e26f4fb05fa04627a91b46b4d99d4e504",
@@ -119,11 +121,11 @@
   "https://adcontextprotocol.org/schemas/2.4.0/media-buy/list-creatives-response.json": "febf62d3d52f5a82d04fbfa9722fb522a5022bb482b914081b79d9257a4be4e9",
   "https://adcontextprotocol.org/schemas/2.4.0/media-buy/package-request.json": "2d47c80a4e7c3e30e3538fba0126270602521a0afa91046b9ae01cd6fa202591",
   "https://adcontextprotocol.org/schemas/2.4.0/media-buy/provide-performance-feedback-request.json": "6d66b25dc09b9128b03944c7833f494f3aedaf115ae971d0d9d295b0e81a9e3f",
-  "https://adcontextprotocol.org/schemas/2.4.0/media-buy/provide-performance-feedback-response.json": "de75336fae826e8a781d47035a7b474dd03a62f97a03a50fdbdf5fa95c7ee58f",
+  "https://adcontextprotocol.org/schemas/2.4.0/media-buy/provide-performance-feedback-response.json": "7e6342486b3139aacac2b3843751999ba81339bfdfba319f4d803ccaf7b69212",
   "https://adcontextprotocol.org/schemas/2.4.0/media-buy/sync-creatives-request.json": "6212d8370226ea3251c07630a718f4dbc4e77c5c1813bdc030b5b67f94d00c68",
-  "https://adcontextprotocol.org/schemas/2.4.0/media-buy/sync-creatives-response.json": "47279e4fa69f83465d65bdfcb0481a180cba044fd5a8c4758ea819bfcb34e5a5",
+  "https://adcontextprotocol.org/schemas/2.4.0/media-buy/sync-creatives-response.json": "0cb749ac0386ef03d43e20d30332a42ddba877f1d370b8ef134d7f4bead61d48",
   "https://adcontextprotocol.org/schemas/2.4.0/media-buy/update-media-buy-request.json": "d2f3319b53b7a6288a43206296902e26033d94941a5af52e4757625db1e51a3d",
-  "https://adcontextprotocol.org/schemas/2.4.0/media-buy/update-media-buy-response.json": "48251c9403fb59465cf2719242883053970574cb4f8227da825c5a9aea3aba5d",
+  "https://adcontextprotocol.org/schemas/2.4.0/media-buy/update-media-buy-response.json": "b6efacdd83f1afe1eac2010c7bf2d153c3e92fc551c61014d58500cf3dc454b9",
   "https://adcontextprotocol.org/schemas/2.4.0/pricing-options/cpc-option.json": "5666571cb088335b6a42f6d3dd9dee9f95893770ba1e478b6147f53093518324",
   "https://adcontextprotocol.org/schemas/2.4.0/pricing-options/cpcv-option.json": "dd1cd842c24ea20b97e0bd5c146256c54d06024aad3a96bf57e3a148c4726284",
   "https://adcontextprotocol.org/schemas/2.4.0/pricing-options/cpm-auction-option.json": "f6bce579d5cd2d3ab984d7b8d77e4d2f781bbc0d2b5123756937ac1e15dc17ab",
@@ -135,7 +137,7 @@
   "https://adcontextprotocol.org/schemas/2.4.0/pricing-options/vcpm-fixed-option.json": "f8077f1733e257e609001eeeb7145388ebd30cbbbe3efeb968d01cfb825c7424",
   "https://adcontextprotocol.org/schemas/2.4.0/protocols/adcp-extension.json": "5f580bfe97cfc6cb94f4dd3ae746d13acd82266c16176fbd6d0cd343e7f588dc",
   "https://adcontextprotocol.org/schemas/2.4.0/signals/activate-signal-request.json": "6b945a51c2e0b9b2feacc17bab91402a50cecd59f8dfc98d385c8f8d9c128d69",
-  "https://adcontextprotocol.org/schemas/2.4.0/signals/activate-signal-response.json": "84776658e92d3b96b65b6e11a6ee6821c82e441bb46c6c3c4c091958ecb4ffed",
+  "https://adcontextprotocol.org/schemas/2.4.0/signals/activate-signal-response.json": "4bfcf6e277ef58d1d01bbd4b01ea1c526b9768b5fbc1aa4bde5112b4b185b137",
   "https://adcontextprotocol.org/schemas/2.4.0/signals/get-signals-request.json": "6e4ef288048d808fdaf16723b440321e7cf2b637c59d2a05fee56a37d9a01d84",
   "https://adcontextprotocol.org/schemas/2.4.0/signals/get-signals-response.json": "dc150ab63e4ca61d06c03b875502dc14a61344920f3dbd334491fb8a82d6b9b4"
 }

schemas/cache/core/assets/image-asset.json

@@ -1,35 +1,32 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "additionalProperties": false,
-  "description": "Image asset with URL and dimensions",
-  "properties": {
-    "alt_text": {
-      "description": "Alternative text for accessibility",
-      "type": "string"
-    },
-    "format": {
-      "description": "Image file format (jpg, png, gif, webp, etc.)",
-      "type": "string"
-    },
-    "height": {
-      "description": "Image height in pixels",
-      "minimum": 1,
-      "type": "integer"
+  "allOf": [
+    {
+      "$ref": "../../core/dimensions.json"
     },
-    "url": {
-      "description": "URL to the image asset",
-      "format": "uri",
-      "type": "string"
-    },
-    "width": {
-      "description": "Image width in pixels",
-      "minimum": 1,
-      "type": "integer"
+    {
+      "additionalProperties": false,
+      "properties": {
+        "alt_text": {
+          "description": "Alternative text for accessibility",
+          "type": "string"
+        },
+        "format": {
+          "description": "Image file format (jpg, png, gif, webp, etc.)",
+          "type": "string"
+        },
+        "url": {
+          "description": "URL to the image asset",
+          "format": "uri",
+          "type": "string"
+        }
+      },
+      "required": [
+        "url"
+      ],
+      "type": "object"
     }
-  },
-  "required": [
-    "url"
   ],
-  "title": "Image Asset",
-  "type": "object"
+  "description": "Image asset with URL and dimensions",
+  "title": "Image Asset"
 }

schemas/cache/core/assets/video-asset.json

@@ -1,41 +1,38 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "additionalProperties": false,
-  "description": "Video asset with URL and specifications",
-  "properties": {
-    "bitrate_kbps": {
-      "description": "Video bitrate in kilobits per second",
-      "minimum": 1,
-      "type": "integer"
-    },
-    "duration_ms": {
-      "description": "Video duration in milliseconds",
-      "minimum": 0,
-      "type": "integer"
-    },
-    "format": {
-      "description": "Video file format (mp4, webm, mov, etc.)",
-      "type": "string"
+  "allOf": [
+    {
+      "$ref": "../../core/dimensions.json"
     },
-    "height": {
-      "description": "Video height in pixels",
-      "minimum": 1,
-      "type": "integer"
-    },
-    "url": {
-      "description": "URL to the video asset",
-      "format": "uri",
-      "type": "string"
-    },
-    "width": {
-      "description": "Video width in pixels",
-      "minimum": 1,
-      "type": "integer"
+    {
+      "additionalProperties": false,
+      "properties": {
+        "bitrate_kbps": {
+          "description": "Video bitrate in kilobits per second",
+          "minimum": 1,
+          "type": "integer"
+        },
+        "duration_ms": {
+          "description": "Video duration in milliseconds",
+          "minimum": 1,
+          "type": "integer"
+        },
+        "format": {
+          "description": "Video file format (mp4, webm, mov, etc.)",
+          "type": "string"
+        },
+        "url": {
+          "description": "URL to the video asset",
+          "format": "uri",
+          "type": "string"
+        }
+      },
+      "required": [
+        "url"
+      ],
+      "type": "object"
     }
-  },
-  "required": [
-    "url"
   ],
-  "title": "Video Asset",
-  "type": "object"
+  "description": "Video asset with URL and specifications",
+  "title": "Video Asset"
 }

schemas/cache/core/creative-asset.json

@@ -57,7 +57,7 @@
     },
     "format_id": {
       "$ref": "format-id.json",
-      "description": "Format identifier specifying which format this creative conforms to"
+      "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."
     },
     "inputs": {
       "description": "Preview contexts for generative formats - defines what scenarios to generate previews for",

schemas/cache/core/creative-manifest.json

@@ -55,7 +55,7 @@
     },
     "format_id": {
       "$ref": "format-id.json",
-      "description": "Format identifier this manifest is for"
+      "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'})."
     },
     "promoted_offering": {
       "description": "Product name or offering being advertised. Maps to promoted_offerings in create_media_buy request to associate creative with the product being promoted.",

schemas/cache/core/dimensions.json

@@ -0,0 +1,23 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "additionalProperties": false,
+  "description": "Pixel dimensions for visual formats (width and height must be specified together)",
+  "properties": {
+    "height": {
+      "description": "Height in pixels",
+      "minimum": 1,
+      "type": "integer"
+    },
+    "width": {
+      "description": "Width in pixels",
+      "minimum": 1,
+      "type": "integer"
+    }
+  },
+  "required": [
+    "width",
+    "height"
+  ],
+  "title": "Dimensions",
+  "type": "object"
+}