Address PR comments

Author: cusell-google

rest/python/client/flower_shop/simple_happy_path_client.py

@@ -795,7 +795,7 @@ def main() -> None:
     # Matches the structure expected by the server's updated complete_checkout
 
     final_payload = {
-      "payment_data": {
+      "payment": {
         "id": "instr_my_card",
         "handler_id": target_handler,
         "handler_name": target_handler,

rest/python/server/routes/discovery_profile.json

@@ -1,10 +1,10 @@
 {
   "ucp": {
-    "version": "2026-01-11",
+    "version": "2026-01-23",
     "services": {
       "dev.ucp.shopping": [
         {
-          "version": "2026-01-11",
+          "version": "2026-01-23",
           "spec": "https://ucp.dev/specification/reference",
           "transport": "rest",
           "endpoint": "{{ENDPOINT}}",
@@ -16,23 +16,23 @@
       "dev.ucp.shopping.checkout": [
         {
           "name": "dev.ucp.shopping.checkout",
-          "version": "2026-01-11",
+          "version": "2026-01-23",
           "spec": "https://ucp.dev/specification/checkout",
           "schema": "https://ucp.dev/schemas/shopping/checkout.json"
         }
       ],
       "dev.ucp.shopping.order": [
         {
           "name": "dev.ucp.shopping.order",
-          "version": "2026-01-11",
+          "version": "2026-01-23",
           "spec": "https://ucp.dev/specification/order",
           "schema": "https://ucp.dev/schemas/shopping/order.json"
         }
       ],
       "dev.ucp.shopping.discount": [
         {
           "name": "dev.ucp.shopping.discount",
-          "version": "2026-01-11",
+          "version": "2026-01-23",
           "spec": "https://ucp.dev/specification/discount",
           "schema": "https://ucp.dev/schemas/shopping/discount.json",
           "extends": "dev.ucp.shopping.checkout"
@@ -41,7 +41,7 @@
       "dev.ucp.shopping.fulfillment": [
         {
           "name": "dev.ucp.shopping.fulfillment",
-          "version": "2026-01-11",
+          "version": "2026-01-23",
           "spec": "https://ucp.dev/specification/fulfillment",
           "schema": "https://ucp.dev/schemas/shopping/fulfillment.json",
           "extends": "dev.ucp.shopping.checkout"
@@ -50,7 +50,7 @@
       "dev.ucp.shopping.buyer_consent": [
         {
           "name": "dev.ucp.shopping.buyer_consent",
-          "version": "2026-01-11",
+          "version": "2026-01-23",
           "spec": "https://ucp.dev/specification/buyer-consent",
           "schema": "https://ucp.dev/schemas/shopping/buyer_consent.json",
           "extends": "dev.ucp.shopping.checkout"
@@ -62,11 +62,11 @@
         {
           "id": "shop_pay",
           "name": "com.shopify.shop_pay",
-          "version": "2026-01-11",
+          "version": "2026-01-23",
           "spec": "https://shopify.dev/docs/agents/checkout/shop-pay-handler",
-          "config_schema": "https://shopify.dev/ucp/shop-pay-handler/2026-01-11/config.json",
+          "config_schema": "https://shopify.dev/ucp/shop-pay-handler/2026-01-23/config.json",
           "instrument_schemas": [
-            "https://shopify.dev/ucp/shop-pay-handler/2026-01-11/instrument.json"
+            "https://shopify.dev/ucp/shop-pay-handler/2026-01-23/instrument.json"
           ],
           "config": {
             "shop_id": "{{SHOP_ID}}"
@@ -77,11 +77,11 @@
         {
           "id": "google_pay",
           "name": "com.google.pay",
-          "version": "2026-01-11",
-          "spec": "https://pay.google.com/gp/p/ucp/2026-01-11/",
-          "config_schema": "https://pay.google.com/gp/p/ucp/2026-01-11/schemas/config.json",
+          "version": "2026-01-23",
+          "spec": "https://pay.google.com/gp/p/ucp/2026-01-23/",
+          "config_schema": "https://pay.google.com/gp/p/ucp/2026-01-23/schemas/config.json",
           "instrument_schemas": [
-            "https://pay.google.com/gp/p/ucp/2026-01-11/schemas/card_payment_instrument.json"
+            "https://pay.google.com/gp/p/ucp/2026-01-23/schemas/card_payment_instrument.json"
           ],
           "config": {
             "api_version": 2,
@@ -118,7 +118,7 @@
         {
           "id": "mock_payment_handler",
           "name": "mock_payment_handler",
-          "version": "2026-01-11",
+          "version": "2026-01-23",
           "spec": "https://ucp.dev/schemas/mock_payment_handler/spec",
           "config": {}
         }

rest/python/server/routes/ucp_implementation.py

@@ -33,8 +33,8 @@
 from pydantic import BaseModel
 from pydantic import HttpUrl
 from services.checkout_service import CheckoutService
-from ucp_sdk.models.schemas.shopping.ap2_mandate import (
-  Checkout as Ap2CompleteRequest,
+from ucp_sdk.models.schemas.shopping.checkout_complete_request import (
+  CheckoutCompleteRequest,
 )
 from ucp_sdk.models.schemas.shopping.order import Order
 from ucp_sdk.models.schemas.shopping.order import PlatformSchema
@@ -214,7 +214,7 @@ async def complete_checkout(
   checkout_service: Annotated[
     CheckoutService, Depends(dependencies.get_checkout_service)
   ],
-  ap2: Annotated[Ap2CompleteRequest | None, Body()] = None,
+  checkout_complete: Annotated[CheckoutCompleteRequest | None, Body()] = None,
 ) -> dict[str, Any]:
   """Complete Checkout Implementation."""
   del common_headers  # Unused
@@ -225,7 +225,7 @@ async def complete_checkout(
   )
 
   checkout_result = await checkout_service.complete_checkout(
-    checkout_id, payment_req, risk_signals, idempotency_key, ap2=ap2
+    checkout_id, payment_req, risk_signals, idempotency_key, checkout_complete=checkout_complete
   )
   return checkout_result.model_dump(mode="json", by_alias=True)
 

rest/python/server/services/checkout_service.py

@@ -61,8 +61,8 @@
 from ucp_sdk.models.schemas.ucp import UcpMetadata
 from ucp_sdk.models.schemas.ucp import Version
 from ucp_sdk.models.schemas.capability import ResponseSchema as Response
-from ucp_sdk.models.schemas.shopping.ap2_mandate import (
-  Checkout as Ap2CompleteRequest,
+from ucp_sdk.models.schemas.shopping.checkout_complete_request import (
+  CheckoutCompleteRequest,
 )
 from ucp_sdk.models.schemas.shopping.discount import Allocation
 from ucp_sdk.models.schemas.shopping.discount import AppliedDiscount
@@ -618,17 +618,17 @@ async def complete_checkout(
     payment: PaymentCreateRequest,
     risk_signals: dict[str, Any],
     idempotency_key: str,
-    ap2: Ap2CompleteRequest | None = None,
+    checkout_complete: CheckoutCompleteRequest | None = None,
   ) -> Checkout:
     """Complete a checkout session."""
     logger.info("Completing checkout session %s", checkout_id)
 
     # Idempotency Check
-    # Include risk_signals and ap2 in the hash
+    # Include risk_signals and checkout_complete in the hash
     combined_data = {
       "payment": payment.model_dump(mode="json"),
       "risk_signals": risk_signals,
-      "ap2": ap2.model_dump(mode="json") if ap2 else None,
+      "checkout_complete": checkout_complete.model_dump(mode="json") if checkout_complete else None,
     }
     request_hash = self._compute_hash(combined_data)