merge: integrate PR #160 oneOf flattening with RC2 governance

Merge origin/main (including PR #160's validation-only oneOf flattening)
into the governance-sdk branch. Regenerated types from RC2 schemas,
removed stale SubAsset types (schema removed in RC2), fixed list field
shadowing in GetPropertyListResponse, and updated tests for flattened
GetPlanAuditLogsRequest.

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

Author: bokelley

scripts/generate_ergonomic_coercion.py

@@ -50,8 +50,7 @@
     ("GetProductsRequest1", "media_buy.get_products_request"),
     ("GetProductsRequest2", "media_buy.get_products_request"),
     ("GetProductsRequest3", "media_buy.get_products_request"),
-    ("PackageUpdate1", "media_buy.package_update"),
-    ("PackageUpdate2", "media_buy.package_update"),
+    ("PackageUpdate", "media_buy.package_update"),
 ]
 
 # Types that should get subclass_list coercion (for list variance)
@@ -253,7 +252,7 @@ def generate_code() -> str:
     )
     from adcp.types.generated_poc.creative.list_creatives_response import ListCreativesResponse
     from adcp.types.generated_poc.media_buy.package_request import PackageRequest
-    from adcp.types.generated_poc.media_buy.package_update import PackageUpdate1, PackageUpdate2
+    from adcp.types.generated_poc.media_buy.package_update import PackageUpdate
 
     # Map names to classes
     request_classes = {
@@ -276,8 +275,7 @@ def generate_code() -> str:
         "GetProductsRequest1": GetProductsRequest1,
         "GetProductsRequest2": GetProductsRequest2,
         "GetProductsRequest3": GetProductsRequest3,
-        "PackageUpdate1": PackageUpdate1,
-        "PackageUpdate2": PackageUpdate2,
+        "PackageUpdate": PackageUpdate,
     }
 
     # Analyze all types
@@ -396,10 +394,7 @@ def generate_code() -> str:
     lines.append("    Sort,")
     lines.append(")")
     lines.append("from adcp.types.generated_poc.media_buy.package_request import PackageRequest")
-    lines.append("from adcp.types.generated_poc.media_buy.package_update import (")
-    lines.append("    PackageUpdate1,")
-    lines.append("    PackageUpdate2,")
-    lines.append(")")
+    lines.append("from adcp.types.generated_poc.media_buy.package_update import PackageUpdate")
 
     # Add response type imports
     lines.append("from adcp.types.generated_poc.media_buy.create_media_buy_response import (")
@@ -443,8 +438,7 @@ def generate_code() -> str:
         "GetProductsRequest3",
         "PackageRequest",
         "CreateMediaBuyRequest",
-        "PackageUpdate1",
-        "PackageUpdate2",
+        "PackageUpdate",
         # Response types
         "GetProductsResponse",
         "ListCreativesResponse",
@@ -539,8 +533,7 @@ def generate_code() -> str:
         lines.append(f"    {type_name}.model_rebuild(force=True)")
         lines.append("")
 
-    # Handle PackageUpdate1 and PackageUpdate2 together if they have same coercions
-    # (they're already handled in the loop above)
+    # PackageUpdate is now a single class (flattened from validation-only oneOf)
 
     # Add helper function
     lines.append("")

scripts/generate_types.py

@@ -70,6 +70,63 @@ def rewrite_refs(obj, current_schema_rel_path: Path):
     return obj
 
 
+def flatten_validation_oneof(schema: dict) -> dict:
+    """Flatten anyOf/oneOf that only express required-field constraints.
+
+    JSON Schema uses anyOf/oneOf with required-only branches to express
+    "at least one of these field groups must be set." datamodel-code-generator
+    misinterprets this as a type union, generating separate variant classes
+    (e.g., FrequencyCap1, FrequencyCap2, FrequencyCap3) plus a RootModel wrapper.
+
+    This function detects the pattern and removes the anyOf/oneOf, keeping
+    only the intersection of required fields so a single class is generated.
+
+    Follow-up to #155: enables consumer subclassing without RootModel or
+    Union type alias barriers.
+    """
+    if "properties" not in schema:
+        return schema
+
+    branch_key = None
+    branches = None
+    for key in ("anyOf", "oneOf"):
+        if key in schema:
+            branch_key = key
+            branches = schema[key]
+            break
+
+    if not branches:
+        return schema
+
+    # All branches must contain only 'required' (and optionally 'not')
+    if not all(set(b.keys()) <= {"required", "not"} for b in branches):
+        return schema
+
+    # All branches are required-only — this is a validation constraint, not a type union
+    # Compute the intersection of required fields (fields required in ALL branches)
+    branch_required = [set(b.get("required", [])) for b in branches]
+    always_required = set.intersection(*branch_required) if branch_required else set()
+
+    # Include any top-level required fields
+    top_required = set(schema.get("required", []))
+    always_required |= top_required
+
+    title = schema.get("title", "unknown")
+    branch_count = len(branches)
+
+    # Remove the anyOf/oneOf
+    del schema[branch_key]
+
+    # Set required to the intersection (or remove if empty)
+    if always_required:
+        schema["required"] = sorted(always_required)
+    elif "required" in schema:
+        del schema["required"]
+
+    print(f"    flattened {branch_key} ({branch_count} branches) in {title}")
+    return schema
+
+
 def flatten_schemas():
     """
     Copy schemas to temp directory, preserving directory structure.
@@ -113,6 +170,9 @@ def flatten_schemas():
         # Rewrite $ref paths: convert absolute paths to relative, hyphens to underscores
         schema = rewrite_refs(schema, rel_path)
 
+        # Flatten validation-only anyOf/oneOf into single-class schemas
+        schema = flatten_validation_oneof(schema)
+
         with open(output_file, "w") as f:
             json.dump(schema, f, indent=2)
 
@@ -361,6 +421,16 @@ def main():
         restore_unchanged_files()
 
         # Generate ergonomic coercion module (type coercion for better API ergonomics)
+        # Reset _ergonomic.py first — the old version may import variant classes
+        # that no longer exist after schema flattening (e.g., PackageUpdate1).
+        ergonomic_file = REPO_ROOT / "src" / "adcp" / "types" / "_ergonomic.py"
+        if ergonomic_file.exists():
+            ergonomic_file.write_text(
+                '"""Auto-generated ergonomic coercion — regenerating..."""\n'
+                "\ndef apply_ergonomic_coercion() -> None:\n"
+                "    pass\n"
+            )
+
         ergonomic_script = REPO_ROOT / "scripts" / "generate_ergonomic_coercion.py"
         if ergonomic_script.exists():
             print("\nGenerating ergonomic coercion module...")

scripts/post_generate_fixes.py

@@ -298,10 +298,13 @@ def fix_constr_type_annotations():
 
 
 # Types to unwrap from RootModel to Union type alias.
-# ALL Request/Response types are unwrapped so consumers can subclass them
-# with model_config overrides (extra='forbid', custom validators, etc.).
-# Value-type RootModels (PricingOption, Destination, etc.) keep the RootModel
-# wrapper + __getattr__ proxy since nobody subclasses them.
+# Only genuine discriminated unions (different field shapes per variant) belong here.
+# "Validation-only" oneOf types (same fields, different required combos) are now
+# handled at the schema level by flatten_validation_oneof() in generate_types.py,
+# which produces a single BaseModel class — no RootModel or unwrapping needed.
+# Removed from this set (now single classes): GetCreativeDeliveryRequest,
+# GetSignalsRequest, ProvidePerformanceFeedbackRequest, SiSendMessageRequest,
+# UpdateMediaBuyRequest.
 # See: https://github.com/adcontextprotocol/adcp-client-python/issues/155
 _UNWRAP_TO_UNION: set[str] = {
     "AcquireRightsResponse",
@@ -315,27 +318,22 @@ def fix_constr_type_annotations():
     "GetAccountFinancialsResponse",
     "GetBrandIdentityResponse",
     "GetContentStandardsResponse",
-    "GetCreativeDeliveryRequest",
     "GetCreativeFeaturesResponse",
     "GetMediaBuyArtifactsResponse",
     "GetPlanAuditLogsRequest",
     "GetProductsRequest",
     "GetRightsResponse",
-    "GetSignalsRequest",
     "ListContentStandardsResponse",
     "LogEventResponse",
     "PreviewCreativeRequest",
     "PreviewCreativeResponse",
-    "ProvidePerformanceFeedbackRequest",
     "ProvidePerformanceFeedbackResponse",
-    "SiSendMessageRequest",
     "SyncAccountsResponse",
     "SyncAudiencesResponse",
     "SyncCatalogsResponse",
     "SyncCreativesResponse",
     "SyncEventSourcesResponse",
     "UpdateContentStandardsResponse",
-    "UpdateMediaBuyRequest",
     "UpdateMediaBuyResponse",
     "UpdateRightsResponse",
     "ValidateContentDeliveryResponse",
@@ -526,6 +524,42 @@ def add_rootmodel_getattr_proxy():
         print("  No RootModel union types needed __getattr__ proxy")
 
 
+def fix_list_field_shadowing():
+    """Fix models where a field named 'list' shadows the builtin list type.
+
+    GetPropertyListResponse has a field named 'list' which shadows the builtin
+    list type in annotations like list[Identifier]. We add a _list = list alias
+    before the class and replace bare list[] usage in annotations.
+    """
+    target = OUTPUT_DIR / "property" / "get_property_list_response.py"
+    if not target.exists():
+        return
+
+    content = target.read_text()
+    if "_list = list" in content:
+        return  # Already fixed
+
+    # Add alias before the class definition
+    content = content.replace(
+        "\n\nclass GetPropertyListResponse(",
+        "\n\n_list = list  # alias to avoid shadowing by field name\n\n\nclass GetPropertyListResponse(",
+    )
+
+    # Replace bare list[] in annotations (but not the 'list' field itself)
+    # Only replace list[ when used as a type annotation, not as a field name
+    import re
+
+    # Replace list[identifier...] and dict[str, list[identifier...]] patterns
+    content = re.sub(
+        r'(?<![._a-zA-Z])list\[identifier\.',
+        '_list[identifier.',
+        content,
+    )
+
+    target.write_text(content)
+    print("  Fixed list field shadowing in get_property_list_response.py")
+
+
 def main():
     """Apply all post-generation fixes."""
     print("Applying post-generation fixes...")
@@ -539,6 +573,7 @@ def main():
     fix_constr_type_annotations()
     unwrap_rootmodel_unions()
     add_rootmodel_getattr_proxy()
+    fix_list_field_shadowing()
 
     print("\n✓ Post-generation fixes complete\n")
 

src/adcp/__init__.py

@@ -294,7 +294,6 @@
     ListContentStandardsSuccessResponse,
     LogEventErrorResponse,
     LogEventSuccessResponse,
-    MediaSubAsset,
     PercentOfMediaSignalPricingOption,
     PlatformDeployment,
     PlatformDestination,
@@ -331,7 +330,6 @@
     SyncCreativesSuccessResponse,
     SyncEventSourcesErrorResponse,
     SyncEventSourcesSuccessResponse,
-    TextSubAsset,
     UpdateContentStandardsErrorResponse,
     UpdateContentStandardsSuccessResponse,
     UpdateMediaBuyErrorResponse,
@@ -698,7 +696,6 @@ def get_adcp_version() -> str:
     "ListContentStandardsErrorResponse",
     "LogEventSuccessResponse",
     "LogEventErrorResponse",
-    "MediaSubAsset",
     "PlatformDeployment",
     "PlatformDestination",
     "PreviewCreativeBatchRequest",
@@ -734,7 +731,6 @@ def get_adcp_version() -> str:
     "SyncCreativesErrorResponse",
     "SyncEventSourcesSuccessResponse",
     "SyncEventSourcesErrorResponse",
-    "TextSubAsset",
     "UpdateContentStandardsSuccessResponse",
     "UpdateContentStandardsErrorResponse",
     "UpdateMediaBuySuccessResponse",

src/adcp/types/__init__.py

@@ -187,6 +187,7 @@
     GetProductsResponse,
     GetPropertyListRequest,
     GetPropertyListResponse,
+    GetSignalsRequest,
     GetSignalsResponse,
     Gtin,
     HtmlAsset,
@@ -403,7 +404,6 @@
     GetProductsWholesaleRequest,
     GetSignalsDiscoveryRequest,
     GetSignalsLookupRequest,
-    GetSignalsRequest,
     HtmlPreviewRender,
     InlineDaastAsset,
     InlineVastAsset,
@@ -413,7 +413,6 @@
     LogEventErrorResponse,
     LogEventSuccessResponse,
     MediaBuyDeliveryStatus,
-    MediaSubAsset,
     PercentOfMediaSignalPricingOption,
     PlatformDeployment,
     PlatformDestination,
@@ -450,7 +449,6 @@
     SyncCreativesSuccessResponse,
     SyncEventSourcesErrorResponse,
     SyncEventSourcesSuccessResponse,
-    TextSubAsset,
     UpdateContentStandardsErrorResponse,
     UpdateContentStandardsSuccessResponse,
     UpdateMediaBuyErrorResponse,
@@ -923,7 +921,6 @@
     "ListContentStandardsSuccessResponse",
     "LogEventErrorResponse",
     "LogEventSuccessResponse",
-    "MediaSubAsset",
     "PlatformDeployment",
     "PlatformDestination",
     "PreviewCreativeBatchRequest",
@@ -957,7 +954,6 @@
     "SyncCreativeResult",
     "SyncEventSourcesErrorResponse",
     "SyncEventSourcesSuccessResponse",
-    "TextSubAsset",
     "UpdateContentStandardsErrorResponse",
     "UpdateContentStandardsSuccessResponse",
     "UpdateMediaBuyErrorResponse",