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

Author: xiaoxuanz-hub

preprocess_schemas.py

@@ -381,6 +381,15 @@ def _create_single_variant(
 
     variant["properties"] = new_props
     variant["required"] = new_required
+
+    # Rewrite $refs in top-level oneOf/anyOf branches (e.g. fulfillment_destination
+    # has no properties, only oneOf with external $refs that need variant rewriting).
+    for poly_key in ["oneOf", "anyOf"]:
+        if poly_key in variant:
+            rewrite_refs_to_variants(
+                variant[poly_key], op, file_path, global_variant_requirements
+            )
+
     return variant
 
 

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

@@ -20,21 +20,24 @@
 
 from pydantic import ConfigDict, Field, RootModel
 
-from . import retail_location, shipping_destination
+from . import (
+    retail_location_create_request,
+    shipping_destination_create_request,
+)
 
 
 class FulfillmentDestinationCreateRequest(
     RootModel[
-        shipping_destination.ShippingDestination
-        | retail_location.RetailLocation
+        shipping_destination_create_request.ShippingDestinationCreateRequest
+        | retail_location_create_request.RetailLocationCreateRequest
     ]
 ):
     model_config = ConfigDict(
         frozen=True,
     )
     root: (
-        shipping_destination.ShippingDestination
-        | retail_location.RetailLocation
+        shipping_destination_create_request.ShippingDestinationCreateRequest
+        | retail_location_create_request.RetailLocationCreateRequest
     ) = Field(..., title="Fulfillment Destination Create Request")
     """
     A destination for fulfillment.

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

@@ -20,21 +20,24 @@
 
 from pydantic import ConfigDict, Field, RootModel
 
-from . import retail_location, shipping_destination
+from . import (
+    retail_location_update_request,
+    shipping_destination_update_request,
+)
 
 
 class FulfillmentDestinationUpdateRequest(
     RootModel[
-        shipping_destination.ShippingDestination
-        | retail_location.RetailLocation
+        shipping_destination_update_request.ShippingDestinationUpdateRequest
+        | retail_location_update_request.RetailLocationUpdateRequest
     ]
 ):
     model_config = ConfigDict(
         frozen=True,
     )
     root: (
-        shipping_destination.ShippingDestination
-        | retail_location.RetailLocation
+        shipping_destination_update_request.ShippingDestinationUpdateRequest
+        | retail_location_update_request.RetailLocationUpdateRequest
     ) = Field(..., title="Fulfillment Destination Update Request")
     """
     A destination for fulfillment.