fix: rewrite $ref in top level oneOf/anyOf/allOf branches during variant generation (#83)

* rewrite $ref in top-level oneOf/anyOf branches during variant generation

(cherry picked from commit 2a9beb9)

* update

(cherry picked from commit e652462)

* test: add coverage for composition variant propagation and rewriting

(cherry picked from commit 34c3107)

* fix: tolerate line-wrapped Annotated[...] in inject_array_contains

_create_single_variant now rewrites $ref inside top-level oneOf/anyOf/
allOf/items branches (see the preceding two commits, cherry-picked from
#35), which lengthens some array-root item type references, e.g.
total.Total becomes total_create_request.TotalCreateRequest for
TotalsCreateRequest. That extra length pushes ruff's formatter to wrap
Annotated[...] onto multiple lines with a trailing comma before the
closing bracket.

inject_array_contains spliced AfterValidator(...) in right before that
closing bracket without checking for the trailing comma, landing the
new element after an orphaned comma with nothing between them - a
SyntaxError, not just a formatting nit. Because tests/test_codegen_pipeline.py
imported the generated Totals*Request classes inside a bare
"except ImportError", the SyntaxError went uncaught and took the whole
test module down at collection time, failing every test in the file.

Fix the splice to insert after the last real token before the closing
bracket instead of blindly before it, reusing an existing trailing
comma when present. Also widen the import guard to catch SyntaxError
so one broken generated file degrades to HAVE_SDK = False instead of
failing collection for the whole module.

* chore: regenerate models against pinned UCP spec 2026-04-08

Runs generate_models.sh 2026-04-08 (README compat table: SDK 0.4.x ->
UCP schema 2026-04-08) against the three preceding commits (the #35
ref-rewrite cherry-picks plus the inject_array_contains fix). Only
totals_create_request.py/totals_update_request.py change beyond what
the cherry-picks already carried, because those two needed both fixes
together: the ref rewrite (to point at total_create_request.json
instead of total.json) and the trailing-comma-safe splice (to still
parse once that longer reference pushes Annotated[...] onto multiple
lines).

---------

Co-authored-by: xiaoxuan-hub <i.travel@live.com>
Co-authored-by: damaz91 <federico.damato91@gmail.com>
Co-authored-by: Vishal Katyal <vishal@katyal.ai>

Author: 4 people

postprocess_models.py

@@ -667,7 +667,26 @@ def inject_array_contains(source, alias_name, groups, item_condition=None):
                 break
     if close is None:
         return source
-    out = source[:close] + f", AfterValidator({func_name})" + source[close:]
+    # Insert right after the last real token inside Annotated[...], not
+    # blindly right before the closing bracket. When the annotation is
+    # line-wrapped -- which ruff/black do once the item type reference is
+    # long enough to push the line past the wrap width, e.g. a
+    # request-variant $ref such as total_create_request.TotalCreateRequest
+    # replacing the shorter total.Total -- there is already a trailing
+    # comma just before the whitespace that precedes "]". Splicing before
+    # that whitespace would leave the existing trailing comma and our own
+    # leading comma separated by nothing but whitespace: two commas with no
+    # expression between them, a SyntaxError (see #34/#35).
+    scan = close - 1
+    while scan >= 0 and source[scan] in " \t\n":
+        scan -= 1
+    if scan >= 0 and source[scan] == ",":
+        insert_at = scan + 1
+        addition = f" AfterValidator({func_name}),"
+    else:
+        insert_at = scan + 1
+        addition = f", AfterValidator({func_name})"
+    out = source[:insert_at] + addition + source[insert_at:]
     func_src = _build_contains_function(func_name, groups, item_condition)
     insert_at = assign_re.search(out).start()
     out = out[:insert_at] + func_src + "\n\n" + out[insert_at:]

preprocess_schemas.py

@@ -558,6 +558,12 @@ def _create_single_variant(
             variant, op, file_path, global_variant_requirements
         )
 
+    # Rewrite all external $refs in the variant schema to point to their
+    # corresponding request variants where applicable. This covers top-level
+    # oneOf/anyOf/allOf branches as well as array items.
+    rewrite_refs_to_variants(
+        variant, op, file_path, global_variant_requirements
+    )
     return variant
 
 
@@ -626,20 +632,29 @@ def normalize_metadata_schemas(schemas, target_dir):
 
 
 def extract_external_refs(schema, path):
-    """Finds all relative external file references in the schema properties."""
+    """Finds all relative external file references in the schema."""
     refs = []
-    props = schema.get("properties", {})
-    if not isinstance(props, dict):
-        return refs
 
-    for name, data in props.items():
+    def _scan(name, data):
         for node in iter_nodes(data):
             if isinstance(node, dict) and "$ref" in node:
                 ref = node["$ref"]
                 ref_file, _, _ = ref.partition("#")
                 if ref_file:
                     abs_path = str((path.parent / ref_file).resolve())
                     refs.append((name, abs_path))
+
+    props = schema.get("properties", {})
+    if isinstance(props, dict):
+        for name, data in props.items():
+            _scan(name, data)
+
+    # Also scan top-level composition keywords (oneOf, anyOf, allOf, items)
+    for key in ["oneOf", "anyOf", "allOf"]:
+        if key in schema:
+            _scan(key, schema[key])
+    if "items" in schema:
+        _scan("items", schema["items"])
     return refs
 
 
@@ -656,23 +671,28 @@ def propagate_needs_transitive(variant_needs, schema_refs, schemas):
                 continue
 
             for op in list(variant_needs[path]):
-                for prop_name, child_path in refs:
+                for ref_name, child_path in refs:
                     if child_path not in schemas:
                         continue
 
-                    # Only propagate if the property isn't 'omit'ted for this op
-                    data = (
-                        schemas[path].get("properties", {}).get(prop_name, {})
-                    )
-                    include, _ = eval_prop_inclusion(
-                        prop_name, data, op, schemas[path].get("required", [])
-                    )
-
-                    if include:
-                        target_set = variant_needs.setdefault(child_path, set())
-                        if op not in target_set:
-                            target_set.add(op)
-                            changed = True
+                    # For property refs, check if the property is included for this op.
+                    # For non-property refs (oneOf, anyOf, allOf, items), always propagate.
+                    props = schemas[path].get("properties", {})
+                    if ref_name in props:
+                        data = props[ref_name]
+                        include, _ = eval_prop_inclusion(
+                            ref_name,
+                            data,
+                            op,
+                            schemas[path].get("required", []),
+                        )
+                        if not include:
+                            continue
+
+                    target_set = variant_needs.setdefault(child_path, set())
+                    if op not in target_set:
+                        target_set.add(op)
+                        changed = True
 
 
 # --- Main Flow ---

src/ucp_sdk/models/schemas/shopping/cart_create_request.py

@@ -20,7 +20,7 @@
 
 from pydantic import BaseModel, ConfigDict
 
-from .checkout import Checkout as Checkout_1
+from .checkout_create_request import CheckoutCreateRequest
 from .types import (
     attribution_create_request,
     buyer_create_request,
@@ -56,7 +56,7 @@ class CartCreateRequest(BaseModel):
     """
 
 
-class Checkout(Checkout_1):
+class Checkout(CheckoutCreateRequest):
     """
     Checkout extended with cart capability. Adds cart_id to create_checkout for cart-to-checkout conversion.
     """

src/ucp_sdk/models/schemas/shopping/cart_update_request.py

@@ -20,7 +20,7 @@
 
 from pydantic import BaseModel, ConfigDict
 
-from .checkout import Checkout as Checkout_1
+from .checkout_update_request import CheckoutUpdateRequest
 from .types import (
     attribution_update_request,
     buyer_update_request,
@@ -60,7 +60,7 @@ class CartUpdateRequest(BaseModel):
     """
 
 
-class Checkout(Checkout_1):
+class Checkout(CheckoutUpdateRequest):
     """
     Checkout extended with cart capability. Adds cart_id to create_checkout for cart-to-checkout conversion.
     """

src/ucp_sdk/models/schemas/shopping/types/error_code_create_request.py

@@ -0,0 +1,48 @@
+# Copyright 2026 UCP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# generated by datamodel-codegen
+# pylint: disable=all
+# pyformat: disable
+
+from __future__ import annotations
+
+from typing import Annotated
+
+from pydantic import Field
+from typing_extensions import TypeAliasType
+
+ErrorCodeCreateRequest = TypeAliasType(
+    "ErrorCodeCreateRequest",
+    Annotated[
+        str,
+        Field(
+            ...,
+            examples=[
+                "not_found",
+                "out_of_stock",
+                "item_unavailable",
+                "address_undeliverable",
+                "payment_failed",
+                "eligibility_invalid",
+                "identity_required",
+                "insufficient_scope",
+            ],
+            title="Error Code Create Request",
+        ),
+    ],
+)
+"""
+Error code identifying the type of error. Standard errors are defined in specification (see examples), and have standardized semantics; freeform codes are permitted.
+"""

src/ucp_sdk/models/schemas/shopping/types/error_code_update_request.py

@@ -0,0 +1,48 @@
+# Copyright 2026 UCP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# generated by datamodel-codegen
+# pylint: disable=all
+# pyformat: disable
+
+from __future__ import annotations
+
+from typing import Annotated
+
+from pydantic import Field
+from typing_extensions import TypeAliasType
+
+ErrorCodeUpdateRequest = TypeAliasType(
+    "ErrorCodeUpdateRequest",
+    Annotated[
+        str,
+        Field(
+            ...,
+            examples=[
+                "not_found",
+                "out_of_stock",
+                "item_unavailable",
+                "address_undeliverable",
+                "payment_failed",
+                "eligibility_invalid",
+                "identity_required",
+                "insufficient_scope",
+            ],
+            title="Error Code Update Request",
+        ),
+    ],
+)
+"""
+Error code identifying the type of error. Standard errors are defined in specification (see examples), and have standardized semantics; freeform codes are permitted.
+"""

src/ucp_sdk/models/schemas/shopping/types/fulfillment_destination_create_request.py

@@ -23,13 +23,16 @@
 from pydantic import Field
 from typing_extensions import TypeAliasType
 
-from . import retail_location, shipping_destination
+from . import (
+    retail_location_create_request,
+    shipping_destination_create_request,
+)
 
 FulfillmentDestinationCreateRequest = TypeAliasType(
     "FulfillmentDestinationCreateRequest",
     Annotated[
-        shipping_destination.ShippingDestination
-        | retail_location.RetailLocation,
+        shipping_destination_create_request.ShippingDestinationCreateRequest
+        | retail_location_create_request.RetailLocationCreateRequest,
         Field(..., title="Fulfillment Destination Create Request"),
     ],
 )

src/ucp_sdk/models/schemas/shopping/types/fulfillment_destination_update_request.py

@@ -23,13 +23,16 @@
 from pydantic import Field
 from typing_extensions import TypeAliasType
 
-from . import retail_location, shipping_destination
+from . import (
+    retail_location_update_request,
+    shipping_destination_update_request,
+)
 
 FulfillmentDestinationUpdateRequest = TypeAliasType(
     "FulfillmentDestinationUpdateRequest",
     Annotated[
-        shipping_destination.ShippingDestination
-        | retail_location.RetailLocation,
+        shipping_destination_update_request.ShippingDestinationUpdateRequest
+        | retail_location_update_request.RetailLocationUpdateRequest,
         Field(..., title="Fulfillment Destination Update Request"),
     ],
 )

src/ucp_sdk/models/schemas/shopping/types/info_code_create_request.py

@@ -0,0 +1,44 @@
+# Copyright 2026 UCP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# generated by datamodel-codegen
+# pylint: disable=all
+# pyformat: disable
+
+from __future__ import annotations
+
+from typing import Annotated
+
+from pydantic import Field
+from typing_extensions import TypeAliasType
+
+InfoCodeCreateRequest = TypeAliasType(
+    "InfoCodeCreateRequest",
+    Annotated[
+        str,
+        Field(
+            ...,
+            examples=[
+                "identity_optional",
+                "signal",
+                "free_shipping",
+                "not_found",
+            ],
+            title="Info Code Create Request",
+        ),
+    ],
+)
+"""
+Info code identifying the type of informational message. Standard codes are defined in capability specs (see examples), and have standardized semantics; freeform codes are permitted.
+"""

src/ucp_sdk/models/schemas/shopping/types/info_code_update_request.py

@@ -0,0 +1,44 @@
+# Copyright 2026 UCP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# generated by datamodel-codegen
+# pylint: disable=all
+# pyformat: disable
+
+from __future__ import annotations
+
+from typing import Annotated
+
+from pydantic import Field
+from typing_extensions import TypeAliasType
+
+InfoCodeUpdateRequest = TypeAliasType(
+    "InfoCodeUpdateRequest",
+    Annotated[
+        str,
+        Field(
+            ...,
+            examples=[
+                "identity_optional",
+                "signal",
+                "free_shipping",
+                "not_found",
+            ],
+            title="Info Code Update Request",
+        ),
+    ],
+)
+"""
+Info code identifying the type of informational message. Standard codes are defined in capability specs (see examples), and have standardized semantics; freeform codes are permitted.
+"""